disinclined.org / git / dylansserver.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'dev' into live
[dylansserver.git] / index.php
diff --git a/index.php b/index.php
index f985f67..e58f737 100644 (file)
--- a/index.php
+++ b/index.php
@@ -93,7 +93,7 @@ abstract class cms {
   $scripts
 </head>
 
-<body>
+<body onload="return typeof highlight == 'function' ? highlight() : true;">
   <div id="structure">
     <div id="banner">
       <a href="$this->home_link">
@@ -138,7 +138,7 @@ class index extends cms {
     $this->scripts = "<script type='text/javascript' src='/includes/index.js'></script>"; 
     $this->display_head();
     $this->display_exhibits();
-    echo "<ul id='portfolio' style='text-align:right'>";
+    echo "<ul id='portfolio'>";
     $this->list_projects();
     echo <<<OTHER_PROJECTS
         <li>
@@ -240,6 +240,24 @@ class page extends cms {
   public function __construct() {
     parent::__construct();
     $this->page_offset();
+    $this->scripts = "
+        <script type='text/javascript' src='/includes/syntax/scripts/shCore.js'></script>
+        <script type='text/javascript' src='/includes/syntax/scripts/shAutoloader.js'></script>
+        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shCore.css'>
+        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'>
+        <script type='text/javascript'>
+          function highlight() {
+            SyntaxHighlighter.autoloader(
+             'js /includes/syntax/scripts/shBrushJScript.js',
+             'bash /includes/syntax/scripts/shBrushBash.js',
+             'sql /includes/syntax/scripts/shBrushSql.js',
+             'cpp /includes/syntax/scripts/shBrushCpp.js');
+            SyntaxHighlighter.defaults['gutter'] = false;
+            SyntaxHighlighter.defaults['toolbar'] = false;
+            SyntaxHighlighter.all();
+          }
+        </script>
+    ";
   }
 
   private function page_offset() {
@@ -325,8 +343,27 @@ class note extends cms {
   public $number_of_comments;
 
   public function __construct() {
-    if (isset($_GET['comments'])) {
       $this->scripts = "
+        <script type='text/javascript' src='/includes/syntax/scripts/shCore.js'></script>
+        <script type='text/javascript' src='/includes/syntax/scripts/shAutoloader.js'></script>
+        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shCore.css'>
+        <link type='text/css' rel='stylesheet' href='/includes/syntax/styles/shThemeDefault.css'>
+        <script type='text/javascript'>
+          function highlight() {
+            SyntaxHighlighter.autoloader(
+             'js /includes/syntax/scripts/shBrushJScript.js',
+             'bash /includes/syntax/scripts/shBrushBash.js',
+             'sql /includes/syntax/scripts/shBrushSql.js',
+             'cpp /includes/syntax/scripts/shBrushCpp.js');
+            SyntaxHighlighter.defaults['gutter'] = false;
+            SyntaxHighlighter.defaults['toolbar'] = false;
+            SyntaxHighlighter.all();
+          }
+        </script>
+      ";
+
+    if (isset($_GET['comments'])) {
+      $this->scripts .= "
         <script type='text/javascript' src='http://www.google.com/recaptcha/api/js/recaptcha_ajax.js'></script>
         <script type='text/javascript' src='/includes/comment.js'></script>";
     }
@@ -416,7 +453,7 @@ END_OF_NOTE;
 
   private function write_navigation() {
     echo <<<END_OF_NAVIGATION
-    <br>
+    <br><br><br><br>
     <div id='navigation'>
     <h1>
 END_OF_NAVIGATION;
@@ -424,7 +461,7 @@ END_OF_NAVIGATION;
       $this->display_comment_link();
     }
     echo <<<END_OF_NAVIGATION
-    <a href="/notes/">back to notes</a>/
+    <a href="/notes/">back to notes/</a>
     </h1>
     </div>
 END_OF_NAVIGATION;
@@ -490,20 +527,20 @@ END_CAPTCHA_STYLE;
   
       <nowiki>
       <div id="recaptcha_widget"> 
-        <h3 class="recaptcha_only_if_image"><b>what's this say</b>?</h3>
-        <h3 class="recaptcha_only_if_audio"><b>enter the numbers you hear</b>:</h3>
-        <span style="font-size:80%;">
-          ( <a href="javascript:Recaptcha.reload()">another</a> /
-          <span class="recaptcha_only_if_image"><a href="javascript:Recaptcha.switch_type('audio')">audio</a></span> /
-          <span class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type('image')">image</a></span><a href="javascript:Recaptcha.showhelp()">help</a> )
-        </span>
-        <br><br>
+        <br>
+        <h3><b>what's this say</b>?</h3>
+        <br>
+          <div id="recaptcha_image"></div>
+        <br><br><br>
+        <span class="recaptcha_only_if_image"><br><br><br></span>
         <input type="text" id="recaptcha_response_field" name="recaptcha_response_field" />
         <br><br>
-        <div style="float:right;position:relative;width:100px;">
-          <div id="recaptcha_image"></div>
-        </div>
-        <br><br><br><br>
+        <h3 class="recaptcha_only_if_audio"><b>enter the numbers you hear</b>:</h3>
+        <span class="recaptcha_help">
+          <a href="javascript:Recaptcha.reload()">another?</a> /
+          <span class="recaptcha_only_if_image"><a href="javascript:Recaptcha.switch_type('audio')">audio?</a> /</span>
+          <span class="recaptcha_only_if_audio"><a href="javascript:Recaptcha.switch_type('image')">image?</a></span><a href="javascript:Recaptcha.showhelp()">help?</a>
+        </span>
       </div>
 END_OF_FORM;
     echo recaptcha_get_html($this->recaptcha_publickey); 
my (old) website