disinclined.org / git / dylansserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a6fc8a7)
Everything now comes from cms.php
authorDylan Lloyd <dylan@psu.edu>
Sat, 5 Mar 2011 20:58:12 +0000 (15:58 -0500)
committerDylan Lloyd <dylan@psu.edu>
Sat, 5 Mar 2011 20:58:12 +0000 (15:58 -0500)
Now every page is generated by includes/cms.php. I still need to do more checks to issue 404s appropriately.

Some leftover cruft from past merges was cleaned.

.htaccess patch | blob | history
includes/style.css patch | blob | history
index.php patch | blob | history
notes/index.php [deleted file] patch | blob | history

diff --git a/.htaccess b/.htaccess
index b11bc6a..44ef5b9 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,6 +1,7 @@
 ErrorDocument 404 /404.php
 RewriteEngine on
-RewriteRule ^notes/page/([1-9]+)/?$ notes/index.php?page=$1 [L]
-RewriteRule ^notes/([^/\.]+)/?$ notes/index.php?note=$1 [L]
+RewriteRule ^notes/?$ /index.php?page=1 [L]
+RewriteRule ^notes/page/([1-9]+)/?$ /index.php?page=$1 [L]
+RewriteRule ^notes/([^/\.]+)/?$ /index.php?note=$1 [L]
 RewriteRule ^notes/?$ notes/ [L]
-RewriteRule ^([^/\.]+)/?$ index.php?project=$1 [L]
+RewriteRule ^([^/\.]+)/?$ /index.php?project=$1 [L]
diff --git a/includes/style.css b/includes/style.css
index 102c82c..4aad85f 100644 (file)
--- a/includes/style.css
+++ b/includes/style.css
@@ -69,11 +69,9 @@ li {
 }
 
 #contact_me {
-       margin-top:100px;
-<<<<<<< HEAD
        font-family:sans-serif;
-=======
->>>>>>> no-javascript
+       text-align:right;
+       float:right;
 }
 
 /* reprap */
@@ -94,30 +92,16 @@ li {
 
 #peephow_title_2 {
        font-size:3em;
-<<<<<<< HEAD
 }
 
 #peepshow_entry {
        font:1.4em "lucida console";
 }
 
-=======
-}
-
 #peepshow_entry {
        font:1.4em "lucida console";
 }
 
->>>>>>> no-javascript
-/* readoo */
-#readoo_title {
-       font:1.6em arial;
-}
-
-#readoo_entry {
-       font:1.6em arial;
-}
-
 /* drawcss */
 #drawcss_title {
        font:1.6em "lucida console";
@@ -143,7 +127,6 @@ li {
 
 #i_like_pandora_entry {
        font:1.4em "lucida console";
-<<<<<<< HEAD
 }
 
 /* notes */
@@ -168,6 +151,8 @@ li {
 
 pre {
        margin-top:10px;
-=======
->>>>>>> no-javascript
+}
+
+#navigation {
+       text-align:right;
 }
diff --git a/index.php b/index.php
index b519847..47a1ad4 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,79 +1 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-<head>
-  <meta name="generator" content=
-  "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
-  <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-
-  <title>dylanstestserver</title>
-  <link href="includes/style.css" rel="stylesheet" type="text/css">
-  <link rel="icon" href="favicon.ico" type="image/png">
-  <script type="text/javascript" src="includes/all.js">
-</script>
-</head>
-
-<body>
-  <div id="structure">
-    <div id="banner">
-      <a href=
-      "http://validator.w3.org/unicorn/check?ucn_uri=dylanstestserver.com&amp;ucn_task=conformance#">
-      <img src="images/dylanstestserver.png" alt="dylanstestserver"
-      border="0"></a>
-    </div>
-
-    <div id="content">
-      <div id="exhibit">
-           <?php require('includes/cms.php'); ?>
-         </div>
-
-      <ul id="portfolio" style="text-align:right">
-        <li>
-          <h3>my projects:</h3>
-        </li>
-
-               <?php $index->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://dylanstestserver.com</a></li>
-
-        <li>
-          <h3>some notes:</h3>
-        </li>
-
-        <li><a href=
-        "/dylanstestserver/notes">here</a></li>
-
-        <li>
-          <h1 id="contact_me"><a href=
-          "mailto:dylan@psu.edu">dylan</a></h1><a href=
-          "mailto:dylan@psu.edu">@psu.edu</a>
-        </li>
-      </ul>
-    </div><br>
-    <br>
-  </div>
-</body>
-</html>
+<?php require('includes/cms.php'); ?>
diff --git a/notes/index.php b/notes/index.php
deleted file mode 100644 (file)
index e0a8211..0000000
--- a/notes/index.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-<head>
-  <meta name="generator" content=
-  "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
-  <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-
-  <title>dylanstestserver</title>
-  <link href="/dylanstestserver/includes/style.css" rel="stylesheet" type="text/css">
-  <link rel="icon" href="/dylanstestserver/favicon.ico" type="image/png">
-</head>
-
-<body>
-  <div id="structure">
-    <div id="banner">
-      <a href=
-      "http://dylanstestserver.com/">
-      <img src="/dylanstestserver/images/dylanstestserver.png" alt="dylanstestserver"
-      border="0"></a>
-    </div>
-
-    <div id="content">
-         <div id="notes">
-           <?php require('../includes/cms.php') ?>
-        <h1 id="contact_me" style="margin-top:60px;"><a href=
-        "mailto:dylan@psu.edu">dylan</a></h1><a href=
-        "mailto:dylan@psu.edu">@psu.edu</a>
-         </div>
-       </div>
-  </div>
-</body>
-</html>
my (old) website