Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update auth.php and theme_handler.php to us ea bootstrap 5 admin theme and comply to use BS5 as it should. #5373

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update auth.php and theme_handler.php to us ea bootstrap 5 admin theme and comply to use BS5 as it should. #5373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21d7674
Update auth.php
Alex-e107nl Dec 25, 2024
50ecaa7
Update theme_handler.php
Alex-e107nl Dec 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e107_admin/auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
// Required for a clean v1.x -> v2 upgrade.
$core = e107::getConfig();
$adminTheme = $core->get('admintheme');
if($adminTheme !== 'bootstrap3'/* && $adminTheme !== 'bootstrap5'*/)
if($adminTheme !== 'bootstrap3' && $adminTheme !== 'bootstrap5')
{
$core->update('admintheme','bootstrap3');
$core->update('adminstyle','infopanel');
Expand Down
6 changes: 3 additions & 3 deletions e107_handlers/theme_handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2599,17 +2599,17 @@ function renderTheme($mode = 0, $theme = array())
$text .= "

<ul class='nav nav-tabs'>
<li class='active'><a data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-configure'>".LAN_CONFIGURE."</a></li>";
<li class='nav-item active'><a class='nav-link active' data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-configure'>".LAN_CONFIGURE."</a></li>";


if($this->themeConfigObj && call_user_func(array(&$this->themeConfigObj, 'config')) && $mode == self::RENDER_SITEPREFS)
{
$text .= "<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-customconfig'>".LAN_PREFS."</a></li>\n";
$text .= "<li class='nav-item'><a class='nav-link' data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-customconfig'>".LAN_PREFS."</a></li>\n";
}

if($this->themeConfigObj && call_user_func(array(&$this->themeConfigObj, 'help')))
{
$text .= "<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-help'>".LAN_HELP."</a></li>\n";
$text .= "<li class='nav-item'><a class='nav-link' data-toggle='tab' data-bs-toggle='tab' href='#core-thememanager-help'>".LAN_HELP."</a></li>\n";
}

$text .= "</ul>
Expand Down
Loading