push to live successful! swapping back out files for normal dev

app/assets/javascripts/application.js

@@ -56,7 +56,7 @@ var labelType, useGradients, nativeTextSupport, animate, json, Mconsole = null,
             sliding1 = true; 
 			if (userid != null) {
               $('.footer .menu').animate({
-				height: '282px'
+				height: '272px'
 			  }, 300, function() {
 				sliding1 = false;
 			  });

db/migrate/20130101193917_create_topics.rb

@@ -0,0 +1,13 @@
+class CreateTopics < ActiveRecord::Migration
+  def change
+    create_table :topics do |t|
+      t.text :name
+      t.text :desc
+      t.text :link
+	    t.text :permission
+	    t.integer :user_id
+	    t.integer :metacode_id
+      t.timestamps
+    end
+  end
+end

db/migrate/20130101194424_create_metacodes.rb

@@ -0,0 +1,10 @@
+class CreateMetacodes < ActiveRecord::Migration
+  def change
+    create_table :metacodes do |t|
+      t.text :name
+      t.string :icon
+      
+      t.timestamps
+    end
+  end
+end

db/migrate/20130101215010_items_to_topics.rb

@@ -1,12 +0,0 @@
-class ItemsToTopics < ActiveRecord::Migration
-  def change
-    drop_table :topics
-    drop_table :metacodes
-    
-    rename_column :items, :item_category_id, :metacode_id
-    rename_column :mappings, :item_id, :topic_id
-  
-    rename_table :items, :topics
-    rename_table :item_categories, :metacodes
-  end
-end

public/assets/manifest.yml

@@ -1,75 +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
-black_bg.png: black_bg-26d4542c5932f6c4ece93b0a27f9b8de.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
-synapse.png: synapse-0f8a7e93a09eb65282152dfe780cec41.png
-synapse2.png: synapse2-6bd9c22212bda7f093fd9ef6ad4c5925.png
-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-fdd4bfea5a8df91457790db5b697aa2c.js
-scroll/mCSB_buttons.png: scroll/mCSB_buttons-6eb1e766df3b6b28f5cb2a218697658f.png
-application.css: application-ee2e4187cd7450789d2a4599219b5ee8.css