diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 1bfc8b3b5..2ef3fad51 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -33,7 +33,7 @@ class AspectsController < ApplicationController
all_selected_contacts = Contact.joins(:aspect_memberships).
where(:aspect_memberships => {:aspect_id => aspect_ids})
@selected_contacts_count = all_selected_contacts.count
- @selected_contacts = all_selected_contacts.limit(24)
+ @selected_contacts = all_selected_contacts.limit(20)
end
@aspect_ids = @aspects.map { |a| a.id }
diff --git a/app/views/aspects/_edit_aspect_pane.html.haml b/app/views/aspects/_edit_aspect_pane.html.haml
deleted file mode 100644
index 62ebfb7ca..000000000
--- a/app/views/aspects/_edit_aspect_pane.html.haml
+++ /dev/null
@@ -1,28 +0,0 @@
--# Copyright (c) 2010, Diaspora Inc. This file is
--# licensed under the Affero General Public License version 3 or later. See
--# the COPYRIGHT file.
-
-- content_for :head do
- = include_javascripts :aspects
-
-#edit_aspect_pane
- - if @contacts.count > 0
- %h4= t('aspects.edit.add_existing')
- = render 'shared/contact_list', :aspect_id => aspect.id, :contacts => contacts, :manage => defined?(manage)
-
- = render 'shared/add_contact', :aspect_id => aspect.id
-
- %hr
- = form_for aspect do |asp|
- = asp.text_field :name, :value => aspect.name
- = t('aspects.contacts_visible')
- = aspect.check_box :contacts_visible, :default => true
- %br
- = t('aspects.contacts_not_visible')
- -#contacts_visible should be editable here
- = asp.submit t('aspects.edit.rename_aspect')
-
- %hr
- .big_buttons
- = button_to t('aspects.edit.remove_aspect'), aspect, :method => "delete", :confirm => t('aspects.edit.confirm_remove_aspect')
-
diff --git a/app/views/aspects/edit.html.haml b/app/views/aspects/edit.html.haml
index 973f059cd..52dba5656 100644
--- a/app/views/aspects/edit.html.haml
+++ b/app/views/aspects/edit.html.haml
@@ -32,7 +32,8 @@
= render 'shared/contact_list', :aspect => @aspect, :contacts => @contacts
%br
- %div{:style => "text-align:right;"}
- = link_to t('.done'), '#', :class => 'button', :rel => 'close'
- = link_to t('delete'), @aspect, :method => "delete", :confirm => t('.confirm_remove_aspect'), :class => 'button'
+ .bottom_submit_section
+ .left
+ = button_to t('delete'), @aspect, :method => "delete", :confirm => t('.confirm_remove_aspect'), :class => 'button delete'
+ = submit_tag t('.done'), :class => 'button creation', :rel => 'close'
diff --git a/app/views/contacts/index.html.haml b/app/views/contacts/index.html.haml
index b6005219a..4e8a9cedd 100644
--- a/app/views/contacts/index.html.haml
+++ b/app/views/contacts/index.html.haml
@@ -18,11 +18,13 @@
.span-18.last
#people_stream.stream.contacts
- - if @contacts.size > 0
- #aspect_controls
- - if @aspect_
- = link_to "start a conversation", new_conversation_path(:aspect_id => @aspect_.id, :name => @aspect_.name), :class => "button conversation_button", :rel => "facebox"
+ #aspect_controls
+ = link_to "Edit #{@aspect_.name}", edit_aspect_path(@aspect_), :rel => "facebox"
+ - if @aspect_
+ = link_to "start a conversation", new_conversation_path(:aspect_id => @aspect_.id, :name => @aspect_.name), :class => "button conversation_button", :rel => "facebox"
+
+ - if @contacts.size > 0
- for contact in @contacts
.stream_element{:id => contact.person.id}
.right
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index e99a6ef93..0bd36b062 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -22,16 +22,26 @@
= text_field_tag 'q', nil, :placeholder => t('find_people'), :type => 'search', :results => 5
- if @notification_count
- #notification_badge
- = link_to "", notifications_path, :title => new_notification_text(@notification_count)
- = image_tag 'icons/monotone_flag.png', :height => 20, :width => 20, :id => "notification-flag"
- .badge_count{:class => ("hidden" if @notification_count == 0)}
- = @notification_count
- #message_inbox_badge
- = link_to "", conversations_path , :title => new_message_text(@unread_message_count)
- = image_tag 'icons/mail_grey.png', :height => 16, :width => 16
- .badge_count{:class => ("hidden" if @unread_message_count == 0)}
- = @unread_message_count
+ #nav_badges
+ #home_badge.badge
+ = link_to aspects_path, :title => t('_home') do
+ = image_tag 'icons/home_grey.svg', :height => 16
+
+ #contacts_badge.badge
+ = link_to contacts_path, :title => t('_contacts') do
+ = image_tag 'icons/contacts_grey.svg', :height => 16
+
+ #notification_badge.badge
+ = link_to notifications_path, :title => new_notification_text(@notification_count) do
+ = image_tag 'icons/notifications_grey.svg', :height => 16, :id => "notification-flag"
+ .badge_count{:class => ("hidden" if @notification_count == 0)}
+ = @notification_count
+
+ #message_inbox_badge.badge
+ = link_to conversations_path , :title => new_message_text(@unread_message_count) do
+ = image_tag 'icons/mail_grey.svg', :width => 18
+ .badge_count{:class => ("hidden" if @unread_message_count == 0)}
+ = @unread_message_count
%ul#user_menu.dropdown
%li
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 21446a014..2db7f7856 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -36,6 +36,7 @@ en:
_comments: "Comments"
all_aspects: "All Aspects"
no_results: "No Results Found"
+ _contacts: "Contacts"
#for reference translation, the real activerecord english transations are actually
@@ -211,7 +212,7 @@ en:
send: "Send"
helper:
new_messages:
- zero: "no new messages"
+ zero: "No new messages"
one: "1 new messages"
few: "%{count} new messages"
many: "%{count} new messages"
@@ -366,7 +367,7 @@ en:
and: 'and'
helper:
new_notifications:
- zero: "no new notifications"
+ zero: "No new notifications"
one: "1 new notifications"
few: "%{count} new notifications"
many: "%{count} new notifications"
diff --git a/public/images/icons/contacts_grey.svg b/public/images/icons/contacts_grey.svg
new file mode 100644
index 000000000..d64cfdd3a
--- /dev/null
+++ b/public/images/icons/contacts_grey.svg
@@ -0,0 +1,88 @@
+
+
+
+
\ No newline at end of file
diff --git a/public/images/icons/home_grey.svg b/public/images/icons/home_grey.svg
new file mode 100644
index 000000000..0fc96056c
--- /dev/null
+++ b/public/images/icons/home_grey.svg
@@ -0,0 +1,50 @@
+
+
+
+
\ No newline at end of file
diff --git a/public/images/icons/mail_grey.svg b/public/images/icons/mail_grey.svg
new file mode 100644
index 000000000..da935a95d
--- /dev/null
+++ b/public/images/icons/mail_grey.svg
@@ -0,0 +1,54 @@
+
+
+
+
\ No newline at end of file
diff --git a/public/images/icons/notifications_grey.svg b/public/images/icons/notifications_grey.svg
new file mode 100644
index 000000000..e4a227af0
--- /dev/null
+++ b/public/images/icons/notifications_grey.svg
@@ -0,0 +1,62 @@
+
+
+
+
diff --git a/public/javascripts/aspect-filters.js b/public/javascripts/aspect-filters.js
index cb90a1ec2..4d14c82a8 100644
--- a/public/javascripts/aspect-filters.js
+++ b/public/javascripts/aspect-filters.js
@@ -16,7 +16,7 @@ var AspectFilters = {
var button = $(this),
guid = button.attr('data-guid');
- if(guid && location.href.search("a_ids..="+guid+"(&|$)") != -1){
+ if(guid && location.href.search("a_ids..="+guid+"(#|&|$)") != -1){
button.parent().addClass('active');
AspectFilters.selectedGUIDS.push(guid);
$("#aspect_nav li.all_aspects").removeClass('active');
diff --git a/public/stylesheets/sass/_mixins.scss b/public/stylesheets/sass/_mixins.scss
index ddde72768..e15e21af0 100644
--- a/public/stylesheets/sass/_mixins.scss
+++ b/public/stylesheets/sass/_mixins.scss
@@ -1,5 +1,5 @@
$blue: #3f8fba;
-$red: red;
+$red: #a80000;
$background: #fff;
$creation-blue: #0097ff;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 45f8d3c38..0cbf2f5cf 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -129,10 +129,8 @@ header
@include linear-gradient(rgba(35,30,30,0.95),rgba(35,30,30,1))
:z-index 50
- :padding 0
- :top 2px
+ :padding 6px 0
:color #CCC
- :height 35px
:position fixed
@@ -182,7 +180,7 @@ header
:position absolute
:display inline
- :top 5px
+ :top 0
:right 0
&:hover
@@ -1617,37 +1615,41 @@ h3 span.current_gs_step
:background
:color #22AAE0
-#notification_badge,
-#message_inbox_badge
+#nav_badges
:position relative
- :top 5px
- :display inline
- :margin 0 10px
- :right -5px
- :font
- :weight bold
- :size smaller
- :width 28px
+ :display inline-block
+ :top 3px
- &:active
- :top 6px
+ a:hover
+ :text
+ :decoration none
- a
- :z-index 5
- :position absolute
- :top -9px
- :width 20px
- :height 20px
+ .badge
+ :position relative
+ :display inline
+ :margin 0 15px
+ :right -5px
+ :font
+ :weight bold
+ :size smaller
+ :width 28px
- &:hover
- .badge_count
- :background
- :color lighten(#A40802, 5%)
+ &:active
+ :top 1px
+
+ &:hover
+ .badge_count
+ :background
+ :color lighten(#A40802, 5%)
+
+#message_inbox_badge
+ img
+ :position relative
+ :top -2px
#notification_badge
img
:position relative
- :top 2px
.badge_count
@include border-radius(2px)
@@ -2034,11 +2036,6 @@ h3,h4
:padding
:bottom 5px
-#edit_aspect_pane
- @include box-shadow(0,4px,8px,#333)
-
- :display none
-
.big_buttons
input
:width 100%
@@ -2252,7 +2249,6 @@ ul.show_comments
:bottom -4px
:padding 4px
-
ul.show_comments,
.likes_container
*
@@ -2260,6 +2256,10 @@ ul.show_comments,
:weight bold
:color #999
+ li
+ :border
+ :bottom 1px solid #ccc
+
img
:position relative
:top 3px
@@ -2349,25 +2349,6 @@ ul.show_comments,
:padding
:left 60px
-#new_notifications,
-#new_requests
- :position relative
-
- :margin
- :bottom 10px
- :top -8px
-
- h4
- :display inline
- img
- :position relative
- :display inline
- :margin
- :right 4px
- :top 5px
-
-
-
#email_invitation
input
:width 100%
@@ -2882,7 +2863,7 @@ ul.left_nav
:padding 3px 7px
&:hover
- @include border-radius(4px)
+ @include border-radius(2px)
:background
:color lighten($blue,45%)
@@ -3018,8 +2999,8 @@ ul.left_nav
#selected_aspect_contacts
.avatar
- :height 26px
- :width 26px
+ :height 32px
+ :width 32px
:margin
:bottom -2px
@@ -3031,7 +3012,16 @@ ul.left_nav
:border 1px dotted #ccc
.bottom_submit_section
+ :display block
+ :position relative
+
+ form
+ :display inline-block
:text-align right
#no_posts
:padding 20px
+
+.left
+ :position absolute
+ :left 0
diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass
index 0286be23e..3f27cb274 100644
--- a/public/stylesheets/sass/ui.sass
+++ b/public/stylesheets/sass/ui.sass
@@ -65,6 +65,9 @@
:border
:top 1px solid #aaa
+.button.delete
+ :color desaturate($red,10%)
+
.button.in_aspects
@include linear-gradient(lighten(#76C000,8%),#76C000)