merges

10 files changed, 58 insertions, 31 deletions

diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml
index a8c4e1c..70c6a3b 100644
--- a/application/modules/user/views/scripts/bootiso/index.phtml
+++ b/application/modules/user/views/scripts/bootiso/index.phtml
@@ -1,9 +1,12 @@
-<h1>BootMedien</h1>
+<h1>BootMedien<img class='helpericon' src='/media/img/bulb_off.png' /></h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
+
+<div class='helper infobox'>This are the available BootMedia. You can download this BootMedia to your Computer to create a bootable USB stick or a bootable CD.</div>
+
 <?php echo $this->searchform; ?>
 
 <?php if(Pbs_Acl::checkRight('bc')): ?>
-<?php echo $this->formButton('createbootiso', 'Create BootISO', array(
+<?php echo $this->formButton('createbootiso', 'Create BootMedium', array(
 							'onclick' => 'self.location="/user/bootiso/createbootiso/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
 <?php endif;?>
@@ -25,11 +28,11 @@
 						
 <div class='listelement'>
 	<?php if(count($this->bootisolist)==0)
-  		echo "There are no BootISO entries to display." ?>
+  		echo "There are no BootMedium entries to display." ?>
 	<?php foreach ($this->bootisolist as $k => $bootiso): ?>							
 	<div class='element'>
   		<div class='number'>
-			<div class='smallnumber'>BootIso</div>
+			<div class='smallnumber'>BootMed</div>
 			<?php echo $k+1; ?>
 		</div>
   		<div class='content'>  			
@@ -56,7 +59,7 @@
 							'page'		=> $this->page
 						),
 						'default',
-						true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootISO' /></a>
+						true, false) ?>"><img src='/media/img/edit.png' alt='Edit BootMedium' /></a>
 				<?php endif; ?>
 				<?php if(Pbs_Acl::checkRight('bd')): ?>
 		  			<a href="<?php echo $this->url(
@@ -68,7 +71,7 @@
 							'page'		=> $this->page
 						),
 						'default',
-						true) ?>"><img src='/media/img/delete.png' alt='Delete BootISO'/></a>
+						true) ?>"><img src='/media/img/delete.png' alt='Delete BootMedium'/></a>
 				<?php endif; ?>
 	  		</div>  
 	  		<?php if(!Pbs_Acl::checkRight('bai')){
diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml
index bdaf3a5..cf23e1d 100644
--- a/application/modules/user/views/scripts/bootmenu/index.phtml
+++ b/application/modules/user/views/scripts/bootmenu/index.phtml
@@ -1,7 +1,14 @@
-<h1>BootMenu</h1>
+<h1>BootMenu<?php if($this->type == 'own'):?><img class='helpericon' src='/media/img/bulb_off.png' /><?php endif;?></h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
+
+<?php if($this->type == 'own'):?>
+	<div class='helper infobox'>Here you can see your Bootmenu. You can add a BootOs with a default Config or with a default Config. If you are overwhelmed by the possibilities the default Config is the best choice.</div>
+<?php endif;?>
+
 <div id='notification' style='display:none;'></div>
-<?php echo $this->searchform; ?>
+<?php if(Pbs_Acl::checkRight('booai')): ?>
+	<?php echo $this->searchform; ?>
+<?php endif; ?>
 
 <?php $conflabel = $this->type == 'group'?'own':'group';?>
 
@@ -16,15 +23,14 @@
 							'onclick' => 'self.location="/user/bootmenu/index/type/'.$conflabel.'/page/'.$this->page.'"',
 							'class' => 'addbutton'))?>
 <?php endif;?>
-
-<div class='searchvars'>
-	<div class='head'>Available searchfilter:</div>
-	<?php if(Pbs_Acl::checkRight('booai')): ?>
-		<div class='code'>bootmenuID</div>
-	<?php endif; ?>
-	<div class='code'>title</div>
-	<div class='code'>changed</div>	
-</div>
+<?php if(Pbs_Acl::checkRight('booai')): ?>
+	<div class='searchvars'>
+		<div class='head'>Available searchfilter:</div>
+		<div class='code'>bootmenuID</div>	
+		<div class='code'>title</div>
+		<div class='code'>changed</div>	
+	</div>
+<?php endif; ?>
 
 <div class='listelement'>
 	<?php if(count($this->bootmenulist)==0)
@@ -102,8 +108,14 @@
 				<?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='details dispnone'>
+	  		<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')
+	  				$class=' dispnone';
+	  		?>	
+	  		<div class='details<?php echo $class;?>'>
 	  			<?php if(Pbs_Acl::checkRight('booai')): ?>
   					<label>BootmenuID</label>
 			  			<div class='item'><?php echo $this->escape($bootmenu->getID()); ?></div>
diff --git a/application/modules/user/views/scripts/bootos/index.phtml b/application/modules/user/views/scripts/bootos/index.phtml
index 94e35c0..c0f201e 100644
--- a/application/modules/user/views/scripts/bootos/index.phtml
+++ b/application/modules/user/views/scripts/bootos/index.phtml
@@ -1,5 +1,8 @@
-<h1>BootOS</h1>
+<h1>BootOS<img class='helpericon' src='/media/img/bulb_off.png' /></h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
+
+<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')): ?>
@@ -27,8 +30,7 @@
 		<div class='code'>share</div>
 		<div class='code'>shortname</div>
 		<div class='code'>source</div>
-	<?php endif; ?>
-	
+	<?php endif; ?>	
 	<div class='code'>title</div>
 	<div class='code'>groupID</div>
 	<div class='code'>description</div>
diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml
index b519140..6f7a806 100644
--- a/application/modules/user/views/scripts/client/index.phtml
+++ b/application/modules/user/views/scripts/client/index.phtml
@@ -11,6 +11,7 @@
 	<div class='code'>clientID</div>
 	<div class='code'>macadress</div>
 	<div class='code'>hardwarehash</div>
+	<div class='code'>created</div>
 </div>
 
 <div class='listelement'>
@@ -55,6 +56,8 @@
 	  				<div class='item'><?php echo $this->escape($client['macadress']) ?></div>
 	  			<label>Hardwarehash</label>
 	  				<div class='item'><?php echo $this->escape($client['hardwarehash']) ?></div>
+	  			<label>Created</label>
+	  				<div class='item'><?php echo $this->escape($client['created']) ?></div>
 	  		</div>
   		</div>
   		<div class='clear'></div>
diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml
index 8361ffd..bfcce9f 100644
--- a/application/modules/user/views/scripts/config/index.phtml
+++ b/application/modules/user/views/scripts/config/index.phtml
@@ -1,5 +1,10 @@
-<h1>Config</h1>
+<h1>Config<?php if(Pbs_Acl::checkRight('csui')): ?><img class='helpericon' src='/media/img/bulb_off.png' /><?php endif; ?></h1>
 <?php if($this->notification != ''){echo $this->notification;} ?>
+
+<?php if(Pbs_Acl::checkRight('csui')): ?>
+<div class='helper infobox'>Here you the the available Configs which you can select to your BootOS. The Config does some modification to the selected BootOs after the start. In Most Cases you don't have to change here anything.</div>
+<?php endif; ?>
+
 <?php echo $this->searchform; ?>
 
 <?php $conflabel = $this->type == 'own'?'group':'own';?>
diff --git a/application/modules/user/views/scripts/person/edit.phtml b/application/modules/user/views/scripts/person/edit.phtml
index 3e666d4..76316db 100644
--- a/application/modules/user/views/scripts/person/edit.phtml
+++ b/application/modules/user/views/scripts/person/edit.phtml
@@ -2,4 +2,4 @@
 <?php
 $this->editForm->setAction($this->url());
 echo $this->editForm;
-?>
\ No newline at end of file
+?>
diff --git a/application/modules/user/views/scripts/person/owndetails.phtml b/application/modules/user/views/scripts/person/owndetails.phtml
index 3f1cfb4..60364c0 100644
--- a/application/modules/user/views/scripts/person/owndetails.phtml
+++ b/application/modules/user/views/scripts/person/owndetails.phtml
@@ -74,7 +74,7 @@ if(count($this->groups)==0)
 				<label>Role</label>
 					<div class='item'><?php echo $group['role']; ?>&nbsp;</div>
 			</div>
-			<?php if($this->apikeys[$group['groupID']] != null):?>
+			<?php if(isset($this->apikeys[$group['groupID']]) && $this->apikeys[$group['groupID']] != null):?>
 				<div class='details'>
 					<label>API-Key</label>
 	  					<div class='item'><?php echo $this->apikeys[$group['groupID']]; ?>&nbsp;</div>
diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml
index 56ae8d5..f78df6a 100644
--- a/application/modules/user/views/scripts/pool/index.phtml
+++ b/application/modules/user/views/scripts/pool/index.phtml
@@ -144,7 +144,7 @@
 	  		<div class='content'>  			
 		  		<div class='actions'>
 		  			<?php if(Pbs_Acl::checkRight('polc')):?>
-		  			<select onChange="location.href=this.options[this.selectedIndex].value">
+		  			Pool:<select onChange="location.href=this.options[this.selectedIndex].value">
 						<option></option>
 						<?php foreach ($this->pools as $pool): ?>
 							<option value="<?php echo $this->url(
@@ -165,9 +165,11 @@
 		  		</div>
 		  		<div class='details'>
 		  			<label>MacAdress</label>
-		  				<div class='item'><?php echo $client['macadress']; ?></div>
+		  				<div class='item'><?php echo $this->escape($client['macadress']); ?></div>
 		  			<label>HardwareHash</label>
-		  				<div class='item'><?php echo $client['hardwarehash']; ?></div>
+		  				<div class='item'><?php echo $this->escape($client['hardwarehash']); ?></div>
+	  			<label>Created</label>
+	  				<div class='item'><?php echo $this->escape($client['created']) ?></div>
 		  		</div>
 	  		</div>
 	  		<div class='clear'></div>
diff --git a/application/modules/user/views/scripts/role/index.phtml b/application/modules/user/views/scripts/role/index.phtml
index 580238f..6dc0707 100644
--- a/application/modules/user/views/scripts/role/index.phtml
+++ b/application/modules/user/views/scripts/role/index.phtml
@@ -68,8 +68,8 @@
 
 			<?php } ?>
 		</div>
-		<div class='title'><?php echo "[".$i."] ";?><?php echo $role->getTitle();?></div>	
-		<div class='subtitle'><?php echo $role->getDescription(); ?>&nbsp;</div></div>
+		<div class='title'><?php echo $role->getTitle();?></div>	
+		<div class='subtitle'><?php echo $i." - ";?><?php echo $role->getDescription(); ?>&nbsp;</div></div>
 		<div class='clear'></div>
 	</div>
 	<?php endforeach ?>
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index 0e440f2..d6fb6cb 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -58,7 +58,7 @@ if(count($this->rightsList)==0) {
 	<?php
 	if(isset($this->rightcategorieslist)) {
 		foreach($this->rightcategorieslist as $k => $v):
-		$rights = $this->rightsList[$k];
+		@$rights = $this->rightsList[$k];
 		if(count($rights) > 0) {
 			?>
 <h3><?php echo $v; ?>:</h3>