updated finding topic by name to be aware whether they are searching in the commons, or on their canvas, and only show the autocomplete if they're searching in the commons

app/assets/javascripts/Jit/filters.js

@@ -255,7 +255,29 @@ $(document).ready(function() {
    //
    $("#topic_by_name_input").keyup(function() {
           var topicName = $(this).val();
-          onCanvasSearch(topicName,null,null);
+		  
+		  // grab the checkboxes to see if the search is on the canvas, in the commons, or both
+		  firstVal = $("#onCanvas").attr('checked');
+		  secondVal = $("#inCommons").attr('checked');
+		  
+		  // only have the autocomplete enabled if they are searching in the commons
+		  
+		  if (firstVal == "checked" && secondVal == "checked"){
+			$('#topic_by_name_input').autocomplete( "option", "disabled", false );
+			onCanvasSearch(topicName,null,null);  
+		  }
+		  else if (firstVal == "checked"){
+			$('#topic_by_name_input').autocomplete( "option", "disabled", true );
+			onCanvasSearch(topicName,null,null);  
+		  }
+		  else if (secondVal == "checked"){
+			hideAll();
+			$('#topic_by_name_input').autocomplete( "option", "disabled", false ); 
+		  }
+		  else {
+			$('#topic_by_name_input').autocomplete( "option", "disabled", true );  
+		  }
+		  
    });
 			
    $('.sideOption .select_content').change(function() {

app/assets/javascripts/Jit/graphsettings.js

@@ -372,7 +372,16 @@ var nodeSettings = {
 			  var pos = node.pos.getc(true),
 			  dim = node.getData('dim'),
 			  cat = node.getData('itemcatname'),
+			  isNew = node.getData('isNew'),
 			  ctx = canvas.getCtx();
+			  
+			  // if the topic is temporary draw a green circle around it
+			  if (isNew) {
+				  ctx.beginPath();
+				  ctx.arc(pos.x, pos.y, dim+3, 0, 2 * Math.PI, false);
+				  ctx.fillStyle = 'green';
+				  ctx.fill();
+			  }
 			  ctx.drawImage(imgArray[cat], pos.x - dim, pos.y - dim, dim*2, dim*2);
 
 		  },

app/views/main/console.html.erb

@@ -64,8 +64,8 @@
 
 <span id="closeFind">close</span>
 <form id="findWhere">
-  <span class="findWhereField"><input type="checkbox"  name="onCanvas" value="1" checked="checked"><p>On my Canvas</p></span>
-  <span class="findWhereField"><input type="checkbox" name="inCommons" value="0"><p>In the Commons</p></span>
+  <span class="findWhereField"><input type="checkbox"  id="onCanvas" checked="checked"><p>On my Canvas</p></span>
+  <span class="findWhereField"><input type="checkbox" id="inCommons"><p>In the Commons</p></span>
 </form>
 <div class="sideOption" id="sideOptionFind">
   <span class="find_key">Find...</span>

public/assets/manifest.yml

@@ -1,49 +0,0 @@
----
-48px-all.zip: 48px-all-2dd6aaa6c99e01af92fd7aa61fbf642a.zip
-96px-gen001.zip: 96px-gen001-a2e2d959694d5f3c98e717eb4f82d5dd.zip
-action.png: action-02bd981b8466a7b2cb167afffc284703.png
-activity.png: activity-27aedb9b5baea69ea88f1f2b5303862c.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
-col2.png: col2-4f58f5695026bcc1789ef2a87be40897.png
-experience.png: experience-8068d2c812493d1852ee7e3c992365ce.png
-futuredev.png: futuredev-e3c62458cfd457b0501dddc6d9b2d8d4.png
-gradient.png: gradient-6c6f5be85356b9e5ff76658e56ccc0f9.png
-group.png: group-70155e13e72ec389d64a4f80a8d62d24.png
-idea.png: idea-283b58d94b9166856f2734e3c5426ca4.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
-location.png: location-e1642892214a5cb4b2891f3837f437de.png
-old icons/action.png: old icons/action-d55838ce24528a56dd241c285ef2349a.png
-old icons/group.png: old icons/group-bd3f38a2d40c7aef4123fd61caa833c7.png
-old icons/intention.png: old icons/intention-6fc1087e39981084643eb9d713f82d90.png
-old icons/location.png: old icons/location-4f88b890ffc41fea38627f59f2c19a3e.png
-old icons/person.png: old icons/person-be021351add736f73b07acc5880ecbf4.png
-old icons/resource.png: old icons/resource-9e40d89dbf5a02859533b6c02eabe2d8.png
-openissue.png: openissue-d9c50446b2dbd0587942ae298bda2a75.png
-opinion.png: opinion-c65d63ce63d9c1dc01f60b2f9a4fecfe.png
-opportunity.png: opportunity-4fe7c2f4f5cbe678058c76924ec43a7f.png
-person.png: person-2cb4eace780426c21c109ca6475431ce.png
-platform.png: platform-29f4dc32fb5f2a9f369b92d2f51ba005.png
-problem.png: problem-d660aa3522f737dfd25487937bed6db1.png
-question.png: question-bc1ccabf1e7cb8b4b6d6744fe096760c.png
-reference.png: reference-c840b77477e0dc3fd431236766793a5f.png
-requirement.png: requirement-d200e129a41fff36f64111f554abea72.png
-resource.png: resource-4017b1e9535d80d205ceff916930cf5d.png
-role.png: role-c474b1fcb4b4f836e7ca0db67e744dc3.png
-task.png: task-0ac599d122a709a5e73990f1745019e0.png
-tool.png: tool-45532482693a381d4da31c103392ee5b.png
-topbg.png: topbg-eb18f5cf8dcfaf7dfd7e47f503956a5d.png
-topbg2.png: topbg2-f9640f6cb183bb610d0954c7759ecc23.png
-trajectory.png: trajectory-a7c520e746d4c1ffe401805b3d0cb6cd.png
-application.js: application-0c68d381554b6624bf1ffdf17eb7420a.js
-scroll/mCSB_buttons.png: scroll/mCSB_buttons-6eb1e766df3b6b28f5cb2a218697658f.png
-application.css: application-2fa20a0fe4b676a391d905bd91e99c83.css