From 34d182fda5293ad42fc1157535080ba5a5d6d47f Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Mon, 19 Sep 2011 16:21:50 -0400 Subject: [PATCH] new template naming conventions, etc --- .htaccess | 2 +- admin.html | 4 +- admin_images.html | 6 +- admin_login.html | 4 +- admin_pages.html | 6 +- admin_pages.php | 2 +- code/cms.php | 29 ++++++---- code/wfpl | 2 +- style.css | 146 ------------------------------------------------ style.less | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++ template.html | 46 +++++++++------- 11 files changed, 218 insertions(+), 188 deletions(-) delete mode 100644 style.css create mode 100644 style.less diff --git a/.htaccess b/.htaccess index c2a8568..e2570ae 100644 --- a/.htaccess +++ b/.htaccess @@ -7,7 +7,7 @@ DirectorySlash Off AddDefaultCharset UTF-8 RewriteEngine on RewriteRule ^[^/.]*$ /run.php [L] -RewriteRule ^style_[0-9]*.css$ /style.css [L] +RewriteRule ^style_[0-9]*.less$ /style.less [L] ExpiresActive On diff --git a/admin.html b/admin.html index 2cf3368..cf25af3 100644 --- a/admin.html +++ b/admin.html @@ -2,12 +2,12 @@ - <!--~main_title show {~-->~this_host~ Administration<!--~}~--> + <!--~$title show {~-->~this_host~ Administration<!--~}~--> - +

~this_host~ Administration

Upload/edit images

diff --git a/admin_images.html b/admin_images.html index 3ba2adb..b8ead21 100644 --- a/admin_images.html +++ b/admin_images.html @@ -2,12 +2,12 @@ - <!--~main_title show {~-->Images<!--~}~--> + <!--~$title show {~-->Images<!--~}~--> - +

Image details

@@ -30,7 +30,7 @@ -
On the right: (with the page text to the left of it)
<span class="float_right"><img src="~src~" width="~width~" height="~height~" alt="" />~caption html~</span>
+
On the right: (with the page text to the left of it)
<span class="wfpl_ifr" style="background-image: url(~src~); width: ~width~px; padding-top: ~height~;">~caption html~</span>
On the left: (with the page text to the right of it)
<span class="float_left"><img src="~src~" width="~width~" height="~height~" alt="" />~caption html~</span>
Centered: (with nothing to either side)
<div class="mid_pic" style="width: ~width~px"><img src="~src~" width="~width~" height="~height~" alt="" />~caption html~</div>
diff --git a/admin_login.html b/admin_login.html index 9da243f..516e3f6 100644 --- a/admin_login.html +++ b/admin_login.html @@ -2,11 +2,11 @@ - <!--~main_title show {~-->~this_host~ Admin Login<!--~}~--> + <!--~$title show {~-->~this_host~ Admin Login<!--~}~--> - +

~this_host~ Admin Login

diff --git a/admin_pages.html b/admin_pages.html index c63a38b..56e244b 100644 --- a/admin_pages.html +++ b/admin_pages.html @@ -2,9 +2,9 @@ - <!--~main_title show {~-->~this_host~ Admin: <!--~listings {~-->Pages Listing<!--~}~--><!--~form {~--><!--~new_msg {~-->Add a new page<!--~}~--><!--~edit_msg {~-->Edit page "~title html~"<!--~}~--><!--~}~--><!--~}~--> + <!--~$title show {~-->~this_host~ Admin: <!--~listings {~-->Pages Listing<!--~}~--><!--~form {~--><!--~new_msg {~-->Add a new page<!--~}~--><!--~edit_msg {~-->Edit page "~title html~"<!--~}~--><!--~}~--><!--~}~--> - + + + + + @@ -17,30 +21,34 @@
header image here
-