diff options
author | michael pereira | 2011-03-08 20:57:46 +0100 |
---|---|---|
committer | michael pereira | 2011-03-08 20:57:46 +0100 |
commit | 1a20e728eae09ceb8b3549628f67630a9b5d3ed8 (patch) | |
tree | 428c356ddad47c606a8834178cd6763abf5722de /application/views | |
parent | BootMenu Order fertig (diff) | |
parent | ansichten vereinheitlicht & Auth gefixxt & user test//test angelegt (diff) | |
download | pbs2-1a20e728eae09ceb8b3549628f67630a9b5d3ed8.tar.gz pbs2-1a20e728eae09ceb8b3549628f67630a9b5d3ed8.tar.xz pbs2-1a20e728eae09ceb8b3549628f67630a9b5d3ed8.zip |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/views')
-rw-r--r-- | application/views/scripts/bootiso/index.phtml | 17 | ||||
-rw-r--r-- | application/views/scripts/bootmenu/index.phtml | 16 | ||||
-rw-r--r-- | application/views/scripts/bootos/index.phtml | 15 | ||||
-rw-r--r-- | application/views/scripts/client/index.phtml | 17 | ||||
-rw-r--r-- | application/views/scripts/config/index.phtml | 15 | ||||
-rw-r--r-- | application/views/scripts/filter/index.phtml | 27 | ||||
-rw-r--r-- | application/views/scripts/index/index.phtml | 2 | ||||
-rw-r--r-- | application/views/scripts/pool/index.phtml | 22 | ||||
-rw-r--r-- | application/views/scripts/session/index.phtml | 14 |
9 files changed, 52 insertions, 93 deletions
diff --git a/application/views/scripts/bootiso/index.phtml b/application/views/scripts/bootiso/index.phtml index 171d85f..f529ff3 100644 --- a/application/views/scripts/bootiso/index.phtml +++ b/application/views/scripts/bootiso/index.phtml @@ -1,12 +1,8 @@ <h1>BootISO</h1> - -<style> -table{font-family:verdana;font-size:12px;} -td{border:1px solid #CCC;} -tr.entry{background-color:#E0ECF8;} -</style> - -<table border=1> +<?php echo $this->formButton('createbootiso', 'Create BootISO', array( + 'onclick' => 'self.location="/bootiso/createbootiso"', + 'class' => 'addbutton'))?> +<table> <tr> <th>ID</th> <th>Title</th> @@ -48,9 +44,8 @@ tr.entry{background-color:#E0ECF8;} </tr> <?php endforeach; ?> </table> -<br/> -<?php echo $this->formButton('createbootiso', 'Create BootISO', array( - 'onclick' => 'self.location="/bootiso/createbootiso"'))?> + + diff --git a/application/views/scripts/bootmenu/index.phtml b/application/views/scripts/bootmenu/index.phtml index 2c02b0c..70bb134 100644 --- a/application/views/scripts/bootmenu/index.phtml +++ b/application/views/scripts/bootmenu/index.phtml @@ -1,14 +1,10 @@ <h1>BootMenu</h1> +<?php echo $this->formButton('createbootmenu', 'Create BootMenu', array( + 'onclick' => 'self.location="/bootmenu/createbootmenu"', + 'class' => 'addbutton'))?> -<style> -table{font-family:verdana;font-size:12px;} -td{border:1px solid #CCC;} -td.nostyle{background-color:#FFFFFF;} -tr.bootmenu{background-color:#D8D8D8;} -tr.bootentry{background-color:#E0ECF8;} -</style> -<table border=1> +<table> <tr> <th>ID</th> <th>Title</th> @@ -91,9 +87,7 @@ tr.bootentry{background-color:#E0ECF8;} <?php endforeach; ?> <?php endforeach; ?> </table> -<br/> -<?php echo $this->formButton('createbootmenu', 'Create BootMenu', array( - 'onclick' => 'self.location="/bootmenu/createbootmenu"'))?> + diff --git a/application/views/scripts/bootos/index.phtml b/application/views/scripts/bootos/index.phtml index 86bcdff..fefd219 100644 --- a/application/views/scripts/bootos/index.phtml +++ b/application/views/scripts/bootos/index.phtml @@ -1,12 +1,9 @@ <h1>BootOS</h1> +<?php echo $this->formButton('createbootos', 'Create BootOS', array( + 'onclick' => 'self.location="/bootos/createbootos"', + 'class' => 'addbutton'))?> -<style> -table{font-family:verdana;font-size:12px;} -td{border:1px solid #CCC;} -tr.entry{background-color:#E0ECF8;} -</style> - -<table border=1> +<table> <tr> <th>ID</th> <th>Title</th> @@ -54,9 +51,7 @@ tr.entry{background-color:#E0ECF8;} </tr> <?php endforeach; ?> </table> -<br/> -<?php echo $this->formButton('createbootos', 'Create BootOS', array( - 'onclick' => 'self.location="/bootos/createbootos"'))?> + diff --git a/application/views/scripts/client/index.phtml b/application/views/scripts/client/index.phtml index 0eb28b8..e9de06b 100644 --- a/application/views/scripts/client/index.phtml +++ b/application/views/scripts/client/index.phtml @@ -1,15 +1,10 @@ <h1>Clients</h1> +<?php echo $this->formButton('createbootos', 'Create Client', array( + 'onclick' => 'self.location="/client/addclient"', + 'class' => 'addbutton'))?> <?php if ($this->clients): ?> - <a href="<?php echo $this->url( - array( - 'controller' => 'client', - 'action' => 'addclient' - ), - 'default', - true) ?>">add client</a> - <!-- A table of filters. --> - <table border=1> + <table> <tr> <th>clientID</th> <th>MAC</th> @@ -18,8 +13,8 @@ <?php foreach ($this->clients as $client): ?> <tr class='client'> <td><?php echo $this->escape($client->getID()) ?></td> - <td><?php echo $this->escape($client->getMacadress()) ?></td> - <td><?php echo $this->escape($client->getHardwarehash()) ?></td> + <td class='monospace'><?php echo $this->escape($client->getMacadress()) ?></td> + <td class='monospace'><?php echo $this->escape($client->getHardwarehash()) ?></td> <td><a href="<?php echo $this->url( array( 'controller' => 'client', diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml index e273b27..62ab1d4 100644 --- a/application/views/scripts/config/index.phtml +++ b/application/views/scripts/config/index.phtml @@ -1,12 +1,9 @@ <h1>Config</h1> +<?php echo $this->formButton('createconfig', 'Create Config', array( + 'onclick' => 'self.location="/config/createconfig"', + 'class' => 'addbutton'))?> -<style> -table{font-family:verdana;font-size:12px;} -td{border:1px solid #CCC;} -tr.entry{background-color:#E0ECF8;} -</style> - -<table border=1> +<table> <tr> <th>ID</th> <th>Title</th> @@ -42,9 +39,7 @@ tr.entry{background-color:#E0ECF8;} </tr> <?php endforeach; ?> </table> -<br/> -<?php echo $this->formButton('createconfig', 'Create Config', array( - 'onclick' => 'self.location="/config/createconfig"'))?> + diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml index 5d70735..0de30a0 100644 --- a/application/views/scripts/filter/index.phtml +++ b/application/views/scripts/filter/index.phtml @@ -1,22 +1,10 @@ <h1>Filters</h1> - -<style> -table{font-family:verdana;font-size:12px;} -td{border:1px solid #CCC;} -tr.filter{background-color:#DDD;} -</style> -<p><a href="<?php echo $this->url( - array( - 'controller' => 'filter', - 'action' => 'addfilter' - ), - 'default', - true) ?>">add new filter</a></p> +<?php echo $this->formButton('createconfig', 'Add Filter', array( + 'onclick' => 'self.location="/filter/addfilter"', + 'class' => 'addbutton'))?> <?php if ($this->filters): ?> - - <!-- A table of filters. --> - <table border=1> + <table> <tr> <th>filterID</th> <th>Title</th> @@ -62,8 +50,13 @@ tr.filter{background-color:#DDD;} $erg = $fe->findBy('filterID',$filter->getID()); ?> <table style='width:100%;'> + <tr> + <th>Filtertype</th> + <th>Value</th> + <th>Value2</th> + </tr> <?php foreach ($erg as $filterentry): ?> - + <tr> <td><?php diff --git a/application/views/scripts/index/index.phtml b/application/views/scripts/index/index.phtml index 487bd28..57e6edb 100644 --- a/application/views/scripts/index/index.phtml +++ b/application/views/scripts/index/index.phtml @@ -1 +1 @@ -<h1>Zend-Framework Index</h1> +<h1>Welcome</h1> diff --git a/application/views/scripts/pool/index.phtml b/application/views/scripts/pool/index.phtml index c3a6be9..2df3e52 100644 --- a/application/views/scripts/pool/index.phtml +++ b/application/views/scripts/pool/index.phtml @@ -1,17 +1,10 @@ <h1>Pools</h1> - -<a href="<?php echo $this->url( - array( - 'controller' => 'pool', - 'action' => 'createpool' - ), - 'default', - true) ?>">create pool</a> +<?php echo $this->formButton('createconfig', 'Create Pool', array( + 'onclick' => 'self.location="/pool/createpool"', + 'class' => 'addbutton'))?> <?php if ($this->pools): ?> - - <!-- A table of filters. --> - <table border=1> + <table > <tr> <th>poolID</th> <th>Title</th> @@ -52,7 +45,12 @@ <tr> <td> </td> - <td colspan=6><table border=1><tr><th>clientID</th><th>mac</th><th>hardwarehash</th></th> + <td colspan=6><table> + <tr> + <th>clientID</th> + <th>mac</th> + <th>hardwarehash</th> + </tr> <?php $poolentriesMapper = new Application_Model_PoolEntriesMapper(); $clients = $poolentriesMapper->findBy('poolID',$pool->getID()); diff --git a/application/views/scripts/session/index.phtml b/application/views/scripts/session/index.phtml index d26e818..1d2506b 100644 --- a/application/views/scripts/session/index.phtml +++ b/application/views/scripts/session/index.phtml @@ -1,14 +1,8 @@ <h1>Session</h1> - -<p><a href="<?php echo $this->url( - array( - 'controller' => 'session', - 'action' => 'createsession' - ), - 'default', - true) ?>">create new session</a></p> - -<table border=1> +<?php echo $this->formButton('createconfig', 'Create Session', array( + 'onclick' => 'self.location="/session/createsession"', + 'class' => 'addbutton'))?> +<table> <tr> <th>SessionID</th> <th>ClientID</th> |