From 076a86c663870be3c4cf6da8059f0f978a7eb3ce Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sun, 12 Jun 2016 21:33:50 -0400 Subject: Add group tab to setting modal Created empty
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/group.setting.modal.view.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/view/common/group.setting.modal.view.php (limited to 'app/view/common/group.setting.modal.view.php') diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php new file mode 100644 index 0000000..e5c096c --- /dev/null +++ b/app/view/common/group.setting.modal.view.php @@ -0,0 +1,21 @@ + + +
+ TODO -- Design this tab. +
-- cgit v1.2.3 From 0e00677199347f296426b77f48c8423602c56d66 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Thu, 15 Sep 2016 19:46:45 -0400 Subject: Commit work on setting modal groups tab I am committing this change incomplete. I'm stopping work on this particular piece to save some work overall and explore view templating using PHP features. The idea is to define this markup once in just one file, rather than having to duplicate it for each object type. --- app/view/common/group.setting.modal.view.php | 53 +++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) (limited to 'app/view/common/group.setting.modal.view.php') diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php index e5c096c..e2a73e0 100644 --- a/app/view/common/group.setting.modal.view.php +++ b/app/view/common/group.setting.modal.view.php @@ -17,5 +17,56 @@ ?>
- TODO -- Design this tab. +

 

+ +
+ + + +
+
+
+ + group->canModify($mod->getCurrentUser()) ? "" : "disabled")?> /> +
+
+ +
+ <?=$mod->group->name?> + + group->canModify($mod->getCurrentUser())) { ?> +
+
+ +
+ + +
+
+ +
+
+ + +
+
+ + + + + + +

 

+

 

+ + +
+ +

 

-- cgit v1.2.3 From ee3b66018804b332ec2a2953a1d04b7e0beb68fa Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 17 Sep 2016 00:31:15 -0400 Subject: Update group setting tab to use parameterized view templates --- app/view/common/group.setting.modal.view.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/view/common/group.setting.modal.view.php') diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php index e2a73e0..bf6b6c5 100644 --- a/app/view/common/group.setting.modal.view.php +++ b/app/view/common/group.setting.modal.view.php @@ -16,6 +16,9 @@ ?> + + +

 

@@ -55,8 +58,8 @@
- - + group); ?> + group); ?> -- cgit v1.2.3 From cc285f5d019e5b586931a2a582374074825de947 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 17 Sep 2016 12:49:34 -0400 Subject: Revert "Update group setting tab to use parameterized view templates" This reverts commit ee3b66018804b332ec2a2953a1d04b7e0beb68fa. --- app/view/common/group.setting.modal.view.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'app/view/common/group.setting.modal.view.php') diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php index bf6b6c5..e2a73e0 100644 --- a/app/view/common/group.setting.modal.view.php +++ b/app/view/common/group.setting.modal.view.php @@ -16,9 +16,6 @@ ?> - - -

 

@@ -58,8 +55,8 @@
- group); ?> - group); ?> + + -- cgit v1.2.3 From f69fe67dec557c27b38535d7e51ed22ae0740e03 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 17 Sep 2016 12:52:22 -0400 Subject: Revert "Revert "Update group setting tab to use parameterized view templates"" This reverts commit cc285f5d019e5b586931a2a582374074825de947. --- app/view/common/group.setting.modal.view.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/view/common/group.setting.modal.view.php') diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php index e2a73e0..bf6b6c5 100644 --- a/app/view/common/group.setting.modal.view.php +++ b/app/view/common/group.setting.modal.view.php @@ -16,6 +16,9 @@ ?> + + +

 

@@ -55,8 +58,8 @@
- - + group); ?> + group); ?> -- cgit v1.2.3 From 98ba4abeff20ae83de84451c4aeb0c68d043ab45 Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Sat, 17 Sep 2016 19:18:59 -0400 Subject: Finish markup for setting modal group tab --- app/view/common/group.setting.modal.view.php | 39 +++++++++++++++++++++------- 1 file changed, 30 insertions(+), 9 deletions(-) (limited to 'app/view/common/group.setting.modal.view.php') diff --git a/app/view/common/group.setting.modal.view.php b/app/view/common/group.setting.modal.view.php index bf6b6c5..d0e11ca 100644 --- a/app/view/common/group.setting.modal.view.php +++ b/app/view/common/group.setting.modal.view.php @@ -17,7 +17,6 @@ ?> -

 

@@ -59,17 +58,39 @@
group); ?> - group); ?> - + group->canModify($mod->getCurrentUser())) { ?> +

 

+ + + -

 

-

 

+

 

+

 

- - +
+ group->canModifyMembers($mod->getCurrentUser())) { ?> + + + + group->isOwner($mod->getCurrentUser())) { ?> + + + + +

 

-- cgit v1.2.3