From a4a3640f4ee97eb8b397914fff0cafaa8c9f2ef6 Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Fri, 22 Apr 2011 11:33:07 +0200
Subject: controller fixes

---
 .../modules/user/views/scripts/bootiso/index.phtml |  8 +++----
 .../modules/user/views/scripts/bootos/index.phtml  | 26 ----------------------
 .../modules/user/views/scripts/preboot/index.phtml |  1 +
 3 files changed, 5 insertions(+), 30 deletions(-)

(limited to 'application/modules/user/views/scripts')

diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml
index 70c6a3b..cd94f9a 100644
--- a/application/modules/user/views/scripts/bootiso/index.phtml
+++ b/application/modules/user/views/scripts/bootiso/index.phtml
@@ -19,6 +19,7 @@
 	<?php endif; ?>
 	<div class='code'>prebootID</div>	
 	<div class='code'>title</div>
+	<div class='code'>description</div>
 	<div class='code'>groupID</div>
 	<div class='code'>created</div>
 	<div class='code'>expires</div>
@@ -79,15 +80,14 @@
   				$bootiso->setGroupID(preg_replace("!^\[[0-9]+\]\s!",'',$bootiso->getGroupID()));
   			} ?>
 	  		<div class='title'><?php echo $this->escape($bootiso->getTitle()); ?></div>
-	  		<div class='subtitle'><?php echo $this->escape($bootiso->getGroupID()); ?> 
-	  		<?php if(Pbs_Acl::checkRight('bai')): ?>
-	  			- Serialnumber: <?php echo $this->escape($bootiso->getSerialnumber()); ?>
-	  		<?php endif; ?>
+	  		<div class='subtitle'><?php echo $this->escape($bootiso->getGroupID())." - ".$this->escape($bootiso->getDescription()); ?> 
 	  		</div>
 	  		<div class='details dispnone'>
 	  			<?php if(Pbs_Acl::checkRight('bai')): ?>
 		  			<label>BootmediumID</label>
 		  				<div class='item'><?php echo $this->escape($bootiso->getID()); ?></div>
+		  			<label>Serialnumber</label>
+		  				<div class='item'><?php echo $this->escape($bootiso->getSerialnumber()); ?></div>		  			
 	  			<?php endif; ?>
 	  			<label>PrebootID</label>
 		  			<div class='item'><?php echo $this->escape($bootiso->getPrebootID()); ?></div>
diff --git a/application/modules/user/views/scripts/bootos/index.phtml b/application/modules/user/views/scripts/bootos/index.phtml
index c39ac05..f01cccd 100644
--- a/application/modules/user/views/scripts/bootos/index.phtml
+++ b/application/modules/user/views/scripts/bootos/index.phtml
@@ -4,13 +4,6 @@
 <div class='helper infobox'>Here you can see all available BootOs you can select to start. Before you can boot one of these you have to add it to your BootMenu.</div>
 
 <?php echo $this->searchform; ?>
-
-<?php if(Pbs_Acl::checkRight('bou')): ?>
-<?php echo $this->formButton('checkupdate', 'Check for Updates', array(
-							'onclick' => 'self.location="/user/bootos/index/page/'.$this->page.'/checkupdate/true"',
-							'class' => 'updatebutton',
-							))?>
-<?php endif;?>
 <?php if(Pbs_Acl::checkRight('boc')): ?>			
 <?php echo $this->formButton('createbootos', 'Create BootOS', array(
 							'onclick' => 'self.location="/user/bootos/createbootos/page/'.$this->page.'"',
@@ -21,10 +14,7 @@
 	<?php if(Pbs_Acl::checkRight('boai')): ?>
 		<div class='code'>bootosID</div>
 		<div class='code'>public</div>
-		<div class='code'>path_kernel</div>
 		<div class='code'>defaultkcl</div>
-		<div class='code'>path_init</div>
-		<div class='code'>path_config</div>
 		<div class='code'>distro</div>
 		<div class='code'>distroversion</div>
 		<div class='code'>share</div>
@@ -50,22 +40,6 @@
   		</div>
   		<div class='content'>  			
 	  		<div class='actions'>
-	  			<?php if(Pbs_Acl::checkRight('bou')): ?>
-		  			<?php if($this->update[$bootos->getID()]==true): ?>
-						<a href="<?php echo $this->url(
-							array(
-								'module'	=> 'user',
-								'controller' => 'bootos',
-								'action'     => 'updatebootos',
-								'bootosID'   =>  $bootos->getID(),
-								'page'		=> $this->page
-							),
-							'default',
-							true, false) ?>"><img src='/media/img/update.png' alt='Updates available' /></a>
-					<?php else: ?>
-						<a><img src='/media/img/update_grey.png' alt='No updates available' /></a>	
-					<?php endif; ?>		
-				<?php endif; ?>
 				<?php if(Pbs_Acl::checkRight('boe') || Pbs_Acl::checkRight('boem')): ?>
 			  		<a href="<?php echo $this->url(
 						array(
diff --git a/application/modules/user/views/scripts/preboot/index.phtml b/application/modules/user/views/scripts/preboot/index.phtml
index 415db2e..c6fdb79 100644
--- a/application/modules/user/views/scripts/preboot/index.phtml
+++ b/application/modules/user/views/scripts/preboot/index.phtml
@@ -11,6 +11,7 @@
 	<div class='head'>Available searchfilter:</div>
 	<div class='code'>prebootID</div>
 	<div class='code'>title</div>
+	<div class='code'>description</div>
 	<div class='code'>created</div>
 	<div class='code'>source</div>
 </div>
-- 
cgit v1.2.3-55-g7522