From fdfd52073ab48324e0c734faef7b862e7f7172f4 Mon Sep 17 00:00:00 2001
From: Simon
Date: Fri, 15 Apr 2011 14:02:19 +0200
Subject: Ticket #210 - FBgui mit Tastatur bedienbar, inklusive Login

---
 .../modules/fbgui/controllers/IndexController.php  | 22 ++++++-----
 .../modules/fbgui/views/scripts/auth/login.phtml   |  7 +++-
 .../modules/fbgui/views/scripts/index/index.phtml  | 43 +++++++++++++++-------
 .../modules/fbgui/views/scripts/index/start.phtml  |  1 -
 .../views/scripts/person/selectmembership.phtml    |  7 +++-
 5 files changed, 53 insertions(+), 27 deletions(-)

(limited to 'application')

diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index aba88db..119c810 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -25,11 +25,9 @@ class Fbgui_IndexController extends Zend_Controller_Action
     {     
 		$mySession = new Zend_Session_Namespace('pbs');
 		
-		if(!isset($mySession->postdata))
+		if(count($mySession->postdata)<=0)
 			$mySession->postdata = $_POST;
 		
-		print_a($mySession->postdata);
-		
 		$d = new Pbs_Debug();
 		$d->debug(array('FBGuiIndexController',$_SERVER['REMOTE_ADDR'],implode("\t",$mySession->postdata)));
 			
@@ -104,14 +102,18 @@ class Fbgui_IndexController extends Zend_Controller_Action
 				$bootmenuentriesMapper = new Application_Model_BootMenuEntriesMapper();
 				$res = $bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID),false);
 				$this->view->entries = $res;
-				if (!Zend_Auth::getInstance()->hasIdentity()) {
-					#echo "<a href='/fbgui/auth/login/'>Goto Login to get your Bootmenu</a>";
-					$pbsNotifier = new Pbs_Notifier();
-					$this->view->notification = $pbsNotifier->notify("This is not your Bootmenu. You have to login to get your own Bootmenu.<br />Click here to <a href='/fbgui/auth/login/'>login</a>",'info');
+				#print_a(Zend_Auth::getInstance()->hasIdentity(),$bm->MembershipID ,$this->membership->getID());
+				if (!Zend_Auth::getInstance()->hasIdentity()) {					
+					#$pbsNotifier = new Pbs_Notifier();
+					#$this->view->notification = $pbsNotifier->notify("This is not your Bootmenu. You have to login to get your own Bootmenu.<br />Click here to <a href='/fbgui/auth/login/'>login</a>",'info');
+					$this->view->loginmenu = true;
 				}
-				if(Zend_Auth::getInstance()->hasIdentity() && $bm->MembershipID != $this->membership->getID() ){					
+				if(Zend_Auth::getInstance()->hasIdentity()){		
+					if($bm->MembershipID != '' && $bm->MembershipID == $this->membership->getID()){}
+					else{
 					$pbsNotifier = new Pbs_Notifier();
-					$this->view->notification = $pbsNotifier->notify("This is not your Bootmenu. There is currently a BootMenu with a higher priority active.",'info');					
+					$this->view->notification = $pbsNotifier->notify("This is not your Bootmenu. There is currently a BootMenu with a higher priority active.",'info');
+					}
 				}
 			}
 			else{
@@ -129,7 +131,7 @@ class Fbgui_IndexController extends Zend_Controller_Action
 			}
 		}
 		else{
-    		$this->_redirect('/fbgui/index/error/serialresult/noserial');
+    		#$this->_redirect('/fbgui/index/error/serialresult/noserial');
     	}    	
     	
     }
diff --git a/application/modules/fbgui/views/scripts/auth/login.phtml b/application/modules/fbgui/views/scripts/auth/login.phtml
index 7bd6183..09724d4 100644
--- a/application/modules/fbgui/views/scripts/auth/login.phtml
+++ b/application/modules/fbgui/views/scripts/auth/login.phtml
@@ -3,4 +3,9 @@
 $this->loginForm->setAction($this->url());
 echo $this->loginForm;
 ?>
-<a href='#' onclick='toggleKeyboard();return false;'>show/hide on-screen keyboard</a>
+<button class='keyboardbutton' onclick='toggleKeyboard();return false;'>Show/Hide on-screen keyboard</button>
+<script>
+$(document).ready(function(){
+	$("#email").focus();
+});
+</script>
diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml
index d5fc8f6..45448dd 100644
--- a/application/modules/fbgui/views/scripts/index/index.phtml
+++ b/application/modules/fbgui/views/scripts/index/index.phtml
@@ -1,18 +1,25 @@
 <?php if($this->notification != ''){echo $this->notification;} ?>
