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

diff --git a/cms.php b/cms.php
index 845eda9..bd7ed60 100644 (file)
--- a/cms.php
+++ b/cms.php
@@ -168,61 +168,7 @@ END_OF_CLOSE;
 class index extends cms {
 
   public function display() {
-    $this->scripts = "<script type='text/javascript' src='/includes/index.js'></script>"; 
-    $this->display_head();
-    $this->display_exhibits();
-    echo "<ul id='portfolio'>";
-    $this->list_projects();
-    echo <<<OTHER_PROJECTS
-        <li>
-          <h3>things i've done for others:</h3>
-        </li>
-
-        <li><a href=
-        "http://activehamptons.com">activehamptons.com</a></li>
-
-        <li><a href=
-        "http://transfishing.com">transfishing.com</a></li>
-
-        <li>
-          <h3>something i've worked on:</h3>
-        </li>
-
-        <li><a href=
-        "http://tempositions.com">tempositions.com</a></li>
-
-        <li>
-          <h3>my repositories:</h3>
-        </li>
-
-        <li><a href=
-        "/git/">git://dylansserver.com</a></li>
-
-        <li>
-          <h3>some notes:</h3>
-        </li>
-
-        <li><a href=
-        "/notes/">here</a> [<a href="/notes/rss">rss</a>]</li>
-
-        <li>
-          <h3>my resume:</h3>
-        </li>
-
-        <li>[<a href=
-        "/resume">pdf</a>]</li>
-
-        <li>
-        </li>
-OTHER_PROJECTS;
-    // Because of the CSS necessary for the animations,
-    // the contact link needs to be in #portfolio to clear
-    // the floats.
-    echo "<li>";
-    $this->display_contact();
-    echo "</li>";
-    echo "</ul>";
-    $this->display_close($show_contact = false);
+      require_once("view/index.php");
   }
 
   protected function display_exhibits() {
@@ -236,11 +182,6 @@ OTHER_PROJECTS;
   }
 
   private function list_projects() {
-    echo <<<HEREDOC
-        <li>
-          <h3>my projects:</h3>
-        </li>
-HEREDOC;
     $sql = "SELECT title FROM projects ORDER BY rank";
     $result = $this->db->query($sql);
     while ($entry = $result->fetch_object()) {
diff --git a/view/index.php b/view/index.php
new file mode 100644 (file)
index 0000000..ec7c7c6
--- /dev/null
+++ b/view/index.php
@@ -0,0 +1,93 @@
+<!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/index.js'></script>
+  <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>
+</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">
+      <?php $this->display_exhibits() ?>
+      <ul id="portfolio">
+        <li>
+           <h3>my projects:</h3>
+        </li>
+        <?php $this->list_projects() ?>
+        <li>
+          <h3>things i've done for others:</h3>
+        </li>
+ 
+        <li><a href=
+        "http://activehamptons.com">activehamptons.com</a></li>
+ 
+        <li><a href=
+        "http://transfishing.com">transfishing.com</a></li>
+ 
+        <li>
+          <h3>something i've worked on:</h3>
+        </li>
+ 
+        <li><a href=
+        "http://tempositions.com">tempositions.com</a></li>
+ 
+        <li>
+          <h3>my repositories:</h3>
+        </li>
+ 
+        <li><a href=
+        "/git/">git://dylansserver.com</a></li>
+ 
+        <li>
+          <h3>some notes:</h3>
+        </li>
+ 
+        <li><a href=
+        "/notes/">here</a> [<a href="/notes/rss">rss</a>]</li>
+ 
+        <li>
+          <h3>my resume:</h3>
+        </li>
+ 
+        <li>[<a href=
+        "/resume">pdf</a>]</li>
+ 
+        <li>
+        </li>
+      <li>
+      <?php $this->display_contact() ?>
+      </li>
+      </ul>
+      </div>
+      <br>
+      <br>
+    </div>
+  </div>
+</body>
+</html>
my (old) website