From b27961b38a0fd4679f330570f0de6df4ac4d9ac5 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Mon, 13 Feb 2012 17:26:53 -0800
Subject: [PATCH] change language around explore/participate.

---
 app/views/aspects/_aspect_listings.haml            |  2 +-
 config/locales/diaspora/en.yml                     |  8 ++++----
 config/locales/javascript/javascript.en.yml        |  4 ++--
 public/javascripts/app/templates/header.handlebars |  4 ++--
 public/stylesheets/sass/application.sass           | 13 +++++++------
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/views/aspects/_aspect_listings.haml b/app/views/aspects/_aspect_listings.haml
index 28b0404a5..41659509f 100644
--- a/app/views/aspects/_aspect_listings.haml
+++ b/app/views/aspects/_aspect_listings.haml
@@ -4,7 +4,7 @@
 
 %ul#aspect_nav.left_nav.sub
   %li.all_aspects
-    = link_to t('aspects.index.your_aspects'), aspects_path, :class => 'home_selector'
+    = link_to t('streams.aspects.title'), aspects_path, :class => 'home_selector'
 
     - if @stream.is_a?(Stream::Aspect)
       %ul.sub_nav
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 612ce783c..94ab50018 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -159,7 +159,6 @@ en:
     index:
       donate: "Donate"
       keep_us_running: "Keep %{pod} running fast and buy servers their coffee fix with a monthly donation!"
-      your_aspects: "Your Aspects"
       no_tags: "+ Find a tag to follow"
       unfollow_tag: "Stop following #%{tag}"
       handle_explanation: "This is your Diaspora ID. Like an email address, you can give this to people to reach you."
@@ -927,14 +926,15 @@ en:
       contacts_title: "Recent Posters"
 
     multi:
-      title: "Explore"
+      title: "Stream"
       contacts_title: "People in your Explore Stream"
 
     aspects:
-      title: "Your Aspects"
+      title: "My Aspects"
 
     participate:
-      title: "Participate"
+      title: "My Activity"
+
   users:
     logged_out:
       signed_out: "You've signed out of Diaspora*"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index 6515cc4e5..9444dfa8a 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -25,8 +25,8 @@ en:
         year: "about a year"
         years: "%d years"
 
-      participate: "Participate"
-      explore: "Explore"
+      my_activity: "My Activity"
+      my_stream: "Stream"
 
       videos:
           watch: "Watch this video on <%= provider %>"
diff --git a/public/javascripts/app/templates/header.handlebars b/public/javascripts/app/templates/header.handlebars
index 497829194..93faf72df 100644
--- a/public/javascripts/app/templates/header.handlebars
+++ b/public/javascripts/app/templates/header.handlebars
@@ -7,13 +7,13 @@
   <span class="header-nav">
     <span>
         <a href="/explore">
-          {{t "explore"}}
+          {{t "my_stream"}}
         </a>
     </span>
 
     <span>
         <a href="/participate">
-          {{t "participate"}}
+          {{t "my_activity"}}
         </a>
      </span>
   </span>
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index fc59097e2..dfb2b9ff4 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -935,7 +935,6 @@ img.scaled_full
   :float right
 
   :margin
-    :top -1px
     :right 10px
 
   form
@@ -949,6 +948,9 @@ img.scaled_full
 
       :border 1px solid #222
 
+      :font-size 13px
+      :padding 4px
+
       &:hover
         :background-color #555
 
@@ -961,11 +963,10 @@ img.scaled_full
         :background-color white
         :width 200px
 
-      &[type='search']
-        &::-webkit-input-placeholder
-          :text-shadow none
-        &:-moz-placeholder
-          :text-shadow none
+      &::-webkit-input-placeholder
+        :text-shadow none
+      &:-moz-placeholder
+        :text-shadow none
 
 ul#settings_nav
   :display inline