IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: improve styling of messages and mobile view of messages

Browse Source
This commit is contained in:
Sam 2016-01-24 18:11:49 +11:00
parent d0ee32f3ce
commit 403f766546
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
View File

@ -10,7 +10,15 @@ export default Ember.Controller.extend({
selected: Em.computed.alias('controllers.user-topics-list.selected'), selected: Em.computed.alias('controllers.user-topics-list.selected'),
bulkSelectEnabled: Em.computed.alias('controllers.user-topics-list.bulkSelectEnabled'), bulkSelectEnabled: Em.computed.alias('controllers.user-topics-list.bulkSelectEnabled'),
showNewPM: Em.computed.alias('controllers.user-topics-list.showNewPM'),
mobileView: function() {
return Discourse.Mobile.mobileView;
}.property(),
showNewPM: function(){
return this.get('controllers.user.viewingSelf') &&
Discourse.User.currentProp('can_send_private_messages');
}.property('controllers.user.viewingSelf'),
@computed('selected.@each', 'bulkSelectEnabled') @computed('selected.@each', 'bulkSelectEnabled')
hasSelection(selected, bulkSelectEnabled){ hasSelection(selected, bulkSelectEnabled){

5
app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
View File

@ -14,9 +14,4 @@ export default Ember.Controller.extend({
} }
}, },
showNewPM: function(){
return this.get('controllers.user.viewingSelf') &&
Discourse.User.currentProp('can_send_private_messages');
}.property('controllers.user.viewingSelf')
}); });

10
app/assets/javascripts/discourse/templates/user/messages.hbs
View File

@ -1,7 +1,9 @@
<section class='user-navigation'> <section class='user-navigation'>
{{#unless mobileView}}
{{#if showNewPM}} {{#if showNewPM}}
{{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}} {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}}
{{/if}} {{/if}}
{{/unless}}
<ul class='action-list nav-stacked'> <ul class='action-list nav-stacked'>
<li class="noGlyph"> <li class="noGlyph">
{{#link-to 'userPrivateMessages.index' model}} {{#link-to 'userPrivateMessages.index' model}}
@ -26,7 +28,7 @@
{{capitalize group.name}} {{capitalize group.name}}
{{/link-to}} {{/link-to}}
</li> </li>
<li> <li class='archive'>
{{#link-to 'userPrivateMessages.groupArchive' group.name}} {{#link-to 'userPrivateMessages.groupArchive' group.name}}
{{i18n 'user.messages.archive'}} {{i18n 'user.messages.archive'}}
{{/link-to}} {{/link-to}}
@ -44,6 +46,12 @@
<i class="fa fa-list"></i> <i class="fa fa-list"></i>
</button> </button>
{{#if mobileView}}
{{#if showNewPM}}
{{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}}
{{/if}}
{{/if}}
{{#if canArchive}} {{#if canArchive}}
<button {{action "archive"}} class="btn btn-archive"> <button {{action "archive"}} class="btn btn-archive">
{{i18n "user.messages.archive"}} {{i18n "user.messages.archive"}}

6
app/assets/stylesheets/desktop/user.scss
View File

@ -99,7 +99,7 @@
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 170px; width: 170px;
padding-right: 50px; padding-right: 30px;
h3 { h3 {
color: $primary; color: $primary;
@ -694,6 +694,10 @@
li > a.active:after { li > a.active:after {
display: none; display: none;
} }
li.archive {
padding-left: 15px;
}
} }