diff options
author | Simon | 2011-03-09 14:43:40 +0100 |
---|---|---|
committer | Simon | 2011-03-09 14:43:40 +0100 |
commit | 9f26be7f273a1c16fee2a369eb6c8dbcfdc83cdd (patch) | |
tree | 937aa56a584bb1401f85c8887f5c4adeb0196c02 | |
parent | htaccess (diff) | |
download | pbs2-9f26be7f273a1c16fee2a369eb6c8dbcfdc83cdd.tar.gz pbs2-9f26be7f273a1c16fee2a369eb6c8dbcfdc83cdd.tar.xz pbs2-9f26be7f273a1c16fee2a369eb6c8dbcfdc83cdd.zip |
Icons ins Oberlfäche hinzugefügt & Views geupdated & style geupdated & select in free clients hinzugefügt
-rw-r--r-- | application/controllers/SessionController.php | 1 | ||||
-rw-r--r-- | application/views/scripts/bootiso/index.phtml | 8 | ||||
-rw-r--r-- | application/views/scripts/bootmenu/index.phtml | 22 | ||||
-rw-r--r-- | application/views/scripts/bootos/index.phtml | 8 | ||||
-rw-r--r-- | application/views/scripts/client/index.phtml | 8 | ||||
-rw-r--r-- | application/views/scripts/config/index.phtml | 8 | ||||
-rw-r--r-- | application/views/scripts/filter/index.phtml | 24 | ||||
-rw-r--r-- | application/views/scripts/pool/index.phtml | 30 | ||||
-rw-r--r-- | application/views/scripts/session/index.phtml | 8 | ||||
-rw-r--r-- | public/media/css/style.css | 12 | ||||
-rw-r--r-- | public/media/img/add.png | bin | 0 -> 318 bytes | |||
-rw-r--r-- | public/media/img/create.png | bin | 0 -> 337 bytes | |||
-rw-r--r-- | public/media/img/delete.png | bin | 0 -> 347 bytes | |||
-rw-r--r-- | public/media/img/edit.png | bin | 0 -> 268 bytes | |||
-rw-r--r-- | public/media/img/iconset | 1 | ||||
-rw-r--r-- | public/media/img/star.png | bin | 0 -> 358 bytes |
16 files changed, 73 insertions, 57 deletions
diff --git a/application/controllers/SessionController.php b/application/controllers/SessionController.php index fc3b962..21f94fa 100644 --- a/application/controllers/SessionController.php +++ b/application/controllers/SessionController.php @@ -20,6 +20,7 @@ class SessionController extends Zend_Controller_Action $createsession = new Application_Form_Session(); $this->view->createsession = $createsession; }else { + // TODO extend with normal function not only with post $createsession = new Application_Form_Session($_POST); print_a($_POST); if ($createsession->isValid($_POST)) { diff --git a/application/views/scripts/bootiso/index.phtml b/application/views/scripts/bootiso/index.phtml index 20de6a1..5e7da1e 100644 --- a/application/views/scripts/bootiso/index.phtml +++ b/application/views/scripts/bootiso/index.phtml @@ -28,22 +28,22 @@ <td><?php echo $this->escape(date('Y-m-d H:i:s', $bootiso->getCreated())); ?></td> <td><?php echo $this->escape($bootiso->getExpires()); ?></td> <td><?php echo $this->escape($bootiso->getPublic()); ?></td> - <td><a href="<?php echo $this->url( + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'bootiso', 'action' => 'editbootiso', 'bootisoID' => $bootiso->getID() ), 'default', - true, false) ?>">Edit BootISO</a></td> - <td><a href="<?php echo $this->url( + true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootISO' /></a></td> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'bootiso', 'action' => 'deletebootiso', 'bootisoID' => $bootiso->getID() ), 'default', - true) ?>">Delete BootISO</a></td> + true) ?>"><img src='/media/img/delete.png' alt='Delete BootISO'/></a></td> </tr> <?php endforeach; ?> </table> diff --git a/application/views/scripts/bootmenu/index.phtml b/application/views/scripts/bootmenu/index.phtml index 019a799..6fb55e4 100644 --- a/application/views/scripts/bootmenu/index.phtml +++ b/application/views/scripts/bootmenu/index.phtml @@ -22,23 +22,23 @@ <td><?php echo $this->escape($bootmenu->getGroupID()); ?></td> <td><?php echo $this->escape($bootmenu->getMembershipID()); ?></td> <td><?php echo $this->escape(date('Y-m-d H:i:s', $bootmenu->getCreated())); ?></td> - <td><a href="<?php echo $this->url( + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'bootmenu', 'action' => 'editbootmenu', 'bootmenuID' => $bootmenu->getID() ), 'default', - true, false) ?>">Edit Bootmenu</a></td> - <td><a href="<?php echo $this->url( + true, false) ?>"><img src='/media/img/edit.png' alt='Edit Bootmenu'/></a></td> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'bootmenu', 'action' => 'deletebootmenu', 'bootmenuID' => $bootmenu->getID() ), 'default', - true) ?>">Delete Bootmenu</a></td> - <td><a href="<?php echo $this->url( + true) ?>"><img src='/media/img/delete.png' alt='Delete Bootmenu'/></a></td> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'bootmenu', 'action' => 'addbootmenuentry', @@ -46,12 +46,12 @@ 'maxorder' => count($this->bootmenuentrylist[$bootmenu->getID()]) ), 'default', - true) ?>">Add Entry</a></td> + true) ?>"><img src='/media/img/add.png' alt='Add Entry'/></a></td> </tr> <?php if(count($this->bootmenuentrylist[$bootmenu->getID()]) > 0):?> <tr class=detail> - <td></td> + <td class=arrowtop>↳</td> <td colspan=7> <table> <tr> @@ -78,7 +78,7 @@ <td><?php echo $this->escape($bootmenuentry->getkcl()); ?></td> <td><?php echo "[".$this->escape($bootmenuentry->getConfigID()."] ". $config->getTitle()); ?></td> <td><?php echo $this->escape($bootmenuentry->getOrder() + 1); ?></td> - <td><a href="<?php echo $this->url( + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'bootmenu', 'action' => 'editbootmenuentry', @@ -88,15 +88,15 @@ 'oldorder' => $bootmenuentry->getOrder() ), 'default', - true, false) ?>">Edit Entry</a></td> - <td><a href="<?php echo $this->url( + true, false) ?>"><img src='/media/img/edit.png' alt='Edit Entry'/></a></td> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'bootmenu', 'action' => 'removebootmenuentry', 'bootmenuentryID' => $bootmenuentry->getID() ), 'default', - true) ?>">Remove Entry</a></td> + true) ?>"><img src='/media/img/delete.png' alt='Remove Entry'/></a></td> </tr> <?php endforeach; ?> </table> diff --git a/application/views/scripts/bootos/index.phtml b/application/views/scripts/bootos/index.phtml index df4f072..6da7a16 100644 --- a/application/views/scripts/bootos/index.phtml +++ b/application/views/scripts/bootos/index.phtml @@ -35,22 +35,22 @@ <td><?php echo $this->escape(date('Y-m-d H:i:s', $bootos->getCreated())); ?></td> <td><?php echo $this->escape($bootos->getExpires()); ?></td> <td><?php echo $this->escape($bootos->getPublic()); ?></td> - <td><a href="<?php echo $this->url( + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'bootos', 'action' => 'editbootos', 'bootosID' => $bootos->getID() ), 'default', - true, false) ?>">Edit BootOS</a></td> - <td><a href="<?php echo $this->url( + true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootOS'/></a></td> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'bootos', 'action' => 'deletebootos', 'bootosID' => $bootos->getID() ), 'default', - true) ?>">Delete BootOS</a></td> + true) ?>"><img src='/media/img/delete.png' alt='Delete BootOS'/></a></td> </tr> <?php endforeach; ?> </table> diff --git a/application/views/scripts/client/index.phtml b/application/views/scripts/client/index.phtml index 9ef344b..fd7725c 100644 --- a/application/views/scripts/client/index.phtml +++ b/application/views/scripts/client/index.phtml @@ -16,22 +16,22 @@ <td><?php echo $this->escape($client->getID()) ?></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( + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'client', 'action' => 'editclient', 'clientID' => $client->getID() ), 'default', - true) ?>">edit client</a></td> - <td><a href="<?php echo $this->url( + true) ?>"><img src='/media/img/edit.png' alt='Edit Client'/></a></td> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'client', 'action' => 'removeclient', 'clientID' => $client->getID() ), 'default', - true) ?>">remove client</a></td> + true) ?>"><img src='/media/img/delete.png' alt='Delete Client'/></a></td> </tr> <?php endforeach ?> </table> diff --git a/application/views/scripts/config/index.phtml b/application/views/scripts/config/index.phtml index 6457d8f..5562b86 100644 --- a/application/views/scripts/config/index.phtml +++ b/application/views/scripts/config/index.phtml @@ -23,22 +23,22 @@ <td><?php echo $this->escape($config->getMembershipID()); ?></td> <td><?php echo $this->escape($config->getShellscript()); ?></td> <td><?php echo $this->escape(date('Y-m-d H:i:s', $config->getCreated())); ?></td> - <td><a href="<?php echo $this->url( + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'config', 'action' => 'editconfig', 'configID' => $config->getID() ), 'default', - true, false) ?>">Edit Config</a></td> - <td><a href="<?php echo $this->url( + true, false) ?>"><img src='/media/img/edit.png' alt='Edit Config'/></a></td> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'config', 'action' => 'deleteconfig', 'configID' => $config->getID() ), 'default', - true) ?>">Delete Config</a></td> + true) ?>"><img src='/media/img/delete.png' alt='Delete Config'/></a></td> </tr> <?php endforeach; ?> </table> diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml index 253d14d..6f98b4c 100644 --- a/application/views/scripts/filter/index.phtml +++ b/application/views/scripts/filter/index.phtml @@ -1,5 +1,5 @@ <h1>Filters</h1> -<?php echo $this->formButton('createconfig', 'Add Filter', array( +<?php echo $this->formButton('createconfig', 'Create Filter', array( 'onclick' => 'self.location="/filter/addfilter"', 'class' => 'addbutton'))?> @@ -18,33 +18,33 @@ <td><?php echo $this->escape($filter->title) ?></td> <td><?php echo $this->escape($filter->priority) ?></td> <td><?php echo $this->escape($filter->bootmenuID) ?></td> - <td><a href="<?php echo $this->url( + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'filter', 'action' => 'editfilter', 'filterID' => $filter->getID() ), 'default', - true) ?>">edit filter</a></td> - <td><a href="<?php echo $this->url( + true) ?>"><img src='/media/img/edit.png' alt='Edit Filter'/></a></td> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'filter', 'action' => 'removefilter', 'filterID' => $filter->getID() ), 'default', - true) ?>">delete filter</a></td> - <td><a href="<?php echo $this->url( + true) ?>"><img src='/media/img/delete.png' alt='Delete Filter'/></a></td> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'filter', 'action' => 'addfilterentry', 'filterID' => $filter->getID() ), 'default', - true) ?>">add filterentry</a></td> + true) ?>"><img src='/media/img/add.png' alt='Add Filterentry'/></a></td> </tr> <tr class=detail> - <td></td> + <td class=arrowtop>↳</td> <td colspan=6> <?php $fe = new Application_Model_FilterEntriesMapper(); @@ -74,22 +74,22 @@ ?></td> <td><?php echo $filterentry['filtervalue'];?></td> <td><?php echo $filterentry['filtervalue2'];?></td> - <td><a href="<?php echo $this->url( + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'filter', 'action' => 'editfilterentry', 'filterentriesID' => $filterentry['filterentriesID'] ), 'default', - true) ?>">edit filterentry</a> - <td><a href="<?php echo $this->url( + true) ?>"><img src='/media/img/edit.png' alt='Edit Filterentry'/></a> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'filter', 'action' => 'removefilterentry', 'filterentriesID' => $filterentry['filterentriesID'] ), 'default', - true) ?>">remove filterentry</a> + true) ?>"><img src='/media/img/delete.png' alt='Delete Filterentry'/></a> </tr> <?php endforeach ?> diff --git a/application/views/scripts/pool/index.phtml b/application/views/scripts/pool/index.phtml index 68fcbc4..f89dbc9 100644 --- a/application/views/scripts/pool/index.phtml +++ b/application/views/scripts/pool/index.phtml @@ -18,33 +18,33 @@ <td><?php echo $this->escape($pool->getTitle()) ?></td> <td><?php echo $this->escape($pool->getDescription()) ?></td> <td><?php echo $this->escape($pool->getLocation()) ?></td> - <td><a href="<?php echo $this->url( + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'pool', 'action' => 'editpool', 'poolID' => $pool->getID() ), 'default', - true) ?>">edit pool</a></td> - <td><a href="<?php echo $this->url( + true) ?>"><img src='/media/img/edit.png' alt='Edit Pool'/></a></td> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'pool', 'action' => 'deletepool', 'poolID' => $pool->getID() ), 'default', - true) ?>">delete pool</a></td> - <td><a href="<?php echo $this->url( + true) ?>"><img src='/media/img/delete.png' alt='Delete Pool'/></a></td> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'pool', 'action' => 'linkclient', 'poolID' => $pool->getID() ), 'default', - true) ?>">link client</a></td> + true) ?>"><img src='/media/img/add.png' alt='Link Client'/></a></td> </tr> <tr class=detail> - <td></td> + <td class=arrowtop>↳</td> <td colspan=6> <table> <tr> @@ -66,21 +66,21 @@ ?> <td><?php echo ($cli->macAdress); ?></td> <td><?php echo ($cli->hardwarehash); ?></td> - <td><a href="<?php echo $this->url( + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'pool', 'action' => 'unlinkclient', 'poolentriesID' => $client['poolentriesID'] ), 'default', - true) ?>">unlink client</a></td> + true) ?>"><img src='/media/img/delete.png' alt='Unlink Client'/></a></td> </tr> <?php endforeach ?> </table> <?php endforeach ?> </table> <h2>Free clients</h2> -<table border=1 > +<table > <tr><th>ClientID</th><th>MacAdress</th><th>Hardwarehash</th> <?php foreach ($this->pools as $pool): ?> <th><?php echo $this->escape($pool->getTitle()) ?></th> @@ -92,8 +92,9 @@ foreach ($this->freeclients as $client): ?> <td><?php echo $client['clientID']; ?></td> <td><?php echo $client['macadress']; ?></td> <td><?php echo $client['hardwarehash']; ?></td> + <td><select> <?php foreach ($this->pools as $pool): ?> - <td><a href='<?php echo $this->url( + <option value="<?php echo $this->url( array( 'controller' => 'pool', 'action' => 'linkclient', @@ -101,8 +102,11 @@ foreach ($this->freeclients as $client): ?> 'poolID' => $pool->getID(), ), 'default', - true) ?>'>link</a></td> - <?php endforeach ?> + true) ?>"><?php echo $pool->getTitle(); ?></option> + <?php //<img src='/media/img/add.png' alt='Link to Pool'/></a></td> ?> + <?php endforeach ?> + </select> + </td> </tr> <?php endforeach ?> </table> diff --git a/application/views/scripts/session/index.phtml b/application/views/scripts/session/index.phtml index f98fa48..0ff255d 100644 --- a/application/views/scripts/session/index.phtml +++ b/application/views/scripts/session/index.phtml @@ -22,22 +22,22 @@ <td><?php echo $this->escape($session->getTime()) ?></td> <td><?php echo $this->escape($session->getIp()) ?></td> <td><?php echo $this->escape($session->getIp6()) ?></td> - <td><a href="<?php echo $this->url( + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'session', 'action' => 'editsession', 'sessionID' => $session->getID() ), 'default', - true) ?>">edit filter</a></td> - <td><a href="<?php echo $this->url( + true) ?>"><img src='/media/img/edit.png' alt='Edit Filter'/></a></td> + <td class='action'><a href="<?php echo $this->url( array( 'controller' => 'session', 'action' => 'deletesession', 'sessionID' => $session->getID() ), 'default', - true) ?>">delete filter</a></td> + true) ?>"><img src='/media/img/delete.png' alt='Delete Filter'/></a></td> </tr> <?php endforeach ?> </table> diff --git a/public/media/css/style.css b/public/media/css/style.css index 8057da4..fb4177e 100644 --- a/public/media/css/style.css +++ b/public/media/css/style.css @@ -80,7 +80,7 @@ border:1px solid #CCC; } .addbutton { -float:right; + float:right; } .monospace { @@ -109,7 +109,17 @@ background-color:#FFF5CC; tr.detail>td { border:none; } +td.arrowtop{ +vertical-align:top; +text-align:center; +} tr.detail table tr td { background-color:#E2EFE1; } + +tr td.action{ + text-align:center; + width:20px; +} +td.action img{border:none;} diff --git a/public/media/img/add.png b/public/media/img/add.png Binary files differnew file mode 100644 index 0000000..8833b99 --- /dev/null +++ b/public/media/img/add.png diff --git a/public/media/img/create.png b/public/media/img/create.png Binary files differnew file mode 100644 index 0000000..6e8c322 --- /dev/null +++ b/public/media/img/create.png diff --git a/public/media/img/delete.png b/public/media/img/delete.png Binary files differnew file mode 100644 index 0000000..3865ccd --- /dev/null +++ b/public/media/img/delete.png diff --git a/public/media/img/edit.png b/public/media/img/edit.png Binary files differnew file mode 100644 index 0000000..1e57b87 --- /dev/null +++ b/public/media/img/edit.png diff --git a/public/media/img/iconset b/public/media/img/iconset new file mode 100644 index 0000000..fd47af8 --- /dev/null +++ b/public/media/img/iconset @@ -0,0 +1 @@ +http://www.iconfinder.com/search/1/?q=iconset:diagona diff --git a/public/media/img/star.png b/public/media/img/star.png Binary files differnew file mode 100644 index 0000000..ef76231 --- /dev/null +++ b/public/media/img/star.png |