summaryrefslogtreecommitdiffstats
path: root/application/modules/user/views/scripts
diff options
context:
space:
mode:
authorSimon2011-04-13 17:56:31 +0200
committerSimon2011-04-13 17:56:31 +0200
commit53bb21d568f085ae496b3a33697575bea070a995 (patch)
tree0aa8b3cad978c4af76f3f64ffde9b9a673e8953b /application/modules/user/views/scripts
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-53bb21d568f085ae496b3a33697575bea070a995.tar.gz
pbs2-53bb21d568f085ae496b3a33697575bea070a995.tar.xz
pbs2-53bb21d568f085ae496b3a33697575bea070a995.zip
Rolle wird nicht kopiert sondern gleiche Rolle wie ersteller wird in der neuen Gruppe benutzt
Diffstat (limited to 'application/modules/user/views/scripts')
-rw-r--r--application/modules/user/views/scripts/group/index.phtml2
-rw-r--r--application/modules/user/views/scripts/group/show.phtml4
-rw-r--r--application/modules/user/views/scripts/role/index.phtml2
-rw-r--r--application/modules/user/views/scripts/role/show.phtml45
4 files changed, 21 insertions, 32 deletions
diff --git a/application/modules/user/views/scripts/group/index.phtml b/application/modules/user/views/scripts/group/index.phtml
index def21f6..e987ae6 100644
--- a/application/modules/user/views/scripts/group/index.phtml
+++ b/application/modules/user/views/scripts/group/index.phtml
@@ -35,7 +35,7 @@ $class= 'highlight checked';
}
?>
<div class='content'>
- <div class='actions'>
+ <div class='actions'>
<?php if($group->getID() == $this->userIDsNamespace['groupID'] ): ?>
<?php if(Pbs_Acl::checkRight('gsdo') ): ?>
<a href="<?php echo $this->url(
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index 2f4ae4a..f27e333 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -12,13 +12,13 @@ if($this->usergroup == $this->requestgroup){
'class' => 'rightbutton'));
}
}
-else{
+elseif($this->usergroup != $this->requestgroup){
if(Pbs_Acl::checkRight('gd')){
echo $this->formButton('deletegroup', 'Delete', array(
'onclick' => 'self.location="/user/group/delete/groupID/' . $this->group->getID() .'"',
'class' => 'rightbutton'));
}
- if(Pbs_Acl::checkRight('geo')){
+ if(Pbs_Acl::checkRight('ge')){
echo $this->formButton('editgroup', 'Edit', array(
'onclick' => 'self.location="/user/group/edit/groupID/' . $this->group->getID() .'"',
'class' => 'rightbutton'));
diff --git a/application/modules/user/views/scripts/role/index.phtml b/application/modules/user/views/scripts/role/index.phtml
index 80a4299..edf03eb 100644
--- a/application/modules/user/views/scripts/role/index.phtml
+++ b/application/modules/user/views/scripts/role/index.phtml
@@ -26,7 +26,7 @@ $class= 'highlight checked';
<?php if($role['roleID'] != $this->userIDsNamespace['roleID']) { ?>
<div class='number'>
<div class='smallnumber'>Role</div>
- <?php echo $k+1; ?>
+ <?php echo $role['roleID']; ?>
</div>
<?php
}
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index 8c7503f..43ae781 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -16,34 +16,23 @@ if($this->roleID) {
'onclick' => 'self.location="/user/role/edit/roleID/' . $this->role->getID() .'"',
'class' => 'rightbutton'));
?>
-<div class='detailelement'>
-<div class='element'>
-<div class='content'>
-<div class='title'>Title:&nbsp;<span class="noBold"><?php echo $this->role->getTitle(); ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
-<div class='element'>
-<div class='content'>
-<div class='title'>Description:&nbsp;<span class="noBold"><?php echo $this->role->getDescription(); ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
-<div class='element'>
-<div class='content'><?php
-if($this->role->getInheritance()) {
- ?>
-<div class='title'>Inheritance:&nbsp;<span class="noBold">yes</span></div>
-
- <?php
-} else {
- ?>
-<div class='title'>Inheritance:&nbsp;<span class="noBold">no</span></div>
- <?php
-}
-?></div>
-<div class='clear'></div>
-</div>
+<div class='listelement'>
+ <div class='element'>
+ <div class='number'>
+ <div class='smallnumber'>Role</div>
+ <?php echo $this->role->getID(); ?>
+ </div>
+ <div class='content'>
+
+ <div class='title'><?php echo $this->role->getTitle(); ?></div>
+ <div class='subtitle'><?php echo $this->role->getDescription(); ?></div>
+ <div class='details'>
+ <label>Inheritance</label>
+ <div class='item'><?php echo ($this->role->getInheritance())?'yes':'no';?></div>
+ </div>
+ </div>
+ <div class='clear'></div>
+ </div>
</div>
<br />
<h2>Rights:</h2>