diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-10-12 03:50:02 -0700 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-10-12 03:50:02 -0700 |
| commit | b2fd98820370eb4521c510abab86481f4af36d5d (patch) | |
| tree | 738b8ecf22f2348ea148c6db7b0f6a89224ec45b /lib/tpl | |
| parent | 9f88c3ada06d83e6bed7fc70d1eb22a806ae40fe (diff) | |
| parent | f809ae7b68654e512abb3c980f458bda533d1327 (diff) | |
| download | rpg-b2fd98820370eb4521c510abab86481f4af36d5d.tar.gz rpg-b2fd98820370eb4521c510abab86481f4af36d5d.tar.bz2 | |
Merge pull request #134 from splitbrain/local-style-ini
added support for local style.ini files
Diffstat (limited to 'lib/tpl')
| -rw-r--r-- | lib/tpl/default/style.ini | 5 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/style.ini | 5 | ||||
| -rw-r--r-- | lib/tpl/index.php | 8 |
3 files changed, 16 insertions, 2 deletions
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index 7d27381c9..726c2025d 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -1,6 +1,11 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here +; To extend this file or make changes to it, it is recommended to create +; a style.local.ini file to prevent losing any changes after an upgrade. +; Please don't forgot to copy the section your changes should be under +; (i.e. [stylesheets] or [replacements]) into that file as well. + ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently ; print, screen and rtl are supported. rtl styles are loaded additionally diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index d0292e9b1..1402f751a 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -1,6 +1,11 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here +; To extend this file or make changes to it, it is recommended to create +; a style.local.ini file to prevent losing any changes after an upgrade. +; Please don't forgot to copy the section your changes should be under +; (i.e. [stylesheets] or [replacements]) into that file as well. + ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently ; print, screen and all are supported. diff --git a/lib/tpl/index.php b/lib/tpl/index.php index 357cc1f0d..3c00ab8e8 100644 --- a/lib/tpl/index.php +++ b/lib/tpl/index.php @@ -43,7 +43,11 @@ require_once(DOKU_INC.'inc/init.php'); </head> <body> <?php -$ini = @parse_ini_file($conf['template'].'/style.ini',true); +// get merged style.ini +define('SIMPLE_TEST', true); // hack to prevent css output and headers +require_once(DOKU_INC.'lib/exe/css.php'); +$ini = css_styleini(tpl_incdir()); + if ($ini) { echo '<table>'; echo "<caption>".htmlspecialchars($conf['template'])."'s style.ini</caption>"; @@ -60,7 +64,7 @@ if ($ini) { } echo '</table>'; } else { - echo "<p>Non-existent template: <strong>".htmlspecialchars($conf['template'])."</strong></p>"; + echo "<p>Non-existent or invalid template or style.ini: <strong>".htmlspecialchars($conf['template'])."</strong></p>"; } ?> </body> |