From: Tom Hughes Date: Sat, 2 Jul 2011 10:22:19 +0000 (+0100) Subject: Move more styling into CSS and make it support RTL layout X-Git-Tag: live~6200 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/aca299ecee9edee1f4affdd59a65f6ad34de6067 Move more styling into CSS and make it support RTL layout --- diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb index 5f42f416d..5c02efb82 100644 --- a/app/views/site/index.html.erb +++ b/app/views/site/index.html.erb @@ -29,11 +29,11 @@
- - + + - - + - + - + - + - + - - +
<%= t'site.index.license.license_url' %><%= t'site.index.license.project_url' %><%= t'site.index.license.license_url' %><%= t'site.index.license.project_url' %>
<%= + <%= t'site.index.license.notice', :license_name => t('site.index.license.license_name'), :project_name => t('site.index.license.project_name') diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 741737559..bdc52fb8c 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -33,7 +33,7 @@
<%= t 'user.account.public editing.heading' %><%= t 'user.account.public editing.heading' %> <% if @user.data_public? %> <%= t 'user.account.public editing.enabled' %> (<%= t 'user.account.public editing.enabled link text' %>) @@ -44,7 +44,7 @@
<%= t 'user.account.contributor terms.heading' %><%= t 'user.account.contributor terms.heading' %> <% if @user.terms_agreed? %> <%= t 'user.account.contributor terms.agreed' %> @@ -62,22 +62,22 @@
<%= t 'user.account.profile description' %><%= t 'user.account.profile description' %> <%= f.text_area :description, :rows => '5', :cols => '60' %>
<%= t 'user.account.preferred languages' %><%= t 'user.account.preferred languages' %> <%= f.text_field :languages %>
<%= t 'user.account.preferred editor' %><%= t 'user.account.preferred editor' %> <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
+ <%= t 'user.account.image' %> @@ -119,7 +119,7 @@

<%= submit_tag t('user.account.save changes button') %>		<%= submit_tag t('user.account.save changes button') %>
<% end %> diff --git a/app/views/user/lost_password.html.erb b/app/views/user/lost_password.html.erb index c5d8bb004..cdee822e4 100644 --- a/app/views/user/lost_password.html.erb +++ b/app/views/user/lost_password.html.erb @@ -8,6 +8,9 @@ <%= t 'user.lost_password.email address' %> <%= text_field('user', 'email', {:size => 50, :maxlength => 255, :tabindex => 1} ) %> - + + + + <% end %> diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb index 5ff4ed028..cf9d0a8ce 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -68,7 +68,7 @@ - <%= submit_tag t('user.new.continue'), :tabindex => 6 %> + <%= submit_tag t('user.new.continue'), :tabindex => 6 %> <% end %> diff --git a/app/views/user/reset_password.html.erb b/app/views/user/reset_password.html.erb index 7d2da5c78..bb00e8a6e 100644 --- a/app/views/user/reset_password.html.erb +++ b/app/views/user/reset_password.html.erb @@ -9,6 +9,6 @@ <%= t 'user.reset_password.confirm password' %><%= password_field(:user, :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :tabindex => 5}) %>   - + <% end %> diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index f348b21eb..da805616e 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -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; } diff --git a/public/stylesheets/ltr.css b/public/stylesheets/ltr.css index 200889563..26d4f1fd8 100644 --- a/public/stylesheets/ltr.css +++ b/public/stylesheets/ltr.css @@ -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; diff --git a/public/stylesheets/rtl.css b/public/stylesheets/rtl.css index 428b63fed..dd4d0f51d 100644 --- a/public/stylesheets/rtl.css +++ b/public/stylesheets/rtl.css @@ -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;