Ignore:
Timestamp:
22 Feb 2014, 19:29:45 (11 years ago)
Author:
uli
Message:

Merge changes from henrik-diazo-themed back into trunk.

Location:
main/kofacustom.skeleton/trunk
Files:
6 deleted
15 edited
8 copied

Legend:

Unmodified
Added
Removed

  • main/kofacustom.skeleton/trunk

  • main/kofacustom.skeleton/trunk/CHANGES.txt

    r11271 r11272  
    22*******
    33
    4 0.2dev (unreleseased)
    5 =====================
     41.0dev (unreleased)
     5===================
    66
    7 * No changes yet
     7* Diazofied complete package.
    88
    99

  • main/kofacustom.skeleton/trunk/buildout-zeo.cfg

    r10765 r11272  
    1313    site_zcml
    1414    zdaemon_conf
    15     deploy_ini
    16     debug_ini
     15    raw_deploy_ini
     16    raw_debug_ini
     17    themed_deploy_ini
     18    themed_debug_ini
    1719    profile_ini
    1820    zeo1_ini
    … …  
    2325# kofactl creation must be _after_ app!
    2426    kofactl
     27    lxml
     28    diazo
    2529# For backward compatibility, telling buildout not to throw away
    2630# the data and log subdirectories from the parts directory.
    … …  
    9397[zeo1_ini]
    9498recipe = collective.recipe.template
    95 input = etc/zeo1.ini.in
    96 output = ${buildout:parts-directory}/etc/zeo1.ini
     99input = etc/themed/zeo1.ini.in
     100output = ${buildout:parts-directory}/etc/themed-zeo1.ini
    97101
    98102[zeo2_ini]
    99103recipe = collective.recipe.template
    100 input = etc/zeo2.ini.in
    101 output = ${buildout:parts-directory}/etc/zeo2.ini
     104input = etc/themed/zeo2.ini.in
     105output = ${buildout:parts-directory}/etc/themed-zeo2.ini
    102106
    103107[zeo1_conf]
    … …  
    115119# See http://pypi.python.org/pypi/zc.recipe.egg for details...
    116120recipe = zc.recipe.egg
    117 eggs = kofacustom.skeleton [beaker]
     121eggs = kofacustom.skeleton [beaker, diazo]
    118122arguments = "${buildout:parts-directory}/etc/zeo1.conf"
    119123scripts = kofactl=zeo_client1
    … …  
    122126# See http://pypi.python.org/pypi/zc.recipe.egg for details...
    123127recipe = zc.recipe.egg
    124 eggs = kofacustom.skeleton [beaker]
     128eggs = kofacustom.skeleton [beaker, diazo]
    125129arguments = "${buildout:parts-directory}/etc/zeo2.conf"
    126130scripts = kofactl=zeo_client2

  • main/kofacustom.skeleton/trunk/buildout.cfg

    r11271 r11272  
    1818    site_zcml
    1919    zdaemon_conf
    20     deploy_ini
    21     debug_ini
     20    raw_deploy_ini
     21    raw_debug_ini
     22    themed_deploy_ini
     23    themed_debug_ini
    2224    profile_ini
    2325    waeupdocs
    … …  
    2628# kofactl creation must be _after_ app!
    2729    kofactl
     30    lxml
     31    diazo
    2832# For backward compatibility, telling buildout not to throw away
    2933# the data and log subdirectories from the parts directory.
    … …  
    4145
    4246[sources]
    43 waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/branches/0.2
    44 kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/branches/0.x
     47waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/branches/uli-diazo-themed
     48kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk
    4549
    4650[kofa_params]
    … …  
    5155base_port = 8080
    5256
    53 # zeo1_port = 7011
    54 # zeo2_port = 7012
    55 # zeo3_port = 7013
    56 # server_port = 7010
     57zeo1_port = 8011
     58zeo2_port = 8012
     59# zeo3_port = 8013
     60server_port = 8010
    5761# default 7. Number of pre-opened ZODB threads/client
    5862pool_size = 7
    … …  
    6367# number of preopened paster threads, default 10
    6468threadpool_workers = 10
     69devel_pkg = kofacustom.skeleton
    6570
    6671[app]
    6772# This creates all scripts in bin/. The kofactl created here is 'faulty'.
    6873recipe = zc.recipe.egg
    69 eggs = kofacustom.skeleton [beaker]
     74eggs = kofacustom.skeleton [beaker, diazo]
    7075       z3c.evalexception>=2.0
    7176       Paste
    … …  
    8186# fixed path to zdaemon.conf as argument.
    8287recipe = zc.recipe.egg
    83 eggs = kofacustom.skeleton [beaker]
     88eggs = kofacustom.skeleton [beaker, diazo]
    8489arguments = "${buildout:parts-directory}/etc/zdaemon.conf"
    8590scripts = kofactl=kofactl
    … …  
    147152output = ${buildout:parts-directory}/etc/zdaemon.conf
    148153
    149 [deploy_ini]
    150 recipe = collective.recipe.template
    151 input = etc/deploy.ini.in
    152 output = ${buildout:parts-directory}/etc/deploy.ini
    153 
    154 [debug_ini]
    155 recipe = collective.recipe.template
    156 input = etc/debug.ini.in
    157 output = ${buildout:parts-directory}/etc/debug.ini
     154[raw_debug_ini]
     155recipe = collective.recipe.template
     156input = etc/raw/debug.ini.in
     157output = ${buildout:parts-directory}/etc/raw-debug.ini
     158
     159[raw_deploy_ini]
     160recipe = collective.recipe.template
     161input = etc/raw/deploy.ini.in
     162output = ${buildout:parts-directory}/etc/raw-deploy.ini
     163
     164[themed_debug_ini]
     165recipe = collective.recipe.template
     166input = etc/themed/debug.ini.in
     167output = ${buildout:parts-directory}/etc/themed-debug.ini
     168
     169[themed_deploy_ini]
     170recipe = collective.recipe.template
     171input = etc/themed/deploy.ini.in
     172output = ${buildout:parts-directory}/etc/themed-deploy.ini
    158173
    159174[profile_ini]
    … …  
    187202scripts = coveragereport
    188203arguments = ('${buildout:parts-directory}/coverage-detect/working-directory/coverage', '${buildout:directory}/coverage-report')
     204
     205[lxml]
     206recipe = z3c.recipe.staticlxml
     207egg = lxml
     208
     209[diazo]
     210recipe = zc.recipe.egg
     211eggs =
     212    diazo [wsgi]
     213    PasteScript
     214    kofacustom.skeleton [beaker, diazo]

  • main/kofacustom.skeleton/trunk/docs/build

    • Property svn:ignore set to
      *

  • main/kofacustom.skeleton/trunk/etc/zdaemon.conf.in

    r10765 r11272  
    11<runner>
    2   program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/deploy.ini
     2  program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/themed-deploy.ini
    33  daemon on
    44  transcript ${zope_conf:logfiles}/zdaemon.log

  • main/kofacustom.skeleton/trunk/etc/zeo1.conf.in

    r10765 r11272  
    11<runner>
    2   program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/zeo1.ini
     2  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/themed-zeo1.ini
    33  daemon on
    44  transcript ${zope_conf:logfiles}/zdaemon-zeo1.log
    55  socket-name ${zope_conf:logfiles}/zeo1.sock
    66  # Enable this to run the child process as a different user
    7   user kofa
     7  # user kofa
    88</runner>

  • main/kofacustom.skeleton/trunk/etc/zeo2.conf.in

    r10765 r11272  
    11<runner>
    2   program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/zeo2.ini
     2  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/themed-zeo2.ini
    33  daemon on
    44  transcript ${zope_conf:logfiles}/zdaemon-zeo2.log
    55  socket-name ${zope_conf:logfiles}/zeo2.sock
    66  # Enable this to run the child process as a different user
    7   user kofa
     7  # user kofa
    88</runner>

  • main/kofacustom.skeleton/trunk/etc/zope_zeo1.conf.in

    r10765 r11272  
    2424# Uncomment this if you want to connect to a ZEO server instead:
    2525  <zeoclient>
    26     server localhost:7010
     26    server localhost:8010
    2727    storage 1
    2828    # ZEO client cache, in bytes
    … …  
    6363<zodb async>
    6464  <zeoclient>
    65     server localhost:7010
     65    server localhost:8010
    6666    storage async
    6767    name async

  • main/kofacustom.skeleton/trunk/etc/zope_zeo2.conf.in

    r10765 r11272  
    2424# Uncomment this if you want to connect to a ZEO server instead:
    2525  <zeoclient>
    26     server localhost:7010
     26    server localhost:8010
    2727    storage 1
    2828    # ZEO client cache, in bytes
    … …  
    6363<zodb async>
    6464  <zeoclient>
    65     server localhost:7010
     65    server localhost:8010
    6666    storage async
    6767    name async

  • main/kofacustom.skeleton/trunk/setup.py

    r11271 r11272  
    22from setuptools import setup, find_packages
    33
    4 version = '0.2dev'
     4version = '1.0dev'
    55
    66install_requires = [
    … …  
    99    'grokui.admin',
    1010    'grokcore.startup',
    11     'waeup.kofa < 1.0',
    12     'kofacustom.nigeria < 1.0',
     11    'waeup.kofa >= 1.0',
     12    'kofacustom.nigeria >= 1.0',
    1313    ],
    1414
    … …  
    2121    'dolmen.beaker',
    2222    ]
     23
     24diazo_require = [
     25    'diazo',
     26    'webob',
     27]
    2328
    2429tests_require = [
    … …  
    8691        docs = docs_require,
    8792        beaker = beaker_require,
     93        diazo = diazo_require,
    8894        ),
    8995      entry_points="""
    9096      # Add entry points here
    91       [hurry.resource.libraries]
    92       waeup_custom = kofacustom.skeleton.browser.resources:waeup_custom
    9397      [console_scripts]
    9498      kofa-debug = grokcore.startup:interactive_debug_prompt

  • main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/browser/tests.py

    r10765 r11272  
    4949        shutil.rmtree(self.dc_root)
    5050
    51     def test_custom_theme(self):
    52         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
    53         self.browser.open('http://localhost/app/configuration')
    54         self.assertMatches('...Skeleton Theme...', self.browser.contents)
    55         self.browser.getControl(name="form.skin").value = ['custom theme']
    56         self.browser.getControl("Save").click()
    57         self.browser.open('http://localhost/app/configuration')
    58         return
    59 
    6051    def test_access_live_url(self):
    6152        # We can't access the system with basic authentication

  • main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/interswitch/browser_templates/applicant_goto_interswitch.pt

    r10765 r11272  
    7171  <input type="hidden" name="payment_params" value="college_split" />
    7272  <span tal:replace="structure view/xml_data"></span>
     73  <br />
    7374
    74   <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
     75  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
     76
     77  <br /><br />
     78
     79  <img src="/static/img/interswitch_verve_mastercard.gif" />
    7580
    7681</form>

  • main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/interswitch/browser_templates/student_goto_interswitch.pt

    r10765 r11272  
    7171  <input type="hidden" name="payment_params" value="college_split" />
    7272  <span tal:replace="structure view/xml_data"></span>
     73  <br />
    7374
    74   <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
     75  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
     76
     77  <br /><br />
     78
     79  <img src="/static/img/interswitch_verve_mastercard.gif" />
    7580
    7681</form>

  • main/kofacustom.skeleton/trunk/versions.cfg

    r10765 r11272  
    128128# zc.recipe.testrunner==2.0.0
    129129zope.testrunner = 4.3.3
     130
     131# Added by buildout at 2014-02-17 16:26:51.455299
     132WebOb = 1.3.1
     133diazo = 1.0.5
     134repoze.xmliter = 0.5
     135z3c.recipe.staticlxml = 0.10
     136
     137# Required by:
     138# diazo==1.0.5
     139experimental.cssselect = 0.3
     140
     141# Required by:
     142# diazo==1.0.5
     143# experimental.cssselect==0.3
     144lxml = 3.3.1
     145
     146# Required by:
     147# z3c.recipe.staticlxml==0.10
     148zc.recipe.cmmi = 1.3.5
     149
     150# Added by buildout at 2014-02-21 08:11:47.544699
     151zc.zodbrecipes = 2.0.0
Note: See TracChangeset for help on using the changeset viewer.