codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-11 16:21:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

UX: Add headers for webhook events

Browse source
This commit is contained in:
Erick Guan 2016-09-15 12:57:04 +08:00 committed by Guo Xiang Tan
parent 00d5facf36
commit 48fb0558d8
5 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/admin/components/admin-web-hook-event.js.es6
View file

@ -26,7 +26,7 @@ export default Ember.Component.extend({
@computed('model.duration') @computed('model.duration')
completion(duration) { completion(duration) {
const seconds = Math.floor(duration / 10.0) / 100.0; 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: { actions: {

2
app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
View file

@ -1,4 +1,4 @@
<div class="col first"> <div class="col first status">
<span class="{{statusColorClasses}}">{{model.status}}</span> <span class="{{statusColorClasses}}">{{model.status}}</span>
</div> </div>
<div class="col event-id">{{model.id}}</div> <div class="col event-id">{{model.id}}</div>

12
app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
View file

@ -10,14 +10,22 @@
<div class='web-hook-events-listing'> <div class='web-hook-events-listing'>
{{#if model}} {{#if model}}
{{#load-more selector=".web-hook-events li" action="loadMore"}}
<div class='web-hook-events content-list'>
<div class='heading-container'>
<div class='col heading first status'>{{i18n 'admin.web_hooks.events.status'}}</div>
<div class='col heading event-id'>{{i18n 'admin.web_hooks.events.event_id'}}</div>
<div class='col heading timestamp'>{{i18n 'admin.web_hooks.events.timestamp'}}</div>
<div class='col heading completion'>{{i18n 'admin.web_hooks.events.completion'}}</div>
<div class='col heading actions'>{{i18n 'admin.web_hooks.events.actions'}}</div>
<div class='clearfix'></div>
</div>
{{#if hasIncoming}} {{#if hasIncoming}}
<div class='alert alert-info clickable' {{action "showInserted"}}> <div class='alert alert-info clickable' {{action "showInserted"}}>
{{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}} {{count-i18n key="admin.web_hooks.events.incoming" count=incomingCount}}
{{i18n 'click_to_show'}} {{i18n 'click_to_show'}}
</div> </div>
{{/if}} {{/if}}
{{#load-more selector=".web-hook-events li" action="loadMore"}}
<div class='web-hook-events content-list'>
<ul> <ul>
{{#each model as |webHookEvent|}} {{#each model as |webHookEvent|}}
{{admin-web-hook-event model=webHookEvent}} {{admin-web-hook-event model=webHookEvent}}

8
app/assets/stylesheets/common/admin/admin_base.scss
View file

@ -1419,7 +1419,7 @@ table.api-keys {
position: absolute; 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%)); 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 { .col.first {
width: 30px; width: 90px;
} }
.col.event-id { .col.event-id {
@ -1895,6 +1895,10 @@ table#user-badges {
} }
} }
.col.heading.actions {
padding: 4px 0;
}
.details { .details {
display: block; display: block;
margin-top: 10px; margin-top: 10px;

9
config/locales/client.en.yml
View file

@ -2481,7 +2481,9 @@ en:
incoming: incoming:
one: "There is a new event." one: "There is a new event."
other: "There are {{count}} new events." 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" request: "Request"
response: "Response" response: "Response"
redeliver_confirm: "Are you sure you want to redeliver the same payload?" redeliver_confirm: "Are you sure you want to redeliver the same payload?"
@ -2492,6 +2494,11 @@ en:
go_details: "Edit webhook" go_details: "Edit webhook"
go_events: "Go to events" go_events: "Go to events"
ping: "Ping" ping: "Ping"
status: "Status Code"
event_id: "ID"
timestamp: "Created"
completion: "Completion Time"
actions: "Actions"
plugins: plugins:
title: "Plugins" title: "Plugins"
installed: "Installed Plugins" installed: "Installed Plugins"