UI update with button sand icons

app/assets/stylesheets/application.scss

@@ -27,15 +27,31 @@
  h1, p {
  	margin: 10px;
  	padding: 0px;
- 	text-align: center;
- 	font-family: 'Open Sans';
+	font-family: 'Open Sans', Helvetica, Arial, sans-serif;
  	font-weight: 700;
  }
 
+.message{
+	color: red;
+}
+
+.col-md-10 {
+	// width: 100%;
+}
+
 a {
  	text-decoration: none;
  }
 
+p.collectioncontrols {
+	display: inline;
+	margin: 0;
+}
+
+.btn {
+	font-family: 'Open Sans', Helvetica, Arial, sans-serif
+}
+
  a:link, a:visited, a:hover, a:active {
  	text-decoration: none;
  }
@@ -55,6 +71,10 @@ a {
 
  }
 
+ .title {
+ 	text-align: center;
+ }
+
 ul#navbar {
 	list-style: none;
 }
@@ -90,6 +110,7 @@ li#navbar {
 	background: #EBF4FA;
 	padding: 10px;
 }
+
 #thetextarea {
 	height: 100%;
 	width: 100%;

app/assets/stylesheets/problems.css.scss

@@ -21,8 +21,6 @@
     transition: all 0.5s ease;
     }
 
-
-
 	ol.questions { list-style-type: none; }
     li.question { page-break-inside: avoid; }
     li.multiplechoice  ol.answers { list-style-type: lower-alpha; }

app/controllers/collections_controller.rb

@@ -36,7 +36,7 @@ def destroy
   def export
     @html_code = Collection.find(params[:id]).export
     if not @html_code
-      flash[:notice] = 'Cannot export an empty collection! Add some questions to your collection'
+      flash[:notice] = 'Cannot export an empty collection! Add some questions to your collection first!'
       flash.keep
       redirect_to edit_collection_path( id: params[:id])
     end

app/views/collections/edit.html.haml

@@ -1,9 +1,8 @@
-%h3= "Your collection #{@collection.name}"
+%h3= "Your collection: #{@collection.name}"
 =render :partial=> 'form', locals: {collection: @collection}
-%p 
-  Delete this collection? 
-  =link_to(image_tag('trashcan.png', width: 21),  collection_path(@collection), method: :delete, :confirm => 'Delete this collection?')
-%p 
-  Export this collection: 
-  =link_to 'export button', export_path(:id => @collection) 
-= render :partial => "shared/problems_table", locals: {problems_index: false, collection: @collection, problems: @collection.problems}
+%p.collectioncontrols
+  =link_to "Delete Collection", collection_path(@collection), :class => 'btn btn-danger', method: :delete, :confirm => 'Delete this collection?'
+%p.collectioncontrols
+  =link_to "Export Collection", export_path(:id => @collection), :class => 'btn btn-info'
+
+= render :partial => "shared/problems_table", locals: {problems_index: false, collection: @collection, problems: @collection.problems}

app/views/collections/finalize_upload.html.haml

@@ -9,10 +9,9 @@
         -@collections.each do |collection|
           %tr
             =render :partial=> 'form', locals: {collection: collection}
-            %p 
-              Delete this collection? 
-              =link_to 'assets/images/trashcan.png', collection_path(collection), method: :delete, :confirm => 'Delete this collection?'
-            %p 
+            %p.collectioncontrols
+              =link_to(image_tag('trashcan.png', width: 21),  collection_path(@collection), method: :delete, :confirm => 'Delete this collection?')
+            %p.collectioncontrols
               Export this collection: 
               =link_to 'export button', export_path(:id => collection) 
             = render :partial => "shared/problems_table", locals: {problems_index: false, collection: collection, problems: collection.problems}

app/views/collections/new.html.haml

@@ -1,4 +1,4 @@
-%h1 Create New Collection
+%h2 Create New Collection
 
 
 = render "form", :collection => @collection

app/views/instructor/show.html.haml

@@ -1,6 +1,6 @@
 -# in app/views/show.html.haml
 
-%h2 Dashboard #{@current_user.name}
+%h2 #{@current_user.name}'s Dashboard
 
 -if @collections.empty?
   %h3 You have no collections! Start one now.
@@ -17,20 +17,23 @@
     %table.table.table-striped#collections
       %thead
         %tr
+        %th 
         %th Name
-        %th No. of Questions
+        %th # Questions
         %th Description
         %th Last Used
-        %th Mark as current
+
       %tbody
         - @collections.each do |collection|
           %tr
+          %td
+            -if @current_user.current_collection == collection.id 
+              =link_to image_tag('yellowstar.png', width: 30), mark_as_current_path(:id => collection.id) 
+            -else 
+              =link_to image_tag('graystar.png', width: 30), mark_as_current_path(:id => collection.id)
           %td= link_to collection.name, edit_collection_path(:id => collection.id)
           %td= collection.problems.length
           %td= collection.description
           %td= collection.last_used
-          %td
-            -if @current_user.current_collection == collection.id 
-              =link_to 'should be gold star', mark_as_current_path(:id => collection.id) 
-            -else 
-              =link_to 'should be grey star', mark_as_current_path(:id => collection.id)
+
+

app/views/problems/_filter.html.haml

@@ -1,5 +1,6 @@
 
 = form_tag problems_path, :method => :get, :id => "filter_form" do
+
   %div.form-group
     = label_tag(:search, "Search Keywords:")
     = text_field_tag(:search, params[:search], class: 'form-control', placeholder: "Search")

app/views/problems/index.html.haml

@@ -3,4 +3,5 @@
 %div.col-md-2#sidebar-filter
 	= render "filter"
 
+
 = render :partial => "shared/problems_table", locals: {problems_index: true, problems: @problems}