From: Tom MacWright Date: Thu, 9 Aug 2012 19:15:08 +0000 (-0400) Subject: Redesign inbox X-Git-Tag: live~5331 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/be8617dfdc9fdf941705272ec9ba152b95677249?hp=024838f203c6a7c4cafb62d005601bc4a34dc14e Redesign inbox Cuts down on buttons, grey, and bold clutter. --- diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 0f7100481..bd812b7e3 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -652,6 +652,11 @@ body.site-export #tabnav a#exportanchor { margin-bottom: 5px; } +/* rules for text content pages */ +.wide-table { + width:100%; +} + /* Rules for the home page */ .site-index #map { @@ -986,19 +991,48 @@ p#contributorGuidance { } /* Rules for message in/out box page */ +.messages { + width:100%; + border-collapse:collapse; + border-spacing:0; + border-width:0; +} -#messages { - border: 1px solid #ccc; +.messages tbody tr { + border-top:1px solid #ccc; } -.inbox-row-unread .inbox-subject { - font-weight: bold; +.messages .inbox-row { + background:#eee; +} + +.messages tr td, +.messages tr th { + padding:0 5px; } .inbox-row .inbox-mark-read { display: none; } +.info-line { + border-bottom:1px solid #ccc; + padding:5px 0 4px 0; +} + +.info-line form, +.info-line form div { + display:inline; +} + +.info-line .user_thumbnail_tiny { + vertical-align:middle; +} + +.right { + float:right; +} + .inbox-row-unread .inbox-mark-unread { display: none; } @@ -1096,13 +1130,19 @@ textarea { img.user_image { max-width: 100px; max-height: 100px; - border: 1px solid black; + border: 1px solid #ccc; } img.user_thumbnail { max-width: 50px; max-height: 100px; - border: 1px solid black; + border: 1px solid #ccc; +} + +img.user_thumbnail_tiny { + max-width: 25px; + max-height: 25px; + border: 1px solid #ccc; } /* Rule for "nowrap" class that can be applied to anything to stop wrapping */ diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index 6a239df5d..70125e804 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -11,6 +11,12 @@ module UserHelper image_tag user.image.url(:small), options end + def user_thumbnail_tiny(user, options = {}) + options[:class] ||= "user_thumbnail_tiny" + + image_tag user.image.url(:small), options + end + def openid_logo image_tag "openid_small.png", :alt => t('user.login.openid_logo_alt'), :class => "openid_logo" end diff --git a/app/views/message/_message_summary.html.erb b/app/views/message/_message_summary.html.erb index 6d09d5c71..b52eb1f1b 100644 --- a/app/views/message/_message_summary.html.erb +++ b/app/views/message/_message_summary.html.erb @@ -1,11 +1,8 @@ -<% this_colour = cycle('lightgrey', 'white') %> - "> - <%= link_to h(message_summary.sender.display_name), :controller => 'user', :action => 'view', :display_name => message_summary.sender.display_name %> - <%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id %> - <%= l message_summary.sent_on, :format => :friendly %> + <%= link_to h(message_summary.sender.display_name), :controller => 'user', :action => 'view', :display_name => message_summary.sender.display_name %> + <%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id %> + <%= l message_summary.sent_on, :format => :friendly %> <%= button_to t('message.message_summary.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :remote => true } %> <%= button_to t('message.message_summary.read_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read'}, { :remote => true } %> - <%= button_to t('message.message_summary.reply_button'), :controller => 'message', :action => 'reply', :message_id => message_summary.id %> <%= button_to t('message.message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => message_summary.id, :referer => request.fullpath %> diff --git a/app/views/message/_sent_message_summary.html.erb b/app/views/message/_sent_message_summary.html.erb index 830f105da..962cf0a5d 100644 --- a/app/views/message/_sent_message_summary.html.erb +++ b/app/views/message/_sent_message_summary.html.erb @@ -1,8 +1,6 @@ -<% this_colour = cycle('lightgrey', 'white') %> - - <%= link_to h(sent_message_summary.recipient.display_name), :controller => 'user', :action => 'view', :display_name => sent_message_summary.recipient.display_name %> - <%= link_to h(sent_message_summary.title), :controller => 'message', :action => 'read', :message_id => sent_message_summary.id %> - <%= l sent_message_summary.sent_on, :format => :friendly %> + <%= link_to h(sent_message_summary.recipient.display_name), :controller => 'user', :action => 'view', :display_name => sent_message_summary.recipient.display_name %> + <%= link_to h(sent_message_summary.title), :controller => 'message', :action => 'read', :message_id => sent_message_summary.id %> + <%= l sent_message_summary.sent_on, :format => :friendly %> <%= button_to t('message.sent_message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => sent_message_summary.id, :referer => request.fullpath %> diff --git a/app/views/message/inbox.html.erb b/app/views/message/inbox.html.erb index 0cbc7c77c..ec1460745 100644 --- a/app/views/message/inbox.html.erb +++ b/app/views/message/inbox.html.erb @@ -1,21 +1,24 @@ +

