Release version for 3.0.0!

- Updated info boxes on the top of pages
- Updated status page to use times
- Bumped version number
- Minor UI updates as always

Author: bgrawi

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

@@ -32,8 +32,10 @@ angular.module('sm').controller("AppController", function($scope, localStorage,
 		};
 
 		$scope.state.ui = {
-			alert_betaInfo: true,
 			alert_newFeatures: true,
+			alert_generateFeatures: true,
+			alert_searchFeatures: true,
+			alert_browseFeatures: true,
 			action_generateSchedules: false,
 		};
 

assets/src/modules/sm/Browse/templates/browse.html

@@ -1,6 +1,10 @@
 <div class="container">
 	<div class="row">
 		<div class="col-md-8">
+			<div class="alert alert-success" ng-show="state.ui.alert_browseFeatures">
+				<button type="button" class="close" data-dismiss="alert" aria-hidden="true" ng-click="state.ui.alert_browseFeatures = false"><i class="fa fa-times"></i></button>
+				<strong>NEW!</strong> Once you've found some courses you like, simply add them to your cart, they will be included in your possible schedules. Also, check out the <a ui-sref="/help">help</a> page for more info.
+			</div>
 			<div class="panel panel-default">
 				<div class="panel-heading">
 					<div class="row form-horizontal">

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

@@ -1,6 +1,10 @@
 <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_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>
+				<strong>NEW!</strong> 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.
+			</div>
 			<div class="panel panel-default form-horizontal" ng-controller="GenerateScheduleCoursesController">
 				<div class="panel-heading">
 					<div class="row form-horizontal">

assets/src/modules/sm/Index/templates/index.html

@@ -1,12 +1,8 @@
 <div class="container">
 	<div class="hidden-xs">
-		<div class="alert alert-info" ng-show="state.ui.alert_betaInfo">
-			<button type="button" class="close" aria-hidden="true" ng-click="state.ui.alert_betaInfo = false"><i class="fa fa-times"></i></button>
-			<strong>Thanks</strong> for testing the new beta of ScheduleMaker! <strong>Please report any bugs</strong> you find to our github page <a target="_blank" href="https://github.com/ComputerScienceHouse/schedulemaker/issues">here</a> or email <a target="_blank" href="mailto:[email protected]">[email protected]</a> (Please try to use github if you can, it makes everything easier for us). Your reports are greatly apreciated!
-		</div>
 		<div class="alert alert-success" ng-show="state.ui.alert_newFeatures">
 			<button type="button" class="close" data-dismiss="alert" aria-hidden="true" ng-click="state.ui.alert_newFeatures = false"><i class="fa fa-times"></i></button>
-			Welcome to the new ScheduleMaker! We've added lots of new functionality to the website, including full mobile support, a brand-new interface, a new course cart and search system, and RateMyProfessors integration. Check out the <a ui-sref="/help">help</a> page for more info. Enjoy!
+			<strong>Welcome to the new ScheduleMaker!</strong> We've added lots of new features to the website, including a completely redesigned  modern interface with full mobile support, a new course cart so you add courses to your schedule from the Browse and Search Page, the ability to come back right where you left off (automatic saved sessions), <a ui-sref="help">keyboard shortcuts</a> for power users, RateMyProfessors integration, and a whole lot more! Check out the <a ui-sref="help">help</a> page for more info. Enjoy!
 		</div>
 	</div>
 	<div id="mainMenu" class="row">

assets/src/modules/sm/Search/templates/search.html

@@ -1,6 +1,10 @@
 <div class="container">
 	<div class="row">
 		<div class="col-md-8">
+		<div class="alert alert-success" ng-show="state.ui.alert_searchFeatures">
+			<button type="button" class="close" data-dismiss="alert" aria-hidden="true" ng-click="state.ui.alert_searchFeatures = false"><i class="fa fa-times"></i></button>
+			<strong>NEW!</strong> Search for courses by a wide range of critera which you can then easily add to your schedule! If you already know your course's number, jump over to to the <a ui-sref="generate">generation page</a> Also, check out the <a ui-sref="/help">help</a> page for new keyboard shortcuts.
+		</div>
 		<form name="search.form" class="form-horizontal">
 			<div class="panel panel-default">
 				<div class="panel-heading">
@@ -44,7 +48,7 @@ <h2 class="panel-title control-label pull-left">Search Courses</h2>
 							<div class="form-group">
 								<label class="control-label col-sm-4" for="search.params.credits">Credit Hours:</label>
 								<div class="col-sm-8">
-									<input type="text" maxlength="2" size="3" ng-model="search.params.credits" name="credits" class="mousetrap form-control">
+									<input type="text" maxlength="2" size="3" id="search.params.credits" ng-model="search.params.credits" name="credits" class="mousetrap form-control">
 								</div>
 							</div>
 						</div>
@@ -67,23 +71,23 @@ <h2 class="panel-title control-label pull-left">Search Courses</h2>
 							<div class="form-group">
 								<label class="control-label col-sm-4" for="search.params.title">Title:</label>
 								<div class="col-sm-8">
-									<input type="text" ng-model="search.params.title" name="title" class="mousetrap form-control">
+									<input type="text" id="search.params.title" ng-model="search.params.title" name="title" class="mousetrap form-control">
 								</div>
 							</div>
 						</div>
 						<div class="col-md-6">
 							<div class="form-group">
 								<label class="control-label col-sm-4" for="search.params.professor">Professor:</label>
 								<div class="col-sm-8">
-									<input type="text" ng-model="search.params.professor" name="professor" class=" mousetrap form-control">
+									<input type="text" id="search.params.professor" ng-model="search.params.professor" name="professor" class=" mousetrap form-control">
 								</div>
 							</div>
 						</div>
 					</div>
 					<div class="form-group">
 						<label class="control-label col-sm-4" for="search.params.description">Keywords:</label>
 						<div class="col-sm-8">
-							<input type="text" ng-model="search.params.description" name="description" class="mousetrap form-control" placeholder="(comma delmited)">
+							<input type="text" id="search.params.description" ng-model="search.params.description" name="description" class="mousetrap form-control" placeholder="(comma delmited)">
 						</div>
 					</div>
 					<div class="form-group">

assets/src/modules/sm/Status/controllers/StatusController.js

@@ -12,4 +12,21 @@ angular.module('sm').controller('StatusController', function($scope, $http) {
 			alert(scope.error);
 		}
 	});
