enabled filter by metacode. enabled navigation through topic pages using right click. styled topic card

app/assets/javascripts/Jit/analyze.js

@@ -1,51 +0,0 @@
-////
-////
-////
-//// Define all the dynamic interactions for the Analyze using Jquery
-
-$(document).ready(function() {
-   
-   // this sets up the initial opening of the organize box
-   $('#sideOptionAnalyze').bind('click',function(){
-	   if (!analyzeOpen) openAnalyze();  
-   });
-   
-   // this sets up the closing of the organize box, and the toggling between open and closed.
-   $('#closeAnalyze').bind('click',function(){
-	   if (analyzeOpen) closeAnalyze();
-   });
-});
-
-function openAnalyze() {
-  analyzeOpen = true;
-  if (findOpen) closeFind();
-  if (organizeOpen) closeOrganize();
-  $('#sideOptionFind').css('z-index','8');
-  $('#sideOptionAnalyze, #closeAnalyze').css('z-index','10');
-  $('#sideOptionOrganize').css('z-index','8');
-  $('#sideOptionAnalyze').animate({
-    width: '100px',
-    height: '76px'
-    }, 100);
-  $('#closeAnalyze').css('display','block');
-  $('#sideOptionAnalyze').css('cursor','default');
-  var numT = Object.keys(Mconsole.graph.nodes).length;
-  var numS = 0;
-  Mconsole.graph.eachNode(function (n) {
-		n.eachAdjacency(function () {
-		  numS++;
-		});
-  });
-  numS = numS/2;
-  $('.analysis').html('<p>' + numT + ' topics</p><p>' + numS + ' synapses</p>');
-}
-
-function closeAnalyze() {
-   analyzeOpen = false;
-   $('#closeAnalyze').css('display','none');
-   $('#sideOptionAnalyze').css('cursor','pointer');
-   $('#sideOptionAnalyze').animate({
-     width: '64px',
-     height: '32px'
-     }, 100);
-}

app/assets/javascripts/Jit/find.js

@@ -1,36 +1,4 @@
-// create filters for maps, and for card views
+// create filters for maps
-
-//  keep an array of which metacodes are currently visible.
-var categoryVisible = new Object();
-
-categoryVisible['Group'] = true; 
-categoryVisible['Person'] = true; 
-categoryVisible['Bizarre'] = true; 
-categoryVisible['Catalyst'] = true; 
-categoryVisible['Closed'] = true; 
-categoryVisible['Experience'] = true; 
-categoryVisible['Future Dev'] = true; 
-categoryVisible['Idea'] = true; 
-categoryVisible['Implication'] = true; 
-categoryVisible['Insight'] = true; 
-categoryVisible['Intention'] = true; 
-categoryVisible['Knowledge'] = true; 
-categoryVisible['Location'] = true; 
-categoryVisible['Open Issue'] = true; 
-categoryVisible['Opinion'] = true; 
-categoryVisible['Opportunity'] = true; 
-categoryVisible['Platform'] = true; 
-categoryVisible['Problem'] = true; 
-categoryVisible['Question'] = true; 
-categoryVisible['Reference'] = true; 
-categoryVisible['Requirement'] = true; 
-categoryVisible['Resource'] = true; 
-categoryVisible['Role'] = true; 
-categoryVisible['Task'] = true; 
-categoryVisible['Tool'] = true; 
-categoryVisible['Trajectory'] = true; 
-categoryVisible['Action'] = true; 
-categoryVisible['Activity'] = true; 
 
 function switchVisible(category, duration) {
 	if (categoryVisible[category] == true) {
@@ -75,22 +43,14 @@ function showCategory(category, duration) {
 	});	
 }
 
