Merge

geoffhumphrey · May 10, 2016 · 8aacf24 · 8aacf24
2 parents cf8008f + 9c0e0a6
commit 8aacf24
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 4 deletions.
diff --git a/500.php b/500.php
@@ -14,7 +14,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title><?php echo $_SESSION['contestName']; ?> Organized By <?php echo $_SESSION['contestHost']." &gt; Error 500; ?></title>
+    <title><?php echo $_SESSION['contestName']; ?> Organized By <?php echo $_SESSION['contestHost']." &gt; Error 404"; ?></title>
 
     <!-- Load jQuery / http://jquery.com/ -->
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
@@ -87,4 +87,95 @@
     </footer><!-- ./footer --> 
 	<!-- ./ Footer -->
 </body>
-</html>
+</html>
+=======
+<?php 
+require('paths.php');
+require(CONFIG.'bootstrap.php');
+$section = "500";
+$go = "error_page";
+
+$container_main = "container";
+$nav_container = "navbar-default";
+?>
+
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title><?php echo $_SESSION['contestName']; ?> Organized By <?php echo $_SESSION['contestHost']." &gt; Error 500"; ?></title>
+
+    <!-- Load jQuery / http://jquery.com/ -->
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+
+    <!-- Load Bootstrap / http://www.getbootsrap.com -->
+    <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" />
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Load Font Awesome / https://fortawesome.github.io/Font-Awesome -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
+
+    <!-- Load BCOE&M Custom Theme CSS - Contains Bootstrap overrides and custom classes -->
+    <link rel="stylesheet" type="text/css" href="<?php echo $theme; ?>" />
+
+	<!-- Load BCOE&M Custom JS -->
+    <script src="<?php echo $base_url; ?>js_includes/bcoem_custom.min.js"></script>
+
+  	</head>
+	<body>    
+    <!-- MAIN NAV -->
+	<div class="container hidden-print">
+		<?php include (SECTIONS.'nav.sec.php'); ?>
+	</div><!-- container -->   
+    <!-- ./MAIN NAV -->
+
+    <!-- ALERTS -->
+    <div class="container bcoem-warning-container">
+    	<div class="alert alert-danger"><span class="fa fa-exclamation-circle"></span> <strong>A misconfiguration on the server caused a hiccup.</strong> Don't worry, we still want you around!</div>
+
+    </div><!-- ./container --> 
+    <!-- ./ALERTS -->
+
+    <!-- Public Pages (Fixed Layout with Sidebar) -->
+    <div class="container"> 
+    	<div class="row">
+    		<div class="col col-lg-9 col-md-8 col-sm-12 col-xs-12">
+            <div class="page-header">
+        		<h1>500 Error</h1>
+        	</div> 
+        	<p class="lead">Unfortunately, there was a problem.</p>
+            <p class="lead"><small>Please use the main navigation above to get where you want to go.</small></p>
+            <p>Cheers!<br>&ndash; The <?php echo $_SESSION['contestName']; ?> Site Server</p>
+            </div><!-- ./left column -->
+            <div class="sidebar col col-lg-3 col-md-4 col-sm-12 col-xs-12">
+            	<?php include (SECTIONS.'sidebar.sec.php'); ?>         
+            </div><!-- ./sidebar -->
+        </div><!-- ./row -->
+    	<!-- ./Public Pages -->
+    </div><!-- ./container -->
+    <!-- ./Public Pages -->
+
+    <!-- Mods Bottom -->
+    <div class="container"> 
+
+    </div>
+    <!-- ./Mods Bottom -->
+
+    <!-- Footer -->
+    <footer class="footer hidden-xs hidden-sm hidden-md">
+    	<nav class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container text-center">
+                <p class="navbar-text col-md-12 col-sm-12 col-xs-12 text-muted small"><?php include (SECTIONS.'footer.sec.php'); ?></p>
+            </div>
+    	</nav>
+    </footer><!-- ./footer --> 
+	<!-- ./ Footer -->
+</body>
+</html>
diff --git a/admin/barcode_check-in.admin.php b/admin/barcode_check-in.admin.php
@@ -3,7 +3,7 @@
  * Module:      barcode_check-in.admin.php 
  * Description: Originally deployed as a "mod" for NHC 2013.
  * 
- */
+ */ 
 
 $fields = 15;
 $entry_list = "";

diff --git a/admin/default.admin.php b/admin/default.admin.php
@@ -1165,4 +1165,4 @@
 <?php foreach ($bcoem_dashboard_help_array as $content)  {
 	echo bcoem_dashboard_help($content);
 }
-?>
+?>
-Original file line number
+Diff line change
@@ Expand Up / @@ -1165,4 +1165,4 @@ @@
     <?php foreach ($bcoem_dashboard_help_array as $content)  {
     	echo bcoem_dashboard_help($content);
     }
-    ?>
+    ?>