From 2e7c5e5f3596a8cee5d0ee48eadd7de244e8a908 Mon Sep 17 00:00:00 2001
From: Erick Guan
Date: Fri, 3 Apr 2015 18:40:17 +0800
Subject: [PATCH] FIX: unmatched element prevents HTMLbars from compiling
---
.../admin/templates/customize_css_html.hbs | 16 +++++++++-------
.../admin/templates/logs/screened_emails.hbs | 2 +-
.../admin/templates/logs/screened_urls.hbs | 2 +-
.../admin/templates/logs/staff_action_logs.hbs | 2 +-
.../discourse/templates/choose_topic.hbs | 1 -
.../templates/components/pagedown-editor.hbs | 1 +
.../javascripts/discourse/templates/topic.hbs | 2 +-
7 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/app/assets/javascripts/admin/templates/customize_css_html.hbs b/app/assets/javascripts/admin/templates/customize_css_html.hbs
index e5e08632ae4..004318e1ebf 100644
--- a/app/assets/javascripts/admin/templates/customize_css_html.hbs
+++ b/app/assets/javascripts/admin/templates/customize_css_html.hbs
@@ -33,13 +33,15 @@
{{fa-icon "mobile"}}
-
- {{#if view.maximized}}
- {{fa-icon "compress"}}
- {{else}}
- {{fa-icon "expand"}}
- {{/if}}
-
+
+
+ {{#if view.maximized}}
+ {{fa-icon "compress"}}
+ {{else}}
+ {{fa-icon "expand"}}
+ {{/if}}
+
+
diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails.hbs b/app/assets/javascripts/admin/templates/logs/screened_emails.hbs
index f231c391943..506ede054dd 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_emails.hbs
@@ -2,7 +2,7 @@
{{i18n 'admin.logs.screened_emails.description'}}
-
+
{{#loading-spinner condition=loading}}
{{#if model.length}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls.hbs b/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
index 701909ff564..aba722a9c79 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
@@ -2,7 +2,7 @@
{{i18n 'admin.logs.screened_urls.description'}}
-
+
{{#loading-spinner condition=loading}}
{{#if model.length}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs b/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
index 58a5ba72a1c..c5ce3aa46e0 100644
--- a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
@@ -31,7 +31,7 @@
{{d-button action="exportStaffActionLogs" label="admin.export_csv.button_text" icon="download"}}
-
+
{{i18n 'admin.logs.staff_actions.instructions'}}
diff --git a/app/assets/javascripts/discourse/templates/choose_topic.hbs b/app/assets/javascripts/discourse/templates/choose_topic.hbs
index b13c9778904..3300b22b6ec 100644
--- a/app/assets/javascripts/discourse/templates/choose_topic.hbs
+++ b/app/assets/javascripts/discourse/templates/choose_topic.hbs
@@ -19,6 +19,5 @@
{{/each}}
-
{{/if}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/pagedown-editor.hbs b/app/assets/javascripts/discourse/templates/components/pagedown-editor.hbs
index f5c59ac08e2..0c3cfc69a2c 100644
--- a/app/assets/javascripts/discourse/templates/components/pagedown-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/pagedown-editor.hbs
@@ -1,3 +1,4 @@
{{textarea value=value elementId="wmd-input"}}
+
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index f1c0e22c4e0..ae4afee8faf 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -16,7 +16,7 @@
{{autofocus-text-field id='edit-title' value=buffered.title maxLength=maxTitleLength}}
{{else}}
{{autofocus-text-field id='edit-title' value=buffered.title maxLength=maxTitleLength}}
-
+
{{category-chooser valueAttribute="id" value=buffered.category_id source=buffered.category_id}}
{{/if}}