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

Make the account image form less ugly

Browse source
This commit is contained in:
Thomas Levine 2013-06-11 13:27:57 -04:00 • committed by Tom Hughes
parent 69e1c2c3ca
commit 3b43cb33cb
2 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1295,9 +1295,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
border: 1px solid #ccc;
}
.accountImage-options {
width: 50%;
display: inline-block;
.accountImage-options p {
margin-bottom: 0px;
}
.nohome .location {

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

@ -89,35 +89,46 @@
<label><%= t 'user.account.image' %></label>
<div class="accountImage">
<%= user_image @user %>
<table class="accountImage-options">
<fieldset class="accountImage-options">
<% if @user.image.file? %>
<fieldset class="form-row">
<div class="form-row">
<%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %>
<%= t 'user.account.keep image' %>
</fieldset>
</div>
<% end %>
<% if @user.image.file? || @user.image_use_gravatar? %>
<fieldset class="form-row">
<div class="form-row">
<%= radio_button_tag "image_action", "delete" %>
<%= t 'user.account.delete image' %>
</fieldset>
</div>
<% end %>
<% if @user.image.file? %>
<fieldset class="form-row">
<%= radio_button_tag "image_action", "new" %>
<%= t 'user.account.replace image' %><br /><%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %><br /><span class="form-help deemphasize"><%= t 'user.account.image size hint' %></span>
</fieldset>
<div>
<div class="form-row">
<%= radio_button_tag "image_action", "new" %>
<%= t 'user.account.replace image' %>
</div>
<div class="form-row">
<%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
<p class="form-help deemphasize"><%= t 'user.account.image size hint' %></p>
</div>
</div>
<% else %>
<fieldset class="form-row">
<div class="form-row">
<%= radio_button_tag "image_action", "new" %>
<%= t 'user.account.new image' %><br /><%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %><br /><span class="form-help deemphasize"><%= t 'user.account.image size hint' %></span>
</fieldset>
<%= t 'user.account.new image' %>
</div>
<div class="form-row">
<%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
<p class="form-help deemphasize"><%= t 'user.account.image size hint' %></p>
</div>
<% end %>
<fieldset class="form-row">
<div class="form-row">
<%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %>
<%= t 'user.account.gravatar.gravatar' %> <span class="form-help deemphasize">(<a href="<%= t 'user.account.gravatar.link' %>" target="_new"><%= t 'user.account.gravatar.link text' %></a>)</span>
</fieldset>
</table>
<%= t 'user.account.gravatar.gravatar' %>
<p class="form-help deemphasize">(<a href="<%= t 'user.account.gravatar.link' %>" target="_new"><%= t 'user.account.gravatar.link text' %></a>)</p>
</div>
</fieldset>
</div>
</fieldset>