From a8ccbfaa8372e74f564fc29ae00853916e7525d5 Mon Sep 17 00:00:00 2001
From: Ps0ke <ps0ke.mail@gmail.com>
Date: Mon, 27 Aug 2012 23:29:57 +0200
Subject: [PATCH] Renamed `static/' to `theme/' to better fit the purpose and
 not to confuse people.

---
 admin/index.php                            |  8 ++++----
 core/functions/functions.php               |  2 +-
 index.php                                  |  8 ++++----
 install/index.php                          |  4 ++--
 plugins/README.md                          | 14 +++++++-------
 {static => theme}/css/mobile.css           |  0
 {static => theme}/css/style.css            |  0
 {static => theme}/js/php-date-format.js    |  0
 {static => theme}/js/showdown-gui.js       |  0
 {static => theme}/js/showdown.js           |  0
 {static => theme}/templates/admin.php      |  4 ++--
 {static => theme}/templates/alert.php      |  2 +-
 {static => theme}/templates/footer.php     |  0
 {static => theme}/templates/header.php     |  4 ++--
 {static => theme}/templates/new-edit.php   | 10 +++++-----
 {static => theme}/templates/no-results.php |  0
 {static => theme}/templates/post.php       |  0
 {static => theme}/templates/really.php     |  2 +-
 18 files changed, 29 insertions(+), 29 deletions(-)
 rename {static => theme}/css/mobile.css (100%)
 rename {static => theme}/css/style.css (100%)
 rename {static => theme}/js/php-date-format.js (100%)
 rename {static => theme}/js/showdown-gui.js (100%)
 rename {static => theme}/js/showdown.js (100%)
 rename {static => theme}/templates/admin.php (93%)
 rename {static => theme}/templates/alert.php (92%)
 rename {static => theme}/templates/footer.php (100%)
 rename {static => theme}/templates/header.php (94%)
 rename {static => theme}/templates/new-edit.php (82%)
 rename {static => theme}/templates/no-results.php (100%)
 rename {static => theme}/templates/post.php (100%)
 rename {static => theme}/templates/really.php (94%)

diff --git a/admin/index.php b/admin/index.php
index 070ebb4..296c163 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -7,12 +7,12 @@
 	
 	if(isset($_GET['new'])){
 		$type = 'new';
-		require(BASE_PATH.'static/templates/new-edit.php');
+		require(BASE_PATH.'theme/templates/new-edit.php');
 	}
 	else if(preg_match('/^\d\d\d\d-\d\d-\d\d_\d\d-\d\d$/', $_GET['edit'])){
 		$type = 'edit';
 		$post = post_details(BASE_PATH."posts/".$_GET['edit'].".md");
-		require(BASE_PATH.'/static/templates/new-edit.php');
+		require(BASE_PATH.'/theme/templates/new-edit.php');
 	}
 	else if(preg_match('/^\d\d\d\d-\d\d-\d\d_\d\d-\d\d$/', $_GET['delete'])){
 		if(isset($_GET['really'])){
@@ -24,10 +24,10 @@
 			}
 		}
 		else
