Use new design on terms page

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index d4afea41086f9b6dca69cb334854b951bf297e74..6eecae577ec219cf01caff364ded192217d732bc 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1046,6 +1046,9 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 /* Overrides for pages that use new layout conventions */
 }
 
 /* Overrides for pages that use new layout conventions */

+.user-new,
+.user-create,
+.user-terms,

 .user-confirm,
 .site-copyright,
 .site-welcome {
 .user-confirm,
 .site-copyright,
 .site-welcome {


@@ -1056,6 +1059,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 .user-new,
 .user-create,
 
 .user-new,
 .user-create,

+.user-terms,

 .user-confirm {
   .content-heading {
     height: 200px;
 .user-confirm {
   .content-heading {
     height: 200px;


@@ -1063,7 +1067,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .user-new,
 }
 
 .user-new,

-.user-create {
+.user-create,
+.user-terms {

   #content {
     padding: 0;
   }
   #content {
     padding: 0;
   }


@@ -1526,7 +1531,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Rules for the account confirmation page */
 
 
 /* Rules for the account confirmation page */
 

-#terms {
+.user-terms {

   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;
   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;


@@ -1548,28 +1553,12 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     }
   }
 
     }
   }
 

-  form.sign {
-    input[type=submit] {
-      float: left;
-    }
-    #decline {
-      background: $lightblue;
-      &:hover {
-        background: darken($lightblue, $hovercolor);
-      }
+  #decline {
+    background: $lightblue;
+    &:hover {
+      background: darken($lightblue, $hovercolor);

     }
   }
     }
   }

-  fieldset {
-    margin-bottom: $lineheight;
-  }
-  #contributorGuidance {
-    background-color: $offwhite;
-    border-radius: 4px;
-    -moz-border-radius: 4px;
-  }
-  .signing-buttons {
-    height: 50px;
-  }

 }
 
 /* Rules for the account settings page */
 }
 
 /* Rules for the account settings page */

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 6c89a7830d5b8f6461822c26631981433d2a166c..3c085c99e27ff7efa33ca09683cd870f68b1a804 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -4,7 +4,7 @@
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 

-<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'signup-form-wrapper standard-form fillL col6 pad2' } do %>
+<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 pad2' } do %>

   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <fieldset>
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <fieldset>

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index f95073df67a9a99afd71c78097f41353d1f50735..e264393946363852d11cf84873738f0327f3d834 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -1,45 +1,55 @@
 <% content_for :heading do %>
   <h1><%= t 'user.terms.heading' %></h1>
 <% content_for :heading do %>
   <h1><%= t 'user.terms.heading' %></h1>

+  <div class='header-illustration new-user-main'></div>
+  <div class='header-illustration new-user-arm'></div>

 <% end %>
 
 <% end %>
 

-<div id="terms">
-  <div class="directions">
-    <p><%= t 'user.terms.read and accept' %></p>
-    
-    <!-- legale is <%= @legale %> -->
-    <%= form_tag :action => 'terms' do %>
-      <p><%= t 'user.terms.legale_select' %></p>
-      <fieldset>
-      <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name,legale| %>
+<%= form_tag({:action => "save"}, { :class => "standard-form fillL col6 pad2" }) do %>
+  <!-- legale is <%= @legale %> -->
+  <label class="standard-label">
+    <%= t 'user.terms.legale_select' %>
+  </label>
+
+  <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %>
+    <div class="form-row">
+      <label for="legale_<%= legale %>">

         <%= radio_button_tag 'legale', legale, @legale == legale %>
         <%= radio_button_tag 'legale', legale, @legale == legale %>

-        <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
-        <script type="text/javascript">
-        <!--
-          $("#legale_<%= legale %>").change(function () {
-            $("#contributorTerms").html("<%=j image_tag 'searching.gif' %>");
-            $("#contributorTerms").load("<%= url_for :legale => legale %>");
-          });
-        // -->
-        </script>
-      <% end %>
-      </fieldset>
-    <% end %>
-  </div> 
+        <%= t('user.terms.legale_names.' + name) %>
+      </label>
+      <script>
+        $("#legale_<%= legale %>").change(function () {
+          $("#contributorTerms").html("<%=j image_tag 'searching.gif' %>");
+          $("#contributorTerms").load("<%= url_for :legale => legale %>");
+        });
+      </script>
+    </div>
+  <% end %>
+

   <div id="contributorTerms" class="legale">
     <%= render :partial => "terms" %>
   </div>
   <div id="contributorTerms" class="legale">
     <%= render :partial => "terms" %>
   </div>

-  
-  <%= form_tag({:action => "save"}, { :class => "sign" }) do %>
-    <p>
-      <label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
+
+  <div class="form-row">
+    <label for="user_consider_pd">

       <%= check_box('user', 'consider_pd') %>
       <%= check_box('user', 'consider_pd') %>

-      <span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
-    </p>
-    <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
-    <div class="signing-buttons buttons">
-      <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
-      <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
-    </div>
-    <p class='pad1' id="contributorGuidance"><%= raw t 'user.terms.guidance', :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %></p>
-  <% end %>
-</terms>
+      <%= t 'user.terms.consider_pd' %>
+    </label>
+    <span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
+  </div>
+
+  <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
+
+  <div class="form-row">
+    <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
+    <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
+  </div>
+<% end %>
+
+<div class="col6 deemphasize pad2">
+  <p><%= t 'user.terms.read and accept' %></p>
+  <p id="contributorGuidance">
+    <%= raw t 'user.terms.guidance',
+              :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
+              :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
+  </p>
+</div>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 212ef633e75feec57de9a6cf881e2b3a3356daed..5115342fd30004238c3da8316ed052a8a278299f 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1735,7 +1735,7 @@ en:
     terms:
       title: "Contributor terms"
       heading: "Contributor terms"
     terms:
       title: "Contributor terms"
       heading: "Contributor terms"

-      read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
+      read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."

       consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain


@@ -1744,7 +1744,7 @@ en:
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"
       you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"
       you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."

-      legale_select: "Please select your country of residence:"
+      legale_select: "Country of residence:"

       legale_names:
         france: "France"
         italy: "Italy"
       legale_names:
         france: "France"
         italy: "Italy"