From c431c863825f69e215ffa13919cfc0d19ac8062b Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Thu, 26 Mar 2020 16:54:06 -0600
Subject: [PATCH] Template CSS, Vertical Menu: Minor adjustments.

---
 resources/classes/menu.php | 7 ++++++-
 themes/default/css.php     | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/resources/classes/menu.php b/resources/classes/menu.php
index 0c13823028..368ab80cd3 100644
--- a/resources/classes/menu.php
+++ b/resources/classes/menu.php
@@ -1156,11 +1156,16 @@ if (!class_exists('menu')) {
 					}
 				//logout icon
 					if (isset($_SESSION['username']) && $_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
-						$html .= "<a id='header_logout_icon' href='".PROJECT_PATH."/logout.php' title=\"".$this->text['theme-label-logout']."\" onclick=\"return confirm('".$this->text['theme-confirm-logout']."')\"><span class='fas fa-log-out'></span></a>";
+						$html .= "<a id='header_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 .= "</span>";
 			$html .= "	</div>\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);
 
diff --git a/themes/default/css.php b/themes/default/css.php
index d59d92236c..9dbfb1f775 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -2671,6 +2671,10 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 		margin: <?php echo $_SESSION['theme']['modal_message_margin']['text'] != '' ? $_SESSION['theme']['modal_message_margin']['text'] : '0 0 20px 0'; ?>;
 		}
 
+	.modal-actions {
+		display: block;
+		text-align: left;
+		}
 
 <?php