From 16f84185fb4d27ffc1668ec7eeaa339428b03f83 Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Sun, 12 Jun 2016 19:20:00 -0400
Subject: Update setting modal to use functions added in previous commit

---
 app/view/common/setting.modal.view.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/view/common/setting.modal.view.php')

diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php
index 68d3e2d..19f5929 100644
--- a/app/view/common/setting.modal.view.php
+++ b/app/view/common/setting.modal.view.php
@@ -31,7 +31,7 @@
 
             <div class="modal-body">
                 <ul class="nav nav-tabs" role="tablist">
-                    <li class="active"><a href="#settUserTab" aria-controls="settUserTab" data-toggle="tab">
+                    <li class="<?=$mod->getSettingModalTabActiveClass()?>"><a href="#settUserTab" aria-controls="settUserTab" data-toggle="tab">
                         <span class="glyphicon glyphicon-user"></span> <?=$mod->getCurrentUser()->getDisplayName()?>
                     </a></li>
 
@@ -42,7 +42,7 @@
                 </ul>
 
                 <div class="tab-content">
-                    <div class="tab-pane fade in active" id="settUserTab">
+                    <div class="tab-pane fade <?=$mod->getSettingModalTabDispClasses()?>" id="settUserTab">
                         <p>&nbsp;</p>
 
                         <form method="post" action="<?=$mod->ap()?>" enctype="multipart/form-data">
-- 
cgit v1.2.3


From 076a86c663870be3c4cf6da8059f0f978a7eb3ce Mon Sep 17 00:00:00 2001
From: Malf Furious <m@lfurio.us>
Date: Sun, 12 Jun 2016 21:33:50 -0400
Subject: Add group tab to setting modal

Created empty <div> for the group setting tab.  Also added code to the
common model for initializing the $mod->group variable and setting a
flag marking what tabs to include in the setting modal (group tab in
this case).  Added logic to the main setting modal view file for picking
up these flags and including appropriate additional content.
---
 app/view/common/setting.modal.view.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'app/view/common/setting.modal.view.php')

diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php
index 19f5929..2217805 100644
--- a/app/view/common/setting.modal.view.php
+++ b/app/view/common/setting.modal.view.php
@@ -31,6 +31,12 @@
 
             <div class="modal-body">
                 <ul class="nav nav-tabs" role="tablist">
+                    <?php if ($mod->common_settingShowTab['group']) { ?>
+                        <li class="<?=$mod->getSettingModalTabActiveClass()?>"><a href="#settGroupTab" aria-controls="settGroupTab" data-toggle="tab">
+                            <span class="glyphicon glyphicon-th"></span> <?=$mod->group->name?>
+                        </a></li>
+                    <?php } ?>
+
                     <li class="<?=$mod->getSettingModalTabActiveClass()?>"><a href="#settUserTab" aria-controls="settUserTab" data-toggle="tab">
                         <span class="glyphicon glyphicon-user"></span> <?=$mod->getCurrentUser()->getDisplayName()?>
                     </a></li>
@@ -42,6 +48,10 @@
                 </ul>
 
                 <div class="tab-content">
+                    <?php if ($mod->common_settingShowTab['group']) { ?>
+                        <?php include "view/common/group.setting.modal.view.php"; ?>
+                    <?php } ?>
+
                     <div class="tab-pane fade <?=$mod->getSettingModalTabDispClasses()?>" id="settUserTab">
                         <p>&nbsp;</p>
 
-- 
cgit v1.2.3