nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a couple of additions to the branch

Browse source
This commit is contained in:
Maxwell Salzberg 2012-01-18 23:44:54 -08:00 committed by Florian Staudacher
parent ad5a17776f
commit aa449f3a2d
5 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/invitations/new.html.haml
View file

@ -13,7 +13,7 @@
= form_for User.new, :url => invitation_path(User) do |invite| = form_for User.new, :url => invitation_path(User) do |invite|
%h4 %h4
= t('email') = 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 %br
%h4 %h4
@ -32,7 +32,7 @@
%h4 %h4
= t('.personal_message') = t('.personal_message')
= invite.text_area :invite_messages, :rows => 3, :value => "" = invite.text_area :invite_messages, :rows => 3, :value => t('.check_out_diaspora')
%p %p
= invite.submit t('.send_an_invitation') = invite.submit t('.send_an_invitation')

11
app/views/profiles/_edit_public.haml
View file

@ -40,17 +40,18 @@
%h4 %h4
= t('profiles.edit.your_name') = t('profiles.edit.your_name')
= text_field_tag 'profile[first_name]', profile.first_name, :placeholder => t('profiles.edit.first_name') = label_tag 'profile[first_name]', t('profiles.edit.first_name')
= text_field_tag 'profile[last_name]', profile.last_name, :placeholder => t('profiles.edit.last_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 %br
%h4 %h4
= t('profiles.edit.your_tags') = t('profiles.edit.your_tags')
= text_field_tag 'profile[tag_string]', "" = text_field_tag 'profile[tag_string]', "", :placeholder => t('profiles.edit.your_tags_placeholder')
%p{:style => "color:#777;font-style:italic"}
= t('profiles.edit.your_tags_placeholder')
%br %br

7
app/views/users/edit.html.haml
View file

@ -38,16 +38,15 @@
= t('.change_password') = t('.change_password')
= form_for 'user', :url => user_path, :html => { :method => :put } do |f| = form_for 'user', :url => user_path, :html => { :method => :put } do |f|
= f.error_messages = f.error_messages
%p %p
= f.label :current_password, t('.current_password') = 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 %p
= f.label :password, t('.new_password') = f.label :password, t('.new_password')
= f.password_field :password = f.password_field :password, :placeholder => 'must be at least six charaters'
%p %p
= f.label :password_confirmation, t('password_confirmation') = 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 .submit_block
= link_to t('cancel'), edit_user_path = link_to t('cancel'), edit_user_path

3
public/javascripts/view.js
View file

@ -9,9 +9,6 @@ var View = {
/* label placeholders */ /* label placeholders */
$("input, textarea").placeholder(); $("input, textarea").placeholder();
if( jQuery.fn.placeholder.input ) {
$("input[placeholder], textarea[placeholder]").siblings("label").hide();
}
/* "Toggling" the search input */ /* "Toggling" the search input */
$(this.search.selector) $(this.search.selector)

9
public/stylesheets/sass/application.sass
View file

@ -890,11 +890,10 @@ form p.checkbox_select
:text-shadow 0 1px 1px #eee :text-shadow 0 1px 1px #eee
:font-weight normal :font-weight normal
label:not(.bootstrapped) //label:not(.bootstrapped)
@include placeholder_styles //:position absolute
:position absolute //:top 3px
:top 3px //:left 0.48em
:left 0.48em
.placeholder .placeholder
@include placeholder_styles @include placeholder_styles