diff options
| author | Malf Furious <m@lfurio.us> | 2016-10-22 00:13:12 -0400 |
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2016-10-22 00:13:12 -0400 |
| commit | 9d0ff6546fb03489bbd127aeec6ee161e204a139 (patch) | |
| tree | 3e4624c95293c3000e0dbac095af4a461ae35176 /app/view/common/setting.modal.view.php | |
| parent | 827a8025ab48dea386b77717f1d1bc30d10ba232 (diff) | |
| parent | 35da301d31045b0974100307a7f0f4128b482170 (diff) | |
| download | scrott-9d0ff6546fb03489bbd127aeec6ee161e204a139.tar.gz scrott-9d0ff6546fb03489bbd127aeec6ee161e204a139.zip | |
Merge branch 'feature/core/groups' into dev
Diffstat (limited to 'app/view/common/setting.modal.view.php')
| -rw-r--r-- | app/view/common/setting.modal.view.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/app/view/common/setting.modal.view.php b/app/view/common/setting.modal.view.php index 68d3e2d..2217805 100644 --- a/app/view/common/setting.modal.view.php +++ b/app/view/common/setting.modal.view.php @@ -31,7 +31,13 @@ <div class="modal-body"> <ul class="nav nav-tabs" role="tablist"> - <li class="active"><a href="#settUserTab" aria-controls="settUserTab" data-toggle="tab"> + <?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,7 +48,11 @@ </ul> <div class="tab-content"> - <div class="tab-pane fade in active" id="settUserTab"> + <?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> </p> <form method="post" action="<?=$mod->ap()?>" enctype="multipart/form-data"> |