minor style things

kkatzen · Apr 30, 2015 · c27040a · c27040a
1 parent e5dfa07
commit c27040a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/assets/js/index.js b/assets/js/index.js
@@ -385,11 +385,11 @@ window.onload = function () {
 	});
 
 	$('#accShow').on('click', function() {
-	    if($(this).text() == 'Hide All') {
-	        $(this).text('Expand Sections');
+	    if($(this).text() == 'Close Folders') {
+	        $(this).text('Expand Folders');
 	        $('.folderCollapse').collapse('hide');
 	    } else {
-	        $(this).text('Hide All');
+	        $(this).text('Close Folders');
 	        $('.folderCollapse').collapse('show');
 	    }
 	    return false;

diff --git a/views/home/admin.ejs b/views/home/admin.ejs
@@ -125,6 +125,10 @@ ul {
 	height:10px;
 	float:left;
 }
+#refreshData {
+	float: right;
+	margin-top: -6px;
+}
 
 </style>
 <script src="lib/codemirror.js"></script>
@@ -301,8 +305,12 @@ ul {
 			<!-- STUDENT PROGRESS SECTION -->
 			<div class="panel panel-default">
 				<div class="panel-heading">
-					Student Attempts  <!-- <span id="function" class="label label-info" data-toggle="tooltip" data-placement="top" title="Students with full correct points">0%</span><span id="style" class="label label-success" data-toggle="tooltip" data-placement="top" title="Students with full style points">0%</span> -->
-					<button class="btn btn-primary btn-sm pull-right" id="refreshData" data-toggle="tooltip" data-placement="top" title="Progress Bar updates in realtime. Use refresh to update table below.">Refresh</button>
+					<h4 class="panel-title">
+						Student Attempts
+						<span id="function" class="label label-info" data-toggle="tooltip" data-placement="top" title="Students with full correct points">0%</span><span id="style" class="label label-success" data-toggle="tooltip" data-placement="top" title="Students with full style points">0%</span>
+						<button class="btn btn-primary btn-sm" id="refreshData" data-toggle="tooltip" data-placement="top" title="Progress Bar updates in realtime. Use refresh to update table below.">Refresh</button>
+
+					</h4>
 				</div>
 				<div id="allStudents1ProblemTable">
 					<div class="panel-body">

diff --git a/views/home/index.ejs b/views/home/index.ejs
@@ -133,7 +133,7 @@ User.find({admin: true}).exec(function(err, users) {
     	<div class="row">
       		<div>
       			<button type="button" id="accShow" class="btn btn-default" aria-label="Left Align" >
-      			Expand sections</button>
+      			Expand Folders</button>
       		    <div class="panel-group scrollableAccordian" id="folderAccordion" >
 
 			    </div>