Changeset 6461


Ignore:
Timestamp:
23 Jun 2011, 07:24:05 (14 years ago)
Author:
Henrik Bettermann
Message:

Replace span tags by div tags. This ensures that the action buutons appear below table information.

Location:
main/waeup.sirp/trunk/src/waeup/sirp
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontaineraddpage.pt

    r6460 r6461  
    4141  </table>
    4242
    43   <span class="actionButtons" tal:condition="view/availableActions">
     43  <div class="actionButtons" tal:condition="view/availableActions">
    4444    <input tal:repeat="action view/actions"
    4545             tal:replace="structure action/render"
    4646             />
    47   </span>
     47  </div>
    4848</form>

  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.pt

    r6460 r6461  
    1 <form action="." tal:attributes="action request/URL" method="POST"
    2       class="edit-form" enctype="multipart/form-data">
     1<form action="." tal:attributes="action request/URL" method="POST"  class="edit-form" enctype="multipart/form-data">
    32  <h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
    4   <div class="form-status"
    5     tal:define="status view/status"
    6     tal:condition="status">
    7     Form Status:
    8     <span i18n:translate="" tal:content="view/status">
    9       Form status summary
     3  <div class="form-status"  tal:define="status view/status"  tal:condition="status"> Form Status:
     4    <span i18n:translate="" tal:content="view/status"> Form status summary
    105    </span>
    116  </div>
    … …  
    3530              <td class="label">
    3631                <label tal:attributes="for widget/name">
    37                   <span class="required" tal:condition="widget/required">*</span>
    38                   <span i18n:translate="" tal:content="widget/label">label</span>:
    39                 </label>
    40               </td>
     32                  <span class="required" tal:condition="widget/required">*
     33                  </span>
     34                  <span i18n:translate="" tal:content="widget/label">label
     35                  </span>:
     36                </label> </td>
    4137              <td class="field">
    4238                <span class="widget" tal:content="structure widget">
    … …  
    4440                </span>
    4541                <tal:error tal:condition="widget/error">
    46                   <span tal:replace="structure widget/error">error</span>
     42                  <span tal:replace="structure widget/error">error
     43                  </span>
    4744                </tal:error>
    4845                <tal:hint tal:condition="widget/hint">
    49                   <span class="hint" tal:content="structure widget/hint">hint</span>
    50                 </tal:hint>
    51               </td>
     46                  <span class="hint" tal:content="structure widget/hint">hint
     47                  </span>
     48                </tal:hint> </td>
    5249            </tr>
    5350          </tal:block>
    5451        </tbody>
    5552      </table>
    56     <span class="actionButtons" tal:condition="view/availableActions">
    57       <span tal:repeat="action view/actions" tal:omit-tag="">
    58         <input tal:condition="python:action.label in view.taboneactions"
    59                tal:replace="structure action/render"/>
    60       </span>
    61     </span>
     53      <div class="actionButtons" tal:condition="view/availableActions">
     54        <span tal:repeat="action view/actions" tal:omit-tag="">
     55          <input tal:condition="python:action.label in view.taboneactions"  tal:replace="structure action/render"/>
     56        </span>
     57      </div>
    6258    </div>
    6359    <div id="tab-2"> <h3>Applicants</h3>
    … …  
    7470        </thead>
    7571        <tbody>
    76           <tr tal:repeat="appl context/values">
    77             <td>
    78               <input type="checkbox" name="val_id" tal:attributes="value appl/__name__" />
    79             </td>
    80             <td>
    81               <a tal:attributes="href python: view.url(appl)"
    82                  tal:content="appl/__name__"> ID </a>
    83             </td>
    84             <td>
    85               <span tal:replace="appl/state">state</span>
    86             </td>
     72          <tr tal:repeat="appl context/values"> <td>
     73              <input type="checkbox" name="val_id" tal:attributes="value appl/__name__" /> </td> <td>
     74              <a tal:attributes="href python: view.url(appl)"  tal:content="appl/__name__"> ID </a> </td> <td>
     75              <span tal:replace="appl/state">state
     76              </span> </td>
    8777          </tr>
    8878        </tbody>
    89       </table><br /><br />
    90       <span class="actionButtons" tal:condition="view/availableActions">
     79      </table>
     80      <div class="actionButtons" tal:condition="view/availableActions">
    9181        <span tal:repeat="action view/actions" tal:omit-tag="">
    92           <input tal:condition="python:action.label in view.tabtwoactions"
    93                  tal:replace="structure action/render"/>
     82          <input tal:condition="python:action.label in view.tabtwoactions"  tal:replace="structure action/render"/>
    9483        </span>
    95       </span>
     84      </div>
    9685    </div>
    9786    <div id="tab-3"> <br />
    98         <table class="display dataTableManage">
    99             <thead>
    100                 <tr>
    101                     <th>&nbsp;
    102                     </th>
    103                     <th>User Id
    104                     </th>
    105                     <th>Name
    106                     </th>
    107                     <th>Local Role
    108                     </th>
    109                 </tr>
    110             </thead>
    111             <tbody>
    112                 <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB">
    113                     <td>
    114                         <input type="checkbox" name="role_id" tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" />
    115                     </td>
    116                     <td tal:content="entry/user_name"> USERNAME
    117                     </td>
    118                     <td tal:content="entry/user_title"> USERTITLE
    119                     </td>
    120                     <td tal:content="entry/local_role_title"> LOCAL ROLE
    121                     </td>
    122                 </tr>
    123             </tbody>
    124         </table> <br /><br />
    125         <div class="actionButtons" tal:condition="view/availableActions">
    126             <span tal:repeat="action view/actions" tal:omit-tag="">
    127                 <input tal:condition="python:action.label in view.tabthreeactions1" tal:replace="structure action/render"/>
    128             </span>
    129         </div> <br /><br />
    130         <table class="zebra">
    131             <tr>
    132                 <td>
    133                     <select id="user" name="user">
    134                         <option tal:repeat="user view/getUsers" tal:attributes="value user/name">
    135                         <span tal:replace="user/val/description">USERTITLE
    136                         </span>
    137                         </option>
    138                     </select>
    139                 </td>
    140                 <td>
    141                     <select id="local_role" name="local_role">
    142                         <option tal:repeat="localrole view/getLocalRoles" tal:attributes="value localrole/name">
    143                         <span tal:replace="localrole/title">LOCALROLETITLE
    144                         </span>
    145                         </option>
    146                     </select>
    147                 </td>
    148                 <td>
    149                     <div class="actionButtons" tal:condition="view/availableActions">
    150                         <span tal:repeat="action view/actions" tal:omit-tag="">
    151                             <input tal:condition="python:action.label in view.tabthreeactions2" tal:replace="structure action/render"/>
    152                         </span>
    153                     </div>
    154                 </td>
    155             </tr>
    156         </table>
     87      <table class="display dataTableManage">
     88        <thead>
     89          <tr>
     90            <th>&nbsp;
     91            </th>
     92            <th>User Id
     93            </th>
     94            <th>Name
     95            </th>
     96            <th>Local Role
     97            </th>
     98          </tr>
     99        </thead>
     100        <tbody>
     101          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB"> <td>
     102              <input type="checkbox" name="role_id" tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
     103            <td tal:content="entry/user_name"> USERNAME  </td>
     104            <td tal:content="entry/user_title"> USERTITLE  </td>
     105            <td tal:content="entry/local_role_title"> LOCAL ROLE  </td>
     106          </tr>
     107        </tbody>
     108      </table>
     109      <div class="actionButtons" tal:condition="view/availableActions">
     110        <span tal:repeat="action view/actions" tal:omit-tag="">
     111          <input tal:condition="python:action.label in view.tabthreeactions1" tal:replace="structure action/render"/>
     112        </span>
     113      </div> <br /><br />
     114      <table class="zebra">
     115        <tr> <td>
     116            <select id="user" name="user">
     117              <option tal:repeat="user view/getUsers" tal:attributes="value user/name">
     118              <span tal:replace="user/val/description">USERTITLE
     119              </span>
     120              </option>
     121            </select> </td> <td>
     122            <select id="local_role" name="local_role">
     123              <option tal:repeat="localrole view/getLocalRoles" tal:attributes="value localrole/name">
     124              <span tal:replace="localrole/title">LOCALROLETITLE
     125              </span>
     126              </option>
     127            </select> </td> <td>
     128            <div tal:condition="view/availableActions">
     129              <span tal:repeat="action view/actions" tal:omit-tag="">
     130                <input tal:condition="python:action.label in view.tabthreeactions2" tal:replace="structure action/render"/>
     131              </span>
     132            </div> </td>
     133        </tr>
     134      </table>
    157135    </div>
    158136  </div>

  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantsrootmanagepage.pt

    r6460 r6461  
    4848        </tbody>
    4949      </table>
    50       <span class="actionButtons" tal:condition="view/availableActions">
     50      <div class="actionButtons" tal:condition="view/availableActions">
    5151        <span tal:repeat="action view/actions" tal:omit-tag="">
    5252          <input tal:condition="python:action.label in view.taboneactions"   tal:replace="structure action/render"/>
    5353        </span>
    54       </span>
     54      </div>
    5555    </div>
    5656    <div id="tab-2"> <br />

  • main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_edit.pt

    r6460 r6461  
    6060  </table>
    6161
    62   <p tal:condition="not: view/manage_applications">
     62  <div tal:condition="not: view/manage_applications">
    6363    <input class="checkboxType" id="confirm_passport" name="confirm_passport"
    6464           type="checkbox" value="True"/>
    6565    I confirm that the Passport Photograph uploaded on this form is a
    6666    true picture of me.
    67   </p>
     67  </div>
    6868
    69   <span class="actionButtons" tal:condition="view/availableActions">
     69  <div class="actionButtons" tal:condition="view/availableActions">
    7070    <input tal:repeat="action view/actions"
    7171           tal:replace="structure action/render"
    7272           />
    73   </span>
     73  </div>
    7474</form>

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt

    r6460 r6461  
    4747      </tbody>
    4848      </table>
    49       <span class="actionButtons" tal:condition="view/availableActions">
    50           <span tal:repeat="action view/actions"
    51                 tal:omit-tag="">
    52             <input tal:condition="python:action.label in view.taboneactions"
    53                    tal:replace="structure action/render"/>
    54           </span>
    55       </span>
     49      <div class="actionButtons" tal:condition="view/availableActions">
     50        <span tal:repeat="action view/actions"
     51              tal:omit-tag="">
     52          <input tal:condition="python:action.label in view.taboneactions"
     53                 tal:replace="structure action/render"/>
     54        </span>
     55      </div>
    5656
    5757</div>   
    … …  
    104104    </tbody>
    105105  </table>
    106   <span class="actionButtons" tal:condition="view/availableActions">
     106  <div class="actionButtons" tal:condition="view/availableActions">
    107107    <span tal:repeat="action view/actions"
    108108          tal:omit-tag="">
    … …  
    110110             tal:replace="structure action/render"/>
    111111    </span>
    112   </span>
     112  </div>
    113113 
    114114</div>

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_edit_form.pt

    r6460 r6461  
    4040    </tbody>
    4141  </table>
    42   <span class="actionButtons" tal:condition="view/availableActions">
     42  <div class="actionButtons" tal:condition="view/availableActions">
    4343    <input tal:repeat="action view/actions"
    4444           tal:replace="structure action/render"
    4545           />
    46   </span>
     46  </div>
    4747</form>

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentpage.pt

    r6025 r6461  
    5656    </table>
    5757    <br /><br />
    58     </div> 
     58    </div>
    5959</div>

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultycontainermanagepage.pt

    r6460 r6461  
    5151        </tbody>
    5252      </table>
    53       <span class="actionButtons" tal:condition="view/availableActions">
     53      <div class="actionButtons" tal:condition="view/availableActions">
    5454        <span tal:repeat="action view/actions"
    5555              tal:omit-tag="">
    … …  
    5757                 tal:replace="structure action/render"/>
    5858        </span>
    59       </span>
     59      </div>
    6060
    6161    </div>
Note: See TracChangeset for help on using the changeset viewer.