Ignore:
Timestamp:
22 Feb 2014, 21:00:38 (11 years ago)
Author:
uli
Message:

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

Location:
main/waeup.kwarapoly/trunk
Files:
7 deleted
13 edited
15 copied

Legend:

Unmodified
Added
Removed

  • main/waeup.kwarapoly/trunk

  • main/waeup.kwarapoly/trunk/buildout-zeo.cfg

    r9884 r11303  
    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.
    … …  
    4448    address ${kofa_params:server_port}
    4549  </zeo>
    46 
    4750  <blobstorage 1>
    4851    blob-dir ${zope_conf:blobstorage}
    … …  
    5154    </filestorage>
    5255  </blobstorage>
    53 
    5456  <filestorage async>
    5557    path ${zope_conf:filestorage}/Data.async.fs
    5658  </filestorage>
    57 
    5859  <eventlog>
    5960    # This sets up logging to a file.
    … …  
    9697[zeo1_ini]
    9798recipe = collective.recipe.template
    98 input = etc/zeo1.ini.in
    99 output = ${buildout:parts-directory}/etc/zeo1.ini
     99input = etc/themed/zeo1.ini.in
     100output = ${buildout:parts-directory}/etc/themed-zeo1.ini
    100101
    101102[zeo2_ini]
    102103recipe = collective.recipe.template
    103 input = etc/zeo2.ini.in
    104 output = ${buildout:parts-directory}/etc/zeo2.ini
     104input = etc/themed/zeo2.ini.in
     105output = ${buildout:parts-directory}/etc/themed-zeo2.ini
    105106
    106107[zeo1_conf]
    … …  
    118119# See http://pypi.python.org/pypi/zc.recipe.egg for details...
    119120recipe = zc.recipe.egg
    120 eggs = waeup.kwarapoly [beaker]
     121eggs = waeup.kwarapoly [beaker, diazo]
    121122arguments = "${buildout:parts-directory}/etc/zeo1.conf"
    122123scripts = kofactl=zeo_client1
    … …  
    125126# See http://pypi.python.org/pypi/zc.recipe.egg for details...
    126127recipe = zc.recipe.egg
    127 eggs = waeup.kwarapoly [beaker]
     128eggs = waeup.kwarapoly [beaker, diazo]
    128129arguments = "${buildout:parts-directory}/etc/zeo2.conf"
    129130scripts = kofactl=zeo_client2

  • main/waeup.kwarapoly/trunk/buildout.cfg

    r11223 r11303  
    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/tags/0.2.1
    44 kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/tags/0.1
     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]
    … …  
    5256zeo1_port = 7051
    5357zeo2_port = 7052
    54 zeo3_port = 7053
     58# zeo3_port = 7053
    5559server_port = 7050
    5660# default 7. Number of pre-opened ZODB threads/client
    … …  
    6266# number of preopened paster threads, default 10
    6367threadpool_workers = 10
     68devel_pkg = waeup.kwarapoly
    6469
    6570[app]
    6671# This creates all scripts in bin/. The kofactl created here is 'faulty'.
    6772recipe = zc.recipe.egg
    68 eggs = waeup.kwarapoly [beaker]
     73eggs = waeup.kwarapoly [beaker, diazo]
    6974       z3c.evalexception>=2.0
    7075       Paste
    … …  
    8085# fixed path to zdaemon.conf as argument.
    8186recipe = zc.recipe.egg
    82 eggs = waeup.kwarapoly [beaker]
     87eggs = waeup.kwarapoly [beaker, diazo]
    8388arguments = "${buildout:parts-directory}/etc/zdaemon.conf"
    8489scripts = kofactl=kofactl
    … …  
    146151output = ${buildout:parts-directory}/etc/zdaemon.conf
    147152
    148 [deploy_ini]
    149 recipe = collective.recipe.template
    150 input = etc/deploy.ini.in
    151 output = ${buildout:parts-directory}/etc/deploy.ini
    152 
    153 [debug_ini]
    154 recipe = collective.recipe.template
    155 input = etc/debug.ini.in
    156 output = ${buildout:parts-directory}/etc/debug.ini
     153[raw_debug_ini]
     154recipe = collective.recipe.template
     155input = etc/raw/debug.ini.in
     156output = ${buildout:parts-directory}/etc/raw-debug.ini
     157
     158[raw_deploy_ini]
     159recipe = collective.recipe.template
     160input = etc/raw/deploy.ini.in
     161output = ${buildout:parts-directory}/etc/raw-deploy.ini
     162
     163[themed_debug_ini]
     164recipe = collective.recipe.template
     165input = etc/themed/debug.ini.in
     166output = ${buildout:parts-directory}/etc/themed-debug.ini
     167
     168[themed_deploy_ini]
     169recipe = collective.recipe.template
     170input = etc/themed/deploy.ini.in
     171output = ${buildout:parts-directory}/etc/themed-deploy.ini
    157172
    158173[profile_ini]
    … …  
    186201scripts = coveragereport
    187202arguments = ('${buildout:parts-directory}/coverage-detect/working-directory/coverage', '${buildout:directory}/coverage-report')
     203
     204[lxml]
     205recipe = z3c.recipe.staticlxml
     206egg = lxml
     207
     208[diazo]
     209recipe = zc.recipe.egg
     210eggs =
     211    diazo [wsgi]
     212    PasteScript
     213    waeup.kwarapoly [beaker, diazo]

  • main/waeup.kwarapoly/trunk/etc/zdaemon.conf.in

    r8469 r11303  
    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/waeup.kwarapoly/trunk/etc/zeo1.conf.in

    r8470 r11303  
    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/waeup.kwarapoly/trunk/etc/zeo2.conf.in

    r8470 r11303  
    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/waeup.kwarapoly/trunk/setup.py

    r11228 r11303  
    22from setuptools import setup, find_packages
    33
    4 version = '0.1.1dev'
     4version = '1.0dev'
    55
    66install_requires =[
    … …  
    99    'grokui.admin',
    1010    'grokcore.startup',
    11     'waeup.kofa',
    12     'kofacustom.nigeria',
     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="""
    90       # Add entry points here
    91       [hurry.resource.libraries]
    92       waeup_custom = waeup.kwarapoly.browser.resources:waeup_custom
    9396      [console_scripts]
    9497      kofa-debug = grokcore.startup:interactive_debug_prompt

  • main/waeup.kwarapoly/trunk/src/waeup/kwarapoly

  • main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/browser/tests.py

    r9347 r11303  
    4848        clearSite()
    4949        shutil.rmtree(self.dc_root)
    50 
    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('...KwaraPoly 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

  • main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/browser.py

    r10844 r11303  
    5252#URL = '/test_paydirect/services/TransactionQueryWs.asmx'
    5353httplib.HTTPConnection.debuglevel = 0
    54 
    55 def interswitch_img_url(view):
    56     static = view.static
    57     if static is None or static.get(
    58         'interswitch_verve_mastercard.gif', None) is None:
    59         static = queryAdapter(
    60             view.request, Interface, name='waeup.kwarapoly.interswitch')
    61     return static['interswitch_verve_mastercard.gif']()
    6254
    6355class InterswitchPageStudent(KofaPage):

  • main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/browser_templates/applicant_goto_interswitch.pt

    r10131 r11303  
    88
    99  <table class="form-table" i18n:domain="waeup.kofa">
    10     <thead>
    11     </thead>
    1210    <tbody>
    1311      <tr>
    … …  
    7270  <input type="hidden" name="payment_params" value="college_split" />
    7371  <span tal:replace="structure view/xml_data"></span>
    74 
    75   <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
     72  <br />
     73  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
    7674
    7775  <br /><br />
    7876
    79   <img tal:attributes="src view/interswitch_img_url" />
     77  <img src="/static/img/interswitch_verve_mastercard.gif" />
    8078
    8179</form>

  • main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/browser_templates/student_goto_interswitch.pt

    r9996 r11303  
    88
    99  <table class="form-table" i18n:domain="waeup.kofa">
    10     <thead>
    11     </thead>
    1210    <tbody>
    1311      <tr>
    … …  
    7270  <input type="hidden" name="payment_params" value="college_split" />
    7371  <span tal:replace="structure view/xml_data"></span>
    74 
    75   <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
     72  <br />
     73  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
    7674
    7775  <br /><br />
    7876
    79   <img tal:attributes="src view/interswitch_img_url" />
     77  <img src="/static/img/interswitch_verve_mastercard.gif" />
    8078
    8179</form>

  • main/waeup.kwarapoly/trunk/versions.cfg

    r11224 r11303  
    77
    88[versions]
    9 waeup.kofa = 0.2.1
    10 kofacustom.nigeria = 0.1
    119collective.recipe.sphinxbuilder = 0.7.0
    1210hurry.workflow = 0.11
    … …  
    132130zope.testrunner = 4.3.3
    133131
    134 # Added by buildout at 2014-02-22 14:34:16.353181
     132# Added by buildout at 2014-02-20 11:46:38.584637
     133WebOb = 1.3.1
     134diazo = 1.0.5
     135repoze.xmliter = 0.5
     136z3c.recipe.staticlxml = 0.10
     137
     138# Required by:
     139# diazo==1.0.5
     140experimental.cssselect = 0.3
     141
     142# Required by:
     143# diazo==1.0.5
     144# experimental.cssselect==0.3
     145lxml = 3.3.1
     146
     147# Required by:
     148# z3c.recipe.staticlxml==0.10
     149zc.recipe.cmmi = 1.3.5
     150
     151# Added by buildout at 2014-02-21 08:32:23.099922
    135152zc.zodbrecipes = 2.0.0
Note: See TracChangeset for help on using the changeset viewer.