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/browser/templates/configurationmanagepage.pt

    r7811 r11254  
    11<form action="." tal:attributes="action request/URL" method="POST"
    2   enctype="multipart/form-data" i18n:domain="waeup.kofa">
    3     <ul class="tabs" data-tabs="tabs">
    4       <li tal:attributes="class view/tab1">
    5       <a href="#tab-1" i18n:translate="">Site Settings</a>
    6       </li>
    7       <li tal:attributes="class view/tab2">
    8       <a href="#tab-2" i18n:translate="">Session Configurations</a>
    9       </li>
    10     </ul>
    11     <div class="tab-content">
    12     <div id="tab-1" tal:attributes="class view/tab1">
     2      enctype="multipart/form-data" i18n:domain="waeup.kofa">
     3  <ul class="tabs nav nav-tabs" data-tabs="tabs">
     4    <li class="active">
     5      <a href="#tab1" data-toggle="tab"
     6         i18n:translate="">Site Settings</a>
     7    </li>
     8    <li>
     9      <a href="#tab2"  data-toggle="tab"
     10         i18n:translate="">Session Configurations</a>
     11    </li>
     12  </ul>
     13  <div class="tab-content">
     14    <div id="tab1" class="active tab-pane">
    1315      <table class="form-table">
    1416        <tbody>
     
    2325      </div>
    2426    </div>
    25     <div id="tab-2" tal:attributes="class view/tab2"> <br />
    26       <table class="display dataTableManage">
     27    <div id="tab2" class="tab-pane">
     28      <br />
     29      <table class="kofa-data-table dataTableManage">
    2730        <thead>
    2831          <tr>
     
    3437        </thead>
    3538        <tbody>
    36           <tr tal:repeat="entry view/getSessionConfigurations" class="gradeC"> <td>
    37               <input type="checkbox" name="val_id" tal:attributes="value entry/name" /> </td> <td>
    38               <a href="" tal:attributes="href entry/url" tal:content="entry/title">Name</a> </td>
     39          <tr tal:repeat="entry view/getSessionConfigurations">
     40            <td>
     41            <input type="checkbox" name="val_id"
     42                   tal:attributes="value entry/name" /> </td> <td>
     43            <a href="" tal:attributes="href entry/url"
     44               tal:content="entry/title">Name</a> </td>
    3945          </tr>
    4046        </tbody>
     
    4349        <span tal:repeat="action view/actions" tal:omit-tag="">
    4450          <input tal:condition="python:action.label in view.tabtwoactions"
    45             tal:replace="structure action/render"/>
     51                 tal:replace="structure action/render"/>
    4652        </span>
    4753      </div>
    48     </div>
    49   </div>
     54    </div><!-- /tab2 -->
     55  </div><!-- /tab-content -->
    5056</form>
Note: See TracChangeset for help on using the changeset viewer.