Add handle indication on search page, improve design

Changelog.md

@@ -13,6 +13,7 @@
 * Change jQuery CDN to jquery.com from googleapis.com [#4765](https://github.com/diaspora/diaspora/pull/4765)
 * Update to jQuery 10
 * Port publisher and bookmarklet to Bootstrap [#4678](https://github.com/diaspora/diaspora/pull/4678)
+* Improve search page, add better indications [#4794](https://github.com/diaspora/diaspora/pull/4794)
 
 ## Bug fixes
 * Improve time agos by updating the plugin [#4280](https://github.com/diaspora/diaspora/issues/4280)

app/assets/stylesheets/application.css.sass

@@ -488,7 +488,7 @@ input[type="search"]
   :margin
     :bottom 2em
   :padding
-    :bottom 1em
+    :bottom 0.4em
 
   h2
     :display inline
@@ -497,6 +497,11 @@ input[type="search"]
     :margin
       :top 10px
       
+  h4
+    :display inline
+    :margin
+      :left 1em
+
 .photo_options
   :color $text-grey
   :text

app/helpers/people_helper.rb

@@ -9,21 +9,12 @@ module PeopleHelper
     if search_query.blank?
       content_tag(:h2, t('people.index.no_results'))
     else
-      content_tag(:h2, :id => 'search_title') do
+      content_tag(:h2, id: 'search_title') do
-        t('people.index.results_for').html_safe + ' ' +
+        t('people.index.results_for', search_term: content_tag(:span, search_query, class: 'term')).html_safe + looking_for_tag_link
-        content_tag(:span, search_query, :class => 'term')
       end
     end
   end
   
-  def search_or_index
-    if search_query
-      I18n.t 'people.helper.results_for',:params => search_query
-    else
-      I18n.t "people.helper.people_on_pod_are_aware_of"
-    end
-  end
-
   def birthday_format(bday)
     if bday.year == 1000
       I18n.l bday, :format => I18n.t('date.formats.birthday')

app/views/people/index.html.haml

@@ -9,18 +9,14 @@
   = javascript_include_tag :people
   = javascript_include_tag 'contact-list'
 
-.span-24.last
+#section_header
   = search_header     
-  = looking_for_tag_link
-.span-15
-  %hr
-.clearfix
 .span-15.append-1
   #people_stream.stream
     - if @hashes.empty?
       - if @background_query.present?
 
-        / this is gross, and should be extracted!
+        / TODO this is gross, and should be extracted!
         :javascript
           $(document).ready( function() {
             List.startSearchDelay('#{@background_query}')
@@ -41,6 +37,10 @@
 - if AppConfig.settings.invitations.open?
   .span-8.last
     %h4
-      = t('.couldnt_find_them_send_invite')
+      = t('.couldnt_find_them')
+    %p
+      = t('.search_handle')
+    %h4
+      = t('.send_invite')
     = render "shared/invitations"
 

app/views/people/index.mobile.haml

@@ -11,16 +11,12 @@
       = search_field_tag :q, nil, :placeholder => t('find_people'), :class => 'search'
     = submit_tag t('search'), 'data-inline' => 'true', :class => 'btn'
 
-
 - if params[:q].blank?
   %h4
     = t('.no_results')
 - else
   %h4#search_title
-    =t('.results_for')
+    = t('.results_for', search_term: params[:q])
-    %span.term
-      = params[:q]
-
 
   - if @hashes.empty?
     %p

config/locales/diaspora/en.yml

@@ -752,9 +752,11 @@ en:
       thats_you: "That's you!"
       add_contact: "add contact"
     index:
-      results_for: "search results for"
+      results_for: "Users matching %{search_term}"
       no_results: "Hey! You need to search for something."
-      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      couldnt_find_them: "Couldn't find them?"
+      search_handle: "Use their diaspora* ID (username@pod.tld) to be sure to find your friends."
+      send_invite: "Still nothing? Send an invite!"
       no_one_found: "...and no one was found."
       searching: "searching, please be patient..."
       looking_for: "Looking for posts tagged %{tag_link}?"
@@ -791,7 +793,6 @@ en:
       remove_from: "Remove %{name} from %{aspect}?"
     helper:
       results_for: " results for %{params}"
-      people_on_pod_are_aware_of: " people on pod are aware of"
       is_sharing: "%{name} is sharing with you"
       is_not_sharing: "%{name} is not sharing with you"
     aspect_list:
@@ -1042,7 +1043,7 @@ en:
       invite_your_friends: "Invite your friends"
       from_facebook: "From Facebook"
       by_email: "By email"
-      share_this: "Share this link via email, blog, or favorite social network!"
+      share_this: "Share this link via email, blog, or social networks!"
     reshare:
       reshare: "Reshare"
     public_explain: