diff options
Diffstat (limited to 'application/views/scripts')
| -rw-r--r-- | application/views/scripts/bootmenu/index.phtml | 9 | ||||
| -rw-r--r-- | application/views/scripts/filter/index.phtml | 18 | ||||
| -rw-r--r-- | application/views/scripts/filter/testevaluate.phtml | 4 | ||||
| -rw-r--r-- | application/views/scripts/pool/index.phtml | 22 | ||||
| -rw-r--r-- | application/views/scripts/resource/get-bootmenu-entry.phtml | 0 | ||||
| -rw-r--r-- | application/views/scripts/resource/index.phtml | 0 | ||||
| -rw-r--r-- | application/views/scripts/session/index.phtml | 2 |
7 files changed, 41 insertions, 14 deletions
diff --git a/application/views/scripts/bootmenu/index.phtml b/application/views/scripts/bootmenu/index.phtml index 6fb55e4..fa722e4 100644 --- a/application/views/scripts/bootmenu/index.phtml +++ b/application/views/scripts/bootmenu/index.phtml @@ -55,7 +55,7 @@ <td colspan=7> <table> <tr> - + <th></th> <th>ID</th> <th>Title</th> <!-- <th>BootmenuID</th>--> @@ -70,7 +70,12 @@ <?php foreach ($this->bootmenuentrylist[$bootmenu->getID()] as $bootmenuentry): ?> <?php $bootos = $this->bootosmapper->find($bootmenuentry->getBootosID());?> <?php $config = $this->configmapper->find($bootmenuentry->getConfigID());?> - <tr> + <tr> + <td class='action'> + <a href='/resource/getbootmenuentry/bootmenuentryID/<?php echo $bootmenuentry->getID();?>'> + <img src='/media/img/play.gif'> + </a> + </td> <td><?php echo $this->escape($bootmenuentry->getID()); ?></td> <td><?php echo $this->escape($bootmenuentry->getTitle()); ?></td> <!--<td><?php echo $this->escape($bootmenuentry->getBootmenuID()); ?></td> diff --git a/application/views/scripts/filter/index.phtml b/application/views/scripts/filter/index.phtml index 6f98b4c..188bed3 100644 --- a/application/views/scripts/filter/index.phtml +++ b/application/views/scripts/filter/index.phtml @@ -8,6 +8,7 @@ <tr> <th>ID</th> <th>Title</th> + <th>Description</th> <th>Priority</th> <th>TargetBootMenu</th> <th colspan=3>Actions</th> @@ -16,6 +17,7 @@ <tr class='entry'> <td><?php echo $this->escape($filter->getID()) ?></td> <td><?php echo $this->escape($filter->title) ?></td> + <td><?php echo $this->escape($filter->Description) ?></td> <td><?php echo $this->escape($filter->priority) ?></td> <td><?php echo $this->escape($filter->bootmenuID) ?></td> <td class='action'><a href="<?php echo $this->url( @@ -43,13 +45,17 @@ 'default', true) ?>"><img src='/media/img/add.png' alt='Add Filterentry'/></a></td> </tr> + <?php + $fe = new Application_Model_FilterEntriesMapper(); + # print_a($erg = $fe->findBy('filterID',$filter->getID())); + $erg = $fe->findBy('filterID',$filter->getID()); + ?> + <?php if (count($erg)>0): ?> <tr class=detail> <td class=arrowtop>↳</td> - <td colspan=6> + <td colspan=7> <?php - $fe = new Application_Model_FilterEntriesMapper(); - # print_a($erg = $fe->findBy('filterID',$filter->getID())); - $erg = $fe->findBy('filterID',$filter->getID()); + ?> <table> <tr> @@ -96,6 +102,7 @@ </table> </td> </tr> + <?php endif;?> <?php endforeach ?> </table> @@ -105,3 +112,6 @@ <p>There are no filters to display.</p> <?php endif;?> +<?php echo $this->formButton('createconfig', 'Test Filters', array( + 'onclick' => 'self.location="/filter/testevaluate"', + 'class' => 'addbutton'))?> diff --git a/application/views/scripts/filter/testevaluate.phtml b/application/views/scripts/filter/testevaluate.phtml new file mode 100644 index 0000000..8a10629 --- /dev/null +++ b/application/views/scripts/filter/testevaluate.phtml @@ -0,0 +1,4 @@ +<h1>Test Filters</h1> + +<?php +echo $this->filterevaluate; diff --git a/application/views/scripts/pool/index.phtml b/application/views/scripts/pool/index.phtml index f89dbc9..2c6ba16 100644 --- a/application/views/scripts/pool/index.phtml +++ b/application/views/scripts/pool/index.phtml @@ -43,6 +43,11 @@ 'default', true) ?>"><img src='/media/img/add.png' alt='Link Client'/></a></td> </tr> + <?php + $poolentriesMapper = new Application_Model_PoolEntriesMapper(); + $clients = $poolentriesMapper->findBy('poolID',$pool->getID()); + ?> + <?php if (count($clients)>0): ?> <tr class=detail> <td class=arrowtop>↳</td> <td colspan=6> @@ -54,8 +59,6 @@ <th>Actions</th> </tr> <?php - $poolentriesMapper = new Application_Model_PoolEntriesMapper(); - $clients = $poolentriesMapper->findBy('poolID',$pool->getID()); foreach ($clients as $client): ?> <tr> <td><?php echo $client['clientID'];?></td> @@ -77,14 +80,18 @@ </tr> <?php endforeach ?> </table> + </td> + </tr> + <?php endif;?> <?php endforeach ?> </table> <h2>Free clients</h2> <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> - <?php endforeach ?> +<tr> +<th>ClientID</th> +<th>MacAdress</th> +<th>Hardwarehash</th> +<th>Actions</th> </tr> <?php foreach ($this->freeclients as $client): ?> @@ -92,7 +99,8 @@ 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> + <td><select onChange="location.href=this.options[this.selectedIndex].value"> + <option></option> <?php foreach ($this->pools as $pool): ?> <option value="<?php echo $this->url( array( diff --git a/application/views/scripts/resource/get-bootmenu-entry.phtml b/application/views/scripts/resource/get-bootmenu-entry.phtml new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/application/views/scripts/resource/get-bootmenu-entry.phtml diff --git a/application/views/scripts/resource/index.phtml b/application/views/scripts/resource/index.phtml new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/application/views/scripts/resource/index.phtml diff --git a/application/views/scripts/session/index.phtml b/application/views/scripts/session/index.phtml index 0ff255d..6e87acf 100644 --- a/application/views/scripts/session/index.phtml +++ b/application/views/scripts/session/index.phtml @@ -19,7 +19,7 @@ <td><?php echo $this->escape($session->getClientID()) ?></td> <td><?php echo $this->escape($session->getBootosID()) ?></td> <td><?php echo $this->escape($session->getBootisoID()) ?></td> - <td><?php echo $this->escape($session->getTime()) ?></td> + <td><?php echo date('d.m.Y H:i',$this->escape($session->getTime())) ?></td> <td><?php echo $this->escape($session->getIp()) ?></td> <td><?php echo $this->escape($session->getIp6()) ?></td> <td class='action'><a href="<?php echo $this->url( |