Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop

app/assets/javascripts/src/Metamaps.js

@@ -1394,7 +1394,7 @@ Metamaps.SynapseCard = {
     },
     add_user_info: function (synapse) {
         var u = '<div id="edgeUser" class="hoverForTip">';
-        u += '<img src="" width="24" height="24" />'
+        u += '<a href="/explore/mapper/' + synapse.get("user_id") + '"> <img src="" width="24" height="24" /></a>'
         u += '<div class="tip">' + synapse.get("user_name") + '</div></div>';
         $('#editSynLowerBar').append(u);
 
@@ -2818,8 +2818,20 @@ Metamaps.Control = {
         }
 
         Metamaps.Control.deselectNode(node);
-        Metamaps.Visualize.mGraph.graph.removeNode(nodeid);
+
-        Metamaps.Visualize.mGraph.plot();
+        node.setData('alpha', 0, 'end');
+        node.eachAdjacency(function (adj) {
+            adj.setData('alpha', 0, 'end');
+        });
+        Metamaps.Visualize.mGraph.fx.animate({
+            modes: ['node-property:alpha',
+            'edge-property:alpha'
+        ],
+            duration: 500
+        });
+        setTimeout(function () {
+            Metamaps.Visualize.mGraph.graph.removeNode(nodeid);
+        }, 500);
         Metamaps.Filter.checkMetacodes();
         Metamaps.Filter.checkMappers();
     },
@@ -2984,13 +2996,17 @@ Metamaps.Control = {
     hideEdge: function (edge) {
         var from = edge.nodeFrom.id;
         var to = edge.nodeTo.id;
+        edge.setData('alpha', 0, 'end');
         Metamaps.Control.deselectEdge(edge);
-        if (Metamaps.Visualize.mGraph.graph.getAdjacence(from, to)) {
+        Metamaps.Visualize.mGraph.fx.animate({
+            modes: ['edge-property:alpha'],
+            duration: 500
+        });
+        setTimeout(function () {
             Metamaps.Visualize.mGraph.graph.removeAdjacence(from, to);
-            Metamaps.Visualize.mGraph.plot();
+        }, 500);
-            Metamaps.Filter.checkSynapses();
+        Metamaps.Filter.checkSynapses();
-            Metamaps.Filter.checkMappers();
+        Metamaps.Filter.checkMappers();
-        }
     },
     updateSelectedPermissions: function (permission) {
 

app/assets/stylesheets/application.css

@@ -81,6 +81,8 @@ body {
     background: #d8d9da url(shattered_@2X.png);
     font-family: 'din-medium', helvetica, sans-serif;
     color: #424242;
+    -moz-osx-font-smoothing: grayscale;
+
 }
 h1,
 h2,
@@ -118,6 +120,7 @@ input[type="submit"] {
     border-radius: 2px;
     -webkit-user-select: none;
     font-family: 'din-medium', helvetica, sans-serif;
+    -webkit-font-smoothing: inherit;
 }
 button.button:hover,
 a.button:hover,

app/views/layouts/_templates.html.erb

@@ -234,7 +234,7 @@
                 <div class="metacodeSelect">{{{metacode_select}}}</div>
             </div>
             <div class="linkItem contributor">
-                <img src="/assets/user.png" class="contributorIcon" width="32" height="32" />
+                <a href="/explore/mapper/{{userid}}"><img src="/assets/user.png" class="contributorIcon" width="32" height="32" /></a>
                 <div class="contributorName">{{username}}</div>
             </div>
             <div class="linkItem mapCount">                  

test/fixtures/metacodes.yml

@@ -25,8 +25,8 @@ four:
   color: #ABB49F
 
 five: 
-  name: Evolution  
+  name: Process  
-  icon: /assets/icons/blueprint_96px/bp_evolution.png
+  icon: /assets/icons/blueprint_96px/bp_process.png
   color: #BDB25E
 
 six: 
@@ -125,8 +125,8 @@ twenty-four:
   color: #CF7C74
 
 twenty-five:
-  name: Concept  
+  name: Subject  
-  icon: /assets/icons/generics_96px/gen_concept.png
+  icon: /assets/icons/generics_96px/gen_subject.png
   color: #8293D8
 
 twenty-six:
@@ -155,8 +155,8 @@ thirty:
   color: #54A19D
 
 thirty-one:
-  name: Foresight  
+  name: Aim  
-  icon: /assets/icons/generics_96px/gen_foresight.png
+  icon: /assets/icons/generics_96px/gen_aim.png
   color: #B0B0B0
 
 thirty-two: