From 0cc2192ff7582f5f9c2c9a20adcceae3bbc1fa84 Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Sun, 6 Mar 2016 15:39:06 -0500
Subject: Update application navbar

The navbar now has a different view when logged in.  I added the 'user button' which shows alert info and has a menu.  Currently, the only menu item is 'Log out'.
---
 app/view/common/topp.view.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'app/view/common/topp.view.php')

diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php
index 05e4862..460887d 100644
--- a/app/view/common/topp.view.php
+++ b/app/view/common/topp.view.php
@@ -14,7 +14,20 @@
         </div>
 
         <div class="collapse navbar-collapse" id="scrottnav">
-            <p class="navbar-text navbar-right"><i>Not Logged In&nbsp;</i></p>
+            <?php if (!$mod->getCurrentUser()) { ?>
+                <p class="navbar-text navbar-right"><i>Not Logged In&nbsp;</i></p>
+            <?php } else { ?>
+                <ul class="nav navbar-nav navbar-right">
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                            <span class="<?=$mod->getCurrentUserGlyphicon()?>"></span> <?=$mod->getCurrentUser()->getDisplayName()?> <span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li><a href="<?=$mod->ar()?>/logout">Log out</a></li>
+                        </ul>
+                    </li>
+                </ul>
+            <?php } ?>
         </div>
 
     </div>
-- 
cgit v1.2.3


From 53472e75c050ce9b653cc70eeed56715d9a4163e Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Sun, 6 Mar 2016 17:09:55 -0500
Subject: Add settings modal to Common MVC

This modal dialog will be used to change app and object settings from any page in the app.  The link to open it is added to the user button menu.
---
 app/view/common/topp.view.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/view/common/topp.view.php')

diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php
index 460887d..b23dc9c 100644
--- a/app/view/common/topp.view.php
+++ b/app/view/common/topp.view.php
@@ -1,5 +1,7 @@
 <?php include "view/master/topp.view.php"; ?>
 
+<?php include "view/common/setting.modal.view.php"; ?>
+
 <nav class="navbar navbar-inverse navbar-fixed-top">
     <div class="container-fluid">
 
@@ -23,6 +25,7 @@
                             <span class="<?=$mod->getCurrentUserGlyphicon()?>"></span> <?=$mod->getCurrentUser()->getDisplayName()?> <span class="caret"></span>
                         </a>
                         <ul class="dropdown-menu">
+                            <li><a href="#" data-toggle="modal" data-target="#settingModal">Settings</a></li>
                             <li><a href="<?=$mod->ar()?>/logout">Log out</a></li>
                         </ul>
                     </li>
-- 
cgit v1.2.3


From 1392664aaf8d763b5cac927df01ce763d6672d36 Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Sun, 6 Mar 2016 21:42:05 -0500
Subject: Only include the Setting modal if currently logged in

This prevents sending un-necessary HTML to the client on login/signup pages and allows code on the setting modal to assume that getCurrentUser() will always return an object.
---
 app/view/common/topp.view.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/view/common/topp.view.php')

diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php
index b23dc9c..d520e00 100644
--- a/app/view/common/topp.view.php
+++ b/app/view/common/topp.view.php
@@ -1,6 +1,8 @@
 <?php include "view/master/topp.view.php"; ?>
 
-<?php include "view/common/setting.modal.view.php"; ?>
+<?php if ($mod->getCurrentUser()) { ?>
+    <?php include "view/common/setting.modal.view.php"; ?>
+<?php } ?>
 
 <nav class="navbar navbar-inverse navbar-fixed-top">
     <div class="container-fluid">
-- 
cgit v1.2.3


From 2936f0d151fb52bd2649edc37abd2e1d559d1f0f Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Sat, 12 Mar 2016 23:38:18 -0500
Subject: Move getUserGlyphicon function from common model into user class

---
 app/view/common/topp.view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/view/common/topp.view.php')

diff --git a/app/view/common/topp.view.php b/app/view/common/topp.view.php
index d520e00..40ad3fe 100644
--- a/app/view/common/topp.view.php
+++ b/app/view/common/topp.view.php
@@ -24,7 +24,7 @@
                 <ul class="nav navbar-nav navbar-right">
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-                            <span class="<?=$mod->getCurrentUserGlyphicon()?>"></span> <?=$mod->getCurrentUser()->getDisplayName()?> <span class="caret"></span>
+                            <span class="<?=$mod->getCurrentUser()->getGlyphicon()?>"></span> <?=$mod->getCurrentUser()->getDisplayName()?> <span class="caret"></span>
                         </a>
                         <ul class="dropdown-menu">
                             <li><a href="#" data-toggle="modal" data-target="#settingModal">Settings</a></li>
-- 
cgit v1.2.3