+<?php if($this->loginmenu):?>
+<div class="fbguilogin selectswitch" style=''> 
+	<div style='font-size:16px;font-weight:bold;margin-bottom:5px;'>Login</div>
+	<i>This is not your Bootmenu. Select this to get your own Bootmenu.</i> 
+	<input type="hidden" class="id" value="login"/> 
+</div>
+<?php endif; ?>
 <?php if(isset($this->entries)):?>
 	<script type="text/javascript">
 	var activeElement = 0;
 	$(document).ready(function(){	
-		$('.menu').click(function(){
-			$('.menu').removeClass('selected');
+		$('.selectswitch').click(function(){
+			$('.selectswitch').removeClass('selected');
 			$(this).addClass('selected');			
 			$("#selectedBootOs").val($(this).find('.id').val());
 			$("#startball").attr('src','/media/img/button-green.png');
 		});
-		$('.menu').eq(activeElement).click();
+		$('.bootmenu .selectswitch').eq(activeElement).click();
 		$('#startbutton').focus();
-		$('.menu').dblclick(function(){
-			$('.menu').removeClass('selected');
+		$('.selectswitch').dblclick(function(){
+			$('.selectswitch').removeClass('selected');
 			$(this).addClass('selected');			
 			$("#selectedBootOs").val($(this).find('.id').val());
 			$("#startball").attr('src','/media/img/button-green.png');
@@ -25,12 +32,12 @@
 					// up
 					if(activeElement >=1)
 						activeElement = activeElement-1;
-					$('.menu').eq(activeElement).click();
+					$('.selectswitch').eq(activeElement).click();
 				} else if (event.keyCode == 40) {
 					// Down
-					if(activeElement < $('.menu').length-1 )					
+					if(activeElement < $('.selectswitch').length-1 )					
 						activeElement = activeElement+1;					
-					$('.menu').eq(activeElement).click();
+					$('.selectswitch').eq(activeElement).click();
 				}
 			});
 		});
@@ -38,7 +45,11 @@
 	});
 	function start(){		
 		if($('#selectedBootOs').val() != ''){
-			window.location='/fbgui/index/start/bme/'+$('#selectedBootOs').val()+'/a/<?php echo $this->alphasessionID;?>';
+			if($('#selectedBootOs').val() == 'login'){
+				window.location='/fbgui/auth/login/a/<?php echo $this->alphasessionID;?>'
+			} else{
+				window.location='/fbgui/index/start/bme/'+$('#selectedBootOs').val()+'/a/<?php echo $this->alphasessionID;?>';
+			}
 		}
 		else{
 			alert('You have to select a BootOs');
@@ -46,15 +57,16 @@
 	}
 	</script>
 	<h1><?php echo $this->title;?></h1>
-	<?php $first = true; ?>
-	<?php foreach($this->entries as $entry):?>
+	<div class='bootmenu'>
+	<?php $first = true; 	
+	?>
+	<?php foreach($this->entries as $k=>$entry):?>
 		<?php
 			$bootosMapper = new Application_Model_BootOsMapper();
 			$bootos = new Application_Model_BootOs();
-			$bootos = $bootosMapper->find($entry->getBootosID());
-			
+			$bootos = $bootosMapper->find($entry->getBootosID());			
 		?>
-		<div id="menu_item_1" class="menu"  class="flexbox"> 
+		<div id="menu_item_<?php echo $k;?>" class="menu selectswitch"  class="flexbox"> 
 			<img src="/media/img/os/ubuntu.png" /> 
 			<h2><?php echo $entry->getTitle(); ?></h2>
 			<i>BootOs-Name: <?php echo $bootos->getTitle();?></i> 
@@ -62,8 +74,11 @@
 			<input type="hidden" class="id" value="<?php echo $entry->getID();?>"/> 
 		</div> 
 	<?php endforeach; ?>
+	</div>
 	<input style="display:none;" type='text' id="selectedBootOs" />
 	<button style='cursor:pointer;float:right;margin-top:10px;' id='startbutton' onClick="start();"><img id='startball' src='/media/img/button-red.png'> <span style='font-size:14px;'>Start System</span></button>
 	<div class='clear'></div>
 	<?php if($this->notificationbot != ''){echo $this->notificationbot;} ?>
+	
+	
 <?php endif;?>
diff --git a/application/modules/fbgui/views/scripts/index/start.phtml b/application/modules/fbgui/views/scripts/index/start.phtml
index 6737fc5..e946530 100644
--- a/application/modules/fbgui/views/scripts/index/start.phtml
+++ b/application/modules/fbgui/views/scripts/index/start.phtml
@@ -109,7 +109,6 @@ function updateProgress(p, s, u){
   <div class="bar7"></div> 
   <div class="bar8"></div> 
 </div>
-<a href='/fbgui'>back</a>
 
 <div id="progressbar" style="height: 15px;"></div>
 <h1>Downloading</h1>
diff --git a/application/modules/fbgui/views/scripts/person/selectmembership.phtml b/application/modules/fbgui/views/scripts/person/selectmembership.phtml
index 5f7e5bf..e226b82 100644
--- a/application/modules/fbgui/views/scripts/person/selectmembership.phtml
+++ b/application/modules/fbgui/views/scripts/person/selectmembership.phtml
@@ -2,4 +2,9 @@
 <?php
 $this->membershipSelectForm->setAction($this->url());
 echo $this->membershipSelectForm;
-?>
\ No newline at end of file
+?>
+<script>
+$(document).ready(function(){
+	$("#membershipID").focus();
+});
+</script>
-- 
cgit v1.2.3-55-g7522