Add standard-label class to all form labels

diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index 0cb1bf8acb79fa9d7bbc7c46892731c254020d40..940389c8367facad3fe9641c6a5a96acbbf63062 100644 (file)
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -11,26 +11,26 @@
 <%= form_for :diary_entry do |f| %>
   <div class="diary_entry standard-form">
     <fieldset>
-      <label><%= t 'diary_entry.edit.subject' -%></label>
+      <label class="standard-label"><%= t 'diary_entry.edit.subject' -%></label>
       <%= f.text_field :title, :size => 60 %>
     </fieldset>
     <fieldset>
-      <label><%= t 'diary_entry.edit.body' -%></label>
+      <label class="standard-label"><%= t 'diary_entry.edit.body' -%></label>
       <%= richtext_area :diary_entry, :body, :cols => 80, :format => @diary_entry.body_format %>
     </fieldset>
     <fieldset>
-      <label><%= t 'diary_entry.edit.language' -%></label>
+      <label class="standard-label"><%= t 'diary_entry.edit.language' -%></label>
       <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
     </fieldset>
     <div class="location">
       <p class="form-help"><%= t 'diary_entry.edit.location' -%></p>
       <%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %>
       <fieldset>
-        <label><%= t 'diary_entry.edit.latitude' -%></label>
+        <label class="standard-label"><%= t 'diary_entry.edit.latitude' -%></label>
         <%= f.text_field :latitude, :size => 20, :id => "latitude" %>
       </fieldset>
       <fieldset>
-        <label><%= t 'diary_entry.edit.longitude' -%></label>
+        <label class="standard-label"><%= t 'diary_entry.edit.longitude' -%></label>
         <%= f.text_field :longitude, :size => 20, :id => "longitude" %>
       </fieldset>
       <p class="form-help"><a href="#" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a></p>

diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb
index 6b8ad18262661305b673d62c463feb3a6abd7a2c..ea9c510f93dad22b519acbfa2a673e0b7af351cb 100644 (file)
--- a/app/views/message/new.html.erb
+++ b/app/views/message/new.html.erb
@@ -6,12 +6,12 @@
 
 <%= form_for :message, :html => { :class => 'standard-form' }, :url => { :action => "new", :display_name => @this_user.display_name } do |f| %>
   <fieldset class="form-row">
-    <label><%= t'message.new.subject' %></label>
+    <label class="standard-label"><%= t'message.new.subject' %></label>
     <%= f.text_field :title, :size => 60, :value => @subject %>
   </fieldset>
 
   <fieldset class="form-row">
-    <label><%= t'message.new.body' %></label>
+    <label class="standard-label"><%= t'message.new.body' %></label>
     <%= richtext_area :message, :body, :cols => 80, :value => @body %>
   </fieldset>
 

diff --git a/app/views/trace/create.html.erb b/app/views/trace/create.html.erb
index 98bce9a513609c1aef72acfbb0164bcfde108bbe..bfdbf37b42d35d3f63fa01a1b883e911799af87d 100644 (file)
--- a/app/views/trace/create.html.erb
+++ b/app/views/trace/create.html.erb
@@ -7,20 +7,20 @@
 <%= form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
   <div class="standard-form">
     <fieldset>
-      <label><%= t'trace.trace_form.upload_gpx' %></label>
+      <label class="standard-label"><%= t'trace.trace_form.upload_gpx' %></label>
       <%= f.file_field :gpx_file %>
     </fieldset>
     <fieldset>
-      <label><%= t'trace.trace_form.description' %></label>
+      <label class="standard-label"><%= t'trace.trace_form.description' %></label>
       <%= f.text_field :description %></td></tr>
     </fieldset>
     <fieldset>
-      <label><%= t'trace.trace_form.tags' %></label>
+      <label class="standard-label"><%= t'trace.trace_form.tags' %></label>
       <%= f.text_field :tagstring %>
       <p class="form-help deemphasize">(<%= t'trace.trace_form.tags_help' %>)</p>
     </fieldset>
     <fieldset>
-      <label><%= t'trace.trace_form.visibility' %></label>
+      <label class="standard-label"><%= t'trace.trace_form.visibility' %></label>
       <%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %>
       <p class="form-help deemphasize">(<a href="<%= t'trace.trace_form.visibility_help_url' %>"><%= t'trace.trace_form.visibility_help' %></a>)</p>
     </fieldset>

diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index f7408dfe554e1c18c16afd39edba5b38412e5443..b5f93dcfb402010f6a0877837bcb760a9869d7ba 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -9,40 +9,40 @@
 <%= error_messages_for 'user' %>
 <%= form_for :user, :html => { :multipart => true, :id => 'accountForm',:class => 'standard-form' } do |f| %>
   <fieldset class="form-row">
-    <label><%= t 'user.new.display name' %></label>
+    <label class="standard-label"><%= t 'user.new.display name' %></label>
     <%= f.text_field :display_name %>
   </fieldset>
 
   <fieldset class="form-row">
-    <label><%= t 'user.account.current email address' %></label>
+    <label class="standard-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>
 
   <fieldset class="form-row">
-    <label><%= t 'user.account.new email address' %></label>
+    <label class="standard-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>
 
   <fieldset class="form-row">
-      <label><%= t 'user.new.password' %></label>
+      <label class="standard-label"><%= t 'user.new.password' %></label>
     <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %>
   </fieldset>
 
   <fieldset class="form-row">
-    <label><%= t 'user.new.confirm password' %></label>
+    <label class="standard-label"><%= t 'user.new.confirm password' %></label>
     <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %>
   </fieldset>
 
   <fieldset class="form-row">
-    <label><%= t 'user.account.openid.openid' %></label>
+    <label class="standard-label"><%= t 'user.account.openid.openid' %></label>
       <%= 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>
 
   <div class="form-row">
-    <label><%= t 'user.account.public editing.heading' %></label>
+    <label class="standard-label"><%= t 'user.account.public editing.heading' %></label>
     <p class="form-help deemphasize">
       <% if @user.data_public? %>
         <%= t 'user.account.public editing.enabled' %>
@@ -55,7 +55,7 @@
   </div>
 
   <fieldset class="form-row">
-    <label><%= t 'user.account.contributor terms.heading' %></label>
+    <label class="standard-label"><%= t 'user.account.contributor terms.heading' %></label>
     <p class="form-help deemphasize">
       <% if @user.terms_agreed? %>
         <%= t 'user.account.contributor terms.agreed' %>
@@ -71,22 +71,22 @@
   </fieldset>
 
   <fieldset class="form-row">
-    <label><%= t 'user.account.profile description' %></label>
+    <label class="standard-label"><%= t 'user.account.profile description' %></label>
     <%= richtext_area :user, :description, :rows => '15', :cols => '80' %>
   </fieldset>
 
   <fieldset class="form-row">
-    <label><%= t 'user.account.preferred languages' %></label>
+    <label class="standard-label"><%= t 'user.account.preferred languages' %></label>
     <%= f.text_field :languages %>
   </fieldset>
 
   <fieldset class="form-row">
-    <label><%= t 'user.account.preferred editor' %></label>
+    <label class="standard-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>
 
   <fieldset class="form-row">
-    <label><%= t 'user.account.image' %></label>
+    <label class="standard-label"><%= t 'user.account.image' %></label>
     <div class="accountImage">
       <%= user_image @user %>
       <fieldset class="accountImage-options">
@@ -137,9 +137,9 @@
   <div id="homerow" <% unless @user.home_lat and @user.home_lon %>class="nohome"<%end%> >
     <p class="message form-help deemphasize"><%= t 'user.account.no home location' %></p>
     <div class="location">
-      <label><%= t 'user.account.latitude' %></label>
+      <label class="standard-label"><%= t 'user.account.latitude' %></label>
       <%= f.text_field :home_lat, :id => "home_lat" %>
-      <label><%= t 'user.account.longitude' %></label>
+      <label class="standard-label"><%= t 'user.account.longitude' %></label>
       <%= f.text_field :home_lon, :id => "home_lon" %>
     </div>
   </div>

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index a7927b6e026116098f9dcb38fb231d15c844e4be..f03292fe99ae858f442d189263b230ff428cb0fc 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -11,13 +11,13 @@
 
     <div id="loginForm" class="standard-form">
       <fieldset>
-        <label>
+        <label class="standard-label">
           <%= t 'user.login.email or username' %>
         </label>
         <%= text_field_tag "username", params[:username], :maxlength => 255, :tabindex => 1 %>
       </fieldset>
       <fieldset>
-        <label>
+        <label class="standard-label">
           <%= t 'user.login.password' %>
         </label>
         <%= password_field_tag "password", "", :maxlength => 255, :tabindex => 2 %>
@@ -27,7 +27,7 @@
       </fieldset>
       <fieldset>
         <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
-        <label for="remember_me">
+        <label for="remember_me" class="standard-label">
           <%= t 'user.login.remember' %>
         </label>
       </fieldset>
