diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6 index 3c27f644b..b03c9a5f8 100644 --- a/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6 +++ b/app/assets/javascripts/admin/components/admin-web-hook-event.js.es6 @@ -26,7 +26,7 @@ export default Ember.Component.extend({ @computed('model.duration') completion(duration) { const seconds = Math.floor(duration / 10.0) / 100.0; - return I18n.t('admin.web_hooks.events.completion', { seconds }); + return I18n.t('admin.web_hooks.events.completed_in', { count: seconds }); }, actions: { diff --git a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs index be4252c42..026b6daae 100644 --- a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs @@ -1,4 +1,4 @@ -
+
{{model.status}}
{{model.id}}
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs index 9b4f1e80a..f3b8825e5 100644 --- a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs +++ b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs @@ -10,14 +10,22 @@
{{#if model}} - {{#if hasIncoming}} -
- {{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}} - {{i18n 'click_to_show'}} -
- {{/if}} {{#load-more selector=".web-hook-events li" action="loadMore"}}
+
+
{{i18n 'admin.web_hooks.events.status'}}
+
{{i18n 'admin.web_hooks.events.event_id'}}
+
{{i18n 'admin.web_hooks.events.timestamp'}}
+
{{i18n 'admin.web_hooks.events.completion'}}
+
{{i18n 'admin.web_hooks.events.actions'}}
+
+
+ {{#if hasIncoming}} +
+ {{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}} + {{i18n 'click_to_show'}} +
+ {{/if}}
    {{#each model as |webHookEvent|}} {{admin-web-hook-event model=webHookEvent}} diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 5d81c310b..afb570536 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -1419,7 +1419,7 @@ table.api-keys { position: absolute; } -.staff-actions, .screened-emails, .screened-urls, .screened-ip-addresses, .permalinks { +.staff-actions, .screened-emails, .screened-urls, .screened-ip-addresses, .permalinks, .web-hook-events { border-bottom: dotted 1px dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); @@ -1872,7 +1872,7 @@ table#user-badges { } .col.first { - width: 30px; + width: 90px; } .col.event-id { @@ -1895,6 +1895,10 @@ table#user-badges { } } + .col.heading.actions { + padding: 4px 0; + } + .details { display: block; margin-top: 10px; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 9809cd7df..53416d176 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -2481,7 +2481,9 @@ en: incoming: one: "There is a new event." other: "There are {{count}} new events." - completion: "Completed in %{seconds} seconds." + completed_in: + one: "Completed in 1 second." + other: "Completed in {{count}} seconds." request: "Request" response: "Response" redeliver_confirm: "Are you sure you want to redeliver the same payload?" @@ -2492,6 +2494,11 @@ en: go_details: "Edit webhook" go_events: "Go to events" ping: "Ping" + status: "Status Code" + event_id: "ID" + timestamp: "Created" + completion: "Completion Time" + actions: "Actions" plugins: title: "Plugins" installed: "Installed Plugins"