<%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %>

<%= render :partial => "message_count" %> <% if @user.messages.size > 0 %> -
- +
+ - - <%= render :partial => "message_summary", :collection => @user.messages %> -
<%= t'message.inbox.from' %> <%= t'message.inbox.subject' %> <%= t'message.inbox.date' %>
-
+ + + <%= render :partial => "message_summary", :collection => @user.messages %> + + <% else %> -
<%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %>
+
<%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %>
<% end %> +
diff --git a/app/views/message/outbox.html.erb b/app/views/message/outbox.html.erb index 6f6823c1b..9786d6fb7 100644 --- a/app/views/message/outbox.html.erb +++ b/app/views/message/outbox.html.erb @@ -3,17 +3,21 @@

<%= t'message.outbox.messages', :count => @user.sent_messages.size %>

<% if @user.sent_messages.size > 0 %> -
- +
+ - - - + + + + + + + <%= render :partial => "sent_message_summary", :collection => @user.sent_messages %> -
<%= t'message.outbox.to' %><%= t'message.outbox.subject' %><%= t'message.outbox.date' %><%= t'message.inbox.from' %><%= t'message.inbox.subject' %><%= t'message.inbox.date' %>
-
+ + <% else %> -
<%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %>
+
<%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %>
<% end %> diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb index d829c79e9..0fbef1d8c 100644 --- a/app/views/message/read.html.erb +++ b/app/views/message/read.html.erb @@ -1,73 +1,37 @@ +
<% if @user == @message.recipient %> -

<%= t'message.read.reading_your_messages' %>

+

<%= h(@message.title) %>

- - - - - - - - - - - - - - - - - - - - - -
<%= t'message.read.from' %><%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %><%= user_thumbnail @message.sender %>
<%= t'message.read.subject' %><%= h(@message.title) %>
<%= t'message.read.date' %><%= l @message.sent_on, :format => :friendly %>
<%= @message.body.to_html %>
+
+ <%= user_thumbnail_tiny @message.sender %> + <%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %> +
+ <%= l @message.sent_on, :format => :friendly %> + <%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %> + <%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %> +
+
-
+ <%= @message.body.to_html %> - - - - - - -
<%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %><%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %><%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
+ <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %> <% else %> -

<%= t'message.read.reading_your_sent_messages' %>

+

<%= h(@message.title) %>

- - - - - - - - - - - - - - - - - - - - - -
<%= t'message.read.to' %><%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %><%= user_thumbnail @message.recipient %>
<%= t'message.read.subject' %><%= h(@message.title) %>
<%= t'message.read.date' %><%= l @message.sent_on, :format => :friendly %>
<%= @message.body.to_html %>
+
+ <%= user_thumbnail_tiny @message.recipient %> + <%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %> +
+ <%= l @message.sent_on, :format => :friendly %> +
+
-
+ <%= @message.body.to_html %> - - - - -
<%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %>
+ <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %> <% end %> +