Merge branch 'master' of github.com:diaspora/diaspora

app/views/layouts/application.html.haml

@@ -47,8 +47,7 @@
           %ul
             %li#global_search
               = form_tag(people_path, :method => 'get') do
-                %label{:for => 'q'} Search
+                = text_field_tag 'q', nil, :placeholder => "Search", :type => 'search', :results => 5
-                = text_field_tag 'q'
 
             %li= link_to current_user.real_name, current_user.person
             %li= link_to "settings", edit_user_path(current_user)

app/views/shared/_public_explain.haml

@@ -1,9 +1,12 @@
-%h1 you are about to post a public message!
+%h3 You are about to post a public message!
-%p 
+%p
-  this message is going to be posted to your public feed, 
+  Public messages will be available for others outside of Diaspora to see.
-  and to any services you may have connected to Diaspora.
 
   - if @logged_in
     = connected_fb_as(@access_token)
   - else
     = link_to "Connect to Facebook", @fb_access_url
+
+  %br
+  %br
+  = link_to "OK", '#', :class => "button", :onClick => '$.fancybox.close();'

app/views/shared/_publisher.haml

@@ -6,11 +6,7 @@
   
   $("div.public_toggle input").live("click", function(evt){
     if("#{@logged_in}" == "false" && $(this).attr('checked') == true){
-      if(confirm("You are currently not connected to facebook.  Sign in to facebook?")){
+      $(".question_mark").click(); 
-        window.location = "#{@fb_access_url}";
-      } else {
-        $(this).attr('checked', false);
-      }
     }; 
   });
 
@@ -34,8 +30,8 @@
     - if @aspect == :all
       .public_toggle
         = f.check_box( :public, :value => false )
-        share on facebook
+        make public
-        = link_to 'public info', "#question_mark_pane", :class => 'question_mark'
+        = link_to '(?)', "#question_mark_pane", :class => 'question_mark'
         .yo{:style => "display:none;"}
           #question_mark_pane
             = render 'shared/public_explain'

public/stylesheets/sass/application.sass

@@ -542,6 +542,7 @@ li.message .from .destroy_link
 
 input[type='text'],
 input[type='password'],
+input[type="search"],
 textarea
   :font
     :family 'Arial', 'Helvetica', sans-serif
@@ -1019,3 +1020,9 @@ ul#settings_nav
       :size 80px
     :display inline-block
 
+input[type="search"]
+  :-webkit-appearance textfield
+
+header
+  input[type="search"]
+    :width 200px