diff --git a/app/helpers/aspect_global_helper.rb b/app/helpers/aspect_global_helper.rb index 67f997b4d..276f3591b 100644 --- a/app/helpers/aspect_global_helper.rb +++ b/app/helpers/aspect_global_helper.rb @@ -79,6 +79,6 @@ LISTITEM end def dropdown_may_create_new_aspect - @aspect == :profile || @aspect == :tag || @aspect == :search || @aspect == :notification + @aspect == :profile || @aspect == :tag || @aspect == :search || @aspect == :notification || params[:action] == "getting_started" end end diff --git a/app/views/users/getting_started.haml b/app/views/users/getting_started.haml index 6e95836d7..1f5cbd217 100644 --- a/app/views/users/getting_started.haml +++ b/app/views/users/getting_started.haml @@ -113,6 +113,12 @@ %div - Person.featured_users[0..5].each do |person| .featured_user_card_small + .right + .add_to_aspect + = render :partial => 'people/relationship_action', + :locals => { :person => person, + :contact => current_user.contact_for(person), + :current_user => current_user } = person_image_link(person, :target => "_blank") = person_link(person, :class => "hovercardable", :target => "_blank") .tags diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 33aab9bca..60c12d4b0 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -92,7 +92,7 @@ en: contacts_visible: "Contacts in this aspect will be able to see each other." contacts_not_visible: "Contacts in this aspect will not be able to see each other." edit: - make_aspect_list_visible: "make aspect list visible?" + make_aspect_list_visible: "make contacts in this aspect visible to each other?" remove_aspect: "Delete this aspect" confirm_remove_aspect: "Are you sure you want to delete this aspect?" add_existing: "Add an existing contact" @@ -127,7 +127,7 @@ en: manage_your_aspects: "Manage your aspects." new: - name: "Name" + name: "Name (only visibile to you)" create: "Create" create: success: "Your new aspect %{name} was created" @@ -696,9 +696,9 @@ en: shared: aspect_dropdown: - add_to_aspect: "Add to aspect" + add_to_aspect: "Add contact" toggle: - zero: "Add to aspect" + zero: "Add contact" one: "In %{count} aspect" two: "In %{count} aspects" few: "In %{count} aspects" diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index 8f78dc166..b2288dd55 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -36,10 +36,10 @@ en: web_sockets: disconnected: "The websocket is closed; posts will no longer be streamed live." aspect_dropdown: - add_to_aspect: "Add to aspect" + add_to_aspect: "Add contact" all_aspects: "All aspects" toggle: - zero: "Add to aspect" + zero: "Add contact" one: "In {{count}} aspect" two: "In {{count}} aspects" few: "In {{count}} aspects" diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index dbdfa59d2..81a72e30d 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -3338,6 +3338,9 @@ ul#getting_started :vertical-align top :position relative + :border + :bottom 1px solid #ddd + :padding 5px :margin :bottom 5px