-// Define the Find/Filters possibilities
-var findTopics = ['name','metacode', 'mapper (by name)', 'map (by name)']
-var findSynapses = ['topics (by name)', 'directionality', 'mapper (by name)', 'map (by name)']
-var findMaps = ['name', 'topic (by name)', 'mapper (by name)', 'synapse (by topics)']
-var findMappers = ['name', 'topic (by name)', 'map (by name)', 'synapse (by topics)']
-
 // These functions toggle ALL nodes and synapses on the page
 function hideAll(duration) {
     if (duration == null) duration = 500;
 	Mconsole.graph.eachNode( function (n) {
-		  if (!(n.getData('greenCircle') || n.getData('whiteCircle'))) {
 		  n.setData('alpha', 0.4, 'end');
       n.eachAdjacency(function(adj) {  
-        adj.setData('alpha', 0.4, 'end');  
+        adj.setData('alpha', 0.2, 'end');  
       });        
-      }        
 	});
 	Mconsole.fx.animate({  
 		modes: ['node-property:alpha',  
@@ -103,7 +63,7 @@ function showAll(duration) {
 	Mconsole.graph.eachNode( function (n) {
 		  n.setData('alpha', 1, 'end');
 		  n.eachAdjacency(function(adj) {  
-		    adj.setData('alpha', 1, 'end');  
+		    adj.setData('alpha', 0.4, 'end');  
 		  });	
 	});
 	Mconsole.fx.animate({  
@@ -113,44 +73,58 @@ function showAll(duration) {
 	});	
 }
 
-/// Traverse the Graph and only show the searched for nodes
+function filterTopicsByMap(mapID) {
-function onCanvasSearch(searchQuery, mapID, mapperID) {
+  Mconsole.graph.eachNode(function (n) {
-  searchQuery = name.toLowerCase();
+    if (n.getData('inmaps').indexOf(parseInt(mapID)) !== -1) {
+      n.setData('alpha', 1, 'end');
+    }
+    else {
+      n.setData('alpha', 0.4, 'end');
+    }
+    Mconsole.fx.animate({  
+		  modes: ['node-property:alpha',  
+				'edge-property:alpha'],  
+		  duration: 500  
+	  });	
+  }); 
+} // filterTopicsByName
+
+function filterTopicsByMapper(mapperID) {
+  Mconsole.graph.eachNode(function (n) {
+    if (n.getData('userid').toString() == mapperID) {
+      n.setData('alpha', 1, 'end');
+    }
+    else {
+      n.setData('alpha', 0.4, 'end');
+    }
+    Mconsole.fx.animate({  
+		  modes: ['node-property:alpha',  
+				'edge-property:alpha'],  
+		  duration: 500  
+	  });	
+  }); 
+} // filterTopicsByName
+
+function filterTopicsByName(searchQuery) {
   Mconsole.graph.eachNode(function (n) {
     nodeName = n.name.toLowerCase();
-    if (name != null) {
     if (nodeName.indexOf(searchQuery) !== -1 && searchQuery != "") {
-        n.setData('whiteCircle', true);
+      n.setData('alpha', 1, 'end');
     }
     else {
-        n.setData('whiteCircle', false);
+      n.setData('alpha', 0.4, 'end');
     }
-    }
+    Mconsole.fx.animate({  
-    else if (mapID != null) {
+		  modes: ['node-property:alpha',  
-      if (n.getData('inmaps').indexOf(parseInt(mapID)) !== -1) {
+				'edge-property:alpha'],  
-        n.setData('whiteCircle', true);
+		  duration: 500  
-      }
-      else {
-        n.setData('whiteCircle', false);
-      }
-    }
-    else if (mapperID != null) {
-      if (n.getData('userid').toString() == mapperID) {
-        n.setData('whiteCircle', true);
-      }
-      else {
-        n.setData('whiteCircle', false);
-      }
-    }
-    Mconsole.plot();
 	  });	
-}//onCanvasSearch
+  }); 
+} // filterTopicsByName
 
 function clearCanvas() {
   Mconsole.graph.eachNode(function(n) {
     Mconsole.graph.removeNode(n.id);
-    Mconsole.labels.disposeLabel(n.id);
-    delete Mconsole.labels.labels["" + n.id]
   });
   Mconsole.plot();
 }
@@ -165,310 +139,34 @@ function clearCanvasExceptRoot() {
   ids.forEach(function(id, index) {
     if (id != root.id) {
       Mconsole.graph.removeNode(id);
-      //TODO is hideLabel correct? Maybe it is...
-      Mconsole.labels.hideLabel(id);
-      $('#topic_' + id + '_label').hide();
     }
   });
   fetchRelatives(root); //also runs Mconsole.plot()
 }
 
-function clearFoundData() {
-  Mconsole.graph.eachNode( function(n) { 
-    if (n.getData('greenCircle') === true) {
-      Mconsole.graph.removeNode(n.id);
-      //TODO is hideLabel correct? Maybe it is...
-      Mconsole.labels.hideLabel(n.id);
-      $('#topic_' + n.id + '_label').hide();
-    }
-  });
-  Mconsole.plot();
-}
-
 /**
- * Define all the dynamic interactions for the FIND/FILTER using Jquery
+ * Define all the dynamic interactions for the Filter By Metacode using Jquery
  */
   
 $(document).ready(function() {
-  // this sets up the initial opening of the find box
+  $('.sidebarFilterBox .showAll').click(function(e) {
-  $('#sideOptionFind').bind('click',function(){
-    if (!findOpen) openFind();  
-  });
-   
-  // this sets up the closing of the find box, and the toggling between open and closed.
-  $('#closeFind').bind('click',function(){
-    if (findOpen) closeFind();
-  });
-   
-  // this is where interactions within the find box begin
-  //on keyup, start the countdown
-  $('#topic_by_name_input').typing({
-    start: function (event, $elem) {
-      // grab the checkboxes to see if the search is on the canvas, in the commons, or both
-      onCanvasChecked = $("#onCanvas").is(':checked');
-      inCommonsChecked = $("#inCommons").is(':checked');
-      clearFoundData();
-          
-      // only have the autocomplete enabled if they are searching in the commons
-      if (onCanvasChecked && inCommonsChecked){
-        $('#topic_by_name_input').autocomplete( "option", "disabled", true );
-      }
-      else if (onCanvasChecked){
-        setTimeout(function(){showAll();},0);
-        $('#topic_by_name_input').autocomplete( "option", "disabled", true );
-      }
-      else if (inCommonsChecked){
-        $('#topic_by_name_input').autocomplete( "option", "disabled", true );
-      }
-      else {
-        alert('You either need to have searching On Your Canvas or In the Commons enabled');  
-      }
-    },
-    stop: function (event, $elem) {
-      // grab the checkboxes to see if the search is on the canvas, in the commons, or both
-      onCanvasChecked = $("#onCanvas").is(':checked');
-      inCommonsChecked = $("#inCommons").is(':checked');
-            
-      var topicName = $('#topic_by_name_input').val();
-      // run a search on the canvas or in the commons (or both)
-      if (onCanvasChecked) {
-        setTimeout(function() {
-                     onCanvasSearch(topicName, null, null);
-                   }, 0);
-      }
-      if (inCommonsChecked) {
-        $('#topicsByName').val(topicName);
-        $('#topicsByUser').val("");
-        $('#topicsByMap').val("");
-        $('#get_topics_form').submit();
-      }
- 
-      if (topicName == "") {
-        clearFoundData();
-      }
-    },
-    delay: 2000
-  });
-
-  $('#sideOptionFind .select_content').change(function() {
-    firstVal = $(this).children("option[value='topics']").attr('selected');
-    secondVal = $(this).children("option[value='maps']").attr('selected');
-    thirdVal = $(this).children("option[value='mappers']").attr('selected');
-    if (firstVal == 'selected') {
-      $('#sideOptionFind .select_type').children("option[value='metacode']").removeAttr('disabled');
-      $('#sideOptionFind .select_type').children("option[value='map (by name)']").removeAttr('disabled');
-      $('#sideOptionFind .select_type').children("option[value='mapper (by name)']").removeAttr('disabled');
-      $('.find').css('display','none');
-      $('.find_topic_by_name').css('display','block');
-      $('#topic_by_name_input').focus();
-    }
-    else if ( secondVal == 'selected' ) {
-      if ( $("#sideOptionFind .select_type").val() != "name") { 
-        $("#sideOptionFind .select_type").val('name');
-        $('#sideOptionFind').animate({
-          width: '305px',
-          height: '76px'
-        }, 300, function() {
-          // Animation complete.
-        });
-      }
-      $('#sideOptionFind .select_type').children("option[value='metacode']").attr('disabled','disabled');
-      $('#sideOptionFind .select_type').children("option[value='map (by name)']").attr('disabled','disabled');
-      $('#sideOptionFind .select_type').children("option[value='mapper (by name)']").attr('disabled','disabled');
-      $('.find').css('display','none');
-      $('.find_map_by_name').css('display','block');
-      $('#map_by_name_input').focus();
-    }
-    else if ( thirdVal == 'selected' ) {
-      $("#sideOptionFind .select_type").val('name');
-      $('#sideOptionFind .select_type').children("option[value='metacode']").attr('disabled','disabled');
-      $('#sideOptionFind .select_type').children("option[value='map (by name)']").attr('disabled','disabled');
-      $('#sideOptionFind .select_type').children("option[value='mapper (by name)']").attr('disabled','disabled');
-      $('.find').css('display','none');
-      $('.find_mapper_by_name').css('display','block');
-      $('#mapper_by_name_input').focus();
-    }
-  });
-   
-  $('#sideOptionFind .select_type').change(function() {
-    firstVal = $(this).children("option[value='name']").attr('selected');
-    secondVal = $(this).children("option[value='metacode']").attr('selected');
-    thirdVal = $(this).children("option[value='map (by name)']").attr('selected');
-    fourthVal = $(this).children("option[value='mapper (by name)']").attr('selected');
-    if (firstVal === 'selected') {
-      $('.find').fadeOut('fast', function() {
         showAll();
-        $('.find_topic_by_metacode ul li').not('#hideAll, #showAll').removeClass('toggledOff');
+        $('#filter_by_metacode ul li').removeClass('toggledOff');
         for (var catVis in categoryVisible) {
           categoryVisible[catVis] = true;
         }
-        $('#sideOptionFind').animate({
-          width: '305px',
-          height: '76px'
-        }, 300, function() {
-          $('.find_topic_by_name').css('display','block');
-          $('#topic_by_name_input').focus();
   });
-      });
+  $('.sidebarFilterBox .hideAll').click(function(e) {
-    }
-    else if ( secondVal === 'selected' ) {
-      $('.find').fadeOut('fast', function() {
-        $('#sideOptionFind').animate({
-          width: '380px',
-          height: '463px'
-        }, 300, function() {
-          $('.find_topic_by_metacode').fadeIn('fast');
-        }); 
-      });
-    }
-    else if ( thirdVal === 'selected' ) {
-      $('.find').fadeOut('fast', function() {
-        $('#sideOptionFind').animate({
-          width: '305px',
-          height: '76px'
-        }, 300, function() {
-          $('.find_map_by_name').css('display','block'); 
-          $('#map_by_name_input').focus();
-        });  
-      });
-    }
-    else if ( fourthVal === 'selected' ) {
-      $('.find').fadeOut('fast', function() {
-        $('#sideOptionFind').animate({
-          width: '305px',
-          height: '76px'
-        }, 300, function() {
-          $('.find_mapper_by_name').css('display','block'); 
-          $('#mapper_by_name_input').focus();
-        });  
-      });
-    }
-  });
-   
-  $('.find_topic_by_name #topic_by_name_input').bind('railsAutocomplete.select', function(event, data) {
-    /* Do something here */
-    if (data.item.id != undefined) {
-      window.open("/topics/" + data.item.id)
-    }
-    $('.find_topic_by_name #topic_by_name_input').val('');
-  });
-    
-  $('.find_topic_by_name').bind('submit', function(event, data) {
-    event.preventDefault();
-  });
-	
-  $('.find_map_by_name #map_by_name_input').bind('railsAutocomplete.select', function(event, data) {
-    firstVal = $('#sideOptionFind .select_content').children("option[value='topics']").attr('selected');
-    secondVal = $('#sideOptionFind .select_content').children("option[value='maps']").attr('selected');
-    thirdVal = $('#sideOptionFind .select_content').children("option[value='mappers']").attr('selected');
-    if (firstVal == 'selected') {
-      // grab the checkboxes to see if the search is on the canvas, in the commons, or both
-      firstNewVal = $("#onCanvas").attr('checked');
-      secondNewVal = $("#inCommons").attr('checked');
-
-      // only have the autocomplete enabled if they are searching in the commons
-      if (firstNewVal == "checked" && secondNewVal == "checked") {
-        setTimeout(function(){onCanvasSearch(null,data.item.id,null);},0);
-        $('#topicsByMap').val(data.item.id);
-        $('#topicsByUser').val("");
-        $('#topicsByName').val("");
-        $('#get_topics_form').submit(); 
-      }
-      else if (firstNewVal == "checked") {
-        setTimeout(function(){onCanvasSearch(null,data.item.id,null);},0); 
-      }
-      else if (secondNewVal == "checked"){
-        $('#topicsByMap').val(data.item.id);
-        $('#topicsByUser').val("");
-        $('#topicsByName').val("");
-        $('#get_topics_form').submit(); 
-      }
-      else {
-        alert('You either need to have searching On Your Canvas or In the Commons enabled'); 
-      }
-    }
-    else if ( secondVal == 'selected' ) {
-      if (data.item.id != undefined) {
-        window.open("/maps/" + data.item.id);
-      }
-      $('.find_map_by_name #map_by_name_input').val('');
-    }
-    else if ( thirdVal == 'selected' ) {
-      //nothing
-    }
-  });
-    
-  $('.find_map_by_name').bind('submit', function(event, data){
-    event.preventDefault();
-  });
-	
-  $('.find_mapper_by_name #mapper_by_name_input').bind('railsAutocomplete.select', function(event, data){
-    firstVal = $('#sideOptionFind .select_content').children("option[value='topics']").attr('selected');
-    secondVal = $('#sideOptionFind .select_content').children("option[value='maps']").attr('selected');
-    thirdVal = $('#sideOptionFind .select_content').children("option[value='mappers']").attr('selected');
-    if ( firstVal == 'selected') {
-      // grab the checkboxes to see if the search is on the canvas, in the commons, or both
-      firstNewVal = $("#onCanvas").attr('checked');
-      secondNewVal = $("#inCommons").attr('checked');
-
-      // only have the autocomplete enabled if they are searching in the commons
-      if (firstNewVal == "checked" && secondNewVal == "checked"){ 
-        setTimeout(function(){onCanvasSearch(null,null,data.item.id.toString());},0);        
-        $('#topicsByUser').val(data.item.id);
-        $('#topicsByMap').val("");
-        $('#topicsByName').val("");
-        $('#get_topics_form').submit(); 
-      }
-      else if (firstNewVal == "checked"){
-        setTimeout(function(){onCanvasSearch(null,null,data.item.id.toString());},0); 
-      }
-      else if (secondNewVal == "checked"){
-        $('#topicsByUser').val(data.item.id);
-        $('#topicsByMap').val("");
-        $('#topicsByName').val("");
-        $('#get_topics_form').submit(); 
-      }
-      else {
-        alert('You either need to have searching On Your Canvas or In the Commons enabled'); 
-      }
-    }
-    else if ( secondVal == 'selected' ) {
-      //nothing
-    }
-    else if ( thirdVal == 'selected' ) {
-      if (data.item.id != undefined) {
-        window.open("/users/" + data.item.id);
-      }
-      $('.find_mapper_by_name #mapper_by_name_input').val('');
-    }
-  });
-    
-  $('.find_mapper_by_name').bind('submit', function(event, data){
-    event.preventDefault();
-  });
-
-  // toggle visibility of topics with metacodes based on status in the filters list
-  $('.find_topic_by_metacode ul li').click(function(event) {
-    obj = document.getElementById('container');
-        
-    var switchAll = $(this).attr('id');
-    if ( switchAll === "showAll" || switchAll === "hideAll") {
-      if (switchAll == "showAll") {
-        showAll();
-        $('.find_topic_by_metacode ul li').not('#hideAll, #showAll').removeClass('toggledOff');
-        for (var catVis in categoryVisible) {
-          categoryVisible[catVis] = true;
-        }
-      }
-      else if (switchAll == "hideAll") {
         hideAll();
-        $('.find_topic_by_metacode ul li').not('#hideAll, #showAll').addClass('toggledOff');
+        $('#filter_by_metacode ul li').addClass('toggledOff');
         for (var catVis in categoryVisible) {
           categoryVisible[catVis] = false;
         }
-      }
+  });
-    }
+  
-    else {
+  // toggle visibility of topics with metacodes based on status in the filters list
+  $('#filter_by_metacode ul li').click(function(event) {
+      
       var category = $(this).children('img').attr('alt');
       switchVisible(category);
   
@@ -481,62 +179,5 @@ $(document).ready(function() {
         $(this).removeClass('toggledOff');
         categoryVisible[category] = true;
       }
-    }
   });
 });
-  
-function openFind() {
-  findOpen = true;
-  if (analyzeOpen) closeAnalyze();
-  if (organizeOpen) closeOrganize();
-  $('#sideOptionFind, #closeFind').css('z-index','10');
-  $('#sideOptionAnalyze').css('z-index','9');
-  $('#sideOptionOrganize').css('z-index','8');
-  firstVal = $('#sideOptionFind option[value="name"]').attr('selected');
-  secondVal = $('#sideOptionFind option[value="metacode"]').attr('selected');
-  thirdVal = $('#sideOptionFind option[value="map (by name)"]').attr('selected');
-  fourthVal = $('#sideOptionFind option[value="mapper (by name)"]').attr('selected');
-  if ( firstVal === 'selected' || thirdVal === 'selected' || fourthVal === 'selected' ) {
-    $('#sideOptionFind').animate({
-    width: '305px',
-      height: '76px'
-    }, 100, function() {
-      $('#topic_by_name_input').focus();
-    });
-  } else if ( secondVal === 'selected') {
-    $('#sideOptionFind').animate({
-    width: '380px',
-    height: '463px'
-    }, 100, function() {
-      // Animation complete.
-    });
-  } else if ( thirdVal === 'selected' ) {
-    $('#sideOptionFind').animate({
-    width: '305px',
-      height: '76px'
-    }, 100, function() {
-      $('#map_by_name_input').focus();
-    });
-  } else if ( fourthVal === 'selected' ) {
-    $('#sideOptionFind').animate({
-    width: '305px',
-      height: '76px'
-    }, 100, function() {
-      $('#mapper_by_name_input').focus();
-    });
-  }
-  $('#closeFind, #findWhere').css('display','block');
-  $('#sideOptionFind').css('cursor','default');
-}
-
-function closeFind() {
-  clearFoundData();
-
-  findOpen = false;
-  $('#closeFind, #findWhere').css('display','none');
-  $('#sideOptionFind').css('cursor','pointer');
-  $('#sideOptionFind').animate({
-    width: '45px',
-    height: '32px'
-    }, 100);
-}//closeFind

app/assets/javascripts/Jit/graphsettings-event-handlers.js

@@ -59,10 +59,6 @@ function enterKeyHandler() {
   if ( $('.new_topic').css('display') != 'none' ) {
     $('.new_topic').submit();
   }
-  // if the metacode spinner is open, create topic when enter is pressed
-  else if ( $('.new_synapse').css('display') != 'none' ) {
-    $('.new_synapse').submit();
-  }
   
   //var selectedNodesCopy = MetamapsModel.selectedNodes.slice(0);
   //var len = selectedNodesCopy.length;
@@ -143,6 +139,8 @@ function selectNodeOnClickHandler(node, e) {
     // the 'node' variable is a JIT node, the one that was clicked on
     // the 'e' variable is the click event
     
+    e.preventDefault();
+    e.stopPropagation();
     
     if (Mconsole.busy) return;
     
@@ -161,6 +159,7 @@ function selectNodeOnClickHandler(node, e) {
     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>';
     
     menustring += '</ul>';
@@ -172,7 +171,8 @@ function selectNodeOnClickHandler(node, e) {
       top: e.clientY
     });
     //add the menu to the page
-    $('#wrapper').append(rightclickmenu);
+    $('#center-container').append(rightclickmenu);
+    
     
     // attach events to clicks on the list items
     
@@ -206,6 +206,12 @@ function selectNodeOnClickHandler(node, e) {
       hideSelectedNodes();
     });
     
+    // when in radial, center on the topic you picked
+    $('.rc-center').click(function() {
+      $('.rightclickmenu').remove();
+      centerOn(node.id);
+    });
+    
     // open the entity in a new tab
     $('.rc-popout').click(function() {
       $('.rightclickmenu').remove();
@@ -230,7 +236,6 @@ function canvasDoubleClickHandler(canvasLoc,e) {
       $('#topic_x').val(canvasLoc.x); 
       $('#topic_y').val(canvasLoc.y);      
       $('#new_topic').fadeIn('fast');
-      addMetacode(); 
       $('#topic_name').focus(); 
    } else { 
       $('#new_topic').fadeOut('fast'); 

app/assets/javascripts/Jit/graphsettings.js

@@ -536,7 +536,6 @@ function onDragEndTopicHandler(node, eventInfo, e, allowRealtime) {
   if (tempInit && tempNode2 == null) {
     $('#topic_addSynapse').val("true");
     $('#new_topic').fadeIn('fast');
-    addMetacode();
     $('#topic_name').focus();
   } else if (tempInit && tempNode2 != null) {
     $('#topic_addSynapse').val("false");
@@ -547,7 +546,7 @@ function onDragEndTopicHandler(node, eventInfo, e, allowRealtime) {
     tempNode = null;
     tempNode2 = null;
     tempInit = false;
-  } else if (dragged != 0 && goRealtime) {
+  } else if (dragged && dragged != 0 && goRealtime) {
       saveLayout(dragged);
 	  for (var i = 0; i < MetamapsModel.selectedNodes.length; i++) {
 	    saveLayout(MetamapsModel.selectedNodes[i].id);

app/assets/javascripts/Jit/jit2.0.0.js

@@ -7248,7 +7248,7 @@ Graph.Label.Native = new Class({
             var width = Math.max.apply(null, lineWidths) + 8;
             var x = pos.x - width/2;
             var y = pos.y + node.getData("height") + 5;
-            var radius = 3;
+            var radius = 5;
             
               ctx.beginPath();
               ctx.moveTo(x + radius, y);

app/assets/javascripts/Jit/onCreateLabelHandler.js

@@ -14,67 +14,30 @@
  * expression is substituted in later (for html, in a separate function).
  */
 
-function onCreateLabelHandler(type, domElement, node) {
-  // Create a 'name' button and add it to the main node label
-  var nameContainer = document.createElement('span'),
-  style = nameContainer.style;
-  nameContainer.className = 'name topic_' + node.id;
-  nameContainer.id = 'topic_' + node.id + '_label';
-
-  if (type == "centered") {
-    nameContainer.innerHTML = generateCenteredLittleHTML (node);
-  }
-  else {
-    nameContainer.innerHTML = generateLittleHTML (node);
-  }
-  
-  domElement.appendChild(nameContainer);
-  style.fontSize = "0.9em";
-  style.color = "#222222";
-
-  bindNameContainerCallbacks(nameContainer, node);
-}
-
-
 function generateShowcardHTML() {
   return '                                                                    \
   <div class="CardOnGraph"                                                    \
          id="topic_$_id_$">                                                   \
-      <p class="type best_in_place best_in_place_metacode"                    \
-         data-url="/topics/$_id_$"                                            \
-         data-object="topic"                                                  \
-         data-collection=$_metacode_choices_$                                 \
-         data-attribute="metacode"                                            \
-         data-type="select">$_metacode_$</p>                                  \
-      <img alt="$_metacode_$"                                                 \
-           class="icon"                                                       \
-           title="Click to hide card"                                         \
-           height="50"                                                        \
-           width="50"                                                         \
-           src="$_imgsrc_$" />                                                \
-        <div class="cardSettings">                                            \
-          <div class="mapPerm"                                                \
-               title="$_permission_$">                                        \
-               $_mk_permission_$                                              \
-          </div>                                                              \
-          $_edit_permission_$                                                 \
-        </div>                                                                \
         <span class="title">                                                  \
           <span class="best_in_place best_in_place_name"                      \
                 data-url="/topics/$_id_$"                                     \
                 data-object="topic"                                           \
                 data-attribute="name"                                         \
                 data-type="input">$_name_$</span>                             \
-          <a href="/topics/$_id_$" class="topic-go-arrow" target="_blank">    \
-            <img class="topic-go-arrow"                                       \
-                 title="Explore Topic"                                        \
-                 src="/assets/go-arrow.png" />                                \
-          </a>                                                                \
-          <div class="clearfloat"></div>                                      \
         </span>                                                               \
-        <div class="contributor">                                             \
+        <div class="links">                                                   \
-          Added by: <a href="/users/$_userid_$" target="_blank">$_username_$  \
+           <img alt="$_metacode_$"                                                 \
-          </a>                                                                \
+           class="linkItem icon"                                                       \
+           title="click and drag to move card"                                         \
+           height="40"                                                        \
+           width="40"                                                         \
+           src="$_imgsrc_$" />                                                \
+           <div class="linkItem contributor"></div>                                    \
+           <div class="linkItem mapCount">$_map_count_$</div>                                    \
+           <div class="linkItem synapseCount">$_synapse_count_$</div>                                    \
+           <div class="linkItem mapPerm $_mk_permission_$"></div>                      \
+           <a href="/topics/$_id_$" class="linkItem topicPopout" title="Open Topic in New Tab" target="_blank"></a>\
+           <div class="clearfloat"></div>                                     \
         </div>                                                                \
       <div class="scroll">                                                    \
         <div class="desc">                                                    \
@@ -88,13 +51,13 @@ function generateShowcardHTML() {
         </div>                                                                \
       </div>                                                                  \
       <div class="link">                                                      \
-      $_go_link_$                                                             \
       $_a_tag_$<span class="best_in_place best_in_place_link"                 \
             data-url="/topics/$_id_$"                                         \
             data-object="topic"                                               \
             data-nil="$_link_nil_$"                                            \
             data-attribute="link"                                             \
             data-type="input">$_link_$</span>$_close_a_tag_$                  \
+      $_go_link_$                                                             \
       </div>                                                                  \
       <div class="clearfloat"></div>                                          \
     </div>';
@@ -106,7 +69,7 @@ function replaceVariables(html, node) {
   if (! authorizeToEdit(node)) {
     go_link = '';
     if (node.getData("link") != "") {
-      a_tag = '<a href="' + node.getData("link") + '">';
+      a_tag = '<a href="' + node.getData("link") + '" target="_blank">';
       close_a_tag = '</a>';
     }
     else {
@@ -142,8 +105,8 @@ function replaceVariables(html, node) {
   metacode_choices = metacode_choices.slice(0, -1);
   metacode_choices += "]'";
 
-  var desc_nil = "<span class='gray'>Click to add description.</span>";
+  var desc_nil = "<span class='gray'>Click to add description...</span>";
-  var link_nil = "<span class='gray'>Click to add link.</span>";
+  var link_nil = "<span class='gray'>Click to add link...</span>";
   
   var edit_perm = '';
   if (userid == node.getData("userid")) {
@@ -180,6 +143,8 @@ function replaceVariables(html, node) {
   html = html.replace(/\$_edit_permission_\$/g, edit_perm);
   html = html.replace(/\$_permission_\$/g, node.getData("permission"));
   html = html.replace(/\$_mk_permission_\$/g, mk_permission(node));
+  html = html.replace(/\$_map_count_\$/g, node.getData("inmaps").length);
+  html = html.replace(/\$_synapse_count_\$/g, node.getData("synapseCount"));
   html = html.replace(/\$_id_\$/g, node.id);
   html = html.replace(/\$_metacode_\$/g, node.getData("metacode"));
   html = html.replace(/\$_imgsrc_\$/g, imgArray[node.getData("metacode")].src);
@@ -203,69 +168,12 @@ function replaceVariables(html, node) {
     //logged in but desc isn't there so it's invisible
     html = html.replace(/\$_desc_\$/g, desc_nil);
   } else {
+    //html = html.replace(/\$_desc_\$/g, node.getData("desc").replace(/\n/g, '<br />'));
     html = html.replace(/\$_desc_\$/g, node.getData("desc"));
   }
   return html;
 }
 
-function generateLittleHTML(node) {
-  var littleHTML = '                                                          \
-    <div class="label">$_name_$</div>                                         \
-      <div class="nodeOptions">';
-
-  if (userid == null || mapid == null || !mapperm) {
-    //unauthenticated, not on a map: can remove from canvas
-    littleHTML += '                                                           \
-        <span class="removeFromCanvas"                                        \
-              onclick="hideNode($_id_$)"                              \
-              title="Click to remove topic from canvas">                      \
-        </span>';
-  } else if (mapperm) {
-    //permission to remove nodes from the map
-    littleHTML += '                                                           \
-        <span class="removeFromCanvas"                                        \
-                 onclick="hideNode($_id_$)"                                   \
-                 title="Click to remove topic from canvas">                   \
-        </span>                                                               \
-        <span class="removeFromMap"                                           \
-                 onclick="removeNode($_id_$)"                                 \
-                 title="Click to remove topic from map">                      \
-        </span>';
-  }
-
-  if (userid == node.getData('userid')) {
-    //logged in, and owner of the topic, thus permission to delete
-    littleHTML += '                                                          \
-        <span class="deleteTopic"                                            \
-                 onclick="var t = confirm(\'Are you sure you want to permanently delete this node and all synapses linking to it?\'); if (t) deleteNode($_id_$)"                                       \
-                 title="Click to delete this topic">                         \
-        </span>';
-  }
-  littleHTML += '</div>';
-  littleHTML = littleHTML.replace(/\$_id_\$/g, node.id);
-  littleHTML = littleHTML.replace(/\$_mapid_\$/g, mapid);
-  littleHTML = littleHTML.replace(/\$_name_\$/g, node.name);
-
-  return littleHTML;
-}
-
-function generateCenteredLittleHTML(node) {
-  var littleHTML = '                                                          \
-    <div class="label">$_name_$</div>                                         \
-      <div class="nodeOptions">';
-
-  littleHTML += '                                                           \
-        <span class="centerOn"                                        \
-              onclick="centerOn($_id_$)"                              \
-              title="Move this topic to center">                      \
-        </span>';
-  littleHTML += '</div>';
-  littleHTML = littleHTML.replace(/\$_id_\$/g, node.id);
-  littleHTML = littleHTML.replace(/\$_name_\$/g, node.name);
-
-  return littleHTML;
-}
-
 function hideCurrentCard() {
   if (MetamapsModel.showcardInUse) {
     var node = Mconsole.graph.getNode(MetamapsModel.showcardInUse);
@@ -275,75 +183,33 @@ function hideCurrentCard() {
 
 function hideCard(node) {
   var card = '.showcard';
-  if (node != null) {
-    card += '.topic_' + node.id;
-  }
 
   $(card).fadeOut('fast', function(){
-    node.setData('dim', 25, 'current');
+    //node.setData('dim', 25, 'current');
-    Mconsole.labels.hideLabel(Mconsole.graph.getNode(node.id), true)
     Mconsole.plot();
   });
 
   MetamapsModel.showcardInUse = null;
 }
 
-function bindNameContainerCallbacks(nameContainer, node) {
-   nameContainer.onmouseover = function(){
-     $('.name.topic_' + node.id + ' .nodeOptions').css('display','block');
-   }
- 
-   nameContainer.onmouseout = function(){
-     $('.name.topic_' + node.id + ' .nodeOptions').css('display','none');
-   }
-
-  // add some events to the label
-  $(nameContainer).find('.label').click(function(e){
-    
-    // set the diameter to full again for whatever node had its topic card showing
-    if ( MetamapsModel.showcardInUse != null ) {
-      currentOpenNode = Mconsole.graph.getNode(MetamapsModel.showcardInUse)
-      currentOpenNode.setData('dim', 25, 'current');
-      Mconsole.labels.hideLabel(currentOpenNode, true)
-      Mconsole.plot();
-    }
-    
-    //populate the card that's about to show with the right topics data
-    populateShowCard(node);
-  
-    // positions the card in the right place
-    var top = $('#' + node.id).css('top');
-    var left = parseInt($('#' + node.id).css('left'));
-    var w = $('#topic_' + node.id + '_label').width();
-    w = w/2;
-    left = (left + w) + 'px';
-    $('#showcard').css('top', top);
-    $('#showcard').css('left', left);   
-
-    $('.showcard.topic_' + node.id).fadeIn('fast');
-    node.setData('dim', 1, 'current');
-    MetamapsModel.showcardInUse = node.id;
-    Mconsole.plot();
-    Mconsole.labels.hideLabel(Mconsole.graph.getNode(node.id));
-  });
-}
-
 function populateShowCard(node) {
   var showCard = document.getElementById('showcard');
 
-    showCard.innerHTML = '';
+    $(showCard).find('.permission').remove();
       
     var html = generateShowcardHTML();
     html = replaceVariables(html, node);
       
-    showCard.className = 'showcard topic_' + node.id;
     if (authorizeToEdit(node)) {
       var perm = document.createElement('div');
       perm.className = 'permission canEdit';
       perm.innerHTML = html;
       showCard.appendChild(perm);
     } else {
-      showCard.innerHTML = html;
+      var perm = document.createElement('div');
+      perm.className = 'permission cannotEdit';
+      perm.innerHTML = html;
+      showCard.appendChild(perm);
     }
 
   //bind best_in_place ajax callbacks
@@ -359,11 +225,11 @@ function populateShowCard(node) {
 
   $(showCard).find('.best_in_place_name').bind("ajax:success", function() {
     var name = $(this).html();
-    $('#topic_' + node.id + '_label').find('.label').html(name);
     node.name = name;
   });
 
   $(showCard).find('.best_in_place_desc').bind("ajax:success", function() {
+    this.innerHTML = this.innerHTML.replace(/\r/g, '')
     $(showCard).find('.scroll').mCustomScrollbar("update");
     var desc = $(this).html();
     node.setData("desc", desc);
@@ -421,10 +287,6 @@ function populateShowCard(node) {
     node.setData("permission", permission);
   });
   
-  $('.showcard.topic_' + node.id).find('.scroll').mCustomScrollbar();
+  $('.showcard').find('.scroll').mCustomScrollbar();
   
-  // add some events to the label
-  $('.showcard').find('img.icon').click(function(){
-    hideCard(node);
-  });
 }

app/assets/javascripts/Jit/organize.js

@@ -1,51 +0,0 @@
-function organize() {
-  Mconsole.compute();
-  Mconsole.fx.animate({  
-    modes: ['linear'],  
-    hideLabels: true  
-  });
-}
-
-
-////
-////
-////
-//// Define all the dynamic interactions for the Organize using Jquery
-
-$(document).ready(function() {
-   
-   // this sets up the initial opening of the organize box
-   $('#sideOptionOrganize').bind('click',function(){
-	   if (!organizeOpen) openOrganize();  
-   });
-   
-   // this sets up the closing of the organize box, and the toggling between open and closed.
-   $('#closeOrganize').bind('click',function(){
-	   if (organizeOpen) closeOrganize();
-   });
-});
-
-function openOrganize() {
-  organizeOpen = true;
-  if (findOpen) closeFind();
-  if (analyzeOpen) closeAnalyze();
-  $('#sideOptionFind').css('z-index','8');
-  $('#sideOptionAnalyze').css('z-index','9');
-  $('#sideOptionOrganize, #closeOrganize').css('z-index','10');
-  $('#sideOptionOrganize').animate({
-    width: '100px',
-    height: '76px'
-    }, 100);
-  $('#closeOrganize').css('display','block');
-  $('#sideOptionOrganize').css('cursor','default');
-}
-
-function closeOrganize() {
-   organizeOpen = false;
-   $('#closeOrganize').css('display','none');
-   $('#sideOptionOrganize').css('cursor','pointer');
-   $('#sideOptionOrganize').animate({
-     width: '75px',
-     height: '32px'
-     }, 100);
-}

app/assets/javascripts/Jit/select-edit-delete-nodes-and-edges.js

@@ -1,7 +1,9 @@
 function centerOn(nodeid) {
   if (!Mconsole.busy) {
           var node = Mconsole.graph.getNode(nodeid);
-          $('h1.index').html('Viewing Topic: ' + node.name);
+          $('div.index img').attr('src', imgArray[node.getData('metacode')].src);
+          $('div.index .mapName').html(node.name);
+          $(document).attr('title', node.name + ' | Metamaps');
           window.history.pushState(node.name, "Metamaps", "/topics/" + node.id);
           Mconsole.onClick(node.id, {  
             hideLabels: false,

app/assets/javascripts/application.js

@@ -13,6 +13,7 @@
 // require autocomplete-rails-uncompressed
 //
 //= require jquery
+//= require jquery-ui
 //= require jquery.purr
 //= require best_in_place
 //= require jquery_ujs
@@ -205,6 +206,13 @@ var labelType, useGradients, nativeTextSupport, animate, json, Mconsole = null,
         clearTimeout(lT);
         if (! sliding1) { 
             sliding1 = true;
+            
+            // hide the other two
+            $('.sidebarFilterBox').hide();
+            $('.sidebarWandBox').hide();
+            $('.sidebarFilterIcon').css('background-color','rgba(0,0,0,0.7)');
+            $('.sidebarWandIcon').css('background-color','rgba(0,0,0,0.7)');
+            
             $('.sidebarAccountIcon').css('background-color','rgba(0,0,0,0.9)');
             $('.sidebarAccountBox').fadeIn(200, function() {
                  sliding1 = false;
@@ -253,9 +261,35 @@ var labelType, useGradients, nativeTextSupport, animate, json, Mconsole = null,
   
   $(".scroll").mCustomScrollbar();
   
+  // initialize scroll bar for filter by metacode, then hide it and position it correctly again
+  $("#filter_by_metacode").mCustomScrollbar();
+  var filterPosition = userid ? '-72px' : '-36px';
+  $('.sidebarFilterBox').hide().css({
+    position:'absolute',
+    top: '35px',
+    right: filterPosition
+  });
+  
+  // initialize metacode spinner and then hide it
+  $("#metacodeImg").CloudCarousel( {
+			titleBox: $('#metacodeImgTitle'),
+			yRadius:40,
+			xPos: 150,
+			yPos: 40,
+			speed:0.3,
+			mouseWheel:true, 
+			bringToFront: true
+	});
+  $('.new_topic').hide();
+  
+  
   $('.notice.metamaps').delay(10000).fadeOut('fast');
   $('.alert.metamaps').delay(10000).fadeOut('fast');
   
+  $('#center-container').bind('contextmenu', function(e){
+		  return false;
+	  });
+  
   addHoverForSettings();
   
   //bind best_in_place ajax callbacks
@@ -407,23 +441,6 @@ function createNewMap() {
   $('#new_map').fadeIn('fast');
 }
 
-function addMetacode() {
-	// code from http://www.professorcloud.com/mainsite/carousel-integration.htm
-  //mouseWheel:true,
-	if (!metacodeIMGinit) {		
-		$("#metacodeImg").CloudCarousel( {
-			titleBox: $('#metacodeImgTitle'),
-			yRadius:40,
-			xPos: 150,
-			yPos: 40,
-			speed:0.3,
-			mouseWheel:true, 
-			bringToFront: true
-		});
-		metacodeIMGinit = true;
-	}
-}
-
 function fetchRelatives(node) {
   var myA = $.ajax({
     type: "Get",
@@ -483,11 +500,7 @@ function openNodeShowcard(node) {
   //populate the card that's about to show with the right topics data
   populateShowCard(node);  
 
-  // positions the card in the right place
+  $('.showcard').fadeIn('fast');
-  $('#showcard').css('top', '250px');
-  $('#showcard').css('left', '100px');   
-
-  $('.showcard.topic_' + node.id).fadeIn('fast');
   //node.setData('dim', 1, 'current');
   MetamapsModel.showcardInUse = node.id;
 }

app/assets/stylesheets/application.css

@@ -244,13 +244,16 @@ box-shadow: 0 1px 0 rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.2);
 }
 
 .anypage .new_topic {
+  /* start it off screen while it initializes the spinner, then it will be hidden with jquery */
+  top:-1000px;
+  left:-1000px;
+  display: block;
+  position: absolute;
   width:300px;	
   margin:-40px 0 0 -50px;
 }
-
-.anypage .new_topic,
 .anypage .new_synapse {
-  display: block;
+  display: none;
   position: absolute;
 }
 
@@ -595,12 +598,162 @@ text-align: start;
   margin-top:5px;
 }
 
+/* wand */
+
+.sidebarWand {
+position:absolute;
+top:5px;
+right:35px;
+z-index:200;
+width: 35px;
+height:35px;
+border-right:1px solid black;
+}
+
+.sidebarWandIcon {
+position:absolute;
+width: 35px;
+height: 35px;
+background: rgba(0,0,0,0.7) url('MMCCicon_wand.png') no-repeat center center;
+background-size: 28px 28px;
+cursor:pointer;
+}
+.sidebarWandBox {
+  position:absolute;
+  display:none;
+  height:auto;
+  width:182px;
+  background: rgba(0,0,0,0.9);
+  top: 35px;
+  right:-36px;
+  padding: 10px;
+  border: 1px solid black;
+  font-family: 'LatoLight', helvetica, sans-serif;
+}
+.sidebarWandBox ul {
+ list-style:none;
+}
+.sidebarWandBox li.wandIcon {
+padding: 6px 0 6px 25px;
+background-size: 18px 18px;
+background-repeat: no-repeat;
+background-position: 0px 6px;
+font-size: 18px;
+line-height: 20px;
+color:white;
+cursor:pointer;
+}
+li.wandIcon:hover {
+background-position: 4px 6px;
+}
+li.wandSaveLayout {
+  background-image: url('MMCCicon_save_layout.png');
+}
+li.wandForkMap {
+  background-image: url('MMCCicon_save_new_map.png');
+}
+
+/* end wand */
+
+/* wand */
+
+.sidebarFilter {
+position:absolute;
+top:5px;
+right:71px;
+z-index:200;
+width: 35px;
+height:35px;
+border-right:1px solid black;
+}
+.sidebarFilter.loggedout {
+  right:35px;
+}
+
+.sidebarFilterIcon {
+position:absolute;
+width: 35px;
+height: 35px;
+background: rgba(0,0,0,0.7) url('MMCCicon_filter.png') no-repeat center center;
+background-size: 28px 28px;
+cursor:pointer;
+}
+
+/* we set a few of these params off screen to begin with, so that when we initialize the scroll bar it works, but then 
+   we hide the element and position it correctly */
+.sidebarFilterBox {
+  position:fixed; 
+  top: -1000px;
+  right:-1000px;
+  display:block;
+  /*
+  position:absolute; 
+  top: 35px;
+  right:-72px;
+  display:none;
+  */
+  height:auto;
+  width:260px;
+  background: rgba(0,0,0,0.9);
+  padding: 10px;
+  border: 1px solid black;
+  font-family: 'LatoLight', helvetica, sans-serif;
+  text-align:center;
+}
+
+h3.filterByMetacode {
+margin-bottom: 10px;
+text-align: left;
+float:left;
+}
+.sidebarFilterBox span {
+float: left;
+background: #17AFBD;
+padding: 1px 4px;
+border-radius: 2px;
+margin-left: 5px;
+cursor: pointer;
+}
+
+.sidebarFilterBox #filter_by_metacode {
+  height:270px;
+  overflow:hidden;
+}
+.sidebarFilterBox ul {
+  list-style:none;
+}
+.sidebarFilterBox li {
+  float:left;
+  width:61px;
+  height:70px;
+  cursor:pointer;
+}
+.sidebarFilterBox li:hover {
+background-color: rgba(255,255,255,0.1);
+}
+.sidebarFilterBox li img {
+  width:45px;
+  height:45px;
+  margin:0 auto;
+}
+.sidebarFilterBox li p {
+  font-size:11px;
+  line-height:11px;
+  font-family:arial, sans-serif;
+}
+
+.sidebarFilterBox li.toggledOff {
+  opacity: 0.4;
+}
+
+/* end filter by metacode */
+
 /* collaborate */
 
 .sidebarCollaborate {
 position:absolute;
 top:5px;
-right:35px;
+right:106px;
 z-index:200;
 width: 35px;
 height:35px;
@@ -631,73 +784,6 @@ cursor:pointer;
 
 /* end collaborate */
 
-/* wand */
-
-.sidebarWand {
-position:absolute;
-top:5px;
-right:71px;
-z-index:200;
-width: 35px;
-height:35px;
-border-right:1px solid black;
-}
-.sidebarWand.topicView {
-  right:35px;
-}
-.sidebarWand.topicView .sidebarWandBox {
-  right:-36px;
-}
-
-.sidebarWandIcon {
-position:absolute;
-width: 35px;
-height: 35px;
-background: rgba(0,0,0,0.7) url('MMCCicon_wand.png') no-repeat center center;
-background-size: 28px 28px;
-cursor:pointer;
-}
-.sidebarWandBox {
-  position:absolute;
-  display:none;
-  height:auto;
-  width:169px;
-  background: rgba(0,0,0,0.9);
-  top: 35px;
-  right:-72px;
-  padding: 10px;
-  border: 1px solid black;
-  min-width:120px;
-  font-family: 'LatoLight', helvetica, sans-serif;
-}
-.sidebarWandBox ul {
- list-style:none;
-}
-.sidebarWandBox li.wandIcon {
-padding: 6px 0 6px 25px;
-background-size: 18px 18px;
-background-repeat: no-repeat;
-background-position: 0px 6px;
-font-size: 18px;
-line-height: 20px;
-color:white;
-cursor:pointer;
-}
-li.wandIcon:hover {
-background-position: 4px 6px;
-}
-li.wandSaveLayout {
-  background-image: url('MMCCicon_save_layout.png');
-}
-li.wandForkMap {
-  background-image: url('MMCCicon_save_new_map.png');
-}
-li.wandFilter{
-  background-image: url('MMCCicon_filter.png');
-}
-
-/* end wand */
-
 /* search */
 
 .sidebarSearch {

app/assets/stylesheets/base.css

@@ -8,14 +8,19 @@
 
 .showcard, #showcard {
     position:absolute;
-    display:none;
+    display:block;
+    top:-1000px;
+    left:-1000px;
     margin-top: -181px;
-    width:216px;
+    width:226px;
 	  height:320px;
     color:#FFF;
     text-align: left;
     overflow: visible;
 	  z-index:14000;
+    background: #FFF;
+    border-radius:5px;
+    box-shadow: 6px 6px 8px rgba(0,0,0,0.4);
 }
 
 #showcard .contributor {
@@ -34,23 +39,23 @@
   overflow:hidden;
 }
 
+.showcard .permission {
+  width:100%;
+  height:100%;
+}
+
 .CardOnGraph {
   display:block;
   position:relative;
-  width:175px;
+  width:100%;
-  height:300px;
+  height:100%;
-  padding:10px 5px 10px 35px;
-  background: #FFF;
-  border-radius:10px;
   color:#000;
   z-index: 25;
-  border:1px solid #000;
-  box-shadow: 6px 6px 8px rgba(0,0,0,0.4);
 }
 
 .CardOnGraph .scroll {
    display:block;
-   height:230px;
+   padding:5px 10px;
 }
  
 .CardOnGraph .type {
@@ -63,50 +68,50 @@
   line-height: 24px;
 }
 
-.CardOnGraph .icon {
-  position:absolute;
-  top:135px;
-  left:-25px;
-}
-
 .CardOnGraph .title {
   font-size:22px;
   line-height:25px;
   display:block;
-  border-bottom:2px solid #000;
+  padding:5px;
-  padding-bottom:5px;
+  font-weight: bold;
+  text-align: center;
 }
 
 .best_in_place_name {
-  width:150px;
+  
-  float:left;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}
-.best_in_place_name:hover {
-  width: 150px;
-  float: left;
-  text-overflow: none;
-  white-space: normal;
-  overflow: visible;
-  position: absolute;
-  background: #ddd;
-  border-radius: 10px;
-  padding: 5px;
-  opacity: 0.98;
-  box-shadow: 4px 4px 5px #888888;
-  border: 1px solid #AAA;
-  z-index: 5;
 }
 
 .best_in_place_name input{
-  max-width:130px;
+height: 15px;
+padding: 5px 0;
+width: 100%;
+margin: 0;
+border: 0;
+outline: none;
+font-size: 22px;
+font-weight:bold;
+line-height: 25px;
+background: white;
+color: black;
+text-align:center;
+font-family: 'LatoLight';
 }
 
 .desc {
   font-size:15px;
-  font-family:Arial, Helvetica, sans-serif;
+  line-height:19px;
+}
+.best_in_place_desc textarea {
+padding: 0;
+width: 100%;
+margin: 0;
+border: 0;
+outline: none;
+font-size: 15px;
+line-height: 19px;
+background: white;
+color: black;
+font-family: 'LatoLight';
 }
 
 .desc h3 {
@@ -121,7 +126,6 @@
 }
 
 .best_in_place_desc {
-  width:155px;
   display:block;
   margin-top:2px;	
 }
@@ -130,22 +134,76 @@
   width: auto;
 }
 
-.best_in_place_desc  textarea{
+.CardOnGraph .links {
-  width:150px;
+  position:relative;
-  display:block;	
+  border-bottom: 1px solid #AAAAAA;
+  border-top: 1px solid #AAAAAA;
+}
+
+.CardOnGraph .linkItem {
+  float:left;
+  min-width:40px;
+  height:40px;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-size: 27px 27px;
+}
+
+.CardOnGraph .icon {
+  position:absolute;
+  left:-20px;
+  cursor:move;
+}
+.linkItem.contributor {
+  background-image: url(MMCCicon_mapper_black.png);
+  margin-left:20px;
+}
+.linkItem.mapCount {
+  background-image: url(MMCCicon_map_black.png);
+  background-size: 22px 22px;
+background-position: 0px center;
+line-height: 40px;
+min-width: 16px;
+padding-left: 24px;
+}
+.linkItem.synapseCount {
+  background-image: url(MMCCicon_synapse_black.png);
+  background-size: 22px 22px;
+background-position: 0px center;
+line-height: 40px;
+min-width: 16px;
+padding-left: 24px;
+}
+.linkItem.mapPerm {
+
+}
+.linkItem.mapPerm.co {
+  background-image: url(MMCCicon_commons.png);
+}
+.linkItem.mapPerm.pu {
+  background-image: url(MMCCicon_public.png);
+}
+.linkItem.mapPerm.pr {
+  background-image: url(MMCCicon_private.png);
+}
+.linkItem.topicPopout {
+  background-image: url(MMCCicon_pop-out_black.png);
 }
 
 .CardOnGraph .link {
   position:absolute;
-  width:170px;
+  bottom:5px;
-  top:293px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  border-top: 1px solid #AAAAAA;
+  padding-top:8px;
+  width:100%;
+  height:25px;
 }
 
 .CardOnGraph .best_in_place_link { 
-  width: 135px;
+  width: 80%;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -153,15 +211,26 @@
   float: left;
   padding-left: 5px; 
   padding-top:2px;
+  font-size: 16px;
+  line-height: 16px;
 }
 
-.CardOnGraph .best_in_place_link input {
+.best_in_place_link input{
-  width:130px;
+height: 16px;
-  margin-top:-2px;	
+margin: -1px 0 0 0;
+border: 0;
+outline: none;
+font-size: 16px;
+line-height: 16px;
+line-height: 16px;
+background: white;
+color: black;
+font-family: 'LatoLight';
 }
 
 .CardOnGraph .go-link {
-  float:left;	
+  float: right;
+  margin: 3px 5px 0 0;	
 }
 
 .cardSettings {
@@ -197,18 +266,6 @@
   top: 30px;
 }
 
-.mapPerm {
-  background: #fff;
-  padding: 0 4px 4px 4px;
-  border-radius: 15px;
-  border: 1px solid #AAA;
-  position: absolute;
-  left: -7px;
-  top: 0px;
-  width:16px;
-  text-align:center;
-}
-
 #edit_synapse .mapPerm,
 #edit_synapse .permActivator {
   position: static;
@@ -227,8 +284,8 @@
 }
 
 #edit_synapse {
-  background: url(bg.png);
+  background: white;
-  border-radius: 0.5em;
+  border-radius: 5px;
   padding: 5px;
   color: #000;
 }

app/models/map.rb

@@ -71,6 +71,7 @@ end
 		  @topicdata['$link'] = topic.link
 		  @topicdata['$metacode'] = topic.metacode.name
       @topicdata['$inmaps'] = @inmaps
+      @topicdata['$synapseCount'] = topic.synapses.count
 		  @topicdata['$userid'] = topic.user.id
 		  @topicdata['$username'] = topic.user.name
 		  @mapping = Mapping.find_by_topic_id_and_map_id(topic.id,self.id)

app/models/topic.rb

@@ -80,6 +80,7 @@ belongs_to :metacode
       @topicdata['$link'] = self.link
 		  @topicdata['$metacode'] = self.metacode.name
       @topicdata['$inmaps'] = @inmaps
+      @topicdata['$synapseCount'] = self.synapses.count
 		  @topicdata['$userid'] = self.user.id
 		  @topicdata['$username'] = self.user.name
       @topicdata['$permission'] = self.permission
@@ -101,6 +102,7 @@ belongs_to :metacode
 		  @topicdata['$link'] = self.link
 		  @topicdata['$metacode'] = self.metacode.name
       @topicdata['$inmaps'] = @inmaps
+      @topicdata['$synapseCount'] = self.synapses.count
 		  @topicdata['$userid'] = self.user.id
 		  @topicdata['$username'] = self.user.name
       @mapping = Mapping.find_by_topic_id_and_map_id(self.id,mapid)
@@ -149,6 +151,7 @@ belongs_to :metacode
         @topicdata['$link'] = topic.link
         @topicdata['$metacode'] = topic.metacode.name
         @topicdata['$inmaps'] = @inmaps
+        @topicdata['$synapseCount'] = topic.synapses.count
 			  @topicdata['$userid'] = topic.user.id
 			  @topicdata['$username'] = topic.user.name
         @topicdata['$permission'] = topic.permission
@@ -168,6 +171,7 @@ belongs_to :metacode
           @topicdata['$link'] = topic.link
           @topicdata['$metacode'] = topic.metacode.name
           @topicdata['$inmaps'] = @inmaps
+          @topicdata['$synapseCount'] = topic.synapses.count
           @topicdata['$userid'] = topic.user.id
           @topicdata['$username'] = topic.user.name
           @topicdata['$permission'] = topic.permission

app/views/layouts/application.html.erb

@@ -49,7 +49,7 @@
     <div class="wrapper" id="wrapper">
       <div class="sidebarSearch">
         <div class="sidebarSearchIcon"></div>
-        <input type="text" class="sidebarSearchField" placeholder="Search..."></input>
+        <input type="text" class="sidebarSearchField"></input>
         <div class="clearfloat"></div>
         <%= render :partial => 'layouts/searchtemplates' %>
       </div>
@@ -94,7 +94,7 @@
     <style type='text/css'>@import url('http://getbarometer.s3.amazonaws.com/assets/barometer/css/barometer.css');</style>
     <script src='http://getbarometer.s3.amazonaws.com/assets/barometer/javascripts/barometer.js' type='text/javascript'></script>
     <script type="text/javascript" charset="utf-8">
-      BAROMETER.load('6FWffBApknnjr7p3Oxf2L');
+      BAROMETER.load('Scqak8nyHdFEkezKMNeQp');
     </script>
 </body>
 </html>

app/views/main/_filterbymetacode.html.erb

@@ -0,0 +1,23 @@
+<%#
+  # @file
+  # this code generates the list of icons in the filter by metacode box in the upper right menu area
+  #%>
+  
+<script>
+ //  keep an array of which metacodes are currently visible.
+ var categoryVisible = new Object();
+
+<% @list = '' %>
+<% Metacode.order("name").all.each_with_index do |m, index| %>
+  <% @list += '<li><img src="/assets/' + m.icon + '" alt="' + m.name + '" /><p>' + m.name.downcase + '</p></li>' %>
+     
+  categoryVisible['<%= m.name %>'] = true;   
+<% end %>
+</script>
+
+<div id="filter_by_metacode">
+  <ul>
+    <%= @list.html_safe %>
+  </ul>
+  <div class="clearfloat"></div>
+</div>

app/views/maps/_newsynapse.html.erb

@@ -5,7 +5,7 @@
   #%>
 <div class="anypage">
 	<%= form_for Synapse.new, url: synapses_url, remote: true do |form| %>
-    <%= form.autocomplete_field :desc, autocomplete_synapse_desc_synapses_path, :placeholder => "Describe the connection..." %>
+    <%= form.text_field :desc, :placeholder => "describe the connection..." %>
     <%= form.hidden_field :topic1id, :value => 0 %>
     <%= form.hidden_field :topic2id, :value => 0 %>
     <% if (@map.permission == "commons" && authenticated?) || @map.user == user %>

app/views/maps/_newtopic.html.erb

@@ -1,6 +1,6 @@
 <%#
   # Partial rendering form for a new topic on a map
-  # TODO: Where is this code used?
+  # This code is called when viewing a metamap in show.html.erb in the views/maps folder
   #%>
 <div class="anypage">
 <%= form_for Topic.new, url: topics_url, remote: true do |form| %>
@@ -11,7 +11,7 @@
       <img class="cloudcarousel" width="40" height="40" src="/assets/<%= metacode.icon %>" alt="<%= metacode.name %>" title="<%= metacode.name %>"/>
     <% end %>
   </div> 
-  <%= form.text_field :name, :placeholder => "title..." %>
+  <%= form.text_field :name, :maxlength => 140, :placeholder => "title..." %>
   <%= form.hidden_field :metacode, :value => "Action" %>
   <%= form.hidden_field :x, :value => 0 %>
   <%= form.hidden_field :y, :value => 0 %>
@@ -20,9 +20,7 @@
   <% end %>
   <%= form.hidden_field :grabTopic, :value => "null" %>
   <%= form.hidden_field :addSynapse, :value => false %>
-  <!--<input id="left-but"  type="button" value="Left" />-->
   <div id="metacodeImgTitle"></div>
-  <!--<input id="right-but" type="button" value="Right" />-->
   <div class="clearfloat"></div>
 <% end %>
 </div>

app/views/maps/show.html.erb

@@ -7,25 +7,31 @@
 <% content_for :title, @map.name + " | Metamaps" %>
 
 <% if authenticated? %>
-
-<div class="sidebarCollaborate">
-  <div class="sidebarCollaborateIcon"></div>
-  <div class="sidebarCollaborateBox">
-    
-  </div>
-</div>
-
 <div class="sidebarWand">
   <div class="sidebarWandIcon"></div>
   <div class="sidebarWandBox">
     <ul>
       <li class="wandIcon wandSaveLayout">Save Layout</li>
       <li class="wandIcon wandForkMap">Save To New Map</li>
-      <li class="wandIcon wandFilter">Filter By Metacode</li>
+      <li class="wandIcon wandChangeMetacodes">Switch Metacode Set</li>
     </ul>
   </div>
 </div>
+<div class="sidebarCollaborate">
+  <div class="sidebarCollaborateIcon"></div>
+  <div class="sidebarCollaborateBox">
+    
+  </div>
+</div>
 <% end %>
+<div class="sidebarFilter">
+  <div class="sidebarFilterIcon"></div>
+  <div class="sidebarFilterBox">
+    <h3 class="filterByMetacode">Filter By Metacode</h3><span class="showAll">all</span><span class="hideAll">none</span>
+    <div class="clearfloat"></div>
+    <%= render :partial => 'main/filterbymetacode' %>
+  </div>
+</div>
 
 <div class="index">
   <div class="openCheatsheet"></div>
@@ -83,6 +89,13 @@
         clearTimeout(lT);
         if (! sliding1) { 
             sliding1 = true;
+            
+            // hide the other two
+            $('.sidebarAccountBox').hide();
+            $('.sidebarFilterBox').hide();
+            $('.sidebarFilterIcon').css('background-color','rgba(0,0,0,0.7)');
+            $('.sidebarAccountIcon').css('background-color','rgba(0,0,0,0.7)');
+            
             $('.sidebarWandIcon').css('background-color','rgba(0,0,0,0.9)');
             $('.sidebarWandBox').fadeIn(200, function() {
                  sliding1 = false;
@@ -105,8 +118,66 @@
           return;
         });
         
-   } // end bindAccountHover
+   } // end bindWandHover
+   
+   function bindFilterHover() {
+      
+      var filterIsOpen = false
+      
+      // controls the sliding hover of the bottom left menu
+      var sliding1 = false; 
+      var lT;
+      
+      var closeFilter = function() {
+        lT = setTimeout(function() { 
+            if (! sliding1) { 
+              sliding1 = true;
+              $('.sidebarFilterIcon').css('background-color','rgba(0,0,0,0.7)');
+              $('.sidebarFilterBox').fadeOut(200, function() {
+                sliding1 = false;
+                filterIsOpen = false; 
+              });
+            } 
+          },300); 
+      }
+      
+      var openFilter = function() {
+        clearTimeout(lT);
+        if (! sliding1) { 
+            sliding1 = true;
+            
+            // hide the other two
+            $('.sidebarAccountBox').hide();
+            $('.sidebarWandBox').hide();
+            $('.sidebarAccountIcon').css('background-color','rgba(0,0,0,0.7)');
+            $('.sidebarWandIcon').css('background-color','rgba(0,0,0,0.7)');
+            
+            $('.sidebarFilterIcon').css('background-color','rgba(0,0,0,0.9)');
+            $('.sidebarFilterBox').fadeIn(200, function() {
+                 sliding1 = false;
+                 filterIsOpen = true;
+            });
+        }
+      }
+        // bind the hover events
+        $(".sidebarFilter").hover(openFilter, closeFilter);
+        
+   } // end bindFilterHover
    bindWandHover();
+   bindFilterHover();
+   
+   $('.showcard').draggable({ handle: ".icon" });
+   $('#showcard').resizable({
+     maxHeight: 500,
+     maxWidth: 500,
+     minHeight: 320,
+     minWidth: 226
+   }).css({
+     display: 'none',
+     top: '300px',
+     left: '100px'
+   });
+   
   });
   
   

app/views/topics/_new.html.erb

@@ -1,7 +1,7 @@
 <%#
   # @file
   # This file contains code for rendering a new topic form.
-  # TODO: What code actually calls this? Is it old?
+  # It's called from the show topic / radial view pages
   #%>
 
 <div class="anypage">
@@ -13,15 +13,13 @@
       <img class="cloudcarousel" width="40" height="40" src="/assets/<%= metacode.icon %>" alt="<%= metacode.name %>" title="<%= metacode.name %>"/>
     <% end %>
   </div> 
-  <%= form.text_field :name, :placeholder => "title..." %>
+  <%= form.text_field :name, :maxlength => 140, :placeholder => "title..." %>
   <%= form.hidden_field :metacode, :value => "Action" %>
   <%= form.hidden_field :x, :value => 0 %>
   <%= form.hidden_field :y, :value => 0 %>
   <%= form.hidden_field :grabTopic, :value => "null" %>
   <%= form.hidden_field :addSynapse, :value => false %>
-  <!--<input id="left-but"  type="button" value="Left" />-->
   <div id="metacodeImgTitle"></div>
-  <!--<input id="right-but" type="button" value="Right" />-->
   <div class="clearfloat"></div>
 <% end %>
 </div>

app/views/topics/show.html.erb

@@ -22,11 +22,19 @@
   <div class="sidebarWandBox">
     <ul>
       <li class="wandIcon wandForkMap">Save As Map</li>
-      <li class="wandIcon wandFilter">Filter By Metacode</li>
+      <li class="wandIcon wandChangeMetacodes">Switch Metacode Set</li>
     </ul>
   </div>
 </div>
 <% end %>
+<div class="sidebarFilter <%= authenticated? ? 'loggedin' : 'loggedout' %>">
+  <div class="sidebarFilterIcon"></div>
+  <div class="sidebarFilterBox">
+    <h3 class="filterByMetacode">Filter By Metacode</h3><span class="showAll">all</span><span class="hideAll">none</span>
+    <div class="clearfloat"></div>
+    <%= render :partial => 'main/filterbymetacode' %>
+  </div>
+</div>
 
 <div class="index">
   <div class="openCheatsheet"></div>
@@ -71,6 +79,13 @@
         clearTimeout(lT);
         if (! sliding1) { 
             sliding1 = true;
+            
+            // hide the other two
+            $('.sidebarAccountBox').hide();
+            $('.sidebarFilterBox').hide();
+            $('.sidebarFilterIcon').css('background-color','rgba(0,0,0,0.7)');
+            $('.sidebarAccountIcon').css('background-color','rgba(0,0,0,0.7)');
+            
             $('.sidebarWandIcon').css('background-color','rgba(0,0,0,0.9)');
             $('.sidebarWandBox').fadeIn(200, function() {
                  sliding1 = false;
@@ -82,6 +97,9 @@
         $(".sidebarWand").hover(openWand, closeWand);
         
         // attach events for clicking on wand actions
+        $('li.wandSaveLayout').click(function() {
+          saveLayoutAll();
+        });
         $('li.wandForkMap').click(function() {
           saveToMap();
           closeWand();
@@ -90,8 +108,66 @@
           return;
         });
         
-   } // end bindAccountHover
+   } // end bindWandHover
+   
+   function bindFilterHover() {
+      
+      var filterIsOpen = false
+      
+      // controls the sliding hover of the bottom left menu
+      var sliding1 = false; 
+      var lT;
+      
+      var closeFilter = function() {
+        lT = setTimeout(function() { 
+            if (! sliding1) { 
+              sliding1 = true;
+              $('.sidebarFilterIcon').css('background-color','rgba(0,0,0,0.7)');
+              $('.sidebarFilterBox').fadeOut(200, function() {
+                sliding1 = false;
+                filterIsOpen = false; 
+              });
+            } 
+          },300); 
+      }
+      
+      var openFilter = function() {
+        clearTimeout(lT);
+        if (! sliding1) { 
+            sliding1 = true;
+            
+            // hide the other two
+            $('.sidebarAccountBox').hide();
+            $('.sidebarWandBox').hide();
+            $('.sidebarAccountIcon').css('background-color','rgba(0,0,0,0.7)');
+            $('.sidebarWandIcon').css('background-color','rgba(0,0,0,0.7)');
+            
+            $('.sidebarFilterIcon').css('background-color','rgba(0,0,0,0.9)');
+            $('.sidebarFilterBox').fadeIn(200, function() {
+                 sliding1 = false;
+                 filterIsOpen = true;
+            });
+        }
+      }
+        // bind the hover events
+        $(".sidebarFilter").hover(openFilter, closeFilter);
+        
+   } // end bindFilterHover
    bindWandHover();
+   bindFilterHover();
+   
+   $('.showcard').draggable({ handle: ".icon" });
+   $('#showcard').resizable({
+     maxHeight: 500,
+     maxWidth: 500,
+     minHeight: 320,
+     minWidth: 226
+   }).css({
+     display: 'none',
+     top: '300px',
+     left: '100px'
+   });
+   
   });
   
   

public/assets/manifest.yml

@@ -23,8 +23,12 @@ MMCCicon_logout.png: MMCCicon_logout-2b7d4dfff8cdc4d38089c082ac0c6929.png
 MMCCicon_logout/index.png: MMCCicon_logout-2b7d4dfff8cdc4d38089c082ac0c6929.png
 MMCCicon_map.png: MMCCicon_map-77c3768601370ee04d15f7da448fee91.png
 MMCCicon_map/index.png: MMCCicon_map-77c3768601370ee04d15f7da448fee91.png
+MMCCicon_map_black.png: MMCCicon_map_black-f07d554e21d2f064d72d94f33efec39f.png
+MMCCicon_map_black/index.png: MMCCicon_map_black-f07d554e21d2f064d72d94f33efec39f.png
 MMCCicon_mapper.png: MMCCicon_mapper-3d7a6f42563271141b72483efa7701d2.png
 MMCCicon_mapper/index.png: MMCCicon_mapper-3d7a6f42563271141b72483efa7701d2.png
+MMCCicon_mapper_black.png: MMCCicon_mapper_black-8e5daace6edd134213588252f1426e10.png
+MMCCicon_mapper_black/index.png: MMCCicon_mapper_black-8e5daace6edd134213588252f1426e10.png
 MMCCicon_pop-out.png: MMCCicon_pop-out-f929f9f904f0dde84210a68980110e9b.png
 MMCCicon_pop-out/index.png: MMCCicon_pop-out-f929f9f904f0dde84210a68980110e9b.png
 MMCCicon_pop-out_black.png: MMCCicon_pop-out_black-a0fe60f38328f60a42e4e59472c669a2.png
@@ -47,20 +51,18 @@ MMCCicon_settings.png: MMCCicon_settings-b80201e3f081378771338f2a37afc64b.png
 MMCCicon_settings/index.png: MMCCicon_settings-b80201e3f081378771338f2a37afc64b.png
 MMCCicon_synapse.png: MMCCicon_synapse-ddb1ae0d586aa9b787244b3648bde538.png
 MMCCicon_synapse/index.png: MMCCicon_synapse-ddb1ae0d586aa9b787244b3648bde538.png
+MMCCicon_synapse_black.png: MMCCicon_synapse_black-e1435858238dd7fa7d47ab313beb5e19.png
+MMCCicon_synapse_black/index.png: MMCCicon_synapse_black-e1435858238dd7fa7d47ab313beb5e19.png
 MMCCicon_topic.png: MMCCicon_topic-f3343e0b8ed9c74cd084e65a9a2ae9a8.png
 MMCCicon_topic/index.png: MMCCicon_topic-f3343e0b8ed9c74cd084e65a9a2ae9a8.png
 MMCCicon_wand.png: MMCCicon_wand-2881f819fcbe04f787bf5d781f302cbc.png
 MMCCicon_wand/index.png: MMCCicon_wand-2881f819fcbe04f787bf5d781f302cbc.png
-account_icon.png: account_icon-accfe0ae2fc05f59f0459bb5da3d92a3.png
-account_icon/index.png: account_icon-accfe0ae2fc05f59f0459bb5da3d92a3.png
 action.png: action-abd8f2e892ebe608b9112249167fb64e.png
 action/index.png: action-abd8f2e892ebe608b9112249167fb64e.png
 activity.png: activity-d115f352e27307a6f15b34bde2c23a5e.png
 activity/index.png: activity-d115f352e27307a6f15b34bde2c23a5e.png
 argument.png: argument-0d73e7980d2a2051880d458038a44442.png
 argument/index.png: argument-0d73e7980d2a2051880d458038a44442.png
-background.jpg: background-4f2d3ab2ad388ab65d405ec7437cf7d6.jpg
-background/index.jpg: background-4f2d3ab2ad388ab65d405ec7437cf7d6.jpg
 background2-for-repeating.jpg: background2-for-repeating-dcbb5a0ce06d31aa90b1e2cb84d01200.jpg
 background2-for-repeating/index.jpg: background2-for-repeating-dcbb5a0ce06d31aa90b1e2cb84d01200.jpg
 background2.jpg: background2-fcd292f486d40ecc07d17e2f4e94a473.jpg
@@ -73,28 +75,20 @@ black_bg.png: black_bg-a84a34cb111aa74875c1074cd333adab.png
 black_bg/index.png: black_bg-a84a34cb111aa74875c1074cd333adab.png
 catalyst.png: catalyst-1594e823fd9c8472821f92bf396d6923.png
 catalyst/index.png: catalyst-1594e823fd9c8472821f92bf396d6923.png
-centerOn.png: centerOn-8e34d2284da3af348a871042dc124b06.png
-centerOn/index.png: centerOn-8e34d2284da3af348a871042dc124b06.png
 closed.png: closed-15267ab51fc3279b336662252acca9bf.png
 closed/index.png: closed-15267ab51fc3279b336662252acca9bf.png
 con_icon.png: con_icon-7ee91f8671fb3fa1fc5881baaea21f15.png
 con_icon/index.png: con_icon-7ee91f8671fb3fa1fc5881baaea21f15.png
-decision.png: decision-457574169c586146d3c8533fb2126eaa.png
+decision.png: decision-e0a000daab3f5f35dbf3c30c46dfdceb.png
-decision/index.png: decision-457574169c586146d3c8533fb2126eaa.png
+decision/index.png: decision-e0a000daab3f5f35dbf3c30c46dfdceb.png
-delete.png: delete-7ac5d3a05903d72d77df086d021613fc.png
-delete/index.png: delete-7ac5d3a05903d72d77df086d021613fc.png
 example.png: example-cdab03bae056eab8d7b8f1edb59d0971.png
 example/index.png: example-cdab03bae056eab8d7b8f1edb59d0971.png
-experience.png: experience-1afef68cd310743142f89ab67c9c40cd.png
+experience.png: experience-0bd9196db39e66beaec6a5867a1d1592.png
-experience/index.png: experience-1afef68cd310743142f89ab67c9c40cd.png
+experience/index.png: experience-0bd9196db39e66beaec6a5867a1d1592.png
 foresight.png: foresight-8d7c59af1bf7ae4a438c8d0d1026b267.png
 foresight/index.png: foresight-8d7c59af1bf7ae4a438c8d0d1026b267.png
 futuredev.png: futuredev-0d5daeb0100f388aedb79d75bd7e3fb8.png
 futuredev/index.png: futuredev-0d5daeb0100f388aedb79d75bd7e3fb8.png
-go-arrow-2.png: go-arrow-2-5afa523fd9f1a48057a6824e2fa4cc01.png
-go-arrow-2/index.png: go-arrow-2-5afa523fd9f1a48057a6824e2fa4cc01.png
-go-arrow.png: go-arrow-369a9329204282cc3fa676b74138f11a.png
-go-arrow/index.png: go-arrow-369a9329204282cc3fa676b74138f11a.png
 goodpractice.png: goodpractice-22595f8e6fa95cb948c78dfec1e434c6.png
 goodpractice/index.png: goodpractice-22595f8e6fa95cb948c78dfec1e434c6.png
 group.png: group-c8ee17544a9e41433c5234586e6f9fec.png
@@ -103,10 +97,8 @@ home_bg.png: home_bg-cf084fcee9fdc1f27b45226e997a238c.png
 home_bg/index.png: home_bg-cf084fcee9fdc1f27b45226e997a238c.png
 home_bg2.png: home_bg2-c881acea5e56343b4abf117d435a3c5a.png
 home_bg2/index.png: home_bg2-c881acea5e56343b4abf117d435a3c5a.png
-home_bg_2.png: home_bg_2-73e5f33a103d2e4248a05abd6b6a9a5e.png
+idea.png: idea-e06b6d614672688a3024b5f13feca166.png
-home_bg_2/index.png: home_bg_2-73e5f33a103d2e4248a05abd6b6a9a5e.png
+idea/index.png: idea-e06b6d614672688a3024b5f13feca166.png
-idea.png: idea-a8109a538b5dc46fa00dd667350d0e7d.png
-idea/index.png: idea-a8109a538b5dc46fa00dd667350d0e7d.png
 implication.png: implication-df9ae923c3614de364c781519d6c4afc.png
 implication/index.png: implication-df9ae923c3614de364c781519d6c4afc.png
 insight.png: insight-76f0ab9b04a6bd112f1899adb171520d.png
@@ -127,12 +119,8 @@ map.png: map-11d4c40918bd0e9d7b9dc654a6940087.png
 map/index.png: map-11d4c40918bd0e9d7b9dc654a6940087.png
 menu_icon_32.png: menu_icon_32-45a773e31d8a68a2e404f176e528b467.png
 menu_icon_32/index.png: menu_icon_32-45a773e31d8a68a2e404f176e528b467.png
-minus.png: minus-f4a2131951232ddd339080a1181fe219.png
-minus/index.png: minus-f4a2131951232ddd339080a1181fe219.png
 moviemap.png: moviemap-090435483d05cf98c6aad5c4d09e3b06.png
 moviemap/index.png: moviemap-090435483d05cf98c6aad5c4d09e3b06.png
-my_maps_icon.png: my_maps_icon-fcf59dec797c1fcbe0fe2e4d65e3621a.png
-my_maps_icon/index.png: my_maps_icon-fcf59dec797c1fcbe0fe2e4d65e3621a.png
 note.png: note-51ba25c12bc7b5fb5f3d2f13764f9463.png
 note/index.png: note-51ba25c12bc7b5fb5f3d2f13764f9463.png
 openissue.png: openissue-d77dfb76b9b7e5be3b9d603f8cea8667.png
@@ -141,8 +129,8 @@ opinion.png: opinion-f1a3c861a6827a10075799dfafb14c80.png
 opinion/index.png: opinion-f1a3c861a6827a10075799dfafb14c80.png
 opportunity.png: opportunity-d29060b764733e42ccd315213aaa5d58.png
 opportunity/index.png: opportunity-d29060b764733e42ccd315213aaa5d58.png
-person.png: person-179a07532de61899670808ee6d35736a.png
+person.png: person-3c753f20ecadc4267ee6cce18a36977e.png
-person/index.png: person-179a07532de61899670808ee6d35736a.png
+person/index.png: person-3c753f20ecadc4267ee6cce18a36977e.png
 platform.png: platform-163be434ff4103819c21828f4de0ed65.png
 platform/index.png: platform-163be434ff4103819c21828f4de0ed65.png
 pro.png: pro-c633975d5df7701ae85723453a73ad49.png
@@ -153,40 +141,32 @@ question.png: question-173c48e4a6e20fff153481cb52ac30cf.png
 question/index.png: question-173c48e4a6e20fff153481cb52ac30cf.png
 reference.png: reference-2a61b6f4307ebdef735e4b43e614ae3e.png
 reference/index.png: reference-2a61b6f4307ebdef735e4b43e614ae3e.png
-removeFromCanvas.png: removeFromCanvas-9c2558014fb0eac31e71b024e9410220.png
-removeFromCanvas/index.png: removeFromCanvas-9c2558014fb0eac31e71b024e9410220.png
-removeFromMap.png: removeFromMap-4c8e39f01de493e6fadeabd7e6d8e12d.png
-removeFromMap/index.png: removeFromMap-4c8e39f01de493e6fadeabd7e6d8e12d.png
 requirement.png: requirement-cff838dc3d45a8553a5273fff225cd01.png
 requirement/index.png: requirement-cff838dc3d45a8553a5273fff225cd01.png
 research.png: research-f86abb0b6acbf555a8d0f31244e99e00.png
 research/index.png: research-f86abb0b6acbf555a8d0f31244e99e00.png
 resource.png: resource-71e7130d4e5cfa588c27bec9fc2f5bd7.png
 resource/index.png: resource-71e7130d4e5cfa588c27bec9fc2f5bd7.png
-role.png: role-f4a40ce30fd80812a63c75a981686d4d.png
+role.png: role-647e1d1634586e3e7a3b8ab80ec77449.png
-role/index.png: role-f4a40ce30fd80812a63c75a981686d4d.png
+role/index.png: role-647e1d1634586e3e7a3b8ab80ec77449.png
 search_icon_32x32.png: search_icon_32x32-69cf355efabc41a792639fd80e443077.png
 search_icon_32x32/index.png: search_icon_32x32-69cf355efabc41a792639fd80e443077.png
 settings.png: settings-4d3619f3e643c1ea36feee76feb7cb53.png
 settings/index.png: settings-4d3619f3e643c1ea36feee76feb7cb53.png
 spinner.gif: spinner-2223be961bac19bdc0a65c6e39270e86.gif
 spinner/index.gif: spinner-2223be961bac19bdc0a65c6e39270e86.gif
-synapse.png: synapse-45a1ade6a366442da90bbc9e467bea69.png
-synapse/index.png: synapse-45a1ade6a366442da90bbc9e467bea69.png
-synapse2.png: synapse2-1424da68b91fe80e7c6527a1ff39c4e0.png
-synapse2/index.png: synapse2-1424da68b91fe80e7c6527a1ff39c4e0.png
-tab.png: tab-60814a9dfd8938d62ded4b267d30d06d.png
-tab/index.png: tab-60814a9dfd8938d62ded4b267d30d06d.png
 task.png: task-6d0ba79696eb668c9a6b34fed375f5fe.png
 task/index.png: task-6d0ba79696eb668c9a6b34fed375f5fe.png
+task2.png: task2-719c4c07b9ea02f9a5453989a5f5aa5d.png
+task2/index.png: task2-719c4c07b9ea02f9a5453989a5f5aa5d.png
 tool.png: tool-a9aa41a694355d723cac130155fb6de8.png
 tool/index.png: tool-a9aa41a694355d723cac130155fb6de8.png
 topbg.png: topbg-875d4334b29e9752bbf9718b94f6da9a.png
 topbg/index.png: topbg-875d4334b29e9752bbf9718b94f6da9a.png
 topbg2.png: topbg2-2a578a925e2dbf78ff8b77508a7bf46e.png
 topbg2/index.png: topbg2-2a578a925e2dbf78ff8b77508a7bf46e.png
-trajectory.png: trajectory-997f0b234e0d836cad2903b295eefd28.png
+trajectory.png: trajectory-6a8ab1e117ca61ae53f70709134e597d.png
-trajectory/index.png: trajectory-997f0b234e0d836cad2903b295eefd28.png
+trajectory/index.png: trajectory-6a8ab1e117ca61ae53f70709134e597d.png
 ui-bg_flat_0_aaaaaa_40x100.png: ui-bg_flat_0_aaaaaa_40x100-3d0f77f5d1e613e6c212e1c3acc28330.png
 ui-bg_flat_0_aaaaaa_40x100/index.png: ui-bg_flat_0_aaaaaa_40x100-3d0f77f5d1e613e6c212e1c3acc28330.png
 ui-bg_flat_75_ffffff_40x100.png: ui-bg_flat_75_ffffff_40x100-a9815e32a79da42d9a0047223b378699.png
@@ -213,16 +193,14 @@ ui-icons_888888_256x240.png: ui-icons_888888_256x240-427c065a98466145840a6a32f94
 ui-icons_888888_256x240/index.png: ui-icons_888888_256x240-427c065a98466145840a6a32f9480977.png
 ui-icons_cd0a0a_256x240.png: ui-icons_cd0a0a_256x240-b8e9df6a7b59feed26328ad5a6f77251.png
 ui-icons_cd0a0a_256x240/index.png: ui-icons_cd0a0a_256x240-b8e9df6a7b59feed26328ad5a6f77251.png
-white-curved-arrow.png: white-curved-arrow-bbecd44e3a86235d1d83de1e45108662.png
-white-curved-arrow/index.png: white-curved-arrow-bbecd44e3a86235d1d83de1e45108662.png
 wildcard.png: wildcard-595930d1e9f48c79bacef5afdfd6a469.png
 wildcard/index.png: wildcard-595930d1e9f48c79bacef5afdfd6a469.png
 WebSocketMain.swf: WebSocketMain-0de980edb45e36785bf9d862baa032bb.swf
 WebSocketMain/index.swf: WebSocketMain-0de980edb45e36785bf9d862baa032bb.swf
 WebSocketMainInsecure.swf: WebSocketMainInsecure-c4377647e57e58cacc692c8a51afc9f8.swf
 WebSocketMainInsecure/index.swf: WebSocketMainInsecure-c4377647e57e58cacc692c8a51afc9f8.swf
-application.js: application-360c6083a16b5cd18ed968ac99bcab71.js
+application.js: application-32fff722d967b095a46a0f9aef58d2ac.js
-application/index.js: application-360c6083a16b5cd18ed968ac99bcab71.js
+application/index.js: application-32fff722d967b095a46a0f9aef58d2ac.js
 scroll/mCSB_buttons.png: scroll/mCSB_buttons-0642ce29bb568932e832d150141614e6.png
 scroll/mCSB_buttons/index.png: scroll/mCSB_buttons-0642ce29bb568932e832d150141614e6.png
 Fonts/Lato-Lig-webfont.eot: Fonts/Lato-Lig-webfont-1435188a694a7d5e29cf4a3288ff3e36.eot
@@ -233,5 +211,5 @@ Fonts/Lato-Lig-webfont.ttf: Fonts/Lato-Lig-webfont-4b8f0d5ac83e783eb84848ff32546
 Fonts/Lato-Lig-webfont/index.ttf: Fonts/Lato-Lig-webfont-4b8f0d5ac83e783eb84848ff3254685c.ttf
 Fonts/Lato-Lig-webfont.woff: Fonts/Lato-Lig-webfont-47c2912f319ae759c3b1cd558b080c33.woff
 Fonts/Lato-Lig-webfont/index.woff: Fonts/Lato-Lig-webfont-47c2912f319ae759c3b1cd558b080c33.woff
-application.css: application-ceebf45e9b7b318963a36f51c245bee4.css
+application.css: application-7d15b1e4985733b33978307af5dce062.css
-application/index.css: application-ceebf45e9b7b318963a36f51c245bee4.css
+application/index.css: application-7d15b1e4985733b33978307af5dce062.css