Changeset 11315 for main


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

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

Location:
main/waeup.uniben/trunk
Files:
6 deleted
16 edited
15 copied

Legend:

Unmodified
Added
Removed

  • main/waeup.uniben/trunk

  • main/waeup.uniben/trunk/CHANGES.txt

    r11252 r11315  
    22*******
    33
    4 0.1.1dev (unreleased)
    5 =====================
     41.0dev (unreleased)
     5===================
    66
    7 * No changes yet
    8 
     7* Diazofied whole package.
    98
    109

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

    r9878 r11315  
    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 = waeup.uniben [beaker]
     121eggs = waeup.uniben [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 = waeup.uniben [beaker]
     128eggs = waeup.uniben [beaker, diazo]
    125129arguments = "${buildout:parts-directory}/etc/zeo2.conf"
    126130scripts = kofactl=zeo_client2

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

    r11246 r11315  
    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]
    … …  
    6266# number of preopened paster threads, default 10
    6367threadpool_workers = 10
     68devel_pkg = waeup.uniben
    6469
    6570[app]
    6671# This creates all scripts in bin/. The kofactl created here is 'faulty'.
    6772recipe = zc.recipe.egg
    68 eggs = waeup.uniben [beaker]
     73eggs = waeup.uniben [beaker, diazo]
    6974       z3c.evalexception>=2.0
    7075       Paste
    … …  
    8085# fixed path to zdaemon.conf as argument.
    8186recipe = zc.recipe.egg
    82 eggs = waeup.uniben [beaker]
     87eggs = waeup.uniben [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.uniben [beaker, diazo]

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

    r5502 r11315  
    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.uniben/trunk/etc/zeo1.conf.in

    r11243 r11315  
    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.uniben/trunk/etc/zeo2.conf.in

    r11243 r11315  
    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.uniben/trunk/setup.py

    r11252 r11315  
    22from setuptools import setup, find_packages
    33
    4 version = '0.1.1dev'
     4version = '1.0dev'
    55
    6 install_requires = [
     6install_requires =[
    77    'setuptools',
    88    'grok',
    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.uniben.browser.resources:waeup_custom
    9396      [console_scripts]
    9497      kofa-debug = grokcore.startup:interactive_debug_prompt

  • main/waeup.uniben/trunk/src/waeup/uniben

  • main/waeup.uniben/trunk/src/waeup/uniben/applicants/browser_templates/applicantdisplaypage.pt

    r10622 r11315  
    8686    Application Fee Payment Tickets
    8787</h3>
    88 <table i18n:domain="waeup.kofa">
     88<table i18n:domain="waeup.kofa" class="table table-condensed">
    8989  <thead>
    9090    <tr>
    … …  
    9999  <tbody>
    100100    <tr tal:repeat="value context/values">
    101       <td> <a tal:attributes="href value/__name__">
     101      <td> <a tal:attributes="href python:view.url(value)">
    102102      <span tal:content="value/p_id">PID</span></a></td>
    103103      <td tal:content="python: layout.formatDatetime(value.creation_date)">CREATION DATE</td>

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

    r8441 r11315  
    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('...Uniben 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/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser_templates/applicant_goto_interswitch.pt

    r9994 r11315  
    88
    99  <table class="form-table" i18n:domain="waeup.kofa">
    10     <thead>
    11     </thead>
    1210    <tbody>
    1311      <tr>
    … …  
    7169  <input type="hidden" name="payment_params" value="college_split" />
    7270  <span tal:replace="structure view/xml_data"></span>
     71  <br />
     72  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
    7373
    74   <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
     74  <br /><br />
     75
     76  <img src="/static/img/interswitch_verve_mastercard.gif" />
    7577
    7678</form>

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

    r9994 r11315  
    88
    99  <table class="form-table" i18n:domain="waeup.kofa">
    10     <thead>
    11     </thead>
    1210    <tbody>
    1311      <tr>
    … …  
    7169  <input type="hidden" name="payment_params" value="college_split" />
    7270  <span tal:replace="structure view/xml_data"></span>
     71  <br />
     72  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
    7373
    74   <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
     74  <br /><br />
     75
     76  <img src="/static/img/interswitch_verve_mastercard.gif" />
    7577
    7678</form>

  • main/waeup.uniben/trunk/src/waeup/uniben/students/browser_templates/studyleveleditpage.pt

    r10441 r11315  
    88      tal:replace="view/context/total_credits">TOTAL</span>)
    99  </h3>
    10   <table class="display dataTableManage">
     10  <table class="kofa-data-table dataTableManage">
    1111  <thead>
    1212    <tr>
    … …  
    2323  </thead>
    2424  <tbody>
    25     <tr tal:repeat="value view/translated_values" class="gradeC">
     25    <tr tal:repeat="value view/translated_values">
    2626       <td>
    2727        <input type="checkbox" name="val_id"
    … …  
    3030      </td>
    3131      <td tal:content="value/semester" nowrap>TERM</td>
    32       <td> <a tal:attributes="href value/__name__">
     32      <td> <a tal:attributes="href value/url">
    3333      <span tal:content="value/code">CODE</span>
    3434      </a></td>
    … …  
    4949    </span>
    5050  </div>
     51
    5152  <br /><br /><br />
    5253  <table class="input-table">

  • main/waeup.uniben/trunk/src/waeup/uniben/students/browser_templates/studylevelpage.pt

    r10441 r11315  
    11<table class="form-table" i18n:domain="waeup.kofa">
    2   <thead>
    3   </thead>
    42  <tbody>
    53    <tal:block repeat="widget view/widgets">
    … …  
    2018<h3 i18n:domain="waeup.kofa" i18n:translate="">Course Tickets</h3>
    2119
    22 <table class="display dataTable" i18n:domain="waeup.kofa">
     20<table class="kofa-data-table dataTable" i18n:domain="waeup.kofa">
    2321  <thead>
    2422    <tr>
    … …  
    3634  </thead>
    3735  <tbody>
    38     <tr tal:repeat="value view/translated_values" class="gradeC">
     36    <tr tal:repeat="value view/translated_values">
    3937      <td tal:content="value/semester" nowrap>TERM</td>
    40       <td> <a tal:attributes="href value/__name__">
     38      <td> <a tal:attributes="href value/url">
    4139      <span tal:content="value/code">CODE</span>
    4240      </a></td>

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

    r11247 r11315  
    77
    88[versions]
    9 waeup.kofa = 0.2.1
    10 kofacustom.nigeria = 0.1
    119collective.recipe.sphinxbuilder = 0.7.0
    1210hurry.workflow = 0.11
    … …  
    131129zope.testrunner = 4.3.3
    132130
    133 # Added by buildout at 2014-02-22 15:31:49.305644
     131# Added by buildout at 2014-02-20 19:40:23.862079
     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-20 22:05:37.029327
    134151zc.zodbrecipes = 2.0.0
Note: See TracChangeset for help on using the changeset viewer.