From: Tom Hughes Date: Tue, 27 Apr 2010 10:22:25 +0000 (+0100) Subject: Merge branch 'master' into terms X-Git-Tag: live~6322^2~9 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/67292724441a7a447a9ea579a36dee64825dedaf?hp=-c Merge branch 'master' into terms --- 67292724441a7a447a9ea579a36dee64825dedaf diff --combined config/locales/de.yml index bd55882e0,7e29cda2a..3f7c31775 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@@ -117,14 -117,14 +117,14 @@@ de other: "Enthält folgende {{count}} Wege:" no_bounding_box: Für dieses Changeset wurde kein Bereich gespeichert. show_area_box: Bereichsgrenze anzeigen - changeset_navigation: + navigation: all: - next_tooltip: Nächstes Changeset - prev_tooltip: Vorheriges Changeset + next_changeset_tooltip: Nächstes Changeset + prev_changeset_tooltip: Vorheriges Changeset user: - name_tooltip: Änderungen von {{user}} anzeigen - next_tooltip: Nächste Änderung von {{user}} - prev_tooltip: Vorherige Änderung von {{user}} + name_changeset_tooltip: Änderungen von {{user}} anzeigen + next_changeset_tooltip: Nächste Änderung von {{user}} + prev_changeset_tooltip: Vorherige Änderung von {{user}} common_details: changeset_comment: "Kommentar:" edited_at: "Bearbeitet am:" @@@ -1433,7 -1433,7 +1433,7 @@@ no_auto_account_create: Im Moment ist das automatische Erstellen eines Benutzerkontos leider nicht möglich. not displayed publicly: Nicht öffentlich sichtbar (Datenschutzrichtlinie) password: "Passwort:" - signup: Registrieren + signup: Fortsetzen title: Benutzerkonto erstellen no_such_user: body: Es gibt leider keinen Benutzer mit dem Namen {{user}}. Bitte überprüfe deine Schreibweise oder der Link war beschädigt. diff --combined config/locales/en.yml index 21931925a,f1e0e6a85..ff764c779 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -89,7 -89,7 +89,7 @@@ en feed: title: "Changeset {{id}}" title_comment: "Changeset {{id}} - {{comment}}" - changeset_navigation: + navigation: paging: user: prev: "« {{id}}" @@@ -98,12 -98,18 +98,18 @@@ prev: "« {{id}}" next: "{{id}} »" user: - name_tooltip: "View edits by {{user}}" - prev_tooltip: "Previous edit by {{user}}" - next_tooltip: "Next edit by {{user}}" + name_changeset_tooltip: "View edits by {{user}}" + prev_changeset_tooltip: "Previous edit by {{user}}" + next_changeset_tooltip: "Next edit by {{user}}" all: - prev_tooltip: "Previous changeset" - next_tooltip: "Next changeset" + prev_node_tooltip: "Previous node" + next_node_tooltip: "Next node" + prev_way_tooltip: "Previous way" + next_way_tooltip: "Next way" + prev_relation_tooltip: "Previous relation" + next_relation_tooltip: "Next relation" + prev_changeset_tooltip: "Previous changeset" + next_changeset_tooltip: "Next changeset" changeset_details: created_at: "Created at:" closed_at: "Closed at:" @@@ -233,6 -239,10 +239,10 @@@ # There is no 'relation' type because it is not represented in OpenLayers tag_details: tags: "Tags:" + wiki_link: + key: "The wiki description page for the {{key}} tag" + tag: "The wiki description page for the {{key}}={{value}} tag" + wikipedia_link: "The {{page}} article on Wikipedia" way_details: nodes: "Nodes:" part_of: "Part of:" @@@ -914,6 -924,7 +924,7 @@@ help_wiki: "Help & Wiki" help_wiki_tooltip: "Help & Wiki site for the project" help_wiki_url: "http://wiki.openstreetmap.org" + copyright: "Copyright & License" news_blog: "News blog" news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc." shop: Shop @@@ -1393,7 -1404,7 +1404,7 @@@ no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.' fill_form: "Fill in the form and we will send you a quick email to activate your account." - license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under this Creative Commons license (by-sa).' + license_agreement: 'When you confirm your account you will need to agree to the contributor terms.' email address: "Email Address:" confirm email address: "Confirm Email Address:" not displayed publicly: 'Not displayed publicly (see privacy policy)' @@@ -1401,23 -1412,8 +1412,23 @@@ display name description: "Your publicly displayed username. You can change this later in the preferences." password: "Password:" confirm password: "Confirm Password:" - signup: Signup + continue: Continue flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)

