From e05b5549c65deb736166da52cf50027e67ca939e Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Wed, 1 Aug 2007 23:04:50 +0000
Subject: [PATCH] Update admin tools to be compatible with unl modern template
---
.../ApprovalbodyadminController.php | 30 +++++++++++--------
.../ApprovalbodymanagerController.php | 15 ++++++----
.../controllers/UseradminController.php | 25 +++++++++-------
document_root/css/user_admin.css | 2 +-
4 files changed, 43 insertions(+), 29 deletions(-)
diff --git a/application/controllers/ApprovalbodyadminController.php b/application/controllers/ApprovalbodyadminController.php
index 58208034..99698c86 100644
--- a/application/controllers/ApprovalbodyadminController.php
+++ b/application/controllers/ApprovalbodyadminController.php
@@ -10,12 +10,13 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
public function indexAction()
{
- $out = new Nmc_View();
+ $out = new Application_View();
$out->page = 'approval_body_admin';
$out->approvalBodies = ApprovalBodies::getInstance()->fetchAll();
- echo $out->render('index.xhtml');
+ $out->clearSidebarModules();
+ echo $out->render('unlModernWrapper.xhtml');
}
public function editBodyAction()
@@ -23,14 +24,15 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
$in = $this->getRequest();
$approvalBodyId = Zend_Filter_Int::filter($in->getParam(0));
- $out = new Nmc_View();
+ $out = new Application_View();
$out->page = 'approval_body_admin';
$out->groups = Groups::getInstance()->fetchAll();
$out->approvalBody = ApprovalBodies::getInstance()->findOne($approvalBodyId);
$out->approvalBodies = ApprovalBodies::getInstance()->fetchAll();
- echo $out->render('index.xhtml');
+ $out->clearSidebarModules();
+ echo $out->render('unlModernWrapper.xhtml');
}
public function editRoleAction()
@@ -38,14 +40,15 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
$in = $this->getRequest();
$roleId = Zend_Filter_Int::filter($in->getParam(0));
- $out = new Nmc_View();
+ $out = new Application_View();
$out->page = 'approval_body_admin';
$out->groups = Groups::getInstance()->fetchAll();
$out->approvalBodyRole = ApprovalBodyRoles::getInstance()->findOne($roleId);
$out->approvalBodies = ApprovalBodies::getInstance()->fetchAll();
- echo $out->render('index.xhtml');
+ $out->clearSidebarModules();
+ echo $out->render('unlModernWrapper.xhtml');
}
public function addRoleAction()
@@ -54,7 +57,7 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
$approvalBodyId = Zend_Filter_Int::filter($in->getParam(0));
$parentApprovalBody = ApprovalBodies::getInstance()->find($approvalBodyId);
- $out = new Nmc_View();
+ $out = new Application_View();
$out->page = 'approval_body_admin';
$out->groups = Groups::getInstance()->fetchAll();
@@ -62,7 +65,8 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
$out->approvalBodyRole->approvalBody = $parentApprovalBody->getPrimaryKey();
$out->approvalBodies = ApprovalBodies::getInstance()->fetchAll();
- echo $out->render('index.xhtml');
+ $out->clearSidebarModules();
+ echo $out->render('unlModernWrapper.xhtml');
}
public function editBodyPostAction()
@@ -80,9 +84,10 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
$body->adminGroup = $in->getPost('adminGroup');
$body->save();
- $out = new Nmc_View();
+ $out = new Application_View();
$out->refresh = '/ApprovalBodyAdmin/EditBody/' . $body->getPrimaryKey();
- echo $out->render('index.xhtml');
+ $out->clearSidebarModules();
+ echo $out->render('unlModernWrapper.xhtml');
}
public function editRolePostAction()
@@ -106,9 +111,10 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
$role->roleGroup = $group;
$role->save();
- $out = new Nmc_View();
+ $out = new Application_View();
$out->refresh = '/ApprovalBodyAdmin/EditRole/' . $role->getPrimaryKey();
- echo $out->render('index.xhtml');
+ $out->clearSidebarModules();
+ echo $out->render('unlModernWrapper.xhtml');
}
}
diff --git a/application/controllers/ApprovalbodymanagerController.php b/application/controllers/ApprovalbodymanagerController.php
index 8493f984..46864b00 100644
--- a/application/controllers/ApprovalbodymanagerController.php
+++ b/application/controllers/ApprovalbodymanagerController.php
@@ -17,10 +17,11 @@ class ApprovalBodyManagerController extends Nmc_Controller_Action
{
$usersBodies = ApprovalBodies::getInstance()->fetchApprovalBodiesUserCanAdminister(Nmc_User::getInstance()->getUser());
- $out = new Nmc_View();
+ $out = new Application_View();
$out->page = 'approval_body_manager';
$out->usersBodies = $usersBodies;
- echo $out->render('index.xhtml');
+ $out->clearSidebarModules();
+ echo $out->render('unlModernWrapper.xhtml');
}
public function editBodyAction()
@@ -40,14 +41,15 @@ class ApprovalBodyManagerController extends Nmc_Controller_Action
$defaultChains[$requestTypeId] = $defaultChain;
}
- $out = new Nmc_View();
+ $out = new Application_View();
$out->page = 'approval_body_manager';
$out->usersBodies = $usersBodies;
$out->currentBody = $currentBody;
$out->approvalChains = $approvalChains;
$out->defaultChains = $defaultChains;
$out->requestTypes = $requestTypes;
- echo $out->render('index.xhtml');
+ $out->clearSidebarModules();
+ echo $out->render('unlModernWrapper.xhtml');
}
public function editBodyPostAction()
@@ -86,8 +88,9 @@ class ApprovalBodyManagerController extends Nmc_Controller_Action
$defaultApprovalChain->save();
}
- $out = new Nmc_View();
+ $out = new Application_View();
+ $out->clearSidebarModules();
$out->refresh = '/ApprovalBodyManager/EditBody/' . $currentBodyId;
- echo $out->render('index.xhtml');
+ echo $out->render('unlModernWrapper.xhtml');
}
}
\ No newline at end of file
diff --git a/application/controllers/UseradminController.php b/application/controllers/UseradminController.php
index e602f6e6..ca9a2151 100644
--- a/application/controllers/UseradminController.php
+++ b/application/controllers/UseradminController.php
@@ -10,14 +10,15 @@ class UserAdminController extends Nmc_Controller_Action
public function indexAction()
{
- $out = new Nmc_View();
+ $out = new Application_View();
$groups = Groups::getInstance()->fetchAllWithoutPrimaries();
$out->title = 'Group Administration';
$out->page = 'user_admin';
$out->groups = $groups;
- echo $out->render('index.xhtml');
+ $out->clearSidebarModules();
+ echo $out->render('unlModernWrapper.xhtml');
}
public function editUserAction()
@@ -29,7 +30,7 @@ class UserAdminController extends Nmc_Controller_Action
return $this->editUserActionPost();
}
- $out = new Nmc_View();
+ $out = new Application_View();
$out->title = 'Group Administration';
$out->page = 'user_admin';
@@ -41,7 +42,8 @@ class UserAdminController extends Nmc_Controller_Action
}
$out->groups = Groups::getInstance()->fetchAllWithoutPrimaries();
- echo $out->render('index.xhtml');
+ $out->clearSidebarModules();
+ echo $out->render('unlModernWrapper.xhtml');
}
protected function editUserActionPost()
@@ -78,9 +80,10 @@ class UserAdminController extends Nmc_Controller_Action
}
- $out = new Nmc_View();
+ $out = new Application_View();
+ $out->clearSidebarModules();
$out->refresh = '/UserAdmin/EditUser/' . $userId;
- echo $out->render('index.xhtml');
+ echo $out->render('unlModdernWrapper.xhtml');
}
public function editGroupAction()
@@ -92,7 +95,7 @@ class UserAdminController extends Nmc_Controller_Action
return $this->editGroupActionPost();
}
- $out = new Nmc_View();
+ $out = new Application_View();
$out->title = 'Group Administration';
$out->page = 'user_admin';
@@ -106,7 +109,8 @@ class UserAdminController extends Nmc_Controller_Action
$out->users = People::getInstance()->fetchAll();
$out->groups = Groups::getInstance()->fetchAllWithoutPrimaries();
- echo $out->render('index.xhtml');
+ $out->clearSidebarModules();
+ echo $out->render('unlModdernWrapper.xhtml');
}
protected function editGroupActionPost()
@@ -157,9 +161,10 @@ class UserAdminController extends Nmc_Controller_Action
$group->addUser($newUser);
}
- $out = new Nmc_View();
+ $out = new Application_View();
+ $out->clearSidebarModules();
$out->refresh = '/UserAdmin/EditGroup/' . $groupId;
- echo $out->render('index.xhtml');
+ echo $out->render('unlModernWrapper.xhtml');
}
}
diff --git a/document_root/css/user_admin.css b/document_root/css/user_admin.css
index 660c3f0c..e82dc3c6 100644
--- a/document_root/css/user_admin.css
+++ b/document_root/css/user_admin.css
@@ -8,7 +8,7 @@ div#admin_list {
}
div.edit_pane {
- margin-left: 150px;
+ overflow: hidden;
}
div.edit_pane h2 {
--
GitLab