diff options
| author | Kevin Chabowski <kevin@kch42.de> | 2014-05-25 12:33:35 +0200 |
|---|---|---|
| committer | Kevin Chabowski <kevin@kch42.de> | 2014-05-25 12:33:35 +0200 |
| commit | e08182c0c900a96c53c5775408069183e28452b9 (patch) | |
| tree | e1a245e39fa3718f6ef743de494e78712a419136 /ratatoeskr | |
| parent | a403f14063ce8ac62f7ff82c35f05b4d4e8ec88c (diff) | |
| parent | 1bb15c28b7af7265687b85607b853a5f6722ecf4 (diff) | |
| download | ratatoeskr-cms-e08182c0c900a96c53c5775408069183e28452b9.tar.gz ratatoeskr-cms-e08182c0c900a96c53c5775408069183e28452b9.tar.bz2 ratatoeskr-cms-e08182c0c900a96c53c5775408069183e28452b9.zip | |
Merge branch 'develop'
Diffstat (limited to 'ratatoeskr')
| -rw-r--r-- | ratatoeskr/libs/INFO | 2 | ||||
| -rw-r--r-- | ratatoeskr/sys/init_ste.php | 2 | ||||
| -rwxr-xr-x | ratatoeskr/templates/src/systemtemplates/backend_login.html | 2 | ||||
| -rwxr-xr-x | ratatoeskr/templates/src/systemtemplates/master.html | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ratatoeskr/libs/INFO b/ratatoeskr/libs/INFO index 448a3d0..4b4e5e3 100644 --- a/ratatoeskr/libs/INFO +++ b/ratatoeskr/libs/INFO @@ -2,7 +2,7 @@ This directory will hold some libraries Ratatöskr needs. 1. STE Template Engine (STE) - Place "ste.php" directly into this directory. + Place the STE files into the subdirectory "ste" (create it, if it doesn't exist). At least "ste.php" and the "src" directory of STE are needed! STE can be found here: <https://github.com/kch42/ste> diff --git a/ratatoeskr/sys/init_ste.php b/ratatoeskr/sys/init_ste.php index 2084cb5..b0a90d1 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/ste.php"); +require_once(dirname(__FILE__) . "/../libs/ste/ste.php"); $tpl_basedir = dirname(__FILE__) . "/../templates"; diff --git a/ratatoeskr/templates/src/systemtemplates/backend_login.html b/ratatoeskr/templates/src/systemtemplates/backend_login.html index 7317ffa..a3d1c0b 100755 --- a/ratatoeskr/templates/src/systemtemplates/backend_login.html +++ b/ratatoeskr/templates/src/systemtemplates/backend_login.html @@ -9,7 +9,7 @@ <body> <img id="background_image" src="$rel_path_to_root/ratatoeskr/cms_style/images/login_bg.jpg" alt="" /> <div id="main"> - <div id="bar_top"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.2 β 3)</div> + <div id="bar_top"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.2 β 4)</div> <div class="vcenter_outer"><div class="vcenter_inner"> <div id="login_box"> <h1><ste:get_translation for="login_form_header" /></h1> diff --git a/ratatoeskr/templates/src/systemtemplates/master.html b/ratatoeskr/templates/src/systemtemplates/master.html index a37f449..aa2bf4e 100755 --- a/ratatoeskr/templates/src/systemtemplates/master.html +++ b/ratatoeskr/templates/src/systemtemplates/master.html @@ -40,7 +40,7 @@ </head> <body> <div id="bar_top"> - <span class="branding"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.2 β 3)</span> + <span class="branding"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.2 β 4)</span> <span class="user"> <a href="$rel_path_to_root/backend/admin/users/u/$user[id]">$user[name]</a> | <a href="$rel_path_to_root/backend/logout"><ste:get_translation for="logout" /></a> </span> |