Improve browse design

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 3845c5b3190b8c25dafd2fe8633c0ac0b8e03d06..e6862f9542d872e9e1110566fb54943d8dfa69b6 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -624,15 +624,15 @@ nav.secondary {
     float: left;
     width: $sidebarWidth;
     background: #fff;
     float: left;
     width: $sidebarWidth;
     background: #fff;

+    font-size: 13px;

 
 

-    h2, h3, h4 {
+    h2 {

       padding: $lineheight $lineheight $lineheight/2;
     }
 
       padding: $lineheight $lineheight $lineheight/2;
     }
 

-    h4 {
-      font-weight: normal;
-      color: #666;
-      font-size: 12px;
+    h3, h4 {
+      margin-top: $lineheight;
+      margin-bottom: $lineheight/2;

     }
 
     .icon.close {
     }
 
     .icon.close {


@@ -937,7 +937,7 @@ header .search_form {
   }
 }
 
   }
 }
 

-/* Rules for search results which appear in the popout sidebar */
+/* Rules for search sidebar */

 
 .search_results_entry {
   ul li {
 
 .search_results_entry {
   ul li {


@@ -959,6 +959,7 @@ header .search_form {
 }
 
 /* Rules for entity history */
 }
 
 /* Rules for entity history */

+

 #sidebar_content {
   .browse_details {
     position: relative;
 #sidebar_content {
   .browse_details {
     position: relative;


@@ -970,7 +971,7 @@ header .search_form {
   display: none;
 }
 
   display: none;
 }
 

-/* Rules for the changeset list shown by the history tab */
+/* Rules for the history sidebar */

 
 #sidebar .changesets {
   li {
 
 #sidebar .changesets {
   li {


@@ -980,34 +981,32 @@ header .search_form {
 
     &.selected { background: #FFFFE6; }
     /* color is derived from changeset bbox fillColor in history.js */
 
     &.selected { background: #FFFFE6; }
     /* color is derived from changeset bbox fillColor in history.js */

-
-    h4 {
-      padding: 0;
-    }

   }
 
   }
 

-  .comment a {
-    font-weight: 500;
-    color: #000;
+  h4 {
+    margin-top: 0;
+    a {
+      color: #000;
+    }

   }
 }
 
   }
 }
 

-/* Rules for the data browser */
+/* Rules for the browse sidebar */

 
 #sidebar_content {
   .browse-section {
 
 #sidebar_content {
   .browse-section {

-    padding: 10px 20px;
+    padding: $lineheight;

 
 

-    h4 {
-      padding: 0;
+    h4:first-child {
+      margin-top: 0;

     }
     }

+  }

 
 

-    .paginate {
-      float: right;
-      padding: 1px 6px;
-      border: 1px solid #eee;
-      border-radius: 3px;
-    }
+  .paginate {
+    float: right;
+    padding: 1px 6px;
+    border: 1px solid #eee;
+    border-radius: 3px;

   }
 
   .paginate ul {
   }
 
   .paginate ul {


@@ -1037,11 +1036,9 @@ header .search_form {
 
   .browse-tag-list {
     background-color: #F6F6F6;
 
   .browse-tag-list {
     background-color: #F6F6F6;

-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
+    border: 1px solid #ddd;
+    border-radius: 3px;

     font-size: 12px;
     font-size: 12px;

-    margin-left: -$lineheight;
-    margin-right: -$lineheight;

 
     li {
       border-bottom: 1px solid #ddd;
 
     li {
       border-bottom: 1px solid #ddd;


@@ -1056,7 +1053,7 @@ header .search_form {
       display: inline-block;
       width: 50%;
       float: left;
       display: inline-block;
       width: 50%;
       float: left;

-      padding: 6px 10px 6px $lineheight;
+      padding: 6px 10px;

     }
 
     .browse-tag-k {
     }
 
     .browse-tag-k {


@@ -1069,38 +1066,46 @@ header .search_form {
       background-color: #fff;
     }
   }
       background-color: #fff;
     }
   }

-}

 
 

-/* Rules for export information which appears in the popout sidebar */
+  .warning {
+    margin: $lineheight/2 0;
+    padding: $lineheight/2;
+    font-size: 90%;
+  }

 
 

-.export_bounds, .export_button {
-  text-align: center;
+  .note-comments li {
+    margin: $lineheight/2 0;
+  }

 }
 
 }
 

-.export_area_inputs {
-  margin-bottom: $lineheight/2;
-  input[type="text"] {
-    width: 80px;
-    margin-bottom: 5px;
+/* Rules for export sidebar */
+
+.export_form {
+  padding: $lineheight;
+
+  .export_area_inputs,
+  .export_button {
+    text-align: center;

   }
   }

-}

 
 

-.export_bound {
-  margin: $lineheight/4;
-}
+  .export_area_inputs {
+    margin-bottom: $lineheight/2;
+    input[type="text"] {
+      width: 80px;
+      margin-bottom: 5px;
+    }
+  }

 
 

-#export_osm {
-  span.small-title { 
-    font-weight: 500;
-    display: block;
-    font-size: 14px;
-    padding-bottom: 5px; 
+  .export_bound {
+    margin: $lineheight/4;
+  }
+
+  .export_button {
+    margin-top: $lineheight;

   }
 
   dl {
   }
 
   dl {

-    padding-left: 30px;
-    font-size: 13px;
-    color: #666;
+    padding-left: $lineheight/2;

     dd {
       margin-left: 0;
       margin-bottom: 10px;
     dd {
       margin-left: 0;
       margin-bottom: 10px;


@@ -2122,66 +2127,6 @@ a.button {
   }
 }
 
   }
 }
 

-/* Rules for the notes interface */
-
-.leaflet-popup-content .note {
-  padding-top: $lineheight/2;
-}
-
-.leaflet-popup-content .note {
-  h2 {
-    margin-bottom: $lineheight/2;
-  }
-
-  div {
-    margin-top: $lineheight/2;
-  }
-
-  .permalink {
-    position: absolute;
-    top: $lineheight/4;
-    left: $lineheight/4;
-    min-width: 15px;
-    min-height: 15px;
-  }
-
-  .permalink span {
-    display: none;
-    padding-left: $lineheight;
-  }
-
-  .permalink:hover span {
-    display: block;
-  }
-
-  .warning {
-    display: block;
-    background-color: #ffe0cc;
-    padding: 4px 6px;
-    margin-bottom: $lineheight/2;
-  }
-
-  .comment_body {
-    margin-top: 2px;
-    margin-bottom: 2px;
-
-    p {
-      margin-top: 0px;
-      margin-bottom: 0px;
-    }
-  }
-
-  .comment {
-    width: 100%;
-    height: 100px;
-  }
-
-  .buttons {
-    margin-top: $lineheight/4;
-    text-align: right;
-  }
-}
-

 /* Rules for the iD editor */
 
 .id-embed {
 /* Rules for the iD editor */
 
 .id-embed {

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index 0f731875b5148ba4d08476eed7de9c38cf3ad384..593215f2953ed7a653b60c2e35f7bd10eb0045e1 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,30 +1,32 @@
-<div class='browse-section common'>
+<h4>

   <% if common_details.changeset.tags['comment'].present? %>
     <%= linkify(h(common_details.changeset.tags['comment'])) %>
   <% else %>
     (no comment)
   <% end %>
   <% if common_details.changeset.tags['comment'].present? %>
     <%= linkify(h(common_details.changeset.tags['comment'])) %>
   <% else %>
     (no comment)
   <% end %>

-  <h4>
-    <% if common_details.visible? %>
-      <%= t 'browse.common_details.edited' %> 
-    <% else %>
-      <%= t 'browse.common_details.deleted' %> 
-    <% end %>
-      <abbr><%= distance_of_time_in_words_to_now(common_details.timestamp) %> ago</abbr>
+</h4>

 
 

-    <% if common_details.changeset.user.data_public? %>
-      <%= t 'browse.common_details.by' %>
-      <%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %>
-    <% end %>
-  </h4>
+<div class="details">
+  <% if common_details.visible? %>
+    <%= t 'browse.common_details.edited' %>
+  <% else %>
+    <%= t 'browse.common_details.deleted' %>
+  <% end %>
+
+  <abbr><%= distance_of_time_in_words_to_now(common_details.timestamp) %> ago</abbr>
+
+  <% if common_details.changeset.user.data_public? %>
+    <%= t 'browse.common_details.by' %>
+    <%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %>
+  <% end %>
+</div>

 
 

-  <h4>
-    <%= t 'browse.common_details.version' %> 
-    #<%= h(common_details.version) %>
-    &middot;
-    <%= t 'browse.common_details.in_changeset' %> 
-    #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
-  </h4>
+<div class="details">
+  <%= t 'browse.common_details.version' %>
+  #<%= h(common_details.version) %>
+  &middot;
+  <%= t 'browse.common_details.in_changeset' %>
+  #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>

 </div>
 
 <%= render :partial => "tag_details", :object => common_details.tags %>
 </div>
 
 <%= render :partial => "tag_details", :object => common_details.tags %>

diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb
index 60f6c01facc70e3d19f2e4a9a3424b3a334c7bf6..2300e75ccee449808ad1c16710d43b3fee0d5915 100644 (file)
--- a/app/views/browse/_node_details.html.erb
+++ b/app/views/browse/_node_details.html.erb
@@ -1,21 +1,21 @@
-<div class='browse_details' id="<%= node_details.version %>">
-<% if node_details.redacted? %>
-  <div class='browse-section'>
-    <%= 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 %>
-  </div>
-<% else %>
-  <%= render :partial => "common_details", :object => node_details %>
+<div class='browse-section'>
+  <% if node_details.redacted? %>
+    <%= t 'browse.redacted.message_html',
+          :type => t('browse.redacted.type.node'),
+          :version => node_details.version,
+          :redaction_link => link_to(t('browse.redacted.redaction',
+                                       :id => node_details.redaction.id), node_details.redaction) %>
+  <% else %>
+    <%= render :partial => "common_details", :object => node_details %>

 
 

-  <% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %>
-    <div class='browse-section'>
+    <% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %>

       <h4><%= t 'browse.node_details.part_of' %></h4>
       <ul>
       <h4><%= t 'browse.node_details.part_of' %></h4>
       <ul>

-          <% node_details.ways.each do |way| %>
-            <li><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
-          <% end %>
-          <%= render :partial => "containing_relation", :collection => node_details.containing_relation_members %>
+        <% node_details.ways.each do |way| %>
+          <li><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
+        <% end %>
+        <%= render :partial => "containing_relation", :collection => node_details.containing_relation_members %>

       </ul>
       </ul>

-    </div>
+    <% end %>

   <% end %>
   <% end %>

-<% end %>

 </div>
 </div>

diff --git a/app/views/browse/_relation_details.html.erb b/app/views/browse/_relation_details.html.erb
index 6e12f7f651bb5a046f28335ecb5d542692cedf58..dcc694c1886fa82aaebb144ba400da5a98e1f6f7 100644 (file)
--- a/app/views/browse/_relation_details.html.erb
+++ b/app/views/browse/_relation_details.html.erb
@@ -1,23 +1,21 @@
-<div class='browse_details' id="<%= relation_details.version %>">
-<% if relation_details.redacted? %>
-  <div class='browse-section'>
-    <%= 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 %><
-  </div>
-<% else %>
-  <%= render :partial => "common_details", :object => relation_details %>
+<div class='browse-section'>
+  <% if relation_details.redacted? %>
+    <%= t 'browse.redacted.message_html',
+          :type => t('browse.redacted.type.relation'),
+          :version => relation_details.version,
+          :redaction_link => link_to(t('browse.redacted.redaction',
+                                       :id => relation_details.redaction.id), relation_details.redaction) %><
+  <% else %>
+    <%= render :partial => "common_details", :object => relation_details %>

 
 

-  <% unless relation_details.relation_members.empty? %>
-    <div class='browse-section'>
+    <% unless relation_details.relation_members.empty? %>

       <h4><%= t'browse.relation_details.members' %></h4>
       <ul><%= render :partial => "relation_member", :collection => relation_details.relation_members %></ul>
       <h4><%= t'browse.relation_details.members' %></h4>
       <ul><%= render :partial => "relation_member", :collection => relation_details.relation_members %></ul>

-    </div>
-  <% end %>
+    <% end %>

 
 

-  <% unless relation_details.containing_relation_members.empty? %>
-    <div class='browse-section'>
+    <% unless relation_details.containing_relation_members.empty? %>

       <h4><%= t'browse.relation_details.part_of' %></h4>
       <ul><%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %></ul>
       <h4><%= t'browse.relation_details.part_of' %></h4>
       <ul><%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %></ul>

-    </div>
+    <% end %>

   <% end %>
   <% end %>

-<% end %>

 </div>
 </div>

diff --git a/app/views/browse/_tag_details.html.erb b/app/views/browse/_tag_details.html.erb
index eaf98b57b26db67d22c720b17d2367c802772d93..090a23e7c3bfa8ad0e6ae8ec4c2d7e355dec8013 100644 (file)
--- a/app/views/browse/_tag_details.html.erb
+++ b/app/views/browse/_tag_details.html.erb
@@ -1,8 +1,6 @@
 <% unless tag_details.empty? %>
 <% unless tag_details.empty? %>

-  <div class='browse-section'>
-    <h4><%= t'browse.tag_details.tags' %></h4>
-    <ul class='browse-tag-list'>
-      <%= render :partial => "tag", :collection => tag_details.sort %>
-    </ul>
-  </div>
+  <h4><%= t 'browse.tag_details.tags' %></h4>
+  <ul class='browse-tag-list'>
+    <%= render :partial => "tag", :collection => tag_details.sort %>
+  </ul>

 <% end %>
 <% end %>

diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb
index 2ffa6573b33e477a56e312bec6fbf6c9f4d1b71b..30e29d989d2c79a66a5269ed8a683f3cd7aa8cee 100644 (file)
--- a/app/views/browse/_way_details.html.erb
+++ b/app/views/browse/_way_details.html.erb
@@ -1,35 +1,33 @@
-<div class='browse_details' id="<%= way_details.version %>">
-<% if way_details.redacted? %>
-  <div class='browse-section'>
-    <%= 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 %>
-  </div>
-<% else %>
-  <%= render :partial => "common_details", :object => way_details %>
+<div class='browse-section'>
+  <% if way_details.redacted? %>
+    <%= t 'browse.redacted.message_html',
+          :type => t('browse.redacted.type.way'),
+          :version => way_details.version,
+          :redaction_link => link_to(t('browse.redacted.redaction',
+                                       :id => way_details.redaction.id), way_details.redaction) %>
+  <% else %>
+    <%= render :partial => "common_details", :object => way_details %>

 
 

-  <% unless way_details.way_nodes.empty? %>
-    <div class='browse-section'>
+    <% unless way_details.way_nodes.empty? %>

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

-        <ul>
-          <% way_details.way_nodes.each do |wn| %>
-            <li>
-              <%= 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 %>
-            </li>
-          <% end %>
-        </ul>
-    </div>
-  <% end %>
+      <ul>
+        <% way_details.way_nodes.each do |wn| %>
+          <li>
+            <%= 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 %>
+          </li>
+        <% end %>
+      </ul>
+    <% end %>

 
 

-  <% unless way_details.containing_relation_members.empty? %>
-    <div class='browse-section'>
+    <% unless way_details.containing_relation_members.empty? %>

       <h4><%= t'browse.way_details.part_of' %></h4>
       <ul>
       <h4><%= t'browse.way_details.part_of' %></h4>
       <ul>

-          <%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %>
+        <%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %>

       </ul>
       </ul>

-    </div>
+    <% end %>

   <% end %>
   <% end %>

-<% end %>

 </div>
 </div>

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 696a8ca8964540055a585d782cb304ef82ee83ca..eaa02af58ca534da94b3c737c67a93938fc89fbc 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -6,14 +6,12 @@
 </h2>
 
 <div class="browse-section">
 </h2>
 
 <div class="browse-section">

-  <p><%= @changeset.tags['comment'].to_s.presence || t('browse.changeset_details.no_comment') %></p>
-  <h4><%= changeset_details(@changeset) %></h4>
-</div>
+  <h4><%= @changeset.tags['comment'].to_s.presence || t('browse.changeset_details.no_comment') %></h4>
+  <div class="details"><%= changeset_details(@changeset) %></div>

 
 

-<%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>
+  <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>

 
 

-<% unless @nodes.empty? %>
-  <div class='browse-section paginate'>
+  <% unless @nodes.empty? %>

     <h4>
       <%= type_and_paginated_count('node', @node_pages) %>
       <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
     <h4>
       <%= type_and_paginated_count('node', @node_pages) %>
       <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>


@@ -23,11 +21,9 @@
         <li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
       <% end %>
     </ul>
         <li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
       <% end %>
     </ul>

-  </div>
-<% end %>
+  <% end %>

 
 

-<% unless @ways.empty? %>
-  <div class='browse-section  paginate'>
+  <% unless @ways.empty? %>

     <h4>
       <%= type_and_paginated_count('way', @way_pages) %>
       <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
     <h4>
       <%= type_and_paginated_count('way', @way_pages) %>
       <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>


@@ -37,11 +33,9 @@
         <li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
       <% end %>
     </ul>
         <li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
       <% end %>
     </ul>

-  </div>
-<% end %>
+  <% end %>

 
 

-<% unless @relations.empty? %>
-  <div class='browse-section  paginate'>
+  <% unless @relations.empty? %>

     <h4>
       <%= type_and_paginated_count('relation', @relation_pages) %>
       <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
     <h4>
       <%= type_and_paginated_count('relation', @relation_pages) %>
       <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>


@@ -51,11 +45,11 @@
         <li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
       <% end %>
     </ul>
         <li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
       <% end %>
     </ul>

-  </div>
-<% end %>
+  <% end %>
+</div>

 
 

-<div class='browse-section secondary-actions'> 
-  <h4><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
+<div class='secondary-actions'>
+  <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>

   &middot;
   &middot;

-  <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></h4>
+  <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>

 </div>
 </div>

diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb
index ae8262867bfb695b158558855c00ab8299a97cfc..1b01e4375b3bc97390c66f3f70554b83b4b0d9df 100644 (file)
--- a/app/views/browse/new_note.html.erb
+++ b/app/views/browse/new_note.html.erb
@@ -6,7 +6,7 @@
 </h2>
 
 <div class="note browse-section">
 </h2>
 
 <div class="note browse-section">

-  <h4><%= t('javascripts.notes.new.intro') %></h4>
+  <p class="warning"><%= t('javascripts.notes.new.intro') %></p>

   <form action="#">
     <input type="hidden" name="lon">
     <input type="hidden" name="lat">
   <form action="#">
     <input type="hidden" name="lon">
     <input type="hidden" name="lat">

diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb
index 8847adb19bf0ec133e71431c2d974549ed62a5fa..b5f65339d0cab5dd0c60a4df8eb4944950ff6531 100644 (file)
--- a/app/views/browse/node.html.erb
+++ b/app/views/browse/node.html.erb
@@ -1,18 +1,17 @@
 <%
 <%

-@name = printable_name @node
-set_title(t('browse.node.node') + ' | ' + @name)
+ @name = printable_name @node
+  set_title(t('browse.node.node') + ' | ' + @name)

 %>
 
 <h2>
 %>
 
 <h2>

-    <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-    <%= t'browse.node.node_title', :node_name => @name %>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t'browse.node.node_title', :node_name => @name %>

 </h2>
 
 <%= render :partial => "node_details", :object => @node %>
 
 </h2>
 
 <%= render :partial => "node_details", :object => @node %>
 

-<div class='browse-section secondary-actions clearfix'> 
-  <h4><%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %>
-    &middot;
+<div class='secondary-actions'>
+  <%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %>
+  &middot;

   <%= link_to(t('browse.node.view_history'), :action => "node_history") %>
   <%= link_to(t('browse.node.view_history'), :action => "node_history") %>

-    </h4>

 </div>
 </div>

diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb
index c476b23babdab06aecd69e220012c7cbc377fd45..ed75695610e810b9bff1ce37941fccf48e5a404e 100644 (file)
--- a/app/views/browse/node_history.html.erb
+++ b/app/views/browse/node_history.html.erb
@@ -1,19 +1,19 @@
 <%
 <%

-@name = printable_name @node
-set_title(t('browse.node_history.node_history') + ' | ' + @name)
+  @name = printable_name @node
+  set_title(t('browse.node_history.node_history') + ' | ' + @name)

 %>
 
 <h2>
 %>
 
 <h2>

-    <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-    <%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %>

 </h2>
 
 <% @node.old_nodes.reverse.each do |node| %>
   <%= render :partial => "node_details", :object => node %>
 <% end %>
 
 </h2>
 
 <% @node.old_nodes.reverse.each do |node| %>
   <%= render :partial => "node_details", :object => node %>
 <% end %>
 

-<div class='browse-section secondary-actions clearfix'> 
-  <span><%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %>
-    &middot;
-  <%= link_to(t('browse.node_history.view_details'), :action => "node") %></span>
+<div class='secondary-actions'>
+  <%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %>
+  &middot;
+  <%= link_to(t('browse.node_history.view_details'), :action => "node") %>

 </div>
 </div>

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 12842f87c57dde0eec9ddd992ce5df17af7b8baa..7f863fef4fd66e14c6a6bbc5eb2e05243ff8cbad 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -4,63 +4,50 @@
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
 </h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
 </h2>

+

 <div class="browse-section">
 <div class="browse-section">

-  <h4>
+  <h4><%= h(@note.comments.first.body.to_html) %></h4>
+  <div class="details">

     <%= note_event('open', @note.created_at, @note.author) %>
     <% if @note.status == "closed" %>
       <br/>
       <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %>
     <% end %>
     <%= note_event('open', @note.created_at, @note.author) %>
     <% if @note.status == "closed" %>
       <br/>
       <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %>
     <% end %>

-  </h4>
-</div>
-
-<% if @note.comments.find { |comment| comment.author.nil? } -%>
-<div class='browse-section common'>
-  <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
-</div>
-<% end -%>
-
-<div class='browse-section common'>
-  <div class='browse-field' id="c<%= @note.comments.first.id %>">
-    <h4><%= t "browse.note.description" %></h4>
-    <%= h(@note.comments.first.body.to_html) %>

   </div>
 
   </div>
 

-  <div class='browse-field'>
-    <h4><%= t "browse.node_details.coordinates" %></h4>
-    <p class='geo'><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>".html_safe), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></p>
-  </div>
-</div>
+  <% if @note.comments.find { |comment| comment.author.nil? } -%>
+    <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
+  <% end -%>

 
 

-<% if @note.comments.length > 1 %>
-  <div class='browse-section clearfix note-comments'>
-    <ul>
-      <% @note.comments[1..-1].each do |comment| %>
-        <li id="c<%= comment.id %>">
-          <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
-          <%= comment.body.to_html %>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>
-<div class="browse-section">
-  <% if @note.status == "open" %>
-  <form action="#">
-    <textarea class="comment" name="text" cols="40" rows="5"></textarea>
-    <div class="buttons clearfix">
-      <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
-      <input type="submit" name="close" value="<%= t('javascripts.notes.show.resolve') %>" class="hide_unless_logged_in" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, 'json') %>">
-      <input type="submit" name="comment" value="<%= t('javascripts.notes.show.comment') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, 'json') %>" disabled="1">
+  <% if @note.comments.length > 1 %>
+    <div class='note-comments'>
+      <ul>
+        <% @note.comments[1..-1].each do |comment| %>
+          <li id="c<%= comment.id %>">
+            <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>
+            <%= comment.body.to_html %>
+          </li>
+        <% end %>
+      </ul>

     </div>
     </div>

-  </form>
+  <% end %>
+
+  <% if @note.status == "open" %>
+    <form action="#">
+      <textarea class="comment" name="text" cols="40" rows="5"></textarea>
+      <div class="buttons clearfix">
+        <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
+        <input type="submit" name="close" value="<%= t('javascripts.notes.show.resolve') %>" class="hide_unless_logged_in" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, 'json') %>">
+        <input type="submit" name="comment" value="<%= t('javascripts.notes.show.comment') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, 'json') %>" disabled="1">
+      </div>
+    </form>

   <% else %>
   <% else %>

-  <form action="#">
-    <input type="hidden" name="text" value="">
-    <div class="buttons clearfix">
-      <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
-      <input type="submit" name="reopen" value="<%= t('javascripts.notes.show.reactivate') %>" class="hide_unless_logged_in" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, 'json') %>">
-    </div>
-  </form>
+    <form action="#">
+      <input type="hidden" name="text" value="">
+      <div class="buttons clearfix">
+        <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
+        <input type="submit" name="reopen" value="<%= t('javascripts.notes.show.reactivate') %>" class="hide_unless_logged_in" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, 'json') %>">
+      </div>
+    </form>

   <% end %>
 </div>
   <% end %>
 </div>

diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb
index 44baa48deb21b22886878ea9b671034432c7e582..2587fe01b615aa4a29bfe15dc9d15318e4fb15c6 100644 (file)
--- a/app/views/browse/relation.html.erb
+++ b/app/views/browse/relation.html.erb
@@ -1,16 +1,17 @@
 <%
 <%

-@name = printable_name @relation
-set_title(t('browse.relation.relation') + ' | ' + @name)
+  @name = printable_name @relation
+  set_title(t('browse.relation.relation') + ' | ' + @name)

 %>
 
 <h2>
 %>
 
 <h2>

-    <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-    <%= t'browse.relation.relation_title', :relation_name => @name %>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t'browse.relation.relation_title', :relation_name => @name %>

 </h2>
 
 <%= render :partial => "relation_details", :object => @relation %>
 
 </h2>
 
 <%= render :partial => "relation_details", :object => @relation %>
 

-<div class='secondary-actions clearfix'>
-  <span><%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %>
-  <%= link_to(t('browse.relation.view_history'), :action => "relation_history") %></span>
+<div class='secondary-actions'>
+  <%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %>
+  &middot;
+  <%= link_to(t('browse.relation.view_history'), :action => "relation_history") %>

 </div>
 </div>

diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb
index 144c7d47652292a8108517b89546ff364a24bdea..6481d490a1e27bd9cff709fadee3e3ba1c8d261e 100644 (file)
--- a/app/views/browse/relation_history.html.erb
+++ b/app/views/browse/relation_history.html.erb
@@ -1,18 +1,19 @@
 <%
 <%

-@name = printable_name @relation
-set_title(t('browse.relation_history.relation_history') + ' | ' + @name)
+  @name = printable_name @relation
+  set_title(t('browse.relation_history.relation_history') + ' | ' + @name)

 %>
 
 <h2>
 %>
 
 <h2>

-    <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-    <%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %>

 </h2>
 
 <% @relation.old_relations.reverse.each do |relation| %>
   <%= render :partial => "relation_details", :object => relation %>
 <% end %>
 
 </h2>
 
 <% @relation.old_relations.reverse.each do |relation| %>
   <%= render :partial => "relation_details", :object => relation %>
 <% end %>
 

-<div class='secondary-actions clearfix'>
-  <span><%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %>
-  <%= link_to(t('browse.relation_history.view_details'), :action => "relation") %></span>
+<div class='secondary-actions'>
+  <%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %>
+  &middot;
+  <%= link_to(t('browse.relation_history.view_details'), :action => "relation") %>

 </div>
 </div>

diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb
index 619b9314b5e13f55236eb7912fa5223d27abdd57..bd7b4d07acc27187c6b9b3a4e3678602d1c1c9ad 100644 (file)
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -1,17 +1,17 @@
 <%
 <%

-@name = printable_name @way
-set_title(t('browse.way.way') + ' | ' + @name)
+ @name = printable_name @way
+  set_title(t('browse.way.way') + ' | ' + @name)

 %>
 %>

+

 <h2>
 <h2>

-    <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-    <%= t'browse.way.way_title', :way_name => @name %>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t'browse.way.way_title', :way_name => @name %>

 </h2>
 
 <%= render :partial => "way_details", :object => @way %>
 
 </h2>
 
 <%= render :partial => "way_details", :object => @way %>
 

-<div class='browse-section secondary-actions clearfix'> 
-  <h4><%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
-    &middot;
-    <%= link_to(t('browse.way.view_history'), :action => "way_history") %>
-    </h4>
+<div class='secondary-actions'>
+  <%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
+  &middot;
+  <%= link_to(t('browse.way.view_history'), :action => "way_history") %>

 </div>
 </div>

diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb
index 6e234454d8638a6d09338c375ab4bb2d17f8f41e..307608e460ee381add0659c1cf384bc3d01848ef 100644 (file)
--- a/app/views/browse/way_history.html.erb
+++ b/app/views/browse/way_history.html.erb
@@ -1,19 +1,19 @@
 <%
 <%

-@name = printable_name @way
-set_title(t('browse.way_history.way_history') + ' | ' + @name)
+  @name = printable_name @way
+  set_title(t('browse.way_history.way_history') + ' | ' + @name)

 %>
 
 <h2>
 %>
 
 <h2>

-    <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-    <%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %>

 </h2>
 
 <% @way.old_ways.reverse.each do |way| %>
   <%= render :partial => "way_details", :object => way %>
 <% end %>
 
 </h2>
 
 <% @way.old_ways.reverse.each do |way| %>
   <%= render :partial => "way_details", :object => way %>
 <% end %>
 

-<div class='secondary-actions clearfix'>
-  <span><%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %>
-    &middot;
-  <%= link_to(t('browse.way_history.view_details'), :action => "way") %></span>
+<div class='secondary-actions'>
+  <%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %>
+  &middot;
+  <%= link_to(t('browse.way_history.view_details'), :action => "way") %>

 </div>
 </div>

diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index 3f2cb319bf4de9b532367a9370c343918bbfaf5c..52bc3be0d95930a0d363093de3df7590777ffe97 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -13,14 +13,14 @@
 %>
 
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
 %>
 
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>

-  <p class="comment">
-      <a class="changeset_id" href="<%= changeset_path(changeset.id) %>">
-        <% if changeset.tags['comment'].to_s != '' %>
-          <%= linkify(h(changeset.tags['comment'])) %>
-        <% else %>
-          <%= t 'changeset.changeset.no_comment' %>
-        <% end %>
-      </a>
-  </p>
-  <h4><%= changeset_details(changeset) %></h4>
+  <h4>
+    <a class="changeset_id" href="<%= changeset_path(changeset.id) %>">
+      <% if changeset.tags['comment'].to_s != '' %>
+        <%= linkify(h(changeset.tags['comment'])) %>
+      <% else %>
+        <%= t 'changeset.changeset.no_comment' %>
+      <% end %>
+    </a>
+  </h4>
+  <div class="details"><%= changeset_details(changeset) %></div>

 <% end %>
 <% end %>

diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb
index b6200a8ba9edd69cc309d17615cfbadbc8f0680f..b0ccf67dc7f271aa5e853536c75cc39ccc4ac42f 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -7,7 +7,7 @@
     <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>
   </div>
 <% elsif params[:max_id] %>
     <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>
   </div>
 <% elsif params[:max_id] %>

-  <h4 class="inner22"><%= t('changeset.list.no_more') %></h4>
+  <div class="inner22"><%= t('changeset.list.no_more') %></div>

 <% else %>
 <% else %>

-  <h4 class="inner22"><%= t('changeset.list.empty') %></h4>
+  <div class="inner22"><%= t('changeset.list.empty') %></div>

 <% end %>
 <% end %>

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 168f7d4396a8799d24994dbadc04bf74eef5d872..475313399507fc4caa67bd6865b95afcf55a7b94 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -1,48 +1,46 @@
 <% set_title(t('export.title')) %>
 <% set_title(t('export.title')) %>

+

 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <%= t 'export.start_rjs.export' %>
 </h2>
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <%= t 'export.start_rjs.export' %>
 </h2>
 

-<%= form_tag :controller => "export", :action => "finish" do %>
+<%= form_tag({:controller => "export", :action => "finish"}, :class => "export_form") do %>

   <%= hidden_field_tag 'format', 'osm' %>
 
   <%= hidden_field_tag 'format', 'osm' %>
 

-  <div class="export_bounds inner22">
-    <div class='export_area_inputs'>
-      <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
-      <br/>
-      <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %>
-      <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %>
-      <br/>
-      <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
-    </div>
-    <a id="drag_box" class='export_hint' href="#"><%= t'export.start.manually_select' %></a>
+  <div class='export_area_inputs'>
+    <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>
+    <br/>
+    <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %>
+    <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %>
+    <br/>
+    <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
+    <br/>
+    <a id='drag_box' href="#"><%= t'export.start.manually_select' %></a>

   </div>
 
   </div>
 

-  <div id="export_osm">
-    <h4><span class="small-title"><%= t'export.start.licence' %></span><%= raw t'export.start.export_details' %></h4>
+  <h4><%= t'export.start.licence' %></h4>
+  <p><%= raw t 'export.start.export_details' %></p>

 
 

-    <div id="export_osm_too_large">
-      <div class="export_details">
-        <h4><span class="small-title red"><%= t'export.start.too_large.heading' %></span><%= t'export.start.too_large.body' %></h4>
-        <dl class="inner12">
-          <dt><a href="http://planet.openstreetmap.org/"><%= t'export.start.too_large.planet.title' %></a></dt>
-          <dd><%= t'export.start.too_large.planet.description' %></dd>
+  <div id="export_osm_too_large">
+    <h4><%= t'export.start.too_large.heading' %></h4>
+    <p><%= t'export.start.too_large.body' %></p>
+    <dl class="inner12">
+      <dt><a href="http://planet.openstreetmap.org/"><%= t'export.start.too_large.planet.title' %></a></dt>
+      <dd><%= t'export.start.too_large.planet.description' %></dd>

 
 

-          <dt><a href="http://download.geofabrik.de/"><%= t'export.start.too_large.geofabrik.title' %></a></dt>
-          <dd><%= t'export.start.too_large.geofabrik.description' %></dd>
+      <dt><a href="http://download.geofabrik.de/"><%= t'export.start.too_large.geofabrik.title' %></a></dt>
+      <dd><%= t'export.start.too_large.geofabrik.description' %></dd>

 
 

-          <dt><a href="http://metro.teczno.com/"><%= t'export.start.too_large.metro.title' %></a></dt>
-          <dd><%= t'export.start.too_large.metro.description' %></dd>
+      <dt><a href="http://metro.teczno.com/"><%= t'export.start.too_large.metro.title' %></a></dt>
+      <dd><%= t'export.start.too_large.metro.description' %></dd>

 
 

-          <dt><a href="http://wiki.openstreetmap.org/wiki/Download"><%= t'export.start.too_large.other.title' %></a></dt>
-          <dd><%= t'export.start.too_large.other.description' %></dd>
-        </dl>
-      </div>
-    </div>
+      <dt><a href="http://wiki.openstreetmap.org/wiki/Download"><%= t'export.start.too_large.other.title' %></a></dt>
+      <dd><%= t'export.start.too_large.other.description' %></dd>
+    </dl>

   </div>
 
   </div>
 

-  <div class="export_button inner12">
+  <div class="export_button">

     <%= submit_tag t('export.start.export_button'), :id => "export_commit" %>
   </div>
 <% end %>
     <%= submit_tag t('export.start.export_button'), :id => "export_commit" %>
   </div>
 <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index db6614cb0d39611db3d363e4927b418c661b0418..1e3da2ad78a452fb75fed8fd933e3f120bf0c370 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -166,7 +166,7 @@ en:
         note: "Edit note"
     node_details:
       coordinates: "Coordinates:"
         note: "Edit note"
     node_details:
       coordinates: "Coordinates:"

-      part_of: "Part of:"
+      part_of: "Part of"

     node_history:
       node_history: "Node History"
       node_history_title: "Node History: %{node_name}"
     node_history:
       node_history: "Node History"
       node_history_title: "Node History: %{node_name}"


@@ -200,8 +200,8 @@ en:
         way: "way"
         relation: "relation"
     relation_details:
         way: "way"
         relation: "relation"
     relation_details:

-      members: "Members:"
-      part_of: "Part of:"
+      members: "Members"
+      part_of: "Part of"

     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: %{relation_name}"
     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: %{relation_name}"


@@ -264,8 +264,8 @@ en:
         tag: "The wiki description page for the %{key}=%{value} tag"
       wikipedia_link: "The %{page} article on Wikipedia"
     way_details:
         tag: "The wiki description page for the %{key}=%{value} tag"
       wikipedia_link: "The %{page} article on Wikipedia"
     way_details:

-      nodes: "Nodes:"
-      part_of: "Part of:"
+      nodes: "Nodes"
+      part_of: "Part of"

       also_part_of:
         one: "part of way %{related_ways}"
         other: "part of ways %{related_ways}"
       also_part_of:
         one: "part of way %{related_ways}"
         other: "part of ways %{related_ways}"