disinclined.org / git / dylansserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 881515b)
class archive pages now from view/archive.php
authorDylan Lloyd <dylan@dylansserver.com>
Thu, 22 Mar 2012 22:29:51 +0000 (18:29 -0400)
committerDylan Lloyd <dylan@dylansserver.com>
Thu, 22 Mar 2012 22:29:51 +0000 (18:29 -0400)
cms.php patch | blob | history
view/archive.php [new file with mode: 0644] patch | blob
view/note.php patch | blob | history

diff --git a/cms.php b/cms.php
index 00a8d7c..845eda9 100644 (file)
--- a/cms.php
+++ b/cms.php
@@ -583,7 +583,10 @@ class archive extends cms {
   }
 
   public function display() {
-    $this->display_head();
+      require_once("view/archive.php");
+  }
+
+  public function display_notes() {
     switch (true) {
       case (isset($_GET['year']) && !isset($_GET['month'])
                 && !isset($_GET['day'])):
@@ -632,20 +635,11 @@ class archive extends cms {
         echo "</div>";
       }
       echo "</div>";
-      $this->write_navigation();
     } else {
       echo "<br>";
       echo "<h1>sorry, nothing here</h2>";
       echo "<pre>Empty set (0.00 sec)</pre>";
     }
-    $this->display_close();
-  }
-
-  private function write_navigation() {
-    echo "<br>";
-    echo "<div id='navigation'>";
-    // fill me in!
-    echo "</div>";
   }
 
 }
diff --git a/view/archive.php b/view/archive.php
new file mode 100644 (file)
index 0000000..2829668
--- /dev/null
+++ b/view/archive.php
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+  <title><?php echo $this->title; ?></title>
+  <link rel="icon" href="/favicon.ico" type="image/png">
+  <link href='/includes/style.css' rel='stylesheet' type='text/css'>
+  <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>
+  <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>
+</head>
+
+<body onload="return typeof highlight == 'function' ? highlight() : true">
+  <div id="structure">
+    <div id="banner">
+      <a href="<?php echo $this->home_link ?>">
+      <img src="/images/dylansserver.png" alt="dylansserver"
+      border="0"></a>
+    </div>
+
+    <div id="content">
+      <div id='notes'>
+        <?php $this->display_notes() ?>
+    <div id='navigation'>
+    <h1>
+    <?php
+    if($this->page > 1){
+      $previous_page = $this->page - 1;
+      echo "<a href='/notes/page/$previous_page'>prev</a>";
+    }
+    if($this->page < $this->number_of_pages) {
+    $forward_page = $this->page + 1;
+    echo " <a href='/notes/page/$forward_page'>next</a>";
+    } ?>
+    </h1>
+    </div>
+      <div id="contact_me"><h1><a href=
+      "mailto:dylan@psu.edu">dylan</a></h1><a href=
+      "mailto:dylan@psu.edu">@psu.edu</a>
+      </div>
+    </div>
+    <br>
+    <br>
+  </div>
+</body>
+</html>
diff --git a/view/note.php b/view/note.php
index 7c1c0c3..8053918 100644 (file)
--- a/view/note.php
+++ b/view/note.php
@@ -39,22 +39,9 @@
         <div class='note'>
             <h1><span class='date'>
               <?php echo "$this->year_posted/$this->month_posted/$this->day_posted/" ?>
-             </span><?php echo $this->title ?></h1>
+            </span><?php echo $this->title ?></h1>
             <?php echo $this->text ?>
         </div>
-        <?php if ($this->comments_enabled) {
-          $this->display_comments();
-          $this->display_comment_form();
-        } ?>
-      </div>
-      <div id='navigation'>
-      <h1>
-      <?php if (!$this->comments_enabled) {
-        $this->display_comment_link();
-      } ?>
-      <a href="/notes/">back to notes/</a>
-      </h1>
-      </div>
       <div id="contact_me"><h1><a href=
       "mailto:dylan@psu.edu">dylan</a></h1><a href=
       "mailto:dylan@psu.edu">@psu.edu</a>
my (old) website