Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEV: Use angle bracket syntax #173

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,36 @@

{{#if houseAds.length}}
<form class="form-horizontal">
{{house-ads-list-setting
name="topic_list_top"
value=adSettings.topic_list_top
allAds=houseAds
adSettings=adSettings
}}
{{house-ads-list-setting
name="topic_above_post_stream"
value=adSettings.topic_above_post_stream
allAds=houseAds
adSettings=adSettings
}}
{{house-ads-list-setting
name="topic_above_suggested"
value=adSettings.topic_above_suggested
allAds=houseAds
adSettings=adSettings
}}
{{house-ads-list-setting
name="post_bottom"
value=adSettings.post_bottom
allAds=houseAds
adSettings=adSettings
}}
{{house-ads-list-setting
name="topic_list_between"
value=adSettings.topic_list_between
allAds=houseAds
adSettings=adSettings
}}
<HouseAdsListSetting
@name="topic_list_top"
@value={{adSettings.topic_list_top}}
@allAds={{houseAds}}
@adSettings={{adSettings}}
/>
<HouseAdsListSetting
@name="topic_above_post_stream"
@value={{adSettings.topic_above_post_stream}}
@allAds={{houseAds}}
@adSettings={{adSettings}}
/>
<HouseAdsListSetting
@name="topic_above_suggested"
@value={{adSettings.topic_above_suggested}}
@allAds={{houseAds}}
@adSettings={{adSettings}}
/>
<HouseAdsListSetting
@name="post_bottom"
@value={{adSettings.post_bottom}}
@allAds={{houseAds}}
@adSettings={{adSettings}}
/>
<HouseAdsListSetting
@name="topic_list_between"
@value={{adSettings.topic_list_between}}
@allAds={{houseAds}}
@adSettings={{adSettings}}
/>

<DButton
@label="admin.adplugin.house_ads.more_settings"
Expand All @@ -43,9 +43,9 @@
</form>
{{else}}
<p>
{{#link-to "adminPlugins.houseAds.show" "new"}}
<LinkTo @route="adminPlugins.houseAds.show" @model="new">
{{i18n "admin.adplugin.house_ads.get_started"}}
{{/link-to}}
</LinkTo>
</p>
{{/if}}
</DSection>
16 changes: 10 additions & 6 deletions assets/javascripts/discourse/templates/admin/plugins-house-ads.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,25 @@
{{#if model.length}}
<div class="content-list">
<div class="house-ads-actions">
{{#link-to "adminPlugins.houseAds.show" "new" class="btn btn-primary"}}
<LinkTo
@route="adminPlugins.houseAds.show"
@model="new"
class="btn btn-primary"
>
{{d-icon "plus"}}
<span>{{i18n "admin.adplugin.house_ads.new"}}</span>
{{/link-to}}
{{#link-to "adminPlugins.houseAds.index" class="btn btn-default"}}
</LinkTo>
<LinkTo @route="adminPlugins.houseAds.index" class="btn btn-default">
{{d-icon "cog"}}
<span>{{i18n "admin.adplugin.house_ads.settings"}}</span>
{{/link-to}}
</LinkTo>
</div>
<ul class="house-ads-list">
{{#each model as |ad|}}
<li class="house-ads-list-item">
{{#link-to "adminPlugins.houseAds.show" ad.id}}
<LinkTo @route="adminPlugins.houseAds.show" @model={{ad.id}}>
{{ad.name}}
{{/link-to}}
</LinkTo>
</li>
{{/each}}
</ul>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<label for={{name}}>{{title}}</label>
{{house-ads-chooser
settingValue=adValue
choices=adNames
onChange=(action (mut adValue))
}}
<HouseAdsChooser
@settingValue={{adValue}}
@choices={{adNames}}
@onChange={{action (mut adValue)}}
/>
<div class="setting-controls">
{{#if changed}}
<DButton class="ok" @action={{action "save"}} @icon="check" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ad-slot
placement="post-bottom"
category=model.topic.category.slug
postNumber=model.post_number
}}
<AdSlot
@placement="post-bottom"
@category={{model.topic.category.slug}}
@postNumber={{model.post_number}}
/>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{{ad-slot
placement="topic-list-between"
refreshOnChange=listLoading
category=category.slug
listLoading=listLoading
indexNumber=index
childTagName="td"
}}
<AdSlot
@placement="topic-list-between"
@refreshOnChange={{listLoading}}
@category={{category.slug}}
@listLoading={{listLoading}}
@indexNumber={{index}}
@childTagName="td"
/>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{ad-slot
placement="topic-list-top"
refreshOnChange=listLoading
category=category.slug
listLoading=listLoading
}}
<AdSlot
@placement="topic-list-top"
@refreshOnChange={{listLoading}}
@category={{category.slug}}
@listLoading={{listLoading}}
/>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{post-bottom-ad model=this}}
<PostBottomAd @model={{this}} />
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ad-slot
placement="topic-above-post-stream"
refreshOnChange=model.id
category=model.category.slug
}}
<AdSlot
@placement="topic-above-post-stream"
@refreshOnChange={{model.id}}
@category={{model.category.slug}}
/>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ad-slot
placement="topic-above-suggested"
refreshOnChange=model.id
category=model.category.slug
}}
<AdSlot
@placement="topic-above-suggested"
@refreshOnChange={{model.id}}
@category={{model.category.slug}}
/>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"author": "Discourse",
"license": "MIT",
"devDependencies": {
"eslint-config-discourse": "^2.0.0"
"eslint-config-discourse": "^3.4.0"
}
}
Loading
Loading