<%= form.autocomplete_field :name, autocomplete_topic_name_topics_path, :placeholder => "What is the name of your topic?" %>
<%= form.hidden_field :metacode, :value => "Action" %>
<%= form.hidden_field :x, :value => 0 %>
diff --git a/app/views/topics/_new.html.erb b/app/views/topics/_new.html.erb
index efb7e91e..faf5c3bc 100644
--- a/app/views/topics/_new.html.erb
+++ b/app/views/topics/_new.html.erb
@@ -6,7 +6,13 @@
<%= form_for Topic.new, url: topics_url, remote: true do |form| %>
-
+
<%= form.autocomplete_field :name, autocomplete_topic_name_topics_path, :placeholder => "What is the name of your topic?" %>
<%= form.hidden_field :metacode, :value => "Action" %>
<%= form.hidden_field :x, :value => 0 %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index fd7ed11a..55d83857 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,12 +1,110 @@
<%#
# @file
- # TODO: What URL is this?
+ # /users/:id/edit
# User edit form
#%>
<%= formula_form_for @user, url: user_url do |form| %>
+
Choose Active Metacodes
+
Show AllHide All
+
+
Edit Account
<%= form.input :name, label: "Name", class: "name" %>
<%= form.input :email, label: "Email", class: "email" %>
<%= form.input :password, label: "Password", class: "password" %>
+ <%= hidden_field(:metacodes, :value, {:value => 0}) %>
<%= form.submit "Update", class: "update" %>
<% end %>
+
+
diff --git a/db/migrate/20120920013446_create_users.rb b/db/migrate/20120920013446_create_users.rb
index 6c603cd0..b120c2ff 100644
--- a/db/migrate/20120920013446_create_users.rb
+++ b/db/migrate/20120920013446_create_users.rb
@@ -3,6 +3,7 @@ class CreateUsers < ActiveRecord::Migration
create_table :users do |t|
t.string :name
t.string :email
+ t.text :settings
t.string :code, :limit => 8
t.string :joinedwithcode, :limit => 8
t.string :crypted_password
diff --git a/db/migrate/20130125194040_add_metacodes_to_user.rb b/db/migrate/20130125194040_add_metacodes_to_user.rb
new file mode 100644
index 00000000..6c395caa
--- /dev/null
+++ b/db/migrate/20130125194040_add_metacodes_to_user.rb
@@ -0,0 +1,9 @@
+class AddMetacodesToUser < ActiveRecord::Migration
+ def self.up
+ add_column :users, :settings, :text
+ end
+
+ def self.down
+ remove_column :users, :settings
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5779a0e1..2aab361a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,81 +1,82 @@
-# 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 => 20130101194424) do
-
- create_table "mappings", :force => true do |t|
- t.text "category"
- t.integer "xloc"
- t.integer "yloc"
- t.integer "topic_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 "metacodes", :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 "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 "topics", :force => true do |t|
- t.text "name"
- t.text "desc"
- t.text "link"
- t.text "permission"
- t.integer "user_id"
- t.integer "metacode_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 => 20130125210014) do
+
+ create_table "mappings", :force => true do |t|
+ t.text "category"
+ t.integer "xloc"
+ t.integer "yloc"
+ t.integer "topic_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 "metacodes", :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 "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 "topics", :force => true do |t|
+ t.text "name"
+ t.text "desc"
+ t.text "link"
+ t.text "permission"
+ t.integer "user_id"
+ t.integer "metacode_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
+ t.text "settings"
+ end
+
+end
diff --git a/test/fixtures/metacodes.yml b/test/fixtures/metacodes.yml
index 4af9d7ea..e2cdfbfa 100644
--- a/test/fixtures/metacodes.yml
+++ b/test/fixtures/metacodes.yml
@@ -115,3 +115,51 @@ twenty-seven:
twenty-eight:
name: Trajectory
icon: trajectory.png
+
+twenty-nine:
+ name: Argument
+ icon: argument.png
+
+thirty:
+ name: Con
+ icon: con_icon.png
+
+thirty-one:
+ name: Decision
+ icon: decision.png
+
+thirty-two:
+ name: Example
+ icon: example.png
+
+thirty-three:
+ name: Foresight
+ icon: foresight.png
+
+thirty-four:
+ name: Good Practice
+ icon: goodpractice.png
+
+thirty-five:
+ name: List
+ icon: list.png
+
+thirty-six:
+ name: Movie Map
+ icon: moviemap.png
+
+thirty-seven:
+ name: Note
+ icon: note.png
+
+thirty-eight:
+ name: Pro
+ icon: pro.png
+
+thirty-nine:
+ name: Research
+ icon: research.png
+
+forty:
+ name: Wildcard
+ icon: wildcard.png
+ <% end %>
+ +