Improve presentation of supporting links on the terms page

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index d6bbd16f55dcd423a4c2bfa701298ed00a963201..cd352ab6fde9af90e80c5b9f68e17ae6535fc14f 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -46,11 +46,5 @@
     </div>
   </p>
   <br clear="all" />
     </div>
   </p>
   <br clear="all" />

-  <hr />
-  <p>
-    <ul>
-      <li><%= link_to(t('user.terms.summary'), t('user.terms.summary_url'), :target => :new)%></li>
-      <li><%= link_to(t('user.terms.translations'), t('user.terms.translations_url'), :target => :new)%></li>
-    </ul>
-  </p>
+  <p id="contributorGuidance"><%= 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 %>
 <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5e82b80c878deee767d9466ecd0d71373da66c88..d8d7c13b32ae3538944b4eaa717eb935afe759c1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1579,10 +1579,7 @@ en:
       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

-      summary: "Human readable summary in English."
-      summary_url: http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary
-      translations: "Informal translations / Informelle Übersetzung"
-      translations_url: http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations
+      guidance: 'Information to help understand these terms: a <a href="{{summary}}">human readable summary</a> and some <a href="{{translations}}">informal translations</a>'

       agree: Agree
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"
       agree: Agree
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index a62665e34c2b1103d3733eec9a41632dc2fb3636..8b387e1d34dbc5b1555b24d5a28836e36e94b7a5 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -734,7 +734,7 @@ div#contributorTerms {
   border: 1px solid black;
   padding: 4px;
   overflow: auto;
   border: 1px solid black;
   padding: 4px;
   overflow: auto;

-  width: 80%;
+  width: 95%;

   height: 400px;
 }
 
   height: 400px;
 }
 


@@ -762,7 +762,7 @@ div#contributorTerms img {
 }
 
 form#termsForm {
 }
 
 form#termsForm {

-  width: 80%;
+  width: 95%;

   margin-bottom: 3em;
 }
 
   margin-bottom: 3em;
 }
 


@@ -778,6 +778,14 @@ form#termsForm input#agree {
   margin-left: 50px;
 }
 
   margin-left: 50px;
 }
 

+p#contributorGuidance {
+  background-color: #f5f5ff;
+  border: 1px solid #f3f3ff;
+  border-radius: 15px;
+  -moz-border-radius: 15px;
+  padding: 10px;
+}
+

 /* Rules for the account settings page */
 
 #accountForm td {
 /* Rules for the account settings page */
 
 #accountForm td {