Merge branch 'devel'

app/assets/stylesheets/items.css.scss

@@ -29,21 +29,10 @@ line-height: 24px;}
 
 .item .icon { position:absolute; top:135px; left:-25px; }
 
-.item .title { 
-  font-size:22px; 
-  line-height:25px; 
-  display:block; 
-  border-bottom:2px solid #000; 
-  padding-bottom:5px; 
-}
+.item .title { font-size:22px; line-height:25px; display:block; border-bottom:2px solid #000; padding-bottom:5px; }
 
 .item .desc { font-size:15px; font-family:Arial, Helvetica, sans-serif; }
 .item .desc h3 { font-style:normal; margin-top:5px; }
 
 .item .link { position:absolute; width:170px; top:295px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
 
-.item .add-synapse {
-  position: absolute;
-  bottom: 48%;
-  right: 0.3em;
-}

config/database.yml

@@ -6,6 +6,8 @@ development:
   encoding: unicode
   database: metamap002_development
   pool: 5
+  username: postgres
+  password: "3112"
 
 production:
   min_messages: WARNING

db/migrate/20121203225613_add_arranged_to_map.rb

@@ -0,0 +1,6 @@
+class AddArrangedToMap < ActiveRecord::Migration
+  def change
+	add_column :maps, :arranged, :boolean
+	Map.update_all ["arranged = ?", false]
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121026000731) do
+ActiveRecord::Schema.define(:version => 20121203225613) do
 
   create_table "item_categories", :force => true do |t|
     t.text     "name"
@@ -45,12 +45,12 @@ ActiveRecord::Schema.define(:version => 20121026000731) do
 
   create_table "maps", :force => true do |t|
     t.text     "name"
-    t.boolean  "arranged"
     t.text     "desc"
     t.text     "permission"
     t.integer  "user_id"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
+    t.boolean  "arranged"
   end
 
   create_table "synapses", :force => true do |t|