Remove tables from user settings page
This commit is contained in:
Thomas Levine
Tom Hughes
parent
26d7f66fbd
commit
f6c7ed6011
2 changed files with 100 additions and 108 deletions
|
|
@ -1288,14 +1288,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
|
|||
|
||||
/* Rules for the account settings page */
|
||||
|
||||
#accountForm {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
#accountForm td {
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
|
||||
#accountForm .user_map {
|
||||
position: relative;
|
||||
width: 500px;
|
||||
|
|
@ -1320,10 +1312,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
|
|||
display: inline !important;
|
||||
}
|
||||
|
||||
#accountForm input[type=submit] {
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
.content_map.settings_map {
|
||||
float: none;
|
||||
width: 50%;
|
||||
|
|
|
|||
|
|
@ -7,141 +7,145 @@
|
|||
<% end %>
|
||||
|
||||
<%= error_messages_for 'user' %>
|
||||
<%= form_for :user, :html => { :multipart => true } do |f| %>
|
||||
<table id="accountForm">
|
||||
<tr>
|
||||
<td class="fieldName"><%= t 'user.new.display name' %></td>
|
||||
<td><%= f.text_field :display_name %></td>
|
||||
</tr>
|
||||
<%= form_for :user, :html => { :multipart => true, :id => 'accountForm',:class => 'standard-form' } do |f| %>
|
||||
<fieldset class="form-row">
|
||||
<label><%= t 'user.new.display name' %></label>
|
||||
<%= f.text_field :display_name %>
|
||||
</fieldset>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName" style="padding-bottom:0px;"><%= t 'user.account.current email address' %></td>
|
||||
<td style="padding-bottom:0px;"><%= @user.email %> <span class="minorNote"><%= t 'user.account.email never displayed publicly' %></span></td>
|
||||
</tr>
|
||||
<fieldset class="form-row">
|
||||
<label><%= t 'user.account.current email address' %></label>
|
||||
<input type="email" size="30" disabled value="<%= @user.email %>" />
|
||||
<p class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></p>
|
||||
</fieldset>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName"><%= t 'user.account.new email address' %></td>
|
||||
<td><%= f.email_field :new_email, {:size => 50, :maxlength => 255} %> <span class="minorNote"><%= t 'user.account.email never displayed publicly' %></span></td>
|
||||
</tr>
|
||||
<fieldset class="form-row">
|
||||
<label><%= t 'user.account.new email address' %></label>
|
||||
<%= f.email_field :new_email %>
|
||||
<p class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></p>
|
||||
</fieldset>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName" style="padding-bottom:0px;"><%= t 'user.new.password' %></td>
|
||||
<td style="padding-bottom:0px;"><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>
|
||||
</tr>
|
||||
<fieldset class="form-row">
|
||||
<label><%= t 'user.new.password' %>
|
||||
<%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %>
|
||||
</fieldset>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName"><%= t 'user.new.confirm password' %></td>
|
||||
<td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>
|
||||
</tr>
|
||||
<fieldset class="form-row">
|
||||
<label><%= t 'user.new.confirm password' %>
|
||||
<%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %>
|
||||
</fieldset>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName" ><%= t 'user.account.openid.openid' %></td>
|
||||
<td><%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span></td>
|
||||
</tr>
|
||||
<fieldset class="form-row">
|
||||
<label ><%= t 'user.account.openid.openid' %>
|
||||
<%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %>
|
||||
<p class="form-help deemphasize">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</p>
|
||||
</fieldset>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName"><%= t 'user.account.public editing.heading' %></td>
|
||||
<td>
|
||||
<div class="form-row">
|
||||
<label><%= t 'user.account.public editing.heading' %></label>
|
||||
<p class="form-help deemphasize">
|
||||
<% if @user.data_public? %>
|
||||
<%= t 'user.account.public editing.enabled' %> <span class="minorNote">(<a href="<%= t 'user.account.public editing.enabled link' %>" target="_new"><%= t 'user.account.public editing.enabled link text' %></a>)</span>
|
||||
<%= t 'user.account.public editing.enabled' %>
|
||||
(<a href="<%= t 'user.account.public editing.enabled link' %>" target="_new"><%= t 'user.account.public editing.enabled link text' %></a>)
|
||||
<% else %>
|
||||
<%= t 'user.account.public editing.disabled' %> <span class="minorNote">(<a href="#public"><%= t 'user.account.public editing.disabled link text' %></a>)</span>
|
||||
<%= t 'user.account.public editing.disabled' %>
|
||||
(<a href="#public"><%= t 'user.account.public editing.disabled link text' %></a>)
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName"><%= t 'user.account.contributor terms.heading' %></td>
|
||||
<td>
|
||||
<fieldset class="form-row">
|
||||
<label><%= t 'user.account.contributor terms.heading' %></label>
|
||||
<p class="form-help deemphasize">
|
||||
<% if @user.terms_agreed? %>
|
||||
<%= t 'user.account.contributor terms.agreed' %>
|
||||
<span class="minorNote">(<a href="<%= t 'user.account.contributor terms.link' %>" target="_new"><%= t 'user.account.contributor terms.link text' %></a>)</span>
|
||||
<br />
|
||||
(<a href="<%= t 'user.account.contributor terms.link' %>" target="_new"><%= t 'user.account.contributor terms.link text' %></a>)
|
||||
<% if @user.consider_pd? %>
|
||||
<%= t 'user.account.contributor terms.agreed_with_pd' %>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<%= t 'user.account.contributor terms.not yet agreed' %> <br />
|
||||
|
||||
<%= t 'user.account.contributor terms.not yet agreed' %>
|
||||
<%= link_to t('user.account.contributor terms.review link text'), :controller => 'user', :action => 'terms' %>
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
</p>
|
||||
</fieldset>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName"><%= t 'user.account.profile description' %></td>
|
||||
<td><%= richtext_area :user, :description, :rows => '15', :cols => '80' %></td>
|
||||
</tr>
|
||||
<fieldset class="form-row">
|
||||
<label><%= t 'user.account.profile description' %></label>
|
||||
<%= richtext_area :user, :description, :rows => '15', :cols => '80' %>
|
||||
</fieldset>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName"><%= t 'user.account.preferred languages' %></td>
|
||||
<td><%= f.text_field :languages %></td>
|
||||
</tr>
|
||||
<fieldset class="form-row">
|
||||
<label><%= t 'user.account.preferred languages' %></label>
|
||||
<%= f.text_field :languages %>
|
||||
</fieldset>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName"><%= t 'user.account.preferred editor' %></td>
|
||||
<td><%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %></td>
|
||||
</tr>
|
||||
<fieldset class="form-row">
|
||||
<label><%= t 'user.account.preferred editor' %></label>
|
||||
<%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
|
||||
</fieldset>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName">
|
||||
<%= t 'user.account.image' %>
|
||||
</td>
|
||||
<td class="accountImage">
|
||||
<fieldset class="form-row">
|
||||
<label><%= t 'user.account.image' %></label>
|
||||
<div class="accountImage">
|
||||
<%= user_image @user %>
|
||||
<table class="accountImage-options">
|
||||
<% if @user.image.file? %>
|
||||
<tr>
|
||||
<td><%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %></td>
|
||||
<td><%= t 'user.account.keep image' %></td>
|
||||
</tr>
|
||||
<fieldset class="form-row">
|
||||
<%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %>
|
||||
<%= t 'user.account.keep image' %>
|
||||
</fieldset>
|
||||
<% 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>
|
||||
<fieldset class="form-row">
|
||||
<%= radio_button_tag "image_action", "delete" %>
|
||||
<%= t 'user.account.delete image' %>
|
||||
</fieldset>
|
||||
<% 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>
|
||||
</tr>
|
||||
<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>
|
||||
<% else %>
|
||||
<tr>
|
||||
<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>
|
||||
<fieldset 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>
|
||||
<% end %>
|
||||
<tr>
|
||||
<td><%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %></td>
|
||||
<td><%= t 'user.account.gravatar.gravatar' %> <span class="minorNote">(<a href="<%= t 'user.account.gravatar.link' %>" target="_new"><%= t 'user.account.gravatar.link text' %></a>)</span></td>
|
||||
</tr>
|
||||
<fieldset 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>
|
||||
</td>
|
||||
</tr>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<tr id="homerow" <% unless @user.home_lat and @user.home_lon %> class="nohome" <%end%> >
|
||||
<td class="fieldName"><%= t 'user.account.home location' %></td>
|
||||
<td><em class="message"><%= t 'user.account.no home location' %></em><span class="location"><%= t 'user.account.latitude' %> <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %> <%= t 'user.account.longitude' %><%= f.text_field :home_lon, :size => 20, :id => "home_lon" %></span></td>
|
||||
</tr>
|
||||
<fieldset id="homerow" <% unless @user.home_lat and @user.home_lon %> class="nohome" <%end%> >
|
||||
<p class="form-help"><%= t 'user.account.home location' %></p>
|
||||
<p class="message form-help deemphasize"><%= t 'user.account.no home location' %></p>
|
||||
<div class="location">
|
||||
<label><%= t 'user.account.latitude' %></label>
|
||||
<%= f.text_field :home_lat, :id => "home_lat" %>
|
||||
<label><%= t 'user.account.longitude' %></label>
|
||||
<%= f.text_field :home_lon, :id => "home_lon" %>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<tr>
|
||||
<td></td>
|
||||
<td>
|
||||
<fieldset class="form-row">
|
||||
|
||||
|
||||
<p><%= t 'user.account.update home location on click' %> <input type="checkbox" value="1" <% unless @user.home_lat and @user.home_lon %> checked="checked" <% end %> id="updatehome" /> </p>
|
||||
<% content_for :head do %>
|
||||
<%= javascript_include_tag "user" %>
|
||||
<% end %>
|
||||
<%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</fieldset>
|
||||
|
||||
<tr>
|
||||
<td></td>
|
||||
<td class="submitButton"><%= submit_tag t('user.account.save changes button') %></td>
|
||||
</tr>
|
||||
</table>
|
||||
<fieldset class="form-row">
|
||||
<%= submit_tag t('user.account.save changes button') %>
|
||||
</fieldset>
|
||||
<% end %>
|
||||
|
||||
<% unless @user.data_public? %>
|
||||
|
|
@ -149,4 +153,4 @@
|
|||
<h2><%= t 'user.account.public editing note.heading' %></h2>
|
||||
<%= raw t 'user.account.public editing note.text' %>
|
||||
<%= button_to t('user.account.make edits public button'), :action => :go_public %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue