Ignore:
Timestamp:
22 Feb 2014, 20:28:32 (11 years ago)
Author:
uli
Message:

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

Location:
main/waeup.aaua/trunk
Files:
3 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.aaua/trunk

  • main/waeup.aaua/trunk/src

    • Property svn:ignore set to
      waeup.aaua.egg-info

  • main/waeup.aaua/trunk/src/waeup/aaua/browser/tests.py

    r10120 r11284  
    4848        clearSite()
    4949        shutil.rmtree(self.dc_root)
    50 
    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('...AAUA 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

  • main/waeup.aaua/trunk/src/waeup/aaua/interswitch/browser_templates/student_goto_interswitch.pt

    r10174 r11284  
    7272  <span tal:replace="structure view/xml_data"></span>
    7373
    74   <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
     74  <input type="submit" class="btn btn-primary" tal:attributes="value view/submit_button"/>
    7575
    7676  <br /><br />
    7777
    78   <img tal:attributes="src view/interswitch_img_url" />
     78  <img src="/static/img/interswitch_verve_mastercard.gif" />
    7979
    8080</form>
Note: See TracChangeset for help on using the changeset viewer.