Ignore:
Timestamp:
22 Feb 2014, 20:41:35 (11 years ago)
Author:
uli
Message:

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

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

Legend:

Unmodified
Added
Removed

  • main/waeup.aaue/trunk

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

    r11219 r11291  
    22*******
    33
    4 0.1.1dev (unreleased)
    5 =====================
     41.0dev (unreleased)
     5===================
    66
    7 * No changes yet
     7* Diazofied whole package.
    88
    99

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

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

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

    r11205 r11291  
    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 = 7021
    5357zeo2_port = 7022
    54 zeo3_port = 7023
     58# zeo3_port = 7023
    5559server_port = 7020
    5660# default 7. Number of pre-opened ZODB threads/client
    … …  
    6266# number of preopened paster threads, default 10
    6367threadpool_workers = 10
     68devel_pkg = waeup.aaue
    6469
    6570[app]
    6671# This creates all scripts in bin/. The kofactl created here is 'faulty'.
    6772recipe = zc.recipe.egg
    68 eggs = waeup.aaue [beaker]
     73eggs = waeup.aaue [beaker, diazo]
    6974       z3c.evalexception>=2.0
    7075       Paste
    … …  
    8085# fixed path to zdaemon.conf as argument.
    8186recipe = zc.recipe.egg
    82 eggs = waeup.aaue [beaker]
     87eggs = waeup.aaue [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.aaue [beaker, diazo]

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

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

    r8508 r11291  
    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.aaue/trunk/etc/zeo2.conf.in

    r8508 r11291  
    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.aaue/trunk/setup.py

    r11219 r11291  
    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.aaue.browser.resources:waeup_custom
    9396      [console_scripts]
    9497      kofa-debug = grokcore.startup:interactive_debug_prompt

  • main/waeup.aaue/trunk/src/waeup/aaue

  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py

    r10929 r11291  
    3535    UG_OMIT_PDF_FIELDS,
    3636    UG_OMIT_MANAGE_FIELDS,
    37     UG_OMIT_EDIT_FIELDS,
    38     PG_OMIT_DISPLAY_FIELDS,
    39     PG_OMIT_PDF_FIELDS,
    40     PG_OMIT_MANAGE_FIELDS,
    41     PG_OMIT_EDIT_FIELDS)
     37    UG_OMIT_EDIT_FIELDS)
    4238from waeup.aaue.applicants.interfaces import (
    4339    ICustomApplicant,
    4440    ICustomUGApplicant,
    45     ICustomPGApplicant,
    46     ICustomPGApplicantEdit,
    47     ICustomUGApplicantEdit)
     41    ICustomUGApplicantEdit
     42    )
    4843
    49 UG_OMIT_PDF_FIELDS = [
    50     element for element in UG_OMIT_PDF_FIELDS if not element == 'phone']
     44UG_OMIT_PDF_FIELDS = tuple([
     45    element for element in UG_OMIT_PDF_FIELDS if not element == 'phone'])
    5146UG_OMIT_PDF_FIELDS += ('reg_number','alr_fname', 'alr_no', 'alr_date',
    5247    'alr_results', 'notice')
     48
     49FP_OMIT_FIELDS = ('hq_type', 'hq_fname', 'hq_matric_no',
     50     'hq_degree', 'hq_school', 'hq_session', 'hq_disc')
     51FP_OMIT_DISPLAY_FIELDS = UG_OMIT_DISPLAY_FIELDS + FP_OMIT_FIELDS
     52FP_OMIT_PDF_FIELDS = UG_OMIT_PDF_FIELDS + FP_OMIT_FIELDS
     53FP_OMIT_MANAGE_FIELDS = UG_OMIT_MANAGE_FIELDS + FP_OMIT_FIELDS
     54FP_OMIT_EDIT_FIELDS = UG_OMIT_EDIT_FIELDS + FP_OMIT_FIELDS
    5355
    5456class CustomApplicantDisplayFormPage(NigeriaApplicantDisplayFormPage):
    … …  
    5860    @property
    5961    def form_fields(self):
    60         if self.target is not None and self.target.startswith('pg'):
    61             form_fields = grok.AutoFields(ICustomPGApplicant)
    62             for field in PG_OMIT_DISPLAY_FIELDS:
     62        form_fields = grok.AutoFields(ICustomUGApplicant)
     63        if self.target is not None and self.target.startswith('fp'):
     64            for field in FP_OMIT_DISPLAY_FIELDS:
    6365                form_fields = form_fields.omit(field)
    6466        else:
    65             form_fields = grok.AutoFields(ICustomUGApplicant)
    6667            for field in UG_OMIT_DISPLAY_FIELDS:
    6768                form_fields = form_fields.omit(field)
    … …  
    104105    @property
    105106    def form_fields(self):
    106         if self.target is not None and self.target.startswith('pg'):
    107             form_fields = grok.AutoFields(ICustomPGApplicant)
    108             for field in PG_OMIT_PDF_FIELDS:
     107        form_fields = grok.AutoFields(ICustomUGApplicant)
     108        if self.target is not None and self.target.startswith('fp'):
     109            for field in FP_OMIT_PDF_FIELDS:
    109110                form_fields = form_fields.omit(field)
    110111        else:
    111             form_fields = grok.AutoFields(ICustomUGApplicant)
    112112            for field in UG_OMIT_PDF_FIELDS:
    113113                form_fields = form_fields.omit(field)
    … …  
    128128    @property
    129129    def form_fields(self):
    130         if self.target is not None and self.target.startswith('pg'):
    131             form_fields = grok.AutoFields(ICustomPGApplicant)
    132             for field in PG_OMIT_MANAGE_FIELDS:
     130        form_fields = grok.AutoFields(ICustomUGApplicant)
     131        if self.target is not None and self.target.startswith('fp'):
     132            for field in FP_OMIT_MANAGE_FIELDS:
    133133                form_fields = form_fields.omit(field)
    134134        else:
    135             form_fields = grok.AutoFields(ICustomUGApplicant)
    136135            for field in UG_OMIT_MANAGE_FIELDS:
    137136                form_fields = form_fields.omit(field)
    … …  
    146145    @property
    147146    def form_fields(self):
    148         if self.target is not None and self.target.startswith('pg'):
    149             form_fields = grok.AutoFields(ICustomPGApplicantEdit)
    150             for field in PG_OMIT_EDIT_FIELDS:
     147        form_fields = grok.AutoFields(ICustomUGApplicantEdit)
     148        if self.target is not None and self.target.startswith('fp'):
     149            for field in FP_OMIT_EDIT_FIELDS:
    151150                form_fields = form_fields.omit(field)
    152151        else:
    153             form_fields = grok.AutoFields(ICustomUGApplicantEdit)
    154152            for field in UG_OMIT_EDIT_FIELDS:
    155153                form_fields = form_fields.omit(field)

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

    r8444 r11291  
    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('...AAUE 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.aaue/trunk/src/waeup/aaue/etranzact/browser.py

    r10983 r11291  
    271271    label = _('Requery eTranzact History')
    272272    action = 'query_history'
     273    placeholder = _('Confirmation Number (PIN)')
    273274
    274275class EtranzactEnterPinPageApplicant(EtranzactEnterPinPageStudent):

  • main/waeup.aaue/trunk/src/waeup/aaue/etranzact/browser_templates/enterpin.pt

    r9853 r11291  
    1 <form tal:attributes="action view/action"
    2     method="POST" i18n:domain="waeup.aaue">
    3   <table class="form-table">
    4     <tbody>
    5       <tr>
    6         <td i18n:translate="">
    7         Confirmation Number (PIN):
    8         </td>
    9         <td>
    10         <input name="confirmation_number" type="text" class="span5" maxlength=""
    11                value="" />
    12         </td>
    13       </tr>
    14       <tr>
    15         <td colspan="2">
    16           <input type="submit" name="SUBMIT" class="btn primary"
    17                  tal:attributes="value view/buttonname" />
    18         </td>
    19       </tr>
    20     </tbody>
    21   </table>
     1<form method="POST" class="form-inline" tal:attributes="action view/action">
     2<br />
     3  <div class="form-group half">
     4    <input name="confirmation_number" type="text" class="form-control" maxlength=""
     5           value="" tal:attributes="placeholder view/placeholder"/>
     6  </div>
     7  <div class="form-group">
     8    <input type="submit" name="SUBMIT" class="btn btn-primary"
     9           tal:attributes="value view/buttonname" />
     10  </div>
    2211</form>

  • main/waeup.aaue/trunk/src/waeup/aaue/etranzact/tests.py

    r10978 r11291  
    7171        self.browser.getLink("Query eTranzact History").click()
    7272        self.assertMatches(
    73             '...Confirmation Number (PIN):...',
     73            '...Confirmation Number (PIN)...',
    7474            self.browser.contents)
    7575

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

    r11205 r11291  
    130130zope.testrunner = 4.3.3
    131131
    132 # Added by buildout at 2014-02-22 14:04:04.735203
     132# Added by buildout at 2014-02-14 13:34:56.813338
     133WebOb = 1.3.1
     134diazo = 1.0.5
     135repoze.xmliter = 0.5
     136z3c.recipe.staticlxml = 0.10
    133137
    134138# Required by:
    135 # waeup.kofa==0.2dev
    136 PIL = 1.1.7
     139# diazo==1.0.5
     140experimental.cssselect = 0.3
    137141
    138 # Added by buildout at 2014-02-22 14:08:06.131262
     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 09:22:50.503061
    139152zc.zodbrecipes = 2.0.0
Note: See TracChangeset for help on using the changeset viewer.