From: Saman Bemel-Benrud Date: Mon, 5 Aug 2013 16:02:12 +0000 (-0500) Subject: reworking terms page + replacing pad classes with inner classes. X-Git-Tag: live~4814^2~14 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8390d1f6c61c1a26051d8685ca1cbd358b221a92 reworking terms page + replacing pad classes with inner classes. --- diff --git a/app/assets/images/terms-illustration.png b/app/assets/images/terms-illustration.png new file mode 100644 index 000000000..475da0e87 Binary files /dev/null and b/app/assets/images/terms-illustration.png differ diff --git a/app/assets/images/terms-illustration.svg b/app/assets/images/terms-illustration.svg new file mode 100644 index 000000000..2bb1aaf99 --- /dev/null +++ b/app/assets/images/terms-illustration.svg @@ -0,0 +1,1620 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010000011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 6eecae577..45b31a924 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -87,9 +87,6 @@ abbr, acronym { .margin11 { margin-left:91.6666%; } .margin12 { margin-left:100.0000%; } -.pad1 { padding: $lineheight/2; } -.pad2 { padding: $lineheight; } - .fillL { background-color: white; } /* Default rules for the body of every page */ @@ -1091,6 +1088,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; } background-image: image-url("confirm-illustration.png"); } + &.new-user-terms { + background-image: image-url("terms-illustration.png"); + } + &.new-user-arm { height: 110px; width: 130px; @@ -1786,6 +1787,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; } padding-top: $lineheight; border-top: 1px solid $lightgrey; } + .horizontal-list .form-row { + float: left; + padding-right: 10px; + } .form-row { margin-bottom: $lineheight/2; } @@ -1905,6 +1910,8 @@ ul.secondary-actions { .inner11 { padding: $lineheight/2;} +.inner20 { padding: $lineheight 0;} + .inner02 { padding: 0 $lineheight;} /* Utility for general button styles */ diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index 45fededab..b943e01f8 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -11,14 +11,14 @@

<%= t "welcome_page.whats_on_the_map.title" %>

-
+

<%= t "welcome_page.whats_on_the_map.on_html" %>

-
-
+
+

<%= t "welcome_page.whats_on_the_map.off_html" %>

@@ -59,7 +59,7 @@
-
+

<%= t "welcome_page.add_a_note.title" %>

<%= t "welcome_page.add_a_note.paragraph_1_html" %>

<%= t "welcome_page.add_a_note.paragraph_2_html" %>

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb index 3c085c99e..45c33aaef 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -4,7 +4,7 @@
<% end %> -<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 pad2' } do %> +<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do %> <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
@@ -71,7 +71,7 @@ <%= submit_tag t('user.new.continue'), :tabindex => 6 %> <% end %> -
+

<%= t 'user.new.about.header' %>

<%= t 'user.new.about.html' %>
diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb index e26439394..525e0cc81 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -1,55 +1,56 @@ <% content_for :heading do %>

<%= t 'user.terms.heading' %>

-
-
+
<% end %> -<%= form_tag({:action => "save"}, { :class => "standard-form fillL col6 pad2" }) do %> +<%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %> - +
+ - <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %> -
- - -
- <% end %> + <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %> +
+ + +
+ <% end %> +
-
+
<%= render :partial => "terms" %>
-
- - (<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>) -
+
+ + (<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>) - <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %> + <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %> -
- <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %> - <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %> -
-<% end %> +
+

<%= t 'user.terms.read and accept' %>

+ <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %> + <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %> +
+ <% end %> -
-

<%= t 'user.terms.read and accept' %>

-

- <%= raw 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' %> -

+
+

+ <%= raw 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' %> +

+