Changeset 11011


Ignore:
Timestamp:
30 Jan 2014, 13:59:56 (11 years ago)
Author:
Henrik Bettermann
Message:

More adjustments in applicants module.

Location:
main/waeup.kofa/branches/uli-diazo-themed
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/branches/uli-diazo-themed/layout/static/css/base.css

    r11009 r11011  
     1/* Customized Bootstrap styles */
     2
    13body {
    24    background-color: #f5f5f5;
    … …  
    2830}
    2931
    30 .wfstatus {
    31     float: right;
    32 }
    33 
    34 .kofa-sidebar,
    35 .kofa-content-narrow , .kofa-breadcrumbs-box {
    36     padding: 0px 5px 0px 5px;
    37 }
    38 
    39 .kofa-content-wide {
    40     padding: 5px 15px;
    41 }
    42 
    4332.well {
    4433    padding: 0px 5px 20px 5px;
    … …  
    4837}
    4938
     39.alert {
     40  margin-bottom: 10px;
     41  margin-top: 10px;
     42}
     43
     44.wfstatus {
     45    float: right;
     46}
     47
     48/* Kofa styles */
     49
     50.kofa-sidebar,
     51.kofa-content-narrow , .kofa-breadcrumbs-box {
     52    padding: 0px 5px 0px 5px;
     53}
     54
     55.kofa-content-wide {
     56    padding: 5px 15px;
     57}
     58
     59.workflow {
     60  border:1px solid #1fdf00;
     61  background-color:#bbffb6;
     62  font-family: courier;
     63  font-size: 100%;
     64  padding: 4px;
     65  margin-bottom: 8px;
     66  line-height: 16px;
     67}
     68
    5069.kofa-breadcrumbs-box .well {
    5170    padding: 5px 5px 5px 5px;
    … …  
    5978    color: #BFBFBF;
    6079    font-size: 18px;
    61 }
    62 
    63 .alert {
    64   margin-bottom: 10px;
    65   margin-top: 10px;
    6680}
    6781
    … …  
    128142    padding: 6px 12px;
    129143    transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
    130     width: 100%;
    131144    margin: 0px 4px 0px 0px;
     145    width: 100%;
    132146}
    133147
    … …  
    152166}
    153167
    154 .ordered-selection-field select , .inline-selection-field select,
    155 td select {
     168.ordered-selection-field select , .inline-selection-field select {
    156169    width: 100%;
    157170}

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

    r11010 r11011  
    655655        container = self.context.__parent__
    656656        payment = createObject(self.factory)
    657         error = applicants_utils.setPaymentDetails(
     657        failure = applicants_utils.setPaymentDetails(
    658658            container, payment, self.context)
    659         if error is not None:
    660             self.flash(error, type='danger')
     659        if failure is not None:
     660            self.flash(failure[0], type='danger')
    661661            self.redirect(self.url(self.context))
    662662            return
    … …  
    12091209    grok.name('index.html')
    12101210    grok.template('exportjobsindex')
    1211     label = _('Applicant Data Exports')
     1211    label = _('Data Exports')
    12121212    pnav = 3
    12131213

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants/browser_templates/applicantcontainerstatistics.pt

    r8643 r11011  
    11<tal:statistics define="stats context/statistics" i18n:domain="waeup.kofa">
    22  <h2 i18n:translate="">Container Statistics</h2>
    3   <table class="span8">
     3  <table class="table">
    44    <thead>
    55      <tr>
    … …  
    1717    </tbody>
    1818  </table>
    19   <table class="span8" tal:condition="python: stats[1]">
     19  <table class="table" tal:condition="python: stats[1]">
    2020    <thead>
    2121      <tr>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt

    r10353 r11011  
    4141    Application Fee Payment Tickets
    4242</h3>
    43 <table i18n:domain="waeup.kofa">
    44   <thead>
    45     <tr>
    46       <th i18n:translate="">Payment Id</th>
    47       <th i18n:translate="">Creation Date</th>
    48       <th i18n:translate="">Payment Date</th>
    49       <th i18n:translate="">Category</th>
    50       <th i18n:translate="">Item</th>
    51       <th i18n:translate="">State</th>
    52     </tr>
    53   </thead>
    54   <tbody>
    55     <tr tal:repeat="value context/values">
    56       <td> <a tal:attributes="href value/__name__">
    57       <span tal:content="value/p_id">PID</span></a></td>
    58       <td tal:content="python: layout.formatDatetime(value.creation_date)">CREATION DATE</td>
    59       <td tal:content="python: layout.formatDatetime(value.payment_date)">PAYMENT DATE</td>
    60       <td tal:content ="value/category">CATEGORY</td>
    61       <td tal:content ="value/display_item">ITEM</td>
    62       <td tal:content ="value/p_state_title">STATE</td>
    63     </tr>
    64   </tbody>
    65 </table>
     43<div class="table-responsive">
     44  <table i18n:domain="waeup.kofa" class="table table-condensed">
     45    <thead>
     46      <tr>
     47        <th i18n:translate="">Payment Id</th>
     48        <th i18n:translate="">Creation Date</th>
     49        <th i18n:translate="">Payment Date</th>
     50        <th i18n:translate="">Category</th>
     51        <th i18n:translate="">Item</th>
     52        <th i18n:translate="">State</th>
     53      </tr>
     54    </thead>
     55    <tbody>
     56      <tr tal:repeat="value context/values">
     57        <td> <a tal:attributes="href value/__name__">
     58        <span tal:content="value/p_id">PID</span></a></td>
     59        <td tal:content="python: layout.formatDatetime(value.creation_date)">CREATION DATE</td>
     60        <td tal:content="python: layout.formatDatetime(value.payment_date)">PAYMENT DATE</td>
     61        <td tal:content ="value/category">CATEGORY</td>
     62        <td tal:content ="value/display_item">ITEM</td>
     63        <td tal:content ="value/p_state_title">STATE</td>
     64      </tr>
     65    </tbody>
     66  </table>
     67</div>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt

    r10353 r11011  
    3838        <td class="fieldname" i18n:translate="">Password:</td>
    3939        <td>
    40           <input name="password" type="password"  />
     40          <input class="form-control" name="password" type="password"  />
    4141        </td>
    4242      </tr>
    … …  
    4444        <td class="fieldname" i18n:translate="">Retype Password:</td>
    4545        <td>
    46           <input name="control_password" type="password" />
     46          <input class="form-control" name="control_password" type="password" />
    4747        </td>
    4848      </tr>
    … …  
    8484  </h3>
    8585
    86   <table>
    87     <thead>
    88     <tr>
    89       <th>&nbsp;</th>
    90       <th i18n:translate="">Payment Id</th>
    91       <th i18n:translate="">Creation Date</th>
    92       <th i18n:translate="">Payment Date</th>
    93       <th i18n:translate="">Category</th>
    94       <th i18n:translate="">Item</th>
    95       <th i18n:translate="">State</th>
    96     </tr>
    97     </thead>
    98     <tbody>
    99       <tr tal:repeat="cl context/values">
    100          <td>
    101           <input type="checkbox"
    102                  name="val_id"
    103                  tal:attributes="value cl/__name__"
    104          tal:condition="python: not view.unremovable(cl)" />
    105         </td>
    106         <td> <a tal:attributes="href cl/__name__">
    107         <span tal:content="cl/p_id">PID</span></a></td>
    108         <td tal:content="python: layout.formatDatetime(cl.creation_date)">CREATION DATE</td>
    109         <td tal:content="python: layout.formatDatetime(cl.payment_date)">PAYMENT DATE</td>
    110       <td tal:content ="cl/category">CATEGORY</td>
    111       <td tal:content ="cl/display_item">ITEM</td>
    112       <td tal:content ="cl/p_state_title">STATE</td>
     86  <div class="table-responsive">
     87    <table i18n:domain="waeup.kofa" class="table table-condensed">
     88      <thead>
     89      <tr>
     90        <th>&nbsp;</th>
     91        <th i18n:translate="">Payment Id</th>
     92        <th i18n:translate="">Creation Date</th>
     93        <th i18n:translate="">Payment Date</th>
     94        <th i18n:translate="">Category</th>
     95        <th i18n:translate="">Item</th>
     96        <th i18n:translate="">State</th>
    11397      </tr>
    114     </tbody>
    115   </table>
     98      </thead>
     99      <tbody>
     100        <tr tal:repeat="cl context/values">
     101           <td>
     102            <input type="checkbox"
     103                 name="val_id"
     104                 tal:attributes="value cl/__name__"
     105           tal:condition="python: not view.unremovable(cl)" />
     106          </td>
     107          <td> <a tal:attributes="href cl/__name__">
     108          <span tal:content="cl/p_id">PID</span></a></td>
     109          <td tal:content="python: layout.formatDatetime(cl.creation_date)">CREATION DATE</td>
     110          <td tal:content="python: layout.formatDatetime(cl.payment_date)">PAYMENT DATE</td>
     111        <td tal:content ="cl/category">CATEGORY</td>
     112        <td tal:content ="cl/display_item">ITEM</td>
     113        <td tal:content ="cl/p_state_title">STATE</td>
     114        </tr>
     115      </tbody>
     116    </table>
     117  </div>
    116118
    117119  <div tal:condition="view/availableActions">

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants/browser_templates/applicantregemailsent.pt

    r8855 r11011  
    1919<tal:credentials condition = "view/password" i18n:domain="waeup.kofa">
    2020  <h3 i18n:translate="">Your login credentials are:</h3>
    21   <table class="bordered-table span6">
     21  <table class="table-bordered">
    2222    <tr>
    2323      <td i18n:translate="">User Name:</td>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants/browser_templates/applicantscontaineraddpage.pt

    r7737 r11011  
    11<form action="." tal:attributes="action request/URL" method="post"
    2   class="edit-form" enctype="multipart/form-data">
     2  enctype="multipart/form-data">
    33
    44  <table class="form-table">

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants/browser_templates/applicantscontainermanagepage.pt

    r9339 r11011  
    11<form action="." tal:attributes="action request/URL" method="POST"
    2   i18n:domain="waeup.kofa" class="edit-form" enctype="multipart/form-data">
     2  i18n:domain="waeup.kofa" enctype="multipart/form-data">
    33
    4   <ul class="tabs" data-tabs="tabs">
    5     <li tal:attributes="class view/tab1">
    6     <a href="#tab-1">
     4 <ul class="tabs nav nav-tabs" data-tabs="tabs">
     5    <li class="active">
     6    <a href="#tab1" data-toggle="tab">
    77      <span i18n:translate="">Settings
    88      </span></a>
    99    </li>
    10     <li tal:attributes="class view/tab2">
    11     <a href="#tab-2">
     10    <li>
     11    <a href="#tab2" data-toggle="tab">
    1212      <span i18n:translate="">Applicants
    1313      </span></a>
    1414    </li>
    15     <li tal:attributes="class view/tab3">
    16     <a href="#tab-3">
     15    <li>
     16    <a href="#tab3" data-toggle="tab">
    1717      <span i18n:translate="">Local Roles
    1818      </span></a>
    … …  
    2020  </ul>
    2121  <div class="tab-content">
    22     <div id="tab-1" tal:attributes="class view/tab1">
     22    <div id="tab1" class="active tab-pane">
     23      <br />
    2324      <table class="form-table">
    2425        <tbody>
    … …  
    3334      </div>
    3435    </div>
    35     <div id="tab-2" tal:attributes="class view/tab2">
     36    <div id="tab2" class="tab-pane">
    3637    <tal:showApplicants  condition="view/showApplicants">
    37     <input type="checkbox" onClick="toggle(this, 'val_id')" />
    38     <span  i18n:translate="">Select all</span>
    39     <br /><br />
    40 
    41       <table class="display dataTableManage">
     38      <br />
     39      <table class="dataTableManage">
    4240        <thead>
    4341          <tr>
    … …  
    5553        </thead>
    5654        <tbody>
    57           <tr class="gradeC" tal:repeat="appl context/values">
     55          <tr tal:repeat="appl context/values">
    5856            <td>
    5957              <input type="checkbox" name="val_id" tal:attributes="value appl/__name__" />
    … …  
    7876        </tbody>
    7977      </table>
     78      <input type="checkbox" onClick="toggle(this, 'val_id')" />
     79      <span  i18n:translate="">Select all</span>
     80      <br /><br />
    8081      <div tal:condition="view/availableActions">
    8182        <span tal:repeat="action view/actions" tal:omit-tag="">
    … …  
    100101    </tal:showNoApplicants>
    101102    </div>
    102     <div id="tab-3" tal:attributes="class view/tab3"> <br />
    103       <table class="display dataTableManage">
     103    <div id="tab3" class="tab-pane"> <br />
     104      <table class="dataTableManage">
    104105        <thead>
    105106          <tr>
    … …  
    115116        </thead>
    116117        <tbody>
    117           <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC"> <td>
     118          <tr tal:repeat="entry view/getUsersWithLocalRoles"> <td>
    118119              <input type="checkbox" name="role_id"
    119120                tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants/browser_templates/exportjobsindex.pt

    r10655 r11011  
    1 <table i18n:domain="waeup.kofa">
    2   <thead>
    3     <tr>
    4       <th i18n:translate="">Export Number</th>
    5       <th i18n:translate="">Exporter</th>
    6       <th i18n:translate="">Filter</th>
    7       <th i18n:translate="">Creator</th>
    8       <th i18n:translate="">Creation Date</th>
    9       <th i18n:translate="">Status</th>
    10       <th>&nbsp;</th>
    11     </tr>
    12   </thead>
    13   <tbody>
    14     <tr tal:repeat="job view/entries">
    15       <td>
    16         <span tal:replace="job/job">12</span>
    17       </td>
    18       <td>
    19         <span tal:replace="structure job/exporter">EXPORTER</span>
    20       </td>
    21       <td>
    22         <span tal:replace="structure job/args">ARGS</span>
    23       </td>
    24       <td>
    25         <span tal:replace="job/creator">CREATOR</span>
    26       </td>
    27       <td nowrap>
    28         <span tal:replace="job/start_time">DATETIME</span>
    29       </td>
    30       <td>
    31         <span tal:replace="job/status">STATUS</span>
    32       </td>
    33       <td nowrap>
    34         <a href="" class="btn" i18n:translate=""
    35            tal:condition="job/show_refresh_button">
    36           <img tal:attributes="src static/actionicon_reload.png" />
    37           Reload
    38         </a>
    39         <form method="POST">
    40           <a href="" class="btn primary small"
    41                  tal:attributes="href job/download_url"
    42                  tal:condition="job/show_download_button">
    43             Download</a>
     1<div class="table-responsive">
     2  <table i18n:domain="waeup.kofa" class="table table-condensed table-hover">
     3    <thead>
     4      <tr>
     5        <th i18n:translate="">Export Number</th>
     6        <th i18n:translate="">Exporter</th>
     7        <th i18n:translate="">Filter</th>
     8        <th i18n:translate="">Creator</th>
     9        <th i18n:translate="">Creation Date</th>
     10        <th i18n:translate="">Status</th>
     11        <th>&nbsp;</th>
     12      </tr>
     13    </thead>
     14    <tbody>
     15      <tr tal:repeat="job view/entries">
     16        <td>
     17          <span tal:replace="job/job">12</span>
     18        </td>
     19        <td>
     20          <span tal:replace="structure job/exporter">EXPORTER</span>
     21        </td>
     22        <td>
     23          <span tal:replace="structure job/args">ARGS</span>
     24        </td>
     25        <td>
     26          <span tal:replace="job/creator">CREATOR</span>
     27        </td>
     28        <td>
     29          <span tal:replace="job/start_time">DATETIME</span>
     30        </td>
     31        <td>
     32          <span tal:replace="job/status">STATUS</span>
     33        </td>
     34        <td nowrap>
     35          <a href="" class="btn btn-default btn-xs" i18n:translate=""
     36             tal:condition="job/show_refresh_button">
     37            <img tal:attributes="src static/actionicon_reload.png" />
     38            Reload
     39          </a>
     40          <form method="POST">
     41            <a href="" class="btn btn-primary btn-xs"
     42                   tal:attributes="href job/download_url"
     43                   tal:condition="job/show_download_button">
     44              Download</a>
     45            <input type="hidden" name="job_id"
     46                   tal:attributes="value job/job" />
     47            <input type="submit" class="btn btn-default btn-xs"
     48                   name="DISCARD" value="Discard"
     49                   tal:condition="job/show_discard_button" />
     50          </form>
     51        </td>
     52      </tr>
     53    </tbody>
     54  </table>
     55</div>
    4456
    45           <input type="hidden" name="job_id"
    46                  tal:attributes="value job/job" />
    47           <input type="submit" class="btn small"
    48                  name="DISCARD" value="Discard"
    49                  tal:condition="job/show_discard_button" />
    50         </form>
    51       </td>
    52     </tr>
    53   </tbody>
    54 </table>
    5557<form method="POST" i18n:domain="waeup.kofa">
    56   <div class="span12">
    57 
    58   </div>
    59   <input class="btn primary" type="submit" name="CREATE"
     58  <input class="btn btn-primary" type="submit" name="CREATE"
    6059         value="Start new export"
    6160          />

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants/utils.py

    r10843 r11011  
    5151            session_config = grok.getSite()['configuration'][session]
    5252        except KeyError:
    53             return _(u'Session configuration object is not available.')
     53            return _(u'Session configuration object is not available.'), None
    5454        payment.p_id = "p%s" % timestamp
    5555        payment.p_item = container.title

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

    r11006 r11011  
    6969          <span tal:replace="job/creator">CREATOR</span>
    7070        </td>
    71         <td nowrap>
     71        <td>
    7272          <span tal:replace="job/start_time">DATETIME</span>
    7373        </td>
Note: See TracChangeset for help on using the changeset viewer.