Changeset 11006 for main


Ignore:
Timestamp:
30 Jan 2014, 10:07:29 (11 years ago)
Author:
Henrik Bettermann
Message:

Remove datatable.need.

Add cancel buttons.

Location:
main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/pages.py

    r11005 r11006  
    5252from waeup.kofa.browser.layout import jsaction, action, UtilityView
    5353from waeup.kofa.browser.resources import (
    54     warning, tabs, datatable)
     54    warning, tabs)
    5555from waeup.kofa.interfaces import MessageFactory as _
    5656from waeup.kofa.interfaces import(
    … …  
    530530
    531531    def update(self, userid=None, adduser=None, manage=None, delete=None):
    532         datatable.need()
    533532        if manage is not None and userid is not None:
    534533            self.redirect(self.url(userid) + '/@@manage')
    … …  
    746745
    747746    def update(self, *args, **kw):
    748         datatable.need()
    749747        form = self.request.form
    750748        self.hitlist = []
    … …  
    791789
    792790    def update(self):
    793         datatable.need()
    794791        warning.need()
    795792        return super(ConfigurationContainerManageFormPage, self).update()
    … …  
    903900
    904901    def update(self):
    905         datatable.need()
    906902        warning.need()
    907903        return super(DatacenterPage, self).update()
    … …  
    940936    label = _(u'Processed Files')
    941937    pnav = 0
    942 
    943     def update(self):
    944         datatable.need()
     938    cancel_button =_('Back to Data Center')
     939
     940    def update(self, CANCEL=None):
     941        if CANCEL is not None:
     942            self.redirect(self.url(self.context))
     943            return
    945944        return super(DatacenterFinishedPage, self).update()
    946945
    … …  
    953952    max_files = 20
    954953    upload_button =_(u'Upload')
    955     cancel_button =_(u'Cancel')
     954    cancel_button =_(u'Back to Data Center')
    956955
    957956    def getPreviewHeader(self):
    … …  
    13851384
    13861385    def update(self, headerfield=None, back2=None, cancel=None, proceed=None):
    1387         datatable.need()
    13881386        session = ISession(self.request)['waeup.kofa']
    13891387        self.filename = session.get('import_filename', None)
    … …  
    15801578    pnav = 0
    15811579    export_button = _(u'Create CSV file')
     1580    cancel_button =_(u'Back to Data Center')
    15821581
    15831582    def getExporters(self):
    … …  
    15911590        return sorted(title_name_tuples)
    15921591
    1593     def update(self, CREATE=None, DISCARD=None, exporter=None, job_id=None):
     1592    def update(self, CREATE=None, DISCARD=None, exporter=None,
     1593               job_id=None, CANCEL=None):
     1594        if CANCEL is not None:
     1595            self.redirect(self.url(self.context))
     1596            return
    15941597        if CREATE:
    15951598            job_id = self.context.start_export_job(
    … …  
    18051808    def update(self):
    18061809        warning.need()
    1807         datatable.need()
    18081810        return super(FacultyManageFormPage, self).update()
    18091811
    … …  
    18691871
    18701872    def update(self, *args, **kw):
    1871         datatable.need()
    18721873        form = self.request.form
    18731874        self.hitlist = []
    … …  
    19331934
    19341935    def update(self):
    1935         datatable.need()
    19361936        super(DepartmentPage, self).update()
    19371937        return
    … …  
    19891989    def update(self):
    19901990        warning.need()
    1991         datatable.need()
    19921991        super(DepartmentManageFormPage, self).update()
    19931992        return
    … …  
    21512150    def update(self):
    21522151        warning.need()
    2153         datatable.need()
    21542152        return super(CourseManageFormPage, self).update()
    21552153
    … …  
    21892187
    21902188    def update(self):
    2191         datatable.need()
    21922189        return super(CertificatePage, self).update()
    21932190
    … …  
    22182215    def update(self):
    22192216        warning.need()
    2220         datatable.need()
    22212217        return super(CertificateManageFormPage, self).update()
    22222218

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/datacenterexportpage.pt

    r9841 r11006  
    88<br />
    99
    10 <form  method="POST">
     10<form  method="POST" class="form-inline">
    1111  <label for="exporter">
    1212    Exporter (Data Type):
    1313  </label>
    14   <div class="input">
     14  <div class="form-group">
    1515    <select name="exporter">
    1616      <span tal:repeat="items view/getExporters" tal:omit-tag="">
    … …  
    2323    </select>
    2424  </div>
    25   <br />
    26   <div class="input">
    27     <input i18n:translate="" type="submit" class="btn primary"
     25  <div class="form-group">
     26    <input i18n:translate="" type="submit" class="btn btn-primary"
    2827      name="CREATE" tal:attributes="value view/export_button" />
     28  </div>
     29  <div class="form-group">
     30  <input type="submit" name="CANCEL" class="btn btn-default"
     31      tal:attributes="value view/cancel_button" />
    2932  </div>
    3033</form>
    … …  
    3942<br /><br />
    4043
    41 <table i18n:domain="waeup.kofa">
    42   <thead>
    43     <tr>
    44       <th i18n:translate="">Export Number</th>
    45       <th i18n:translate="">Exporter</th>
    46       <th i18n:translate="">Filter</th>
    47       <th i18n:translate="">Creator</th>
    48       <th i18n:translate="">Creation Date</th>
    49       <th i18n:translate="">Status</th>
    50       <th>&nbsp;</th>
    51     </tr>
    52   </thead>
    53   <tbody>
    54     <tr tal:repeat="job view/entries">
    55       <td>
    56         <span tal:replace="job/job">12</span>
    57       </td>
    58       <td>
    59         <span tal:replace="structure job/exporter">EXPORTER</span>
    60       </td>
    61       <td>
    62         <span tal:replace="structure job/args">ARGS</span>
    63       </td>
    64       <td>
    65         <span tal:replace="job/creator">CREATOR</span>
    66       </td>
    67       <td nowrap>
    68         <span tal:replace="job/start_time">DATETIME</span>
    69       </td>
    70       <td>
    71         <span tal:replace="job/status">STATUS</span>
    72       </td>
    73       <td nowrap>
    74         <a href="" class="btn small" i18n:translate=""
    75            tal:condition="job/show_refresh_button">
    76           <img tal:attributes="src static/actionicon_reload.png" />
    77           Reload
    78         </a>
    79         <form method="POST">
    80           <a href="" class="btn primary small"
    81                  tal:attributes="href job/download_url"
    82                  tal:condition="job/show_download_button">
    83             Download</a>
    84 
    85           <input type="hidden" name="job_id"
    86                  tal:attributes="value job/job" />
    87           <input type="submit" class="btn small"
    88                  name="DISCARD" value="Discard"
    89                  tal:condition="job/show_discard_button" />
    90         </form>
    91       </td>
    92     </tr>
    93   </tbody>
    94 </table>
     44<div class="table-responsive">
     45  <table i18n:domain="waeup.kofa" class="table table-condensed table-hover">
     46    <thead>
     47      <tr>
     48        <th i18n:translate="">Export Number</th>
     49        <th i18n:translate="">Exporter</th>
     50        <th i18n:translate="">Filter</th>
     51        <th i18n:translate="">Creator</th>
     52        <th i18n:translate="">Creation Date</th>
     53        <th i18n:translate="">Status</th>
     54        <th>&nbsp;</th>
     55      </tr>
     56    </thead>
     57    <tbody>
     58      <tr tal:repeat="job view/entries">
     59        <td>
     60          <span tal:replace="job/job">12</span>
     61        </td>
     62        <td>
     63          <span tal:replace="structure job/exporter">EXPORTER</span>
     64        </td>
     65        <td>
     66          <span tal:replace="structure job/args">ARGS</span>
     67        </td>
     68        <td>
     69          <span tal:replace="job/creator">CREATOR</span>
     70        </td>
     71        <td nowrap>
     72          <span tal:replace="job/start_time">DATETIME</span>
     73        </td>
     74        <td>
     75          <span tal:replace="job/status">STATUS</span>
     76        </td>
     77        <td nowrap>
     78          <a href="" class="btn btn-default btn-xs" i18n:translate=""
     79             tal:condition="job/show_refresh_button">
     80            <img tal:attributes="src static/actionicon_reload.png" />
     81            Reload
     82          </a>
     83          <form method="POST">
     84            <a href="" class="btn btn-primary btn-xs"
     85                   tal:attributes="href job/download_url"
     86                   tal:condition="job/show_download_button">
     87              Download</a>
     88            <input type="hidden" name="job_id"
     89                   tal:attributes="value job/job" />
     90            <input type="submit" class="btn btn-default btn-xs"
     91                   name="DISCARD" value="Discard"
     92                   tal:condition="job/show_discard_button" />
     93          </form>
     94        </td>
     95      </tr>
     96    </tbody>
     97  </table>
     98</div>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/datacenterfinishedpage.pt

    r10999 r11006  
    2121  </tbody>
    2222</table>
     23<form method="POST">
     24  <input i18n:translate="" type="submit" class="btn btn-default" name="CANCEL"
     25      tal:attributes="value view/cancel_button"/>
     26</form>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/datacenteruploadpage.pt

    r11005 r11006  
    4444      </td>
    4545    </tr>
    46     <tr>
    47       <td>
    48         <input class="btn btn-primary" type="submit" name="SUBMIT"
    49             tal:attributes="value view/upload_button" />
    50         <input class="btn btn-default" type="submit" name="CANCEL"
    51             tal:attributes="value view/cancel_button"/>
    52       </td>
    53       <td>
    54       </td>
    55     </tr>
    5646  </table>
     47  <br />
     48  <input class="btn btn-primary" type="submit" name="SUBMIT"
     49      tal:attributes="value view/upload_button" />
     50  <input class="btn btn-default" type="submit" name="CANCEL"
     51      tal:attributes="value view/cancel_button"/>
    5752</form>
    58 
     53<br />
    5954<p i18n:translate="">
    6055    Import managers will be automatically informed by email after file upload.
Note: See TracChangeset for help on using the changeset viewer.