diff options
| author | Simon | 2011-04-08 15:03:58 +0200 |
|---|---|---|
| committer | Simon | 2011-04-08 15:03:58 +0200 |
| commit | c4be5c8868516d64126847223e421e51359551c3 (patch) | |
| tree | e114aa0a0ed9985b3a213252a04c923618a14903 /application | |
| parent | Endlosschleifen bei falschen Einträgen gefixt (diff) | |
| download | pbs2-c4be5c8868516d64126847223e421e51359551c3.tar.gz pbs2-c4be5c8868516d64126847223e421e51359551c3.tar.xz pbs2-c4be5c8868516d64126847223e421e51359551c3.zip | |
Notifier in Bootmenu richitg gesetzt
Diffstat (limited to 'application')
| -rw-r--r-- | application/controllers/ResourceController.php | 19 | ||||
| -rw-r--r-- | application/modules/user/views/scripts/bootmenu/index.phtml | 11 |
2 files changed, 21 insertions, 9 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index f72a5ae..a9b2fb3 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -165,7 +165,8 @@ class ResourceController extends Zend_Controller_Action // so getkclAction, getkernelAction, getconfigAction and getinitramfsAction // can be called with session-identifier - + $this->_helper->layout->disableLayout(); + $this->_helper->viewRenderer->setNoRender(); $return_val = array( @@ -176,13 +177,15 @@ class ResourceController extends Zend_Controller_Action 'config' => $this->thisSession->getAlphasessionID() ); - $ser = serialize($return_val); - $this->_forward('index','bootmenu','user', array( - 'page' => $this->page, - 'json' => $ser - )); - - + $result = $return_val; + $result2 = "<table class='json'>"; + $result2 .= "<tr><td><b>info</b>: </td><td>".$result['info']."</td></tr>"; + $result2 .= "<tr><td><b>kernel</b>: </td><td><a href=".$result['kernel'].">".$result['kernel']."<a></td></tr>"; + $result2 .= "<tr><td><b>initramfs</b>: </td><td><a href=".$result['initramfs'].">".$result['initramfs']."<a></td></tr>"; + $result2 .= "<tr><td><b>kcl</b>: </td><td><a href=".$result['kcl'].">".$result['kcl']."<a></td></tr>"; + $result2 .= "<tr><td><b>config</b>: </td><td>".$result['config']."</td></tr>"; + $result2 .= "</table>"; + echo $result2; } private function generateURL($action, $varname, $varvalue, $filename){ diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml index 1ed7807..5d298a5 100644 --- a/application/modules/user/views/scripts/bootmenu/index.phtml +++ b/application/modules/user/views/scripts/bootmenu/index.phtml @@ -1,5 +1,6 @@ <h1>BootMenu</h1> <?php if($this->notification != ''){echo $this->notification;} ?> +<div id='notification' style='display:none;'></div> <?php echo $this->searchform; ?> <?php echo $this->formButton('createbootmenu', 'Create BootMenu', array( 'onclick' => 'self.location="/user/bootmenu/createbootmenu/page/'.$this->page.'"', @@ -80,7 +81,7 @@ <div class='number'><?php echo $this->escape($bootmenuentry->getID()); ?></div> <div class='content'> <div class='actions'> - <a href="<?php echo $this->url( + <a class='play' href="<?php echo $this->url( array( 'controller' => 'resource', 'action' => 'getbootmenuentry', @@ -135,3 +136,11 @@ <?php echo $this->pagination; ?> +<script> +$(document).ready(function(){ + $('.actions .play').click(function (){ + $("#notification").load($(this).attr('href')).addClass('infobox').show(); + return false; + }); +}); +</script> |