Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Give example values for CSS rules in embedding

This commit is contained in:
Robin Ward 2015-09-23 12:10:15 -04:00
parent 6b48647fc7
commit 7d4dbc9962
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/admin/components/embedding-setting.js.es6
View File

@ -6,6 +6,11 @@ export default Ember.Component.extend({
@computed('field') @computed('field')
inputId(field) { return field.dasherize(); }, inputId(field) { return field.dasherize(); },
@computed('placeholder')
placeholderValue(placeholder) {
return placeholder ? I18n.t(placeholder) : null;
},
@computed('field') @computed('field')
translationKey(field) { return `admin.embedding.${field}`; }, translationKey(field) { return `admin.embedding.${field}`; },

2
app/assets/javascripts/admin/templates/components/embedding-setting.hbs
View File

@ -5,7 +5,7 @@
</label> </label>
{{else}} {{else}}
<label for={{inputId}}>{{i18n translationKey}}</label> <label for={{inputId}}>{{i18n translationKey}}</label>
{{input value=value id=inputId}} {{input value=value id=inputId placeholder=placeholderValue}}
{{/if}} {{/if}}
<div class='clearfix'></div> <div class='clearfix'></div>

9
app/assets/javascripts/admin/templates/embedding.hbs
View File

@ -46,8 +46,13 @@
<h3>{{i18n "admin.embedding.crawling_settings"}}</h3> <h3>{{i18n "admin.embedding.crawling_settings"}}</h3>
<p class="description">{{i18n "admin.embedding.crawling_description"}}</p> <p class="description">{{i18n "admin.embedding.crawling_description"}}</p>
{{embedding-setting field="embed_whitelist_selector" value=embedding.embed_whitelist_selector}} {{embedding-setting field="embed_whitelist_selector"
{{embedding-setting field="embed_blacklist_selector" value=embedding.embed_blacklist_selector}} value=embedding.embed_whitelist_selector
placeholder="admin.embedding.whitelist_example"}}
{{embedding-setting field="embed_blacklist_selector"
value=embedding.embed_blacklist_selector
placeholder="admin.embedding.blacklist_example"}}
</div> </div>
<div class='embedding-secondary'> <div class='embedding-secondary'>

2
config/locales/client.en.yml
View File

@ -2592,7 +2592,9 @@ en:
embed_username_key_from_feed: "Key to pull discourse username from feed" embed_username_key_from_feed: "Key to pull discourse username from feed"
embed_truncate: "Truncate the embedded posts" embed_truncate: "Truncate the embedded posts"
embed_whitelist_selector: "CSS selector for elements that are allowed in embeds" embed_whitelist_selector: "CSS selector for elements that are allowed in embeds"
whitelist_example: "article, #story, .post"
embed_blacklist_selector: "CSS selector for elements that are removed from embeds" embed_blacklist_selector: "CSS selector for elements that are removed from embeds"
blacklist_example: ".ad-unit, header"
feed_polling_enabled: "Import posts via RSS/ATOM" feed_polling_enabled: "Import posts via RSS/ATOM"
feed_polling_url: "URL of RSS/ATOM feed to crawl" feed_polling_url: "URL of RSS/ATOM feed to crawl"
save: "Save Embedding Settings" save: "Save Embedding Settings"