Ignore:
Timestamp:
30 Jan 2014, 17:11:23 (11 years ago)
Author:
Henrik Bettermann
Message:

First adjustments in students module.

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

Legend:

Unmodified
Added
Removed

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

    r10706 r11013  
    4040from waeup.kofa.browser.pages import ContactAdminForm, ExportCSVView, doll_up
    4141from waeup.kofa.browser.resources import (
    42     datepicker, datatable, tabs, warning, toggleall)
     42    datepicker, warning, toggleall)
    4343from waeup.kofa.browser.layout import jsaction, action, UtilityView
    4444from waeup.kofa.browser.interfaces import ICaptchaManager
    … …  
    263263
    264264    def update(self, *args, **kw):
    265         datatable.need()
    266265        form = self.request.form
    267266        self.hitlist = []
    … …  
    307306
    308307    def update(self, *args, **kw):
    309         datatable.need()
    310308        toggleall.need()
    311309        warning.need()
    … …  
    536534    def update(self):
    537535        datepicker.need() # Enable jQuery datepicker in date fields.
    538         tabs.need()
    539536        self.tab1 = self.tab2 = ''
    540537        qs = self.request.get('QUERY_STRING', '')
    … …  
    766763    def update(self):
    767764        datepicker.need() # Enable jQuery datepicker in date fields.
    768         tabs.need()
    769765        self.tab1 = self.tab2 = ''
    770766        qs = self.request.get('QUERY_STRING', '')
    … …  
    987983            return
    988984        super(StudyCourseManageFormPage, self).update()
    989         tabs.need()
    990985        self.tab1 = self.tab2 = ''
    991986        qs = self.request.get('QUERY_STRING', '')
    … …  
    994989        setattr(self, qs, 'active')
    995990        warning.need()
    996         datatable.need()
    997991        return
    998992
    … …  
    10231017            yield(dict(code=code, title=title))
    10241018
    1025     @action(_('Add study level'))
     1019    @action(_('Add study level'), style='primary')
    10261020    def addStudyLevel(self, **data):
    10271021        level_code = self.request.form.get('addlevel', None)
    … …  
    10821076    def update(self, SUBMIT=None):
    10831077        super(StudentTranscriptRequestPage, self).update()
    1084         tabs.need()
    10851078        self.tab1 = self.tab2 = ''
    10861079        qs = self.request.get('QUERY_STRING', '')
    … …  
    11571150    def update(self, SUBMIT=None):
    11581151        super(StudentTranscriptRequestProcessFormPage, self).update()
    1159         tabs.need()
    11601152        self.tab1 = self.tab2 = ''
    11611153        qs = self.request.get('QUERY_STRING', '')
    … …  
    13751367    def update(self):
    13761368        super(StudyLevelDisplayFormPage, self).update()
    1377         datatable.need()
    13781369        return
    13791370
    … …  
    14861477    tabtwoactions = [_('Add course ticket'),
    14871478        _('Remove selected tickets'),_('Cancel')]
     1479    placeholder = _('Enter valid course code')
    14881480
    14891481    def update(self, ADD=None, course=None):
    … …  
    14921484            return
    14931485        super(StudyLevelManageFormPage, self).update()
    1494         tabs.need()
    14951486        self.tab1 = self.tab2 = ''
    14961487        qs = self.request.get('QUERY_STRING', '')
    … …  
    14991490        setattr(self, qs, 'active')
    15001491        warning.need()
    1501         datatable.need()
    15021492        if ADD is not None:
    15031493            if not course:
    … …  
    17211711    def update(self):
    17221712        super(PaymentsManageFormPage, self).update()
    1723         datatable.need()
    17241713        warning.need()
    17251714        return
    … …  
    19911980    def update(self):
    19921981        super(AccommodationManageFormPage, self).update()
    1993         datatable.need()
    19941982        warning.need()
    19951983        return
    … …  
    26462634            return
    26472635        super(StudyLevelEditFormPage, self).update()
    2648         datatable.need()
    26492636        warning.need()
    26502637        if ADD is not None:
    … …  
    29652952
    29662953    def update(self, SHOW=None, session=None, level=None):
    2967         datatable.need()
    29682954        self.parent_url = self.url(self.context.__parent__)
    29692955        self._set_session_values()
    … …  
    30803066            self.redirect(self.url(self.context))
    30813067            return
    3082         datatable.need()
    30833068        self.tickets = self._searchCatalog(self.current_academic_session)
    30843069        editable_tickets = [

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

    r9273 r11013  
    33      autocomplete="off">
    44
    5   <ul class="tabs" data-tabs="tabs">
    6     <li tal:attributes="class view/tab1"><a href="#tab-1">
    7     <span i18n:translate="">Base Data</span></a></li>
    8     <li tal:attributes="class view/tab2"><a href="#tab-2">
    9     <span i18n:translate="">Passport Picture</span></a></li>
     5  <ul class="tabs nav nav-tabs" data-tabs="tabs">
     6    <li class="active">
     7      <a href="#tab1" data-toggle="tab">
     8      <span i18n:translate="">Base Data</span></a>
     9    </li>
     10    <li>
     11      <a href="#tab2" data-toggle="tab">
     12        <span i18n:translate="">Passport Picture</span>
     13      </a>
     14    </li>
    1015  </ul>
    1116
    1217  <div class="tab-content">
    13     <div id="tab-1" tal:attributes="class view/tab1">
     18    <div id="tab1" class="active tab-pane">
     19      <br />
    1420      <table class="form-table">
    1521        <tbody>
    … …  
    1824            <td class="fieldname" i18n:translate="">Password:</td>
    1925            <td>
    20               <input name="password" type="password"  />
     26              <input name="password" class="form-control" type="password"  />
    2127            </td>
    2228          </tr>
    … …  
    2430            <td class="fieldname" i18n:translate="">Retype Password:</td>
    2531            <td>
    26               <input name="control_password" type="password" />
     32              <input name="control_password" class="form-control" type="password" />
    2733            </td>
    2834          </tr>
    … …  
    3844    </div>
    3945
    40     <div id="tab-2"  tal:attributes="class view/tab2">
     46    <div id="tab2" class="tab-pane">
     47      <br />
    4148      <table class="form-table">
    4249        <tbody>

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

    r8486 r11013  
    1010        <td class="fieldname" i18n:translate="">Password:</td>
    1111        <td>
    12           <input name="change_password" type="password"  />
     12          <input name="change_password" class="form-control" type="password"  />
    1313        </td>
    1414      </tr>
    … …  
    1616        <td class="fieldname" i18n:translate="">Retype Password:</td>
    1717        <td>
    18           <input name="change_password_repeat" type="password" />
     18          <input name="change_password_repeat" class="form-control" type="password" />
    1919        </td>
    2020      </tr>

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

    r7811 r11013  
    22      i18n:domain="waeup.kofa" enctype="multipart/form-data">
    33
    4   <ul class="tabs" data-tabs="tabs">
    5     <li tal:attributes="class view/tab1"><a href="#tab-1">
    6     <span i18n:translate="">Clearance Data</span></a></li>
    7     <li tal:attributes="class view/tab2"><a href="#tab-2">
    8     <span i18n:translate="">Scans</span></a></li>
     4  <ul class="tabs nav nav-tabs" data-tabs="tabs">
     5    <li class="active">
     6      <a href="#tab1" data-toggle="tab">
     7        <span i18n:translate="">Clearance Data</span>
     8      </a>
     9    </li>
     10    <li>
     11      <a href="#tab2" data-toggle="tab">
     12        <span i18n:translate="">Scans</span>
     13      </a>
     14    </li>
    915  </ul>
    1016  <div class="tab-content">
    11     <div id="tab-1" tal:attributes="class view/tab1">
     17    <div id="tab1" class="active tab-pane">
    1218      <table class="form-table">
    1319        <tbody>
    … …  
    2329    </div>
    2430
    25     <div id="tab-2" tal:attributes="class view/tab2">
     31    <div id="tab2" class="tab-pane">
    2632      <table class="form-table">
    2733        <tbody>

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

    r9952 r11013  
    88        <td>
    99        <span tal:replace="view/ac_prefix">PIN Prefix</span> -
    10         <input name="ac_series" type="text" class="span1" maxlength="3"
     10        <input name="ac_series" type="text" maxlength="3"
    1111               value="" tal:attributes="value view/ac_series"/> -
    12         <input name="ac_number" type="text" class="span3" maxlength="10"
     12        <input name="ac_number" type="text" maxlength="10"
    1313               value="" tal:attributes="value view/ac_number" />
    1414        <font color="red"><span tal:replace="view/notice">Notice</span>
    … …  
    2424      <tr>
    2525        <td colspan="2">
    26           <input type="submit" name="SUBMIT" class="btn primary"
     26          <input type="submit" name="SUBMIT" class="btn btn-primary"
    2727                 tal:attributes="value view/buttonname" />
    2828        </td>
    … …  
    3636      clicking the button below.
    3737    </p>
    38     <input type="submit" name="SUBMIT" class="btn primary"
     38    <input type="submit" name="SUBMIT" class="btn btn-primary"
    3939           tal:attributes="value view/buttonname" />
    4040  </span>

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

    r7876 r11013  
    99     tal:attributes="id python:('delete_%s' % viewlet.input_name);
    1010        name python:('delete_%s' % viewlet.input_name)"
    11      value="Delete" class="btn error" />
     11     value="Delete" class="btn btn-danger" />
    1212    <br /><br />
    1313    <input type="file" tal:attributes="name viewlet/input_name"/>
    … …  
    1717                name python:('upload_%s' % viewlet.input_name);
    1818                value viewlet/upload_button"
    19              value="Upload" class="btn primary" />
     19             value="Upload" class="btn btn-primary" />
    2020    <span i18n:translate="">
    2121      Max. file size:

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

    r10266 r11013  
    22      i18n:domain="waeup.kofa" enctype="multipart/form-data">
    33
    4   <ul class="tabs" data-tabs="tabs">
    5     <li tal:attributes="class view/tab1"><a href="#tab-1">
    6       <span i18n:translate="">Study Course Data</span></a>
     4  <ul class="tabs nav nav-tabs" data-tabs="tabs">
     5    <li class="active">
     6      <a href="#tab1" data-toggle="tab">
     7        <span i18n:translate="">Study Course Data</span>
     8      </a>
    79    </li>
    8     <li tal:attributes="class view/tab2"><a href="#tab-2">
    9       <span i18n:translate="">Study Levels</span></a>
     10    <li t>
     11      <a href="#tab2" data-toggle="tab">
     12        <span i18n:translate="">Study Levels</span>
     13      </a>
    1014    </li>
    1115  </ul>
    1216
    1317  <div class="tab-content">
    14     <div id="tab-1" tal:attributes="class view/tab1">
     18    <div id="tab1" class="active tab-pane">
     19      <br />
    1520      <table class="form-table">
    1621      <tbody>
    … …  
    2732    </div>
    2833
    29     <div id="tab-2" tal:attributes="class view/tab2">
    30       <h3 i18n:translate="">Study Levels (Course Lists)</h3>
    31       <table class="display dataTableManage">
     34    <div id="tab2" class="tab-pane">
     35      <br />
     36      <table class="dataTableManage">
    3237        <thead>
    3338          <tr>
    … …  
    4449                         tal:attributes="value cl/__name__" />
    4550            </td>
    46             <td> <a tal:attributes="href cl/__name__">
     51            <td> <a tal:attributes="href python:view.url(cl)">
    4752              <span tal:content="cl/level">CODE</span></a>
    4853            </td>
    … …  
    6267      </div>
    6368      <br /><br /><br />
    64       <div>
     69
     70
     71      <div class="form-inline">
    6572        <span tal:condition="view/availableActions">
    66           <span tal:repeat="action view/actions"
    67                 tal:omit-tag="">
    68             <input tal:condition="python:action.label in view.tabthreeactions"
    69                    tal:replace="structure action/render"/>
    70           </span>
     73          <div tal:repeat="action view/actions"
     74              class="form-group">
     75              <input tal:condition="python:action.label in view.tabthreeactions"
     76                     tal:replace="structure action/render"/>
     77          </div>
    7178        </span>
    72         <select id="addlevel" name="addlevel" class='span5'>
    73           <option tal:attributes="value level/code" tal:repeat="level view/level_dicts">
    74             <span tal:replace="level/title">LEVELTITLE
    75           </span>
    76           </option>
    77         </select>
     79        <div class="form-group">
     80          <select id="addlevel" name="addlevel">
     81            <option tal:attributes="value level/code" tal:repeat="level view/level_dicts">
     82              <span tal:replace="level/title">LEVELTITLE
     83            </span>
     84            </option>
     85          </select>
     86        </div>
    7887        &nbsp;&nbsp;<span i18n:translate="">in session</span>&nbsp;&nbsp;
    79         <select id="level_session" name="level_session" class='span3'>
    80           <option tal:attributes="value session/code" tal:repeat="session view/session_dicts">
    81             <span tal:replace="session/title">LEVELSESSION
    82           </span>
    83           </option>
    84         </select>
     88        <div class="form-group">
     89          <select id="level_session" name="level_session">
     90            <option tal:attributes="value session/code" tal:repeat="session view/session_dicts">
     91              <span tal:replace="session/title">LEVELSESSION
     92            </span>
     93            </option>
     94          </select>
     95        </div>
    8596      </div>
     97
    8698    </div>
    8799  </div>

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

    r10250 r11013  
    6464<h3 i18n:domain="waeup.kofa" i18n:translate="">Study Levels (Course Lists)</h3>
    6565
    66 <table i18n:domain="waeup.kofa">
     66<table i18n:domain="waeup.kofa" class="table">
    6767  <thead>
    6868    <tr>
    … …  
    7272  </thead>
    7373  <tbody>
    74     <tr class="gradeC" tal:repeat="value context/values">
    75       <td> <a tal:attributes="href value/__name__">
     74    <tr tal:repeat="value context/values">
     75      <td> <a tal:attributes="href python:view.url(value)">
    7676      <span tal:content="value/level">CODE</span></a></td>
    7777      <td tal:content="value/level_title">TITLE</td>

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

    r10440 r11013  
    22      i18n:domain="waeup.kofa" enctype="multipart/form-data">
    33
    4   <ul class="tabs" data-tabs="tabs">
    5     <li tal:attributes="class view/tab1"><a href="#tab-1">
    6       <span i18n:translate="">Study Level Data</span></a>
     4  <ul class="tabs nav nav-tabs" data-tabs="tabs">
     5    <li class="active">
     6      <a href="#tab1" data-toggle="tab">
     7        <span i18n:translate="">Study Level Data</span>
     8      </a>
    79    </li>
    8     <li tal:attributes="class view/tab2"><a href="#tab-2">
    9       <span i18n:translate="">Course Tickets</span>
    10     </a></li>
     10    <li>
     11      <a href="#tab2" data-toggle="tab">
     12        <span i18n:translate="">Course Tickets</span>
     13      </a>
     14    </li>
    1115  </ul>
    1216
    1317  <div class="tab-content">
    14     <div id="tab-1" tal:attributes="class view/tab1">
     18    <div id="tab1" class="active tab-pane">
     19      <br />
    1520      <table class="form-table">
    1621      <tbody>
    … …  
    2732    </div>
    2833
    29     <div id="tab-2" tal:attributes="class view/tab2">
    30       <h3 i18n:translate="">Course Tickets</h3>
     34    <div id="tab2" class="tab-pane">
     35      <br />
    3136      <table class="display dataTableManage">
    3237      <thead>
    … …  
    7479        </span>
    7580      </div>
    76 
    7781      <br /><br /><br />
    78       <table class="input-table">
    79         <tr>
    80           <td>
    81             <input class="btn primary" type="submit" name="ADD"
     82      <div class="form-inline">
     83        <div class="form-group">
     84            <input class="btn btn-primary" type="submit" name="ADD"
    8285                   i18n:translate=""
    8386                   value="Add course ticket" />
    84           </td>
    85           <td>
    86             <input type="text" name="course" />
    87             <div class="hint" i18n:translate="">
    88                 Enter valid course code.
    89             </div>
    90           </td>
    91         </tr>
    92       </table>
     87        </div>
     88        <div class="form-group">
     89            <input type="text" name="course" class="form-control"
     90                   tal:attributes="placeholder view/placeholder" />
     91        </div>
     92      </div>
     93      <br />
    9394      <p i18n:translate="">
    9495        You don't know the course code? Then select a course

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

    r10440 r11013  
    11<table class="form-table" i18n:domain="waeup.kofa">
    2   <thead>
    3   </thead>
    42  <tbody>
    53    <tal:block repeat="widget view/widgets">
    … …  
    2018<h3 i18n:domain="waeup.kofa" i18n:translate="">Course Tickets</h3>
    2119
    22 <table class="display dataTable" i18n:domain="waeup.kofa">
    23   <thead>
    24     <tr>
    25       <th i18n:translate="">Term</th>
    26       <th i18n:translate="">Code</th>
    27       <th i18n:translate="">Title</th>
    28       <th i18n:translate="">Dep.</th>
    29       <th i18n:translate="">Fac.</th>
    30       <th i18n:translate="">Cred.</th>
    31       <th i18n:translate="">Requ.</th>
    32       <th i18n:translate="">Score</th>
    33       <th i18n:translate="">Grade</th>
    34       <th i18n:translate="">CO</th>
    35       <th i18n:translate="">Auto</th>
    36     </tr>
    37   </thead>
    38   <tbody>
    39     <tr tal:repeat="value view/translated_values" class="gradeC">
    40       <td tal:content="value/semester" nowrap>TERM</td>
    41       <td> <a tal:attributes="href value/__name__">
    42       <span tal:content="value/code">CODE</span>
    43       </a></td>
    44       <td tal:content="value/title">TITLE</td>
    45       <td tal:content="value/dcode">DEPARTMENT</td>
    46       <td tal:content="value/fcode">FACULTY</td>
    47       <td tal:content="value/credits">CREDITS</td>
    48       <td tal:content="value/mandatory">MANDATORY</td>
    49       <td tal:content="value/score|nothing">SCORE</td>
    50       <td tal:content="value/grade|nothing">GRADE</td>
    51       <td tal:content="value/carry_over">CO</td>
    52       <td tal:content="value/automatic">AUTO</td>
    53     </tr>
    54   </tbody>
    55 </table>
     20<div class="table-responsive">
     21  <table class="dataTable" i18n:domain="waeup.kofa">
     22    <thead>
     23      <tr>
     24        <th i18n:translate="">Term</th>
     25        <th i18n:translate="">Code</th>
     26        <th i18n:translate="">Title</th>
     27        <th i18n:translate="">Dep.</th>
     28        <th i18n:translate="">Fac.</th>
     29        <th i18n:translate="">Cred.</th>
     30        <th i18n:translate="">Requ.</th>
     31        <th i18n:translate="">Score</th>
     32        <th i18n:translate="">Grade</th>
     33        <th i18n:translate="">CO</th>
     34        <th i18n:translate="">Auto</th>
     35      </tr>
     36    </thead>
     37    <tbody>
     38      <tr tal:repeat="value view/translated_values">
     39        <td tal:content="value/semester" nowrap>TERM</td>
     40        <td> <a tal:attributes="href value/__name__">
     41        <span tal:content="value/code">CODE</span>
     42        </a></td>
     43        <td tal:content="value/title">TITLE</td>
     44        <td tal:content="value/dcode">DEPARTMENT</td>
     45        <td tal:content="value/fcode">FACULTY</td>
     46        <td tal:content="value/credits">CREDITS</td>
     47        <td tal:content="value/mandatory">MANDATORY</td>
     48        <td tal:content="value/score|nothing">SCORE</td>
     49        <td tal:content="value/grade|nothing">GRADE</td>
     50        <td tal:content="value/carry_over">CO</td>
     51        <td tal:content="value/automatic">AUTO</td>
     52      </tr>
     53    </tbody>
     54  </table>
     55</div>
    5656
    5757

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

    r10816 r11013  
    891891    template = default_fileupload_template
    892892    grok.require('waeup.uploadStudentFile')
    893     tab_redirect = '?tab2'
     893    tab_redirect = '#tab2'
    894894    mus = 1024 * 150
    895895    upload_button =_('Upload new file')
    … …  
    959959    mus = 1024 * 50
    960960    download_name = u'passport.jpg'
    961     tab_redirect = '?tab2'
     961    tab_redirect = '#tab2'
    962962
    963963class PassportUploadEdit(PassportUploadManage):
    … …  
    986986    mus = 1024 * 150
    987987    download_name = u'birth_certificate'
    988     tab_redirect = '?tab2'
     988    tab_redirect = '#tab2'
    989989
    990990class Image(grok.View):
Note: See TracChangeset for help on using the changeset viewer.