Merge branch 'JoelEager-master'

Author: bgrawi

.htaccess

@@ -33,10 +33,10 @@ RewriteRule ^ index.php [L]
 
 # Set max-age one year in the future for all static assets
 # Allow caching for all assets
-<FilesMatch "\.(js|css|png|jpg|html)$">
-    Header set Cache-Control "max-age=29030400, public"
-    Header unset ETag
-    FileETag None
-    ExpiresActive On
-    ExpiresDefault A29030400
-</FilesMatch>
+#<FilesMatch "\.(js|css|png|jpg|html)$">
+#    Header set Cache-Control "max-age=29030400, public"
+#    Header unset ETag
+#    FileETag None
+#    ExpiresActive On
+#    ExpiresDefault A29030400
+#</FilesMatch>

assets/src/modules/sm/App/controllers/AppController.js

@@ -37,7 +37,7 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 			alert_generateFeatures: true,
 			alert_searchFeatures: true,
 			alert_browseFeatures: true,
-			alert_labClasses: true,
+			alert_labClasses: false,
 			action_generateSchedules: false,
 		};
 

assets/src/modules/sm/App/providers/globalKbdShortcutsFactory.js

@@ -9,6 +9,15 @@ angular.module('sm').factory('globalKbdShortcuts', function($rootScope) {
 			// Only allow to bind once, so mock function after first use
 			this.bindCtrlEnter = function() {};
 		},
+		'bindEnter': function(callback) {
+			Mousetrap.bind('enter', function(e) {
+			    $rootScope.$apply(callback);
+			    return true;
+			});
+			
+			// Only allow to bind once, so mock function after first use
+			this.bindCtrlEnter = function() {};
+		},
 		'bindPagination': function(callback) {
 			Mousetrap.bind('mod+right', function(e) {
 			    $rootScope.$apply(callback.apply(e));

assets/src/modules/sm/App/templates/help.html

@@ -19,7 +19,7 @@ <h4>Keyboard Shortcuts</h4>
 			</ul>
 			<strong>Search Page</strong>
 			<ul>
-				<li><kbd>Ctrl</kbd> + <kbd>Enter</kbd>: Search</li>
+				<li><kbd>Enter</kbd>: Search</li>
 				<li><kbd>Ctrl</kbd> + <kbd>Left</kbd> or <kbd>Right</kbd>: Move between pages of results</li>
 			</ul>
 		</div>

assets/src/modules/sm/Generate/templates/generate.html

@@ -1,11 +1,6 @@
 <form novalidate id="scheduleForm" name="schedule" class="container">
 	<div class="row">
 		<div class="col-md-8 clearfix">
-			<div class="alert alert-success" ng-show="state.ui.alert_labClasses">
-				<button type="button" class="close" data-dismiss="alert" aria-hidden="true" ng-click="state.ui.alert_labClasses = false"><i class="fa fa-times"></i></button>
-				<strong>NEW!</strong> Lab classes and other sections should now be paired with their respective sections. Just enter in classes with labs and everything should work as you expected. Please <a target="_blank" href="https://github.com/ComputerScienceHouse/schedulemaker/issues">report any issues</a> that you find!
-
-			</div>
 			<div class="alert alert-info" ng-show="state.ui.alert_generateFeatures">
 				<button type="button" class="close" data-dismiss="alert" aria-hidden="true" ng-click="state.ui.alert_generateFeatures = false"><i class="fa fa-times"></i></button>
 				Use a comma to separate courses to see which course fits your schedule better. Add courses from the Browse or Search page to your schedule as well so you can easily create schedule combinations from anywhere! Also, check out the <a ui-sref="help">help</a> page for new keyboard shortcuts.

assets/src/modules/sm/Search/controllers/SearchController.js

@@ -1,6 +1,7 @@
 /**
  * The controller holding all the logic for the search page
  */
+
 angular.module('sm').controller('SearchController', function($scope, $http, entityDataRequest, globalKbdShortcuts) {
 
 	var defaultOptions = {
@@ -203,7 +204,7 @@ angular.module('sm').controller('SearchController', function($scope, $http, enti
 		}, 100);
 	};
 
-	globalKbdShortcuts.bindCtrlEnter($scope.findMatches);
+	globalKbdShortcuts.bindEnter($scope.findMatches);
     globalKbdShortcuts.bindPagination(function() {
     	if (this.keyCode == 39 && $scope.searchPagination.currentPage + 1 < $scope.numberOfPages()) {
     		$scope.searchPagination.currentPage++;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "schedulemaker",
-  "version": "3.0.18",
+  "version": "3.0.19",
   "private": true,
   "description": "A course database lookup tool and schedule building web application for use at Rochester Institute of Technology.",
   "main": "index.php",