1
0

added temporary backend developer template dir switch - Please read:

The smartified code as forked from master to 2.0 being outsourced,
now is to find in /include/admin/tplold, which will still be used as
the default backend template dir.
To switch to the new version, please paste the dirs and files of s9y-admin-tpl
as adviced in the readme and reload, but also add a
```php
	// End of Serendipity configuration file
	// You can place your own special variables after here:

	define('SWITCH_TEMPLATE_VERSION', 'true');

```
to the end of your serendipity_config_local.inc.php.

To switch back to the old smartified files, just set a // to the define().
This commit is contained in:
Ian
2012-11-20 14:38:28 +01:00
parent 370f30a269
commit fb81d6a121
36 changed files with 32 additions and 37 deletions

@ -200,11 +200,9 @@ if (!is_object($serendipity['smarty'])) {
}
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/category.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/category.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile); // short notation with Smarty3 in S9y 1.7 and up
echo $content;
/* vim: set sts=4 ts=4 expandtab : */

@ -415,11 +415,9 @@ if (!is_object($serendipity['smarty'])) {
}
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/comments.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/comments.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile); // short notation with Smarty3 in S9y 1.7 and up
echo $content;
/* vim: set sts=4 ts=4 expandtab : */

@ -80,7 +80,8 @@ if (!is_object($serendipity['smarty'])) {
}
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/configuration.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/configuration.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile);
echo $content;

@ -418,7 +418,8 @@ if (!is_object($serendipity['smarty'])) {
}
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/entries.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/entries.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile);
echo $content;

@ -8,7 +8,8 @@ if (!is_object($serendipity['smarty'])) {
serendipity_smarty_init();
}
$tfile = dirname(__FILE__) . "/tpl/entries_overview.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/entries_overview.inc.tpl";
$serendipity['smarty']->display('file:'. $tfile);
/* vim: set sts=4 ts=4 expandtab : */

@ -8,7 +8,8 @@ if (!is_object($serendipity['smarty'])) {
serendipity_smarty_init();
}
$tfile = dirname(__FILE__) . "/tpl/export.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/export.inc.tpl";
$serendipity['smarty']->display('file:'. $tfile);
/* vim: set sts=4 ts=4 expandtab : */

@ -126,7 +126,8 @@ if ($serendipity['GET']['adminAction'] == 'edit' || isset($_POST['NEW'])) {
}
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/groups.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/groups.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile);
echo $content;

@ -732,11 +732,9 @@ $data['get']['fid'] = $serendipity['GET']['fid']; // don't trust {$smarty.get.va
$data['get']['only_path'] = $serendipity['GET']['only_path']; // we dont need other GET vars in images.inc.tpl
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/images.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/images.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile); // short notation with Smarty3 in S9y 1.7 and up
echo $content;
/* vim: set sts=4 ts=4 expandtab : */

@ -259,7 +259,8 @@ if (!is_object($serendipity['smarty'])) {
}
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/import.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/import.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile);
echo $content;

@ -385,8 +385,9 @@ if (!is_object($serendipity['smarty'])) {
}
$serendipity['smarty']->assign($data);
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/installer.inc.tpl";
$tfile = dirname(__FILE__) . "/tpl/installer.inc.tpl";
ob_start();
include $tfile;
$content = ob_get_contents();

@ -41,11 +41,9 @@ if (!is_object($serendipity['smarty'])) {
}
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/overview.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/overview.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile); // short notation with Smarty3 in S9y 1.7 and up
echo $content;
/* vim: set sts=4 ts=4 expandtab : */

@ -119,7 +119,8 @@ if (!is_object($serendipity['smarty'])) {
}
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/personal.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/personal.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile);
echo $content;

@ -443,7 +443,8 @@ if (!is_object($serendipity['smarty'])) {
}
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/plugins.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/plugins.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile);
echo $content;

@ -173,11 +173,9 @@ if (!is_object($serendipity['smarty'])) {
}
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/templates.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/templates.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile); // short notation with Smarty3 in S9y 1.7 and up
echo $content;
/* vim: set sts=4 ts=4 expandtab : */

@ -365,11 +365,9 @@ if (!is_object($serendipity['smarty'])) {
#$serendipity['smarty']->registerPlugin('function', 'serendipity_upgraderResultDiagnose', 'serendipity_smarty_backend_upgraderResultDiagnose');
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/upgrader.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/upgrader.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile); // short notation with Smarty3 in S9y 1.7 and up
echo $content;
/* vim: set sts=4 ts=4 expandtab : */

@ -253,11 +253,9 @@ if (!is_object($serendipity['smarty'])) {
}
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/users.inc.tpl";
$tpldir = ( !defined('SWITCH_TEMPLATE_VERSION') ) ? 'tplold' : 'tpl';
$tfile = dirname(__FILE__) . "/$tpldir/users.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile);
echo $content;
/* vim: set sts=4 ts=4 expandtab : */