Changeset 11278 for main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco

Timestamp:

22 Feb 2014, 20:12:28 (11 years ago)

Author:

uli

Message:

Merge changes from henrik-diazo-themed.

Location:

main/kofacustom.ekodisco/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/kofacustom/ekodisco/browser/resources.py (deleted)
• src/kofacustom/ekodisco/browser/static/custom_theme.css (deleted)
• src/kofacustom/ekodisco/browser/static/favicon.ico (deleted)
• src/kofacustom/ekodisco/browser/tests.py (modified) (1 diff)
• src/kofacustom/ekodisco/browser/theming.py (deleted)
• src/kofacustom/ekodisco/interswitch/browser_templates/applicant_goto_interswitch.pt (modified) (1 diff)
• src/kofacustom/ekodisco/interswitch/browser_templates/student_goto_interswitch.pt (modified) (1 diff)
• src/kofacustom/ekodisco/students/browser_templates/studycoursepage.pt (modified) (1 diff)

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco/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('...EkoDisco 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/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco/interswitch/browser_templates/applicant_goto_interswitch.pt

@@ -72 +72 @@
   <span tal:replace="structure view/xml_data"></span>
 
-  <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
+  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
+
+  <br /><br />
+
+  <img src="/static/img/interswitch_verve_mastercard.gif" />
 
 </form>

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco/interswitch/browser_templates/student_goto_interswitch.pt

@@ -72 +72 @@
   <span tal:replace="structure view/xml_data"></span>
 
-  <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
+  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
+
+  <br /><br />
+
+  <img src="/static/img/interswitch_verve_mastercard.gif" />
 
 </form>

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco/students/browser_templates/studycoursepage.pt

@@ -1 +1 @@
 <table class="form-table" i18n:domain="waeup.kofa">
-  <thead>
-  </thead>
   <tbody>
     <tal:block repeat="widget view/widgets">