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

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/trunk

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

  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantcontainerstatistics.pt

    r8643 r11254  
    11<tal:statistics define="stats context/statistics" i18n:domain="waeup.kofa">
    22  <h2 i18n:translate="">Container Statistics</h2>
    3   <table class="span8">
     3  <table class="table">
    44    <thead>
    55      <tr>
    … …  
    1717    </tbody>
    1818  </table>
    19   <table class="span8" tal:condition="python: stats[1]">
     19  <table class="table" tal:condition="python: stats[1]">
    2020    <thead>
    2121      <tr>

  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt

    r10353 r11254  
    4141    Application Fee Payment Tickets
    4242</h3>
    43 <table i18n:domain="waeup.kofa">
     43<table i18n:domain="waeup.kofa" class="table table-condensed">
    4444  <thead>
    4545    <tr>
    … …  
    5454  <tbody>
    5555    <tr tal:repeat="value context/values">
    56       <td> <a tal:attributes="href value/__name__">
     56      <td> <a tal:attributes="href python:view.url(value)">
    5757      <span tal:content="value/p_id">PID</span></a></td>
    5858      <td tal:content="python: layout.formatDatetime(value.creation_date)">CREATION DATE</td>

  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt

    r10353 r11254  
    3838        <td class="fieldname" i18n:translate="">Password:</td>
    3939        <td>
    40           <input name="password" type="password"  />
     40          <input class="form-control" name="password" type="password"  />
    4141        </td>
    4242      </tr>
    … …  
    4444        <td class="fieldname" i18n:translate="">Retype Password:</td>
    4545        <td>
    46           <input name="control_password" type="password" />
     46          <input class="form-control" name="control_password" type="password" />
    4747        </td>
    4848      </tr>
    … …  
    5050        <td class="fieldname" i18n:translate="">Application Transition:</td>
    5151        <td>
    52           <select id="transition" name="transition">
     52          <select id="transition" name="transition" class="form-control half">
    5353            <option tal:repeat="transition view/getTransitions"
    5454                    tal:attributes="value transition/name">
    … …  
    8484  </h3>
    8585
    86   <table>
     86  <table i18n:domain="waeup.kofa" class="table table-condensed">
    8787    <thead>
    8888    <tr>
    … …  
    104104         tal:condition="python: not view.unremovable(cl)" />
    105105        </td>
    106         <td> <a tal:attributes="href cl/__name__">
     106        <td> <a tal:attributes="href python:view.url(cl)">
    107107        <span tal:content="cl/p_id">PID</span></a></td>
    108108        <td tal:content="python: layout.formatDatetime(cl.creation_date)">CREATION DATE</td>

  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantregemailsent.pt

    r8855 r11254  
    1919<tal:credentials condition = "view/password" i18n:domain="waeup.kofa">
    2020  <h3 i18n:translate="">Your login credentials are:</h3>
    21   <table class="bordered-table span6">
     21  <table class="table-bordered">
    2222    <tr>
    2323      <td i18n:translate="">User Name:</td>

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

    r7737 r11254  
    11<form action="." tal:attributes="action request/URL" method="post"
    2   class="edit-form" enctype="multipart/form-data">
     2  enctype="multipart/form-data">
    33
    44  <table class="form-table">

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

    r9339 r11254  
    11<form action="." tal:attributes="action request/URL" method="POST"
    2   i18n:domain="waeup.kofa" class="edit-form" enctype="multipart/form-data">
     2  i18n:domain="waeup.kofa" enctype="multipart/form-data">
    33
    4   <ul class="tabs" data-tabs="tabs">
    5     <li tal:attributes="class view/tab1">
    6     <a href="#tab-1">
     4 <ul class="tabs nav nav-tabs" data-tabs="tabs">
     5    <li class="active">
     6    <a href="#tab1" data-toggle="tab">
    77      <span i18n:translate="">Settings
    88      </span></a>
    99    </li>
    10     <li tal:attributes="class view/tab2">
    11     <a href="#tab-2">
     10    <li>
     11    <a href="#tab2" data-toggle="tab">
    1212      <span i18n:translate="">Applicants
    1313      </span></a>
    1414    </li>
    15     <li tal:attributes="class view/tab3">
    16     <a href="#tab-3">
     15    <li>
     16    <a href="#tab3" data-toggle="tab">
    1717      <span i18n:translate="">Local Roles
    1818      </span></a>
    … …  
    2020  </ul>
    2121  <div class="tab-content">
    22     <div id="tab-1" tal:attributes="class view/tab1">
     22    <div id="tab1" class="active tab-pane">
     23      <br />
    2324      <table class="form-table">
    2425        <tbody>
    … …  
    3334      </div>
    3435    </div>
    35     <div id="tab-2" tal:attributes="class view/tab2">
     36    <div id="tab2" class="tab-pane">
    3637    <tal:showApplicants  condition="view/showApplicants">
    37     <input type="checkbox" onClick="toggle(this, 'val_id')" />
    38     <span  i18n:translate="">Select all</span>
    39     <br /><br />
    40 
    41       <table class="display dataTableManage">
     38      <br />
     39      <table class="kofa-data-table dataTableManage">
    4240        <thead>
    4341          <tr>
    … …  
    5553        </thead>
    5654        <tbody>
    57           <tr class="gradeC" tal:repeat="appl context/values">
     55          <tr tal:repeat="appl context/values">
    5856            <td>
    5957              <input type="checkbox" name="val_id" tal:attributes="value appl/__name__" />
    … …  
    7876        </tbody>
    7977      </table>
     78      <input type="checkbox" onClick="toggle(this, 'val_id')" />
     79      <span  i18n:translate="">Select all</span>
     80      <br /><br />
    8081      <div tal:condition="view/availableActions">
    8182        <span tal:repeat="action view/actions" tal:omit-tag="">
    … …  
    100101    </tal:showNoApplicants>
    101102    </div>
    102     <div id="tab-3" tal:attributes="class view/tab3"> <br />
    103       <table class="display dataTableManage">
     103    <div id="tab3" class="tab-pane"> <br />
     104      <table class="kofa-data-table dataTableManage">
    104105        <thead>
    105106          <tr>
    … …  
    115116        </thead>
    116117        <tbody>
    117           <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC"> <td>
     118          <tr tal:repeat="entry view/getUsersWithLocalRoles"> <td>
    118119              <input type="checkbox" name="role_id"
    119120                tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
    … …  
    132133      <table class="form-table">
    133134        <tr> <td>
    134             <select id="user" name="user">
     135            <select id="user" name="user" class="form-control">
    135136              <option tal:repeat="user view/getUsers"
    136137                      tal:attributes="value user/name">
    … …  
    139140              </option>
    140141            </select> </td> <td>
    141             <select id="local_role" name="local_role">
     142            <select id="local_role" name="local_role" class="form-control">
    142143              <option tal:repeat="localrole view/getLocalRoles"
    143144                      tal:attributes="value localrole/name">

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

    r8547 r11254  
    11<form action="." tal:attributes="action request/URL"
    22  i18n:domain="waeup.kofa" method="POST"  enctype="multipart/form-data">
    3   <ul class="tabs" data-tabs="tabs">
    4     <li tal:attributes="class view/tab1">
    5     <a href="#tab-1">
     3  <ul class="tabs nav nav-tabs" data-tabs="tabs">
     4    <li class="active">
     5    <a href="#tab1" data-toggle="tab">
    66      <span i18n:translate="">Introduction
    77      </span></a>
    88    </li>
    9     <li tal:attributes="class view/tab2">
    10     <a href="#tab-2">
     9    <li>
     10    <a href="#tab2" data-toggle="tab">
    1111      <span tal:content="view/subunits">Contents
    1212      </span></a>
    1313    </li>
    14     <li tal:attributes="class view/tab3">
    15     <a href="#tab-3">
     14    <li>
     15    <a href="#tab3" data-toggle="tab">
    1616      <span i18n:translate="">Local Roles
    1717      </span></a>
    … …  
    1919  </ul>
    2020  <div class="tab-content">
    21     <div id="tab-1" tal:attributes="class view/tab1">
     21    <div id="tab1" class="active tab-pane">
     22     <br />
    2223      <table class="form-table">
    2324        <tbody>
    … …  
    2526        </tbody>
    2627      </table>
    27 
    2828      <div tal:condition="view/availableActions">
    2929        <span tal:repeat="action view/actions" tal:omit-tag="">
    … …  
    3333      </div>
    3434    </div>
    35     <div id="tab-2" tal:attributes="class view/tab2">
    36       <h3 tal:content="view/subunits">SUBUNITS</h3>
    37 
     35    <div id="tab2" class="tab-pane">
     36      <br />
    3837      <p i18n:translate="note_armp">
    3938        Please note that containers will be opened in manage mode here.
    … …  
    4241        Please be patient until all records have been loaded.
    4342      </p>
    44 
    45       <table class="display dataTableManage">
     43      <table class="kofa-data-table dataTableManage">
    4644        <thead>
    4745          <tr>
    … …  
    5957        </thead>
    6058        <tbody>
    61           <tr tal:repeat="entry context/values"         class="gradeC"> <td>
     59          <tr tal:repeat="entry context/values"> <td>
    6260              <input type="checkbox" name="val_id"
    6361                tal:attributes="value entry/__name__" /> </td>
    … …  
    7876      </div>
    7977    </div>
    80     <div id="tab-3" tal:attributes="class view/tab3">
     78    <div id="tab3" class="tab-pane">
    8179      <br />
    82       <table class="display dataTableManage">
     80      <table class="kofa-data-table dataTableManage">
    8381        <thead>
    8482          <tr>
    … …  
    9492        </thead>
    9593        <tbody>
    96           <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC">
     94          <tr tal:repeat="entry view/getUsersWithLocalRoles">
    9795            <td> <input type="checkbox" name="role_id"
    9896                    tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" />  </td>
    … …  
    109107        </span>
    110108      </div> <br /><br />
    111       <table class="form-table">
    112         <tr> <td>
    113             <select id="user" name="user">
    114               <option tal:repeat="user view/getUsers"
    115                 tal:attributes="value user/name">
    116               <span tal:replace="user/val/title">USERTITLE
    117               </span>
    118               </option>
    119             </select> </td> <td>
    120             <select id="local_role" name="local_role">
    121               <option tal:repeat="localrole view/getLocalRoles"
    122                 tal:attributes="value localrole/name">
    123               <span tal:replace="localrole/title">LOCALROLETITLE
    124               </span>
    125               </option>
    126             </select> </td> <td>
    127             <div tal:condition="view/availableActions">
    128               <span tal:repeat="action view/actions" tal:omit-tag="">
    129                 <input tal:condition="python:action.label in view.tabthreeactions2"
    130                   tal:replace="structure action/render"/>
    131               </span>
    132             </div> </td>
    133         </tr>
    134       </table>
     109      <div class="form-inline">
     110        <br />
     111        <div class="form-group">
     112          <select id="user" name="user" class="form-control">
     113            <option tal:repeat="user view/getUsers"
     114                    tal:attributes="value user/name">
     115            <span tal:replace="user/val/title">USERTITLE
     116            </span>
     117            </option>
     118          </select>
     119        </div>
     120        <div class="form-group">
     121          <select id="local_role" name="local_role" class="form-control">
     122            <option tal:repeat="localrole view/getLocalRoles"
     123                    tal:attributes="value localrole/name">
     124            <span tal:replace="localrole/title">LOCALROLETITLE
     125            </span>
     126            </option>
     127          </select>
     128        </div>
     129        <div class="form-group" tal:condition="view/availableActions">
     130          <span tal:repeat="action view/actions" tal:omit-tag="">
     131            <input tal:condition="python:action.label in view.tabthreeactions2"
     132                   tal:replace="structure action/render"/>
     133          </span>
     134        </div>
     135      </div>
    135136    </div>
    136137  </div>

  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantsrootpage.pt

    r10097 r11254  
    44</span>
    55
    6 <table i18n:domain="waeup.kofa">
     6<table i18n:domain="waeup.kofa" class="table table-hover">
    77  <thead>
    88    <tr>
    … …  
    1414  </thead>
    1515  <tbody>
    16     <tr tal:repeat="entry view/containers" class="gradeC">
     16    <tr tal:repeat="entry view/containers">
    1717      <td tal:content="entry/year">Year
    1818      </td>

  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantssearchpage.pt

    r10645 r11254  
    1 <form method="POST" i18n:domain="waeup.kofa">
     1<form method="POST" i18n:domain="waeup.kofa" class="form-inline">
    22<br />
    3   <input class="btn primary" type="submit" name="search"
    4     tal:attributes="value view/search_button" />
     3  <div class="form-group">
     4    <input class="btn btn-primary" type="submit" name="search"
     5      tal:attributes="value view/search_button" />
     6  </div>
     7  <div class="form-group">
     8    <select name="searchtype" class="form-control">
     9      <option i18n:translate="" value="applicant_id">with id</option>
     10      <option i18n:translate="" value="fullname">with name</option>
     11      <option i18n:translate="" value="reg_number">with registration number</option>
     12      <option i18n:translate="" value="email">with email address</option>
     13    </select>
     14  </div>
     15  <div class="form-group">
     16    <input type="text" class="form-control" name="searchterm" />
     17  </div>
    518
    6   <select name="searchtype">
    7     <option i18n:translate="" value="applicant_id">with id</option>
    8     <option i18n:translate="" value="fullname">with name</option>
    9     <option i18n:translate="" value="reg_number">with registration number</option>
    10     <option i18n:translate="" value="email">with email address</option>
    11   </select>
    12 
    13   <input type="text" name="searchterm" />
    14 
    15   <p>&nbsp;</p>
     19  <br /><br />
    1620  <div tal:condition="view/results">
    1721    <h3 i18n:translate="">Search Results</h3>
    … …  
    2024    <input type="hidden" name="old_searchtype"
    2125         tal:attributes="value view/searchtype" />
    22     <table class="display dataTable">
     26    <table class="kofa-data-table dataTable">
    2327      <thead>
    2428      <tr>
    … …  
    3034      </thead>
    3135      <tbody>
    32       <tr tal:repeat="item view/results" class="gradeC">
     36      <tr tal:repeat="item view/results">
    3337        <td> <a tal:attributes="href python:view.url(item)">
    3438          <span tal:content="item/applicant_id">XXXX_1234</span></a>
    … …  
    4246      </tbody>
    4347    </table>
    44     <br />
    4548  </div>
    4649</form>

  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/exportjobsindex.pt

    r10655 r11254  
    1 <table i18n:domain="waeup.kofa">
     1<table i18n:domain="waeup.kofa" class="table table-condensed table-hover">
    22  <thead>
    33    <tr>
    … …  
    2525        <span tal:replace="job/creator">CREATOR</span>
    2626      </td>
    27       <td nowrap>
     27      <td>
    2828        <span tal:replace="job/start_time">DATETIME</span>
    2929      </td>
    … …  
    3232      </td>
    3333      <td nowrap>
    34         <a href="" class="btn" i18n:translate=""
     34        <a href="" class="btn btn-default btn-xs" i18n:translate=""
    3535           tal:condition="job/show_refresh_button">
    36           <img tal:attributes="src static/actionicon_reload.png" />
     36          <img src="/static/img/actionicon_reload.png" />
    3737          Reload
    3838        </a>
    3939        <form method="POST">
    40           <a href="" class="btn primary small"
     40          <a href="" class="btn btn-primary btn-xs"
    4141                 tal:attributes="href job/download_url"
    4242                 tal:condition="job/show_download_button">
    4343            Download</a>
    44 
    4544          <input type="hidden" name="job_id"
    4645                 tal:attributes="value job/job" />
    47           <input type="submit" class="btn small"
     46          <input type="submit" class="btn btn-default btn-xs"
    4847                 name="DISCARD" value="Discard"
    4948                 tal:condition="job/show_discard_button" />
    … …  
    5352  </tbody>
    5453</table>
     54
    5555<form method="POST" i18n:domain="waeup.kofa">
    56   <div class="span12">
    57 
    58   </div>
    59   <input class="btn primary" type="submit" name="CREATE"
     56  <input class="btn btn-primary" type="submit" name="CREATE"
    6057         value="Start new export"
    6158          />
Note: See TracChangeset for help on using the changeset viewer.