IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 03:33:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3327 from fantasticfears/fix-templates

Browse Source 
FIX: unmatched element prevents HTMLbars from compiling
This commit is contained in:
Régis Hanol 2015-04-03 14:10:26 +02:00
commit 1c4fd78cf6
7 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/admin/templates/customize_css_html.hbs
View File

@ -33,13 +33,15 @@
<li class='toggle-mobile'>
<a {{bind-attr class="view.mobile:active"}} {{action "toggleMobile" target="view"}}>{{fa-icon "mobile"}}</a>
</li>
<li class='toggle-maximize'><a {{action "toggleMaximize" target="view"}}>
{{#if view.maximized}}
{{fa-icon "compress"}}
{{else}}
{{fa-icon "expand"}}
{{/if}}
</a>
<li class='toggle-maximize'>
<a {{action "toggleMaximize" target="view"}}>
{{#if view.maximized}}
{{fa-icon "compress"}}
{{else}}
{{fa-icon "expand"}}
{{/if}}
</a>
</li>
</ul>
</div>

2
app/assets/javascripts/admin/templates/logs/screened_emails.hbs
View File

@ -2,7 +2,7 @@
{{i18n 'admin.logs.screened_emails.description'}}
<button class="btn pull-right" {{action "exportScreenedEmailList"}} title="{{i18n 'admin.export_csv.button_title.screened_email'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
</p>
</br>
<br>
{{#loading-spinner condition=loading}}
{{#if model.length}}

2
app/assets/javascripts/admin/templates/logs/screened_urls.hbs
View File

@ -2,7 +2,7 @@
{{i18n 'admin.logs.screened_urls.description'}}
<button class="btn pull-right" {{action "exportScreenedUrlList"}} title="{{i18n 'admin.export_csv.button_title.screened_url'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
</p>
</br>
<br>
{{#loading-spinner condition=loading}}
{{#if model.length}}

2
app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
View File

@ -31,7 +31,7 @@
<div class="pull-right">
{{d-button action="exportStaffActionLogs" label="admin.export_csv.button_text" icon="download"}}
</div>
</br>
<br>
<div class="staff-action-logs-instructions" {{bind-attr class=":staff-action-logs-instructions showInstructions::invisible"}}>
{{i18n 'admin.logs.staff_actions.instructions'}}

1
app/assets/javascripts/discourse/templates/choose_topic.hbs
View File

@ -19,6 +19,5 @@
</label>
</div>
{{/each}}
</ul>
{{/if}}
{{/if}}

1
app/assets/javascripts/discourse/templates/components/pagedown-editor.hbs
View File

@ -1,3 +1,4 @@
<div id='wmd-button-bar'></div>
{{textarea value=value elementId="wmd-input"}}
<div id='wmd-preview' {{bind-attr class=":preview value::hidden"}}>
</div>

2
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -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}}
</br>
<br>
{{category-chooser valueAttribute="id" value=buffered.category_id source=buffered.category_id}}
{{/if}}