mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Redo backend page title order.

Browse Source 
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 <thh@inter.net>
This commit is contained in:
Thomas Hochstein 2017-04-13 00:18:28 +02:00
parent 82b79ef4d6
commit 6b775e1cac
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serendipity_admin.php
View File

@ -230,7 +230,7 @@ if ($ajax) {
$admin_vars['out'] = array(); $admin_vars['out'] = array();
$admin_vars['no_create'] = $serendipity['no_create']; $admin_vars['no_create'] = $serendipity['no_create'];
$admin_vars['title'] = $admin_section; $admin_vars['title'] = $admin_section;
$admin_vars['title_first'] = $serendipity['title_first']; $admin_vars['backendBlogtitleFirst'] = $serendipity['backendBlogtitleFirst'];
if ($serendipity['expose_s9y']) { if ($serendipity['expose_s9y']) {
$admin_vars['version_info'] = sprintf(ADMIN_FOOTER_POWERED_BY, $serendipity['versionInstalled'], phpversion()); $admin_vars['version_info'] = sprintf(ADMIN_FOOTER_POWERED_BY, $serendipity['versionInstalled'], phpversion());

7
serendipity_config.inc.php
View File

@ -137,6 +137,13 @@ if (!isset($serendipity['template_backend'])) {
$serendipity['template_backend'] = '2k11'; $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 // Available languages
if (!isset($serendipity['languages'])) { if (!isset($serendipity['languages'])) {
$serendipity['languages'] = array('en' => 'English', $serendipity['languages'] = array('en' => 'English',

6
templates/2k11/admin/index.tpl
View File

@ -3,10 +3,10 @@
<!--[if gt IE 8]><!--> <html class="no-js" dir="{$CONST.LANG_DIRECTION}" lang="{$lang}"> <!--<![endif]--> <!--[if gt IE 8]><!--> <html class="no-js" dir="{$CONST.LANG_DIRECTION}" lang="{$lang}"> <!--<![endif]-->
<head> <head>
<meta charset="{$CONST.LANG_CHARSET}"> <meta charset="{$CONST.LANG_CHARSET}">
{if $admin_vars.title_first == 'blogtitle'} {if !$admin_vars.backendBlogtitleFirst}
<title>{$blogTitle} | {if $admin_vars.title}{$admin_vars.title}{/if} | {$CONST.SERENDIPITY_ADMIN_SUITE}</title>
{else}
<title>{if $admin_vars.title}{$admin_vars.title} | {/if}{$blogTitle} | {$CONST.SERENDIPITY_ADMIN_SUITE}</title> <title>{if $admin_vars.title}{$admin_vars.title} | {/if}{$blogTitle} | {$CONST.SERENDIPITY_ADMIN_SUITE}</title>
{else}
<title>{$blogTitle} | {if $admin_vars.title}{$admin_vars.title}{/if} | {$CONST.SERENDIPITY_ADMIN_SUITE}</title>
{/if} {/if}
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{$head_link_stylesheet}"> <link rel="stylesheet" href="{$head_link_stylesheet}">