summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/fbgui/controllers/IndexController.php1
-rw-r--r--application/modules/fbgui/views/scripts/index/index.phtml55
-rw-r--r--application/modules/user/controllers/BootmenuController.php2
-rw-r--r--application/modules/user/forms/Bootmenu.php8
-rw-r--r--application/modules/user/views/scripts/bootmenu/index.phtml3
5 files changed, 65 insertions, 4 deletions
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 17d9337..150f1c5 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -117,6 +117,7 @@ class Fbgui_IndexController extends Zend_Controller_Action
$bootmenuMapper = new Application_Model_BootMenuMapper();
$bm = $bootmenuMapper->find($bootmenuID);
$this->view->title = $bm->getTitle();
+ $this->view->startcounter = $bm->getStartcounter();
$bootmenuentriesMapper = new Application_Model_BootMenuEntriesMapper();
$res = $bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID),false);
diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml
index 2454d45..8a5f0e6 100644
--- a/application/modules/fbgui/views/scripts/index/index.phtml
+++ b/application/modules/fbgui/views/scripts/index/index.phtml
@@ -26,6 +26,9 @@
});
$(function() {
+ $(document).click(function(){
+ abortStartcount = true;
+ })
$(document).keyup(function (event) {
if (event.keyCode == 38) {
// up
@@ -41,9 +44,29 @@
// Down
$('#startbutton').click();
}
+ abortStartcount = true;
});
});
+ decreaseDown();
});
+ function decreaseDown(){
+ var act = parseInt($('.startcounter').html());
+ if(act == 0){
+ start();
+ return;
+ }
+ var next = act-1;
+ $('.startcounter').html(next);
+ if(next == 0){
+ start();
+ }
+ if(next > 0 && abortStartcount == false){
+ setTimeout('decreaseDown()',1000);
+ }
+ if(abortStartcount == true){
+ $('.startcounter').parent().fadeOut();
+ }
+ }
function start(){
if($('#selectedBootOs').val() != ''){
if($('#selectedBootOs').val() == 'login'){
@@ -79,6 +102,7 @@
<?php endif;?>
<script type="text/javascript">
var activeElement = 0;
+ var abortStartcount = false;
$(document).ready(function(){
$('.selectswitch').click(function(){
$('.selectswitch').removeClass('selected');
@@ -97,6 +121,9 @@
});
$(function() {
+ $(document).click(function(){
+ abortStartcount = true;
+ })
$(document).keyup(function (event) {
if (event.keyCode == 38) {
// up
@@ -112,10 +139,31 @@
// Down
$('#startbutton').click();
}
+ abortStartcount = true;
});
});
-
+ <?php if(count($this->entries) > 0): ?>
+ decreaseDown()
+ <?php endif; ?>
});
+ function decreaseDown(){
+ var act = parseInt($('.startcounter').html());
+ if(act == 0){
+ start();
+ return;
+ }
+ var next = act-1;
+ $('.startcounter').html(next);
+ if(next == 0){
+ start();
+ }
+ if(next > 0 && abortStartcount == false){
+ setTimeout('decreaseDown()',1000);
+ }
+ if(abortStartcount == true){
+ $('.startcounter').parent().fadeOut();
+ }
+ }
function start(){
if($('#selectedBootOs').val() != ''){
if($('#selectedBootOs').val() == 'login'){
@@ -132,6 +180,9 @@
}
</script>
<h1><?php echo $this->title;?></h1>
+ <?php if(count($this->entries) > 0): ?>
+ <div style='padding:5px;float:right;'>Starting in <span class='startcounter'><?php echo $this->startcounter; ?></span> seconds</div>
+ <?php endif; ?>
<div class='bootmenu'>
<?php $first = true;
?>
@@ -149,7 +200,7 @@
<input type="hidden" class="id" value="<?php echo $entry->getID();?>"/>
</div>
<?php endforeach; ?>
- </div>
+ </div>
<input style="display:none;" type='text' id="selectedBootOs" />
<button onClick="start();" id='startbutton' class="fbguistart" style='font-size:16px;font-weight:bold;margin-bottom:5px;'>
Start System
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index 1eeb19b..f901568 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -219,7 +219,7 @@ class user_BootmenuController extends Zend_Controller_Action
$bootmenu->setCreated(time());
$bootmenu->setID($bootmenuID);
$bootmenu->setDefaultbootmenu($bootmenuold->getDefaultbootmenu());
-
+ print_a($bootmenu);
try {
$this->bootmenuMapper->save($bootmenu);
}catch(Zend_Exception $e)
diff --git a/application/modules/user/forms/Bootmenu.php b/application/modules/user/forms/Bootmenu.php
index 77b8f3c..0a827d9 100644
--- a/application/modules/user/forms/Bootmenu.php
+++ b/application/modules/user/forms/Bootmenu.php
@@ -50,6 +50,14 @@ class user_Form_Bootmenu extends Zend_Form
'required' => true,
'label' => 'Title:',
));
+ $this->addElement('text', 'startcounter', array(
+ 'filters' => array('StringTrim'),
+ 'validators' => array(
+ array('Int'),
+ ),
+ 'required' => true,
+ 'label' => 'Startcounter:',
+ ));
if($this->action == "createbootmenu")
$label = "Create Bootmenu";
diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml
index e9a6958..cf23e1d 100644
--- a/application/modules/user/views/scripts/bootmenu/index.phtml
+++ b/application/modules/user/views/scripts/bootmenu/index.phtml
@@ -108,7 +108,8 @@
<?php endif; ?>
</div>
<div class='title'><?php echo $this->escape($bootmenu->getTitle()); ?></div>
- <div class='subtitle'><?php echo count($this->bootmenuentrylist[$bootmenu->getID()]);?> Entrys - <?php echo $this->escape($bootmenu->getCreated()); ?></div>
+ <div class='subtitle'><?php echo count($this->bootmenuentrylist[$bootmenu->getID()]);?> Entrys -
+ Startcounter: <?php echo $this->escape($bootmenu->getStartcounter()); ?> - <?php echo $this->escape($bootmenu->getCreated()); ?></div>
<?php
$class='';
if($this->type != 'own')