Changeset 11025


Ignore:
Timestamp:
1 Feb 2014, 08:20:23 (11 years ago)
Author:
Henrik Bettermann
Message:

Adjust reports and export pages.

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

Legend:

Unmodified
Added
Removed

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

    r9643 r11025  
    88  </p>
    99  <br />
    10   <div class="clearfix">
    11     <label for="generator">Report Type:</label>
    12     <div class="input">
    13       <select name="generator">
    14         <span tal:repeat="items view/creators" tal:omit-tag="">
    15           <option
    16               tal:define="name python: items[1]; title python: items[0]"
    17               tal:attributes="value name">
    18             <span tal:replace="title">TITLE</span>
    19           </option>
    20         </span>
    21       </select>
    22       <div class="help-inline" i18n:translate="">
    23         Type of report to create
    24       </div>
    25     </div>
     10  <div class="form-group">
     11    <label for="generator">Report Type</label>
     12    <select name="generator" class="form-control">
     13      <span tal:repeat="items view/creators" tal:omit-tag="">
     14        <option
     15            tal:define="name python: items[1]; title python: items[0]"
     16            tal:attributes="value name">
     17          <span tal:replace="title">TITLE</span>
     18        </option>
     19      </span>
     20    </select>
    2621  </div>
    27   <div class="input">
    28     <input i18n:translate="" type="submit" class="btn primary"
     22  <div class="form-group">
     23    <input i18n:translate="" type="submit" class="btn btn-primary"
    2924           name="START_GENERATOR" value="Configure" />
    30     <a class="btn secondary" href=""
     25    <a class="btn btn-default" href=""
    3126       tal:attributes="href python:view.url(context)">Cancel</a>
    3227  </div>

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

    r9840 r11025  
    1 <table i18n:domain="waeup.kofa">
     1<table i18n:domain="waeup.kofa" class="table">
    22  <thead>
    33    <tr>
    … …  
    3131          <input type="hidden" name="job_id"
    3232                 tal:attributes="value python: entry[0]" />
    33           <input type="submit" class="btn small primary"
     33          <input type="submit" class="btn btn-sm btn-primary"
    3434                 name="DOWNLOAD" value="Download"
    3535                 tal:condition="python: entry[4]" />
    36           <input type="submit" class="btn small secondary"
     36          <input type="submit" class="btn btn-sm btn-default"
    3737                 name="DISCARD" value="Discard"
    3838                 tal:condition="python: entry[3]" />
    39           <a href="" class="btn" i18n:translate=""
     39          <a href="" class="btn btn-sm btn-default" i18n:translate=""
    4040             tal:condition="python: entry[5]">
    4141            <img tal:attributes="src static/actionicon_reload.png" />
    … …  
    4848</table>
    4949<form method="POST" i18n:domain="waeup.kofa">
    50   <div class="span12">
    51     <a href="create" class="btn primary" i18n:translate="">
    52       Create new report
    53     </a>
    54   </div>
     50  <a tal:attributes="href python:view.url(context, 'create')"
     51     class="btn btn-primary" i18n:translate="">
     52    Create new report
     53  </a>
    5554</form>

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

    r11016 r11025  
    120120        value._p_activate()
    121121        value_dict = dict([i for i in value.__dict__.items()])
     122        value_dict['url'] = view.url(value)
    122123        value_dict['removable_by_student'] = value.removable_by_student
    123124        value_dict['mandatory'] = translate(str(value.mandatory), 'zope',

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/browser_templates/exportconfig.pt

    r10390 r11025  
    1 <p class="alert-message warning"  i18n:domain="waeup.kofa"
     1<p class="alert alert-warning"  i18n:domain="waeup.kofa"
    22   i18n:translate="student_export_warning">
    33  <strong>NOTICE:</strong>
    … …  
    1212<form i18n:domain="waeup.kofa" method="POST">
    1313  <label for="mode" i18n:translate="">
    14     Exporter (Data Type):
     14    Exporter (Data Type)
    1515  </label>
    16   <div class="input">
    17     <select name="exporter">
    18       <option tal:repeat="item view/exporters"
    19               tal:attributes="value python:item[1]">
    20         <span tal:replace="python: item[0]">Students</span>
    21       </option>
    22     </select>
    23   </div>
     16  <select name="exporter" class="form-control">
     17    <option tal:repeat="item view/exporters"
     18            tal:attributes="value python:item[1]">
     19      <span tal:replace="python: item[0]">Students</span>
     20    </option>
     21  </select>
    2422  <br />
    2523  <label for="session" i18n:translate="">
    26     Current Session:
     24    Current Session
    2725  </label>
    28   <div class="input">
    29     <select name="session">
    30       <option tal:repeat="item view/sessions"
    31               tal:attributes="value python:item[1]">
    32         <span tal:replace="python: item[0]">2012/2013</span>
    33       </option>
    34     </select>
    35   </div>
     26  <select name="session" class="form-control">
     27    <option tal:repeat="item view/sessions"
     28            tal:attributes="value python:item[1]">
     29      <span tal:replace="python: item[0]">2012/2013</span>
     30    </option>
     31  </select>
    3632  <br />
    3733  <label for="level" i18n:translate="">
    38     Current Level:
     34    Current Level
    3935  </label>
    40   <div class="input">
    41     <select name="level">
    42       <option tal:repeat="item view/levels"
    43               tal:attributes="value python:item[1]">
    44         <span tal:replace="python: item[0]">200</span>
    45       </option>
    46     </select>
    47   </div>
     36  <select name="level" class="form-control">
     37    <option tal:repeat="item view/levels"
     38            tal:attributes="value python:item[1]">
     39      <span tal:replace="python: item[0]">200</span>
     40    </option>
     41  </select>
    4842  <br />
    4943  <label for="mode" i18n:translate="">
    50     Current Study Mode:
     44    Current Study Mode
    5145  </label>
    52   <div class="input">
    53     <select name="mode">
    54       <option tal:repeat="item view/modes"
    55               tal:attributes="value python:item[1]">
    56         <span tal:replace="python: item[0]">ug_ft</span>
    57       </option>
    58     </select>
    59   </div>
     46  <select name="mode" class="form-control">
     47    <option tal:repeat="item view/modes"
     48            tal:attributes="value python:item[1]">
     49      <span tal:replace="python: item[0]">ug_ft</span>
     50    </option>
     51  </select>
    6052  <br /><br />
    61   <div class="input">
    6253  <input type="submit" name="START"  i18n:translate=""
    6354    value="Create CSV file"
    64     class="btn primary" />
    65   </div>
     55    class="btn btn-primary" />
    6656</form>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/browser_templates/exportconfig_certificate.pt

    r10390 r11025  
    1 <p class="alert-message warning"  i18n:domain="waeup.kofa"
     1<p class="alert alert-warning"  i18n:domain="waeup.kofa"
    22   i18n:translate="student_export_warning">
    33  <strong>NOTICE:</strong>
    … …  
    1212<form i18n:domain="waeup.kofa" method="POST">
    1313  <label for="mode" i18n:translate="">
    14     Exporter (Data Type):
     14    Exporter (Data Type)
    1515  </label>
    16   <div class="input">
    17     <select name="exporter">
    18       <option tal:repeat="item view/exporters"
    19               tal:attributes="value python:item[1]">
    20         <span tal:replace="python: item[0]">Students</span>
    21       </option>
    22     </select>
    23   </div>
     16  <select name="exporter" class="form-control">
     17    <option tal:repeat="item view/exporters"
     18            tal:attributes="value python:item[1]">
     19      <span tal:replace="python: item[0]">Students</span>
     20    </option>
     21  </select>
    2422  <br />
    2523  <label for="session" i18n:translate="">
    26     Current Session:
     24    Current Session
    2725  </label>
    28   <div class="input">
    29     <select name="session">
    30       <option tal:repeat="item view/sessions"
    31               tal:attributes="value python:item[1]">
    32         <span tal:replace="python: item[0]">2012/2013</span>
    33       </option>
    34     </select>
    35   </div>
     26  <select name="session" class="form-control">
     27    <option tal:repeat="item view/sessions"
     28            tal:attributes="value python:item[1]">
     29      <span tal:replace="python: item[0]">2012/2013</span>
     30    </option>
     31  </select>
    3632  <br />
    3733  <label for="level" i18n:translate="">
    38     Current Level:
     34    Current Level
    3935  </label>
    40   <div class="input">
    41     <select name="level">
    42       <option tal:repeat="item view/levels"
    43               tal:attributes="value python:item[1]">
    44         <span tal:replace="python: item[0]">200</span>
    45       </option>
    46     </select>
    47   </div>
     36  <select name="level" class="form-control">
     37    <option tal:repeat="item view/levels"
     38            tal:attributes="value python:item[1]">
     39      <span tal:replace="python: item[0]">200</span>
     40    </option>
     41  </select>
    4842  <br /><br />
    49   <div class="input">
    5043  <input type="submit" name="START"  i18n:translate=""
    5144    value="Create CSV file"
    52     class="btn primary" />
    53   </div>
     45    class="btn btn-primary" />
    5446</form>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/browser_templates/exportconfig_course.pt

    r9843 r11025  
     1<p class="alert alert-warning"  i18n:domain="waeup.kofa"
     2   i18n:translate="student_export_warning">
     3  <strong>NOTICE:</strong>
     4  Student data exports are very computation intensive.
     5  Depending on the filter selected and the portal traffic load, exports may take
     6  longer than 15 minutes. You are advised to export data outside high-traffic
     7  time periods.
     8</p>
     9
     10<br />
     11
    112<form i18n:domain="waeup.kofa" method="POST">
    213  <label for="mode" i18n:translate="">
    3     Exporter (Data Type):
     14    Exporter (Data Type)
    415  </label>
    5   <div class="input">
    6     <select name="exporter">
    7       <option tal:repeat="item view/exporters"
    8               tal:attributes="value python:item[1]">
    9         <span tal:replace="python: item[0]">Students</span>
    10       </option>
    11     </select>
    12   </div>
     16  <select name="exporter" class="form-control">
     17    <option tal:repeat="item view/exporters"
     18            tal:attributes="value python:item[1]">
     19      <span tal:replace="python: item[0]">Students</span>
     20    </option>
     21  </select>
    1322  <br />
    1423  <label for="session" i18n:translate="">
    15     Level Session:
     24    Level Session
    1625  </label>
    17   <div class="input">
    18     <select name="session">
    19       <option tal:repeat="item view/sessions"
    20               tal:attributes="value python:item[1]">
    21         <span tal:replace="python: item[0]">2012/2013</span>
    22       </option>
    23     </select>
    24   </div>
     26  <select name="session" class="form-control">
     27    <option tal:repeat="item view/sessions"
     28            tal:attributes="value python:item[1]">
     29      <span tal:replace="python: item[0]">2012/2013</span>
     30    </option>
     31  </select>
    2532  <br />
    2633  <label for="level" i18n:translate="">
    27     Level:
     34    Level
    2835  </label>
    29   <div class="input">
    30     <select name="level">
    31       <option tal:repeat="item view/levels"
    32               tal:attributes="value python:item[1]">
    33         <span tal:replace="python: item[0]">200</span>
    34       </option>
    35     </select>
    36   </div>
     36  <select name="level" class="form-control">
     37    <option tal:repeat="item view/levels"
     38            tal:attributes="value python:item[1]">
     39      <span tal:replace="python: item[0]">200</span>
     40    </option>
     41  </select>
    3742  <br /><br />
    38   <div class="input">
    3943  <input type="submit" name="START"  i18n:translate=""
    4044    value="Create CSV file"
    41     class="btn primary" />
    42   </div>
     45    class="btn btn-primary" />
    4346</form>

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

    r11005 r11025  
    11<div class="table-responsive">
    2   <table i18n:domain="waeup.kofa" class="table">
     2  <table i18n:domain="waeup.kofa" class="table table-condensed">
    33    <thead>
    44      <tr>
    … …  
    2626          <span tal:replace="job/creator">CREATOR</span>
    2727        </td>
    28         <td nowrap>
     28        <td>
    2929          <span tal:replace="job/start_time">DATETIME</span>
    3030        </td>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/browser_templates/studyleveleditpage.pt

    r10440 r11025  
    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>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/browser_templates/studylevelmanagepage.pt

    r11013 r11025  
    5757          </td>
    5858          <td tal:content="value/semester" nowrap>TERM</td>
    59           <td> <a tal:attributes="href value/__name__">
     59          <td> <a tal:attributes="href value/url">
    6060          <span tal:content="value/code">CODE</span>
    6161          </a></td>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/browser_templates/studylevelpage.pt

    r11013 r11025  
    3838      <tr tal:repeat="value view/translated_values">
    3939        <td tal:content="value/semester" nowrap>TERM</td>
    40         <td> <a tal:attributes="href value/__name__">
     40        <td> <a tal:attributes="href value/url">
    4141        <span tal:content="value/code">CODE</span>
    4242        </a></td>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/reports/browser_templates/levelreportgeneratorpage.pt

    r10560 r11025  
    77  </p>
    88  <br />
    9   <div class="clearfix">
    10     <label for="session" i18n:translate="">Department:</label>
    11     <div class="input">
    12       <select name="faccode_depcode">
    13         <span tal:repeat="items view/faccode_depcodes" tal:omit-tag="">
    14           <option
    15               tal:define="name python: items[1]; title python: items[0]"
    16               tal:attributes="value name">
    17             <span tal:replace="title">TITLE</span>
    18           </option>
    19         </span>
    20       </select>
    21       <div class="help-inline" i18n:translate="">
    22         Set department filter.
    23       </div>
    24     </div>
    25     <br />
    26     <label for="session">Academic Session:</label>
    27     <div class="input">
    28       <select name="session" i18n:translate="">
    29         <span tal:repeat="items view/sessions" tal:omit-tag="">
    30           <option
    31               tal:define="name python: items[1]; title python: items[0]"
    32               tal:attributes="value name">
    33             <span tal:replace="title">TITLE</span>
    34           </option>
    35         </span>
    36       </select>
    37       <div class="help-inline" i18n:translate="">
    38         Select academic session to report.
    39       </div>
    40     </div>
    41     <br />
    42     <label for="session">Level:</label>
    43     <div class="input">
    44       <select name="level" i18n:translate="">
    45         <span tal:repeat="items view/levels" tal:omit-tag="">
    46           <option
    47               tal:define="name python: items[1]; title python: items[0]"
    48               tal:attributes="value name">
    49             <span tal:replace="title">TITLE</span>
    50           </option>
    51         </span>
    52       </select>
    53       <div class="help-inline" i18n:translate="">
    54         Select level to report.
    55       </div>
    56     </div>
    57 
     9  <label for="session" i18n:translate="">Department</label>
     10  <select name="faccode_depcode" class="form-control">
     11    <span tal:repeat="items view/faccode_depcodes" tal:omit-tag="">
     12      <option
     13          tal:define="name python: items[1]; title python: items[0]"
     14          tal:attributes="value name">
     15        <span tal:replace="title">TITLE</span>
     16      </option>
     17    </span>
     18  </select>
     19  <br />
     20  <label for="session">Academic Session</label>
     21  <div class="input">
     22    <select name="session" i18n:translate="" class="form-control">
     23      <span tal:repeat="items view/sessions" tal:omit-tag="">
     24        <option
     25            tal:define="name python: items[1]; title python: items[0]"
     26            tal:attributes="value name">
     27          <span tal:replace="title">TITLE</span>
     28        </option>
     29      </span>
     30    </select>
    5831  </div>
    59   <div class="input">
    60     <input i18n:translate="" type="submit" class="btn primary"
    61            name="CREATE" value="Create" />
    62     <a class="btn secondary" href=""
    63        tal:attributes="href view/parent_url">Cancel</a>
    64   </div>
     32  <br />
     33  <label for="session">Level</label>
     34  <select name="level" i18n:translate="" class="form-control">
     35    <span tal:repeat="items view/levels" tal:omit-tag="">
     36      <option
     37          tal:define="name python: items[1]; title python: items[0]"
     38          tal:attributes="value name">
     39        <span tal:replace="title">TITLE</span>
     40      </option>
     41    </span>
     42  </select>
     43  <br />
     44  <input i18n:translate="" type="submit" class="btn btn-primary"
     45         name="CREATE" value="Create" />
     46  <a class="btn btn-default" href=""
     47     tal:attributes="href view/parent_url">Cancel</a>
    6548</form>

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/reports/browser_templates/studentstatisticsreportgeneratorpage.pt

    r10550 r11025  
    77  </p>
    88  <br />
    9   <div class="clearfix">
    10     <label for="session" i18n:translate="">Study Modes Group:</label>
    11     <div class="input">
    12       <select name="mode">
    13         <span tal:repeat="items view/modes" tal:omit-tag="">
    14           <option
    15               tal:define="name python: items[1]; title python: items[0]"
    16               tal:attributes="value name">
    17             <span tal:replace="title">TITLE</span>
    18           </option>
    19         </span>
    20       </select>
    21       <div class="help-inline" i18n:translate="">
    22         Set study modes filter.
    23       </div>
    24     </div>
    25     <br />
    26     <label for="session">Academic Session:</label>
    27     <div class="input">
    28       <select name="session" i18n:translate="">
    29         <span tal:repeat="items view/sessions" tal:omit-tag="">
    30           <option
    31               tal:define="name python: items[1]; title python: items[0]"
    32               tal:attributes="value name">
    33             <span tal:replace="title">TITLE</span>
    34           </option>
    35         </span>
    36       </select>
    37       <div class="help-inline" i18n:translate="">
    38         Select academic session to report.
    39       </div>
    40     </div>
    41 
    42   </div>
    43   <div class="input">
    44     <input i18n:translate="" type="submit" class="btn primary"
    45            name="CREATE" value="Create" />
    46     <a class="btn secondary" href=""
    47        tal:attributes="href view/parent_url">Cancel</a>
    48   </div>
     9  <label for="session" i18n:translate="">Study Modes Group</label>
     10    <select name="mode" class="form-control">
     11      <span tal:repeat="items view/modes" tal:omit-tag="">
     12        <option
     13            tal:define="name python: items[1]; title python: items[0]"
     14            tal:attributes="value name">
     15          <span tal:replace="title">TITLE</span>
     16        </option>
     17      </span>
     18    </select>
     19  <br />
     20  <label for="session">Academic Session</label>
     21  <select name="session" i18n:translate="" class="form-control">
     22    <span tal:repeat="items view/sessions" tal:omit-tag="">
     23      <option
     24          tal:define="name python: items[1]; title python: items[0]"
     25          tal:attributes="value name">
     26        <span tal:replace="title">TITLE</span>
     27      </option>
     28    </span>
     29  </select>
     30  <br />
     31  <input i18n:translate="" type="submit" class="btn btn-primary"
     32         name="CREATE" value="Create" />
     33  <a class="btn btn-default" href=""
     34     tal:attributes="href view/parent_url">Cancel</a>
    4935</form>
Note: See TracChangeset for help on using the changeset viewer.