From 06268cf4dd5d7b6a1742077db3a5949144a4761f Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Sat, 5 Mar 2011 15:58:12 -0500 Subject: [PATCH] Everything now comes from cms.php 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 | 7 ++-- includes/style.css | 27 ++++------------ index.php | 80 +--------------------------------------------- notes/index.php | 34 -------------------- 4 files changed, 11 insertions(+), 137 deletions(-) delete mode 100644 notes/index.php diff --git a/.htaccess b/.htaccess index b11bc6a..44ef5b9 100644 --- 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 --- 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 --- a/index.php +++ b/index.php @@ -1,79 +1 @@ - - - - - - - - dylanstestserver - - - - - - -
- - -
-
- -
- - -

-
-
- - + diff --git a/notes/index.php b/notes/index.php deleted file mode 100644 index e0a8211..0000000 --- a/notes/index.php +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - dylanstestserver - - - - - -
- - -
- -
-
- - -- 2.30.2