Changeset 11303 for main/waeup.kwarapoly/trunk/src/waeup

Timestamp:

22 Feb 2014, 21:00:38 (11 years ago)

Author:

uli

Message:

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

Location:

main/waeup.kwarapoly/trunk

Files:

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

main/waeup.kwarapoly/trunk

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

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

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

@@ -48 +48 @@
         clearSite()
         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('...KwaraPoly 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

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/browser.py

@@ -52 +52 @@
 #URL = '/test_paydirect/services/TransactionQueryWs.asmx'
 httplib.HTTPConnection.debuglevel = 0
-
-def interswitch_img_url(view):
-    static = view.static
-    if static is None or static.get(
-        'interswitch_verve_mastercard.gif', None) is None:
-        static = queryAdapter(
-            view.request, Interface, name='waeup.kwarapoly.interswitch')
-    return static['interswitch_verve_mastercard.gif']()
 
 class InterswitchPageStudent(KofaPage):

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

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

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

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

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