diff --git a/app/assets/images/topright_sprite.png b/app/assets/images/topright_sprite.png
old mode 100755
new mode 100644
index 938c6a0b..36feb895
Binary files a/app/assets/images/topright_sprite.png and b/app/assets/images/topright_sprite.png differ
diff --git a/app/assets/javascripts/src/Metamaps.JIT.js b/app/assets/javascripts/src/Metamaps.JIT.js
index 07a17149..89e6c5e5 100644
--- a/app/assets/javascripts/src/Metamaps.JIT.js
+++ b/app/assets/javascripts/src/Metamaps.JIT.js
@@ -1244,9 +1244,10 @@ Metamaps.JIT = {
// add the proper options to the menu
var menustring = '
';
- if (Metamaps.Active.Mapper) menustring += '- Delete
';
- if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '- Remove from map
';
menustring += '- Hide until refresh
';
+ if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '- Remove from map
';
+ if (Metamaps.Active.Mapper) menustring += '- Delete
';
+
if (!Metamaps.Active.Map) menustring += '- Center this topic
';
menustring += '- Open in new tab
';
@@ -1418,11 +1419,11 @@ Metamaps.JIT = {
// add the proper options to the menu
var menustring = '';
- if (Metamaps.Active.Mapper) menustring += '- Delete
';
+ menustring += '- Hide until refresh
';
if (Metamaps.Active.Map && Metamaps.Active.Map.authorizeToEdit(Metamaps.Active.Mapper)) {
menustring += '- Remove from map
';
}
- menustring += '- Hide until refresh
';
+ if (Metamaps.Active.Mapper) menustring += '- Delete
';
if (Metamaps.Active.Mapper) {
var permOptions = '- commons
\
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index eee316c2..864fc2fc 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1183,15 +1183,16 @@ h3.realtimeBoxTitle {
width: 24px;
height: 24px;
}
-.rightclickmenu .rc-delete .rc-icon {
- background-position: 0 -48px;
+.rightclickmenu .rc-hide .rc-icon {
+ background-position: 0 0;
}
.rightclickmenu .rc-remove .rc-icon {
background-position: 0 -24px;
}
-.rightclickmenu .rc-hide .rc-icon {
- background-position: 0 0;
+.rightclickmenu .rc-delete .rc-icon {
+ background-position: 0 -48px;
}
+
.rightclickmenu .rc-center .rc-icon {
}
@@ -2737,4 +2738,4 @@ and it won't be important on password protected instances */
script.data-gratipay-username {
display: inline;
float: left;
-}
+}
diff --git a/app/views/layouts/_googleanalytics.html.erb b/app/views/layouts/_googleanalytics.html.erb
index 484aa762..a8ce6c71 100644
--- a/app/views/layouts/_googleanalytics.html.erb
+++ b/app/views/layouts/_googleanalytics.html.erb
@@ -11,7 +11,7 @@
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + 'stats.g.doubleclick.net/dc.js';
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl.' : 'http://') + 'stats.g.doubleclick.net/dc.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e49555fa..8b8b6611 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -16,12 +16,13 @@
<%= javascript_include_tag "application" %>
-
-
-
-
-
-
+ <% if Rails.env.production? %>
+
+
+ <% elsif Rails.env.development? %>
+
+
+ <% end %>