Ignore:
Timestamp:
12 Jan 2012, 16:19:57 (13 years ago)
Author:
Henrik Bettermann
Message:

Merge Bootstrap branch into trunk.

Location:
main/waeup.sirp/trunk/src/waeup/sirp/accesscodes
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.py

    r7321 r7459  
    3232    )
    3333from waeup.sirp.accesscodes.catalog import search
     34from waeup.sirp.browser.layout import action
    3435
    3536grok.context(ISIRPObject)
    … …  
    6667    grok.require('waeup.manageACBatches')
    6768
    68     title = 'Create Access Code Batch'
     69    label = 'Create Access Code Batch'
    6970    pnav = 0
    7071
    … …  
    7273        'prefix', 'entry_num', 'cost')
    7374
    74     @grok.action('Cancel')
     75    @action('Cancel')
    7576    def cancel(self, *args, **kw):
    7677        self.flash('Batch creation cancelled.')
    7778        self.redirect(self.url(self.context))
    7879
    79     @grok.action('Create batch')
     80    @action('Create batch')
    8081    def createBatch(self, **data):
    8182        creator = self.request.principal.id

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.txt

    r7372 r7459  
    5858    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    5959    ...
    60     <h2>Access Code Batches</h2>
     60    ...<h2>Access Code Batches</h2>
    6161    ...
    6262    ... The following batches are available:
    … …  
    106106    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    107107    ...
    108     <h2>Access Code Batches</h2>
     108    ...<h2>Access Code Batches</h2>
    109109    ...
    110110    ... The following batches are available:
    … …  
    155155    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    156156    ...
    157     <li ...>Archived APP-2 (APP-2_archive-...-zope.mgr.csv)</li>
     157    <div ...>Archived APP-2 (APP-2_archive-...-zope.mgr.csv)</div>
    158158    ...
    159159
    … …  
    165165    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    166166    ...
    167     <li ...>No batch selected.</li>
     167    <div ...>No batch selected.</div>
    168168    ...
    169169
    … …  
    345345    >>> print browser.contents
    346346    <!DOCTYPE html ...
    347     <li class="message">APP-1-<10-DIGITS> disabled.</li>
     347    ...APP-1-<10-DIGITS> disabled.</div>
    348348    ...
    349349
    … …  
    355355    >>> print browser.contents
    356356    <!DOCTYPE html ...
    357     <li ...>APP-1-<10-DIGITS>: Disable transition not allowed.</li>
     357    <div ...>APP-1-<10-DIGITS>: Disable transition not allowed.</div>
    358358    ...
    359359
    … …  
    365365    >>> print browser.contents
    366366    <!DOCTYPE html ...
    367     <li class="message">APP-1-<10-DIGITS> (re-)enabled.</li>
     367    ...APP-1-<10-DIGITS> (re-)enabled.</div>
    368368    ...
    369369
    … …  
    375375    >>> print browser.contents
    376376    <!DOCTYPE html ...
    377     <li ...>APP-1-<10-DIGITS>: Re-enable transition not allowed.</li>
     377    <div ...>APP-1-<10-DIGITS>: Re-enable transition not allowed.</div>
    378378    ...
    379379

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/admintaskacbatches.pt

    r5082 r7459  
    22<a href=""
    33   tal:attributes="href viewlet/link_target"
    4    tal:content="viewlet/link_title">Manage Users</a>
     4   tal:content="viewlet/link_title">Manage</a>
    55</p>

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/batchcontainer.pt

    r7198 r7459  
    1515    </thead>
    1616    <tbody>
    17       <tr tal:repeat="batch context/values"
    18     tal:attributes="class python: repeat['batch'].odd() and 'even' or 'odd'">
     17      <tr tal:repeat="batch context/values">
    1918  <td>
    2019    <input type="checkbox" name="batches" value="batch/prefix"
    … …  
    4241    </tbody>
    4342  </table>
    44   <input type="submit" name="archive" value="Archive" />
    45   <input type="submit" name="delete" value="Archive and Delete" />
     43  <input type="submit" class="btn" name="archive" value="Archive" />
     44  <input type="submit" class="btn" name="delete" value="Archive and Delete" />
    4645</form>

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/reimportbatchpage.pt

    r7198 r7459  
    11<h3>Reimport Access Code Batches</h3>
    2 <p>
    3   Please select the files to reimport. Please note, that batches with
    4   same name have to be deleted before.
     2<p> Please select the files to reimport. Please note, that batches with  same name have to be deleted before.
    53</p>
    64<form method="POST">
    … …  
    86    <thead>
    97      <tr>
    10         <th>&nbsp;</th>
    11   <th>File</th>
     8        <th>&nbsp;
     9        </th>
     10        <th>File
     11        </th>
    1212      </tr>
    1313    </thead>
    1414    <tbody>
    15       <tr tal:repeat="filename context/getImportFiles"
    16     tal:attributes="class python: repeat['filename'].odd() and 'even' or 'odd'">
    17   <td>
    18     <input type="checkbox" name="filenames" value="filename"
    19      tal:attributes="value filename" />
    20   </td>
    21   <td tal:content="filename">file.name</td>
     15      <tr tal:repeat="filename context/getImportFiles"  tal:attributes="class python: repeat['filename'].odd() and 'even' or 'odd'"> <td>
     16          <input type="checkbox" name="filenames" value="filename"  tal:attributes="value filename" /> </td>
     17        <td tal:content="filename">file.name</td>
    2218      </tr>
    2319      <tr tal:condition="python: len(list(context.getImportFiles())) == 0">
    24   <td colspan="5"><b>No import batches available</b></td>
     20        <td colspan="5"><b>No import batches available</b></td>
    2521      </tr>
    2622    </tbody>
    2723  </table>
    28 
    29   <input type="submit" name="cancel" value="Cancel" />
    30   <input type="submit" name="reimport" value="Reimport" />
     24  <input type="submit" class="btn primary" name="reimport" value="Reimport" />
     25  <input type="submit" class="btn" name="cancel" value="Cancel" />
    3126</form>

  • main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/searchpage.pt

    r7198 r7459  
    33<br />
    44
    5   <input type="submit" name="search" value="Search" />
     5  <input type="submit" class="btn primary" name="search" value="Search" />
    66  for access codes
    77
    … …  
    4646      </tbody>
    4747    </table>
    48     <div class="actionButtons">
    49         <input type="submit" name="disable" value="Disable ACs" />
    50         <input type="submit" name="enable" value="Enable ACs" />
     48    <div>
     49      <input type="submit" class="btn" name="disable" value="Disable ACs" />
     50      <input type="submit" class="btn" name="enable" value="Enable ACs" />
    5151    </div>
    5252
Note: See TracChangeset for help on using the changeset viewer.