From 7008750fafc7f0c4c0b31f0a53f1ffaeb8f7e36a Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 6 Apr 2011 20:32:47 +0200 Subject: neues Design eingebettet, bei Role, Person &Group muss noch etwas überlegt werden --- .../modules/user/views/scripts/bootiso/index.phtml | 2 +- .../user/views/scripts/bootmenu/index.phtml | 191 ++++++++-------- .../modules/user/views/scripts/bootos/index.phtml | 2 +- .../modules/user/views/scripts/client/index.phtml | 2 +- .../modules/user/views/scripts/config/index.phtml | 2 +- .../modules/user/views/scripts/filter/index.phtml | 127 +++++++++++ .../modules/user/views/scripts/pool/index.phtml | 249 +++++++++++---------- .../modules/user/views/scripts/preboot/index.phtml | 2 +- .../modules/user/views/scripts/session/index.phtml | 2 +- library/Pbs/Search.php | 5 +- 10 files changed, 366 insertions(+), 218 deletions(-) diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml index 0d175e8..0f9c830 100644 --- a/application/modules/user/views/scripts/bootiso/index.phtml +++ b/application/modules/user/views/scripts/bootiso/index.phtml @@ -83,7 +83,7 @@ $(document).ready(function(){ $(this).find('.title').css('cursor','pointer'); $('.title').click(function(){ - $(this).parent().find('.dispnone').toggle(); + $(this).siblings('.dispnone').toggle(); }); } }); diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml index 01842c1..c51a3ed 100644 --- a/application/modules/user/views/scripts/bootmenu/index.phtml +++ b/application/modules/user/views/scripts/bootmenu/index.phtml @@ -5,21 +5,22 @@ 'onclick' => 'self.location="/user/bootmenu/createbootmenu/page/'.$this->page.'"', 'class' => 'addbutton'))?> - - - - - - - - bootmenulist)==0) - echo "
ID bootmenuIDTitle titleChanged createdActions
There are no BootMenus to display." ?> - bootmenulist as $bootmenu): ?> - - escape($bootmenu->getID()); ?> - escape($bootmenu->getTitle()); ?> - escape($bootmenu->getCreated()); ?> - + bootmenulist as $bootmenu): ?> +
+
escape($bootmenu->getID()); ?>
+
+
+ Edit Bootmenu - Edit Bootmenu + Delete Bootmenu - Delete Bootmenu + Add Entry - - -bootmenuentrylist[$bootmenu->getID()]) > 0):?> - - ↳ - - - - - - - - - - - - - - - bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?> - - - - - - - - - - + true) ?>">Add Entry + +
escape($bootmenu->getTitle()); ?>
+
bootmenuentrylist[$bootmenu->getID()]);?> Entrys - escape($bootmenu->getCreated()); ?>
+
+ bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?> +
+
escape($bootmenuentry->getID()); ?>
+
+
+ + Edit Entry + Remove Entry +
+
escape($bootmenuentry->getTitle()); ?>
+
escape($bootmenuentry->getBootosID()) ?>
+
+ +
escape($bootmenuentry->getKcl()); ?>
+ +
escape($bootmenuentry->getKclappend()); ?>
+ +
escape($bootmenuentry->getConfigID()) ?>
+
+
+
+
+ +
+ +
+ -
IDTitleBootOSkclkclappendConfigActions
- - - escape($bootmenuentry->getID()); ?>escape($bootmenuentry->getTitle()); ?>escape($bootmenuentry->getBootosID()) ?>escape($bootmenuentry->getKcl()); ?>escape($bootmenuentry->getKclappend()); ?>escape($bootmenuentry->getConfigID()) ?>Edit EntryRemove Entry
- - - - - - pagination; ?> - - - - - - +
+ +pagination; ?> + diff --git a/application/modules/user/views/scripts/bootos/index.phtml b/application/modules/user/views/scripts/bootos/index.phtml index cb2a3aa..a520ab5 100644 --- a/application/modules/user/views/scripts/bootos/index.phtml +++ b/application/modules/user/views/scripts/bootos/index.phtml @@ -102,7 +102,7 @@ $(document).ready(function(){ $(this).find('.title').css('cursor','pointer'); $('.title').click(function(){ - $(this).parent().find('.dispnone').toggle(); + $(this).siblings('.dispnone').toggle(); }); } }); diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml index 6b7c43f..7cdc03d 100644 --- a/application/modules/user/views/scripts/client/index.phtml +++ b/application/modules/user/views/scripts/client/index.phtml @@ -62,7 +62,7 @@ $(document).ready(function(){ $(this).find('.title').css('cursor','pointer'); $('.title').click(function(){ - $(this).parent().find('.dispnone').toggle(); + $(this).siblings('.dispnone').toggle(); }); } }); diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml index aa68975..28200e2 100644 --- a/application/modules/user/views/scripts/config/index.phtml +++ b/application/modules/user/views/scripts/config/index.phtml @@ -64,7 +64,7 @@ $(document).ready(function(){ $(this).find('.title').css('cursor','pointer'); $('.title').click(function(){ - $(this).parent().find('.dispnone').toggle(); + $(this).siblings('.dispnone').toggle(); }); } }); diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml index 5d3646d..97a3077 100644 --- a/application/modules/user/views/scripts/filter/index.phtml +++ b/application/modules/user/views/scripts/filter/index.phtml @@ -5,6 +5,132 @@ 'onclick' => 'self.location="/user/filter/addfilter/page/'.$this->page.'"', 'class' => 'addbutton'))?> +
+
Available searchfilter:
+
filterID
+
title
+
description
+
priority
+
bootmenuID
+
created
+
+ +
+ filters)==0) + echo "There are no Filters to display." ?> + filters as $filter): ?> +
+
escape($filter->getID()) ?>
+
+
+ Edit Filter + Delete Filter + Add Filterentry +
+
escape($filter->title) ?>
+
+ escape($filter->bootmenuID) ?> - Priority: escape($filter->priority) ?>
+ Created: escape($filter->created) ?>
+ escape($filter->Description) ?>
+ findBy(array('filterID' => $filter->getID()),true); + ?> +
+ + find($filterentry['filtertypeID'],$erg); + //name zur ID finden + $title = "[".$filterentry['filtertypeID']."] "; + $title .= $erg->getFiltertypename(); + ?> +
+
+
+ Edit Filterentry + Delete Filterentry +
+ +
:
+ +
+
+
+ +
+
+
+
+ +
+ +pagination; ?> + + + + diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml index f7d04e2..568654d 100644 --- a/application/modules/user/views/scripts/pool/index.phtml +++ b/application/modules/user/views/scripts/pool/index.phtml @@ -5,22 +5,30 @@ 'onclick' => 'self.location="/user/pool/createpool/page/'.$this->page.'"', 'class' => 'addbutton'))?> -pools): ?> - - - - - - - - +
+
Available searchfilter:
+
bootosID
+
title
+
groupID
+
configID
+
init
+
kernel
+
kcl
+
description
+
changed
+
expires
+
public
+
+ +
+ pools)==0) + echo "There are no Pools to display." ?> pools as $pool): ?> -
- - - - - - - - - findBy(array('poolID' => $pool->getID()),true); - ?> - 0): ?> - - - - - - -
Title titleDescription descriptionLocation locationActions
escape($pool->getTitle()) ?>escape($pool->getDescription()) ?>escape($pool->getLocation()) ?>url( array( 'module' => 'user', 'controller' => 'pool', @@ -29,8 +37,8 @@ 'page' => $this->page ), 'default', - true) ?>">Edit PoolEdit Pool + Delete PoolDelete Pool + Link Client
↳ - - - - - - - - - - - find($client['clientID'],$cli); + true) ?>">Link Client + + findBy(array('poolID' => $pool->getID()),true); ?> - - - - - -
MacHardwarehashActions
macAdress); ?>hardwarehash); ?>Unlink Client
-
- pagination; ?> - +
escape($pool->getTitle()) ?>
+
escape($pool->getLocation()) ?> - Clients
+ escape($pool->getDescription()) ?>
+
+ + 0): ?> + + find($client['clientID'],$cli); + ?> +
+
+
+
+ Unlink Client +
+
+ +
macAdress); ?>
+ +
hardwarehash); ?>
+
+
+
+
+ +
+ +
+
+
+ + + +pagination; ?> + + + freeclients) && count($this->freeclients)>0): ?>

