diff --git a/app/assets/images/MMCCicon_center.png b/app/assets/images/MMCCicon_center.png
new file mode 100644
index 00000000..c009d99d
Binary files /dev/null and b/app/assets/images/MMCCicon_center.png differ
diff --git a/app/assets/javascripts/Jit/graphsettings-event-handlers.js b/app/assets/javascripts/Jit/graphsettings-event-handlers.js
index e9d573e5..8fb448b8 100644
--- a/app/assets/javascripts/Jit/graphsettings-event-handlers.js
+++ b/app/assets/javascripts/Jit/graphsettings-event-handlers.js
@@ -1,12 +1,17 @@
function selectEdgeOnClickHandler(adj, e) {
if (Mconsole.busy) return;
+ // catch right click on mac, which is often like ctrl+click
+ if (navigator.platform.indexOf("Mac")!=-1 && e.ctrlKey) {
+ selectEdgeOnRightClickHandler(adj, e)
+ return;
+ }
+
if (synapseWasDoubleClicked()) {
synapseDoubleClickHandler(adj, e);
return;
}
-
var edgeIsSelected = MetamapsModel.selectedEdges.indexOf(adj);
if (edgeIsSelected == -1) edgeIsSelected = false;
else if (edgeIsSelected != -1) edgeIsSelected = true;
@@ -50,7 +55,7 @@ function selectEdgeOnRightClickHandler(adj, e) {
var menustring = '
';
if (userid != null) menustring += '- Delete
';
- if (mapid && userid != null) menustring += '- Remove from Map
';
+ if (mapid && userid != null) menustring += '- Remove from map
';
menustring += '- Hide until refresh
';
if (userid) {
var options = '- commons
\
@@ -252,11 +257,11 @@ function selectNodeOnClickHandler(node, e) {
var menustring = '';
if (userid != null) menustring += '- Delete
';
- if (mapid && userid != null) menustring += '- Remove from Map
';
+ if (mapid && userid != null) menustring += '- Remove from map
';
menustring += '- Hide until refresh
';
- if (!mapid) menustring += '- Center This Topic
';
- menustring += '- Open In New Tab
';
+ if (!mapid) menustring += '- Center this topic
';
+ menustring += '- Open in new tab
';
if (userid) {
var options = '- commons
\
- public
\
diff --git a/app/assets/javascripts/Jit/graphsettings.js b/app/assets/javascripts/Jit/graphsettings.js
index cb85f52f..c20666ca 100644
--- a/app/assets/javascripts/Jit/graphsettings.js
+++ b/app/assets/javascripts/Jit/graphsettings.js
@@ -167,7 +167,7 @@ function graphSettings(type, embed) {
lineWidth: 1.5
}
};
- t.levelDistance = 400;
+ t.levelDistance = 280;
t.Events.enableForEdges = true;
t.Events.onDragEnd = function(node, eventInfo, e) {
//different because we can't go realtime
diff --git a/app/assets/javascripts/Jit/jit2.0.0.js b/app/assets/javascripts/Jit/jit2.0.0.js
index 771c5489..0a1d2e3b 100644
--- a/app/assets/javascripts/Jit/jit2.0.0.js
+++ b/app/assets/javascripts/Jit/jit2.0.0.js
@@ -3156,7 +3156,7 @@ var Canvas;
this.viz = viz;
this.config = $.merge({
idSuffix: '-bkcanvas',
- levelDistance: 400,
+ levelDistance: 280,
numberOfCircles: 4,
CanvasStyles: {},
offset: 0
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index b1a773b4..d86f7da5 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1326,6 +1326,9 @@ background-position: 5px 2px;
.rightclickmenu .rc-hide {
background-image: url(MMCCicon_hide.png);
}
+.rightclickmenu .rc-center {
+ background-image: url(MMCCicon_center.png);
+}
.rightclickmenu .rc-popout {
background-image: url(MMCCicon_pop-out_black.png);
}
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index d8795c82..f44bc1ac 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -18,7 +18,9 @@
<% if authenticated? %>
<% end %>