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:
3 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.kofa/trunk

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

  • main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/studycoursemanagepage.pt

    r10266 r11254  
    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="kofa-data-table 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" class="form-control">
     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" class="form-control">
     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>
Note: See TracChangeset for help on using the changeset viewer.