Please note that you will not be able to login until you've received and confirmed your email address.

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." + terms: + heading: "Contributor terms" + press accept button: "Please read the agreement below and press the agree button to create your account." + consider_pd: "I consider my contributions to be in the Public Domain" + consider_pd_why: "what's this?" + consider_pd_why_url: http://wiki.openstreetmap.org/wiki/Why_would_I_want_my_contributions_to_be_public_domain + agree: Agree + declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" + decline: "Decline" + legale_select: "Please select your country of residence:" + legale_button: "Go" + legale_names: + france: "France" + italy: "Italy" + rest_of_world: "Rest of the world" no_such_user: title: "No such user" heading: "The user {{user}} does not exist" diff --combined config/routes.rb index e2f95f7d7,df6efef60..dab156c00 --- a/config/routes.rb +++ b/config/routes.rb @@@ -88,6 -88,7 +88,7 @@@ ActionController::Routing::Routes.draw map.root :controller => 'site', :action => 'index' map.connect '/', :controller => 'site', :action => 'index' map.connect '/edit', :controller => 'site', :action => 'edit' + map.connect '/copyright', :controller => 'site', :action => 'copyright' map.connect '/history', :controller => 'changeset', :action => 'list' map.connect '/history/feed', :controller => 'changeset', :action => 'list', :format => :atom map.connect '/export', :controller => 'site', :action => 'export' @@@ -96,7 -97,6 +97,7 @@@ map.connect '/offline', :controller => 'site', :action => 'offline' map.connect '/key', :controller => 'site', :action => 'key' map.connect '/user/new', :controller => 'user', :action => 'new' + map.connect '/user/terms', :controller => 'user', :action => 'terms' map.connect '/user/save', :controller => 'user', :action => 'save' map.connect '/user/confirm', :controller => 'user', :action => 'confirm' map.connect '/user/confirm-email', :controller => 'user', :action => 'confirm_email' diff --combined public/stylesheets/common.css index 8435fd01f,b6ee99712..69bac58b5 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@@ -526,6 -526,28 +526,28 @@@ hr font-weight: bold; } + /* Rules for the data browser */ + + #browse_navigation { + float: right; + width: 250px; + text-align: center; + margin-left: 10px; + } + + #browse_map { + float: right; + width: 250px; + text-align: right; + margin-left: 10px; + } + + #browse_map #small_map { + width: 250px; + height: 300px; + border: solid 1px black; + } + /* Rules for the trace list shown by the traces tab etc */ #trace_list { @@@ -540,47 -562,6 +562,47 @@@ color: gray; } +/* Rules for the account confirmation page */ + +div#contributorTerms { + border: 1px solid black; + padding: 4px; + overflow: auto; + width: 80%; + height: 60%; +} + +div#contributorTerms p#first { + margin-top: 0px; +} + +div#contributorTerms p#last { + margin-bottom: 0px; +} + +div#contributorTerms ol { + margin-bottom: 0px; +} + +div#contributorTerms img { + display: block; + margin-left: auto; + margin-right: auto; + margin-top: 10%; +} + +form#termsForm { + width: 80%; +} + +form#termsForm div#buttons { + float: right; +} + +form#termsForm input#agree { + margin-left: 50px; +} + /* Rules for the account settings page */ #accountForm td {