From 7e1610147aabf7c6c3dd10bbd7a0aa6627eabe7c Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sun, 9 Dec 2012 19:44:18 -0500 Subject: [PATCH] Revert "removed 20121203225613_add_arranged_to_map.rb" This reverts commit baaa746a478eddc4bc3872aed858bfe94f4d8293. --- app/assets/stylesheets/items.css.scss | 13 +- config/database.yml | 2 + .../20121203225613_add_arranged_to_map.rb | 6 + db/schema.rb | 162 +++++++++--------- 4 files changed, 90 insertions(+), 93 deletions(-) create mode 100644 db/migrate/20121203225613_add_arranged_to_map.rb diff --git a/app/assets/stylesheets/items.css.scss b/app/assets/stylesheets/items.css.scss index e0402e36..a8f73290 100644 --- a/app/assets/stylesheets/items.css.scss +++ b/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; -} diff --git a/config/database.yml b/config/database.yml index 24d22eda..6705ca8f 100644 --- a/config/database.yml +++ b/config/database.yml @@ -6,6 +6,8 @@ development: encoding: unicode database: metamap002_development pool: 5 + username: postgres + password: "3112" production: min_messages: WARNING diff --git a/db/migrate/20121203225613_add_arranged_to_map.rb b/db/migrate/20121203225613_add_arranged_to_map.rb new file mode 100644 index 00000000..f5a88665 --- /dev/null +++ b/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 diff --git a/db/schema.rb b/db/schema.rb index b1835047..c4f01152 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,81 +1,81 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended to check this file into your version control system. - -ActiveRecord::Schema.define(:version => 20121026000731) do - - create_table "item_categories", :force => true do |t| - t.text "name" - t.string "icon" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "items", :force => true do |t| - t.text "name" - t.text "desc" - t.text "link" - t.text "permission" - t.integer "user_id" - t.integer "item_category_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "mappings", :force => true do |t| - t.text "category" - t.integer "xloc" - t.integer "yloc" - t.integer "item_id" - t.integer "synapse_id" - t.integer "map_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - 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 - end - - create_table "synapses", :force => true do |t| - t.text "desc" - t.text "category" - t.text "weight" - t.text "permission" - t.integer "node1_id" - t.integer "node2_id" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "users", :force => true do |t| - t.string "name" - t.string "email" - t.string "code", :limit => 8 - t.string "joinedwithcode", :limit => 8 - t.string "crypted_password" - t.string "password_salt" - t.string "persistence_token" - t.string "perishable_token" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - -end +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended to check this file into your version control system. + +ActiveRecord::Schema.define(:version => 20121203225613) do + + create_table "item_categories", :force => true do |t| + t.text "name" + t.string "icon" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "items", :force => true do |t| + t.text "name" + t.text "desc" + t.text "link" + t.text "permission" + t.integer "user_id" + t.integer "item_category_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "mappings", :force => true do |t| + t.text "category" + t.integer "xloc" + t.integer "yloc" + t.integer "item_id" + t.integer "synapse_id" + t.integer "map_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "maps", :force => true do |t| + t.text "name" + 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| + t.text "desc" + t.text "category" + t.text "weight" + t.text "permission" + t.integer "node1_id" + t.integer "node2_id" + t.integer "user_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "users", :force => true do |t| + t.string "name" + t.string "email" + t.string "code", :limit => 8 + t.string "joinedwithcode", :limit => 8 + t.string "crypted_password" + t.string "password_salt" + t.string "persistence_token" + t.string "perishable_token" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + +end