Skip to content

Commit 1d3c558

Browse files
committed
Merge branch 'akath20-master' into november-update
Closes #115
2 parents 1cf1dc3 + d260234 commit 1d3c558

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

index.php

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
require_once("./inc/config.php");
1515
header("Location: {$HTTPROOTADDRESS}schedule.php?mode=old&id={$_GET['s']}");
1616
die();
17-
}
17+
}
1818

1919
// REQUIRED FILES
2020
$APP_ROOT = "./";
@@ -30,7 +30,7 @@
3030
if ($path[1] == 'schedule') {
3131
$id = (empty($path[2]))? '': hexdec($path[2]);
3232
if(!empty($id)) {
33-
33+
3434
// We are making the assumption that only new schedules with images
3535
// will be shared. Due relative requires in api/schedule.php, I cannot
3636
// check to see if the schedule has an image. #WONTFIX #WORKS4ME
@@ -43,20 +43,20 @@
4343
<html prefix="og: http://ogp.me/ns#" ng-app="sm">
4444
<head>
4545
<title><?= (!empty($TITLE)) ? $TITLE . " - " : "" ?>Schedule Maker</title>
46-
46+
4747
<!-- META DATA -->
4848
<meta http-equiv="X-UA-Compatible" content="IE=edge">
4949
<meta charset="utf-8">
5050
<meta name="viewport" content="width=device-width, initial-scale=1.0">
5151
<meta name="apple-mobile-web-app-capable" content="yes">
52-
52+
5353
<!-- STYLE SHEETS -->
5454
<link rel="stylesheet" href="//brick.a.ssl.fastly.net/Roboto:300,700">
5555
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.1/css/font-awesome.css">
5656
<link rel="stylesheet" href="<?=$ASSETROOTADDRESS?>assets/prod/<?=$APP_VERSION?>/modules/sm/dist.min.css">
57-
57+
5858
<!-- OPEN GRAPH TAGS -->
59-
<meta name="twitter:card" content="photo">
59+
<meta name="twitter:card" content="photo">
6060
<meta property="og:title" content="<?= (!empty($TITLE)) ? $TITLE . " - " : "" ?>ScheduleMaker" />
6161
<meta property="og:type" content="website" />
6262
<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.">
@@ -95,10 +95,10 @@
9595
<footer class="main default">
9696
<div class="container">
9797
<div class="csh"><a target="_blank" href="http://www.csh.rit.edu/"><img src="<?=$ASSETROOTADDRESS?>img/csh.png" alt="CSH" /></a></div>
98-
Version: <?=$APP_VERSION?> | <a ui-sref="help">Help</a> | <a href="/status">Status</a> | <a target="_blank" href="https://github.com/ComputerScienceHouse/schedulemaker/issues">Report Issues</a>
98+
<a target="_blank" href="https://github.com/ComputerScienceHouse/schedulemaker">Version: <?=$APP_VERSION?></a> | <a ui-sref="help">Help</a> | <a href="/status">Status</a> | <a target="_blank" href="https://github.com/ComputerScienceHouse/schedulemaker/issues">Report Issues</a>
9999
<div>
100100
Development v3: Ben Grawi (bgrawi at csh.rit.edu)<br>
101-
Development v2: Ben Russell (benrr101 at csh.rit.edu),<br>
101+
Development v2: Ben Russell (benrr101 at csh.rit.edu)<br>
102102
Idea: John Resig (phytar at csh.rit.edu)<br>
103103
Hosting: <a href="http://www.csh.rit.edu/">Computer Science House</a><br>
104104
</div>
@@ -107,7 +107,7 @@
107107
<footer class="main print">
108108
Made Using <a href='<?= $HTTPROOTADDRESS ?>'>CSH ScheduleMaker</a>
109109
<a href="http://www.csh.rit.edu/"><img height="25" src="/img/csh_print.png"></a>
110-
</footer>
110+
</footer>
111111
</div>
112112
<!-- LOAD SCRIPTS LAST -->
113113
<script>
@@ -116,7 +116,7 @@
116116
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
117117
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
118118
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
119-
119+
120120
ga('create', '<?= $GOOGLEANALYTICS ?>', 'rit.edu');
121121
</script>
122122
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
@@ -129,4 +129,3 @@
129129
<script src="<?=$ASSETROOTADDRESS?>assets/prod/<?=$APP_VERSION?>/modules/sm/dist.min.js"></script>
130130
</body>
131131
</html>
132-

0 commit comments

Comments
 (0)