From a88de608dde6e0df48a122d72f112b5b92ad15ac Mon Sep 17 00:00:00 2001 From: Kevin Chabowski Date: Mon, 28 Oct 2013 22:42:56 +0100 Subject: STE has a new repository and name. --- .gitignore | 2 +- INSTALL.md | 14 ++++++++++---- create-package.sh | 2 +- ratatoeskr/libs/INFO | 6 +++--- ratatoeskr/sys/init_ste.php | 4 ++-- setup.php | 2 +- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 2505a76..d231bc2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ images/* ratatoeskr/templates/src/plugintemplates/* ratatoeskr/templates/src/usertemplates/* ratatoeskr/templates/transc/* -ratatoeskr/libs/stupid_template_engine.php +ratatoeskr/libs/ste.php ratatoeskr/libs/markdown.php ratatoeskr/libs/kses.php ratatoeskr/libs/jquery.min.js diff --git a/INSTALL.md b/INSTALL.md index 8d50ddb..8a59dfc 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -5,7 +5,7 @@ Step 0: Requirements -------------------- * Apache Webserver with PHP 5.3 -* These PHP modules (usually installed): gd, hash, session, mysql +* These PHP modules (usually installed): gd, hash, session, pdo * A MySQL server. Step 1: Get additional libraries @@ -13,11 +13,11 @@ Step 1: Get additional libraries You need these libraries to run Ratatöskr (it is probably already bundled with these): -1. Stupid Template Engine (STE) +1. STE Template Engine (STE) - Place "stupid_template_engine.php" directly into this directory. + Place "ste.php" directly into this directory. - STE can be found here: + STE can be found here: 2. PHP Markdown @@ -31,6 +31,12 @@ You need these libraries to run Ratatöskr (it is probably already bundled with kses can be found at +4. jQuery + + Place jquery.min.js into this folder. + + jQuery can be found at + Step 2: Copy files to your Webspace ----------------------------------- diff --git a/create-package.sh b/create-package.sh index a2efb4f..534518b 100755 --- a/create-package.sh +++ b/create-package.sh @@ -12,7 +12,7 @@ mkdir plugin_extradata/public mkdir templates/src/plugintemplates mkdir templates/transc cd libs -wget https://raw.github.com/kch42/Stupid-Template-Engine/master/stupid_template_engine.php +wget https://raw.github.com/kch42/ste/ste.php wget http://michelf.com/docs/projets/php-markdown-1.0.1o.zip unzip php-markdown-*.zip mv PHP\ Markdown\ */markdown.php . diff --git a/ratatoeskr/libs/INFO b/ratatoeskr/libs/INFO index e2bc19b..448a3d0 100644 --- a/ratatoeskr/libs/INFO +++ b/ratatoeskr/libs/INFO @@ -1,10 +1,10 @@ This directory will hold some libraries Ratatöskr needs. -1. Stupid Template Engine (STE) +1. STE Template Engine (STE) - Place "stupid_template_engine.php" directly into this directory. + Place "ste.php" directly into this directory. - STE can be found here: + STE can be found here: 2. PHP Markdown diff --git a/ratatoeskr/sys/init_ste.php b/ratatoeskr/sys/init_ste.php index 6152683..2084cb5 100644 --- a/ratatoeskr/sys/init_ste.php +++ b/ratatoeskr/sys/init_ste.php @@ -11,7 +11,7 @@ * See "ratatoeskr/licenses/ratatoeskr" for more information. */ -require_once(dirname(__FILE__) . "/../libs/stupid_template_engine.php"); +require_once(dirname(__FILE__) . "/../libs/ste.php"); $tpl_basedir = dirname(__FILE__) . "/../templates"; @@ -20,7 +20,7 @@ if(!isset($ste)) /* * Variable: $ste * - * The global STECore (Stupid Template Engine) instance. + * The global STECore instance. */ $ste = new \ste\STECore(new \ste\FilesystemStorageAccess("$tpl_basedir/src", "$tpl_basedir/transc")); if(defined("__DEBUG__") && __DEBUG__) diff --git a/setup.php b/setup.php index 054001e..4c3e39d 100644 --- a/setup.php +++ b/setup.php @@ -60,7 +60,7 @@ $files = array( "/ratatoeskr/translations/en.php", "/ratatoeskr/backend.php", "/ratatoeskr/libs/markdown.php", - "/ratatoeskr/libs/stupid_template_engine.php", + "/ratatoeskr/libs/ste.php", "/ratatoeskr/libs/kses.php", "/ratatoeskr/.htaccess", "/ratatoeskr/setup/create_tables.php", -- cgit v1.2.3-54-g00ecf From d552bd7b8fbc9ff8b81067a05eba53207cb8c91a Mon Sep 17 00:00:00 2001 From: Kevin Chabowski Date: Mon, 28 Oct 2013 22:44:12 +0100 Subject: Using the new ste:else in ste:foreach feature. --- .../templates/src/systemtemplates/articles.html | 41 ++++++++++------------ .../src/systemtemplates/comments_list.html | 29 +++++++-------- .../templates/src/systemtemplates/image_list.html | 25 ++++++------- .../templates/src/systemtemplates/pluginlist.html | 30 +++++++--------- .../templates/src/systemtemplates/repos.html | 22 +++++------- 5 files changed, 60 insertions(+), 87 deletions(-) diff --git a/ratatoeskr/templates/src/systemtemplates/articles.html b/ratatoeskr/templates/src/systemtemplates/articles.html index 764ac40..2970b7c 100644 --- a/ratatoeskr/templates/src/systemtemplates/articles.html +++ b/ratatoeskr/templates/src/systemtemplates/articles.html @@ -37,32 +37,27 @@ - - ~{$articles_n|gt|0} - - - - - $article[urlname] - - - ?{~{$i|eq|0}||, }$lang - - - %Y-%m-%d %H:%M:%S - - - ?{~{$i|eq|0}||, } $tag - - - $article[section][name] - - - + + + + $article[urlname] + + + ?{~{$i|eq|0}||, }$lang + + + %Y-%m-%d %H:%M:%S + + + ?{~{$i|eq|0}||, } $tag + + + $article[section][name] + - +
diff --git a/ratatoeskr/templates/src/systemtemplates/comments_list.html b/ratatoeskr/templates/src/systemtemplates/comments_list.html index 5c86a8e..8bbcda8 100644 --- a/ratatoeskr/templates/src/systemtemplates/comments_list.html +++ b/ratatoeskr/templates/src/systemtemplates/comments_list.html @@ -39,26 +39,21 @@ - - ~{$comments_n|gt|0} - - - - - ?{$comment[read_by_admin]||} - ?{$comment[visible]||} - $comment[excerpt]... - $comment[language] - $comment[author] - %Y-%m-%d %H:%M:%S - $comment[article] - - - + + + + ?{$comment[read_by_admin]||} + ?{$comment[visible]||} + $comment[excerpt]... + $comment[language] + $comment[author] + %Y-%m-%d %H:%M:%S + $comment[article] + - +
diff --git a/ratatoeskr/templates/src/systemtemplates/image_list.html b/ratatoeskr/templates/src/systemtemplates/image_list.html index fe600aa..0674f94 100644 --- a/ratatoeskr/templates/src/systemtemplates/image_list.html +++ b/ratatoeskr/templates/src/systemtemplates/image_list.html @@ -26,24 +26,19 @@ - - ~{$images_n|gt|0} - - - - - - $image[name] - - Markdown - HTML - STE - - - - + + + + + $image[name] + + Markdown - HTML - STE + + - +
diff --git a/ratatoeskr/templates/src/systemtemplates/pluginlist.html b/ratatoeskr/templates/src/systemtemplates/pluginlist.html index 5d88fb4..85ad71a 100644 --- a/ratatoeskr/templates/src/systemtemplates/pluginlist.html +++ b/ratatoeskr/templates/src/systemtemplates/pluginlist.html @@ -19,27 +19,21 @@ - - - ~{$plugins_n|gt|0} - - - - - $p[name] - $p[versiontext] - ?{$p[active]||} - $p[description] - $p[author] - ?{$p[web]|$p[web]|} - ?{$p[help]||} - - - + + + + $p[name] + $p[versiontext] + ?{$p[active]||} + $p[description] + $p[author] + ?{$p[web]|$p[web]|} + ?{$p[help]||} + - +
diff --git a/ratatoeskr/templates/src/systemtemplates/repos.html b/ratatoeskr/templates/src/systemtemplates/repos.html index 31de6a5..1da92ea 100644 --- a/ratatoeskr/templates/src/systemtemplates/repos.html +++ b/ratatoeskr/templates/src/systemtemplates/repos.html @@ -23,25 +23,19 @@ - - - ~{$repos_n|gt|0} - - - - - $repo[name] - $repo[description] - $repo[baseurl] - - - + + + + $repo[name] + $repo[description] + $repo[baseurl] + - +
-- cgit v1.2.3-54-g00ecf From 2c88eecc053ad8d7fc527238485c17b7b6c53afa Mon Sep 17 00:00:00 2001 From: Kevin Chabowski Date: Mon, 28 Oct 2013 22:44:37 +0100 Subject: We are now Beta 3. --- ratatoeskr/templates/src/systemtemplates/backend_login.html | 2 +- ratatoeskr/templates/src/systemtemplates/master.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ratatoeskr/templates/src/systemtemplates/backend_login.html b/ratatoeskr/templates/src/systemtemplates/backend_login.html index 8c26b83..7317ffa 100755 --- a/ratatoeskr/templates/src/systemtemplates/backend_login.html +++ b/ratatoeskr/templates/src/systemtemplates/backend_login.html @@ -9,7 +9,7 @@
-
Ratatöskr::Noctilucent clouds (v. 0.2 β 2)
+
Ratatöskr::Noctilucent clouds (v. 0.2 β 3)

diff --git a/ratatoeskr/templates/src/systemtemplates/master.html b/ratatoeskr/templates/src/systemtemplates/master.html index 161b75d..a37f449 100755 --- a/ratatoeskr/templates/src/systemtemplates/master.html +++ b/ratatoeskr/templates/src/systemtemplates/master.html @@ -40,7 +40,7 @@
- Ratatöskr::Noctilucent clouds (v. 0.2 β 2) + Ratatöskr::Noctilucent clouds (v. 0.2 β 3) $user[name] | -- cgit v1.2.3-54-g00ecf