+	
+	$scope.timeConvert = function(UNIX_timestamp){
+	 var a = new Date(+UNIX_timestamp*1000);
+	 var months = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
+	     var year = a.getFullYear();
+	     var month = months[a.getMonth()];
+	     var date = a.getDate();
+	     var hour = a.getHours();
+	     var min = a.getMinutes();
+	     var sec = a.getSeconds();
+	     if(sec <= 10) sec = "0" + sec;
+	     if(min <= 10) min = "0" + min;
+	     var time = month+' '+date+' '+year+' '+hour+':'+min+':'+sec ;
+	     return time;
+	 }
+
+
 });

assets/src/modules/sm/Status/templates/status.html

@@ -1,7 +1,7 @@
 <div class="container">
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			<h3 class="panel-title">Last 20 Data Scrapes <div class="pull-right">Last run: {{logs.length > 0?logs[0].timeStarted:'Never'}}</div></h3>
+			<h3 class="panel-title">Last 20 Data Scrapes <div class="pull-right">Last run: {{logs.length > 0?timeConvert(logs[0].timeStarted):'Never'}}</div></h3>
 		</div>
 		<div class="panel-body">
 		<table class="table">
@@ -20,9 +20,9 @@ <h3 class="panel-title">Last 20 Data Scrapes <div class="pull-right">Last run: {
 			<tbody>
 				<tr ng-show="logs.length == 0"><td colspan='7'>No Logs Exist</td></tr>
 				<tr ng-repeat="log in logs">
-					<td ng-bind="log.timeStarted"></td>
-					<td ng-bind="log.timeEnded"></td>
-					<td ng-bind="log.timeEnded - log.timeStarted"></td>
+					<td ng-bind="timeConvert(log.timeStarted)"></td>
+					<td ng-bind="timeConvert(log.timeEnded)"></td>
+					<td ng-bind="log.timeEnded - log.timeStarted + 's'"></td>
 					<td ng-bind="log.coursesAdded"></td>
 					<td ng-bind="log.coursesUpdated"></td>
 					<td ng-bind="log.sectionsAdded"></td>

index.php

@@ -55,7 +55,7 @@
 		<meta name="twitter:card" content="photo"> 
         <meta property="og:title" content="<?= (!empty($TITLE)) ? $TITLE . " - " : "" ?>ScheduleMaker" />
         <meta property="og:type" content="website" />
-        <meta property="og:description" content="CSH ScheduleMaker makes picking your RIT class schedule easy! Preview all permutations of your schedule, browse available courses, and select courses at random, all with ScheduleMaker.">
+        <meta property="og:description" content="CSH ScheduleMaker makes picking your RIT class schedule easy! Preview all permutations of your schedule, browse available courses, and search for any course, all with ScheduleMaker.">
         <meta property="og:url" content="http://<?= $_SERVER['HTTP_HOST'] ?><?= $_SERVER['REQUEST_URI'] ?>" />
         <? if(!empty($IMGURL)) { ?>
         <meta property="og:image" content="<?= $IMGURL ?>" />
@@ -74,7 +74,7 @@
 	                        <span class="icon-bar"></span>
 	                        <span class="icon-bar"></span>
 	                    </button>
-	                    <a class="navbar-brand" ui-sref="index">ScheduleMaker <?=($SERVER_TYPE != 'production')?"<span class=\"label label-info\">BETA</span>":""?></a>
+	                    <a class="navbar-brand" ui-sref="index">ScheduleMaker <?=($SERVER_TYPE != 'development')?"<span class=\"label label-info\">BETA</span>":"<span class=\"label label-success\">NEW!</span>"?></a>
 	                </div>
 	                <div class="collapse navbar-collapse navbar-right navbar-ex1-collapse" nav-close-on-mobile>
 	                    <ul class="nav navbar-nav">

package.json

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