@@ -48,12 +48,12 @@
 
     <div>
       <fieldset id="login_openid_url">
-        <label><%= raw t 'user.login.openid', :logo => openid_logo %></label>
+        <label class="standard-label"><%= raw t 'user.login.openid', :logo => openid_logo %></label>
         <%= url_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %>
         <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
       </fieldset>
       <fieldset id="remember_me_openid">
-        <label for="remember_me"><%= t 'user.login.remember' %></label>
+        <label class="standard-label" for="remember_me"><%= t 'user.login.remember' %></label>
         <%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %>
       </fieldset>
     </div>

diff --git a/app/views/user/lost_password.html.erb b/app/views/user/lost_password.html.erb
index cf7f9b7d0396341757df80b6a3f2f5adf3642288..19147e0b075b9457b79c753c8bb9bf842d516055 100644 (file)
--- a/app/views/user/lost_password.html.erb
+++ b/app/views/user/lost_password.html.erb
@@ -6,7 +6,7 @@
 
 <%= form_tag :action => 'lost_password' do %>
   <div class="standard-form">
-    <label><%= t 'user.lost_password.email address' %></label>
+    <label class="standard-label"><%= t 'user.lost_password.email address' %></label>
     <%= text_field('user', 'email', { :tabindex => 1} ) %>
     <%= submit_tag t('user.lost_password.new password button'), :tabindex => 2 %>
   </div>

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 2b113866608224b59eeafbc2825cba0f49ba3212..ab243cbfd7602c673e1ae36bccfae6aead1a136a 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -12,13 +12,13 @@
   <div id="signupForm" class="standard-form">
     <fieldset>
       <div class="form-row">
-        <label for="email" class="fieldName">
+        <label for="email" class="standard-label">
           <%= t 'user.new.email address' %>
         </label>
         <%= email_field(:user, :email, { :tabindex => 1 }) %>
       </div>
       <div class="form-row">
-        <label for="email_confirmation" class="fieldName">
+        <label for="email_confirmation" class="standard-label">
           <%= t 'user.new.confirm email address' %>
         </label>
         <%= email_field(:user, :email_confirmation, { :tabindex => 2 }) %>
@@ -28,7 +28,7 @@
 
     <fieldset>
       <div class="form-row">
-        <label for="display_name" class="fieldName">
+        <label for="display_name" class="standard-label">
           <%= t 'user.new.display name' %>
         </label>
         <%= text_field(:user, :display_name, { :tabindex => 3 }) %>
@@ -38,7 +38,7 @@
 
     <fieldset id="openid_field">
       <div class="form-row">
-        <label for="openid_url" class="fieldName">
+        <label for="openid_url" class="standard-label">
           <%= raw t 'user.new.openid', :logo => openid_logo %>
         </label>
         <%= url_field(:user, :openid_url, { :id => "openid_url", :tabindex => 4, :class => "openid_url" }) %>
@@ -47,13 +47,13 @@
 
     <fieldset>
       <div class="form-row">
-        <label for='user[pass_crypt]' class="fieldName">
+        <label for='user[pass_crypt]' class="standard-label">
           <%= t 'user.new.password' %>
         </label>
         <%= password_field(:user, :pass_crypt, {:tabindex => 5 }) %>
       </div>
       <div class="form-row">
-        <label class="fieldName">
+        <label class="standard-label">
           <%= t 'user.new.confirm password' %>
         </label>
         <%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 6 }) %>

diff --git a/app/views/user/reset_password.html.erb b/app/views/user/reset_password.html.erb
index 3f011a5fda13da714711fa52c6c08beb72c65da3..d1718a5e4853f074a77c3b6dd488a62c1057e68e 100644 (file)
--- a/app/views/user/reset_password.html.erb
+++ b/app/views/user/reset_password.html.erb
@@ -8,11 +8,11 @@
 <%= hidden_field_tag(:token, params[:token]) %>
   <div class="standard-form">
     <fieldset>
-      <label><%= t 'user.reset_password.password' %></label>
+      <label class="standard-label"><%= t 'user.reset_password.password' %></label>
       <%= password_field(:user, :pass_crypt, {:value => '', :tabindex => 4}) %>
     </fieldset>
     <fieldset>
-      <label><%= t 'user.reset_password.confirm password' %></label>
+      <label class="standard-label"><%= t 'user.reset_password.confirm password' %></label>
       <%= password_field(:user, :pass_crypt_confirmation, {:value => '', :tabindex => 5}) %>
     </fieldset>
     <%= submit_tag t('user.reset_password.reset'), :tabindex => 6 %>