From: Tom Hughes <tom@compton.nu>
Date: Tue, 23 Mar 2010 00:17:14 +0000 (+0000)
Subject: Improve styling of contributor terms.
X-Git-Tag: live~6294^2~20
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/917ed5a7fda9be9c3d751b56db4995a8cb088d57

Improve styling of contributor terms.
---

diff --git a/app/views/user/confirm.html.erb b/app/views/user/confirm.html.erb
index 3186c78dd..af3fa2556 100644
--- a/app/views/user/confirm.html.erb
+++ b/app/views/user/confirm.html.erb
@@ -2,29 +2,33 @@
 
 <p><%= t 'user.confirm.press confirm button' %></p>
 
-<div style="overflow: auto; width: 80%; height: 60%;">
-<p><%= t 'legal.contributor_terms.intro' %></p>
-<ol>
-<li><%= t 'legal.contributor_terms.section_1' %></li>
-<li><%= t 'legal.contributor_terms.section_2' %></li>
-<li><%= t 'legal.contributor_terms.section_3' %></li>
-<p><%= t 'legal.contributor_terms.active_defn_1' %></p>
-<p><%= t 'legal.contributor_terms.active_defn_2' %></p>
-<li><%= t 'legal.contributor_terms.section_4' %></li>
-<li><%= t 'legal.contributor_terms.section_5' %></li>
-<li><%= t 'legal.contributor_terms.section_6' %></li>
-<ol>
-<li><%= t 'legal.contributor_terms.section_6_1' %></li>
-<li><%= t 'legal.contributor_terms.section_6_2' %></li>
-</ol>
-<li><%= t 'legal.contributor_terms.section_7' %></li>
-</ol>
+<div id="contributorTerms">
+  <p><%= t 'legal.contributor_terms.intro' %></p>
+  <ol>
+    <li><%= t 'legal.contributor_terms.section_1' %></li>
+    <li><%= t 'legal.contributor_terms.section_2' %></li>
+    <li><%= t 'legal.contributor_terms.section_3' %></li>
+    <p><%= t 'legal.contributor_terms.active_defn_1' %></p>
+    <p><%= t 'legal.contributor_terms.active_defn_2' %></p>
+    <li><%= t 'legal.contributor_terms.section_4' %></li>
+    <li><%= t 'legal.contributor_terms.section_5' %></li>
+    <li><%= t 'legal.contributor_terms.section_6' %></li>
+    <ol>
+      <li><%= t 'legal.contributor_terms.section_6_1' %></li>
+      <li><%= t 'legal.contributor_terms.section_6_2' %></li>
+    </ol>
+    <li><%= t 'legal.contributor_terms.section_7' %></li>
+  </ol>
 </div>
 
 <form method="post">
-<input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>"/>
-<label for="confirm_pd_checkbox"><%= t 'user.confirm.consider_pd' %></label><input id="confirm_pd_checkbox" type="checkbox" name="consider_pd"/><br/>
-<input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>"/>
+  <p>
+    <label for="confirm_pd_checkbox"><%= t 'user.confirm.consider_pd' %></label>
+    <input id="confirm_pd_checkbox" type="checkbox"
+    name="consider_pd"/><br/>
+  </p>
+  <p>
+    <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>"/>
+    <input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>"/>
+  </p>
 </form>
-
-
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 4efbd928f..f61698742 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -540,6 +540,24 @@ hr {
   color: gray;
 }
 
+/* Rules for the account confirmation page */
+
+div#contributorTerms {
+  border: 1px solid black;
+  padding: 4px;
+  overflow: auto;
+  width: 80%;
+  height: 60%;
+}
+
+div#contributorTerms p {
+  margin-top: 0px;
+}
+
+div#contributorTerms ol {
+  margin-bottom: 0px;
+}
+
 /* Rules for the account settings page */
 
 #accountForm td {