Skip to content
Browse files

Merge pull request #621 from cmcavoy/583-quotes-break-everything

fixes #583 hotfix to production
  • Loading branch information...
2 parents 6950f6d + 99a82eb commit 66f1ea65c2a65ebfd42481ce523be33b969f4000 @brianloveswords committed Feb 25, 2013
Showing with 4 additions and 4 deletions.
  1. +1 −1 controllers/demo.js
  2. +2 −2 views/backpack.html
  3. +1 −1 views/badges_partial.html
View
2 controllers/demo.js
@@ -89,7 +89,7 @@ function makeDemoAssertion(email, image, title, description) {
badge: {
version: 'v0.5.0',
name: 'DEMO: ' + (title || 'Open Badges Demo Badge'),
- description: description || "For rocking in the free world",
+ description: description || 'For rocking in the "free world"',
image: image,
criteria: '/demo/criteria',
issuer: {
View
4 views/backpack.html
@@ -26,7 +26,7 @@ <h4 class="alert-heading">Welcome to your Badge Backpack!</h4>
<h1><span data-title="Badges" data-content="These are the badges you've earned so far! Click on one to see its details." rel="popover">Badges{% if tooltips %}<i class="icon-info-sign"></i>{% endif %}</span></h1>
<div id="badges" class="js-badges">
{% for badge in badges %}
- <span draggable="true" class="openbadge" data-id="{{badge.attributes.id}}" rel="popinfo" data-title="{{badge.attributes.body.badge.name}}" data-content="<span>{{badge.attributes.body.badge.description}}</span><span>Issuer: {{badge.attributes.body.badge.issuer.name}}</span>">
+ <span draggable="true" class="openbadge" data-id="{{badge.attributes.id}}" rel="popinfo" data-title="{{badge.attributes.body.badge.name|escape}}" data-content="<span>{{badge.attributes.body.badge.description|escape}}</span><span>Issuer: {{badge.attributes.body.badge.issuer.name|escape}}</span>">
<img src="{{badge.attributes.image_path}}" width="64px"/>
</span>
{% endfor %}
@@ -67,7 +67,7 @@ <h4 class="alert-heading">Welcome to your Badge Backpack!</h4>
</span>
{% for badge in group.attributes.badgeObjects %}
- <span draggable="true" class="openbadge" data-id="{{badge.attributes.id}}" rel="popinfo" data-title="{{badge.attributes.body.badge.name}}" data-content="<span>{{badge.attributes.body.badge.description}}</span><span>Issuer: {{badge.attributes.body.badge.issuer.name}}</span>">
+ <span draggable="true" class="openbadge" data-id="{{badge.attributes.id}}" rel="popinfo" data-title="{{badge.attributes.body.badge.name|escape}}" data-content="<span>{{badge.attributes.body.badge.description|escape}}</span><span>Issuer: {{badge.attributes.body.badge.issuer.name|escape}}</span>">
<img src="{{badge.attributes.image_path}}" width="64px"/>
</span>
{% endfor %}
View
2 views/badges_partial.html
@@ -1,3 +1,3 @@
-<span draggable="true" class="openbadge" data-id="{{id}}" rel="popinfo" data-title="{{body.badge.name}}" data-content="<span>{{body.badge.description}}</span><span>Issuer: {{body.badge.issuer.name}}</span>">
+<span draggable="true" class="openbadge" data-id="{{id}}" rel="popinfo" data-title="{{body.badge.name|escape}}" data-content="<span>{{body.badge.description|escape}}</span><span>Issuer: {{body.badge.issuer.name|escape}}</span>">
<img src="{{image_path}}" width="64px"/>
</span>

0 comments on commit 66f1ea6

Please sign in to comment.
Something went wrong with that request. Please try again.