summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael pereira2011-04-07 16:30:23 +0200
committermichael pereira2011-04-07 16:30:23 +0200
commitd6c915089ddf3da5f8dc887ffd401f7c488cd175 (patch)
treed0b1ea9f3d4f816bf5aaecf28264628ed466e9c9
parentACL gefixt (diff)
parentpfeile in allen übersichten hinzugefügt, script ausgelagert (diff)
downloadpbs2-d6c915089ddf3da5f8dc887ffd401f7c488cd175.tar.gz
pbs2-d6c915089ddf3da5f8dc887ffd401f7c488cd175.tar.xz
pbs2-d6c915089ddf3da5f8dc887ffd401f7c488cd175.zip
acl merge
Diffstat
-rw-r--r--application/modules/user/layouts/user.phtml1
-rw-r--r--application/modules/user/views/scripts/bootiso/index.phtml11
-rw-r--r--application/modules/user/views/scripts/bootmenu/index.phtml13
-rw-r--r--application/modules/user/views/scripts/bootos/index.phtml11
-rw-r--r--application/modules/user/views/scripts/filter/index.phtml11
-rw-r--r--application/modules/user/views/scripts/group/show.phtml12
-rw-r--r--application/modules/user/views/scripts/group/showall.phtml2
-rw-r--r--application/modules/user/views/scripts/person/index.phtml2
-rw-r--r--application/modules/user/views/scripts/pool/index.phtml12
-rw-r--r--application/modules/user/views/scripts/session/index.phtml11
-rw-r--r--library/Pbs/Acl.php1
-rw-r--r--public/media/css/user.css5
-rw-r--r--public/media/img/right.pngbin0 -> 305 bytes
-rw-r--r--public/media/js/user.js19
14 files changed, 30 insertions, 81 deletions
diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml
index 7d80d38..2fbdabf 100644
--- a/application/modules/user/layouts/user.phtml
+++ b/application/modules/user/layouts/user.phtml
@@ -16,6 +16,7 @@ echo $this->headScript()."\n";
<script src='/media/js/jquery.min.js'></script>
<script src='/media/js/jquery-ui.min.js'></script>
<script src='/media/js/script.js'></script>
+<script src='/media/js/user.js'></script>
</head>
<body>
<div id='sidepannel'>
diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml
index 3f89a92..4af8c0e 100644
--- a/application/modules/user/views/scripts/bootiso/index.phtml
+++ b/application/modules/user/views/scripts/bootiso/index.phtml
@@ -75,14 +75,3 @@
<?php echo $this->pagination; ?>
-<script>
-$(document).ready(function(){
- if($('.element').find('.dispnone').length >= 1){
- $(this).find('.title').css('cursor','pointer');
-
- $('.title').click(function(){
- $(this).siblings('.dispnone').toggle();
- });
- }
-});
-</script>
diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml
index c51a3ed..74d0666 100644
--- a/application/modules/user/views/scripts/bootmenu/index.phtml
+++ b/application/modules/user/views/scripts/bootmenu/index.phtml
@@ -114,15 +114,4 @@
</div>
<?php echo $this->pagination; ?>
-
-<script>
-$(document).ready(function(){
- if($('.element').find('.dispnone').length >= 1){
- $(this).find('.title').css('cursor','pointer');
-
- $('.title').click(function(){
- $(this).siblings('.dispnone').toggle();
- });
- }
-});
-</script>
+
diff --git a/application/modules/user/views/scripts/bootos/index.phtml b/application/modules/user/views/scripts/bootos/index.phtml
index e4eb417..99ddfc3 100644
--- a/application/modules/user/views/scripts/bootos/index.phtml
+++ b/application/modules/user/views/scripts/bootos/index.phtml
@@ -94,14 +94,3 @@
<?php echo $this->pagination; ?>
-<script>
-$(document).ready(function(){
- if($('.element').find('.dispnone').length >= 1){
- $(this).find('.title').css('cursor','pointer');
-
- $('.title').click(function(){
- $(this).siblings('.dispnone').toggle();
- });
- }
-});
-</script>
diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml
index 0164985..c928216 100644
--- a/application/modules/user/views/scripts/filter/index.phtml
+++ b/application/modules/user/views/scripts/filter/index.phtml
@@ -118,14 +118,3 @@
<?php echo $this->pagination; ?>
-<script>
-$(document).ready(function(){
- if($('.element').find('.dispnone').length >= 1){
- $(this).find('.title').css('cursor','pointer');
-
- $('.title').click(function(){
- $(this).siblings('.dispnone').toggle();
- });
- }
-});
-</script>
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index a869c76..a1c0896 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -122,17 +122,7 @@ if($this->groupID) {
</div>
<?php endforeach ?>
</div>
-<script>
-$(document).ready(function(){
- if($('.element').find('.dispnone').length >= 1){
- $(this).find('.title').css('cursor','pointer');
-
- $('.title').click(function(){
- $(this).siblings('.dispnone').toggle();
- });
- }
-});
-</script>
+
<?php echo $this->memberPagination; ?>
<?php
}
diff --git a/application/modules/user/views/scripts/group/showall.phtml b/application/modules/user/views/scripts/group/showall.phtml
index 9afedbb..2ed777a 100644
--- a/application/modules/user/views/scripts/group/showall.phtml
+++ b/application/modules/user/views/scripts/group/showall.phtml
@@ -20,7 +20,7 @@
<?php
$class='';
if($group->getID() == $this->userIDsNamespace['groupID'])
- $class= 'highlight';
+ $class= 'highlight checked';
?>
<div class='element<?php echo " $class";?>'>
<div class='content'>
diff --git a/application/modules/user/views/scripts/person/index.phtml b/application/modules/user/views/scripts/person/index.phtml
index 7505954..a4d3a3d 100644
--- a/application/modules/user/views/scripts/person/index.phtml
+++ b/application/modules/user/views/scripts/person/index.phtml
@@ -30,7 +30,7 @@ if(isset($this->groups)) {
<?php
$class='';
if($group['membershipID'] == $this->userIDsNamespace['membershipID'])
- $class= 'highlight';
+ $class= 'highlight checked';
?>
<div class='element<?php echo " $class";?>'>
<div class='content'>
diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml
index 568654d..7d5a6cc 100644
--- a/application/modules/user/views/scripts/pool/index.phtml
+++ b/application/modules/user/views/scripts/pool/index.phtml
@@ -111,18 +111,6 @@
<?php echo $this->pagination; ?>
-<script>
-$(document).ready(function(){
- if($('.element').find('.dispnone').length >= 1){
- $(this).find('.title').css('cursor','pointer');
-
- $('.title').click(function(){
- $(this).siblings('.dispnone').toggle();
- });
- }
-});
-</script>
-
<?php if (isset($this->freeclients) && count($this->freeclients)>0): ?>
<h2 style='margin-top:20px;'>Free clients</h2>
<p style="text-align:right;">
diff --git a/application/modules/user/views/scripts/session/index.phtml b/application/modules/user/views/scripts/session/index.phtml
index 412b113..c4225f3 100644
--- a/application/modules/user/views/scripts/session/index.phtml
+++ b/application/modules/user/views/scripts/session/index.phtml
@@ -47,14 +47,3 @@
<?php echo $this->pagination; ?>
-<script>
-$(document).ready(function(){
- if($('.element').find('.dispnone').length >= 1){
- $(this).find('.title').css('cursor','pointer');
-
- $('.title').click(function(){
- $(this).siblings('.dispnone').toggle();
- });
- }
-});
-</script>
diff --git a/library/Pbs/Acl.php b/library/Pbs/Acl.php
index ac4c8aa..e1a7ace 100644
--- a/library/Pbs/Acl.php
+++ b/library/Pbs/Acl.php
@@ -7,6 +7,7 @@ class Pbs_Acl
$userIDsNamespace = Zend_Session::namespaceGet('userIDs');
$roleID = $userIDsNamespace['roleID'];
+
$rightMapper = new Application_Model_RightMapper();
$element = $rightMapper->findBy(array('shortcut' => $rightShortcut),true);
diff --git a/public/media/css/user.css b/public/media/css/user.css
index 602b4a9..5192cd2 100644
--- a/public/media/css/user.css
+++ b/public/media/css/user.css
@@ -131,6 +131,11 @@ tr.selectedEntry td {
}
.listelement .highlight {
background-color:#FFF5CC;
+}
+.listelement .checked {
+ background-image:url('/media/img/checked.png');
+ background-repeat:no-repeat;
+ background-position: 15px center;
}
.searchvars{
border:1px solid #000;
diff --git a/public/media/img/right.png b/public/media/img/right.png
new file mode 100644
index 0000000..4f43b11
--- /dev/null
+++ b/public/media/img/right.png
Binary files differ
diff --git a/public/media/js/user.js b/public/media/js/user.js
new file mode 100644
index 0000000..488ab45
--- /dev/null
+++ b/public/media/js/user.js
@@ -0,0 +1,19 @@
+$(document).ready(function(){
+ if($('.listelement .element').find('.dispnone').length >= 1){
+ $(this).find('.title').css('cursor','pointer');
+ $(this).find('.title').prepend("<span class='toggler'><img src='/media/img/right.png'></span> ");
+ $(this).find('.title').data('toggle','0');
+
+ $('.listelement .title').click(function(){
+ $(this).siblings('.dispnone').toggle();
+ if($(this).data('toggle') == '0'){
+ $(this).data('toggle','1');
+ $(this).find('.toggler img').attr('src','/media/img/down.png')
+ }
+ else{
+ $(this).data('toggle','0');
+ $(this).find('.toggler img').attr('src','/media/img/right.png')
+ }
+ });
+ }
+});
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-27 23:50:04 +0100