-			require(BASE_PATH.'static/templates/really.php');
+			require(BASE_PATH.'theme/templates/really.php');
 	}
 	else{
-	    require(BASE_PATH.'static/templates/admin.php');
+	    require(BASE_PATH.'theme/templates/admin.php');
 	}
 }
 if('POST' == $_SERVER['REQUEST_METHOD']){
diff --git a/core/functions/functions.php b/core/functions/functions.php
index a0b3f99..bb96b16 100644
--- a/core/functions/functions.php
+++ b/core/functions/functions.php
@@ -86,7 +86,7 @@ function to_url($string){
 
 function alert($alert_message, $alert_type, $alert_return_url = BASE_URL, $alert_delay = DEFAULT_ALERT_DELAY){
 	foreach(glob(BASE_PATH."plugins/*/php_functions-alert.php") as $filename){include $filename;}
-	include(BASE_PATH.'/static/templates/alert.php');
+	include(BASE_PATH.'/theme/templates/alert.php');
 	exit();
 }
 ?>
diff --git a/index.php b/index.php
index 4b4b5f5..7eea80c 100644
--- a/index.php
+++ b/index.php
@@ -85,7 +85,7 @@ function SpeedTest(){
 
 foreach(glob(BASE_PATH."plugins/*/php_main-before-include-header.php") as $pluginfilename){include $pluginfilename;}
 
-include(BASE_PATH.'static/templates/header.php');
+include(BASE_PATH.'theme/templates/header.php');
 
 if($files)
 	foreach($files as $filename){
@@ -101,13 +101,13 @@ function SpeedTest(){
 			
 			foreach(glob(BASE_PATH."plugins/*/php_main-post-before-include.php") as $pluginfilename){include $pluginfilename;}
 			
-			include(BASE_PATH.'static/templates/post.php');
+			include(BASE_PATH.'theme/templates/post.php');
 		}
 	}
 else
-	include(BASE_PATH.'static/templates/no-results.php');
+	include(BASE_PATH.'theme/templates/no-results.php');
 
-include(BASE_PATH.'static/templates/footer.php');
+include(BASE_PATH.'theme/templates/footer.php');
 
 if(DEV_MODE){
 	echo "<!-- Execution Time: ".SpeedTest()."s -->";
diff --git a/install/index.php b/install/index.php
index fe3390d..30e1b28 100644
--- a/install/index.php
+++ b/install/index.php
@@ -18,8 +18,8 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<title><?php echo POWERED_BY; ?></title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-	<link rel="stylesheet" type="text/css" href="../static/css/style.css" media="all and (min-width: 840px)">
-	<link rel="stylesheet" type="text/css" href="../static/css/mobile.css" media="only screen and (max-width: 839px)">
+	<link rel="stylesheet" type="text/css" href="../theme/css/style.css" media="all and (min-width: 840px)">
+	<link rel="stylesheet" type="text/css" href="../theme/css/mobile.css" media="only screen and (max-width: 839px)">
 	<link href='http://fonts.googleapis.com/css?family=Average' rel='stylesheet' type='text/css'>
 	<style>
 		.progressbar.outer{
diff --git a/plugins/README.md b/plugins/README.md
index 7eea469..47c61ec 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -49,8 +49,8 @@ I would like it to keep all plugins in the [mdbl0g Plugin Directory](https://git
 
 ## List of available hook points
 * `php_main-after-type-selection` - Hooks into `index.php` after the conditionals which select the `$type` of the query and the `$files` that get rendered. This is the place to go if you want to mod these.
-* `php_main-before-include-header` - Hooks into `index.php` after the `$DATA` has been set and before the `static/templates/header.php` is included.
-* `php_main-post-before-include` - Hooks into the `index.php` before the `static/templates/post.php` gets included, so it enables you to modify the `$DATA[]` of the post before it gets rendered.
+* `php_main-before-include-header` - Hooks into `index.php` after the `$DATA` has been set and before the `theme/templates/header.php` is included.
+* `php_main-post-before-include` - Hooks into the `index.php` before the `theme/templates/post.php` gets included, so it enables you to modify the `$DATA[]` of the post before it gets rendered.
 * `php_main-bottom-dev_mode` - Hooks the `if(DEV_MODE){}` conditional at the end of `index.php` so you can display debug information. Consider wrapping it up in html comments (`<!-- foobar -->`).
 * `php_main-post-before-set-data` - Hooks into the `index.php` before the `$DATA[]` array is filled, markdown text is rendered, etc.
 * `php_functions-to_html-md` - Hooks into the `core/functions/functions.php to_html()` function, before the conversion, `$markdown` is available for modification.
@@ -69,13 +69,13 @@ I would like it to keep all plugins in the [mdbl0g Plugin Directory](https://git
 * `php_admin-before-write-post` - Hooks into the `admin.index.php` and lets you modify the `$filecontent` directly before it gets written. `$_POST[]` is available. You can use this to to modify the file format and add extensions to it. Do checks for form fields to be non-empty if they are required (not recommended!) and throw suitable `alert();`s with predefined strings (so they are localized) like `$STR["alert_new_error_fields"]`. When using `php_admin*` hooks please read the section about security!
 
 
-* `html_head-top` - Hooks into the very top of the `<head>` element in `static/templates/header.php` before all other tags. This enables you to load recourses e.g. frameworks that are taken advantage of by other plugins and thus have to be strictly included _before_ the all other resources.
-* `html_head` - Hooks into the `<head>` element in `static/templates/header.php` after all other tags to load assets and overwrite previously loaded files.
+* `html_head-top` - Hooks into the very top of the `<head>` element in `theme/templates/header.php` before all other tags. This enables you to load recourses e.g. frameworks that are taken advantage of by other plugins and thus have to be strictly included _before_ the all other resources.
+* `html_head` - Hooks into the `<head>` element in `theme/templates/header.php` after all other tags to load assets and overwrite previously loaded files.
 * `html_aside` - Hooks in the end of the `<aside>` element. Used to display, widgets etc.
 * `html_aside-list` - Hooks into the `<aside>` but in a list element. May not be supported by all themes. The corresponding `<li> </li>` are already wrapped around.
 * `html_post-info` - Hooks into the info section of the post, after the publishing date and the admin links. Use it to add custom information
-* `html_post-bottom` - Hooks in at the end of the post element in `static/templates/post.php` to add html after the post. Add links or other short information here. For very long content use `html_post-bottom-last` so it won't interfere with other plugins right after the post content.
-* `html_post-bottom-last` - Hooks in at the end of the post element in `static/templates/post.php` to add html after the post. In contradiction to`html_post-bottom` it is the very last hook point in the post so its suitable for long content like a comments section.
+* `html_post-bottom` - Hooks in at the end of the post element in `theme/templates/post.php` to add html after the post. Add links or other short information here. For very long content use `html_post-bottom-last` so it won't interfere with other plugins right after the post content.
+* `html_post-bottom-last` - Hooks in at the end of the post element in `theme/templates/post.php` to add html after the post. In contradiction to`html_post-bottom` it is the very last hook point in the post so its suitable for long content like a comments section.
 * `html_footer-bottom` - Hooks in right before `</body>`. It's purpose is to be home to javascript code that need to parse the whole `<body>`.
 * `html_admin` - Hooks into the admin interface and lets you present options/links/information etc. to the admin. Headline and style should be provided by the theme, just put html to present the actual user interface here.
-* `html_admin-new-edit-after-textarea` - Hooks in the input form of the `static/templates/new-edit.php` and lets you add custom form fields after the `content` field. 
+* `html_admin-new-edit-after-textarea` - Hooks in the input form of the `theme/templates/new-edit.php` and lets you add custom form fields after the `content` field. 
diff --git a/static/css/mobile.css b/theme/css/mobile.css
similarity index 100%
rename from static/css/mobile.css
rename to theme/css/mobile.css
diff --git a/static/css/style.css b/theme/css/style.css
similarity index 100%
rename from static/css/style.css
rename to theme/css/style.css
diff --git a/static/js/php-date-format.js b/theme/js/php-date-format.js
similarity index 100%
rename from static/js/php-date-format.js
rename to theme/js/php-date-format.js
diff --git a/static/js/showdown-gui.js b/theme/js/showdown-gui.js
similarity index 100%
rename from static/js/showdown-gui.js
rename to theme/js/showdown-gui.js
diff --git a/static/js/showdown.js b/theme/js/showdown.js
similarity index 100%
rename from static/js/showdown.js
rename to theme/js/showdown.js
diff --git a/static/templates/admin.php b/theme/templates/admin.php
similarity index 93%
rename from static/templates/admin.php
rename to theme/templates/admin.php
index 3878a7a..d8bc4ed 100644
--- a/static/templates/admin.php
+++ b/theme/templates/admin.php
@@ -3,8 +3,8 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-	<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>static/css/style.css" media="all and (min-width: 840px)">
-	<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL ?>static/css/mobile.css" media="only screen and (max-width: 839px)">
+	<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>theme/css/style.css" media="all and (min-width: 840px)">
+	<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL ?>theme/css/mobile.css" media="only screen and (max-width: 839px)">
 	<link href='http://fonts.googleapis.com/css?family=Average' rel='stylesheet' type='text/css'>
 	<title>Admin Interface <?php echo BLOG_TITLE; ?></title>
 </head>
diff --git a/static/templates/alert.php b/theme/templates/alert.php
similarity index 92%
rename from static/templates/alert.php
rename to theme/templates/alert.php
index 415b1b9..9dc5d54 100644
--- a/static/templates/alert.php
+++ b/theme/templates/alert.php
@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-	<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>static/css/style.css" media="all">
+	<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>theme/css/style.css" media="all">
 	<title><?php echo BLOG_TITLE; ?></title>
 
 	<!-- Refresh -->
diff --git a/static/templates/footer.php b/theme/templates/footer.php
similarity index 100%
rename from static/templates/footer.php
rename to theme/templates/footer.php
diff --git a/static/templates/header.php b/theme/templates/header.php
similarity index 94%
rename from static/templates/header.php
rename to theme/templates/header.php
index 42e217d..fe171c6 100644
--- a/static/templates/header.php
+++ b/theme/templates/header.php
@@ -7,8 +7,8 @@
 		<link rel="alternate" type="application/rss+xml" title="<?php echo BLOG_TITLE; ?> Feed" href="<?php echo $DATA['rssLink']; ?>">
 		<title><?php echo BLOG_TITLE; ?></title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-		<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>static/css/style.css" media="all and (min-width: 610px)">
-		<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>static/css/mobile.css" media="only screen and (max-width: 609px)">
+		<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>theme/css/style.css" media="all and (min-width: 610px)">
+		<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>theme/css/mobile.css" media="only screen and (max-width: 609px)">
 		<?php foreach(glob(BASE_PATH."plugins/*/html_head.php") as $filename){include $filename;} ?>
 	</head>
 <body>
diff --git a/static/templates/new-edit.php b/theme/templates/new-edit.php
similarity index 82%
rename from static/templates/new-edit.php
rename to theme/templates/new-edit.php
index 8199784..61cf787 100644
--- a/static/templates/new-edit.php
+++ b/theme/templates/new-edit.php
@@ -4,12 +4,12 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<title><?php echo BLOG_TITLE; ?></title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-	<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>static/css/style.css" media="all and (min-width: 840px)">
-	<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL ?>static/css/mobile.css" media="only screen and (max-width: 839px)">
+	<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>theme/css/style.css" media="all and (min-width: 840px)">
+	<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL ?>theme/css/mobile.css" media="only screen and (max-width: 839px)">
 	<link href='http://fonts.googleapis.com/css?family=Average' rel='stylesheet' type='text/css'>
-	<script type="text/javascript" src="<?php echo BASE_URL; ?>static/js/showdown.js"></script>
-	<script type="text/javascript" src="<?php echo BASE_URL; ?>static/js/showdown-gui.js"></script>
-	<script type="text/javascript" src="<?php echo BASE_URL; ?>static/js/php-date-format.js"></script>
+	<script type="text/javascript" src="<?php echo BASE_URL; ?>theme/js/showdown.js"></script>
+	<script type="text/javascript" src="<?php echo BASE_URL; ?>theme/js/showdown-gui.js"></script>
+	<script type="text/javascript" src="<?php echo BASE_URL; ?>theme/js/php-date-format.js"></script>
 </head>
 <body>
 <div class="newpost-wrapper">
diff --git a/static/templates/no-results.php b/theme/templates/no-results.php
similarity index 100%
rename from static/templates/no-results.php
rename to theme/templates/no-results.php
diff --git a/static/templates/post.php b/theme/templates/post.php
similarity index 100%
rename from static/templates/post.php
rename to theme/templates/post.php
diff --git a/static/templates/really.php b/theme/templates/really.php
similarity index 94%
rename from static/templates/really.php
rename to theme/templates/really.php
index 700aa7e..245847a 100644
--- a/static/templates/really.php
+++ b/theme/templates/really.php
@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-	<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>static/css/style.css" media="all">
+	<link rel="stylesheet" type="text/css" href="<?php echo BASE_URL; ?>theme/css/style.css" media="all">
 	<title><?php echo BLOG_TITLE; ?></title>
 </head>
 <body>