summaryrefslogtreecommitdiffstats
path: root/application/modules/user
diff options
context:
space:
mode:
Diffstat (limited to 'application/modules/user')
-rw-r--r--application/modules/user/controllers/BootmenuController.php3
-rw-r--r--application/modules/user/controllers/PersonController.php2
-rw-r--r--application/modules/user/controllers/RoleController.php28
-rw-r--r--application/modules/user/forms/LinkRight.php45
-rw-r--r--application/modules/user/forms/RoleAdd.php16
-rw-r--r--application/modules/user/layouts/user.phtml99
-rw-r--r--application/modules/user/views/scripts/bootiso/index.phtml4
-rw-r--r--application/modules/user/views/scripts/bootmenu/index.phtml35
-rw-r--r--application/modules/user/views/scripts/group/show.phtml55
-rw-r--r--application/modules/user/views/scripts/person/index.phtml48
-rw-r--r--application/modules/user/views/scripts/person/show.phtml3
-rw-r--r--application/modules/user/views/scripts/role/show.phtml2
12 files changed, 184 insertions, 156 deletions
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index 1ad2997..e3513e0 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -106,9 +106,8 @@ class user_BootmenuController extends Zend_Controller_Action
$pagination->setElement($bootmenu);
$pagination->setRequestPage($this->_request->getParam('page'));
$pagination->setPageUrl('/user/bootmenu/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
- $bootmenu = $pagination->getElements();
+ $bootmenu = $pagination->getElements();
- $this->view->pagination = $pagination->pagination($pageurl);
$this->view->page = $pagination->getRequestPage();
$this->view->bootmenulist = $bootmenu;
diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
index c1e76d3..ff5517c 100644
--- a/application/modules/user/controllers/PersonController.php
+++ b/application/modules/user/controllers/PersonController.php
@@ -63,7 +63,6 @@ class user_PersonController extends Zend_Controller_Action
$this->view->groupRequestRight = Pbs_Acl::checkRight('grm');
$this->view->editRight = Pbs_Acl::checkRight('peoa');
$this->view->leaveRight = Pbs_Acl::checkRight('gl');
- $this->view->overviewRight = Pbs_Acl::checkRight('pso');
$this->view->userIDsNamespace = Zend_Session::namespaceGet('userIDs');
}
@@ -340,7 +339,6 @@ class user_PersonController extends Zend_Controller_Action
$this->view->personID = $personID;
$this->view->editRight = Pbs_Acl::checkRight('peoa');
$this->view->deleteRight = Pbs_Acl::checkRight('pd');
- $this->view->overviewRight = Pbs_Acl::checkRight('pso');
$this->view->userIDsNamespace = Zend_Session::namespaceGet('userIDs');
} else {
$this->_helper->redirector('', 'person');
diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php
index 4e0aa52..88e2eeb 100644
--- a/application/modules/user/controllers/RoleController.php
+++ b/application/modules/user/controllers/RoleController.php
@@ -303,20 +303,24 @@ class User_RoleController extends Zend_Controller_Action
}
if(count($rightlist) > 0) {
if (!isset($_POST["link"])){
- $linkForm = new user_Form_LinkRight(array('rightlist' => $rightlist, 'roleID' => $roleID));
+ $linkForm = new user_Form_LinkRight(array('rightlist' => $rightlist));
} else {
- $linkForm = new user_Form_LinkRight(array('rightlist' => $rightlist, 'roleID' => $roleID), $_POST);
+ $linkForm = new user_Form_LinkRight(array('rightlist' => $rightlist, $_POST));
if ($linkForm->isValid($_POST)) {
- $rightroles = new Application_Model_RightRoles();
- $rightroles->setRightID($_POST['rightID']);
- $rightroles->setRoleID($roleID);
- try {
- $this->rightRolesMapper->save($rightroles);
- } catch(Zend_Exception $e)
- {
- echo "Caught exception: " . get_class($e) . "<br/>";
- echo "Message: " . $e->getMessage() . "<br/>";
- return;
+ foreach($_POST['rights'] as $rightID => $bool) {
+ if($bool == 1) {
+ $rightroles = new Application_Model_RightRoles();
+ $rightroles->setRightID($rightID);
+ $rightroles->setRoleID($roleID);
+ try {
+ $this->rightRolesMapper->save($rightroles);
+ } catch(Zend_Exception $e)
+ {
+ echo "Caught exception: " . get_class($e) . "<br/>";
+ echo "Message: " . $e->getMessage() . "<br/>";
+ return;
+ }
+ }
}
$this->_redirect('/user/role/show/roleID/' . $roleID);
return;
diff --git a/application/modules/user/forms/LinkRight.php b/application/modules/user/forms/LinkRight.php
index 54aacd6..80cfb1d 100644
--- a/application/modules/user/forms/LinkRight.php
+++ b/application/modules/user/forms/LinkRight.php
@@ -3,29 +3,54 @@
class user_Form_LinkRight extends Zend_Form
{
private $rightlist;
- private $roleID;
public function setRightlist($rightlist){
$this->rightlist = $rightlist;
}
- public function setRoleID($roleID){
- $this->roleID = $roleID;
- }
-
public function init()
{
- $this->setName("LinkRight");
+ $this->setName("LinkRights");
$this->setMethod('post');
- $rightfield = $this->createElement('select','rightID',array('label'=> 'Right: ','required' => true,'multioptions'=> $this->rightlist));
- $rightfield->setRegisterInArrayValidator(false);
- $this->addElement($rightfield);
+ $sform = new Zend_Form_SubForm(array('legend' => 'Rights:'));
+
+ $sform->addElement('button', 'checkAll', array(
+ 'required' => false,
+ 'ignore' => true,
+ 'label' => 'Check All',
+ 'class' => 'leftbutton',
+ 'onclick' => "checkAllCheckBoxes();",
+ ));
+
+ $sform->addElement('button', 'uncheckAll', array(
+ 'required' => false,
+ 'ignore' => true,
+ 'label' => 'Uncheck All',
+ 'onclick' => "uncheckAllCheckBoxes();",
+ ));
+
+ if(count($this->rightlist) > 0) {
+ foreach($this->rightlist as $rightcategory => $rights) {
+ foreach($rights as $rightID => $rightTitle) {
+ $element = $this->createElement('checkbox', "$rightID", array(
+ 'label' => $rightTitle . ':',
+ 'belongsTo' => 'rights',
+ ));
+ $elements[] = $rightID;
+ $sform->addElement($element);
+ }
+ $sform->addDisplayGroup($elements, "$rightcategory", array("legend" => $rightcategory . ":"));
+ unset($elements);
+ }
+ }
+
+ $this->addSubForm($sform, 'rights');
$this->addElement('submit', 'link', array(
'required' => false,
'ignore' => true,
- 'label' => 'Add',
+ 'label' => 'Add Rights',
));
$this->addElement('button', 'cancel', array(
diff --git a/application/modules/user/forms/RoleAdd.php b/application/modules/user/forms/RoleAdd.php
index 5968b47..d165701 100644
--- a/application/modules/user/forms/RoleAdd.php
+++ b/application/modules/user/forms/RoleAdd.php
@@ -32,6 +32,21 @@ class user_Form_RoleAdd extends Zend_Form
));
$sform = new Zend_Form_SubForm(array('legend' => 'Rights:'));
+
+ $sform->addElement('button', 'checkAll', array(
+ 'required' => false,
+ 'ignore' => true,
+ 'label' => 'Check All',
+ 'class' => 'leftbutton',
+ 'onclick' => "checkAllCheckBoxes(new Array('inheritance'));",
+ ));
+
+ $sform->addElement('button', 'uncheckAll', array(
+ 'required' => false,
+ 'ignore' => true,
+ 'label' => 'Uncheck All',
+ 'onclick' => "uncheckAllCheckBoxes(new Array('inheritance'));",
+ ));
if(count($this->rightlist) > 0) {
foreach($this->rightlist as $rightcategory => $rights) {
foreach($rights as $rightID => $rightTitle) {
@@ -46,6 +61,7 @@ class user_Form_RoleAdd extends Zend_Form
unset($elements);
}
}
+
$this->addSubForm($sform, 'rights');
$this->addElement('checkbox', 'inheritance', array(
diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml
index 2fbdabf..b27b747 100644
--- a/application/modules/user/layouts/user.phtml
+++ b/application/modules/user/layouts/user.phtml
@@ -25,60 +25,56 @@ echo $this->headScript()."\n";
</div>
<div id="sidepannel-top" class='portletNavigationTree'>
<ul class='navTreeLevel0'>
- <li class='navTreeItem'><a href='/'><<</a></li>
+ <li class='navTreeItem'><a href='/'>&lt;&lt;</a></li>
<li class='navTreeItem'><a href='/user/'>user</a></li>
<li>
<ul class='navTreeLevel1'>
- <?php if (Zend_Auth::getInstance()->hasIdentity() && count(Zend_Session::namespaceGet('userIDs')) > 0) {
- # This should be splitted
- if(Pbs_Acl::checkRight('pso') || Pbs_Acl::checkRight('psod'))
- echo "<li class='navTreeItem'><a href='/user/person'>Person</a></li>";
- if(Pbs_Acl::checkRight('gso'))
- echo "<li class='navTreeItem'><a href='/user/group'>Group</a></li>";
- if(Pbs_Acl::checkRight('ro'))
- echo "<li class='navTreeItem'><a href='/user/role'>Role</a></li>";
- if(Pbs_Acl::checkRight('bai') || Pbs_Acl::checkRight('bui'))
- echo "<li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li>";
- if(Pbs_Acl::checkRight('pro'))
- echo "<li class='navTreeItem'><a href='/user/preboot'>PreBoot</a></li>";
- if(Pbs_Acl::checkRight('booai') || Pbs_Acl::checkRight('booui'))
- echo "<li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li>";
- if(Pbs_Acl::checkRight('csai') || Pbs_Acl::checkRight('csui'))
- echo "<li class='navTreeItem'><a href='/user/config'>Config</a></li>";
- if(Pbs_Acl::checkRight('boai') || Pbs_Acl::checkRight('boui'))
- echo "<li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li>";
- if(Pbs_Acl::checkRight('clo'))
- echo "<li class='navTreeItem'><a href='/user/client'>Client</a></li>";
- if(Pbs_Acl::checkRight('fo'))
- echo "<li class='navTreeItem'><a href='/user/filter'>Filter</a></li>";
- if(Pbs_Acl::checkRight('poo'))
- echo "<li class='navTreeItem'><a href='/user/pool'>Pool</a></li>";
- if(Pbs_Acl::checkRight('so'))
- echo "<li class='navTreeItem'><a href='/user/session'>Session</a></li>";
- }
- ?>
- <?php if (!Zend_Auth::getInstance()->hasIdentity()) {?>
- <li class='navTreeItem'><a href='/user/auth/login'>Login</a></li>
- <li class='navTreeItem'><a href='/user/auth/register'>Register</a></li>
- <?php
- } else {
+ <?php if (Zend_Auth::getInstance()->hasIdentity() && count(Zend_Session::namespaceGet('userIDs')) > 0) {
+ # This should be splitted
+ if(Pbs_Acl::checkRight('psod'))
+ echo "<li class='navTreeItem'><a href='/user/person'>Own Details</a></li>";
+ if(Pbs_Acl::checkRight('pso'))
+ echo "<li class='navTreeItem'><a href='/user/person/showall'>Personlist</a></li>";
+ if(Pbs_Acl::checkRight('gsdo'))
+ echo "<li class='navTreeItem'><a href='/user/group'>Own Group</a></li>";
+ if(Pbs_Acl::checkRight('gso'))
+ echo "<li class='navTreeItem'><a href='/user/group/showall'>Grouplist</a></li>";
+ if(Pbs_Acl::checkRight('ro'))
+ echo "<li class='navTreeItem'><a href='/user/role'>Rolelist</a></li>";
+ if(Pbs_Acl::checkRight('bai') || Pbs_Acl::checkRight('bui'))
+ echo "<li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li>";
+ if(Pbs_Acl::checkRight('pro'))
+ echo "<li class='navTreeItem'><a href='/user/preboot'>PreBoot</a></li>";
+ if(Pbs_Acl::checkRight('booai') || Pbs_Acl::checkRight('booui'))
+ echo "<li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li>";
+ if(Pbs_Acl::checkRight('csai') || Pbs_Acl::checkRight('csui'))
+ echo "<li class='navTreeItem'><a href='/user/config'>Config</a></li>";
+ if(Pbs_Acl::checkRight('boai') || Pbs_Acl::checkRight('boui'))
+ echo "<li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li>";
+ if(Pbs_Acl::checkRight('clo'))
+ echo "<li class='navTreeItem'><a href='/user/client'>Client</a></li>";
+ if(Pbs_Acl::checkRight('fo'))
+ echo "<li class='navTreeItem'><a href='/user/filter'>Filter</a></li>";
+ if(Pbs_Acl::checkRight('poo'))
+ echo "<li class='navTreeItem'><a href='/user/pool'>Pool</a></li>";
+ if(Pbs_Acl::checkRight('so'))
+ echo "<li class='navTreeItem'><a href='/user/session'>Session</a></li>";
+ }
+ ?>
+ <?php if (!Zend_Auth::getInstance()->hasIdentity()) {
+ echo "<li class='navTreeItem'><a href='/user/auth/login'>Login</a></li>";
+ echo "<li class='navTreeItem'><a href='/user/auth/register'>Register</a></li>";
+ } else {
if(count(Zend_Session::namespaceGet('userIDs')) > 0) {
- ?>
- <li class='navTreeItem'><a href='/user/person/changemembership'>Change
- Membership</a></li>
- <?php
+ echo "<li class='navTreeItem'><a href='/user/person/changemembership'>Change Membership</a></li>";
} else {
- ?>
- <li class='navTreeItem'><a href='/user/person/selectmembership'>Select
- Membership</a></li>
- <?php
+ echo "<li class='navTreeItem'><a href='/user/person/selectmembership'>Select Membership</a></li>";
}
- ?>
- <li class='navTreeItem'><a href='/user/auth/delete'>Delete Account</a></li>
- <li class='navTreeItem'><a href='/user/auth/logout'>Logout</a></li>
- <?php
- }
- ?>
+ if(Pbs_Acl::checkRight('pdo'))
+ echo "<li class='navTreeItem'><a href='/user/auth/delete'>Delete Account</a></li>";
+ echo "<li class='navTreeItem'><a href='/user/auth/logout'>Logout</a></li>";
+ }
+ ?>
</ul>
</li>
</ul>
@@ -93,11 +89,11 @@ echo $this->headScript()."\n";
</div>
<div id="logo-bar-red"></div>
<div id="head-titlebar">
-<div style='float:right'><?php
+<div style='float: right'><?php
if(Zend_Auth::getInstance()->hasIdentity()){
echo 'Angemeldet als ';
$userIDsNamespace = Zend_Session::namespaceGet('userIDs');
-
+
if(isset($userIDsNamespace['membershipID'])){
$membershipMapper = new Application_Model_MembershipMapper();
$membership = new Application_Model_Membership();
@@ -118,8 +114,7 @@ if(Zend_Auth::getInstance()->hasIdentity()){
echo "<b><i>".$role->getTitle()."</i></b>";
}
}
-?>
-</div>
+?></div>
<?php
echo ucwords($request->getControllerName()) . " > " . ucwords($request->getActionName());
?></div>
diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml
index 4af8c0e..1c0c5fe 100644
--- a/application/modules/user/views/scripts/bootiso/index.phtml
+++ b/application/modules/user/views/scripts/bootiso/index.phtml
@@ -19,9 +19,9 @@
<div class='listelement'>
<?php if(count($this->bootisolist)==0)
echo "There are no BootISO entries to display." ?>
- <?php foreach ($this->bootisolist as $bootiso): ?>
+ <?php foreach ($this->bootisolist as $k => $bootiso): ?>
<div class='element'>
- <div class='number'><?php echo $this->escape($bootiso->getID()); ?></div>
+ <div class='number'><?php echo $k+1; ?></div>
<div class='content'>
<div class='actions'>
<a href="<?php echo $this->url(
diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml
index 2e04618..5d298a5 100644
--- a/application/modules/user/views/scripts/bootmenu/index.phtml
+++ b/application/modules/user/views/scripts/bootmenu/index.phtml
@@ -1,5 +1,6 @@
<h1>BootMenu</h1>
<?php if($this->notification != ''){echo $this->notification;} ?>
+<div id='notification' style='display:none;'></div>
<?php echo $this->searchform; ?>
<?php echo $this->formButton('createbootmenu', 'Create BootMenu', array(
'onclick' => 'self.location="/user/bootmenu/createbootmenu/page/'.$this->page.'"',
@@ -24,20 +25,20 @@
<div class='element<?php echo " $class";?>'>
<div class='number'><?php echo $this->escape($bootmenu->getID()); ?></div>
<div class='content'>
- <div class='actions'>
- <a href="<?php echo $this->url(
- array(
- 'module' => 'user',
- 'controller' => 'bootmenu',
- 'action' => 'defaultbootmenu',
- 'bootmenuID' => $bootmenu->getID(),
- 'page' => $this->page
- ),
- 'default',
- true, false) ?>">
+ <div class='actions'>
<?php if($bootmenu->getDefaultbootmenu() == true): ?>
- <img src='/media/img/default.png' alt='Checked as default'/></a>
+ <a><img src='/media/img/default.png' alt='Checked as default'/></a>
<?php else: ?>
+ <a href="<?php echo $this->url(
+ array(
+ 'module' => 'user',
+ 'controller' => 'bootmenu',
+ 'action' => 'defaultbootmenu',
+ 'bootmenuID' => $bootmenu->getID(),
+ 'page' => $this->page
+ ),
+ 'default',
+ true, false) ?>">
<img src='/media/img/default_grey.png' alt='Not checked as default' /></a>
<?php endif; ?>
<a href="<?php echo $this->url(
@@ -80,7 +81,7 @@
<div class='number'><?php echo $this->escape($bootmenuentry->getID()); ?></div>
<div class='content'>
<div class='actions'>
- <a href="<?php echo $this->url(
+ <a class='play' href="<?php echo $this->url(
array(
'controller' => 'resource',
'action' => 'getbootmenuentry',
@@ -135,3 +136,11 @@
<?php echo $this->pagination; ?>
+<script>
+$(document).ready(function(){
+ $('.actions .play').click(function (){
+ $("#notification").load($(this).attr('href')).addClass('infobox').show();
+ return false;
+ });
+});
+</script>
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index a1c0896..ea677ac 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -44,9 +44,6 @@ if($this->groupID) {
?>
</table>
<?php
- echo $this->formButton('editgroup', 'Show Grouplist', array(
- 'onclick' => 'self.location="/user/group/showall"',
- 'class' => 'rightbutton'));
if(isset($this->groupRequestList)) {
?>
<br />
@@ -87,19 +84,17 @@ if($this->groupID) {
?>
<br />
<h2>Members:</h2>
-<div class='listelement'>
- <?php if(count($this->membersList)==0)
- echo "This hroup has no members." ?>
- <?php foreach ($this->membersList as $member): ?>
- <?php
- $membershipID = $member['membershipID'];
- $person = $member['person'];
- $role = $member['role'];
- ?>
- <div class='element'>
- <div class='content'>
- <div class='actions'>
- <a href="<?php echo $this->url(
+<div class='listelement'><?php if(count($this->membersList)==0)
+echo "This hroup has no members." ?> <?php foreach ($this->membersList as $member): ?>
+<?php
+$membershipID = $member['membershipID'];
+$person = $member['person'];
+$role = $member['role'];
+?>
+<div class='element'>
+<div class='content'>
+<div class='actions'><a
+ href="<?php echo $this->url(
array(
'module' => 'user',
'controller' => 'group',
@@ -108,23 +103,21 @@ if($this->groupID) {
),
'default',
true) ?>"> <img src='/media/img/delete.png' alt='Revoke Membership' /></a>
- </div>
- <div class='title'><?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div>
- <div class='subtitle'>Role: <?php echo $role->getTitle(); ?></div>
- <div class='details dispnone'>
- <label>Email</label>
- <div class='item'><?php echo $person->getEmail(); ?></div>
- <label>City</label>
- <div class='item'><?php echo $person->getCity(); ?></div>
- </div>
- </div>
- <div class='clear'></div>
- </div>
- <?php endforeach ?>
</div>
+<div class='title'><?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div>
+<div class='subtitle'>Role: <?php echo $role->getTitle(); ?></div>
+<div class='details dispnone'><label>Email</label>
+<div class='item'><?php echo $person->getEmail(); ?></div>
+<label>City</label>
+<div class='item'><?php echo $person->getCity(); ?></div>
+</div>
+</div>
+<div class='clear'></div>
+</div>
+ <?php endforeach ?></div>
- <?php echo $this->memberPagination; ?>
- <?php
+ <?php echo $this->memberPagination; ?>
+ <?php
}
}
diff --git a/application/modules/user/views/scripts/person/index.phtml b/application/modules/user/views/scripts/person/index.phtml
index a4d3a3d..7c6fc8d 100644
--- a/application/modules/user/views/scripts/person/index.phtml
+++ b/application/modules/user/views/scripts/person/index.phtml
@@ -15,28 +15,22 @@
<div class="personColorDiv"><span class="bold">Last Login Date:</span>&nbsp;<?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?></div>
<div class="personDiv"><span class="bold">Register Date:</span>&nbsp;<?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?></div>
<?php
-if($this->overviewRight === true) echo $this->formButton('showallperson', 'Show Personlist', array(
- 'onclick' => 'self.location="/user/person/showall/"',
- 'class' => 'rightbutton'));
if(isset($this->groups)) {
?>
<br />
<h2>Member in the following Groups:</h2>
-<div class='listelement'>
- <?php if(count($this->groups)==0)
- echo "You are in no group." ?>
- <?php foreach ($this->groups as $group): ?>
- <?php
- $class='';
- if($group['membershipID'] == $this->userIDsNamespace['membershipID'])
- $class= 'highlight checked';
- ?>
- <div class='element<?php echo " $class";?>'>
- <div class='content'>
- <div class='actions'>
- <?php if($this->leaveRight === true): ?>
- <a href="<?php echo $this->url(
+<div class='listelement'><?php if(count($this->groups)==0)
+echo "You are in no group." ?> <?php foreach ($this->groups as $group): ?>
+<?php
+$class='';
+if($group['membershipID'] == $this->userIDsNamespace['membershipID'])
+$class= 'highlight checked';
+?>
+<div class='element<?php echo " $class";?>'>
+<div class='content'>
+<div class='actions'><?php if($this->leaveRight === true): ?> <a
+ href="<?php echo $this->url(
array(
'module' => 'user',
'controller' => 'person',
@@ -44,18 +38,16 @@ if(isset($this->groups)) {
'membershipID' => $group['membershipID']
),
'default',
- true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
- <?php endif; ?>
- </div>
- <div class='title'><?php echo $group['title']; ?></div>
- <div class='subtitle'><?php echo $group['description']; ?></div>
- </div>
- <div class='clear'></div>
- </div>
- <?php endforeach ?>
+ true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
+ <?php endif; ?></div>
+<div class='title'><?php echo $group['title']; ?></div>
+<div class='subtitle'><?php echo $group['description']; ?></div>
+</div>
+<div class='clear'></div>
</div>
- <?php echo $this->pagination;
- if($this->groupRequestRight === true) echo $this->formButton('addtogroup', 'Add to additional
+ <?php endforeach ?></div>
+ <?php echo $this->pagination;
+ if($this->groupRequestRight === true) echo $this->formButton('addtogroup', 'Add to additional
Groups', array(
'onclick' => 'self.location="/user/person/request/"',
'class' => 'addbutton'));
diff --git a/application/modules/user/views/scripts/person/show.phtml b/application/modules/user/views/scripts/person/show.phtml
index be973b9..8ebb371 100644
--- a/application/modules/user/views/scripts/person/show.phtml
+++ b/application/modules/user/views/scripts/person/show.phtml
@@ -18,9 +18,6 @@
<div class="personColorDiv"><span class="bold">Last Login Date:</span>&nbsp;<?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?></div>
<div class="personDiv"><span class="bold">Register Date:</span>&nbsp;<?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?></div>
<?php
-if($this->overviewRight === true) echo $this->formButton('showallperson', 'Show Personlist', array(
- 'onclick' => 'self.location="/user/person/showall/"',
- 'class' => 'rightbutton'));
if(isset($this->groups)) {
?>
<br />
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index 6769336..8194353 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -33,7 +33,7 @@ if($this->roleID) {
<h2>Rights:</h2>
<?php
if($this->rightsAvailable === true) {
- echo $this->formButton('linkright', 'Add Right', array(
+ echo $this->formButton('linkright', 'Add Rights', array(
'onclick' => 'self.location="/user/role/linkright/roleID/' . $this->role->getID() .'"',
'class' => 'addbutton'))?>
<br />