diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb index a6570468a..09ef3437c 100644 --- a/app/helpers/notifications_helper.rb +++ b/app/helpers/notifications_helper.rb @@ -32,4 +32,10 @@ module NotificationsHelper t('no_new_notifications') end end + + def new_notification_link(count) + if count > 0 + link_to new_notification_text(count), notifications_path + end + end end diff --git a/app/views/aspects/_aspect.haml b/app/views/aspects/_aspect.haml index 02f299ff9..7a1299e88 100644 --- a/app/views/aspects/_aspect.haml +++ b/app/views/aspects/_aspect.haml @@ -1,4 +1,4 @@ -%li.aspect{:data=>{:guid=>aspect.id}} +%li{:data=>{:guid=>aspect.id}} .right = link_to t('contacts', :count => contact_count), edit_aspect_path(aspect), :rel => 'facebox' %b{:class => ("dull" if contacts.length == 0)} diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index 77d74215c..20a25ca99 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -24,16 +24,22 @@ = link_to current_user.diaspora_handle, person_path(current_user.person) /= info_text(t('.handle_explanation')) - - if @request_count > 0 - #new_request_pane{:class => "everyone"} - %h1.new_request{:style => 'text-align:center'} - = new_request_link(@request_count) + - if @notification_count > 0 || @request_count > 0 + - if @request_count > 0 + #new_requests + %h4 + = new_request_link(@request_count) - #left_pane - #aspect_listings.section - = render 'aspects/aspect_listings', :aspect_hashes => @aspect_hashes + - if @notification_count > 0 + #new_notifications + %h4 + = new_notification_link(@notification_count) + %hr - .section - %h4= t('shared.invitations.invites') - = render "shared/invitations", :invites => @invites + #aspect_listings.section + = render 'aspects/aspect_listings', :aspect_hashes => @aspect_hashes + + .section + %h4= t('shared.invitations.invites') + = render "shared/invitations", :invites => @invites diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml index 2a192448f..3068a87e3 100644 --- a/app/views/aspects/show.html.haml +++ b/app/views/aspects/show.html.haml @@ -4,7 +4,7 @@ - content_for :head do - = include_javascripts :home + = include_javascripts :aspects - content_for :page_title do = @aspect.name.html_safe diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index fdd15866e..f1732ca53 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -1232,27 +1232,17 @@ ul#settings_nav :margin 0 :padding 0 -#left_pane - #aspect_listings - a - :font - :weight bold - - .section - :margin - :bottom 24px - - ul - :padding 0 - :margin 0 - > li - :position relative +#aspect_listings .dull :color #aaa :font :style italic +.section + :margin + :bottom 24px + #aspect_listings .contacts :margin @@ -1262,6 +1252,7 @@ ul#settings_nav :padding 0 :margin 0 > li + :position relative :padding 8px 0 :border :bottom 1px solid #ddd @@ -1369,7 +1360,6 @@ input[type="search"] ul.aspects :margin 0 :padding 0 - :color #999 :font :size 24px