diff --git a/assets/javascripts/discourse/templates/user/subscriptions.hbs b/assets/javascripts/discourse/templates/user/subscriptions.hbs index 4f22b63..a18ac1a 100644 --- a/assets/javascripts/discourse/templates/user/subscriptions.hbs +++ b/assets/javascripts/discourse/templates/user/subscriptions.hbs @@ -1,33 +1,35 @@ -{{i18n 'discourse_subscriptions.user.subscriptions.title'}} +{{#d-section pageClass="user-subscriptions" class="user-content"}} +

{{i18n 'discourse_subscriptions.user.subscriptions.title'}}

-{{#if model}} - - - - - - - - - - {{#each model as |subscription|}} - - - - - - - - - {{/each}} -
{{i18n 'discourse_subscriptions.user.subscriptions.id'}}{{i18n 'discourse_subscriptions.user.plans.product'}}{{i18n 'discourse_subscriptions.user.plans.rate'}}{{i18n 'discourse_subscriptions.user.subscriptions.status'}}{{i18n 'discourse_subscriptions.user.subscriptions.created_at'}}
{{subscription.id}}{{subscription.product.name}}{{subscription.plan.subscriptionRate}}{{subscription.status}}{{format-unix-date subscription.created}} - {{#if subscription.loading}} - {{loading-spinner size="small"}} - {{else}} - {{d-button disabled=subscription.canceled label="cancel" action=(route-action "cancelSubscription" subscription) icon="times"}} - {{/if}} -
-{{else}} -

{{i18n 'discourse_subscriptions.user.subscriptions_help'}}

-{{/if}} + {{#if model}} + + + + + + + + + + {{#each model as |subscription|}} + + + + + + + + + {{/each}} +
{{i18n 'discourse_subscriptions.user.subscriptions.id'}}{{i18n 'discourse_subscriptions.user.plans.product'}}{{i18n 'discourse_subscriptions.user.plans.rate'}}{{i18n 'discourse_subscriptions.user.subscriptions.status'}}{{i18n 'discourse_subscriptions.user.subscriptions.created_at'}}
{{subscription.id}}{{subscription.product.name}}{{subscription.plan.subscriptionRate}}{{subscription.status}}{{format-unix-date subscription.created}} + {{#if subscription.loading}} + {{loading-spinner size="small"}} + {{else}} + {{d-button disabled=subscription.canceled label="cancel" action=(route-action "cancelSubscription" subscription) icon="times"}} + {{/if}} +
+ {{else}} +

{{i18n 'discourse_subscriptions.user.subscriptions_help'}}

+ {{/if}} +{{/d-section}} diff --git a/assets/stylesheets/common/main.scss b/assets/stylesheets/common/main.scss index 9c17d98..a42e7b3 100644 --- a/assets/stylesheets/common/main.scss +++ b/assets/stylesheets/common/main.scss @@ -28,12 +28,18 @@ textarea[readonly] { text-align: right; } -table.discourse-patrons-user-table { +table.discourse-subscriptions-user-table { width: 100%; th, td { padding: 10px; } + th:first-child, + td:first-child, + th:last-child, + td:last-child { + padding-left: 0; + } } .desc {