From: Saman Bemel-Benrud Date: Thu, 3 Jan 2013 11:20:32 +0000 (+0000) Subject: Site cleanup X-Git-Tag: live~5199 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a36f3558dd43dd5a598e36dd21fd5f7d2b4a94f5?hp=91139ae014608fe98653496e4c5425f9ebe3bed7 Site cleanup I set out to do a quick and dirty typography overhaul to make things more consistent and a bit cleaner, but I kept running into things I didn't like, so this lead me down something of a rabbit hole of design tweaks to the OSM site. Goals here are to have better content hierarchy, better vertical rhythm, more consistent UI, cleaner markup with less tables, all while keeping the basics pretty much intact. There are a lot of things I didn't touch even though they need to be updated (lots of tables where stuff shouldn't be tables, mostly). Basic overview of changes: I added a new persistent header that helps segment pages. It's now a lot easier to know what you're looking at. The header has a page title, a description, plus a submenu of actions. There is now a pattern of 20px/10px margins and padding for more rhythm and breathing room throughout the site. I know there are other problems here or things I've missed - would love another set of eyes to look over this! I am still getting comfortable working on the site - it's my first time ever digging into a ruby or rails so I'm not familiar with the templating language yet. --- diff --git a/app/assets/images/RSS.gif b/app/assets/images/RSS.gif deleted file mode 100644 index b0e4adf1d..000000000 Binary files a/app/assets/images/RSS.gif and /dev/null differ diff --git a/app/assets/images/RSS.png b/app/assets/images/RSS.png new file mode 100644 index 000000000..4838e5a70 Binary files /dev/null and b/app/assets/images/RSS.png differ diff --git a/app/assets/images/RSS.svg b/app/assets/images/RSS.svg new file mode 100644 index 000000000..bd2919ebf --- /dev/null +++ b/app/assets/images/RSS.svg @@ -0,0 +1,84 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/app/assets/images/color-palette.svg b/app/assets/images/color-palette.svg new file mode 100644 index 000000000..329288e1a --- /dev/null +++ b/app/assets/images/color-palette.svg @@ -0,0 +1,151 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/new.png b/app/assets/images/new.png index 202e10eca..d6355e021 100644 Binary files a/app/assets/images/new.png and b/app/assets/images/new.png differ diff --git a/app/assets/images/new.svg b/app/assets/images/new.svg new file mode 100644 index 000000000..ef65650f7 --- /dev/null +++ b/app/assets/images/new.svg @@ -0,0 +1,73 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/app/assets/images/notice.png b/app/assets/images/notice.png new file mode 100644 index 000000000..a2698d77b Binary files /dev/null and b/app/assets/images/notice.png differ diff --git a/app/assets/images/notice.svg b/app/assets/images/notice.svg new file mode 100644 index 000000000..cb779ce21 --- /dev/null +++ b/app/assets/images/notice.svg @@ -0,0 +1,73 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/app/assets/images/roles/administrator.png b/app/assets/images/roles/administrator.png index b566decb4..ea363d257 100644 Binary files a/app/assets/images/roles/administrator.png and b/app/assets/images/roles/administrator.png differ diff --git a/app/assets/images/roles/administrator.svg b/app/assets/images/roles/administrator.svg new file mode 100644 index 000000000..460d9b449 --- /dev/null +++ b/app/assets/images/roles/administrator.svg @@ -0,0 +1,60 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/app/assets/images/roles/blank_administrator.png b/app/assets/images/roles/blank_administrator.png index c68f9e427..8f56b6ea6 100644 Binary files a/app/assets/images/roles/blank_administrator.png and b/app/assets/images/roles/blank_administrator.png differ diff --git a/app/assets/images/roles/blank_administrator.svg b/app/assets/images/roles/blank_administrator.svg new file mode 100644 index 000000000..3e56c789a --- /dev/null +++ b/app/assets/images/roles/blank_administrator.svg @@ -0,0 +1,89 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/app/assets/images/roles/blank_moderator.png b/app/assets/images/roles/blank_moderator.png index cf5ceea36..7dc307284 100644 Binary files a/app/assets/images/roles/blank_moderator.png and b/app/assets/images/roles/blank_moderator.png differ diff --git a/app/assets/images/roles/blank_moderator.svg b/app/assets/images/roles/blank_moderator.svg new file mode 100644 index 000000000..1b2a09177 --- /dev/null +++ b/app/assets/images/roles/blank_moderator.svg @@ -0,0 +1,65 @@ + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/app/assets/images/roles/moderator.png b/app/assets/images/roles/moderator.png index eaedf95d2..f7534beb5 100644 Binary files a/app/assets/images/roles/moderator.png and b/app/assets/images/roles/moderator.png differ diff --git a/app/assets/images/roles/moderator.svg b/app/assets/images/roles/moderator.svg new file mode 100644 index 000000000..9288dac4f --- /dev/null +++ b/app/assets/images/roles/moderator.svg @@ -0,0 +1,71 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/app/assets/images/users/images/user-icons.svg b/app/assets/images/users/images/user-icons.svg new file mode 100644 index 000000000..85288b242 --- /dev/null +++ b/app/assets/images/users/images/user-icons.svg @@ -0,0 +1,182 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/javascripts/changeset.js b/app/assets/javascripts/changeset.js index 152b3b4f7..9e393ad5a 100644 --- a/app/assets/javascripts/changeset.js +++ b/app/assets/javascripts/changeset.js @@ -27,12 +27,12 @@ $(document).ready(function () { function highlightChangeset(id) { rects[id].setStyle({fillOpacity: 0.5}); - $("#tr-changeset-" + id).addClass("selected"); + $("#changeset_" + id).addClass("selected"); } function unHighlightChangeset(id) { rects[id].setStyle({fillOpacity: 0}); - $("#tr-changeset-" + id).removeClass("selected"); + $("#changeset_" + id).removeClass("selected"); } group.on({ diff --git a/app/assets/javascripts/templates/browse/feature.jst.ejs b/app/assets/javascripts/templates/browse/feature.jst.ejs index 5a3fe3644..d80c68922 100644 --- a/app/assets/javascripts/templates/browse/feature.jst.ejs +++ b/app/assets/javascripts/templates/browse/feature.jst.ejs @@ -1,19 +1,15 @@ -
- <%- I18n.t('browse.start_rjs.object_list.back') %> -
- - - - - -
<%- name %> - <%- I18n.t('browse.start_rjs.object_list.details') %> -
-
+ +<%- I18n.t('browse.start_rjs.object_list.back') %> \ No newline at end of file diff --git a/app/assets/javascripts/templates/browse/feature_history.jst.ejs b/app/assets/javascripts/templates/browse/feature_history.jst.ejs index 6f870ac5b..c579070e1 100644 --- a/app/assets/javascripts/templates/browse/feature_history.jst.ejs +++ b/app/assets/javascripts/templates/browse/feature_history.jst.ejs @@ -1,13 +1,8 @@ - - - - - -
<%- I18n.t("browse.start_rjs.history_for_feature", {feature: name}) %> - <%- I18n.t('browse.start_rjs.details') %> -
-
\ No newline at end of file diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 07b44a94a..574242f77 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,38 +1,39 @@ - - <% if common_details.visible? %> - <%= t 'browse.common_details.edited_at' %> - <% else %> - <%= t 'browse.common_details.deleted_at' %> - <% end %> - <%= l common_details.timestamp %> - - -<% if common_details.changeset.user.data_public? %> - +
+
<% if common_details.visible? %> - <%= t 'browse.common_details.edited_by' %> +

<%= t 'browse.common_details.edited_at' %>

<% else %> - <%= t 'browse.common_details.deleted_by' %> +

<%= t 'browse.common_details.deleted_at' %>

<% end %> - <%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %> - -<% end %> +

<%= l common_details.timestamp %>

+
- - <%= t 'browse.common_details.version' %> - <%= h(common_details.version) %> - + <% if common_details.changeset.user.data_public? %> +
+ <% if common_details.visible? %> +

<%= t 'browse.common_details.edited_by' %>

+ <% else %> +

<%= t 'browse.common_details.deleted_by' %>

+ <% end %> +

<%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %>

+
+ <% end %> - - <%= t 'browse.common_details.in_changeset' %> - <%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %> - +
+

<%= t 'browse.common_details.version' %>

+

<%= h(common_details.version) %>

+
-<% if common_details.changeset.tags['comment'] %> - - <%= t 'browse.common_details.changeset_comment' %> - <%= linkify(h(common_details.changeset.tags['comment'])) %> - -<% end %> +
+

<%= t 'browse.common_details.in_changeset' %>

+

<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>

+
+ <% if common_details.changeset.tags['comment'] %> +
+

<%= t 'browse.common_details.changeset_comment' %>

+

<%= linkify(h(common_details.changeset.tags['comment'])) %>

+
+ <% end %> +
<%= render :partial => "tag_details", :object => common_details %> diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb index 6cc0cce6e..de41d9247 100644 --- a/app/views/browse/_containing_relation.html.erb +++ b/app/views/browse/_containing_relation.html.erb @@ -1,11 +1,8 @@ - - <%= - linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s - - if containing_relation.member_role.blank? - raw t 'browse.containing_relation.entry', :relation_name => linked_name - else - raw t 'browse.containing_relation.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role) - end - %> - +
  • <%= + linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s + if containing_relation.member_role.blank? + raw t 'browse.containing_relation.entry', :relation_name => linked_name + else + raw t 'browse.containing_relation.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role) + end +%>
    • \ No newline at end of file diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb index d0e5af81e..f44e5bb31 100644 --- a/app/views/browse/_map.html.erb +++ b/app/views/browse/_map.html.erb @@ -1,7 +1,7 @@ -
    +
    <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %> <% content_for :head do %> @@ -31,29 +31,38 @@ <%= content_tag "div", "", :id => "small_map", :data => data %> <%= t 'browse.map.loading' %> - <%= link_to t("browse.map.larger.area"), - root_path(:box => "yes"), - :id => "area_larger_map", - :class => "geolink bbox" %> -
    - <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"), - edit_path, - :id => "area_edit", - :data => { :editor => preferred_editor }, - :class => "geolink bbox" %> - - <% unless map.instance_of? Changeset %> -
    - <%= link_to t("browse.map.larger." + map.class.to_s.downcase), - root_path, - :id => "object_larger_map", - :class => "geolink object" %> -
    - <%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▾", :class => "menuicon"), +
      +
    • + <%= link_to t("browse.map.larger.area"), + root_path(:box => "yes"), + :id => "area_larger_map", + :class => "geolink bbox" %> +
      • +
    • + <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"), edit_path, - :id => "object_edit", + :id => "area_edit", :data => { :editor => preferred_editor }, - :class => "geolink object" %> + :class => "geolink bbox" %> +
      • +
    + + <% unless map.instance_of? Changeset %> +
      +
    • + <%= link_to t("browse.map.larger." + map.class.to_s.downcase), + root_path, + :id => "object_larger_map", + :class => "geolink object" %> +
      • +
    • + <%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▾", :class => "menuicon"), + edit_path, + :id => "object_edit", + :data => { :editor => preferred_editor }, + :class => "geolink object" %> +
      • +
    <% end %> <% else %> diff --git a/app/views/browse/_navigation.html.erb b/app/views/browse/_navigation.html.erb index 54e792a9f..0856044c8 100644 --- a/app/views/browse/_navigation.html.erb +++ b/app/views/browse/_navigation.html.erb @@ -1,42 +1,43 @@ <% type = (@next || @prev).class.name.downcase %> -<% margin = @next_by_user || @prev_by_user ? 9 : 18 %> -
    - <% if @next_by_user or @prev_by_user %> - - <% if @prev_by_user %> - <%= link_to t('browse.navigation.paging.user.prev', :id => @prev_by_user.id.to_s), - { :id => @prev_by_user.id }, - { :title => t("browse.navigation.user.prev_#{type}_tooltip", :user => @prev_by_user.user.display_name) } %> - | - <% end %> - <%= - user = (@prev_by_user || @next_by_user).user.display_name - link_to h(user), - { :controller => "changeset", :action => "list", :display_name => user }, - { :title => t("browse.navigation.user.name_#{type}_tooltip", :user => h(user)) } - %> - <% if @next_by_user %> - | - <%= link_to t('browse.navigation.paging.user.next', :id => @next_by_user.id.to_s), - { :id => @next_by_user.id }, - { :title => t("browse.navigation.user.next_#{type}_tooltip", :user => @next_by_user.user.display_name) } %> - <% end %> - -
    - <% end %> - +
      <% if @prev %> +
    • <%= link_to t('browse.navigation.paging.all.prev', :id => @prev.id.to_s), { :id => @prev.id }, { :title => t("browse.navigation.all.prev_#{type}_tooltip") } %> - <% end %> - <% if @prev and @next %> - | +
      • <% end %> <% if @next %> - <%= link_to t('browse.navigation.paging.all.next', :id => @next.id.to_s), - { :id => @next.id }, - { :title => t("browse.navigation.all.next_#{type}_tooltip") } %> +
    • + <%= link_to t('browse.navigation.paging.all.next', :id => @next.id.to_s), + { :id => @next.id }, + { :title => t("browse.navigation.all.next_#{type}_tooltip") } %> +
      • <% end %> - -
    + + <% if @next_by_user or @prev_by_user %> +
      + <% if @prev_by_user %> +
    • + <%= link_to t('browse.navigation.paging.user.prev', :id => @prev_by_user.id.to_s), + { :id => @prev_by_user.id }, + { :title => t("browse.navigation.user.prev_#{type}_tooltip", :user => @prev_by_user.user.display_name) } %> +
      • + <% end %> +
    • + <%= + user = (@prev_by_user || @next_by_user).user.display_name + link_to h(user), + { :controller => "changeset", :action => "list", :display_name => user }, + { :title => t("browse.navigation.user.name_#{type}_tooltip", :user => h(user)) } + %> +
      • + <% if @next_by_user %> +
    • + <%= link_to t('browse.navigation.paging.user.next', :id => @next_by_user.id.to_s), + { :id => @next_by_user.id }, + { :title => t("browse.navigation.user.next_#{type}_tooltip", :user => @next_by_user.user.display_name) } %> +
      • + <% end %> +
    + <% end %> diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb index 23176eab2..308ccd9bf 100644 --- a/app/views/browse/_node_details.html.erb +++ b/app/views/browse/_node_details.html.erb @@ -1,30 +1,28 @@ <% if node_details.redacted? %>

    <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.node'), :redaction_link => link_to(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %>

    <% else %> - +
    <%= render :partial => "common_details", :object => node_details %> <% if node_details.visible -%> -
    - - - +
    +

    <%= t 'browse.node_details.coordinates' %>

    +
    <%= link_to(content_tag(:span, number_with_delimiter(node_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(node_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(node_details.lat), :lon => h(node_details.lon), :zoom => "18"}) %>
    +
    <% end -%> <% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %> - - - - + + <% end %> -
    <%= t 'browse.node_details.coordinates' %>
    <%= link_to(content_tag(:span, number_with_delimiter(node_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(node_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(node_details.lat), :lon => h(node_details.lon), :zoom => "18"}) %>
    <%= t 'browse.node_details.part_of' %> - +
    +

    <%= t 'browse.node_details.part_of' %>

    +
      <% node_details.ways.each do |way| %> -
    +
  • <%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
    • <% end %> <%= render :partial => "containing_relation", :collection => node_details.containing_relation_members %> -
    <%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
    -
    +
    <% end %> diff --git a/app/views/browse/_paging_nav.html.erb b/app/views/browse/_paging_nav.html.erb index f0342403e..f236b4465 100644 --- a/app/views/browse/_paging_nav.html.erb +++ b/app/views/browse/_paging_nav.html.erb @@ -1,15 +1,14 @@ - +
    <% current_page = pages.current_page %> -<%= t'browse.paging_nav.showing_page' %> -<%= current_page.number %> (<%= current_page.first_item %><% -if (current_page.first_item < current_page.last_item) # if more than 1 trace on page - %>-<%= current_page.last_item %><% +<%= t'browse.paging_nav.showing_page' %> +<%= current_page.number %> (<%= current_page.first_item %><% +if (current_page.first_item < current_page.last_item) # if more than 1 trace on page + %>-<%= current_page.last_item %><% end %> <%= t'browse.paging_nav.of'%> <%= pages.item_count %>) <% if pages.page_count > 1 %> | <%= raw pagination_links_each(pages, {}) { |n| link_to_page(n, page_param) } %> <% end %> - - +
    \ No newline at end of file diff --git a/app/views/browse/_relation_details.html.erb b/app/views/browse/_relation_details.html.erb index 57314817d..bfa5edefc 100644 --- a/app/views/browse/_relation_details.html.erb +++ b/app/views/browse/_relation_details.html.erb @@ -1,31 +1,23 @@ <% if relation_details.redacted? %>

    <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %>

    <% else %> - +
    <%= render :partial => "common_details", :object => relation_details %> <% unless relation_details.relation_members.empty? %> -
    - - - +
    +

    <%= t'browse.relation_details.members' %>

    +
      <%= render :partial => "relation_member", :collection => relation_details.relation_members %>
    +
    <% end %> <% unless relation_details.containing_relation_members.empty? %> - - - - +
    +

    <%= t'browse.relation_details.part_of' %>

    +
      <%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %>
    +
    <% end %> -
    <%= t'browse.relation_details.members' %> - - <%= render :partial => "relation_member", :collection => relation_details.relation_members %> -
    -
    <%= t'browse.relation_details.part_of' %> - - <%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %> -
    -
    +
    <% end %> diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb index 71d283971..2673df3c3 100644 --- a/app/views/browse/_relation_member.html.erb +++ b/app/views/browse/_relation_member.html.erb @@ -1,14 +1,12 @@ <% member_class = link_class(relation_member.member_type.downcase, relation_member.member) linked_name = link_to h(printable_name(relation_member.member)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member) - type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase + type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase %> - - <%= +
  • <%= if relation_member.member_role.blank? raw t'browse.relation_member.entry', :type => type_str, :name => linked_name else raw t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role) end - %> - + %>
    • \ No newline at end of file diff --git a/app/views/browse/_tag.html.erb b/app/views/browse/_tag.html.erb index 2eadad4f2..298331832 100644 --- a/app/views/browse/_tag.html.erb +++ b/app/views/browse/_tag.html.erb @@ -1,3 +1 @@ - - <%= format_key(tag[0]) %> = <%= format_value(tag[0], tag[1]) %> - +
  • <%= format_key(tag[0]) %> = <%= format_value(tag[0], tag[1]) %>
    • \ No newline at end of file diff --git a/app/views/browse/_tag_details.html.erb b/app/views/browse/_tag_details.html.erb index b5f2d97e7..9d0a2af54 100644 --- a/app/views/browse/_tag_details.html.erb +++ b/app/views/browse/_tag_details.html.erb @@ -1,10 +1,6 @@ <% unless tag_details.tags.empty? %> - - <%= t'browse.tag_details.tags' %> - - - <%= render :partial => "tag", :collection => tag_details.tags.sort %> -
    - - -<% end %> +
    +

    <%= t'browse.tag_details.tags' %>

    + +
    +<% end %> \ No newline at end of file diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb index 1313cb250..d21365b45 100644 --- a/app/views/browse/_way_details.html.erb +++ b/app/views/browse/_way_details.html.erb @@ -1,39 +1,35 @@ <% if way_details.redacted? %>

    <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %>

    <% else %> - + +
    <%= render :partial => "common_details", :object => way_details %> <% unless way_details.way_nodes.empty? %> -
    - - - + + <% end %> <% unless way_details.containing_relation_members.empty? %> - - - - + <% end %> -
    <%= t'browse.way_details.nodes' %> - +
    +

    <%= t'browse.way_details.nodes' %>

    +
      <% way_details.way_nodes.each do |wn| %> -
    + <% end %> -
    +
  • <%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %> <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %> <% if related_ways.size > 0 then %> (<%= raw t 'browse.way_details.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>) <% end %> -
    • -
    <%= t'browse.way_details.part_of' %> - +
    +

    <%= t'browse.way_details.part_of' %>

    +
      <%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %> -
    -
    + <% end %> diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 2796f7c5f..96a5280a5 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,12 +1,18 @@ <% content_for :head do %> <%= stylesheet_link_tag 'browse' %> <% end %> + +<% content_for :heading do %> +

    <%= t 'browse.changeset.changeset', :id => @changeset.id %>

    + +<% end %> + <%= render :partial => "navigation" %> -

    <%= t 'browse.changeset.changeset', :id => @changeset.id %>

    + <% if @changeset.has_valid_bbox? %> <%= render :partial => "map", :object => @changeset %> <% end %> -<%= render :partial => "changeset_details", :object => @changeset %> -
    -<%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> -| <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> +<%= render :partial => "changeset_details", :object => @changeset %> \ No newline at end of file diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index 8f0a2001b..f41562a7f 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -5,15 +5,23 @@ <% content_for :head do %> <%= stylesheet_link_tag 'browse' %> <% end %> + +<% content_for :heading do %> +

    <%= t'browse.node.node_title', :node_name => @name %>

    + +<% end %> <%= render :partial => "navigation" %> -

    <%= t'browse.node.node_title', :node_name => @name %>

    + <% if @node.visible -%> <%= render :partial => "map", :object => @node %> <% end -%> -<%= render :partial => "node_details", :object => @node %> -
    -<%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %> -| <%= link_to(t('browse.node.view_history'), :action => "node_history") %> -<% if @node.visible -%> -| <%= link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id) %> -<% end -%> + +
    + <%= render :partial => "node_details", :object => @node %> +
    \ No newline at end of file diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb index 937ad7dc0..61fc83492 100644 --- a/app/views/browse/node_history.html.erb +++ b/app/views/browse/node_history.html.erb @@ -2,13 +2,20 @@ @name = printable_name @node @title = t('browse.node_history.node_history') + ' | ' + @name %> -

    <%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %>

    +<% content_for :heading do %> +

    <%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %>

    + +<% end %> + <% if @node.visible -%> -<%= render :partial => "map", :object => @node %> + <%= render :partial => "map", :object => @node %> <% end -%> -<% @node.old_nodes.reverse.each do |node| %> - <%= render :partial => "node_details", :object => node %> -
    -<% end %> -<%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %> -| <%= link_to(t('browse.node_history.view_details'), :action => "node") %> + +
    + <% @node.old_nodes.reverse.each do |node| %> + <%= render :partial => "node_details", :object => node %> + <% end %> +
    diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index 28e251ac2..3ba355054 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -5,10 +5,17 @@ <% content_for :head do %> <%= stylesheet_link_tag 'browse' %> <% end %> + +<% content_for :heading do %> +

    <%= t'browse.relation.relation_title', :relation_name => @name %>

    + +<% end %> <%= render :partial => "navigation" %> -

    <%= t'browse.relation.relation_title', :relation_name => @name %>

    <%= render :partial => "map", :object => @relation %> -<%= render :partial => "relation_details", :object => @relation %> -
    -<%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %> -| <%= link_to(t('browse.relation.view_history'), :action => "relation_history") %> + +
    + <%= render :partial => "relation_details", :object => @relation %> +
    \ No newline at end of file diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb index 8fb08e6e9..022248fba 100644 --- a/app/views/browse/relation_history.html.erb +++ b/app/views/browse/relation_history.html.erb @@ -2,11 +2,18 @@ @name = printable_name @relation @title = t('browse.relation_history.relation_history') + ' | ' + @name %> -

    <%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %>

    + +<% content_for :heading do %> +

    <%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %>

    + +<% end %> + <%= render :partial => "map", :object => @relation %> +
    <% @relation.old_relations.reverse.each do |relation| %> <%= render :partial => "relation_details", :object => relation %> -
    <% end %> -<%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %> -| <%= link_to(t('browse.relation_history.view_details'), :action => "relation") %> +
    \ No newline at end of file diff --git a/app/views/browse/start.html.erb b/app/views/browse/start.html.erb index b0315dad9..12012a029 100644 --- a/app/views/browse/start.html.erb +++ b/app/views/browse/start.html.erb @@ -1,13 +1,6 @@ -
    -
    -

    - <%= t'browse.start_rjs.manually_select' %> -
    - <%= t'browse.start_rjs.hide_areas' %> -

    -
    - -
    -
    + +
    +
    diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index aa7b5d0b7..15a0dcad8 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -5,11 +5,19 @@ <% content_for :head do %> <%= stylesheet_link_tag 'browse' %> <% end %> + +<% content_for :heading do %> +

    <%= t'browse.way.way_title', :way_name => @name %>

    + +<% end %> + <%= render :partial => "navigation" %> -

    <%= t'browse.way.way_title', :way_name => @name %>

    <%= render :partial => "map", :object => @way %> -<%= render :partial => "way_details", :object => @way %> -
    -<%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %> -| <%= link_to(t('browse.way.view_history'), :action => "way_history") %> -| <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id) %> + +
    + <%= render :partial => "way_details", :object => @way %> +
    \ No newline at end of file diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb index f581dd189..296ebb3dd 100644 --- a/app/views/browse/way_history.html.erb +++ b/app/views/browse/way_history.html.erb @@ -2,11 +2,18 @@ @name = printable_name @way @title = t('browse.way_history.way_history') + ' | ' + @name %> -

    <%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %>

    + +<% content_for :heading do %> +

    <%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %>

    + +<% end %> + <%= render :partial => "map", :object => @way %> +
    <% @way.old_ways.reverse.each do |way| %> <%= render :partial => "way_details", :object => way %> -
    <% end %> -<%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %> -| <%= link_to(t('browse.way_history.view_details'), :action => "way") %> +
    \ No newline at end of file diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb index ba963ea8e..3e4871ec0 100644 --- a/app/views/changeset/_changeset.html.erb +++ b/app/views/changeset/_changeset.html.erb @@ -12,39 +12,39 @@ end %> -<%= content_tag "tr", :class => cycle('table0', 'table1'), :id => "tr-changeset-#{changeset.id}", :data => {:changeset => changeset_data} do %> - - <%= - id_link = link_to(changeset.id, - {:controller => 'browse', :action => 'changeset', :id => changeset.id}, - {:title => t('changeset.changeset.view_changeset_details')}) - raw t 'changeset.changeset.id', :id => id_link - %> - +<%= content_tag "ul", :class => 'changeset_item', :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %> +
  • - - + + <%= + link_to(changeset.id, + {:controller => 'browse', :action => 'changeset', :id => changeset.id}, + {:title => t('changeset.changeset.view_changeset_details')}) + %> + + + <% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %> <% else %><%= l changeset.closed_at, :format => :long %><% end %> - + <%if showusername %> -
    - <% if changeset.user.data_public? %> - <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list", :display_name => changeset.user.display_name %> - <% else %> - <%= t'changeset.changeset.anonymous' %> - <% end %> + <% if changeset.user.data_public? %> + <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list", :display_name => changeset.user.display_name %> + <% else %> + <%= t'changeset.changeset.anonymous' %> + <% end %> <% end %> - - - +
    • + +
  • <% if changeset.tags['comment'].to_s != '' %> <%= linkify(h(changeset.tags['comment'])) %> <% else %> <%= t'changeset.changeset.no_comment' %> <% end %> - +
    • + <% end %> diff --git a/app/views/changeset/_changeset_paging_nav.html.erb b/app/views/changeset/_changeset_paging_nav.html.erb index 52c3decb8..46b4635c8 100644 --- a/app/views/changeset/_changeset_paging_nav.html.erb +++ b/app/views/changeset/_changeset_paging_nav.html.erb @@ -1,17 +1,15 @@ -

    - -<% if @page > 1 %> -<%= link_to t('changeset.changeset_paging_nav.previous'), params.merge({ :page => @page - 1 }) %> -<% else %> -<%= t('changeset.changeset_paging_nav.previous') %> -<% end %> - -| <%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %> | - -<% if @edits.size < @page_size %> -<%= t('changeset.changeset_paging_nav.next') %> -<% else %> -<%= link_to t('changeset.changeset_paging_nav.next'), params.merge({ :page => @page + 1 }) %> -<% end %> - -

    + \ No newline at end of file diff --git a/app/views/changeset/_changesets.html.erb b/app/views/changeset/_changesets.html.erb index 2bd40dafc..fe8da2b38 100644 --- a/app/views/changeset/_changesets.html.erb +++ b/app/views/changeset/_changesets.html.erb @@ -1,4 +1,4 @@ <% showusername = true if showusername.nil? %> - +
    <%= render :partial => 'changeset', :locals => {:showusername => showusername}, :collection => @edits unless @edits.nil? %> -
    +
    diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb index abeea654a..8ecdda946 100644 --- a/app/views/changeset/list.html.erb +++ b/app/views/changeset/list.html.erb @@ -2,28 +2,34 @@ <%= javascript_include_tag "changeset" %> <% end -%> -

    <%= @heading %>

    -

    <%= raw(@description) %>

    +<% content_for :heading do %> -<% if @edits.size > 0 %> - <%= render :partial => 'changeset_paging_nav' %> +

    <%= @heading %>

    + + +<% end %> + +<%= render :partial => 'changeset_paging_nav' %> -
    - <%= render :partial => 'map' %> +<% if @edits.size > 0 %> + <%= render :partial => 'map' %> +
    <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
    - <%= render :partial => 'changeset_paging_nav' %> <% elsif @user and @user.display_name == params[:display_name] %> -

    <%= t('changeset.list.empty_user_html') %>

    +

    <%= t('changeset.list.empty_user_html') %>

    <% else %> -

    <%= t('changeset.list.empty_anon_html') %>

    +

    <%= t('changeset.list.empty_anon_html') %>

    <% end %> <% unless params[:friends] or params[:nearby] -%> -<%= atom_link_to params.merge({ :page => nil, :action => :feed }) %> - -<% content_for :head do -%> -<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %> -<% end -%> -<% end -%> + <% content_for :head do -%> + <%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %> + <% end -%> +<% end -%> \ No newline at end of file diff --git a/app/views/changeset/timeout.html.erb b/app/views/changeset/timeout.html.erb index a52255722..3ba59fae7 100644 --- a/app/views/changeset/timeout.html.erb +++ b/app/views/changeset/timeout.html.erb @@ -1 +1 @@ -

    <%= t'changeset.timeout.sorry' %>

    +

    <%= t'changeset.timeout.sorry' %>

    \ No newline at end of file diff --git a/app/views/diary_entry/_diary_comment.html.erb b/app/views/diary_entry/_diary_comment.html.erb index 163af888f..ccc1c744f 100644 --- a/app/views/diary_entry/_diary_comment.html.erb +++ b/app/views/diary_entry/_diary_comment.html.erb @@ -1,7 +1,8 @@ -<%= user_thumbnail diary_comment.user %> -

    <%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at, :format => :friendly))) %>

    -<%= diary_comment.body.to_html %> -<%= if_administrator(:span) do %> - <%= link_to t('diary_entry.diary_comment.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('diary_entry.diary_comment.confirm') } %> -<% end %> -
    +
    + <%= user_thumbnail diary_comment.user %> +

    <%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at, :format => :friendly))) %>

    + <%= diary_comment.body.to_html %> + <%= if_administrator(:span) do %> + <%= link_to t('diary_entry.diary_comment.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('diary_entry.diary_comment.confirm') } %> + <% end %> +
    \ No newline at end of file diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb index eae60e822..a88e8adbc 100644 --- a/app/views/diary_entry/_diary_entry.html.erb +++ b/app/views/diary_entry/_diary_entry.html.erb @@ -1,30 +1,36 @@ -<%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
    +
    +
    + <% if !@this_user %> + <%= user_thumbnail diary_entry.user %> + <% end %> -
    - <%= diary_entry.body.to_html %> -
    +

    <%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>

    +
    +
    + <%= diary_entry.body.to_html %> +
    + + <% if diary_entry.latitude and diary_entry.longitude %> + <%= render :partial => "location", :object => diary_entry %> + <% end %> -<% if diary_entry.latitude and diary_entry.longitude %> - <%= render :partial => "location", :object => diary_entry %> -
    -<% end %> + + <%= raw(t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at, :format => :friendly), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %> + -<%= raw(t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at, :format => :friendly), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %> +
      + <% if params[:action] == 'list' %> +
    • <%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %>
      • +
    • <%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :title => "Re: #{diary_entry.title}" %>
      • +
    • <%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %>
      • + <% end %> -<% if params[:action] == 'list' %> -
      - <%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %> - | - <%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :title => "Re: #{diary_entry.title}" %> - | - <%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %> -<% end %> -<%= if_user(diary_entry.user, :span) do %> - | <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %> -<% end %> -<%= if_administrator(:span) do %> - | <%= link_to t('diary_entry.diary_entry.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('diary_entry.diary_entry.confirm') } %> -<% end %> + <%= if_user(diary_entry.user, :span) do %> +
    • <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
      • + <% end %> -
      -
      + <%= if_administrator(:span) do %> +
    • <%= link_to t('diary_entry.diary_entry.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('diary_entry.diary_entry.confirm') } %>
      • + <% end %> +
    +
    diff --git a/app/views/diary_entry/_diary_list_entry.html.erb b/app/views/diary_entry/_diary_list_entry.html.erb index 496443272..ca583ef47 100644 --- a/app/views/diary_entry/_diary_list_entry.html.erb +++ b/app/views/diary_entry/_diary_list_entry.html.erb @@ -1,2 +1 @@ -<%= user_thumbnail diary_list_entry.user %> -<%= render :partial => "diary_entry", :object => diary_list_entry %> +<%= render :partial => "diary_entry", :object => diary_list_entry %> \ No newline at end of file diff --git a/app/views/diary_entry/comments.html.erb b/app/views/diary_entry/comments.html.erb index f477ab8b6..e486308ea 100644 --- a/app/views/diary_entry/comments.html.erb +++ b/app/views/diary_entry/comments.html.erb @@ -1,23 +1,24 @@ -

    <%= t('diary_entry.comments.has_commented_on', :display_name => @this_user.display_name) %>

    +<% content_for :heading do %> +

    <%= t('diary_entry.comments.has_commented_on', :display_name => @this_user.display_name) %>

    +<% end %> - +
    - - - + + + <% @comments.each do |comment| -%> <% cl = cycle('table0', 'table1') %> - - - + + + <% end -%>
    <%= t 'diary_entry.comments.post' %><%= t 'diary_entry.comments.when' %><%= t 'diary_entry.comments.comment' %><%= t 'diary_entry.comments.post' %><%= t 'diary_entry.comments.when' %><%= t 'diary_entry.comments.comment' %>
    <%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id %><%= t 'diary_entry.comments.ago', :ago => time_ago_in_words(comment.created_at) %><%= comment.body.to_html %><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id %><%= t 'diary_entry.comments.ago', :ago => time_ago_in_words(comment.created_at) %><%= comment.body.to_html %>
    -<%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %> -<% if @comment_pages.current.next and @comment_pages.current.previous %> -| -<% end %> -<%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %> + \ No newline at end of file diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb index 0cdd3b098..0c83ef4ce 100644 --- a/app/views/diary_entry/edit.html.erb +++ b/app/views/diary_entry/edit.html.erb @@ -2,7 +2,9 @@ <%= javascript_include_tag "diary_entry" %> <% end %> -

    <%= @title %>

    +<% content_for :heading do %> +

    <%= @title %>

    +<% end %> <%= error_messages_for 'diary_entry' %> diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb index 9de2efea5..3353fef79 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -1,43 +1,47 @@ -<% if @this_user %> - <%= user_image @this_user %> +<% content_for :heading do %> +
    id="userinformation"<% end %> > + <% if @this_user %> + <%= user_image @this_user %> + <% end %> +

    <%= h(@title) %>

    + +
      + <% unless params[:friends] or params[:nearby] -%> +
    • <%= rss_link_to :action => 'rss', :language => params[:language] %>
      • + <% end -%> + + <% if @this_user %> + <%= if_user(@this_user) do %> +
    • <%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %>
      • + <% end %> + <% else %> + <%= if_logged_in do %> +
    • <%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %>
      • + <% end %> + <% end %> +
    +
    <% end %> -

    <%= h(@title) %>

    +<% if @entries.empty? %> +

    <%= t 'diary_entry.list.no_entries' %>

    +<% else %> +

    <%= t 'diary_entry.list.recent_entries' %>

    <% if @this_user %> - <%= if_user(@this_user) do %> - <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %> - <% end %> + <%= render :partial => 'diary_entry', :collection => @entries %> <% else %> - <%= if_logged_in do %> - <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %> - <% end %> + <%= render :partial => 'diary_list_entry', :collection => @entries %> <% end %> -<% if @entries.empty? %> -

    <%= t 'diary_entry.list.no_entries' %>

    -<% else %> -

    <%= t 'diary_entry.list.recent_entries' %>

    - -
    - - <% if @this_user %> - <%= render :partial => 'diary_entry', :collection => @entries %> - <% else %> - <%= render :partial => 'diary_list_entry', :collection => @entries %> - <% end %> - - <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %> - <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %> - <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %> +<%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %> +<% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %> +<%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %> -
    <% end %> <% unless params[:friends] or params[:nearby] -%> -<%= rss_link_to :action => 'rss', :language => params[:language] %> - -<% content_for :head do -%> -<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %> -<% end -%> + <% content_for :head do -%> + <%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %> + <% end -%> <% end -%> diff --git a/app/views/diary_entry/no_such_entry.html.erb b/app/views/diary_entry/no_such_entry.html.erb index eef0e47d2..ff9a811c7 100644 --- a/app/views/diary_entry/no_such_entry.html.erb +++ b/app/views/diary_entry/no_such_entry.html.erb @@ -1,2 +1,5 @@ -

    <%= t 'diary_entry.no_such_entry.heading', :id => h(params[:id]) %>

    +<% content_for :heading do %> +

    <%= t 'diary_entry.no_such_entry.heading', :id => h(params[:id]) %>

    +<% end %> +

    <%= t 'diary_entry.no_such_entry.body', :id => h(params[:id]) %>

    diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb index 1bce441b4..5735188a7 100644 --- a/app/views/diary_entry/view.html.erb +++ b/app/views/diary_entry/view.html.erb @@ -1,26 +1,27 @@ -<%= user_image @entry.user %> - -

    <%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %>

    +<% content_for :heading do %> +
    + <%= user_image @entry.user %> +

    <%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %>

    +
    +<% end %> <%= render :partial => 'diary_entry', :object => @entry %> - +
    <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %> - +
    <%= if_logged_in(:div) do %> -

    <%= t 'diary_entry.view.leave_a_comment' %>

    +

    <%= t 'diary_entry.view.leave_a_comment' %>

    <%= error_messages_for 'diary_comment' %> <%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %> <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %> -
    -
    <%= submit_tag t('diary_entry.view.save_button') %> <% end %> <% end %> <%= if_not_logged_in(:div) do %> -

    <%= raw t("diary_entry.view.login_to_leave_a_comment", :login_link => link_to(t("diary_entry.view.login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %>

    -<% end %> +

    <%= raw t("diary_entry.view.login_to_leave_a_comment", :login_link => link_to(t("diary_entry.view.login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %>

    +<% end %> \ No newline at end of file diff --git a/app/views/export/start.html.erb b/app/views/export/start.html.erb index 539c6f448..f5dcb1462 100644 --- a/app/views/export/start.html.erb +++ b/app/views/export/start.html.erb @@ -1,73 +1,69 @@ <%= form_tag :action => "finish" do %> -

    <%= t'export.start.area_to_export' %>

    - -
    - <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %> -
    - <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %> - <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %> -
    - <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %> -

    - <%= t'export.start.manually_select' %> -

    -
    - -

    <%= t'export.start.format_to_export' %>

    +

    <%= t'export.start.area_to_export' %>

    -
    -

    - <%= radio_button_tag("format", "osm") %> <%= t'export.start.osm_xml_data' %> +

    +
    + <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
    - <%= radio_button_tag("format", "mapnik") %> <%= t'export.start.map_image' %> + <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %> + <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %>
    - <%= radio_button_tag("format", "html") %> <%= t'export.start.embeddable_html' %> -

    + <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %> +
    + <%= t'export.start.manually_select' %>
    +

    <%= t'export.start.format_to_export' %>

    + +
      +
    • <%= radio_button_tag("format", "osm") %> <%= t'export.start.osm_xml_data' %>
      • +
    • <%= radio_button_tag("format", "mapnik") %> <%= t'export.start.map_image' %>
      • +
    • <%= radio_button_tag("format", "html") %> <%= t'export.start.embeddable_html' %>
      • +
    +
    -

    <%= t'export.start.licence' %>

    +

    <%= t'export.start.licence' %>

    -
    +

    <%= raw t'export.start.export_details' %>

    -

    <%= t'export.start.too_large.heading' %>

    +

    <%= t'export.start.too_large.heading' %>

    -
    +

    <%= t'export.start.too_large.body' %>

    -

    <%= t'export.start.options' %>

    +

    <%= t'export.start.options' %>

    -
    -

    <%= t'export.start.format' %> <%= select_tag("mapnik_format", options_for_select([["PNG", "png"], ["JPEG", "jpeg"], ["SVG", "svg"], ["PDF", "pdf"]], "png")) %>

    -

    <%= t'export.start.scale' %> 1 : <%= text_field_tag("mapnik_scale", nil, :size => 8) %> (<%= t'export.start.max' %> 1 : )

    -

    <%= t'export.start.image_size' %> x

    -
    +
      +
    • <%= t'export.start.format' %> <%= select_tag("mapnik_format", options_for_select([["PNG", "png"], ["JPEG", "jpeg"], ["SVG", "svg"], ["PDF", "pdf"]], "png")) %>
      • +
    • <%= t'export.start.scale' %> 1 : <%= text_field_tag("mapnik_scale", nil) %>

      (<%= t'export.start.max' %> 1 : )

      • +
    • <%= t'export.start.image_size' %> x
      • +
    -

    <%= t'export.start.options' %>

    - -
    -

    <%= t'export.start.add_marker' %>

    - +

    <%= t'export.start.options' %>

    + +
    + + <%= t'export.start.add_marker' %>
    -

    <%= t'export.start.output' %>

    +

    <%= t'export.start.output' %>

    -
    -

    -

    <%= t'export.start.paste_html' %>

    +
    + +

    <%= t'export.start.paste_html' %>

    diff --git a/app/views/geocoder/description.html.erb b/app/views/geocoder/description.html.erb index a01954d72..018f77765 100644 --- a/app/views/geocoder/description.html.erb +++ b/app/views/geocoder/description.html.erb @@ -1,10 +1,10 @@ <% @sources.each do |source| %> <% if source[:types] %> -

    <%= raw(t("geocoder.description.title.#{source[:name]}", :types => t("geocoder.description.types.#{source[:types]}"))) %>

    +

    <%= raw(t("geocoder.description.title.#{source[:name]}", :types => t("geocoder.description.types.#{source[:types]}"))) %>

    <% else %> -

    <%= raw(t("geocoder.description.title.#{source[:name]}")) %>

    +

    <%= raw(t("geocoder.description.title.#{source[:name]}")) %>

    <% end %> -
    +
    <%= image_tag "searching.gif", :class => "search_searching" %>
    <% end %> <% end %> diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb index 7bc8fcd76..8674c9580 100644 --- a/app/views/geocoder/search.html.erb +++ b/app/views/geocoder/search.html.erb @@ -1,5 +1,5 @@ <% @sources.each do |source| %> -

    <%= raw(t "geocoder.search.title.#{source}") %>

    +

    <%= raw(t "geocoder.search.title.#{source}") %>

    "> <%= image_tag "searching.gif", :class => "search_searching" %>
    diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb index 0380a5094..a3cbbc207 100644 --- a/app/views/layouts/_flash.html.erb +++ b/app/views/layouts/_flash.html.erb @@ -1,11 +1,11 @@ <% if flash[:error] %> -
    <%= raw flash[:error] %>
    +
    <%=image_tag("notice.png", :class => "small_icon", :border=>0)%><%= raw flash[:error] %>
    <% end %> <% if flash[:warning] %> -
    <%= raw flash[:warning] %>
    +
    <%=image_tag("notice.png", :class => "small_icon", :border=>0)%><%= raw flash[:warning] %>
    <% end %> <% if flash[:notice] %> -
    <%= raw flash[:notice] %>
    +
    <%=image_tag("notice.png", :class => "small_icon", :border=>0)%><%= raw flash[:notice] %>
    <% end %> diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index f1ae440e7..d36681d97 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -6,66 +6,7 @@ <%= link_to(image_tag("osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text')), root_path) %>

    <%= t 'layouts.project_name.h1' %>

    -
    - <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> - <%= yield %> -
    -
    - - <% if @user and @user.id %> - <%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip'))) %> - <%= link_to t('layouts.welcome_user_link_tooltip'), user_path(:display_name => @user.display_name) %> | - <%= yield :greeting %> - <%= render :partial => "layouts/inbox" %> | - <%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%> - <% else %> - <%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> | - <%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %> - <% end %> - -
      -
    • <%= link_to t('layouts.view'), root_path, { - :id => 'viewanchor', - :title => t('layouts.view_tooltip'), - :class => 'geolink llz layers' - } %>
      • -
    • <%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), edit_path, { - :id => 'editanchor', - :title => t('javascripts.site.edit_tooltip'), - :data => { :minzoom => 13, :editor => preferred_editor }, - :class => 'geolink llz object disabled' - } %>
      • -
    • <%= link_to t('layouts.history'), browse_changesets_path, { - :id => 'historyanchor', - :data => { :minzoom => 11 }, - :title => t('javascripts.site.history_tooltip'), - :class => 'geolink bbox' - } %>
      • -
    • <%= link_to t('layouts.export'), export_path, { - :id => 'exportanchor', - :title => t('layouts.export_tooltip'), - :data => { :url => url_for(:controller => :export, :action => :start) }, - :class => 'geolink llz layers' - } %>
      • -
    -
    - - -
    +
    +
    +
      + <% if @user and @user.id %> +
    • <%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %>
      • +
    • <%= yield :greeting %>
      • +
    • <%= render :partial => "layouts/inbox" %>
      • +
    • <%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
      • + <% else %> +
    • <%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %>
      • +
    • <%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
      • + <% end %> +
    +
      +
    • <%= link_to t('layouts.view'), root_path, { + :id => 'viewanchor', + :title => t('layouts.view_tooltip'), + :class => 'geolink llz layers' + } %>
      • +
    • <%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), edit_path, { + :id => 'editanchor', + :title => t('javascripts.site.edit_tooltip'), + :data => { :minzoom => 13, :editor => preferred_editor }, + :class => 'geolink llz object disabled' + } %>
      • +
    • <%= link_to t('layouts.history'), browse_changesets_path, { + :id => 'historyanchor', + :data => { :minzoom => 11 }, + :title => t('javascripts.site.history_tooltip'), + :class => 'geolink bbox' + } %>
      • +
    • <%= link_to t('layouts.export'), export_path, { + :id => 'exportanchor', + :title => t('layouts.export_tooltip'), + :data => { :url => url_for(:controller => :export, :action => :start) }, + :class => 'geolink llz layers' + } %>
      • +
    +
    + + +
    + <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> + <% if content_for? :heading %> +
    + <%= yield :heading %> +
    + <% end %> +
    + <%= yield %> +
    +
    <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> <% end -%> diff --git a/app/views/message/_message_summary.html.erb b/app/views/message/_message_summary.html.erb index b52eb1f1b..26001c0bd 100644 --- a/app/views/message/_message_summary.html.erb +++ b/app/views/message/_message_summary.html.erb @@ -1,7 +1,7 @@ "> <%= link_to h(message_summary.sender.display_name), :controller => 'user', :action => 'view', :display_name => message_summary.sender.display_name %> <%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id %> - <%= l message_summary.sent_on, :format => :friendly %> + <%= l message_summary.sent_on, :format => :friendly %> <%= button_to t('message.message_summary.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :remote => true } %> <%= button_to t('message.message_summary.read_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read'}, { :remote => true } %> <%= button_to t('message.message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => message_summary.id, :referer => request.fullpath %> diff --git a/app/views/message/_sent_message_summary.html.erb b/app/views/message/_sent_message_summary.html.erb index 962cf0a5d..3580822ae 100644 --- a/app/views/message/_sent_message_summary.html.erb +++ b/app/views/message/_sent_message_summary.html.erb @@ -1,6 +1,6 @@ <%= link_to h(sent_message_summary.recipient.display_name), :controller => 'user', :action => 'view', :display_name => sent_message_summary.recipient.display_name %> <%= link_to h(sent_message_summary.title), :controller => 'message', :action => 'read', :message_id => sent_message_summary.id %> - <%= l sent_message_summary.sent_on, :format => :friendly %> + <%= l sent_message_summary.sent_on, :format => :friendly %> <%= button_to t('message.sent_message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => sent_message_summary.id, :referer => request.fullpath %> diff --git a/app/views/message/inbox.html.erb b/app/views/message/inbox.html.erb index ec1460745..4a898c085 100644 --- a/app/views/message/inbox.html.erb +++ b/app/views/message/inbox.html.erb @@ -1,7 +1,8 @@ -
    -

    <%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %>

    +<% content_for :heading do %> +

    <%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %>

    +<% end %> -<%= render :partial => "message_count" %> +

    <%= render :partial => "message_count" %>

    <% if @user.messages.size > 0 %> @@ -21,4 +22,3 @@ <% else %>
    <%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %>
    <% end %> - diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb index ed95e2252..96f6b080d 100644 --- a/app/views/message/new.html.erb +++ b/app/views/message/new.html.erb @@ -1,4 +1,6 @@ -

    <%= raw(t'message.new.send_message_to', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %>

    +<% content_for :heading do %> +

    <%= raw(t'message.new.send_message_to', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %>

    +<% end %> <%= error_messages_for 'message' %> diff --git a/app/views/message/no_such_message.html.erb b/app/views/message/no_such_message.html.erb index 6fd52124a..9bf6ddbea 100644 --- a/app/views/message/no_such_message.html.erb +++ b/app/views/message/no_such_message.html.erb @@ -1,2 +1,5 @@ -

    <%= t'message.no_such_message.heading' %>

    +<% content_for :heading do %> +

    <%= t'message.no_such_message.heading' %>

    +<% end %> +

    <%= t'message.no_such_message.body' %>

    diff --git a/app/views/message/outbox.html.erb b/app/views/message/outbox.html.erb index 30d55e1aa..ebf04c9fb 100644 --- a/app/views/message/outbox.html.erb +++ b/app/views/message/outbox.html.erb @@ -1,6 +1,8 @@ -

    <%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(@user.display_name))) %>/<%= t'message.outbox.outbox' %>

    +<% content_for :heading do %> +

    <%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(@user.display_name))) %>/<%= t'message.outbox.outbox' %>

    +<% end %> -

    <%= t'message.outbox.messages', :count => @user.sent_messages.size %>

    +

    <%= t'message.outbox.messages', :count => @user.sent_messages.size %>

    <% if @user.sent_messages.size > 0 %>
    diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb index de36cafe8..e62873ad4 100644 --- a/app/views/message/read.html.erb +++ b/app/views/message/read.html.erb @@ -1,37 +1,36 @@ -
    <% if @user == @message.recipient %> - + <% content_for :heading do %>

    <%= h(@message.title) %>

    - -
    - <%= user_thumbnail_tiny @message.sender %> - <%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %> -
    - <%= l @message.sent_on, :format => :friendly %> - <%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %> - <%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %> -
    + <% end %> + +
    + <%= user_thumbnail_tiny @message.sender %> + <%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %> +
    + <%= l @message.sent_on, :format => :friendly %> + <%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %> + <%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %>
    +
    - <%= @message.body.to_html %> + <%= @message.body.to_html %> - <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %> + <%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %> <% else %> -

    <%= h(@message.title) %>

    +

    <%= h(@message.title) %>

    -
    - <%= user_thumbnail_tiny @message.recipient %> - <%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %> -
    - <%= l @message.sent_on, :format => :friendly %> -
    +
    + <%= user_thumbnail_tiny @message.recipient %> + <%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %> +
    + <%= l @message.sent_on, :format => :friendly %>
    +
    - <%= @message.body.to_html %> + <%= @message.body.to_html %> - <%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %> + <%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %> -<% end %> -
    +<% end %> \ No newline at end of file diff --git a/app/views/oauth/authorize.html.erb b/app/views/oauth/authorize.html.erb index eaf43f9d1..31729d4f0 100644 --- a/app/views/oauth/authorize.html.erb +++ b/app/views/oauth/authorize.html.erb @@ -1,5 +1,8 @@ -

    Authorize access to your account

    -

    <%= raw t('oauth.oauthorize.request_access', :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(@user.display_name, :controller => :user, :action => :view, :display_name => @user.display_name)) %>

    +<% content_for :heading do %> +

    Authorize access to your account

    +

    <%= raw t('oauth.oauthorize.request_access', :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(@user.display_name, :controller => :user, :action => :view, :display_name => @user.display_name)) %>

    +<% end %> + <%= form_tag authorize_url do %> <%= hidden_field_tag "oauth_token", @token.token %> <%- if params[:oauth_callback] -%> diff --git a/app/views/oauth/authorize_failure.html.erb b/app/views/oauth/authorize_failure.html.erb index d8110c94f..d5e53e4c4 100644 --- a/app/views/oauth/authorize_failure.html.erb +++ b/app/views/oauth/authorize_failure.html.erb @@ -1 +1,3 @@ -

    You have disallowed this request

    +<% content_for :heading do %> +

    You have disallowed this request

    +<% end %> \ No newline at end of file diff --git a/app/views/oauth/authorize_success.html.erb b/app/views/oauth/authorize_success.html.erb index 89512db31..aa2a52f66 100644 --- a/app/views/oauth/authorize_success.html.erb +++ b/app/views/oauth/authorize_success.html.erb @@ -1,4 +1,6 @@ -

    You have allowed this request

    +<% content_for :heading do %> +

    You have allowed this request

    +<% end %> <% if @token.oob? and not @token.oauth10? %>

    The verification code is <%= @token.verifier %>

    diff --git a/app/views/oauth_clients/edit.html.erb b/app/views/oauth_clients/edit.html.erb index b27f9b8fc..99aab0ed0 100644 --- a/app/views/oauth_clients/edit.html.erb +++ b/app/views/oauth_clients/edit.html.erb @@ -1,4 +1,7 @@ -

    <%= t'oauth_clients.edit.title' %>

    +<% content_for :heading do %> +

    <%= t'oauth_clients.edit.title' %>

    +<% end %> + <%= form_for @client_application, :url => oauth_client_path(@client_application.user.display_name, @client_application), :html => { :method => :put } do |f| %> <%= render :partial => "form", :locals => { :f => f } %>
    diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb index d698728f5..80dbc6079 100644 --- a/app/views/oauth_clients/index.html.erb +++ b/app/views/oauth_clients/index.html.erb @@ -1,4 +1,7 @@ -

    <%= t'oauth_clients.index.title' %>

    +<% content_for :heading do %> +

    <%= t'oauth_clients.index.title' %>

    +<% end %> + <% unless @tokens.empty? %>

    <%= t'oauth_clients.index.my_tokens' %>

    <%= t'oauth_clients.index.list_tokens' %>

    @@ -16,7 +19,7 @@ <% end %> <% end %> - <% end %> + <% end %>
    <% end %>

    <%= t'oauth_clients.index.my_apps' %>

    @@ -30,4 +33,4 @@ <% end %> <% end %> <% end %> -

    <%= link_to t('oauth_clients.index.register_new'), :action => :new %>

    +

    <%= link_to t('oauth_clients.index.register_new'), :action => :new %>

    \ No newline at end of file diff --git a/app/views/oauth_clients/new.html.erb b/app/views/oauth_clients/new.html.erb index 2cd748ac6..1c18857b1 100644 --- a/app/views/oauth_clients/new.html.erb +++ b/app/views/oauth_clients/new.html.erb @@ -1,6 +1,9 @@ -

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

    +<% content_for :heading do %> +

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

    +<% end %> + <%= form_for :client_application, :url => { :action => :create } do |f| %> <%= render :partial => "form", :locals => { :f => f } %>
    <%= submit_tag t('oauth_clients.new.submit') %> -<% end %> +<% end %> \ No newline at end of file diff --git a/app/views/oauth_clients/show.html.erb b/app/views/oauth_clients/show.html.erb index 8139a2d73..6b9169211 100644 --- a/app/views/oauth_clients/show.html.erb +++ b/app/views/oauth_clients/show.html.erb @@ -1,4 +1,6 @@ -

    <%= t('oauth_clients.show.title', :app_name => @client_application.name) %>

    +<% content_for :heading do %> +

    <%= t('oauth_clients.show.title', :app_name => @client_application.name) %>

    +<% end %>

    <%= t'oauth_clients.show.key' %> <%=@client_application.key %>

    diff --git a/app/views/redactions/edit.html.erb b/app/views/redactions/edit.html.erb index 2a5e69d0a..2dd63c9cb 100644 --- a/app/views/redactions/edit.html.erb +++ b/app/views/redactions/edit.html.erb @@ -1,5 +1,8 @@ <% @title = t 'redaction.edit.title' %> -

    <%= t 'redaction.edit.heading' %>

    + +<% content_for :heading do %> +

    <%= t 'redaction.edit.heading' %>

    +<% end %> <%= form_for(@redaction) do |f| %> <%= f.error_messages %> diff --git a/app/views/redactions/index.html.erb b/app/views/redactions/index.html.erb index 1fa683de8..a5a85c38d 100644 --- a/app/views/redactions/index.html.erb +++ b/app/views/redactions/index.html.erb @@ -1,5 +1,7 @@ <% @title = t('redaction.index.title') %> -

    <%= t('redaction.index.heading') %>

    +<% content_for :heading do %> +

    <%= t('redaction.index.heading') %>

    +<% end %> <% unless @redactions.empty? %> <%= render :partial => 'redactions' %> diff --git a/app/views/redactions/new.html.erb b/app/views/redactions/new.html.erb index c714acdbc..5004c0e1e 100644 --- a/app/views/redactions/new.html.erb +++ b/app/views/redactions/new.html.erb @@ -1,5 +1,7 @@ <% @title = t 'redaction.new.title' %> -

    <%= t 'redaction.new.heading' %>

    +<% content_for :heading do %> +

    <%= t 'redaction.new.heading' %>

    +<% end %> <%= form_for(@redaction) do |f| %> <%= f.error_messages %> diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb index 1a24f15b4..798ed962a 100644 --- a/app/views/redactions/show.html.erb +++ b/app/views/redactions/show.html.erb @@ -1,5 +1,7 @@ <% @title = t('redaction.show.title') %> -

    <%= t('redaction.show.heading', :title => @redaction.title) %>

    +<% content_for :heading do %> +

    <%= t('redaction.show.heading', :title => @redaction.title) %>

    +<% end %>

    <%= t 'redaction.show.user' %> diff --git a/app/views/site/_home_link.html.erb b/app/views/site/_home_link.html.erb index 615200b5e..4d781c123 100644 --- a/app/views/site/_home_link.html.erb +++ b/app/views/site/_home_link.html.erb @@ -1,5 +1,5 @@ <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> <% content_for :greeting do %> - <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> | + <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> <% end %> <% end %> diff --git a/app/views/site/_sidebar.html.erb b/app/views/site/_sidebar.html.erb index bea37d0d9..60d057512 100644 --- a/app/views/site/_sidebar.html.erb +++ b/app/views/site/_sidebar.html.erb @@ -1,10 +1,8 @@

    diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index 2f44386da..160dfea7c 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -1,35 +1,39 @@ +<% content_for :heading do %> <% if @locale == 'en' %> - <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %> -

    <%= t 'license_page.native.title' %>

    -

    - <%= raw t 'license_page.native.text', - :native_link => link_to(t('license_page.native.native_link'), - :controller => 'site', - :action => 'copyright', - :copyright_locale => nil), - :mapping_link => link_to(t('license_page.native.mapping_link'), - :controller => 'site', - :action => 'index') %> -

    -
    - <% end %> -<% else %> - - <% if t('license_page.legal_babble', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %> -

    <%= t 'license_page.foreign.title' %>

    -

    - <%= raw t 'license_page.foreign.text', - :english_original_link => link_to(t('license_page.foreign.english_link'), - :controller => 'site', - :action => 'copyright', - :copyright_locale => 'en') %> -

    -
    + + <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %> +

    <%= t 'license_page.native.title' %>

    +

    + <%= raw t 'license_page.native.text', + :native_link => link_to(t('license_page.native.native_link'), + :controller => 'site', + :action => 'copyright', + :copyright_locale => nil), + :mapping_link => link_to(t('license_page.native.mapping_link'), + :controller => 'site', + :action => 'index') %> +

    +
    + <% end %> + <% else %> + + <% if t('license_page.legal_babble', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %> +

    <%= t 'license_page.foreign.title' %>

    +

    + <%= raw t 'license_page.foreign.text', + :english_original_link => link_to(t('license_page.foreign.english_link'), + :controller => 'site', + :action => 'copyright', + :copyright_locale => 'en') %> +

    +
    + <% end %> <% end %> -<% end %> -

    <%= t "license_page.legal_babble.title_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.title_html", :locale => @locale %>

    + +<% end %>

    <%= t "license_page.legal_babble.intro_1_html", :locale => @locale %>

    <%= t "license_page.legal_babble.intro_2_html", :locale => @locale %>

    @@ -42,8 +46,6 @@

    <%= image_tag("attribution_example.png", :alt => t('license_page.legal_babble.attribution_example.alt'), :border => 0, - :width => 193, - :height => 69, :title => t('license_page.legal_babble.attribution_example.title')) %>

    <%= t "license_page.legal_babble.more_title_html", :locale => @locale %>

    @@ -66,4 +68,4 @@

    <%= t "license_page.legal_babble.infringement_title_html", :locale => @locale %>

    <%= t "license_page.legal_babble.infringement_1_html", :locale => @locale %>

    -

    <%= t "license_page.legal_babble.infringement_2_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.infringement_2_html", :locale => @locale %>

    \ No newline at end of file diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb index 32717d824..ac5233669 100644 --- a/app/views/trace/_trace.html.erb +++ b/app/views/trace/_trace.html.erb @@ -10,21 +10,21 @@ <% end %> <%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %> - ... - <% if trace.inserted %> + ... + <% if trace.inserted %> (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>) - <% end %> + <% end %> ... <%= t'trace.trace.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %> <%= link_to t('trace.trace.more'), {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => t('trace.trace.trace_details')} %> / <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {:title => t('trace.trace.view_map')} %> / <%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %> <%= t('trace.trace.' + trace.visibility) %>
    - <%= h(trace.description) %> + <%= t('trace.list.description') %>
    <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %> <% if !trace.tags.empty? %> - <%= t'trace.trace.in' %> + <%= t'trace.trace.in' %> <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %> <% end %> diff --git a/app/views/trace/_trace_optionals.html.erb b/app/views/trace/_trace_optionals.html.erb index d541c985b..a20091c07 100644 --- a/app/views/trace/_trace_optionals.html.erb +++ b/app/views/trace/_trace_optionals.html.erb @@ -1,7 +1,6 @@ <% content_for :optionals do %>
    -

    <%= t'trace.trace_optionals.tags' %>

    -
    +

    <%= t'trace.trace_optionals.tags' %>

    <% if @all_tags %> <% @all_tags.each do |tag| %> <%= link_to_tag tag %>
    diff --git a/app/views/trace/create.html.erb b/app/views/trace/create.html.erb index 23346a951..1f91ef801 100644 --- a/app/views/trace/create.html.erb +++ b/app/views/trace/create.html.erb @@ -1,4 +1,6 @@ -

    <%= t'trace.create.upload_trace' %>

    +<% content_for :heading do %> +

    <%= t'trace.create.upload_trace' %>

    +<% end %> <%= error_messages_for 'trace' %> diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb index a694d55bb..32c07db75 100644 --- a/app/views/trace/edit.html.erb +++ b/app/views/trace/edit.html.erb @@ -1,4 +1,6 @@ -

    <%= t 'trace.edit.heading', :name => h(@trace.name) %>

    +<% content_for :heading do %> +

    <%= t 'trace.edit.heading', :name => h(@trace.name) %>

    +<% end %> @@ -8,7 +10,7 @@ <%= t'trace.edit.filename' %> <%= @trace.name %> (<%= link_to t('trace.edit.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>) - + <%= t'trace.edit.uploaded_at' %> <%= l @trace.timestamp, :format => :friendly %> diff --git a/app/views/trace/list.html.erb b/app/views/trace/list.html.erb index 5a33defc8..c600df110 100644 --- a/app/views/trace/list.html.erb +++ b/app/views/trace/list.html.erb @@ -1,25 +1,27 @@ -

    <%= h(@title) %>

    +<% content_for :heading do %> +

    <%= h(@title) %>

    +
      +
    • <%= t('trace.list.description') %>
      • +
    • <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %>
      • +
    • <%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %>
      • + <% if @tag %> +
    • <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %>
      • +
    • <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>
      • + <% else %> + <% if @display_name %> +
    • <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %>
      • + <% end %> + <%= unless_user(@target_user, :li) do %> + <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %> + <% end %> + <% end %> +
    +<% end %> <% content_for :head do %> <%= auto_discovery_link_tag :atom, :action => 'georss', :display_name => @display_name, :tag => @tag %> <% end %> -

    - <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %> - | <%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %> - <% if @tag %> - | <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %> - | <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %> - <% else %> - <% if @display_name %> - | <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %> - <% end %> - <%= unless_user(@target_user, :span) do %> - | <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %> - <% end %> - <% end %> -

    - <% if @traces.size > 0 %> <%= render :partial => 'trace_paging_nav' %> @@ -33,7 +35,7 @@ <%= render :partial => 'trace_paging_nav' %> <% else %> -

    <%= t 'trace.list.empty_html', :upload_link => trace_create_path %>

    +

    <%= t 'trace.list.empty_html', :upload_link => trace_create_path %>

    <% end %> <%= render :partial => 'trace_optionals' %> diff --git a/app/views/trace/offline.html.erb b/app/views/trace/offline.html.erb index d9cfb3926..ed6c1c58d 100644 --- a/app/views/trace/offline.html.erb +++ b/app/views/trace/offline.html.erb @@ -1,2 +1,5 @@ +<% content_for :heading do %>

    <%= t 'trace.offline.heading' %>

    +<% end %> +

    <%= t 'trace.offline.message' %>

    diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb index 5a7c5bcc6..0887e5605 100644 --- a/app/views/trace/view.html.erb +++ b/app/views/trace/view.html.erb @@ -1,4 +1,6 @@ -

    <%= t 'trace.view.heading', :name => h(@trace.name) %>

    +<% content_for :heading do %> +

    <%= t 'trace.view.heading', :name => h(@trace.name) %>

    +<% end %> <% if STATUS != :gpx_offline %> <% if @trace.inserted %> @@ -12,7 +14,7 @@ <%= t'trace.view.filename' %> <%= @trace.name %> (<%= link_to t('trace.view.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>) - + <%= t'trace.view.uploaded' %> <%= l @trace.timestamp, :format => :friendly %> diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb index 1a28c21bd..e723af9e7 100644 --- a/app/views/user/_contact.html.erb +++ b/app/views/user/_contact.html.erb @@ -1,4 +1,4 @@ - +
    <% user_data = { :lon => contact.home_lon, @@ -10,41 +10,41 @@ <%= content_tag "td", :rowspan => 3, :data => {:user => user_data} do %> <%= user_thumbnail contact %> <% end %> - - <%= link_to h(contact.display_name), :controller => 'user', :action => 'view', :display_name => contact.display_name %> - <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %> - <% distance = @this_user.distance(contact) %> - <% if distance < 1 %> - (<%= t 'user.view.m away', :count => (distance * 1000).round %>) +
    +

    + <%= link_to h(contact.display_name), :controller => 'user', :action => 'view', :display_name => contact.display_name %> + <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %> + <% distance = @this_user.distance(contact) %> + <% if distance < 1 %> + (<%= t 'user.view.m away', :count => (distance * 1000).round %>) + <% else %> + (<%= t 'user.view.km away', :count => distance.round %>) + <% end %> + <% end %> +

    +

    + <% changeset = contact.changesets.first %> + <% if changeset %> + <%= t('user.view.latest edit', :ago => t('user.view.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %> + <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('changeset.changeset.no_comment') %> + "<%= link_to(comment, + {:controller => 'browse', :action => 'changeset', :id => changeset.id}, + {:title => t('changeset.changeset.view_changeset_details')}) + %>" <% else %> - (<%= t 'user.view.km away', :count => distance.round %>) + <%= t'changeset.changeset.no_edits' %> + <% end %> +

    + +
      +
    • <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %>
      • +
    • + <% if @user.is_friends_with?(contact) %> + <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> + <% else %> + <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> <% end %> - <% end %> - - - - - <% changeset = contact.changesets.first %> - <% if changeset %> - <%= t('user.view.latest edit', :ago => t('user.view.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %> - <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('changeset.changeset.no_comment') %> - "<%= link_to(comment, - {:controller => 'browse', :action => 'changeset', :id => changeset.id}, - {:title => t('changeset.changeset.view_changeset_details')}) - %>" - <% else %> - <%= t'changeset.changeset.no_edits' %> - <% end %> - - - - - <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %> - | - <% if @user.is_friends_with?(contact) %> - <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> - <% else %> - <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> - <% end %> - - +
      • +
    +
    +
    diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 179e1b2f6..2782fc808 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,7 +1,10 @@ -

    <%= t 'user.account.my settings' %>

    - -<%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %> | -<%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %> +<% content_for :heading do %> +

    <%= t 'user.account.my settings' %>

    +
      +
    • <%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %>
      • +
    • <%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %>
      • +
    +<% end %> <%= error_messages_for 'user' %> <%= form_for :user, :html => { :multipart => true } do |f| %> @@ -86,7 +89,7 @@ <%= user_image @user %> - +
    <% if @user.image.file? %> @@ -130,7 +133,7 @@ <% content_for :head do %> <%= javascript_include_tag "user" %> <% end %> - <%= content_tag "div", "", :id => "map", :class => "user_map set_location" %> + <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %> @@ -146,4 +149,4 @@

    <%= t 'user.account.public editing note.heading' %>

    <%= raw t 'user.account.public editing note.text' %> <%= button_to t('user.account.make edits public button'), :action => :go_public %> -<% end %> +<% end %> \ No newline at end of file diff --git a/app/views/user/blocked.html.erb b/app/views/user/blocked.html.erb index 69e700634..f175fe18a 100644 --- a/app/views/user/blocked.html.erb +++ b/app/views/user/blocked.html.erb @@ -1,4 +1,6 @@ -

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

    +<% content_for :heading do %> +

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

    +<% end %>

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

    diff --git a/app/views/user/confirm.html.erb b/app/views/user/confirm.html.erb index f48cd8867..3b68ddd5b 100644 --- a/app/views/user/confirm.html.erb +++ b/app/views/user/confirm.html.erb @@ -2,7 +2,9 @@ $("#content").hide(); -

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

    +<% content_for :heading do %> +

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

    +<% end %>

    <%= t 'user.confirm.press confirm button' %>

    diff --git a/app/views/user/confirm_email.html.erb b/app/views/user/confirm_email.html.erb index 5efc6a2c5..1170631ca 100644 --- a/app/views/user/confirm_email.html.erb +++ b/app/views/user/confirm_email.html.erb @@ -2,7 +2,9 @@ $("#content").hide(); -

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

    +<% content_for :heading do %> +

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

    +<% end %>

    <%= t 'user.confirm_email.press confirm button' %>

    diff --git a/app/views/user/list.html.erb b/app/views/user/list.html.erb index 398debe1e..240a7590d 100644 --- a/app/views/user/list.html.erb +++ b/app/views/user/list.html.erb @@ -1,6 +1,8 @@ <% @title = t('user.list.title') %> -

    <%= t('user.list.heading') %>

    +<% content_for :heading do %> +

    <%= t('user.list.heading') %>

    +<% end %> <% unless @users.empty? %> <%= form_tag do %> diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 5208d0a7f..c2deada5c 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,67 +1,61 @@ -
    -
    -

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

    +
    +<% content_for :heading do %> +

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

    +<% end %> - <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %> - <%= hidden_field_tag('referer', h(params[:referer])) %> + <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %> + <%= hidden_field_tag('referer', h(params[:referer])) %> -

    <%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %>

    +

    <%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %>

    -
    <%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %>
    - - - - - - - - - - -
    <%= t 'user.login.email or username' %><%= text_field_tag "username", params[:username], :size => 28, :maxlength => 255, :tabindex => 1 %>
    <%= t 'user.login.password' %><%= password_field_tag "password", "", :size => 28, :maxlength => 255, :tabindex => 2 %> (<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)
    <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %> - -
    - <%= submit_tag t('user.login.login_button'), :tabindex => 4 %> -
    + + + + + + + + + + + +
    <%= t 'user.login.email or username' %><%= text_field_tag "username", params[:username], :size => 28, :maxlength => 255, :tabindex => 1 %>
    <%= t 'user.login.password' %><%= password_field_tag "password", "", :size => 28, :maxlength => 255, :tabindex => 2 %> (<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)
    <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %> + +
    + <%= submit_tag t('user.login.login_button'), :tabindex => 4 %> +
    +

    <%= t 'user.login.with openid' %>

    -
    +
      +
    • <%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %>
      • +
    • <%= openid_button "google", "gmail.com" %>
      • +
    • <%= openid_button "yahoo", "me.yahoo.com" %>
      • +
    • <%= openid_button "myopenid", "myopenid.com" %>
      • +
    • <%= openid_button "wordpress", "wordpress.com" %>
      • +
    • <%= openid_button "aol", "aol.com" %>
      • +
    -

    <%= t 'user.login.with openid' %>

    + + + + + + + + + +
    + <%= raw t 'user.login.openid', :logo => openid_logo %> + + <%= url_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %> + (<%= t 'user.account.openid.link text' %>) +
    <%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %>
    - - - - - - - - - -
    <%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %><%= openid_button "google", "gmail.com" %><%= openid_button "yahoo", "me.yahoo.com" %><%= openid_button "myopenid", "myopenid.com" %><%= openid_button "wordpress", "wordpress.com" %><%= openid_button "aol", "aol.com" %>
    + <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %> + <% end %> - - - - - - - - - -
    - <%= raw t 'user.login.openid', :logo => openid_logo %> - - <%= url_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %> - (<%= t 'user.account.openid.link text' %>) -
    <%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %>
    - - <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %> - <% end %> - -
    -