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

Move more styling into CSS and make it support RTL layout

Browse source
This commit is contained in:
Tom Hughes 2011-07-02 11:22:19 +01:00
parent d075fc4c1f
commit aca299ecee
8 changed files with 53 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/site/index.html.erb
View file

@ -29,11 +29,11 @@
<div id="attribution">
<table width="100%">
<tr>
<td align="left"><%= t'site.index.license.license_url' %></td>
<td align="right"><%= t'site.index.license.project_url' %></td>
<td class="attribution_license"><%= t'site.index.license.license_url' %></td>
<td class="attribution_project"><%= t'site.index.license.project_url' %></td>
</tr>
<tr>
<td colspan="2" align="center"><%=
<td colspan="2" class="attribution_notice"><%=
t'site.index.license.notice',
:license_name => t('site.index.license.license_name'),
:project_name => t('site.index.license.project_name')

14
app/views/user/account.html.erb
View file

@ -33,7 +33,7 @@
</tr>
<tr>
<td class="fieldName" valign="top"><%= t 'user.account.public editing.heading' %></td>
<td class="fieldName"><%= t 'user.account.public editing.heading' %></td>
<td>
<% if @user.data_public? %>
<%= t 'user.account.public editing.enabled' %> <span class="minorNote">(<a href="<%= t 'user.account.public editing.enabled link' %>" target="_new"><%= t 'user.account.public editing.enabled link text' %></a>)</span>
@ -44,7 +44,7 @@
</tr>
<tr>
<td class="fieldName" valign="top"><%= t 'user.account.contributor terms.heading' %></td>
<td class="fieldName"><%= t 'user.account.contributor terms.heading' %></td>
<td>
<% if @user.terms_agreed? %>
<%= t 'user.account.contributor terms.agreed' %>
@ -62,22 +62,22 @@
</tr>
<tr>
<td class="fieldName" valign="top"><%= t 'user.account.profile description' %></td>
<td class="fieldName"><%= t 'user.account.profile description' %></td>
<td><%= f.text_area :description, :rows => '5', :cols => '60' %></td>
</tr>
<tr>
<td class="fieldName" valign="top"><%= t 'user.account.preferred languages' %></td>
<td class="fieldName"><%= t 'user.account.preferred languages' %></td>
<td><%= f.text_field :languages %></td>
</tr>
<tr>
<td class="fieldName" valign="top"><%= t 'user.account.preferred editor' %></td>
<td class="fieldName"><%= t 'user.account.preferred editor' %></td>
<td><%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %></td>
</tr>
<tr>
<td class="fieldName" valign="top">
<td class="fieldName">
<%= t 'user.account.image' %>
</td>
<td valign="top">
@ -119,7 +119,7 @@
<tr>
<td></td>
<td align=right><br/><%= submit_tag t('user.account.save changes button') %></td>
<td class="submitButton"><%= submit_tag t('user.account.save changes button') %></td>
</tr>
</table>
<% end %>

5
app/views/user/lost_password.html.erb
View file

@ -8,6 +8,9 @@
<td class="fieldName"><%= t 'user.lost_password.email address' %></td>
<td><%= text_field('user', 'email', {:size => 50, :maxlength => 255, :tabindex => 1} ) %></td>
</tr>
<tr><td></td><td align="right"><input type="submit" value="<%= t'user.lost_password.new password button' %>" tabindex="2"></td></tr>
<tr>
<td></td>
<td class="submitButton"><input type="submit" value="<%= t'user.lost_password.new password button' %>" tabindex="2"></td>
</tr>
</table>
<% end %>

2
app/views/user/new.html.erb
View file

@ -68,7 +68,7 @@
<tr>
<td></td>
<td align="right"><%= submit_tag t('user.new.continue'), :tabindex => 6 %></td>
<td class="submitButton"><%= submit_tag t('user.new.continue'), :tabindex => 6 %></td>
</tr>
</table>
<% end %>

2
app/views/user/reset_password.html.erb
View file

@ -9,6 +9,6 @@
<tr><td class="fieldName"><%= t 'user.reset_password.confirm password' %></td><td><%= password_field(:user, :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>
<tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
<tr><td></td><td align=right><input type="submit" value="<%= t'user.reset_password.reset' %>" tabindex="6"></td></tr>
<tr><td></td><td class="submitButton"><input type="submit" value="<%= t'user.reset_password.reset' %>" tabindex="6"></td></tr>
</table>
<% end %>

9
public/stylesheets/common.css
View file

@ -384,6 +384,10 @@ hr {
display: none;
}
.attribution_notice {
text-align: center;
}
/* Rules for the popout map sidebar */
#sidebar {
@ -780,6 +784,10 @@ p#contributorGuidance {
display: inline !important;
}
#accountForm input[type=submit] {
margin-top: 15px;
}
/* Rules for the user view */
#user_details .user_map {
@ -893,6 +901,7 @@ p#contributorGuidance {
/* Rules for forms */
.fieldName {
vertical-align: top;
font-weight: bold;
}

14
public/stylesheets/ltr.css
View file

@ -104,6 +104,16 @@ html body {
text-align: left;
}
/* Rules for attribution text under the main map shown on printouts */
.attribution_license {
text-align: left;
}
.attribution_project {
text-align: right;
}
/* Rules for the popout map sidebar */
#sidebar {
@ -227,6 +237,10 @@ form#termsForm input#agree {
text-align: right;
}
.submitButton {
text-align: right;
}
input.openid_url {
background: url('../images/openid_input.png') repeat-y left white;
padding-left: 16px;

14
public/stylesheets/rtl.css
View file

@ -111,6 +111,16 @@ html body {
text-align: right;
}
/* Rules for attribution text under the main map shown on printouts */
.attribution_license {
text-align: right;
}
.attribution_project {
text-align: left;
}
/* Rules for the popout map sidebar */
#sidebar {
@ -234,6 +244,10 @@ form#termsForm input#agree {
text-align: left;
}
.submitButton {
text-align: left;
}
input.openid_url {
background: url('../images/openid_input.png') repeat-y right white;
padding-right: 16px;