fixed front page styling

UFPE · May 1, 2015 · 23faf3e · 23faf3e
1 parent 5208839
commit 23faf3e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -16,7 +16,6 @@
 //= require bootstrap-sprockets
 
 jQuery(document).ready(function() {
-
 	$('.maintable').find('.answers').hide(); //Hide/close all containers
     $('.maintable').find('.additional').hide();
     $('.text').addClass('toggler').removeClass('text');
@@ -26,7 +25,8 @@ jQuery(document).ready(function() {
 		$('#q' + $(this).attr('id')).find('.answers').toggle();
 		$('#q' + $(this).attr('id')).find('.additional').toggle();
 		$('#q' + $(this).attr('id')).find('.text, .toggler').toggleClass("text toggler");
-		$('#q' + $(this).attr('id')).find('.colname, .toggler2').toggleClass("colname toggler2");		
+		$('#q' + $(this).attr('id')).find('.colname, .toggler2').toggleClass("colname toggler2");
 	});
+
 });
 
diff --git a/app/views/collections/_collections_table.html.haml b/app/views/collections/_collections_table.html.haml
@@ -3,13 +3,16 @@
     %table.table.table-striped#problems
       %thead
         %tr
+        %th
         %th Question Text
         %th Collections
         %th Tags
         %th Remove from collection
       %tbody
         - problems.each do |problem|
           %tr
+          %tr{:id => "q#{problem.id - 1}"}
+            %td= check_box_tag "problems[#{problem.id}]", 1
             %td
               = problem.html5.html_safe
               = "Created Date: " + problem.created_date.to_s + " | "

diff --git a/app/views/collections/_form.html.haml b/app/views/collections/_form.html.haml
@@ -13,3 +13,4 @@
     =link_to export_path(:id => collection), :class => 'btn btn-default' do
       %span.glyphicon.glyphicon-export
       Export
+
diff --git a/app/views/problems/_problems_table.html.haml b/app/views/problems/_problems_table.html.haml
@@ -32,11 +32,11 @@
 /               - problem.tags.each do |tag|
 /                 %span= tag
 /               = text_field_tag(:username, params[:username], class: 'form-control', id: 'add_tags', placeholder: "Add tags")
-/ =======
-=form_tag checked_problems_path do
-  =select_tag 'dropdown', options_from_collection_for_select(Collection.where(instructor_id: @current_user), "id","name")
-  =submit_tag 'Add problems to the collection', class: 'btn'
-  %div.col-md-10
+/ ======= 
+=form_tag checked_problems_path, class: 'form-inline' do
+  %div.form-group
+    =select_tag 'dropdown', options_from_collection_for_select(Collection.where(instructor_id: @current_user), "id","name"), class: 'form-control'
+    =submit_tag 'Add problems to the collection', class: 'btn btn-primary'
     %div{:class => "maintable"}
       %div.table-responsive
         %table.table.table-striped#problems

diff --git a/app/views/upload/index.html.haml b/app/views/upload/index.html.haml
@@ -1,11 +1,6 @@
-%div.col-md-10
-	%div{:style=>"margin-top: 2%; margin-left: 21%; border-style:dashed; border-width:4px; border-color: #d3dbe1;"}
-		%div{:style=>"margin: 10%; margin-left: 38%"}
-			= form_tag("", multipart: true) do
-				= file_field_tag 'ruql_file', :id => 'file_upload'
-				%br
-				%br
-				%br
-				%br
-				%div{:style=>"margin-left: 8%"}
-					= submit_tag('Upload File', :class => 'btn btn-primary')
+%div{:style=>"margin-top: 2%; border-style:solid;border-color: transparent;"}
+	%div{:style=>"margin: 10%; margin-left: 38%"}
+		= form_tag("", multipart: true) do
+			= file_field_tag 'ruql_file', :id => 'file_upload'
+			%div{:style=>"margin-left: 8%"}
+				= submit_tag('Upload File', :class => 'btn btn-primary')