Backporting retarded amount of changes outside of version control

2 files changed, 143 insertions, 143 deletions

diff --git a/admin/navigation/functions.php b/admin/navigation/functions.php
index 68ab7c3..da8a8e4 100644
--- a/admin/navigation/functions.php
+++ b/admin/navigation/functions.php
@@ -1,91 +1,91 @@
-<style> 

-

-ul {

-	margin: 0;

-}

- 

-#contentLeft {

-	width: 400px;

-}

- 

-#contentLeft li {

-	list-style: none;

-	margin: 0 0 4px 0;

-	padding: 10px;

-	background-color:#a1a1a1;

-	border: #CCCCCC solid 1px;

-	color:#fff;

-	text-align:center;

-	cursor:move;

-}

-

-</style>

-<script type="text/javascript" src="scripts/jquery-ui-1.7.1.custom.min.js"></script>

-<script type="text/javascript">

-$(document).ready(function(){ 

-						   

-	$(function() {

-		$("#contentLeft ul").sortable({ opacity: 0.6, cursor: 'move', update: function() {

-			var order = $(this).sortable("serialize") + '&action=updateOrder'; 

-			$.post("navigation/updateDB.php", order, function(theResponse){

-				 $("#updateStatus").html(theResponse);

-			}); 															 

-		}								  

-		});

-	});

- 

-});	

-</script> 

-<?php

-/**

- * Bayonet Content Management System

- * Copyright (C) 2008  Joseph Hunkeler & Evan O'Connell

- *

- * This program is free software: you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation, either version 3 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program.  If not, see <http://www.gnu.org/licenses/>.

- */ 

- 

-/**

- * Note to anyone feeling the need to edit this file...

- * You MUST declare $db as global inside your functions in order access MySQL from here.

- */

-

-function ListNavigation(){

-  

-  global $db;

-  $result = $db->Query("SELECT `nav_id`, `title`, `weight` FROM `bayonet_navigation` ORDER BY `weight`");

-  $data = $db->Fetch($result);

-  

-  ?>

-  	 	 <div id="contentLeft">

-	 		<table> 

-	 			<tr>

-				 	<th>News Reel Order</th>

-			 		<td id="updateStatus"></td>

-			 	</tr>

-		 	</table>

-		 	<ul>

-  <?php

-  

-  foreach($data as $nav){

-  	

-	  	echo "<li id=\"recordsArray_{$nav['nav_id']}\">{$nav['title']}</li>";  

-  }

-  ?>

-  		  </ul>

-		  Click and drag on a slide to change the order. Wait for confirmation indicating the changes have been saved.

-	 	</div> 

-  <?php

-  

-}

+<style> 
+
+ul {
+	margin: 0;
+}
+ 
+#contentLeft {
+	width: 400px;
+}
+ 
+#contentLeft li {
+	list-style: none;
+	margin: 0 0 4px 0;
+	padding: 10px;
+	background-color:#a1a1a1;
+	border: #CCCCCC solid 1px;
+	color:#fff;
+	text-align:center;
+	cursor:move;
+}
+
+</style>
+<script type="text/javascript" src="scripts/jquery-ui-1.7.1.custom.min.js"></script>
+<script type="text/javascript">
+$(document).ready(function(){ 
+						   
+	$(function() {
+		$("#contentLeft ul").sortable({ opacity: 0.6, cursor: 'move', update: function() {
+			var order = $(this).sortable("serialize") + '&action=updateOrder'; 
+			$.post("navigation/updateDB.php", order, function(theResponse){
+				 $("#updateStatus").html(theResponse);
+			}); 															 
+		}								  
+		});
+	});
+ 
+});	
+</script> 
+<?php
+/**
+ * Bayonet Content Management System
+ * Copyright (C) 2008  Joseph Hunkeler & Evan O'Connell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+ 
+/**
+ * Note to anyone feeling the need to edit this file...
+ * You MUST declare $db as global inside your functions in order access MySQL from here.
+ */
+
+function ListNavigation(){
+  
+  global $db;
+  $result = $db->Query("SELECT `nav_id`, `title`, `weight` FROM `bayonet_navigation` ORDER BY `weight`");
+  $data = $db->Fetch($result);
+  
+  ?>
+  	 	 <div id="contentLeft">
+	 		<table> 
+	 			<tr>
+				 	<th>News Reel Order</th>
+			 		<td id="updateStatus"></td>
+			 	</tr>
+		 	</table>
+		 	<ul>
+  <?php
+  
+  foreach($data as $nav){
+  	
+	  	echo "<li id=\"recordsArray_{$nav['nav_id']}\">{$nav['title']}</li>";  
+  }
+  ?>
+  		  </ul>
+		  Click and drag on a slide to change the order. Wait for confirmation indicating the changes have been saved.
+	 	</div> 
+  <?php
+  
+}
 ?>
\ No newline at end of file
diff --git a/admin/navigation/index.php b/admin/navigation/index.php
index e2179a1..fff3196 100644
--- a/admin/navigation/index.php
+++ b/admin/navigation/index.php
@@ -1,54 +1,54 @@
-<?php

-/**

- * Bayonet Content Management System

- * Copyright (C) 2008  Joseph Hunkeler & Evan O'Connell

- *

- * This program is free software: you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation, either version 3 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program.  If not, see <http://www.gnu.org/licenses/>.

- */ 

- ?>

- 

- <div style="text-align:left;"><h2>- Navigation Links</h2></div>

- -Edit Order, Edit Page, Delete Pages, Add Pages<br />

- 

-<?php 

-if(!defined("ADMIN_FILE"))

-{

-  die("Access denied.");

-}

-

-

-include $basedir.'navigation/functions.php';

-

-if(isset($_GET['edit']))

-{

-  $block_id = $_GET['edit'];

-  EditBlock($block_id);

-  return;

-}

-

-if(isset($_GET['delete']))

-{

-  $block_id = $_GET['delete'];

-  DeleteBlock($block_id);

-  return;

-}

-

-if(isset($_GET['create']))

-{

-  NewBlock();

-  return;

-}

-

-  ListNavigation();

+<?php
+/**
+ * Bayonet Content Management System
+ * Copyright (C) 2008  Joseph Hunkeler & Evan O'Connell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+ ?>
+ 
+ <div style="text-align:left;"><h2>- Navigation Links</h2></div>
+ -Edit Order, Edit Page, Delete Pages, Add Pages<br />
+ 
+<?php 
+if(!defined("ADMIN_FILE"))
+{
+  die("Access denied.");
+}
+
+
+include $basedir.'navigation/functions.php';
+
+if(isset($_GET['edit']))
+{
+  $block_id = $_GET['edit'];
+  EditBlock($block_id);
+  return;
+}
+
+if(isset($_GET['delete']))
+{
+  $block_id = $_GET['delete'];
+  DeleteBlock($block_id);
+  return;
+}
+
+if(isset($_GET['create']))
+{
+  NewBlock();
+  return;
+}
+
+  ListNavigation();
 ?>
\ No newline at end of file