Skip to content

Commit

Permalink
Closes e107inc#5373 - Bootstrap 5.
Browse files Browse the repository at this point in the history
  • Loading branch information
@CaMer0n
CaMer0n committed Jan 13, 2025
1 parent d86eeac commit 6aa42cc
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion e107_admin/admin_log.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ function dblog_remarks($curVal,$mode)
{
$id = $this->getController()->getListModel()->get('dblog_id');
$ret ="<a class='e-expandit' href='#rem-".$id."'>".RL_LAN_087."</a>";
$ret .= "<div style='display:none;width:33vw' id='rem-".$id."'>";
$ret .= "<div class='logcanvas' style='display:none;width:33vw' id='rem-".$id."'>";
$text = str_replace("<br />","\n",$text);
$text = str_replace("&#092;","/",$text);

Expand Down
2 changes: 1 addition & 1 deletion e107_admin/image.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3079,7 +3079,7 @@ function avatarPage()
$text .= "</div>
<div class='col-md-12 spacer clearfix'>
<div class='row buttons-bar'>
<div class='buttons-bar'>
<input type='hidden' name='show_avatars' value='1' />
".$frm->admin_button('e_check_all', LAN_CHECKALL, 'action'). '
' .$frm->admin_button('e_uncheck_all', LAN_UNCHECKALL, 'action'). '
Expand Down
4 changes: 3 additions & 1 deletion e107_core/shortcodes/batch/admin_shortcodes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2617,12 +2617,14 @@ public function sc_admin_menumanager($parm=null) // List all menu-configs for e
e107::setRegistry('core/e107/menu-manager/curLayout',$action);

$icon = e107::getParser()->toIcon('e-menus-24');
$caption = $icon. '<span>' .ADLAN_6. '</span>';
$caption = '<span>' .ADLAN_6. '</span>';

$diz = MENLAN_58;

$caption .= "<span class='e-help-icon pull-right'><a data-placement=\"bottom\" class='e-tip' title=\"".e107::getParser()->toAttribute($diz). '">' .defset('ADMIN_INFO_ICON'). '</a></span>';

$var['_extras_']['icon'] = e107::getParser()->toIcon('e-menus-24');

return e107::getNav()->admin($caption,$action, $var);


Expand Down
6 changes: 3 additions & 3 deletions e107_handlers/theme_handler.php
View file
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
18 changes: 9 additions & 9 deletions e107_plugins/download/includes/admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1297,9 +1297,9 @@ function create_download()
$text = "
<ul class='nav nav-tabs'>
<li class='active'><a data-toggle='tab' data-bs-toggle='tab' href='#download-create'>".DOWLAN_175."</a></li>
<li><a data-toggle='tab' data-bs-toggle='tab' href='#download-edit-external'>".DOWLAN_176."</a></li>
<li><a data-toggle='tab' data-bs-toggle='tab' href='#download-edit-mirror'>".DOWLAN_128."</a></li>
<li class='nav-item active'><a class='nav-link active' data-toggle='tab' data-bs-toggle='tab' href='#download-create'>".DOWLAN_175."</a></li>
<li class='nav-item'><a class='nav-link' data-toggle='tab' data-bs-toggle='tab' href='#download-edit-external'>".DOWLAN_176."</a></li>
<li class='nav-item'><a class='nav-link' data-toggle='tab' data-bs-toggle='tab' href='#download-edit-mirror'>".DOWLAN_128."</a></li>
</ul>
<form method='post' action='".e_SELF."?".e_QUERY."' id='myform'>
<div class='tab-content'>
Expand Down Expand Up @@ -2181,11 +2181,11 @@ function show_download_options()
$text = "
<ul class='nav nav-tabs'>
<li class='active'><a data-toggle='tab' data-bs-toggle='tab' href='#core-download-download1'>".LAN_DL_DOWNLOAD_OPT_GENERAL."</a></li>
<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-download-download2'>".LAN_DL_DOWNLOAD_OPT_BROKEN."</a></li>
<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-download-download3'>".LAN_DL_DOWNLOAD_OPT_AGREE."</a></li>
<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-download-download4'>".LAN_DL_DOWNLOAD_OPT_SECURITY."</a></li>
<li><a data-toggle='tab' data-bs-toggle='tab' href='#core-download-download5'>".LAN_DL_UPLOAD."</a></li>
<li class='nav-item active'><a class='nav-link active' data-toggle='tab' data-bs-toggle='tab' href='#core-download-download1'>".LAN_DL_DOWNLOAD_OPT_GENERAL."</a></li>
<li class='nav-item'><a class='nav-link' data-toggle='tab' data-bs-toggle='tab' href='#core-download-download2'>".LAN_DL_DOWNLOAD_OPT_BROKEN."</a></li>
<li class='nav-item'><a class='nav-link' data-toggle='tab' data-bs-toggle='tab' href='#core-download-download3'>".LAN_DL_DOWNLOAD_OPT_AGREE."</a></li>
<li class='nav-item'><a class='nav-link' data-toggle='tab' data-bs-toggle='tab' href='#core-download-download4'>".LAN_DL_DOWNLOAD_OPT_SECURITY."</a></li>
<li class='nav-item'><a class='nav-link' data-toggle='tab' data-bs-toggle='tab' href='#core-download-download5'>".LAN_DL_UPLOAD."</a></li>
</ul>
<form method='post' action='".e_SELF."?".e_QUERY."'>\n
Expand Down Expand Up @@ -2657,7 +2657,7 @@ public function afterDelete($deleted_data, $id, $deleted_check)
public function renderHelp()
{
$help_text = str_replace("[br]", "<br />", DOWLAN_HELP_11);
$help_text = str_replace(array("[", "]"), array("<a href='".e_ADMIN_ABS."notify.php'>"), $help_text);
$help_text = str_replace(array("[", "]"), array("<a href='".e_ADMIN_ABS."notify.php'>", "</a>"), $help_text);

return array('caption' => LAN_HELP, 'text' => $help_text);
}
Expand Down
2 changes: 1 addition & 1 deletion e107_plugins/forum/forum_admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@ public function afterDelete($deleted_data, $id, $deleted_check)
public function renderHelp()
{
$help_text = str_replace("[br]", "<br />", FORLAN_189);
$help_text = str_replace(array("[", "]"), array("<a href='".e_ADMIN_ABS."notify.php'>"), $help_text);
$help_text = str_replace(array("[", "]"), array("<a href='".e_ADMIN_ABS."notify.php'>", "</a>"), $help_text);

return array('caption' => LAN_HELP, 'text' => $help_text);
}
Expand Down

0 comments on commit 6aa42cc

Please sign in to comment.