adds tags

TheDesignExchange · Jul 24, 2014 · e5ab73a · e5ab73a
1 parent 7f9f18d
commit e5ab73a
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 14 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -25,7 +25,32 @@
 $(function(){
 		$('textarea').unbind();
 })
+function removeTag(id, self){
+	console.log("/tags/" + id);
+	$.ajax({
+	  url: "/tags/" + id,
+	  type: "DELETE"
+	});
+	$(self).parent().remove();
+}
 
+function createTag(model, model_id, tag){
+	var value = $(tag).parent().siblings('input').val();
+	tag = {};
+	tag[model + "_id"] = model_id;
+	tag["content"] = value
+	// console.log(tag);
+	$.ajax({
+	  url: "/tags",
+	  type: "POST",
+	  data: {tag: tag, commit:"Create Tag"},
+	  success: function(html){
+	  	console.log(html);
+	  	$('.tag-list').append(html.tag);
+	  },
+	  dataType: "json"
+	});
+}
 
 function DOM(){}
 DOM.tag = function(t){

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -19,7 +19,11 @@
 
  */
 
-
+.tag-list > span{
+  margin-bottom: 5px;
+  display: inline-block;
+  margin-bottom: 4px;
+}
 .nav-row > *{
   margin: 2px;
 }

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
@@ -22,4 +22,13 @@ def login
   def register
   	render layout: "custom" 
   end
+
+  def tagify(content, options)
+    tag = "<span class='tag-label label-gap'>#{content}  " 
+      if options[:removable]
+        tag = tag + '<span class="glyphicon glyphicon-remove-circle"></span>' 
+      end
+      tag = tag + '</span>'
+    tag.html_safe
+  end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -19,14 +19,13 @@ def human_boolean(boolean)
 	    boolean ? 'Yes' : 'No'
 	end
 
-	def tagify(content)
-		# tag << eos 
-		# 	<span class="tag-label label-gap">brainstorming 
-	 #         <span class="glyphicon glyphicon-remove-circle"></span>
-	 #        </span>
-  #       eos
-  		tag = content
-        tag.html_safe
+	def tagify(id, content, options)
+		tag = "<span class='tag-label label-gap'>#{content}  " 
+	    if options[:removable]
+	    	tag = tag + '<span onclick="removeTag('+ (id.to_s) +', this);" class="glyphicon glyphicon-remove-circle"></span>' 
+	    end
+	    tag = tag + '</span>'
+		tag.html_safe
 	end
 
 end

diff --git a/app/views/design_methods/_form.html.erb b/app/views/design_methods/_form.html.erb
@@ -1,5 +1,9 @@
 <script> 
   $(function(){
+    adjustSaveBar();
+  });
+
+  function adjustSaveBar(){
     var pH = $('#publish-btn').parent().height()
     var eH = $('#publish-btn').height()
     $('#publish-btn').css('margin-top', (pH - eH)/2)
@@ -11,7 +15,7 @@
     pH = $('#auto-saved-text').parent().height()
     eH = $('#auto-saved-text').height()
     $('#auto-saved-text').css('margin-top', (pH - eH)/2)
-  });
+  }
 </script>
 <%= form_for @design_method, :html => {:multipart => true} do |f| %>
 <!-- ERROR MESSAGES -->
@@ -92,9 +96,17 @@
     <!-- TAGS -->
   	<div class="row">
 			<h4>Tags</h4>  
-      <input type="text" class="form-control" placeholder="Tag">
-      <p>
-        <%= tagify("test") %>
+      <div class="input-group">
+      <input type="text" class="form-control">
+      <span class="input-group-btn">
+        <button class="btn btn-default" type="button" onclick="createTag('design_method', <%=params[:id]%>, this);">Add Tag</button>
+      </span>
+    </div>
+    <br>
+      <p class='tag-list'>
+        <% @design_method.tags.each do |t| %>
+         <%= tagify(t.id, t.content, {:removable => true}) %>
+        <% end %>
       </p>
   	</div>
 	</div>

diff --git a/app/views/design_methods/show.html.erb b/app/views/design_methods/show.html.erb
@@ -59,7 +59,10 @@
   	<div class="row">
 			<h4>Tags</h4>
       <p>
-        No tags available
+        <% @method.tags.each do |t| %>
+         <%= tagify(t.id, t.content, {:removable => false}) %>
+        <% end %>
+        <%= "No tags available" unless not @method.tags.empty? %>
       </p>
       <!-- END TAGS -->
   	</div>