Merge branch 'master' into WebGUI8. Merged up to 7.10.4

This commit is contained in:
Colin Kuskie 2010-11-03 09:47:36 -07:00
commit 5f3014aaee
66 changed files with 3078 additions and 997 deletions

View file

@ -12,11 +12,24 @@ templates, you will need to apply these changes manually to your copies.
toggle.url => toggle_url
toggle.text => toggle_text
7.10.4
* DataForm email template - default_email
Do HTML escaping on field values. Move table tags outside of the loops so only one table
is generated.
* Template Variable template
The URL for that template has been changed from "help" to "root/import/adminconsole/help", making
the short URL Help available for WebGUI content use.
* EMS Badge Listing template - root/import/ems/ems-badge-listing-default
Changed the javascript to use a custom formatter for the Badge price.
7.10.3
* Carousel Default Template - root/import/carousel/carousel-default
Add a height parameter to the template.
* survey.css
Removed relative positioning and offset from top.