Several printing fixes

- Closes #35 by renaming all sessionStorage to proper localStorage names
- Closes #24 and added a lot of print options and styles
- Also added gitignore files for VS

Author: bgrawi

.gitignore

@@ -7,7 +7,13 @@ inc/config.php
 # Ignore schedule images
 img/schedules/*.png
 
-$ Ignore Eclipse files
+# Ignore Eclipse files
 .settings
 .project
 .buildpath
+
+# Ignore VisualStudio files
+/*.phpproj*
+/*.sln
+/*.suo
+/WebEssentials-Settings.json

inc/footer.inc

@@ -13,7 +13,7 @@
 			<? } elseif($LAYOUT_MODE == 'print') { ?>
 			<div id="print_footer">
 				Made Using <a href='<?= $HTTPROOTADDRESS ?>'>CSH ScheduleMaker</a>
-				<a href="http://www.csh.rit.edu/"><img src="/img/csh_print.png"></a>
+				<a href="http://www.csh.rit.edu/"><img height="25" src="/img/csh_print.png"></a>
 			</div> 
 
 			<? } ?>

inc/global.css

@@ -14,6 +14,14 @@ body.print {
 	overflow-y: auto;
 }
 
+@media print{
+    @page {
+    	size: auto; 
+   		margin: auto;
+    }
+
+} 
+
 @-webkit-viewport   { width: device-width; }
 @-moz-viewport      { width: device-width; }
 @-ms-viewport       { width: device-width; }
@@ -140,9 +148,10 @@ label {
 }
 
 #print_footer {
-	height:50px;
-	text-align:center;
-	line-height:50px;
+	height: 50px;
+	text-align: center;
+	line-height: 50px;
+	margin-top: -30px;
 }
 
 #print_footer img {
@@ -153,6 +162,10 @@ label {
 	color: #000;
 }
 
+#print_header {
+	margin: 0 0;
+}
+
 input[type=text] {
 	margin-top:0px;
 }
@@ -954,9 +967,35 @@ input {
 body.print div[schedule] > .panel {
 	box-shadow: none;
 	border: none;
-	width: 720px;
+	min-width: 720px;
 	margin: 0 auto;
 }
+
+body.print div[schedule].bow svg g[svg-schedule-item] rect,
+body.print div[schedule].gow svg g[svg-schedule-item] rect {
+	fill: #FFFFFF !important;
+	fill-opacity: 1 !important;
+	stroke: #000;
+	stroke-width: 1px;
+}
+
+body.print div[schedule].gow svg g[svg-schedule-item] rect {
+	stroke: #555;
+}
+
+body.print div[schedule].bow text,
+body.print div[schedule].boc svg g[svg-schedule-item] text {
+	fill: #000000 !important;
+}
+
+body.print div[schedule].bow svg line {
+	stroke: #000000 !important;
+}
+
+body.print div[schedule].gow svg g[svg-schedule-item] text {
+	fill: #333 !important;
+}
+
 @media print {
   body.print a[href]:after {
     content: "";

js/app.js

@@ -94,47 +94,47 @@ app.filter("courseNum", function() {
 	};
 });
 
-app.factory("sessionStorage", function($window) {
+app.factory("localStorage", function($window) {
 
-	var sessionStorage = $window.localStorage;
+	var localStorage = $window.localStorage;
 
 	return {
 		setItem: function(key, value) {
-			if(sessionStorage) {
+			if(localStorage) {
 				if(value != null) {
-					sessionStorage.setItem(key, angular.toJson(value));
+					localStorage.setItem(key, angular.toJson(value));
 				} else {
-					sessionStorage.setItem(key, null);
+					localStorage.setItem(key, null);
 				}
 			} else {
 				return false;
 			}
 		},
 		getItem: function(key) {
-			if(sessionStorage) {
-				return angular.fromJson(sessionStorage.getItem(key));
+			if(localStorage) {
+				return angular.fromJson(localStorage.getItem(key));
 			} else {
 				return false;
 			}
 		},
 		hasKey: function(key) {
-			if(sessionStorage) {
-				return sessionStorage.hasOwnProperty(key);
+			if(localStorage) {
+				return localStorage.hasOwnProperty(key);
 			} else {
 				return false;
 			}
 		},
 		clear: function() {
-			if(sessionStorage) {
-				return sessionStorage.clear();
+			if(localStorage) {
+				return localStorage.clear();
 			} else {
 				return false;
 			}
 		},
 	};
 });
 
-app.controller("AppCtrl", function($scope, sessionStorage, $window, $filter) {
+app.controller("AppCtrl", function($scope, localStorage, $window, $filter) {
 
 	$scope.initState = function() {
 		$scope.state = {};
@@ -179,7 +179,7 @@ app.controller("AppCtrl", function($scope, sessionStorage, $window, $filter) {
 	};
 
 	$scope.saveState = function() {
-		sessionStorage.setItem('state', $scope.state);
+		localStorage.setItem('state', $scope.state);
 	};
 
 	// Force save on close
@@ -188,11 +188,13 @@ app.controller("AppCtrl", function($scope, sessionStorage, $window, $filter) {
 	};
 
 	$scope.noStateSaveOnUnload = function() {
-		$window.onbeforeunload = null;
+		$window.onbeforeunload = function() {
+			//No-op
+		};
 	};
 
 	// Reload the state if it exists
-	var storedState = sessionStorage.getItem('state');
+	var storedState = localStorage.getItem('state');
 	if(storedState != null) {
 
 		// Check if state version exists or is correct
@@ -249,9 +251,9 @@ app.controller("AppCtrl", function($scope, sessionStorage, $window, $filter) {
 
 		// The schedule was set as a global variable
 		$scope.reloadSchedule($window.reloadSchedule);
-	} else if(sessionStorage.hasKey('reloadSchedule')){
+	} else if(localStorage.hasKey('reloadSchedule')){
 		// Get the schedule from sessions storage
-		var reloadSchedule = sessionStorage.getItem('reloadSchedule');
+		var reloadSchedule = localStorage.getItem('reloadSchedule');
 		if(reloadSchedule != null) {
 			$scope.reloadSchedule(reloadSchedule);
 		}
@@ -764,18 +766,18 @@ app.controller("AppCtrl", function($scope, sessionStorage, $window, $filter) {
 	};
 });
 
-app.controller("GenerateCtrl", function($scope, globalKbdShortcuts, $http, $filter, sessionStorage, uiDayFactory) {
+app.controller("GenerateCtrl", function($scope, globalKbdShortcuts, $http, $filter, localStorage, uiDayFactory) {
 
 
 	//Check if we are forking a schedule
-	if(sessionStorage.hasKey('forkSchedule')){
+	if(localStorage.hasKey('forkSchedule')){
 
 		// Get the schedule from sessions storage
-		var forkSchedule = sessionStorage.getItem('forkSchedule');
+		var forkSchedule = localStorage.getItem('forkSchedule');
 		if(forkSchedule != null) {
 
 			// Clear it so we don't fork again
-			sessionStorage.setItem('forkSchedule', null);
+			localStorage.setItem('forkSchedule', null);
 
 			var days = uiDayFactory();
 
@@ -1538,7 +1540,7 @@ app.factory('shareServiceInfo', function() {
 /**
  * Several endpoint abstractions for the schedules
  */
