openrat-cms

commit 489e17e3e3afdc6aa2464982e39f47fceae87bcb
parent 573c6cd79f822aa246c4ec4c296b1e3fa3db5bcf
Author: Jan Dankert <devnull@localhost>
Date:   Fri, 21 Sep 2012 01:20:36 +0200

Hilfe-Funktion ist nun funktionsfähig.

Diffstat:
themes/default/js/openrat.js
 | 
10
++++++++++
themes/default/layout/perspective/header.php
 | 
6
+++---

2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/themes/default/js/openrat.js b/themes/default/js/openrat.js
@@ -1085,3 +1085,12 @@ function resizeTabs( el, closable )
 	var width = Math.floor(Math.min(((windowsize-24)/count)-(closable?24:0)-24-8-1,100));
 	$(el).find('li.action div.tabname').css('width',width+'px');
 }
+
+
+function help(el,url,suffix)
+{
+	var method = $(el).closest('div.frame').find('li.action.active').attr('data-method');
+	var action = $(el).closest('div.frame').attr('data-action');
+	
+	window.open(url + action + '/'+ method + suffix, 'OpenRat_Help', 'location=no,menubar=no,scrollbars=yes,toolbar=no,resizable=yes');
+}+
\ No newline at end of file
diff --git a/themes/default/layout/perspective/header.php b/themes/default/layout/perspective/header.php
@@ -33,12 +33,12 @@ function view_header( $name )
 			$icon_url = OR_THEMES_EXT_DIR.'default/images/icon/'.$vn.'.png';
 			
 			?><li title="<?php echo $tmp_text ?>" data-method="<?php echo $vn ?>" class="<?php echo $liClass?>" title="<?php echo langHtml('menu_'.$vn.'_desc'); ?>"><?php
-          		?><img class="icon" src="<?php echo $icon_url ?>" /><span class="tabname"><?php echo $tmp_text ?></span><?php
+          		?><img class="icon" src="<?php echo $icon_url ?>" /><div class="tabname"><?php echo $tmp_text ?></div><?php
           	?></li><?php
           }
           if ( /* Deaktiviert */ false && @$conf['help']['enabled'] )
           	{
-             ?><a class="help" href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo $image_dir.'icon/help.png' ?>" /><?php echo @$conf['help']['only_question_mark']?'?':langHtml('MENU_HELP') ?></a><?php
+             ?><a class="help" href="javascript:help(this,'<?php echo $conf['help']['url'] ?>','<?php echo @$conf['help']['suffix'] ?> " title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo $image_dir.'icon/help.png' ?>" /><?php echo @$conf['help']['only_question_mark']?'?':langHtml('MENU_HELP') ?></a><?php
           	}
           	?><?php
 	
@@ -56,7 +56,7 @@ function view_header( $name )
 <?php 
           if ( @$conf['help']['enabled'] )
           	{
-             ?><div class="entry"><a href="<?php echo @$conf['help']['url'].@$conf['help']['suffix'] ?> " target="_new" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/help.png' ?>" /><?php echo langHtml('MENU_HELP') ?></a></div><?php
+             ?><div class="entry"><a onclick="help(this,'<?php echo $conf['help']['url'] ?>','<?php echo @$conf['help']['suffix'] ?>');" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/help.png' ?>" /><?php echo langHtml('MENU_HELP') ?></a></div><?php
           	}
           	?>
 </div>