summaryrefslogtreecommitdiffstats
path: root/application/modules/user/views
diff options
context:
space:
mode:
authormichael pereira2011-04-05 19:33:21 +0200
committermichael pereira2011-04-05 19:33:21 +0200
commit882df77e0f3c96795a8acc966b228d6fc1a934da (patch)
tree7fdd5fcf04d49ef424230ac44ac20bcfa1061a14 /application/modules/user/views
parentForms Rechte angepasst, Views angepasst (diff)
parentMerge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-882df77e0f3c96795a8acc966b228d6fc1a934da.tar.gz
pbs2-882df77e0f3c96795a8acc966b228d6fc1a934da.tar.xz
pbs2-882df77e0f3c96795a8acc966b228d6fc1a934da.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/views')
-rw-r--r--application/modules/user/views/scripts/filter/index.phtml2
-rw-r--r--application/modules/user/views/scripts/group/showall.phtml3
-rw-r--r--application/modules/user/views/scripts/person/showall.phtml1
-rw-r--r--application/modules/user/views/scripts/role/index.phtml1
4 files changed, 5 insertions, 2 deletions
diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml
index aa615e4..5d3646d 100644
--- a/application/modules/user/views/scripts/filter/index.phtml
+++ b/application/modules/user/views/scripts/filter/index.phtml
@@ -63,7 +63,7 @@
<?php if (count($erg)>0): ?>
<tr class=detail>
<td class=arrowtop>↳</td>
- <td colspan=7>
+ <td colspan=8>
<?php
?>
diff --git a/application/modules/user/views/scripts/group/showall.phtml b/application/modules/user/views/scripts/group/showall.phtml
index 34f3e11..356ebbc 100644
--- a/application/modules/user/views/scripts/group/showall.phtml
+++ b/application/modules/user/views/scripts/group/showall.phtml
@@ -1,4 +1,5 @@
<h1>Groups Overview</h1>
+<?php echo $this->searchform; ?>
<?php echo $this->formButton('addgroup', 'Add Group', array(
'onclick' => 'self.location="/user/group/add"',
'class' => 'addbutton'))
@@ -73,7 +74,7 @@
}
?>
</table>
-<?php echo $this->pagination; ?>
+ <?php echo $this->pagination; ?>
<?php echo $this->formButton('linkgroups', 'Link Groups', array(
'onclick' => 'self.location="/user/group/link"',
'class' => 'addbutton'))
diff --git a/application/modules/user/views/scripts/person/showall.phtml b/application/modules/user/views/scripts/person/showall.phtml
index d605f70..d9f4cf9 100644
--- a/application/modules/user/views/scripts/person/showall.phtml
+++ b/application/modules/user/views/scripts/person/showall.phtml
@@ -1,6 +1,7 @@
<h1>Persons Overview</h1>
<br />
<br />
+<?php echo $this->searchform; ?>
<table>
<tr>
<th>Title</th>
diff --git a/application/modules/user/views/scripts/role/index.phtml b/application/modules/user/views/scripts/role/index.phtml
index 8ca2bd6..2dbe77d 100644
--- a/application/modules/user/views/scripts/role/index.phtml
+++ b/application/modules/user/views/scripts/role/index.phtml
@@ -2,6 +2,7 @@
if($this->userIDsNamespace['groupID']) {
?>
<h1>Roles</h1>
+ <?php echo $this->searchform; ?>
<?php echo $this->formButton('addrole', 'Add Role', array(
'onclick' => 'self.location="/user/role/add"',
'class' => 'addbutton'))?>