-app.directive('scheduleActions', function($http, $q, shareServiceInfo, openPopup, sessionStorage) {
+app.directive('scheduleActions', function($http, $q, shareServiceInfo, openPopup, localStorage) {
 
 	var serializer = new XMLSerializer();
 
@@ -1609,7 +1611,7 @@ app.directive('scheduleActions', function($http, $q, shareServiceInfo, openPopup
 					});
 				} else {
 
-					sessionStorage.setItem('forkSchedule', scope.schedule);
+					localStorage.setItem('forkSchedule', scope.schedule);
 
 					window.location = "/generate.php";
 				}
@@ -1686,7 +1688,7 @@ app.directive('scheduleActions', function($http, $q, shareServiceInfo, openPopup
 
 				var popup = openPopup(780, 600);
 
-				popup.sessionStorage.setItem('reloadSchedule', angular.toJson(reloadSchedule));
+				popup.localStorage.setItem('reloadSchedule', angular.toJson(reloadSchedule));
 				popup.document.title = "My Schedule";
 				popup.location = "http://" + window.location.hostname + '/schedule/render/print';	
 			}
@@ -1978,7 +1980,7 @@ app.controller("scheduleCtrl", function($scope, $location) {
 });
 
 
-app.controller("printScheduleCtrl", function($scope, $location, sessionStorage) {
+app.controller("printScheduleCtrl", function($scope, $location, localStorage) {
 
 	if($scope.schedule) {	
 		var pTerm ='' + $scope.state.requestOptions.term;
@@ -2004,11 +2006,27 @@ app.controller("printScheduleCtrl", function($scope, $location, sessionStorage)
         }
 
         $scope.heading = "My " + year + "-" + (year+1) + " " + term  + " Schedule";
+        
+        $scope.printTheme = 'woc';
+        
+        $scope.printThemeOptions = [{
+        	value: 'woc',
+        	label: "Modern Colors"
+        }, {
+        	value: 'bow',
+        	label: "Classic B&W"
+        }, {
+        	value: 'gow',
+        	label: "Classic Greyscale"
+        }, {
+        	value: 'boc',
+        	label: "Black Text & Colors"
+        }];
 	}
 
 	$scope.noStateSaveOnUnload();
 
-	window.print();
+	$scope.print = window.print.bind(window);
 });