From: Harry Wood Date: Sat, 8 Nov 2008 19:03:25 +0000 (+0000) Subject: cosmetic tweaks to user settings form + move 'Mapper since' field onto user profile... X-Git-Tag: live~7557^2~192 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/43b3998657c9807a68e71609c568748c8337b95e cosmetic tweaks to user settings form + move 'Mapper since' field onto user profile view --- diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml index cf7ad9fc8..a5416ff68 100644 --- a/app/views/layouts/site.rhtml +++ b/app/views/layouts/site.rhtml @@ -69,6 +69,7 @@ <% unless @user %>
+ HELLO! OpenStreetMap is a free editable map of the whole world. It is made by people like you.

OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth. diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml index 501af7494..8a57ccf52 100644 --- a/app/views/user/account.rhtml +++ b/app/views/user/account.rhtml @@ -1,34 +1,53 @@ -

User details

+

My settings

<%= error_messages_for 'user' %> <% form_for :user, @user do |f| %> - - - - - - +
Email<%= f.text_field :email %>
Mapper since<%= @user.creation_time %> (<%= time_ago_in_words(@user.creation_time) %> ago)
Display Name<%= f.text_field :display_name %>
Password<%= f.password_field :pass_crypt, {:value => '', :size => 50, :maxlength => 255} %>
Confirm Password<%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 50, :maxlength => 255} %>
+ + + + + + + + + - + + + - class="nohome" <%end%> > + class="nohome" <%end%> > + +
Display Name : <%= f.text_field :display_name %>
Email : <%= f.text_field :email, {:size => 50, :maxlength => 255} %> (not displayed publicly)
Password : <%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %>
Confirm Password : <%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %>
Public editing : +<% if @user.data_public? %> + Enabled. Not anonymous (what's this?) +<% else %> + + Currently your edits are anonymous and people can't send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. + You will need to do this if you want to use the online editor and it is encouraged (find out why). +

+ This action cannot be reversed and all new users are now public by default. +

+ <%= button_to "Make all my edits public", :action => :go_public %> +

+ +<% end %> +
Description<%= f.text_area :description, :class => "editDescription" %>
Profile Description : <%= f.text_area :description, :rows => '5', :cols => '60' %>

Your homeYou have not entered your home location.Latitude: <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %> Longitude <%= f.text_field :home_lon, :size => 20, :id => "home_lon" %>
Home Location : You have not entered your home location.Latitude: <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %> Longitude <%= f.text_field :home_lon, :size => 20, :id => "home_lon" %>

Update home location when I click on the map? checked="checked" <% end %> id="updatehome" />

-
+


<%= submit_tag 'Save Changes' %>
-<%= submit_tag 'Save Changes' %> +
+ <% end %> <%= render :partial => 'friend_map' %> -

Public editing

-<% if @user.data_public? %> - All your edits are public. -<% else %> -Currently your edits are anonymous and people can't send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. -You will need to do this if you want to use the online editor and it is encouraged (find out why). -This action cannot be reversed and all new users are now public by default. -

- <%= button_to "Make all my edits public", :action => :go_public %> -<% end %> +
+
+
+<%= link_to 'return to profile', :controller => 'user', :action => @user.display_name %> +
+
\ No newline at end of file diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml index 438de836d..66a7426f5 100644 --- a/app/views/user/view.rhtml +++ b/app/views/user/view.rhtml @@ -2,11 +2,13 @@

<%= h(@this_user.display_name) %>

<% if @user and @this_user.id == @user.id %> + <%= link_to 'my diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> | <%= link_to 'new diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> | <%= link_to 'my traces', :controller => 'trace', :action=>'mine' %> | <%= link_to 'my settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> <% else %> + <%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %> | <%= link_to 'diary', :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %> | <%= link_to 'traces', :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %> @@ -18,6 +20,12 @@ <% end %>
+<% if @this_user != nil %> +

+Mapper since : <%= @this_user.creation_time %> (<%= time_ago_in_words(@this_user.creation_time) %> ago) +

+<% end %> +

User image

<% if @this_user.image %> <%= image_tag url_for_file_column(@this_user, "image") %> @@ -92,3 +100,9 @@ <% end %> <% end %> <% end %> + +
+
+<% if @user and @this_user.id == @user.id %> +<%= link_to 'change your settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> +<% end %> \ No newline at end of file diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css index 31c61de28..222c93280 100644 --- a/public/stylesheets/site.css +++ b/public/stylesheets/site.css @@ -527,6 +527,14 @@ input[type="submit"] { border: 1px solid black; } +#accountForm TD { + padding-bottom:10px; +} +#accountForm .fieldName { + text-align:right; + font-weight:bold; +} + .nohome .location { display: none; } @@ -539,9 +547,8 @@ input[type="submit"] { display: inline !important; } -.editDescription { - height: 10ex; - width: 30em; +.minorNote { + font-size:0.8em; } .nowrap {