From 6b775e1cac042a9ace0733176918abcfc57e1129 Mon Sep 17 00:00:00 2001 From: Thomas Hochstein Date: Thu, 13 Apr 2017 00:18:28 +0200 Subject: [PATCH] Redo backend page title order. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Code style improvements from the reviews of * Rename ´$serendipity['title_first'´] to ´$serendipity['backendBlogtitleFirst']´ and make it boolean * Add default to `serendipity_config.inc.php`. * Change the condition in ´2k11/admin/index.tpl´ that the first branch is run by default Signed-off-by: Thomas Hochstein --- serendipity_admin.php | 2 +- serendipity_config.inc.php | 7 +++++++ templates/2k11/admin/index.tpl | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/serendipity_admin.php b/serendipity_admin.php index 8103a778..3a70b9ac 100644 --- a/serendipity_admin.php +++ b/serendipity_admin.php @@ -230,7 +230,7 @@ if ($ajax) { $admin_vars['out'] = array(); $admin_vars['no_create'] = $serendipity['no_create']; $admin_vars['title'] = $admin_section; - $admin_vars['title_first'] = $serendipity['title_first']; + $admin_vars['backendBlogtitleFirst'] = $serendipity['backendBlogtitleFirst']; if ($serendipity['expose_s9y']) { $admin_vars['version_info'] = sprintf(ADMIN_FOOTER_POWERED_BY, $serendipity['versionInstalled'], phpversion()); diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php index 57ff9e3b..66502452 100644 --- a/serendipity_config.inc.php +++ b/serendipity_config.inc.php @@ -137,6 +137,13 @@ if (!isset($serendipity['template_backend'])) { $serendipity['template_backend'] = '2k11'; } +// The default page title of backend pages is "section | blog title | SERENDIPITY_ADMIN_SUITE" +// If set to true (in serendipity_config_local.inc.php), the page title will be +// "blog title | section | SERENDIPITY_ADMIN_SUITE" instead +if (!isset($serendipity['backendBlogtitleFirst'])) { + $serendipity['backendBlogtitleFirst'] = false; +} + // Available languages if (!isset($serendipity['languages'])) { $serendipity['languages'] = array('en' => 'English', diff --git a/templates/2k11/admin/index.tpl b/templates/2k11/admin/index.tpl index 338c8b88..198b26ef 100644 --- a/templates/2k11/admin/index.tpl +++ b/templates/2k11/admin/index.tpl @@ -3,10 +3,10 @@ - {if $admin_vars.title_first == 'blogtitle'} - {$blogTitle} | {if $admin_vars.title}{$admin_vars.title}{/if} | {$CONST.SERENDIPITY_ADMIN_SUITE} - {else} + {if !$admin_vars.backendBlogtitleFirst} {if $admin_vars.title}{$admin_vars.title} | {/if}{$blogTitle} | {$CONST.SERENDIPITY_ADMIN_SUITE} + {else} + {$blogTitle} | {if $admin_vars.title}{$admin_vars.title}{/if} | {$CONST.SERENDIPITY_ADMIN_SUITE} {/if}