From aa449f3a2dfd665ac0c21e24d246c0ef68883798 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Wed, 18 Jan 2012 23:44:54 -0800
Subject: [PATCH] a couple of additions to the branch

---
 app/views/invitations/new.html.haml      |  4 ++--
 app/views/profiles/_edit_public.haml     | 11 ++++++-----
 app/views/users/edit.html.haml           |  7 +++----
 public/javascripts/view.js               |  3 ---
 public/stylesheets/sass/application.sass |  9 ++++-----
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/views/invitations/new.html.haml b/app/views/invitations/new.html.haml
index 2a55bf40c..5bfa3e319 100644
--- a/app/views/invitations/new.html.haml
+++ b/app/views/invitations/new.html.haml
@@ -13,7 +13,7 @@
       = form_for User.new, :url => invitation_path(User) do |invite|
         %h4
           = t('email')
-        = invite.text_field :email, :title => t('.comma_seperated_plz')
+        = invite.text_field :email, :title => t('.comma_seperated_plz'), :placeholder => 'foo@bar.com, max@foo.com...'
         %br
 
         %h4
@@ -32,7 +32,7 @@
 
         %h4
           = t('.personal_message')
-        = invite.text_area :invite_messages, :rows => 3, :value => ""
+        = invite.text_area :invite_messages, :rows => 3, :value => t('.check_out_diaspora')
 
         %p
           = invite.submit t('.send_an_invitation')
diff --git a/app/views/profiles/_edit_public.haml b/app/views/profiles/_edit_public.haml
index fda938d61..eaed1e31a 100644
--- a/app/views/profiles/_edit_public.haml
+++ b/app/views/profiles/_edit_public.haml
@@ -40,17 +40,18 @@
 
 %h4
   = t('profiles.edit.your_name')
-= text_field_tag 'profile[first_name]', profile.first_name, :placeholder => t('profiles.edit.first_name')
-= text_field_tag 'profile[last_name]', profile.last_name, :placeholder => t('profiles.edit.last_name')
+= label_tag 'profile[first_name]', t('profiles.edit.first_name')
+= text_field_tag 'profile[first_name]', profile.first_name, :placeholder => "Raphael"
+
+= label_tag 'profile[first_name]', t('profiles.edit.last_name')
+= text_field_tag 'profile[last_name]', profile.last_name, :placeholder => "Sofaer"
 
 %br
 
 %h4
   = t('profiles.edit.your_tags')
 
-= text_field_tag 'profile[tag_string]', ""
-%p{:style => "color:#777;font-style:italic"}
-  = t('profiles.edit.your_tags_placeholder')
+= text_field_tag 'profile[tag_string]', "", :placeholder => t('profiles.edit.your_tags_placeholder')
 
 %br
 
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index ac629b2e4..4689bd7bb 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -38,16 +38,15 @@
     = t('.change_password')
   = form_for 'user', :url => user_path, :html => { :method => :put } do |f|
     = f.error_messages
-
     %p
       = f.label :current_password, t('.current_password')
-      = f.password_field :current_password
+      = f.password_field :current_password, :placeholder => "the one you sign in with..."
     %p
       = f.label :password, t('.new_password')
-      = f.password_field :password
+      = f.password_field :password, :placeholder => 'must be at least six charaters'
     %p
       = f.label :password_confirmation, t('password_confirmation')
-      = f.password_field :password_confirmation
+      = f.password_field :password_confirmation, :placeholder => 'must be at least six charaters'
 
     .submit_block
       = link_to t('cancel'), edit_user_path
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index d451901aa..019ec67f8 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -9,9 +9,6 @@ var View = {
 
     /* label placeholders */
     $("input, textarea").placeholder();
-    if( jQuery.fn.placeholder.input ) {
-      $("input[placeholder], textarea[placeholder]").siblings("label").hide();
-    }
 
     /* "Toggling" the search input */
     $(this.search.selector)
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 6212ca831..ba4deeb8a 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -890,11 +890,10 @@ form p.checkbox_select
   :text-shadow 0 1px 1px #eee
   :font-weight normal
     
-label:not(.bootstrapped)
-  @include placeholder_styles
-  :position absolute
-  :top 3px
-  :left 0.48em
+//label:not(.bootstrapped)
+  //:position absolute
+  //:top 3px
+  //:left 0.48em
   
 .placeholder
   @include placeholder_styles