Various spa improvements and fixes

Author: bgrawi

.htaccess

@@ -1,27 +1,24 @@
-RewriteEngine On
-
-#Legacy Rewrites
-RewriteCond %{QUERY_STRING} ^id=(.*)$ [NC]
-RewriteRule ^schedule.php$ /schedule/%1? [NC,L,R=301]
-
-#RewriteRule ^index.php$ / [L,R=301]
-#RewriteRule ^generate.php$ /generate [L,R=301]
-#RewriteRule ^browse.php$ /browse [L,R=301]
-#RewriteRule ^roulette.php$ /search [L,R=301]
-
-
-# Let old ScheduleMaker handle Resig's schedules for now
-RewriteCond %{QUERY_STRING} ^mode=old&id=(.*)$ [NC]
-RewriteRule ^schedule.php$ http://schedule-old.csh.rit.edu/schedule.php [NC,L,R=301]
-
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteCond %{REQUEST_FILENAME}\.php -f
-RewriteRule ^api/([^/]*)(?:/([^/]*))*$ api/$1.php [L]
-
-# Don't rewrite files or directories
-RewriteCond %{REQUEST_FILENAME} -f [OR]
-RewriteCond %{REQUEST_FILENAME} -d
-RewriteRule ^ - [L]
-
-# Rewrite everything else to index.html to allow html5 state links
-RewriteRule ^ index.php [L]
+RewriteEngine On
+
+#Legacy Rewrites
+RewriteCond %{QUERY_STRING} ^id=(.*)$ [NC]
+RewriteRule ^schedule.php$ /schedule/%1? [NC,L,R=302]
+
+
+# Let old ScheduleMaker handle Resig's schedules for now
+#RewriteCond %{QUERY_STRING} ^mode=old&id=(.*)$ [NC]
+RewriteRule ^schedule.php$ http://schedule-old.csh.rit.edu/schedule.php [NC,L,R=302]
+
+#RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME}\.php -f
+RewriteRule ^api/([^/]*)(?:/([^/]*))*$ api/$1.php [L]
+
+
+# Don't rewrite files or directories
+RewriteCond %{REQUEST_FILENAME} -f [OR]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteRule ^ - [L]
+
+
+# Rewrite everything else to index.html to allow html5 state links
+RewriteRule ^ index.php [L]

assets/src/templates/404.html

@@ -0,0 +1,3 @@
+<div class="container">
+	<div class="alert alert-danger"><i class="fa fa-exclamation-circle"></i> 404 Error. The page you were looking for was not found. <a ui-sref="index">Go back to the homepage.</a></div>
+</div>

js/templates/cart.html assets/src/templates/cart.htmljs/templates/cart.html renamed to assets/src/templates/cart.html

@@ -22,7 +22,8 @@ gulp.task('templates', function() {
 	return gulp.src(paths.templates.src)
 		.pipe(htmlmin({
 			collapseWhitespace: true,
-			caseSensitive: true
+			caseSensitive: true,
+			keepClosingSlash: true
 		}))
 		.pipe(gulp.dest(paths.templates.dest));
 });

js/templates/courseselect.html assets/src/templates/courseselect.htmljs/templates/courseselect.html renamed to assets/src/templates/courseselect.html

@@ -16,13 +16,17 @@ app.config(function($stateProvider, $urlRouterProvider, $locationProvider) {
 
 	$locationProvider.html5Mode(true);
 
-	$urlRouterProvider.otherwise("/?status=404");
+	$urlRouterProvider.otherwise("/404");
 
 	$stateProvider
 	.state('index', {
 		url: '/',
 		templateUrl: '/assets/build/templates/index.html'
 	})
+	.state('404', {
+		url: '/404',
+		templateUrl: '/assets/build/templates/404.html'
+	})
 	.state('generate', {
 		url: '/generate',
 		templateUrl: '/assets/build/templates/generate.html',
@@ -503,7 +507,7 @@ app.controller("AppCtrl", function($scope, localStorage, $window, $filter, $stat
 					return course.sections.reduce(
 						function(total, section) { 
 							return total && section.selected;
-					});
+					}, true);
 				},
 
 				/**
@@ -1351,7 +1355,7 @@ app.factory('uiDayFactory', function() {
 app.directive("courseCart", function() {
 	return {
 		restrict: 'A',
-		templateUrl: '/js/templates/cart.html'
+		templateUrl: '/assets/build/templates/cart.html'
 	};
 });
 app.directive("dowSelectFields", function(uiDayFactory) {
@@ -1410,7 +1414,7 @@ app.directive("loadingButton", function(uiDayFactory) {
 app.directive("scheduleCourse", function(){
 	  return {
 	    restrict: "C",
-	    templateUrl: './js/templates/courseselect.html',
+	    templateUrl: '/assets/build/templates/courseselect.html',
 	  };
 });
 app.directive("dynamicItems", function($compile,$timeout, globalKbdShortcuts){
@@ -1595,7 +1599,7 @@ app.directive('pinned', function() {
 
 			var $window = $(window),
 			sizer = elm.parent().parent().find(".pinned-sizer"),
-			$footer = $("#footer"),
+			$footer = $("footer.main"),
 			fO, sO;
 			var updateHeight = function() {
 				fO = $window.height() - $footer.offset().top - $footer.outerHeight();
@@ -2030,7 +2034,7 @@ app.directive('schedule', function($timeout, $filter) {
 
 	return {
 		restrict: 'A',
-		templateUrl: '/js/templates/schedule.html',
+		templateUrl: '/assets/build/templates/scheduleitem.html',
 		link: {
 			pre: function(scope, elm, attrs) {
 				scope.scheduleController = new Schedule(scope);
@@ -2156,10 +2160,9 @@ app.controller("ScheduleCtrl", function($scope, parsedSchedule) {
 });
 
 
-app.controller("ScheduleViewCtrl", function($scope, $location) {
+app.controller("ScheduleViewCtrl", function($scope, $location, $stateParams) {
 
-	var id = window.location.pathname.split('/');
-	id = id[id.length - 1];
+	id = $stateParams.id;
 	$scope.saveInfo = {
 		url: $location.absUrl(),
 		id: id