From: Saman Bemel-Benrud Date: Wed, 31 Jul 2013 15:41:48 +0000 (-0400) Subject: adding new verify page, updating graphics. X-Git-Tag: live~4768^2~28 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ad60ee5c9c9fbb760d54c94448ba96a790e78a71 adding new verify page, updating graphics. --- diff --git a/app/assets/images/sign-up-illustration-arm.png b/app/assets/images/sign-up-illustration-arm.png index 50d6fb9fd..5f780299e 100644 Binary files a/app/assets/images/sign-up-illustration-arm.png and b/app/assets/images/sign-up-illustration-arm.png differ diff --git a/app/assets/images/sign-up-illustration.png b/app/assets/images/sign-up-illustration.png index 242ca1487..0a92b9c5b 100644 Binary files a/app/assets/images/sign-up-illustration.png and b/app/assets/images/sign-up-illustration.png differ diff --git a/app/assets/images/sign-up-illustration.svg b/app/assets/images/sign-up-illustration.svg index 8cd6cc46c..7f3a3338f 100644 --- a/app/assets/images/sign-up-illustration.svg +++ b/app/assets/images/sign-up-illustration.svg @@ -21,18 +21,6 @@ inkscape:export-ydpi="90"> - - - - @@ -57,30 +45,6 @@ offset="1" style="stop-color:#93b8e0;stop-opacity:0" /> - - - - - - - - - - - - - - @@ -259,24 +185,6 @@ x2="1184" y2="-533.03516" gradientUnits="userSpaceOnUse" /> - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - + + + + + + + + + + + - - - - 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 - - - - - - - - - - - - - - - - - - - - - + inkscape:connector-curvature="0" + style="color:#000000;fill:#adadc6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 1230.4688,792.26843 c 13.3096,49.6722 -20.4537,112.82556 -47.6876,150.09372 l 152.2188,0 c 0,-68.85715 -43.5157,-127.53233 -104.5312,-150.09372 z" + id="path7757-0" + sodipodi:nodetypes="cccc" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010000011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/welcome-sprite.png b/app/assets/images/welcome-sprite.png index 5a65496da..9f3b3ba81 100644 Binary files a/app/assets/images/welcome-sprite.png and b/app/assets/images/welcome-sprite.png differ diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 67f04e55c..78126bb88 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1046,6 +1046,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } } /* Overrides for pages that use new layout conventions */ +.site-verifysignup, .site-copyright, .site-welcome { #content { @@ -1060,13 +1061,13 @@ ul.results-list li { border-bottom: 1px solid #ccc; } height: 200px; } -.new-user-illustration { +.header-illustration { background-position: 0 0; background-repeat: no-repeat; position: absolute; } -.new-user-illustration.new-user-main { +.header-illustration.new-user-main { height: 200px; width: 100%; left: 0; @@ -1074,10 +1075,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; } background-image: image-url("sign-up-illustration.png"); } -.new-user-illustration.new-user-arm { +.header-illustration.new-user-arm { height: 110px; width: 130px; - left: 230px; + left: 260px; top: 160px; background-image: image-url("sign-up-illustration-arm.png"); } @@ -2267,6 +2268,25 @@ a.button { background: #fff; } +/* Rules for the "Verify signup" page */ +.site-verifysignup .content-heading { + height: 200px; +} + +.header-illustration.verify-main { + background-position: 0 0; + background-repeat: no-repeat; + position: absolute; +} + +.header-illustration.verify-main { + height: 200px; + width: 100%; + left: 0; + bottom: 0; + background-image: image-url("verify-illustration.png"); +} + /* Rules for the "Welcome" page */ .site-welcome { .center { diff --git a/app/views/site/verifysignup.html.erb b/app/views/site/verifysignup.html.erb new file mode 100644 index 000000000..d6fa4a1d5 --- /dev/null +++ b/app/views/site/verifysignup.html.erb @@ -0,0 +1,13 @@ +<% content_for :head do %> +<% end %> + +<%= content_for :heading do %> +

<%= t "verify_page.title" %>

+
+<% end %> + +

<%= t "verify_page.introduction_html" %>

+ +

<%= t "verify_page.antispam_alert_html" %>

+ + put login form here \ No newline at end of file diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb index 3707bb070..478905b09 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -1,7 +1,7 @@ <% content_for :heading do %>

<%= t 'user.new.title' %>

-
-
+
+
<% end %> <%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'signup-form-wrapper fillL col6 pad2' } do %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 6ad207999..adc940667 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1148,6 +1148,13 @@ en: to our takedown procedure or file directly at our on-line filing page. + verify_page: + title: Congratulations! + introduction_html: | + We sent a confirmation email to %{email}. Confirm your account + by clicking on the link in the email and you'll be able to start mapping. + antispam_alert_html: | + If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests." welcome_page: title: Welcome! introduction_html: | diff --git a/config/routes.rb b/config/routes.rb index 0168b6190..656bc5819 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -126,6 +126,7 @@ OpenStreetMap::Application.routes.draw do match '/copyright/:copyright_locale' => 'site#copyright', :via => :get match '/copyright' => 'site#copyright', :via => :get match '/welcome' => 'site#welcome', :via => :get, :as => :welcome + match '/verifysignup' => 'site#verifysignup', :via => :get, :as => :verifysignup match '/history' => 'changeset#list', :via => :get match '/history/feed' => 'changeset#feed', :via => :get, :format => :atom match '/export' => 'site#index', :export => true, :via => :get