Ignore:
Timestamp:
22 Feb 2014, 15:46:03 (11 years ago)
Author:
uli
Message:

Merge changes from uli-diazo-themed back into trunk. If this works, then a miracle happened.

Location:
main/waeup.kofa/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/trunk

  • main/waeup.kofa/trunk/src/waeup/kofa

  • main/waeup.kofa/trunk/src/waeup/kofa/students/reports/browser_templates/levelreportgeneratorpage.pt

    r10560 r11254  
    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 half">
     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 half">
     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 half">
     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/trunk/src/waeup/kofa/students/reports/browser_templates/studentstatisticsreportgeneratorpage.pt

    r10550 r11254  
    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 half">
     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 half">
     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>

  • main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py

    r10650 r11254  
    208208from waeup.kofa.interfaces import academic_sessions_vocab
    209209from waeup.kofa.reports import get_generators
     210from waeup.kofa.browser.breadcrumbs import Breadcrumb
    210211grok.templatedir('browser_templates')
    211212class LevelReportGeneratorPage(KofaPage):
    … …  
    291292            self.context.creation_dt_string)
    292293
     294class LevelReportBreadcrumb(Breadcrumb):
     295    """A breadcrumb for reports.
     296    """
     297    grok.context(LevelReportGenerator)
     298    title = _(u'Level Report')
     299    target = None

  • main/waeup.kofa/trunk/src/waeup/kofa/students/reports/session_results_presentation.py

    r10650 r11254  
    198198from waeup.kofa.interfaces import academic_sessions_vocab
    199199from waeup.kofa.reports import get_generators
     200from waeup.kofa.browser.breadcrumbs import Breadcrumb
    200201grok.templatedir('browser_templates')
    201202class SessionResultsPresentationGeneratorPage(LevelReportGeneratorPage):
    … …  
    230231            self.context.sessioncode, self.context.levelcode,
    231232            self.context.creation_dt_string)
     233
     234class SessionResultsPresentationBreadcrumb(Breadcrumb):
     235    """A breadcrumb for reports.
     236    """
     237    grok.context(SessionResultsPresentationGenerator)
     238    title = _(u'Session Results Presentation')
     239    target = None

  • main/waeup.kofa/trunk/src/waeup/kofa/students/reports/student_statistics.py

    r10575 r11254  
    168168from waeup.kofa.interfaces import academic_sessions_vocab
    169169from waeup.kofa.reports import get_generators
     170from waeup.kofa.browser.breadcrumbs import Breadcrumb
    170171grok.templatedir('browser_templates')
    171172class StudentStatisticsReportGeneratorPage(KofaPage):
    … …  
    240241            ob_class, self.context.__name__, filename))
    241242        return pdf_stream
     243
     244class StudentStatsBreadcrumb(Breadcrumb):
     245    """A breadcrumb for reports.
     246    """
     247    grok.context(StudentStatisticsReportGenerator)
     248    title = _(u'Student Statistics')
     249    target = None
Note: See TracChangeset for help on using the changeset viewer.