Ignore:
Timestamp:
22 Feb 2014, 21:25:56 (11 years ago)
Author:
uli
Message:

Merge changes from henrik-diazo-themed back into trunk.

Location:
main/waeup.uniben/trunk
Files:
4 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.uniben/trunk

  • main/waeup.uniben/trunk/src/waeup/uniben

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

    r10622 r11315  
    8686    Application Fee Payment Tickets
    8787</h3>
    88 <table i18n:domain="waeup.kofa">
     88<table i18n:domain="waeup.kofa" class="table table-condensed">
    8989  <thead>
    9090    <tr>
     
    9999  <tbody>
    100100    <tr tal:repeat="value context/values">
    101       <td> <a tal:attributes="href value/__name__">
     101      <td> <a tal:attributes="href python:view.url(value)">
    102102      <span tal:content="value/p_id">PID</span></a></td>
    103103      <td tal:content="python: layout.formatDatetime(value.creation_date)">CREATION DATE</td>
  • main/waeup.uniben/trunk/src/waeup/uniben/browser/tests.py

    r8441 r11315  
    4949        shutil.rmtree(self.dc_root)
    5050
    51     def test_custom_theme(self):
    52         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
    53         self.browser.open('http://localhost/app/configuration')
    54         self.assertMatches('...Uniben Theme...', self.browser.contents)
    55         self.browser.getControl(name="form.skin").value = ['custom theme']
    56         self.browser.getControl("Save").click()
    57         self.browser.open('http://localhost/app/configuration')
    58         return
    59 
    6051    def test_access_live_url(self):
    6152        # We can't access the system with basic authentication
  • main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser_templates/applicant_goto_interswitch.pt

    r9994 r11315  
    88
    99  <table class="form-table" i18n:domain="waeup.kofa">
    10     <thead>
    11     </thead>
    1210    <tbody>
    1311      <tr>
     
    7169  <input type="hidden" name="payment_params" value="college_split" />
    7270  <span tal:replace="structure view/xml_data"></span>
     71  <br />
     72  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
    7373
    74   <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
     74  <br /><br />
     75
     76  <img src="/static/img/interswitch_verve_mastercard.gif" />
    7577
    7678</form>
  • main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser_templates/student_goto_interswitch.pt

    r9994 r11315  
    88
    99  <table class="form-table" i18n:domain="waeup.kofa">
    10     <thead>
    11     </thead>
    1210    <tbody>
    1311      <tr>
     
    7169  <input type="hidden" name="payment_params" value="college_split" />
    7270  <span tal:replace="structure view/xml_data"></span>
     71  <br />
     72  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
    7373
    74   <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
     74  <br /><br />
     75
     76  <img src="/static/img/interswitch_verve_mastercard.gif" />
    7577
    7678</form>
  • main/waeup.uniben/trunk/src/waeup/uniben/students/browser_templates/studyleveleditpage.pt

    r10441 r11315  
    88      tal:replace="view/context/total_credits">TOTAL</span>)
    99  </h3>
    10   <table class="display dataTableManage">
     10  <table class="kofa-data-table dataTableManage">
    1111  <thead>
    1212    <tr>
     
    2323  </thead>
    2424  <tbody>
    25     <tr tal:repeat="value view/translated_values" class="gradeC">
     25    <tr tal:repeat="value view/translated_values">
    2626       <td>
    2727        <input type="checkbox" name="val_id"
     
    3030      </td>
    3131      <td tal:content="value/semester" nowrap>TERM</td>
    32       <td> <a tal:attributes="href value/__name__">
     32      <td> <a tal:attributes="href value/url">
    3333      <span tal:content="value/code">CODE</span>
    3434      </a></td>
     
    4949    </span>
    5050  </div>
     51
    5152  <br /><br /><br />
    5253  <table class="input-table">
  • main/waeup.uniben/trunk/src/waeup/uniben/students/browser_templates/studylevelpage.pt

    r10441 r11315  
    11<table class="form-table" i18n:domain="waeup.kofa">
    2   <thead>
    3   </thead>
    42  <tbody>
    53    <tal:block repeat="widget view/widgets">
     
    2018<h3 i18n:domain="waeup.kofa" i18n:translate="">Course Tickets</h3>
    2119
    22 <table class="display dataTable" i18n:domain="waeup.kofa">
     20<table class="kofa-data-table dataTable" i18n:domain="waeup.kofa">
    2321  <thead>
    2422    <tr>
     
    3634  </thead>
    3735  <tbody>
    38     <tr tal:repeat="value view/translated_values" class="gradeC">
     36    <tr tal:repeat="value view/translated_values">
    3937      <td tal:content="value/semester" nowrap>TERM</td>
    40       <td> <a tal:attributes="href value/__name__">
     38      <td> <a tal:attributes="href value/url">
    4139      <span tal:content="value/code">CODE</span>
    4240      </a></td>
Note: See TracChangeset for help on using the changeset viewer.