cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve styling of contributor terms.

Browse source
This commit is contained in:
Tom Hughes 2010-03-23 00:17:14 +00:00
parent 9cff6985ff
commit 917ed5a7fd
2 changed files with 44 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

48
app/views/user/confirm.html.erb
View file

@ -2,29 +2,33 @@
<p><%= t 'user.confirm.press confirm button' %></p> <p><%= t 'user.confirm.press confirm button' %></p>
<div style="overflow: auto; width: 80%; height: 60%;"> <div id="contributorTerms">
<p><%= t 'legal.contributor_terms.intro' %></p> <p><%= t 'legal.contributor_terms.intro' %></p>
<ol> <ol>
<li><%= t 'legal.contributor_terms.section_1' %></li> <li><%= t 'legal.contributor_terms.section_1' %></li>
<li><%= t 'legal.contributor_terms.section_2' %></li> <li><%= t 'legal.contributor_terms.section_2' %></li>
<li><%= t 'legal.contributor_terms.section_3' %></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_1' %></p>
<p><%= t 'legal.contributor_terms.active_defn_2' %></p> <p><%= t 'legal.contributor_terms.active_defn_2' %></p>
<li><%= t 'legal.contributor_terms.section_4' %></li> <li><%= t 'legal.contributor_terms.section_4' %></li>
<li><%= t 'legal.contributor_terms.section_5' %></li> <li><%= t 'legal.contributor_terms.section_5' %></li>
<li><%= t 'legal.contributor_terms.section_6' %></li> <li><%= t 'legal.contributor_terms.section_6' %></li>
<ol> <ol>
<li><%= t 'legal.contributor_terms.section_6_1' %></li> <li><%= t 'legal.contributor_terms.section_6_1' %></li>
<li><%= t 'legal.contributor_terms.section_6_2' %></li> <li><%= t 'legal.contributor_terms.section_6_2' %></li>
</ol> </ol>
<li><%= t 'legal.contributor_terms.section_7' %></li> <li><%= t 'legal.contributor_terms.section_7' %></li>
</ol> </ol>
</div> </div>
<form method="post"> <form method="post">
<input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>"/> <p>
<label for="confirm_pd_checkbox"><%= t 'user.confirm.consider_pd' %></label><input id="confirm_pd_checkbox" type="checkbox" name="consider_pd"/><br/> <label for="confirm_pd_checkbox"><%= t 'user.confirm.consider_pd' %></label>
<input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>"/> <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> </form>

18
public/stylesheets/common.css
View file

@ -540,6 +540,24 @@ hr {
color: gray; 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 */ /* Rules for the account settings page */
#accountForm td { #accountForm td {