added ability to add existing topics to map. also the ability to remove topics from a map that you've added by mistake or don't wan't there anymore.

app/assets/stylesheets/maps.css.scss

@@ -33,3 +33,9 @@ line-height: 24px;}
 .map .desc h3 { font-style:normal; margin-top:5px; }
 
 .map .link { position:absolute; width:170px; top:295px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+
+
+
+// add topic on maps pages
+.selecttype { border:1px solid #000; margin-top: 20px; border-radius:15px; }
+.mapspages .new_item h3 { padding: 10px 26px; display: block; cursor: pointer; color: #2d6a5d; float:left; }

app/controllers/items_controller.rb

@@ -45,6 +45,10 @@ class ItemsController < ApplicationController
   def create
     
     @user = current_user
+	
+	if params[:initem]
+		@item = Item.find(params[:initem])
+	else
 		@item = Item.new()
 		@item.name = params[:item][:name]
 		@item.desc = params[:item][:desc]
@@ -54,6 +58,7 @@ class ItemsController < ApplicationController
 		@item.user = @user
 		
 		@item.save
+    end		
 	
 	if params[:item][:map]
 		@mapping = Mapping.new()

app/controllers/maps_controller.rb

@@ -67,7 +67,9 @@ class MapsController < ApplicationController
 	  redirect_to root_url and return
 	end
 	
-	respond_with(@user, @map)
+	@outitems = @map.items.order("name ASC").delete_if{|item| not item.authorize_to_view(@current)}
+  
+	respond_with(@user, @map, @outitems)
   end
   
   # PUT /users/:user_id/maps/:id
@@ -79,6 +81,14 @@ class MapsController < ApplicationController
 	@map.attributes = params[:map]
 	@map.save
 	
+	if params[:outitems]
+		@outitems = params[:outitems]
+		@outitems.each do |item|
+			@mapping = Mapping.where("map_id = ? AND item_id = ?", @map.id, item).first
+			@mapping.delete
+		end
+	end
+	
     respond_with(@user, location: user_map_path(@user, @map)) do |format|
     end
 	

app/views/maps/_newtopic.html.erb

@@ -1,7 +1,12 @@
-<div class="anypage">
+<div class="anypage mapspages">
 <%= form_for Item.new, url: user_items_url(user), remote: true do |form| %>
   <button id="closenewtopic" onclick="$('#new_item').fadeOut('fast'); $('#new_item')[0].reset(); return false;">close</button>
-  <h3>Add Topic</h3>
+  <div class="selecttype">	
+	<h3 onclick="$('.existingtopic').fadeOut('fast', function () { $('.newtopic').fadeIn('fast'); });" style="border-right:1px solid #000;">Add New Topic</h3>
+	<h3 onclick="$('.newtopic').fadeOut('fast', function () { $('.existingtopic').fadeIn('fast'); });">Add Existing Topic</h3>
+	<div style="clear:both;"></div>
+  </div>
+  <div class="newtopic">
 	  <label for="category">Category</label>
 	  <%= select_tag "category", options_from_collection_for_select(ItemCategory.order("name ASC").all, "id", "name") %>
 	  <label for="item_name">Title</label>
@@ -14,5 +19,11 @@
 	  <%= form.select(:permission, options_for_select(['commons', 'public', 'private'])) %>
 	  <%= form.hidden_field :map, :value => @map.id %>
 	  <%= form.submit "Add Item", class: "addItem", id: "addItem" %>
+  </div>
+  <div class="existingtopic" style="display:none;" >
+      <label for="initem">Select Topic To Add</label>
+	  <%= select_tag "initem", options_from_collection_for_select(Item.order("name ASC").visibleToUser(user, nil).delete_if{|item| @map.items.include?(item)}, "id", "name") %>
+	  <%= form.submit "Add Item", class: "addItem", id: "addItem" %>
+  </div>
 <% end %>
 </div>

app/views/maps/edit.html.erb

@@ -4,6 +4,8 @@
   <%= form.text_field :name %>
   <label for="map_desc">Description</label>
   <%= form.text_area :desc, class: "description", :rows => 5 %>
+  <label for="outitems">Remove Topics From Map</label>
+  <%= select_tag "outitems", options_from_collection_for_select(@outitems, "id", "name"), { :multiple => true } %>
   <label for="map_perm">Permission</label>
   <%= form.select :permission, options_for_select(['commons', 'public', 'private'], @map.permission) %>
   <%= form.submit "Update", class: "update" %>