Ticket #229 - Hilfetexte wurde bei den Bereichen, zu denen Benutzer zugriff haben hinzugefügt

9 files changed, 54 insertions, 30 deletions

diff --git a/AUTHORS b/AUTHORS
index a400332..5039725 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,34 +2,24 @@ AUTHORS
 
 Author: Simon Franz <simonfranz85 at googlemail.com>
 
-    Database Layout
-    
-    Filter, Client, Pool Controllers
-    
-    Layout of user interface
-    
-    Javascript stuff
-    
-    Additional Librarys
+	Database Layout    
+	Filter, Client, Pool Controllers    
+	Layout of user interface    
+	Javascript stuff    
+	Additional Librarys
 
 Author: Björn Geiger <bjoern.geiger at googlemail.com>
 
-	Authentication
-	
-	Group, Person and Role Controller
-	
+	Authentication	
+	Group, Person and Role Controller	
 	Database Layout
 
 Author: Michael Pereira-Neves <pereira at informatik.uni-freiburg.de>
 
-    Database Layout
-    
-    Bootmenu, Bootos, Bootiso, Config, Preboot Controllers
-    
-    Managing different resources in Resource via Controller
-    
-    API-Implementation
-    
-    Additional Librarys
+	Database Layout    
+	Bootmenu, Bootos, Bootiso, Config, Preboot Controllers    
+	Managing different resources in Resource via Controller    
+	API-Implementation    
+	Additional Librarys
     
 
diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml
index 672dad3..70c6a3b 100644
--- a/application/modules/user/views/scripts/bootiso/index.phtml
+++ b/application/modules/user/views/scripts/bootiso/index.phtml
@@ -1,5 +1,8 @@
-<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')): ?>
diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml
index 42498c9..e9a6958 100644
--- a/application/modules/user/views/scripts/bootmenu/index.phtml
+++ b/application/modules/user/views/scripts/bootmenu/index.phtml
@@ -1,5 +1,10 @@
-<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 if(Pbs_Acl::checkRight('booai')): ?>
 	<?php echo $this->searchform; ?>
@@ -104,7 +109,12 @@
 	  		</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'>
+	  		<?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/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/public/media/css/style.css b/public/media/css/style.css
index 80b504c..0c076ab 100644
--- a/public/media/css/style.css
+++ b/public/media/css/style.css
@@ -508,4 +508,11 @@ table.json td {
 	background-color: yellow; 
 }
 
+.helpericon {
+	vertical-align:text-top;
+}
+
+.helper {
+	display: none;
+}
 
diff --git a/public/media/img/bulb_off.png b/public/media/img/bulb_off.png
new file mode 100644
index 0000000..fdfed3b
--- /dev/null
+++ b/public/media/img/bulb_off.png
diff --git a/public/media/img/bulb_on.png b/public/media/img/bulb_on.png
new file mode 100644
index 0000000..283c938
--- /dev/null
+++ b/public/media/img/bulb_on.png
diff --git a/public/media/js/user.js b/public/media/js/user.js
index 26f4e80..50cfb80 100644
--- a/public/media/js/user.js
+++ b/public/media/js/user.js
@@ -1,6 +1,5 @@
 $(document).ready(function(){
 	if($('.listelement .element').find('.dispnone').length >= 1){
-		console.log($(this));
 		$('.listelement .element').find('.dispnone').parent().find('.title')
 				.css('cursor','pointer')
 				.prepend("<span class='toggler'><img src='/media/img/right.png'></span> ")
@@ -18,6 +17,14 @@ $(document).ready(function(){
 			}
 		});
 	}
+	$('.helpericon').click(function(){
+		$('.infobox').slideToggle('fast');
+		if($(this).data('info') == '1'){
+			$(this).data('info','0').attr('src','/media/img/bulb_off.png');
+		} else{
+			$(this).data('info','1').attr('src','/media/img/bulb_on.png');
+		}
+	});
 });
 
 function checkAllCheckBoxes(exceptions) {