mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Merge pull request #5058 from Jimmi08/fix4683

Browse Source 
Fixes #4683 Missing preferences in bootstrap5
This commit is contained in:
Cameron
2023-08-17 11:16:50 -07:00
committed by GitHub
parent 5ff319cd5c b495efef5f
commit 1f06bb34c0
4 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_themes/bootstrap5/languages/English_admin.php
View File

@@ -6,6 +6,12 @@
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
define("LAN_THEMEPREF_01", "Bootswatch Styles:"); define("LAN_THEMEPREF_00", "Branding:");
define("LAN_THEMEPREF_01", "Navbar Alignment:");
define("LAN_THEMEPREF_02", "Display standard menu with card look"); define("LAN_THEMEPREF_02", "Display standard menu with card look");
define("LAN_THEMEPREF_03", "Display Login Page as standard page"); define("LAN_THEMEPREF_03", "Display Login Page as standard page");
define("LAN_THEMEPREF_04", "Site Name");
define("LAN_THEMEPREF_05", "Logo");
define("LAN_THEMEPREF_06", "Logo & Site Name");
define("LAN_THEMEPREF_07", "left");
define("LAN_THEMEPREF_08", "right");

4
e107_themes/bootstrap5/theme.html
View File

@@ -2,12 +2,12 @@
<body id="page-top" class="{LAYOUT_ID}" {BODY_ONLOAD} > <body id="page-top" class="{LAYOUT_ID}" {BODY_ONLOAD} >
<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
<div class="container"> <div class="container">
<a class="navbar-brand" href="{SITEURL}">{SITENAME}</a> <a class="navbar-brand" href="{SITEURL}">{BOOTSTRAP_BRANDING}</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarResponsive"> <div class="collapse navbar-collapse" id="navbarResponsive">
{NAVIGATION: type=main&class=me-auto} {BOOTSTRAP_NAV_ALIGN}
{SIGNIN} {SIGNIN}
</div> </div>
</div> </div>

7
e107_themes/bootstrap5/theme_config.php
View File

@@ -18,10 +18,11 @@ class theme_config implements e_theme_config
function config() function config()
{ {
$brandingOpts = array('sitename' => LAN_THEMEPREF_04, 'logo' => LAN_THEMEPREF_05, 'sitenamelogo' => LAN_THEMEPREF_06);
return array( return array(
// 'cardmenu_look' => array('title' => LAN_THEMEPREF_02, 'type'=>'boolean', 'writeParms'=>array(),'help'=>''), 'login_iframe' => array('title' => LAN_THEMEPREF_03, 'type' => 'boolean', 'writeParms' => array(), 'help' => ''),
'login_iframe' => array('title' => LAN_THEMEPREF_03, 'type'=>'boolean', 'writeParms'=>array(),'help'=>''), 'branding' => array('title' => LAN_THEMEPREF_00, 'type' => 'dropdown', 'writeParms' => array('optArray' => $brandingOpts)),
'nav_alignment' => array('title' => LAN_THEMEPREF_01, 'type' => 'radio', 'writeParms' => array('optArray' => array('left' => LAN_THEMEPREF_07, 'right' => LAN_THEMEPREF_08)))
); );
} }

38
e107_themes/bootstrap5/theme_shortcodes.php
View File

@@ -158,7 +158,45 @@ class theme_shortcodes extends e_shortcode
} }
function sc_bootstrap_branding()
{
$pref = e107::pref('theme', 'branding');
switch ($pref)
{
case 'logo':
return e107::getParser()->parseTemplate('{SITELOGO: h=30}', true);
break;
case 'sitenamelogo':
return "<span>" . e107::getParser()->parseTemplate('{SITELOGO: h=30}', true) . "</span>" . SITENAME;
break;
case 'sitename':
default:
return SITENAME;
break;
}
}
function sc_bootstrap_nav_align()
{
$pref = e107::pref('theme', 'nav_alignment');
if ($pref == 'right')
{
return e107::getParser()->parseTemplate('{NAVIGATION: type=main&class=ms-auto}');
}
else
{
return e107::getParser()->parseTemplate('{NAVIGATION: type=main&class=me-auto}');
}
}
} }