Changeset 11315 for main/waeup.uniben/trunk/src/waeup

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:

• . (modified) (2 props)
• src/waeup/uniben (modified) (1 prop)
• src/waeup/uniben/applicants/browser_templates/applicantdisplaypage.pt (modified) (2 diffs)
• src/waeup/uniben/browser/resources.py (deleted)
• src/waeup/uniben/browser/static/custom_theme.css (deleted)
• src/waeup/uniben/browser/static/favicon.ico (deleted)
• src/waeup/uniben/browser/tests.py (modified) (1 diff)
• src/waeup/uniben/browser/theming.py (deleted)
• src/waeup/uniben/interswitch/browser_templates/applicant_goto_interswitch.pt (modified) (2 diffs)
• src/waeup/uniben/interswitch/browser_templates/student_goto_interswitch.pt (modified) (2 diffs)
• src/waeup/uniben/students/browser_templates/studyleveleditpage.pt (modified) (4 diffs)
• src/waeup/uniben/students/browser_templates/studylevelpage.pt (modified) (3 diffs)

main/waeup.uniben/trunk

@@ -5 +5 @@
 develop-eggs
 parts
+sources
 var

@@ -5 +5 @@
 develop-eggs
 parts
+sources
 var

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

@@ -86 +86 @@
     Application Fee Payment Tickets
 </h3>
-<table i18n:domain="waeup.kofa">
+<table i18n:domain="waeup.kofa" class="table table-condensed">
   <thead>
     <tr>
@@ -99 +99 @@
   <tbody>
     <tr tal:repeat="value context/values">
-      <td> <a tal:attributes="href value/__name__">
+      <td> <a tal:attributes="href python:view.url(value)">
       <span tal:content="value/p_id">PID</span></a></td>
       <td tal:content="python: layout.formatDatetime(value.creation_date)">CREATION DATE</td>

main/waeup.uniben/trunk/src/waeup/uniben/browser/tests.py

@@ -49 +49 @@
         shutil.rmtree(self.dc_root)
 
-    def test_custom_theme(self):
-        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.browser.open('http://localhost/app/configuration')
-        self.assertMatches('...Uniben Theme...', self.browser.contents)
-        self.browser.getControl(name="form.skin").value = ['custom theme']
-        self.browser.getControl("Save").click()
-        self.browser.open('http://localhost/app/configuration')
-        return
-
     def test_access_live_url(self):
         # We can't access the system with basic authentication

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser_templates/applicant_goto_interswitch.pt

@@ -8 +8 @@
 
   <table class="form-table" i18n:domain="waeup.kofa">
-    <thead>
-    </thead>
     <tbody>
       <tr>
@@ -71 +69 @@
   <input type="hidden" name="payment_params" value="college_split" />
   <span tal:replace="structure view/xml_data"></span>
+  <br />
+  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
 
-  <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
+  <br /><br />
+
+  <img src="/static/img/interswitch_verve_mastercard.gif" />
 
 </form>

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser_templates/student_goto_interswitch.pt

@@ -8 +8 @@
 
   <table class="form-table" i18n:domain="waeup.kofa">
-    <thead>
-    </thead>
     <tbody>
       <tr>
@@ -71 +69 @@
   <input type="hidden" name="payment_params" value="college_split" />
   <span tal:replace="structure view/xml_data"></span>
+  <br />
+  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
 
-  <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
+  <br /><br />
+
+  <img src="/static/img/interswitch_verve_mastercard.gif" />
 
 </form>

main/waeup.uniben/trunk/src/waeup/uniben/students/browser_templates/studyleveleditpage.pt

@@ -8 +8 @@
       tal:replace="view/context/total_credits">TOTAL</span>)
   </h3>
-  <table class="display dataTableManage">
+  <table class="kofa-data-table dataTableManage">
   <thead>
     <tr>
@@ -23 +23 @@
   </thead>
   <tbody>
-    <tr tal:repeat="value view/translated_values" class="gradeC">
+    <tr tal:repeat="value view/translated_values">
        <td>
         <input type="checkbox" name="val_id"
@@ -30 +30 @@
       </td>
       <td tal:content="value/semester" nowrap>TERM</td>
-      <td> <a tal:attributes="href value/__name__">
+      <td> <a tal:attributes="href value/url">
       <span tal:content="value/code">CODE</span>
       </a></td>
@@ -49 +49 @@
     </span>
   </div>
+
   <br /><br /><br />
   <table class="input-table">

main/waeup.uniben/trunk/src/waeup/uniben/students/browser_templates/studylevelpage.pt

@@ -1 +1 @@
 <table class="form-table" i18n:domain="waeup.kofa">
-  <thead>
-  </thead>
   <tbody>
     <tal:block repeat="widget view/widgets">
@@ -20 +18 @@
 <h3 i18n:domain="waeup.kofa" i18n:translate="">Course Tickets</h3>
 
-<table class="display dataTable" i18n:domain="waeup.kofa">
+<table class="kofa-data-table dataTable" i18n:domain="waeup.kofa">
   <thead>
     <tr>
@@ -36 +34 @@
   </thead>
   <tbody>
-    <tr tal:repeat="value view/translated_values" class="gradeC">
+    <tr tal:repeat="value view/translated_values">
       <td tal:content="value/semester" nowrap>TERM</td>
-      <td> <a tal:attributes="href value/__name__">
+      <td> <a tal:attributes="href value/url">
       <span tal:content="value/code">CODE</span>
       </a></td>

@@ -5 +5 @@
 develop-eggs
 parts
+sources
 var