commit 63a5c1df416c9b36d5d9320e52d5d9663839d4a8
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Sun Jun 3 00:42:30 2012 -0400
Actually show multiline descriptions as multiline
.../auth/templates/registration/profile.html | 5 ++---
.../extensions/templates/extensions/detail.html | 4 +---
sweettooth/review/templates/review/review.html | 4 +---
sweettooth/static/css/sweettooth.css | 1 +
.../js/templates/extensions/info_contents.mustache | 4 +---
sweettooth/static/js/templates/templatedata.js | 2 +-
6 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/sweettooth/auth/templates/registration/profile.html b/sweettooth/auth/templates/registration/profile.html
index 6323256..8ec2973 100644
--- a/sweettooth/auth/templates/registration/profile.html
+++ b/sweettooth/auth/templates/registration/profile.html
@@ -24,9 +24,8 @@
<h4 class="extension-name"><a href="{{ extension.get_absolute_url }}">
<img src="{{ extension.icon.url }}" class="icon"> {{ extension.name }}
</a></h4>
- <p class="description">
- {{ extension.description }}
- </p>
+
+ <p class="description">{{ extension.description }}</p>
</li>
{% endfor %}
</ul>
diff --git a/sweettooth/extensions/templates/extensions/detail.html b/sweettooth/extensions/templates/extensions/detail.html
index 15c903f..d28f41e 100644
--- a/sweettooth/extensions/templates/extensions/detail.html
+++ b/sweettooth/extensions/templates/extensions/detail.html
@@ -51,9 +51,7 @@
{% endblock %}
{% endif %}
- <p class="description" id="extension_description">
- {{ extension.description }}
- </p>
+ <p class="description" id="extension_description">{{ extension.description }}</p>
<dl>
{% if extension.url %}
diff --git a/sweettooth/review/templates/review/review.html b/sweettooth/review/templates/review/review.html
index 7874bc9..ca59090 100644
--- a/sweettooth/review/templates/review/review.html
+++ b/sweettooth/review/templates/review/review.html
@@ -22,9 +22,7 @@
{% endthumbnail %}
{% endif %}
- <p class="description">
- {{ extension.description }}
- </p>
+ <p class="description">{{ extension.description }}</p>
<dl>
{% if extension.url %}
diff --git a/sweettooth/static/css/sweettooth.css b/sweettooth/static/css/sweettooth.css
index ebf7835..8d54082 100644
--- a/sweettooth/static/css/sweettooth.css
+++ b/sweettooth/static/css/sweettooth.css
@@ -327,6 +327,7 @@ li.extension:last-child {
margin: 0.5em;
font-size: 1.2em;
overflow: auto;
+ white-space: pre-line;
}
.extension .screenshot {
diff --git a/sweettooth/static/js/templates/extensions/info_contents.mustache b/sweettooth/static/js/templates/extensions/info_contents.mustache
index 5e85f35..afeae4f 100644
--- a/sweettooth/static/js/templates/extensions/info_contents.mustache
+++ b/sweettooth/static/js/templates/extensions/info_contents.mustache
@@ -14,9 +14,7 @@
{{#creator}}
<span class="author">by <a href="{{creator_url}}"> {{creator}} </a></span>
{{/creator}}
-<p class="description">
- {{first_line_of_description}}
-</p>
+<p class="description">{{first_line_of_description}}</p>
{{#want_uninstall}}
<button class="uninstall" title="Uninstall">Uninstall</button>
{{/want_uninstall}}
diff --git a/sweettooth/static/js/templates/templatedata.js b/sweettooth/static/js/templates/templatedata.js
index c648e04..0b95837 100644
--- a/sweettooth/static/js/templates/templatedata.js
+++ b/sweettooth/static/js/templates/templatedata.js
@@ -5,7 +5,7 @@ define({
"extensions": {
"error_report_template": "What's wrong?\n\n\n\nWhat have you tried?\n\n\n\nAutomatically detected errors:\n\n{{#errors}}\n {{.}}\n\n================\n{{/errors}}\n{{^errors}}\nGNOME Shell Extensions did not detect any errors with this extension.\n{{/errors}}\n\nVersion information:\n\n Shell version: {{sv}}\n Extension version: {{#ev}}{{ev}}{{/ev}}{{^ev}}Unknown{{/ev}}",
"info": "<div class=\"extension\" data-uuid=\"{{uuid}}\">\n {{>extensions.info_contents}}\n</div>",
- "info_contents": "<div class=\"switch\"></div>\n<div class=\"extra-buttons\">\n <div class=\"upgrade-button\"></div>\n <div class=\"configure-button\"></div>\n</div>\n<h3 class=\"extension-name\">\n {{#link}}\n <a href=\"{{link}}\" class=\"title-link\"> <img src=\"{{icon}}\" class=\"icon\"> {{name}} </a>\n {{/link}}\n {{^link}}\n {{name}}\n {{/link}}\n</h3>\n{{#creator}}\n <span class=\"author\">by <a href=\"{{creator_url}}\"> {{creator}} </a></span>\n{{/creator}}\n<p class=\"description\">\n {{first_line_of_description}}\n</p>\n{{#want_uninstall}}\n <button class=\"uninstall\" title=\"Uninstall\">Uninstall</button>\n{{/want_uninstall}}",
+ "info_contents": "<div class=\"switch\"></div>\n<div class=\"extra-buttons\">\n <div class=\"upgrade-button\"></div>\n <div class=\"configure-button\"></div>\n</div>\n<h3 class=\"extension-name\">\n {{#link}}\n <a href=\"{{link}}\" class=\"title-link\"> <img src=\"{{icon}}\" class=\"icon\"> {{name}} </a>\n {{/link}}\n {{^link}}\n {{name}}\n {{/link}}\n</h3>\n{{#creator}}\n <span class=\"author\">by <a href=\"{{creator_url}}\"> {{creator}} </a></span>\n{{/creator}}\n<p class=\"description\">{{first_line_of_description}}</p>\n{{#want_uninstall}}\n <button class=\"uninstall\" title=\"Uninstall\">Uninstall</button>\n{{/want_uninstall}}",
"info_list": "<ul class=\"extensions\">\n{{#extensions}}\n <li class=\"extension\" data-svm=\"{{shell_version_map}}\">\n {{>extensions.info_contents}}\n </li>\n{{/extensions}}\n</ul>",
"uninstall": "You uninstalled <b>{{name}}</b>."
},