added buttons for upload

app/assets/stylesheets/application.scss

@@ -20,14 +20,26 @@
  	padding: 0px;
  }
 
+ #main {
+ 	margin: 20px;
+ }
+
  h1, p {
  	margin: 0px;
  	padding: 0px;
  }
+
+a {
+ 	text-decoration: none;
+ }
 
 
  a:link, a:visited, a:hover, a:active {
- 	color: #2163E3;
+ }
+
+ .btn-primary, .btn-info {
+ 	//float: right;
+ 	margin: 20px 5px;
  }
 
  h1.title, p.welcome {

app/views/instructor/show.html.haml

@@ -5,10 +5,12 @@
 -if @collections.empty?
   %h3 You have no collections! Start one now.
   =link_to 'start a new collection', new_collection_path, :class => 'btn btn-info', :id=> 'add_collection'
+  =link_to 'upload new questions', upload_path, :class => 'btn btn-primary', :id=> 'upload_questions'
 
 -else
 
   =link_to 'start a new collection', new_collection_path, :class => 'btn btn-info', :id=> 'add_collection'
+  =link_to 'upload new questions', upload_path, :class => 'btn btn-primary', :id=> 'upload_questions'
 
 %div.col-md-10
   %div.table-responsive

db/schema.rb

@@ -14,11 +14,16 @@
 ActiveRecord::Schema.define(:version => 20150404010702) do
 
   create_table "collections", :force => true do |t|
-    t.integer  "instructor_id"
     t.string   "name"
     t.datetime "last_used"
     t.datetime "created_at",    :null => false
     t.datetime "updated_at",    :null => false
+    t.integer  "instructor_id"
+  end
+
+  create_table "collections_instructors", :id => false, :force => true do |t|
+    t.integer "collection_id"
+    t.integer "instructor_id"
   end
 
   create_table "collections_problems", :id => false, :force => true do |t|
@@ -38,7 +43,7 @@
 
   create_table "problems", :force => true do |t|
     t.integer  "instructor_id"
-    t.text     "text"
+    t.string   "text"
     t.datetime "created_date"
     t.string   "created_by"
     t.boolean  "is_public"

text.rb

@@ -0,0 +1,9 @@
+quiz '' do 
+ select_multiple do
+    text 'Which statements are TRUE regarding Rails routes and the resources to which they refer?'
+    answer 'In an MVC app, every valid route must eventually trigger a controller action.'
+    answer 'One common set of RESTful resource actions are the CRUD actions on models.'
+    distractor 'A route always contains one or more wildcard parameters, such as ":id", to identify the particular resource named in the operation.',
+    :explanation => "Some routes, such as those to list all resources of a given type or create a new resource of a given type, don't require any such identifier."
+  end 
+ end