From 76281bad35e395da364dc551ee99d21c883cdd64 Mon Sep 17 00:00:00 2001
From: TamaraShopsin <tamara@codeforamerica.org>
Date: Tue, 29 May 2012 16:16:20 -0700
Subject: [PATCH] Fix nav - moved style sheet to top row

---
 functions.php           | 2 +-
 guidepage.php           | 6 ++----
 home.php                | 6 ------
 homeoccsplash.php       | 2 +-
 map.php                 | 8 ++++----
 page.php                | 7 +++----
 scripts/magic-arrows.js | 8 ++++++--
 scripts/thinbox2.js     | 2 +-
 8 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/functions.php b/functions.php
index cedc4ad..2a157de 100644
--- a/functions.php
+++ b/functions.php
@@ -481,7 +481,7 @@ function kubrick_theme_page() {
 if ( ! function_exists( 'myCustomTinyMCE') ) :
 function myCustomTinyMCE($init) {
 $init['theme_advanced_disable'] = 'outdent, indent, justifyleft, justifycenter, justifyright, justifyfull, bullist, numlist, outdent, indent, fontselect, fontsizeselect, forecolor, backcolor, forecolorpicker, backcolorpicker, formatselect'; // Removes the undesired buttons
-$init['theme_advanced_buttons2_add_before'] = 'styleselect'; // Adds the buttons at the begining. (theme_advanced_buttons2_add adds them at the end)
+$init['theme_advanced_buttons1_add_before'] = 'styleselect'; // Adds the buttons at the begining. (theme_advanced_buttons2_add adds them at the end)
 $init['theme_advanced_styles'] = 'Big=b, Small=s, Mini=mini';
 $init['content_css'] = get_template_directory_uri().'/mycustomstyles.css';
 return $init;
diff --git a/guidepage.php b/guidepage.php
index e3359b1..5d48710 100644
--- a/guidepage.php
+++ b/guidepage.php
@@ -26,12 +26,10 @@
 				<?php wp_link_pages(array('before' => '<p><strong>' . __('Pages:', 'kubrick') . '</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
 <div class="navigation">
 
-    <div class="alignleft">
         <?php previous_link(); ?>
-    </div>
-    <div class="alignright">
+
         <?php next_link(); ?>
-    </div>
+
 
             </div>
                    	         
diff --git a/home.php b/home.php
index 5d20c89..29498a4 100644
--- a/home.php
+++ b/home.php
@@ -40,13 +40,7 @@
 <div class="navigation">
 
 
-<div class="alignright">
-
         <?php next_link(); ?>
-         <?php next_link(); ?>
-    </div>
-
-
 
 </div>
 
diff --git a/homeoccsplash.php b/homeoccsplash.php
index e02041e..f46d521 100644
--- a/homeoccsplash.php
+++ b/homeoccsplash.php
@@ -8,7 +8,7 @@
 
 get_header(); ?>
 <div id="header3">
-    <a href="http://opencounter.org">
+    <a href="<?php echo get_settings('home'); ?>">
     <canvas id="clockcanvas" width="50" height="50"></canvas>
 </a>
     
diff --git a/map.php b/map.php
index 37ec1d2..be0728b 100644
--- a/map.php
+++ b/map.php
@@ -145,12 +145,12 @@ function checkForEnter(e){
 				<?php wp_link_pages(array('before' => '<p><strong>' . __('Pages:', 'kubrick') . '</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
 <div class="navigation">
 
-     <div class="alignleft">
+  
         <?php previous_link(); ?>
-    </div>
-    <div class="alignright">
+    
+    
         <?php next_link(); ?>
-    </div>
+ 
 
             </div>
                    	         
diff --git a/page.php b/page.php
index 797295c..f3829bb 100644
--- a/page.php
+++ b/page.php
@@ -34,12 +34,11 @@
 
             <div class="navigation">
 
-    <div class="alignleft">
+
         <?php previous_link(); ?>
-    </div>
-    <div class="alignright">
+  
         <?php next_link(); ?>
-    </div>
+
 
             </div>
                    	         
diff --git a/scripts/magic-arrows.js b/scripts/magic-arrows.js
index f94f10e..894df9c 100644
--- a/scripts/magic-arrows.js
+++ b/scripts/magic-arrows.js
@@ -136,10 +136,14 @@ jQuery(document).ready(function(){
   jQuery(document.body).bind("keyup", function(event){
     console.log(event);
     if(event.which == 37){   // Left arrow key
-        window.location = jQuery( ".alignleft" ).children()[0].href;
+        if(jQuery( ".alignleft" ).children()[0].href){
+            window.location = jQuery( ".alignleft" ).children()[0].href;
+        }
     }
     else if(event.which == 39){   // Right arrow key
-        window.location = jQuery( ".alignright" ).children()[0].href;
+        if(jQuery( ".alignright" ).children()[0].href){
+            window.location = jQuery( ".alignright" ).children()[0].href;
+        }
     }
 });  
     
diff --git a/scripts/thinbox2.js b/scripts/thinbox2.js
index 2767d86..0ee99be 100644
--- a/scripts/thinbox2.js
+++ b/scripts/thinbox2.js
@@ -178,7 +178,7 @@ var ThinBox = {
 			} else if(href=='') {
 				 return false;
 			} else {
-				var thinboxContent = $("<div class='betabox'><div class='betabox2'>BETA WARNING<input type='button' value='X' onclick='ThinBox.remove()' class='betax'/></div><br/><div class='betabox3'>Welcome to Open Counter, a site built for the <a href='http://www.cityofsantacruz.com/' target='_blank'>City of Santa Cruz</a> by <a href='http://codeforamerica.org/' target='_blank'>Code for America</a>.</br></br>PLEASE NOTE:</br></br>This is an experimental/beta version of the site. It may contain inaccuracies!!</br></br>Your suggestions will help make this site better, so if you have any comments please share them on any page by clicking the thumb icon in the upper left corner.</div></div>");
+				var thinboxContent = $("<div class='betabox'><div class='betabox2'>BETA WARNING<input type='button' value='X' onclick='ThinBox.remove()' class='betax'/></div><br/><div class='betabox3'>Welcome to Open Counter, a site built for the <a href='http://www.cityofsantacruz.com/' target='_blank'>City of Santa Cruz</a> by <a href='http://codeforamerica.org/' target='_blank'>Code for America</a>.</br></br>PLEASE NOTE:</br></br>This is an experimental/beta version of the site. It may contain inaccuracies!!</br></br>Your suggestions will help make this site better, so if you have any comments please share them on any page by clicking the speech bubble icon in the upper left corner.</div></div>");
 				//thinboxContent.attr("src",href);
 				var inIframe = true;
 			}