nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-02-11 13:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Template, Core Apps: Update to new modal.

Browse Source
This commit is contained in:
Nate
2020-03-25 16:48:12 -06:00
parent 52f4626452
commit 97eec1da04
20 changed files with 213 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/classes/menu.php
View File

@@ -1051,7 +1051,7 @@ if (!class_exists('menu')) {
if (isset($_SESSION['username']) && $_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
$username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null);
$html .= " <li class='nav-item'>\n";
$html .= " <a class='nav-link logout_icon' href='".PROJECT_PATH."/logout.php' title=\"".$text['theme-label-logout']."\" onclick=\"return confirm('".$this->text['theme-confirm-logout']."')\"><span class='fas fa-sign-out-alt'></span></a>";
$html .= " <a class='nav-link logout_icon' href='#' title=\"".$this->text['theme-label-logout']."\" onclick=\"modal_open('modal-logout','btn_logout');\"><span class='fas fa-sign-out-alt'></span></a>";
$html .= " </li>\n";
unset($username_full);
}
@@ -1061,6 +1061,11 @@ if (!class_exists('menu')) {
$html .= " </div>\n";
$html .= "</nav>\n";
//modal for logout icon (above)
if (isset($_SESSION['username']) && $_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
$html .= modal::create(['id'=>'modal-logout','type'=>'general','message'=>$this->text['theme-confirm-logout'],'actions'=>button::create(['type'=>'button','label'=>$this->text['theme-label-logout'],'icon'=>'sign-out-alt','id'=>'btn_logout','style'=>'float: right; margin-left: 15px;','collapse'=>'never','link'=>PROJECT_PATH.'/logout.php','onclick'=>"modal_close();"])]);
}
return $html;
unset($html);

8
resources/classes/modal.php
View File

@@ -18,7 +18,7 @@
The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com>
Copyright (C) 2010 - 2019
Copyright (C) 2010 - 2020
All Rights Reserved.
Contributor(s):
@@ -32,7 +32,7 @@ if (!class_exists('modal')) {
$modal = "<div id='".($array['id'] ? $array['id'] : 'modal')."' class='modal-window'>\n";
$modal .= " <div>\n";
$modal .= " <a href='#' title=\"".$text['button-close']."\" class='modal-close'>".($array['close'] ? $array['close'] : '&times;')."</a>\n";
$modal .= " <span title=\"".$text['button-close']."\" class='modal-close' onclick=\"modal_close();\">".($array['close'] ? $array['close'] : '&times;')."</span>\n";
if ($array['type'] != '') {
//add multi-lingual support
$language = new text;
@@ -51,6 +51,8 @@ if (!class_exists('modal')) {
$array['title'] = $text['modal_title-confirmation'];
$array['message'] = $text['confirm-delete'];
break;
default:
$array['title'] = $array['title'] != '' ? $array['title'] : $text['modal_title-confirmation'];
}
//prefix cancel button to action
$array['actions'] = button::create(['type'=>'button','label'=>$text['button-cancel'],'icon'=>$_SESSION['theme']['button_icon_cancel'],'collapse'=>'never','onclick'=>'modal_close();']).$array['actions'];
@@ -69,4 +71,4 @@ if (!class_exists('modal')) {
}
}
?>
?>