cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve the user image selection UI

Browse source
This commit is contained in:
Tom Hughes 2012-10-17 13:05:05 +01:00
parent ad43499205
commit 8cdd6b6a1c
2 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/assets/stylesheets/common.css.scss
View file

@ -928,8 +928,19 @@ p#contributorGuidance {
border: 1px solid #ccc;
}
#accountImage td {
padding-bottom: 0px;
#accountForm td.accountImage {
img {
vertical-align: top;
margin-top: 3px;
}
table {
display: inline-block;
td {
padding-bottom: 0px;
}
}
}
.nohome .location {

17
app/views/user/account.html.erb
View file

@ -84,27 +84,30 @@
<td class="fieldName">
<%= t 'user.account.image' %>
</td>
<td valign="top">
<table id="accountImage">
<td class="accountImage">
<%= user_image @user %>
<table>
<% if @user.image.file? %>
<tr>
<td rowspan="4" valign="top"><%= user_image @user %></td>
<td><%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %></td>
<td><%= t 'user.account.keep image' %></td>
</tr>
<% end %>
<% if @user.image.file? || @user.image_use_gravatar? %>
<tr>
<td><%= radio_button_tag "image_action", "delete" %></td>
<td><%= t 'user.account.delete image' %></td>
</tr>
<% end %>
<% if @user.image.file? %>
<tr>
<td><%= radio_button_tag "image_action", "new" %></td>
<td><%= t 'user.account.replace image' %><br /><%= f.file_field :image, :onchange => "$('image_action_new').prop('checked', true)" %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span></td>
<td><%= t 'user.account.replace image' %><br /><%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span></td>
</tr>
<% else %>
<tr>
<td rowspan="2" valign="top"><%= user_image @user %></td>
<td><%= radio_button_tag "image_action", "new", !@user.image_use_gravatar %></td>
<td><%= t 'user.account.new image' %> <%= f.file_field :image %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span></td>
<td><%= radio_button_tag "image_action", "new" %></td>
<td><%= t 'user.account.new image' %><br /><%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span></td>
</tr>
<% end %>
<tr>