From 0a6ade7ab9e5458ec59a6733c74616f0b90f26eb Mon Sep 17 00:00:00 2001 From: Rimian Perkins Date: Tue, 8 Oct 2019 22:26:58 +1100 Subject: [PATCH] stylin, translations --- .../admin-plugins-discourse-patrons-plans-index.js.es6 | 2 +- .../admin-plugins-discourse-patrons-plans-index.js.es6 | 2 +- .../admin/plugins-discourse-patrons-plans-show.hbs | 1 - .../admin/plugins-discourse-patrons-plans.hbs | 10 ++++++---- .../admin/plugins-discourse-patrons-subscriptions.hbs | 7 +------ .../templates/admin/plugins-discourse-patrons.hbs | 4 +++- assets/stylesheets/common/discourse-patrons.scss | 6 ++++++ config/locales/client.en.yml | 6 +++--- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/assets/javascripts/discourse/controllers/admin-plugins-discourse-patrons-plans-index.js.es6 b/assets/javascripts/discourse/controllers/admin-plugins-discourse-patrons-plans-index.js.es6 index afbfd52..825ed23 100644 --- a/assets/javascripts/discourse/controllers/admin-plugins-discourse-patrons-plans-index.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-plugins-discourse-patrons-plans-index.js.es6 @@ -6,7 +6,7 @@ export default Ember.Controller.extend({ plan.destroy().then(() => this.controllerFor("adminBackupsIndex") .get("model") - .removeObject(backup) + .removeObject(plan) ); }, diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-plans-index.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-plans-index.js.es6 index 07ad8ff..ac02092 100644 --- a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-plans-index.js.es6 +++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-plans-index.js.es6 @@ -8,7 +8,7 @@ export default Discourse.Route.extend({ actions: { destroyPlan(plan) { bootbox.confirm( - I18n.t("discourse-patrons.plans.operations.destroy.confirm"), + I18n.t("discourse_patrons.admin.plans.operations.destroy.confirm"), I18n.t("no_value"), I18n.t("yes_value"), confirmed => { diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-plans-show.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-plans-show.hbs index a0f55fc..48f83c4 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-plans-show.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-plans-show.hbs @@ -1,5 +1,4 @@ -

{{i18n 'discourse_patrons.admin.plans.title'}}

diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-plans.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-plans.hbs index edb56b6..44a0050 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-plans.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-plans.hbs @@ -1,7 +1,9 @@ -{{#link-to 'adminPlugins.discourse-patrons.plans.show' 'new' class="btn btn-primary"}} - {{d-icon "plus"}} - {{i18n 'discourse_patrons.admin.plans.new'}} -{{/link-to}} +

+ {{#link-to 'adminPlugins.discourse-patrons.plans.show' 'new' class="btn btn-primary"}} + {{d-icon "plus"}} + {{i18n 'discourse_patrons.admin.plans.new'}} + {{/link-to}} +

{{outlet}} diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs index b410359..8c677b9 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs @@ -1,18 +1,13 @@ -

{{i18n 'discourse_patrons.admin.plans'}}

+

{{i18n 'discourse_patrons.admin.subscriptions.title'}}

- - - - {{#each model as |subscription|}} - {{/each}}
Plan NameIntervalProductAmount
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons.hbs index 785989a..e6181f0 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons.hbs @@ -9,4 +9,6 @@
-{{outlet}} +
+ {{outlet}} +
diff --git a/assets/stylesheets/common/discourse-patrons.scss b/assets/stylesheets/common/discourse-patrons.scss index 194986a..2f0e01a 100644 --- a/assets/stylesheets/common/discourse-patrons.scss +++ b/assets/stylesheets/common/discourse-patrons.scss @@ -32,6 +32,12 @@ } } +#discourse-patrons-admin { + .btn-right { + text-align: right; + } +} + .discourse-patrons-admin { .amount { text-align: right; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 2150342..6717294 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -60,8 +60,8 @@ en: nickname: Nickname interval: Interval amount: Amount - operations: - destroy: - confirm: Are you sure you want to destroy this plan? + operations: + destroy: + confirm: Are you sure you want to destroy this plan? subscriptions: title: Subscriptions