Fixed default contextual behavior and content in MyApp

Qbix · Nov 8, 2020 · 4cc58e1 · 4cc58e1
1 parent d9b8a02
commit 4cc58e1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/MyApp/views/MyApp/dashboard.php b/MyApp/views/MyApp/dashboard.php
@@ -6,6 +6,13 @@
 	<div id="dashboard_user">
 		<?php echo Q::tool('Users/status') ?>
 	</div>
+
+	<div id="dashboard_user_contextual">
+		<ul class="Q_listing">
+			<li data-action="setIdentifier"><?php echo $dashboard['SetEmailAddress'] ?></li>
+			<li data-action="logout"><?php echo $dashboard['LogOut'] ?></li>
+		</ul>
+	</div>
 
 	<?php echo Q::tool('Q/tabs', array(
 		'vertical' => !$isMobile and Q_Config::get('Q', 'response', 'layout', 'sidebar', false),

diff --git a/MyApp/web/css/MyApp.css b/MyApp/web/css/MyApp.css
@@ -132,6 +132,7 @@ table { table-layout: fixed; }
 .Q_mobile.Users_loggedIn #dashboard_user { margin: 0; }
 .Q_mobile.Users_loggedOut #dashboard_user { line-height: 40px; }
 #dashboard .Q_contextual * { color: black; }
+#dashboard_user_contextual { display: none; }
 #dashboard td { vertical-align: middle; }
 #dashboard table { width: 100%; padding: 0; margin: 0; }
 #dashboard .Q_dashboard_logo { padding: 0; }

diff --git a/MyApp/web/js/MyApp.js b/MyApp/web/js/MyApp.js
@@ -28,13 +28,16 @@ var MyApp = (function (Q, $) {
 			Q.Users.login();
 			return false;
 		});
-
-		Q.addScript("{{Q}}/js/contextual.js", function () {
-			$('#dashboard .Users_avatar_tool').plugin('Q/contextual', {
-				elements: $('#dashboard_user_contextual .Q_listing').clone().children(),
-				defaultHandler: MyApp.userContextual
+
+		var $userCommands = $('#dashboard_user_contextual .Q_listing').children();
+		if ($userCommands.length) {
+			Q.addScript("{{Q}}/js/contextual.js", function () {
+				$('#dashboard .Users_avatar_tool').plugin('Q/contextual', {
+					elements: $userCommands.clone(),
+					defaultHandler: MyApp.userContextual
+				});
 			});
-		});
+		}
 
 		// For example, we can hide notices when the user clicks/taps on them
 		$('#notices li').on(Q.Pointer.fastclick, true, function () {