From b3f501a6cabab2582d969741fe7eb09e257e7474 Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Mon, 31 Oct 2011 01:02:47 +0100
Subject: login

---
 application/modules/ipxe/controllers/AuthController.php           | 2 --
 application/modules/ipxe/views/scripts/resource/getvesamenu.phtml | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'application/modules')

diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index 0eee127..c54e881 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -85,8 +85,6 @@ class Ipxe_AuthController extends Zend_Controller_Action
 			$result .= "set filename http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$this->session->getAlphasessionID()."/error/".$this->error."\n";
 			$result .= ":start\n";
 			$result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 \${filename}\n";	
-			$result .= "show filename\n";
-			$result .= "prompt\n";	
 			$result .= "goto start\n";
 		}else{ 
 			$result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/serialnumber/$serialnumber/mac/$mac/error/$this->error\n";
diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index b4b7009..ec07a86 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -99,7 +99,7 @@ menu color unsel         37;40           #ff4f75aa #00000000 all
 menu color hotkey        1 		         #ffff8b00 #00000000 std
 menu color sel           7;37;40         #ff1c2a33 #667799bb all
 #menu color hotsel       1;7;37;40       #ffff8b00 #667799bb all
-menu color disabled     1;37;40          #ffffffff #ffcacac8 std
+menu color disabled     1;37;40          #ff000000 #ffffffff std
 #menu color scrollbar    37;40           #40000000 #ee000000 std
 #menu color tabmsg       37;40           #ffff8b00 #ff8093a1 std
 #menu color cmdmark      1;37;40         #ffff8b00 #ff8093a1 std
@@ -111,11 +111,11 @@ menu color disabled     1;37;40          #ffffffff #ffcacac8 std
 #menu color timeout      1;37;40         #ffff8b00 #ff8093a1 std
 #menu color help         37;40           #ff1c2a33 #00000000 none
 MENU MSGCOLOR                            #ff1c2a33 #00000000 none
-MENU SEPARATOR                           #ffffffff #ffffffff none
 
 <?php
 
   if(isset($this->error)){
+  	  title ( "An Error occured:" );
 	  switch($this->error){
 	  	case "serial": 
 	  		serialerror($this->serialnumber, $this->mac);
@@ -162,7 +162,7 @@ MENU SEPARATOR                           #ffffffff #ffffffff none
 	  		nobootmenu();
 	  	}
 	
-	  	separator();
+	  	comment ("", "");
 	  	comment ("info", "More Options:");
 	  	
 	  	if(!$this->loggedin){
-- 
cgit v1.2.3-55-g7522