Improve styling of staff action logs UI

This commit is contained in:
Neil Lalonde 2013-10-31 12:17:06 -04:00
parent d3c7bbe268
commit e1d956f5ee
4 changed files with 36 additions and 32 deletions

View File

@ -24,19 +24,6 @@ Discourse.AdminLogsStaffActionLogsController = Ember.ArrayController.extend(Disc
return (_.size(this.get('filters')) > 0); return (_.size(this.get('filters')) > 0);
}.property('filters.action_name', 'filters.acting_user', 'filters.target_user', 'filters.subject'), }.property('filters.action_name', 'filters.acting_user', 'filters.target_user', 'filters.subject'),
clearFilter: function(key) {
delete this.get('filters')[key];
this.notifyPropertyChange('filters');
},
clearAllFilters: function() {
this.set('filters', {});
},
filterByAction: function(action) {
this.set('filters.action_name', action);
},
actionFilter: function() { actionFilter: function() {
if (this.get('filters.action_name')) { if (this.get('filters.action_name')) {
return I18n.t("admin.logs.staff_actions.actions." + this.get('filters.action_name')); return I18n.t("admin.logs.staff_actions.actions." + this.get('filters.action_name'));
@ -45,15 +32,34 @@ Discourse.AdminLogsStaffActionLogsController = Ember.ArrayController.extend(Disc
} }
}.property('filters.action_name'), }.property('filters.action_name'),
filterByStaffUser: function(acting_user) { showInstructions: function() {
this.set('filters.acting_user', acting_user.username); return this.get('model.length') > 0;
}, }.property('loading', 'model.length'),
filterByTargetUser: function(target_user) { actions: {
this.set('filters.target_user', target_user.username); clearFilter: function(key) {
}, delete this.get('filters')[key];
this.notifyPropertyChange('filters');
},
filterBySubject: function(subject) { clearAllFilters: function() {
this.set('filters.subject', subject); this.set('filters', {});
},
filterByAction: function(action) {
this.set('filters.action_name', action);
},
filterByStaffUser: function(acting_user) {
this.set('filters.acting_user', acting_user.username);
},
filterByTargetUser: function(target_user) {
this.set('filters.target_user', target_user.username);
},
filterBySubject: function(subject) {
this.set('filters.subject', subject);
}
} }
}); });

View File

@ -28,6 +28,10 @@
{{/if}} {{/if}}
</div> </div>
<div class="staff-action-logs-instructions" {{bindAttr class=":staff-action-logs-instructions showInstructions::invisible"}}>
{{i18n admin.logs.staff_actions.instructions}}
</div>
<div class='table staff-actions'> <div class='table staff-actions'>
<div class="heading-container"> <div class="heading-container">
<div class="col heading first staff_user">{{i18n admin.logs.staff_actions.staff_user}}</div> <div class="col heading first staff_user">{{i18n admin.logs.staff_actions.staff_user}}</div>
@ -50,9 +54,3 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
</div> </div>
{{#unless loading}}
<div class="staff-action-logs-instructions">
{{i18n admin.logs.staff_actions.instructions}}
</div>
{{/unless}}

View File

@ -1,17 +1,17 @@
<div class="col value first staff_user"> <div class="col value first staff_user">
{{#link-to 'adminUser' acting_user}}{{avatar acting_user imageSize="tiny"}}{{/link-to}} {{#link-to 'adminUser' acting_user}}{{avatar acting_user imageSize="tiny"}}{{/link-to}}
<a {{action filterByStaffUser acting_user}}>{{acting_user.username}}</a> <a {{action filterByStaffUser acting_user}} class="btn btn-small">{{acting_user.username}}</a>
</div> </div>
<div class="col value action"> <div class="col value action">
<a {{action filterByAction action_name}}>{{actionName}}</a> <a {{action filterByAction action_name}} class="btn btn-small">{{actionName}}</a>
</div> </div>
<div class="col value subject"> <div class="col value subject">
{{#if target_user}} {{#if target_user}}
{{#link-to 'adminUser' target_user}}{{avatar target_user imageSize="tiny"}}{{/link-to}} {{#link-to 'adminUser' target_user}}{{avatar target_user imageSize="tiny"}}{{/link-to}}
<a {{action filterByTargetUser target_user}}>{{target_user.username}}</a> <a {{action filterByTargetUser target_user}} class="btn btn-small">{{target_user.username}}</a>
{{/if}} {{/if}}
{{#if subject}} {{#if subject}}
<a {{action filterBySubject subject}} {{bindAttr title="subject"}}>{{subject}}</a> <a {{action filterBySubject subject}} {{bindAttr title="subject"}} class="btn btn-small">{{subject}}</a>
{{/if}} {{/if}}
</div> </div>
<div class="col value created_at">{{unboundAgeWithTooltip created_at}}</div> <div class="col value created_at">{{unboundAgeWithTooltip created_at}}</div>

View File

@ -849,7 +849,7 @@ table.api-keys {
} }
.staff-action-logs-instructions { .staff-action-logs-instructions {
margin: 50px 0 0 10px; margin: 0 0 10px 10px;
} }
// Ember.ListView // Ember.ListView