Free clients

@@ -105,41 +131,44 @@

- - - - - - - -freeclients as $client): ?> - - - - - ?> - - - - - -
ClientIDMacAdressHardwarehashActions
+
+ freeclients as $client): ?> +
+
5
+
+
+ +
+
+ +
+ +
+
+
+
+
+ +
+ - - -

There are no pools to display.

- - diff --git a/application/modules/user/views/scripts/preboot/index.phtml b/application/modules/user/views/scripts/preboot/index.phtml index 76420fb..fc0d07d 100644 --- a/application/modules/user/views/scripts/preboot/index.phtml +++ b/application/modules/user/views/scripts/preboot/index.phtml @@ -76,7 +76,7 @@ $(document).ready(function(){ $(this).find('.title').css('cursor','pointer'); $('.title').click(function(){ - $(this).parent().find('.dispnone').toggle(); + $(this).siblings('.dispnone').toggle(); }); } }); diff --git a/application/modules/user/views/scripts/session/index.phtml b/application/modules/user/views/scripts/session/index.phtml index a5ed851..412b113 100644 --- a/application/modules/user/views/scripts/session/index.phtml +++ b/application/modules/user/views/scripts/session/index.phtml @@ -53,7 +53,7 @@ $(document).ready(function(){ $(this).find('.title').css('cursor','pointer'); $('.title').click(function(){ - $(this).parent().find('.dispnone').toggle(); + $(this).siblings('.dispnone').toggle(); }); } }); diff --git a/library/Pbs/Search.php b/library/Pbs/Search.php index fc05213..127c4d3 100644 --- a/library/Pbs/Search.php +++ b/library/Pbs/Search.php @@ -23,6 +23,7 @@ class Pbs_Search{ $highlight[] = "$('table').highlight('".$term."');"; $highlight[] = "$('.element .number').highlight('".$term."');"; $highlight[] = "$('.element .title').highlight('".$term."');"; + $highlight[] = "$('.element .subtitle').highlight('".$term."');"; $highlight[] = "$('.element .item').highlight('".$term."');"; } @@ -116,7 +117,7 @@ class Pbs_Search{ if(count($this->searcha) > 0){ foreach($this->searcha as $sk => $sv){ if($k == $sk){ - if(stristr($v,$sv) || $v == $sv){ + if(stristr($v,$sv) || $v == $sv){ $com1[$counter] += 1; } } @@ -131,7 +132,7 @@ class Pbs_Search{ } } } - # print_a($com2[$counter]." >= ".count($this->searchb)." && ".$com1[$counter]." >= ".count($this->searcha)); + #print_a($com2[$counter]." >= ".count($this->searchb)." && ".$com1[$counter]." >= ".count($this->searcha)); if($com2[$counter] >= count($this->searchb) && $com1[$counter] >= count($this->searcha)){ // add item in resultlist $data[] = $counter; -- cgit v1.2.3-55-g7522