Fix some issues with the new edit menu code

Make sure that the arrow icons are always displayed, and that menus
are aligned in the requested way.

diff --git a/app/assets/javascripts/menu.js b/app/assets/javascripts/menu.js
index 5e2d9d97a59f10703917097ccbbaa43adabd6984..595b153986f3e102424bccec97db812eb7bde3a3 100644 (file)
--- a/app/assets/javascripts/menu.js
+++ b/app/assets/javascripts/menu.js
@@ -23,25 +23,25 @@ function openMenu(anchor, menu, align) {
  * Setup a menu, triggered by hovering over an anchor for a given time.
  */
 function createMenu(anchorid, menuid, align) {
-  var $anchor = $("#" + anchorid),
-      $arrow = $("#" + anchorid + ' .arrow'),
-      $menu = $("#" + menuid),
-      $page = $(':not(#' + menuid + ', #' + anchorid + ')');
+  var $anchor = $("#" + anchorid);
+  var $arrow = $("#" + anchorid + " .menuicon");
+  var $menu = $("#" + menuid);
+  var $page = $(":not(#" + menuid + ", #" + anchorid + ")");
 
   function hide() {
     $menu.hide();
-    $page.unbind('click', hide);
+    $page.off("click", hide);
   }
 
   $arrow.click(function(e) {
-      e.stopPropagation();
-      e.preventDefault();
-      if ($menu.is(':visible')) {
-          $menu.hide();
-          $page.unbind('click', hide);
-      } else {
-          openMenu($anchor, $menu.show(), 'left');
-          $page.bind('click', hide);
-      }
+    e.stopPropagation();
+    e.preventDefault();
+    if ($menu.is(":visible")) {
+      $menu.hide();
+      $page.off("click", hide);
+    } else {
+      openMenu($anchor, $menu.show(), align);
+      $page.on("click", hide);
+    }
   });
 }

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 825d8719ed2741304bb9622c18b384b63a9e0fa6..294d648c2a6a7bd3f5e4c969b03f10f5c5f8a03e 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -366,7 +366,7 @@ h2 {
 
 /* Rules for edit menu */
 
-.arrow {
+.menuicon {
   padding: 5px;
 
   &:hover {
@@ -381,17 +381,17 @@ h2 {
   position: absolute;
   background-color: #ffffff;
   border: 1px solid #cccccc;
-  border-top: 0;
+  border-top: 0px;
 }
 
 .menu ul {
-  margin: 0;
-  padding: 0;
+  margin: 0px;
+  padding: 0px;
 }
 
 .menu li {
   padding: 2px 5px;
-  margin: 0;
+  margin: 0px;
   list-style-type: none;
   border-top: 1px solid #eee;
   white-space: nowrap;

diff --git a/app/assets/stylesheets/ltr.css.scss b/app/assets/stylesheets/ltr.css.scss
index 7e30d18ecfde91bff5bd9705df866218b6bad38e..84adc8e7296f1f497807fb868358b84ddc79bf78 100644 (file)
--- a/app/assets/stylesheets/ltr.css.scss
+++ b/app/assets/stylesheets/ltr.css.scss
@@ -80,7 +80,7 @@ html body {
 
 /* Rules for edit menu */
 
-.arrow {
+.menuicon {
   margin-left: 10px;
   border-left: 1px solid #eee;
 }

diff --git a/app/assets/stylesheets/rtl.css.scss b/app/assets/stylesheets/rtl.css.scss
index 9b3ebe288eb989bf1e05020af08fa4bc7375af3d..ae142f9ae0d0b8d8209305bb06b07f63645f23e9 100644 (file)
--- a/app/assets/stylesheets/rtl.css.scss
+++ b/app/assets/stylesheets/rtl.css.scss
@@ -80,7 +80,7 @@ html body {
 
 /* Rules for edit menu */
 
-.arrow {
+.menuicon {
   margin-right: 10px;
   border-right: 1px solid #eee;
 }

diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index 88619c8e56b5b50d54237658b9733e6c8c51812f..2c29a0d008999a2fc7491ef915a328b1602e9551 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -11,12 +11,12 @@
   <span id="loading"><%= t 'browse.map.loading' %></span>
   <%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :box => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %>
   <br />
-  <%= link_to(h(t("browse.map.edit.area")) + '<span class="arrow">&#x25be;</span>'.html_safe, { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %>
+  <%= link_to(h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %>
   <% unless map.instance_of? Changeset %>
     <br />
-    <%= link_to("", { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %>
+    <%= link_to(t("browse.map.larger." + map.class.to_s.downcase), { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %>
     <br />
-    <%= link_to(h("")  + '<span class="arrow">&#x25be;</span>'.html_safe, { :controller => :site, :action => :edit }, { :id => "object_edit", :class => "geolink object" }) %>
+    <%= link_to(h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "object_edit", :class => "geolink object" }) %>
   <% end %>
   <% else %>
     <%= t 'browse.map.deleted' %>
@@ -110,6 +110,9 @@
           url += "/" + previous_version;
         }
 
+        $("#object_larger_map").hide();
+        $("#object_edit").hide();
+
         addObjectToMap(url, true, function(extent) {
           $("#loading").hide();
           $("#browse_map .geolink").show();
@@ -129,7 +132,6 @@
             });
             <% end -%>
 
-            <% unless map.instance_of? Changeset -%>
             $("#remote_object_edit").click(function (event) {
               return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
             });
@@ -140,9 +142,8 @@
             });
             <% end -%>
 
-            $("#object_larger_map").html("<%=j t('browse.map.larger.' + map.class.to_s.downcase) %>");
-            $("#object_edit").html("<%=j t('browse.map.edit.' + map.class.to_s.downcase) %>");
-            <% end -%>
+            $("#object_larger_map").show();
+            $("#object_edit").show();
 
             updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>);
           } else {

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 67994bc06c7e9f39232b8775180f88b34b42779d..41af1d2b605648341490d42be8229d3a414edcff 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -37,7 +37,7 @@
         exportclass += ' active' if params['controller'] == 'site' and params['action'] == 'export'
         %>
         <li><%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %></li>
-        <li><%= link_to h(t('layouts.edit')) + '<span class="arrow">&#x25be;</span>'.html_safe, {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %></li>
+        <li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %></li>
         <li><%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %></li>
         <li><%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %></li>
       </ul>