From 5fe3eb8f00a036d1829202bcb3627762d5e775aa Mon Sep 17 00:00:00 2001
From: Connor Turland <connor@madhattertech.ca>
Date: Sun, 2 Mar 2014 16:36:18 -0800
Subject: [PATCH] fixed capitalization issues. tidied up topic pages. added
 center this topic icon

---
 app/assets/images/MMCCicon_center.png            | Bin 0 -> 656 bytes
 .../Jit/graphsettings-event-handlers.js          |  15 ++++++++++-----
 app/assets/javascripts/Jit/graphsettings.js      |   2 +-
 app/assets/javascripts/Jit/jit2.0.0.js           |   2 +-
 app/assets/stylesheets/application.css           |   3 +++
 app/views/topics/show.html.erb                   |   4 +++-
 6 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 app/assets/images/MMCCicon_center.png

diff --git a/app/assets/images/MMCCicon_center.png b/app/assets/images/MMCCicon_center.png
new file mode 100644
index 0000000000000000000000000000000000000000..c009d99dde16b714c4186343971f087412eb909e
GIT binary patch
literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?0v$<2
zK~#9!>{^R$gfI*}x<DBrBQOFZFajfF1V+dRjBwrHZUedjBZLWPBIR0y5`Rbnr6rQ3
z({XnE9NV$Y74tmb&b;1kCtq0r6h(12G_R=7vR4ilvI_gYH+vPA3ta$U*C`E2;JGv;
zk|MA%5JP5_hOE+q6-T7O@s!c~M=IVK(hS9Y)WrbVs(fQ;j8uF{)(G`30L)Se6<?Fg
z3c##Bqw+86vj8AkUOSN1#i|8wWvF$}bjp+9_&laKDHs{SUnc?JHq=N;6dPhmAgNcA
z3=-)&eS$j#0?|bQa2o_IAA1QAK%l39l@e{>`^m*cib_B`S(E4SJD>wzN&uGW2&Khi
zVMY77MfU2poHQ0>tYdZQazFyU+>k89766hHxP*X2Eec$eEegP_JMpG$n1IO&Ie%x}
z)=OsU=7Je7K6(HyNRsj5`R<8BeJr)FrShke^Wy)1EhW$relo;71F|b3|KtPkBr=CK
zxibKSek+K|*XTtCWEBOZ(J@mRl}Rr$fTu!049h+t>qX{-j%<tk)ceCqaj;)VUP>TB
zNwqq&H_%(UGm79}T~5a~@+le`NWR*ur7VAKOUY>JW#WlmbJSQxIl$%0+Kqcg8LOyk
zuyxRAvD<UFt8ZzCyUh{f^%O3pb|0^M(xGCG+eep)#9=QufMO0h6&Wh#w$k;Q^{>8W
qoz4!R_JH^}&0h_!H}#D5CBOh(evuV`=h=k-0000<MNUMnLSTYzN)?6x

literal 0
HcmV?d00001

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 = '<ul>';
     
     if (userid != null) menustring += '<li class="rc-delete">Delete</li>';
-    if (mapid && userid != null) menustring += '<li class="rc-remove">Remove from Map</li>';
+    if (mapid && userid != null) menustring += '<li class="rc-remove">Remove from map</li>';
     menustring += '<li class="rc-hide">Hide until refresh</li>';
     if (userid) {
       var options = '<ul><li class="changeP toCommons">commons</li> \
@@ -252,11 +257,11 @@ function selectNodeOnClickHandler(node, e) {
     var menustring = '<ul>';
     
     if (userid != null) menustring += '<li class="rc-delete">Delete</li>';
-    if (mapid && userid != null) menustring += '<li class="rc-remove">Remove from Map</li>';
+    if (mapid && userid != null) menustring += '<li class="rc-remove">Remove from map</li>';
     menustring += '<li class="rc-hide">Hide until refresh</li>';
     
-    if (!mapid) menustring += '<li class="rc-center">Center This Topic</li>';
-    menustring += '<li class="rc-popout">Open In New Tab</li>';
+    if (!mapid) menustring += '<li class="rc-center">Center this topic</li>';
+    menustring += '<li class="rc-popout">Open in new tab</li>';
     if (userid) {
       var options = '<ul><li class="changeP toCommons">commons</li> \
                          <li class="changeP toPublic">public</li> \
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? %>
 <div class="sidebarFork">
-  <div class="sidebarForkIcon"></div>
+  <div class="sidebarForkIcon hoverForTip">
+    <div class="tip">Save As New Map</div>
+  </div>
   <div class="sidebarForkBox"></div>
 </div>
 <% end %>