From 16274cfd27846d799767af69eb170accbeb487d3 Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 22 Mar 2011 13:24:39 +0100
Subject: FBGui Layout geändert

---
 application/modules/fbgui/layouts/fbgui.phtml             | 10 +++++-----
 application/modules/fbgui/views/scripts/index/index.phtml |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'application/modules')

diff --git a/application/modules/fbgui/layouts/fbgui.phtml b/application/modules/fbgui/layouts/fbgui.phtml
index 335e3c5..d04664a 100644
--- a/application/modules/fbgui/layouts/fbgui.phtml
+++ b/application/modules/fbgui/layouts/fbgui.phtml
@@ -23,22 +23,22 @@ echo $this->headScript()."\n";
 <div id='sidepannel'>
 	<div id="logo"><div id="logo-bar-gray"></div></div> 
 	<div id="sidepannel-top"> 
-		<h1><a href=/><</a> <a href=/fbgui/>fbgui</a></h1>
-		<ul>
-			<li>Controller:
+		<!-- <h1><a href=/><</a> <a href=/fbgui/>fbgui</a></h1> -->
+	<!--	<ul>
+			<li>
 			<ul>
 			
 			</ul>
 			</li>
 			
 		</ul>
-</ul> 
+</ul> -->
 	</div>  
 </div>
 <div id='main'>
 	<div id="head-bg"> 
 		<div id="head">
-			<h1>pbs<sup>2</sup></h1> 
+			<h1>OpenSLX Preboot Portal</h1> 
 			<h2>Rechenzentrum Universit&auml;t Freiburg</h2> 
 		</div> 
 	</div> 
diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml
index 9f243e5..8077a56 100644
--- a/application/modules/fbgui/views/scripts/index/index.phtml
+++ b/application/modules/fbgui/views/scripts/index/index.phtml
@@ -3,8 +3,7 @@
 	$(document).ready(function(){	
 		$('.menu').click(function(){
 			$('.menu').removeClass('selected');
-			$(this).addClass('selected');
-			console.log($(this).find('.id').val());
+			$(this).addClass('selected');			
 			$("#selectedBootOs").val($(this).find('.id').val());
 		});
 	});
-- 
cgit v1.2.3-55-g7522


From 1d75ea9083b9ed690517bd4b21d803466d590afa Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 22 Mar 2011 13:56:02 +0100
Subject: back button für fbgui

---
 application/modules/fbgui/views/scripts/index/index.phtml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'application/modules')

diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml
index 8077a56..9a04ab3 100644
--- a/application/modules/fbgui/views/scripts/index/index.phtml
+++ b/application/modules/fbgui/views/scripts/index/index.phtml
@@ -39,4 +39,5 @@
 		<img style='vertical-align:-8px;' src='/media/img/startOs.png'>
 		<span style='font-size:18px;'>Start System</span>
 	</div>
+	<a href='/fbgui'>back</a>
 <?php endif;?>
-- 
cgit v1.2.3-55-g7522


From 6dadcae3351798e5a4aabee11cd7dd2520e77036 Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 22 Mar 2011 13:57:27 +0100
Subject: fix

---
 application/modules/fbgui/views/scripts/index/index.phtml | 3 +--
 application/modules/fbgui/views/scripts/index/start.phtml | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'application/modules')

diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml
index 9a04ab3..60ec5a8 100644
--- a/application/modules/fbgui/views/scripts/index/index.phtml
+++ b/application/modules/fbgui/views/scripts/index/index.phtml
@@ -38,6 +38,5 @@
 	<div class="right" style='cursor:pointer;' onClick="start();">
 		<img style='vertical-align:-8px;' src='/media/img/startOs.png'>
 		<span style='font-size:18px;'>Start System</span>
-	</div>
-	<a href='/fbgui'>back</a>
+	</div>	
 <?php endif;?>
diff --git a/application/modules/fbgui/views/scripts/index/start.phtml b/application/modules/fbgui/views/scripts/index/start.phtml
index a8f91fe..c341e02 100644
--- a/application/modules/fbgui/views/scripts/index/start.phtml
+++ b/application/modules/fbgui/views/scripts/index/start.phtml
@@ -98,3 +98,4 @@
   <div class="bar7"></div> 
   <div class="bar8"></div> 
 </div>
+<a href='/fbgui'>back</a>
-- 
cgit v1.2.3-55-g7522


From f118415009099568a20ce3177ef44dd427357c81 Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 22 Mar 2011 14:00:25 +0100
Subject: quickfix für back-button

---
 application/modules/fbgui/controllers/IndexController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/modules')

diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index ef04b9d..a9bf16b 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -14,7 +14,7 @@ class Fbgui_IndexController extends Zend_Controller_Action
 
     	if(isset($_SESSION['postdata'])){
     		$_POST = ($_SESSION['postdata']);
-			unset($_SESSION['postdata']);
+			#unset($_SESSION['postdata']);
     	}    	  	    	
     	
         if(isset($_POST['bootisoID']) || isset($_POST['serialnumber'])){
-- 
cgit v1.2.3-55-g7522