From: Steve Coast Date: Fri, 28 Jul 2006 22:35:05 +0000 (+0000) Subject: various skeleton stuff X-Git-Tag: live~9384 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2fad5f7c92055755e0a662ed22943b7d3f92e909 various skeleton stuff --- diff --git a/app/views/layouts/user.rhtml b/app/views/layouts/user.rhtml index 1bd916a02..dc90025bb 100644 --- a/app/views/layouts/user.rhtml +++ b/app/views/layouts/user.rhtml @@ -4,19 +4,88 @@ <%= javascript_include_tag 'tile.js' %> <%= javascript_include_tag 'site.js' %> - - - - OpenStreetMap - - - <%= @content_for_layout %> + + + OpenStreetMap + + + +
+ <%= @content_for_layout %> + +
+ + + + + <%= link_to 'Login', :controller => 'user', :action => 'login' %> / + <%= link_to 'Sign up', :controller => 'user', :action => 'new' %> + + +
+ +
+ + + +
+ + + +
+ OpenStreetMap is a free editable map of the whole world. It is made by people like you. +

+ OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth. +

+ OpenStreetMap's hosting is kindly supported by the UCL VR Centre and bytemark. + +

+ +
+ Help & Wiki
+ News blog
+ Shop
+
+ + + + +
+ +
+ + + + +
+ + diff --git a/app/views/user/login.rhtml b/app/views/user/login.rhtml new file mode 100644 index 000000000..ff71fb8cb --- /dev/null +++ b/app/views/user/login.rhtml @@ -0,0 +1,14 @@ +

Login:


+Please login or <%= link_to 'create an account', :controller => 'user', :action => 'new' %>.
+ + +<%= start_form_tag :action => 'login' %> + + + +
Login name<%= text_field('user', 'display_name',{:size => 50, :maxlength => 255}) %>
password:<%= password_field('user', 'password',{:size => 50, :maxlength => 255}) %>
+ +
+ + +<%= end_form_tag %> (<%= link_to 'Forgotten your password?', :controller => 'user', :action => 'lost_password' %>) diff --git a/app/views/user/new.rhtml b/app/views/user/new.rhtml index 4e1ca5f72..b67ad1f58 100644 --- a/app/views/user/new.rhtml +++ b/app/views/user/new.rhtml @@ -1,4 +1,18 @@ +

Create a user account


+Fill in the form and we'll send you a quick email to activate your account.

-create a user +By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools on openstreetmap.org is to be licensed under this Creative Commons license.

+<%= start_form_tag :action => 'signup' %> + + + + + +
email address:<%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %>
Login name<%= text_field('user', 'display_name',{:size => 50, :maxlength => 255}) %>
password:<%= password_field('user', 'password',{:size => 50, :maxlength => 255}) %>
retype password:<%= password_field('user', 'password_confirm',{:size => 50, :maxlength => 255}) %>
+ +
+ + +<%= end_form_tag %> diff --git a/public/images/cc_button.png b/public/images/cc_button.png new file mode 100644 index 000000000..c6d26414b Binary files /dev/null and b/public/images/cc_button.png differ diff --git a/public/images/osm_logo.png b/public/images/osm_logo.png new file mode 100644 index 000000000..d2ddc6969 Binary files /dev/null and b/public/images/osm_logo.png differ diff --git a/public/index.html b/public/index.html index b48454685..319ca90af 100644 --- a/public/index.html +++ b/public/index.html @@ -1,5 +1,5 @@ nuffin here - +new user diff --git a/public/javascripts/site.js b/public/javascripts/site.js index 75c3eb539..e7ef320bc 100644 --- a/public/javascripts/site.js +++ b/public/javascripts/site.js @@ -1,28 +1,28 @@ function updatelinks(lon,lat,zoom) { - var links = new Array(); - links['viewanchor'] = '/index.html'; - //links['editanchor'] = 'edit.html'; - links['uploadanchor'] = '/traces'; - links['loginanchor'] = '/login.html'; - links['logoutanchor'] = '/logout.html'; - links['registeranchor'] = '/create-account.html'; - - var node; - var anchor; - for (anchor in links) { - node = document.getElementById(anchor); - if (! node) { continue; } - node.href = links[anchor] + "?lat=" + lat + "&lon=" + lon + "&zoom=" + zoom; - } + var links = new Array(); + links['viewanchor'] = '/index.html'; + //links['editanchor'] = 'edit.html'; + links['uploadanchor'] = '/traces'; + links['loginanchor'] = '/login.html'; + links['logoutanchor'] = '/logout.html'; + links['registeranchor'] = '/create-account.html'; + + var node; + var anchor; + for (anchor in links) { + node = document.getElementById(anchor); + if (! node) { continue; } + node.href = links[anchor] + "?lat=" + lat + "&lon=" + lon + "&zoom=" + zoom; + } - node = document.getElementById("editanchor"); - if (node) { + node = document.getElementById("editanchor"); + if (node) { if ( zoom >= 14) { - node.href = '/edit.html?lat=' + lat + '&lon=' + lon + "&zoom=" + zoom; - node.style.fontStyle = 'normal'; + node.href = '/edit.html?lat=' + lat + '&lon=' + lon + "&zoom=" + zoom; + node.style.fontStyle = 'normal'; } else { - node.href = 'javascript:alert("zoom in to edit map");'; - node.style.fontStyle = 'italic'; - } + node.href = 'javascript:alert("zoom in to edit map");'; + node.style.fontStyle = 'italic'; } + } } diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css index 2cd8ca412..0dc7eaf18 100644 --- a/public/stylesheets/site.css +++ b/public/stylesheets/site.css @@ -146,7 +146,7 @@ body { } -#main_area { +#content { width: 700px; padding: 0; /*padding-left: 1em;*/