too many changes to say

app/assets/javascripts/Jit/graphsettings.js

@@ -96,8 +96,7 @@ function graphSettings(type) {
                  selectEdgeOnClickHandler(node, e);  
 			   }
 			   else if (node && !node.nodeFrom) {
-                 //do nothing - let it select edges, etc instead
+                 selectNodeOnClickHandler(node, e);
-                 //we don't want to run double click handler
                } else {
                  canvasDoubleClickHandler(eventInfo.getPos(), e);
                }//if
@@ -223,15 +222,13 @@ function graphSettings(type) {
             onClick: function (node, eventInfo, e) {
 			   if (e.target.id != "infovis-canvas") return false;
                //clicking on an edge, a node, or clicking on blank part of canvas?
-               console.log(eventInfo);
-               console.log(eventInfo.getNode());
                if (eventInfo.getNode() == false) {
 					if (eventInfo.getEdge() != false) selectEdgeOnClickHandler(eventInfo.getEdge(), e);
 					else if (node.nodeFrom) selectEdgeOnClickHandler(node, e);  
 			   }
 			   else if (node && !node.nodeFrom) {
 				 if (!Mconsole.busy) {
-					selectNodeOnClickHandler(node);
+					selectNodeOnClickHandler(node, e);
 					Mconsole.onClick(node.id, {  
 					   hideLabels: false  
 					});
@@ -270,7 +267,7 @@ function graphSettings(type) {
       };
    }
 
-   $('body').keypress(function(e) {
+   /*$('body').keypress(function(e) {
      console.log(e);
      switch(e.keyCode) {
        case 114: case 82:
@@ -280,7 +277,7 @@ function graphSettings(type) {
          deleteSelectedEdges();
          break;
      }//switch
-   });
+   });*/
 
    return t;
 }
@@ -412,9 +409,13 @@ var nodeSettings = {
 	}
 
 function selectEdgeOnClickHandler(adj, e) {
-  if (e.altKey) {
+  if (!e.shiftKey) {
-    removeEdge(adj);
+	for (var i = 0; i < selectedEdges.length; i += 1) {
+      var edge = selectedEdges[i];
+      deselectEdge(edge);
+    }  
   }
+  
   var showDesc = adj.getData("showDesc");
   if (showDesc) {
     deselectEdge(adj);
@@ -425,24 +426,26 @@ function selectEdgeOnClickHandler(adj, e) {
   }
 }//selectEdgeOnClickHandler
 
-function selectNodeOnClickHandler(node) {
+function selectNodeOnClickHandler(node, e) {
-  $('.showcard').css('display','none');
-  $('.name').css('display','block');
-  $('.name.topic_' + node.id).css('display','none');
-  $('.showcard.topic_' + node.id).fadeIn('fast');
 				
-  //set final styles  
+  //set final styles 
-  Mconsole.graph.eachNode(function (n) {
+  if (!e.shiftKey) { 
-    if (n.id != node.id) delete n.selected;
+	  Mconsole.graph.eachNode(function (n) {
-    n.setData('dim', 25, 'current');
+		if (n.id != node.id) {
-    n.eachAdjacency(function (adj) {
+			delete n.selected;
-      deselectEdge(adj);
+			n.setData('onCanvas',false);
-    });
+		}
-  });
+		
+		n.setData('dim', 25, 'current');
+		n.eachAdjacency(function (adj) {
+		  deselectEdge(adj);
+		});
+	  });
+  }
   if (!node.selected) {
     node.selected = true;
-    node.setData('dim', 1, 'current');  
+    node.setData('dim', 30, 'current');  
-
+    node.setData('onCanvas',true);
     node.eachAdjacency(function (adj) {
       selectEdge(adj);
     });
@@ -450,6 +453,7 @@ function selectNodeOnClickHandler(node) {
   } else {
     node.setData('dim', 25, 'current');
     delete node.selected;
+	node.setData('onCanvas',false);
   }
   //trigger animation to final styles  
   Mconsole.fx.animate({
@@ -507,7 +511,7 @@ function clickDragOnTopic(node, eventInfo, e) {
 		   Mconsole.plot();
 	   }
 	   // if it's a right click or holding down alt, start synapse creation  ->third option is for firefox
-	   else if (e.button == 2 || (e.button == 0 && e.altKey) || e.buttons == 2) {
+	   else if ((e.button == 2 || (e.button == 0 && e.altKey) || e.buttons == 2) && userid != null) {
 		   if (tempInit == false) {
 			  tempNode = node;
 			  tempInit = true;   
@@ -535,9 +539,9 @@ function clickDragOnTopic(node, eventInfo, e) {
 			  var myX = e.clientX - 110;
 			  var myY = e.clientY - 30;
 			  $('#new_topic').css('left',myX + "px");
-        $('#new_topic').css('top',myY + "px");
+              $('#new_topic').css('top',myY + "px");
-        $('#new_synapse').css('left',myX + "px");
+              $('#new_synapse').css('left',myX + "px");
-        $('#new_synapse').css('top',myY + "px");
+              $('#new_synapse').css('top',myY + "px");
 			  $('#topic_x').val(eventInfo.getPos().x);
 			  $('#topic_y').val(eventInfo.getPos().y);
 			  Mconsole.plot();
@@ -594,12 +598,14 @@ function onCreateLabelHandler(domElement, node) {
 				<div class="clearfloat"></div>                                \
         </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-attribute="link"                                             \
             data-type="input">$_link_$</span>$_close_a_tag_$                  \
+	  </div>                                                                  \
 	  <div class="clearfloat"></div>                                          \
     </div>';
 
@@ -607,8 +613,14 @@ function onCreateLabelHandler(domElement, node) {
   var go_link, a_tag, close_a_tag;
   if (userid == null) {
     go_link = '';
-    a_tag = '<a href="' + node.getData("link") + '">';
+	if (node.getData("link") != "") {
-    close_a_tag = '</a>';
+      a_tag = '<a href="' + node.getData("link") + '">';
+      close_a_tag = '</a>';
+	}
+	else { 
+	  a_tag = '';
+	  close_a_tag = '';
+    }  
   } else {
     go_link = '<a href="' + node.getData("link") + '" ' + 
               '   class="go-link" target="_blank">[go]</a>';
@@ -651,7 +663,7 @@ function onCreateLabelHandler(domElement, node) {
   html = html.replace(/\$_go_link_\$/g, go_link);
   html = html.replace(/\$_a_tag_\$/g, a_tag);
   html = html.replace(/\$_close_a_tag_\$/g, close_a_tag);
-  if (node.getData("link") == "") {
+  if (node.getData("link") == "" && userid != null) {
     html = html.replace(/\$_link_\$/g, link_nil);
   } else {
     html = html.replace(/\$_link_\$/g, node.getData("link"));
@@ -673,13 +685,9 @@ function onCreateLabelHandler(domElement, node) {
 
   // add some events to the label
   $(showCard).find('img.icon').click(function(){
-    delete node.selected;
-    node.setData('dim', 25, 'current');
-    node.eachAdjacency(function (adj) {
-      deselectEdge(adj);
-    });
     $('.showcard.topic_' + node.id).fadeOut('fast', function(){
-      $('.name').css('display','block');
+      node.setData('dim', 25, 'current');
+	  $('.name').css('display','block');
       Mconsole.plot();
     });
   });
@@ -695,24 +703,28 @@ function onCreateLabelHandler(domElement, node) {
   var littleHTML = '                                                    \
 		 <div class="label">$_name_$</div>                              \
 		 <div class="nodeOptions">';
-  if (mapid == null) {
+  if (userid == null && node.id != Mconsole.root) {
 	  littleHTML += '                                                   \
 		   <span class="removeFromCanvas"                               \
 				 onclick="removeFromCanvas($_id_$)"                     \
 				 title="Click to remove topic from canvas">              \
 		   </span>';
   }
-  else if (mapid != null && userid != null) {
+  else if (mapid != null && userid != null && node.id != Mconsole.root) {
 	  littleHTML += '                                               \
+	  <span class="removeFromCanvas"                                \
+				 onclick="removeFromCanvas($_id_$)"                 \
+				 title="Click to remove topic from canvas">         \
+	  </span>                                                       \
 	  <a href="/mappings/$_mapid_$/$_id_$/removefrommap"            \
 		  title="Click to remove topic from map"                    \
-		  class="removeFromMap"                                               \
+		  class="removeFromMap"                                     \
 		  data-method="get"                                         \
 		  data-remote="true"                                        \
 		  rel="nofollow">                                           \
 	  </a>';
   }
-  if (userid != null) {
+  if (userid != null && node.id != Mconsole.root) {
 	  littleHTML += '                                               \
 	  <a href="/topics/$_id_$"                                      \
 		  title="Click to delete this topic"                        \
@@ -733,8 +745,13 @@ function onCreateLabelHandler(domElement, node) {
   style.color = "#222222";
 
   // add some events to the label
-  $(nameContainer).find('.label').click(function(){
+  $(nameContainer).find('.label').click(function(e){
-    selectNodeOnClickHandler(node)
+    $('.showcard').css('display','none');
+    $('.name').css('display','block');
+    $('.name.topic_' + node.id).css('display','none');
+    $('.showcard.topic_' + node.id).fadeIn('fast');
+	selectNodeOnClickHandler(node,e);
+	node.setData('dim', 1, 'current');
   });
   
   nameContainer.onmouseover = function(){
@@ -870,6 +887,14 @@ function hideEdge(edge) {
   Mconsole.plot();
 }
 
+function hideSelectedEdges() {
+  for (var i = 0; i < selectedEdges.length; i += 1) {
+    var edge = selectedEdges[i];
+    hideEdge(edge);
+  }
+  selectedEdges = new Array();
+}
+
 function removeSelectedEdges() {
   for (var i = 0; i < selectedEdges.length; i += 1) {
     if (mapid != null) {

app/assets/javascripts/application.js

@@ -41,10 +41,10 @@ var labelType, useGradients, nativeTextSupport, animate, json, Mconsole = null,
       event.preventDefault();
     });
 	
-	$(".focus .desc").mCustomScrollbar(); 
+	//$("#cards").mCustomScrollbar(); 
 	$(".scroll").mCustomScrollbar();
 	
-	$('.nodemargin').css('padding-top',$('.focus').css('height'));	
+	//$('.nodemargin').css('padding-top',$('.focus').css('height'));	
 	
 	// controls the sliding hover of the menus at the top
 	var sliding1 = false; 
@@ -168,8 +168,4 @@ function MconsoleReset() {
 	var mY = Mconsole.canvas.scaleOffsetY;
 	Mconsole.canvas.scale((1/mX),(1/mY));
 	
-}
+}
-
-
- 
- 

app/assets/stylesheets/application.css

@@ -38,6 +38,7 @@ body,
 .wrapper, 
 #container {
   height: 100%;
+  overflow:hidden;
 }
 
 html {
@@ -230,10 +231,18 @@ input[type="submit"] {
 }
 
 .wrapper h1.index {
-  position:absolute;
+  position: fixed;
-  top:50px;
+  bottom: 9px;
-  left:50px;
+  right: 0;
-  z-index:9999;
+  z-index: 9999;
+  width: auto;
+  background: url('black_bg.png');
+  padding: 0px 10px 0px 20px;
+  border-bottom-left-radius: 15px;
+  border-top-left-radius: 15px;
+  height: 38px;
+  font-size: 30px;
+  line-height: 38px;
 }
 
 .nodemargin {
@@ -346,7 +355,8 @@ input[type="submit"] {
 }
 
 #cards {
-  margin:100px 0;	
+  height:100%;
+  overflow-y:scroll;	
 }
 
 #cards p.empty {
@@ -509,6 +519,18 @@ input[type="submit"] {
 }
 
 /* --- styling the logo button ---*/
+.footer {
+  width: 188px;
+  display: block;
+  position: fixed;
+  bottom: 9px;
+  height: 38px;
+  background: url('black_bg.png');
+  border-bottom-right-radius: 15px;
+  border-top-right-radius: 15px;
+  z-index: 15000;
+}
+
 .logo {
   position:fixed;
   bottom:6px;
@@ -522,7 +544,7 @@ input[type="submit"] {
 
 #mainTitle {
   float: left;
-  background: #000;
+  /*background: url('black_bg.png') repeat 0 0;*/
   padding: 0 5px;
   border-radius: 10px;
 }
@@ -545,10 +567,10 @@ input[type="submit"] {
   position:absolute;
   border:none;
   bottom:40px;
-  left:0;
+  left:10px;
   height:0px;
   z-index:12;
-  width:124px;
+  width:118px;
   color: #67AF9F;
   white-space: nowrap;
   text-align: center;
@@ -563,7 +585,7 @@ input[type="submit"] {
   box-shadow: 0 2px rgba(0, 0, 0, 0.05), 0 -2px rgba(0, 0, 0, 0.05) inset;
   -webkit-box-shadow: 0 2px rgba(0, 0, 0, 0.05), 0 -2px rgba(0, 0, 0, 0.05) inset;
   -moz-box-shadow: 0 2px rgba(0, 0, 0, 0.05), 0 -2px rgba(0, 0, 0, 0.05) inset;
-  background: url('bg.png') no-repeat 0 0;
+  background: url('black_bg.png') repeat 0 0;
 }
 
 .footer ul li {
@@ -580,9 +602,9 @@ input[type="submit"] {
   border:none;
 }
 .footer ul li a:hover {
-  color:#2d6a5d;
+  color:#9E2;
 }
 .footer ul li a {
-  color: #67AF9F;
+  color: #FFF;
   display:block;
 }

app/assets/stylesheets/base.css

@@ -40,6 +40,7 @@
   background: url('bg.png');
   border-radius:15px;
   color:#000;
+  z-index: 25;
 }
 
 .CardOnGraph .scroll {

app/assets/stylesheets/maps.css.scss

@@ -3,8 +3,11 @@
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
 .saveMapLayout { 
-	margin:10px auto 5px auto;
+  float:left;
-	width:87px;
+}
+
+.saveMapLayout input {
+ margin-top:2px;
 }
 
 #MapRealtime { 

app/assets/stylesheets/topics.css.scss

@@ -13,10 +13,6 @@
   display:none !important;
 }
 
-.onMap .removeFromCanvas {
-  display:none !important;
-}
-
 .unauthenticated .deleteTopic {
   display:none !important;
 }
@@ -42,7 +38,10 @@
   background: url('delete.png') no-repeat 2px 0;
 }
 
-.topic { display:block; float:left; position:relative; width:175px; height:300px; padding:10px 5px 10px 35px; background: url('bg.png'); border-radius:15px; margin:30px 0 30px 50px; color:#000; }
+.topic { 
+  float:left; 
+  margin:30px 0 30px 50px;
+}
 
 .topic .delete {
 position: absolute;
@@ -58,7 +57,9 @@ padding: 0;
 cursor:pointer;
 }
 
-.topic .scroll { display:block; height:283px; }
+.topic .scroll { 
+  display:block; 
+}
 
 .topic .type {position: absolute;
 color: white;
@@ -75,8 +76,6 @@ line-height: 24px;}
 .topic .desc { font-size:15px; font-family:Arial, Helvetica, sans-serif; }
 .topic .desc h3 { font-style:normal; margin-top:5px; }
 
-.topic .link { position:absolute; width:140px; top:295px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
-
 .topic-go-arrow {
   width: 25px;
   height: 25px;

app/views/main/console.html.erb

@@ -1,8 +1,17 @@
   <div class="headertop">
-    <% if authenticated? %><button onclick="saveToMap();">Save to Map</button><% end %>
+    <button onclick="hideSelectedEdges();">Hide Selected</button>
+    <% if authenticated? %>
+      <button onclick="deleteSelectedEdges();">Permanently Delete Selected</button>
+      <button onclick="saveToMap();">Save to Map</button>      
+    <% end %>
     <button onclick='clearCanvas();'>Clear Canvas</button>
   </div>
   <div class="clearfloat"></div>
+  
+<h1 class="index">
+  Console
+</h1>
+
   <div class="maps onCanvas" id="container">
     <div id="center-container">
       <div id="infovis"></div>    

app/views/maps/_new.html.erb

@@ -1,5 +1,5 @@
 <div class="onConsole">
-<%= form_for @map || Map.new, url: maps_url, remote: true do |form|%>
+<%= form_for Map.new, url: maps_url, remote: true do |form|%>
   <h3>Save to Map</h3>
   <label for="map_name">Name</label>
   <%= form.text_field :name %>

app/views/maps/create.js.erb

@@ -4,7 +4,12 @@ $('#map_permission').val('commons');
 $('#map_topicsToMap').val('0');
 
 var tempForm = $('#new_map').html();
-$('#new_map').html("Success! Do you want to <br> <a href='/maps/" + '<%= @map.id %>' + "'>Go to your new map?</a><br>or<br><a href='javascript:closeIt(); event.preventDefault();'>Stay on the Console?</a>");
+if (mapid == null) {
+  $('#new_map').html("Success! Do you want to <br> <a href='/maps/" + '<%= @map.id %>' + "'>Go to your new map?</a><br>or<br><a href='javascript:closeIt(); event.preventDefault();'>Stay on the Console?</a>");
+}
+else if (mapid != null) {
+  $('#new_map').html("Success! Do you want to <br> <a href='/maps/" + '<%= @map.id %>' + "'>Go to your new map?</a><br>or<br><a href='javascript:closeIt(); event.preventDefault();'>Stay on this map?</a>");
+}
 
 function closeIt() {
   $('#new_map').fadeOut('fast', function(){

app/views/maps/savelayout.js.erb

@@ -1,3 +1,2 @@
-$('.saveNotify').remove();
+$('#saveLayout').attr('value','Saved!');
-$('.focusleft').append('<div class="saveNotify">Saved!</div>');
+setTimeout(function(){$('#saveLayout').attr('value','Save Layout')},1500);
-$('.saveNotify').delay(1500).fadeOut('fast', function(){$('.saveNotify').remove()});

app/views/maps/show.html.erb

@@ -1,4 +1,4 @@
-<div class="focus">
+<!--<div class="focus">
 	<div class="focusleft">
 		<p># of Topics: <%= @map.topics.count %></p>
 		<p># of Synapses: <%= @map.synapses.count %></p>
@@ -20,7 +20,34 @@
 		<div class="link"><p>Permissions: <%= @map.permission %></p></div>
 	</div>
 </div>
-<div class="clearfloat nodemargin"></div>
+<div class="clearfloat nodemargin"></div>-->
+
+<div class="headertop">
+    <button onclick="if (!goRealtime) { this.innerHTML = 'Stop Realtime'; $('#saveLayout').css('display','none');} else if (goRealtime) { this.innerHTML = 'Start Realtime'; $('#saveLayout').css('display','block');} goRealtime = !goRealtime;">Start Realtime</button>
+    <button onclick="hideSelectedEdges();">Hide Selected</button>
+    <% if authenticated? %>
+      <button onclick="removeSelectedEdges();">Remove Selected From Map</button>
+      <button onclick="deleteSelectedEdges();">Permanently Delete Selected</button>
+      <% if (@map.permission == "commons" && authenticated?) || @map.user == user %>
+			  <%= form_for @map, :url => savelayout_path(@map), :html => { :class => "saveMapLayout", :id => "saveMapLayout"}, remote: true do |form| %>
+				  <%= form.hidden_field "coordinates", :value => "" %>
+				  <%= form.submit "Save Layout", class: "saveLayout", id: "saveLayout" %>
+			  <% end %>
+		  <% end %>
+      <button onclick="saveToMap();">Save to New Map</button>
+    <% end %>
+    <button onclick='clearCanvas();'>Clear Canvas</button>
+</div>
+<div class="clearfloat"></div>
+
+<h1 class="index">
+  <% if (@map.permission == "commons" && authenticated?) || @map.user == user %>
+    Editing Map:
+  <% else %>
+    Viewing Map:  
+  <% end %>
+  <%= @map.name %>
+</h1>
 
 <div class="maps onMap" id="container">
   <div id="center-container">
@@ -32,6 +59,7 @@
 <% if authenticated? %>
   <%= render :partial => 'newtopic' %>
   <%= render :partial => 'newsynapse' %>
+  <%= render :partial => 'maps/new' %>
 <% end %>
 <%= form_for @map, :url => realtime_path(@map), :method => "GET", :html => { :id => "MapRealtime"}, remote: true do |form| %>
   <%= form.hidden_field :time, :value => Time.now.to_i %>
@@ -64,4 +92,8 @@
 				initialize("chaotic", true);
 		});
 	}
-</script>
+</script>
+
+<%= render :partial => 'main/find' %>
+<%= render :partial => 'main/analyze' %>
+<%= render :partial => 'main/organize' %>

app/views/topics/_topic.html.erb

@@ -1,11 +1,58 @@
-<%= div_for topic, class: topic.metacode.name do %>
+<%= div_for topic do %>
-	<% if topic.user == user %><%= link_to 'Delete', topic_path(topic), :class => 'delete', :confirm => 'Delete this topic and all synapses linking to it?', :method => :delete, :remote => true%><% end %>
+<div class="CardOnGraph"                                                  
-	<p class="type"><%= topic.metacode.name %></p>
+         id="topic_<%=topic.id %>">
-	<%= image_tag topic.metacode.icon, :class => 'icon', :size => '50x50' %>
+      <% if topic.user == user %><%= link_to 'Delete', topic_path(topic), :class => 'delete', :confirm => 'Delete this topic and all synapses linking to it?', :method => :delete, :remote => true%><% end %>         
-	<div class="scroll">
+      <p class="type best_in_place best_in_place_metacode"                    
-		<%= link_to topic.name, topic_path(topic), :class => 'title' %>
+         data-url="/topics/<%=topic.id %>"                                            
-		<div class="desc"><p><%=topic.desc %></p></div>
+         data-object="topic"                                                  
-	</div>
+         data-collection='[["Action","Action"],["Activity","Activity"],["Bizarre","Bizarre"],["Catalyst","Catalyst"],["Closed","Closed"],["Experience","Experience"],["Future Dev","Future Dev"],["Group","Group"],["Idea","Idea"],["Implication","Implication"],["Insight","Insight"],["Intention","Intention"],["Knowledge","Knowledge"],["Location","Location"],["Open Issue","Open Issue"],["Opinion","Opinion"],["Opportunity","Opportunity"],["Person","Person"],["Platform","Platform"],["Problem","Problem"],["Question","Question"],["Reference","Reference"],["Requirement","Requirement"],["Resource","Resource"],["Role","Role"],["Task","Task"],["Tool","Tool"],["Trajectory","Trajectory"]]'                                 
-	<%= link_to topic.link, topic.link, :class => 'link', :target => '_blank' %>
+         data-attribute="metacode"                                            
-    <%= best_in_place topic, :name, :nil => 'lol' %>
+         data-type="select"><%= topic.metacode.name %></p>                                  
-<% end %>
+      <%= image_tag topic.metacode.icon, :class => 'icon', :size => '50x50' %>                                                
+        <span class="title">                                                  
+          <span class="best_in_place best_in_place_name"                      
+                data-url="/topics/<%=topic.id %>"                                     
+                data-object="topic"                                           
+                data-attribute="name"                                         
+                data-type="input"><%=topic.name %></span>                             
+          <a href="/topics/<%=topic.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">                                             
+          Added by: <a href="/users/<%=topic.user.id %>" target="_blank"><%=topic.user.name %>  
+          </a>                                                                
+        </div>                                                                
+      <div class="scroll">                                                    
+        <div class="desc">                                                    
+          <span class="best_in_place best_in_place_desc"                      
+                data-url="/topics/<%=topic.id %>"                                     
+                data-object="topic"                                           
+                data-nil="<span class='gray'>Click to add description.</span>"                                       
+                data-attribute="desc"                                         
+				        data-ok-button="Save"                                         
+				        data-cancel-button="Discard"                                   
+                data-type="textarea"><%=topic.desc %></span>                          
+				<div class="clearfloat"></div>                                
+        </div>                                                                
+      </div>
+      <div class="link">
+      <% if (authenticated? && topic.permission == "commons") || topic.user == user  %>
+        <a href="<%=topic.link %>" class="go-link" target="_blank">[go]</a>
+        <span class="best_in_place best_in_place_link"                 
+            data-url="/topics/<%=topic.id %>"                                         
+            data-object="topic"                                               
+            data-attribute="link"
+            data-nil="<span class='gray'>Click to add link.</span>"            
+            data-type="input"><%=topic.link %></span> 
+      <% else %>
+        <a href="<%=topic.link %>" target="_blank"><%= topic.link %></a>
+      <% end %>
+      </div>      
+                       
+	  <div class="clearfloat"></div>                                          
+    </div>
+<% end %>

app/views/topics/index.html.erb

@@ -1,4 +1,4 @@
-<h1 class="index"><% if @user %><%= @user.name %>'s<% end %> Topics</h1>
+<h1 class="index"><% if @user %><%= @user.name %>'s <% end %>Topics</h1>
 
 <div class="topics" id="cards">
   <% @topics.each do |topic| %>
@@ -8,4 +8,21 @@
 	 <p class="empty"><br>Shucks, there are no topics. <% if authenticated? %><%= link_to "Create some if you want.", console_url %><% end %></p>
   <% end %>
 </div>
-<div class="clearfloat"></div>
+
+<script>
+  //bind best_in_place ajax callbacks
+  $('.topic').find('.best_in_place_metacode')
+      .bind("ajax:success", function() {
+    var metacode = $(this).html();
+    //changing img alt, img src for top card (topic view page) 
+    //and on-canvas card. Also changing image of node
+    $(this).parent().find('img.icon').attr('alt', metacode);
+    $(this).parent().find('img.icon').attr('src', imgArray[metacode].src);
+  });
+  
+  $('.topic').find('.best_in_place_link').bind("ajax:success", function() {
+    var link = $(this).html();
+    $(this).parent().find('.go-link').attr('href', link);
+  });
+
+</script>

app/views/topics/show.html.erb

@@ -1,4 +1,4 @@
-<div class="focus topic_<%= @topic.id %>">
+<!--<div class="focus topic_<%= @topic.id %>">
 	<div class="focusleft">
 		<p><%= @topic.metacode.name %></p>
 		<%= image_tag @topic.metacode.icon, :class => 'icon', :size => '50x50' %>
@@ -14,7 +14,11 @@
 		<%= link_to @topic.link, @topic.link, :class => 'link', :target => '_blank' %>
 	</div>
 </div>
-<div class="clearfloat nodemargin"></div>
+<div class="clearfloat nodemargin"></div>-->
+
+<h1 class="index">
+  Viewing Topic: <%= @topic.name %>
+</h1>
 
 <div class="relatives" id="container">
   <div id="center-container">

app/views/users/show.html.erb

@@ -1,4 +1,4 @@
-<div class="focus">
+<!--<div class="focus">
 	<div class="focusleft">
 		<p># of Topics: <%= @user.topics.count %></p>
 		<p># of Synapses: <%= @user.synapses.count %></p>
@@ -15,4 +15,9 @@
 	<div class="focusright">
 	</div>
 </div>
-<div class="clearfloat nodemargin"></div>
+<div class="clearfloat nodemargin"></div>-->
+
+
+<h1 class="index">
+  Viewing Mapper: <%= @user.name %>
+</h1>

public/assets/manifest.yml

@@ -1,72 +0,0 @@
----
-action.png: action-02bd981b8466a7b2cb167afffc284703.png
-activity.png: activity-27aedb9b5baea69ea88f1f2b5303862c.png
-argument.png: argument-0b523f319bce9cc9f2f08b4e39429e6d.png
-background.jpg: background-2fcc9f96ace4764a02278ada04bc0d9d.jpg
-background2-for-repeating.jpg: background2-for-repeating-8d022369a362b364c9395039167f1ffd.jpg
-background2.jpg: background2-c2b46d9ebc7d31aea8135e3c505aa1e9.jpg
-bg.png: bg-eea3f1ec61623cbc3833f8fcbf114bf8.png
-bizarre.png: bizarre-4154e4b7b2e0169cfc4af24c32119305.png
-catalyst.png: catalyst-21e04cdb0f34140b3e00d0b98aca240c.png
-closed.png: closed-11f6970ed42d52bc9352fa8860ab7479.png
-con_icon.png: con_icon-f2f77ebe92f9ae974d01c8dacd6a070c.png
-decision.png: decision-c6f539e7d36589c49f7c177b807ab186.png
-delete.png: delete-8346a9c7cd774a4b59f20705e65fef93.png
-example.png: example-ee8413ab6bfbd75e35f9dc44d1acd3a2.png
-experience.png: experience-9b77160b960af96d7289e30bb6ddb2ce.png
-foresight.png: foresight-cc773b1b576ae7ffa5563a6a67c8cf4c.png
-futuredev.png: futuredev-e3c62458cfd457b0501dddc6d9b2d8d4.png
-go-arrow-2.png: go-arrow-2-8764298d4f3bef64c1df86c12301a666.png
-go-arrow.png: go-arrow-a6053323760f32056d368796d4411a61.png
-goodpractice.png: goodpractice-f414477faf83067a6c120344db56563a.png
-group.png: group-70155e13e72ec389d64a4f80a8d62d24.png
-idea.png: idea-a829cd20fc47bba7cde2b67882924be3.png
-implication.png: implication-652ece8bc0b1060dd5ca0756393cf21e.png
-insight.png: insight-858ccca7357b37837a257e0202319b27.png
-intention.png: intention-a487d116bfcf64c7ac559ef89ed61544.png
-junto.png: junto-3bca283ec5fe80ef34d6a888b7c676b4.png
-knowledge.png: knowledge-eb4b1dc4412b210c286b934737b04f80.png
-list.png: list-2f03402c790901a3d999e8e4f66ad33c.png
-location.png: location-e1642892214a5cb4b2891f3837f437de.png
-map.png: map-d20581fb798f43034a243c27f153b88e.png
-minus.png: minus-2b44e91f7c84730925351c83f32a784e.png
-moviemap.png: moviemap-b65a3ef344dd7b8c2e28963ac85f17f7.png
-note.png: note-7305031a3a47f3b6b8d80a497416a4ac.png
-openissue.png: openissue-d9c50446b2dbd0587942ae298bda2a75.png
-opinion.png: opinion-300b4a0cf37edf5c94d6681a906faf56.png
-opportunity.png: opportunity-4fe7c2f4f5cbe678058c76924ec43a7f.png
-person.png: person-2cb4eace780426c21c109ca6475431ce.png
-platform.png: platform-29f4dc32fb5f2a9f369b92d2f51ba005.png
-pro.png: pro-d20b7ab030f19747f17afbd7fa4fd891.png
-problem.png: problem-d660aa3522f737dfd25487937bed6db1.png
-question.png: question-bf730ef7455bc8027ea65e8a6d713f32.png
-reference.png: reference-67c1f843f8a1ac1b6e23e80b29114bd7.png
-removeFromCanvas.png: removeFromCanvas-9d4aea13df00df3dab36be4f7485af82.png
-removeFromMap.png: removeFromMap-e976aad0b6b9297e2a673b51a242e07a.png
-requirement.png: requirement-d200e129a41fff36f64111f554abea72.png
-research.png: research-d01556b43c0c331aa60c17a3926e3a47.png
-resource.png: resource-4017b1e9535d80d205ceff916930cf5d.png
-role.png: role-c474b1fcb4b4f836e7ca0db67e744dc3.png
-spinner.gif: spinner-3dc049c5763846dcf9ff6cab669b2b87.gif
-task.png: task-0ac599d122a709a5e73990f1745019e0.png
-tool.png: tool-99b35794f8ea7c858ee89c062555505a.png
-topbg.png: topbg-eb18f5cf8dcfaf7dfd7e47f503956a5d.png
-topbg2.png: topbg2-f9640f6cb183bb610d0954c7759ecc23.png
-trajectory.png: trajectory-a7c520e746d4c1ffe401805b3d0cb6cd.png
-ui-bg_flat_0_aaaaaa_40x100.png: ui-bg_flat_0_aaaaaa_40x100-a1eb3e0764573ed4b261ca742ed96ac3.png
-ui-bg_flat_75_ffffff_40x100.png: ui-bg_flat_75_ffffff_40x100-841636c8f8d33987bb8d2f31e8ef92ca.png
-ui-bg_glass_55_fbf9ee_1x400.png: ui-bg_glass_55_fbf9ee_1x400-bbb04adbe79f471d8c88a2bc691231b6.png
-ui-bg_glass_65_ffffff_1x400.png: ui-bg_glass_65_ffffff_1x400-a30aa544902182c133dbb46ac40a08d2.png
-ui-bg_glass_75_dadada_1x400.png: ui-bg_glass_75_dadada_1x400-38ed9f33e066d6bee977c567d4b03650.png
-ui-bg_glass_75_e6e6e6_1x400.png: ui-bg_glass_75_e6e6e6_1x400-3e20bce1b7b2f5dd47ca6ac361805162.png
-ui-bg_glass_95_fef1ec_1x400.png: ui-bg_glass_95_fef1ec_1x400-c723e9a2b50006c6054836a10b76bb84.png
-ui-bg_highlight-soft_75_cccccc_1x100.png: ui-bg_highlight-soft_75_cccccc_1x100-081f36ef02c9233c6db45d2d566fbecd.png
-ui-icons_222222_256x240.png: ui-icons_222222_256x240-4ffd13be9750b79d62db5d2f9670150c.png
-ui-icons_2e83ff_256x240.png: ui-icons_2e83ff_256x240-94086d0ce953eb0887ab1b8140903af9.png
-ui-icons_454545_256x240.png: ui-icons_454545_256x240-db2a5b254322e84a22f467b70714c5e8.png
-ui-icons_888888_256x240.png: ui-icons_888888_256x240-6dd8599dbdeb6e2103570075622a8bd1.png
-ui-icons_cd0a0a_256x240.png: ui-icons_cd0a0a_256x240-8b44e266bdc1f57f1393579591f89222.png
-wildcard.png: wildcard-e70c8b4fbcb7419c2f7f6e7e1320848e.png
-application.js: application-bd57f495f9d53425da97ebe64d1edb1f.js
-scroll/mCSB_buttons.png: scroll/mCSB_buttons-6eb1e766df3b6b28f5cb2a218697658f.png
-application.css: application-9849d315653083388be762c0f193a232.css