From b42c3e4c1b91cd2c2e15465a4e70666fbcac7b8c Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Fri, 29 Oct 2010 08:44:34 +0000
Subject: - Disable help plugin in ajax and framed mode - Add warning when
 clicking help task while message composition (#1487094)

git-svn-id: https://svn.roundcube.net/trunk@4155 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 plugins/help/skins/default/templates/help.html | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'plugins/help/skins')

diff --git a/plugins/help/skins/default/templates/help.html b/plugins/help/skins/default/templates/help.html
index 42f1a4a93..98beb6655 100644
--- a/plugins/help/skins/default/templates/help.html
+++ b/plugins/help/skins/default/templates/help.html
@@ -8,10 +8,9 @@
 <script type="text/javascript">
 function help_init_settings_tabs()
 {
-    var tab = '#helptabdefault';
-    if (window.rcmail && rcmail.env.action) {
-	var action = rcmail.env.action.replace(/^plugin\.help/, '');
-	tab = '#helptab' + (action ? action : 'default');
+    var action, tab = '#helptabdefault';
+    if (window.rcmail && (action = rcmail.env.action)) {
+	    tab = '#helptab' + (action ? action : 'default');
     }
     $(tab).addClass('tablink-selected');
 }	       
@@ -23,9 +22,9 @@ function help_init_settings_tabs()
 <roundcube:include file="/includes/header.html" />
 
 <div id="tabsbar">
-<span id="helptabdefault" class="tablink"><roundcube:button name="helpdefault" href="?_task=dummy&_action=plugin.help" type="link" label="help.help" title="help.help" /></span>
-<span id="helptababout" class="tablink"><roundcube:button name="helpabout" href="?_task=dummy&_action=plugin.helpabout" type="link" label="help.about" title="help.about" class="tablink" /></span>
-<span id="helptablicense" class="tablink"><roundcube:button name="helplicense" href="?_task=dummy&_action=plugin.helplicense" type="link" label="help.license" title="help.license" class="tablink" /></span>
+<span id="helptabdefault" class="tablink"><roundcube:button name="helpdefault" href="?_task=help" type="link" label="help.help" title="help.help" /></span>
+<span id="helptababout" class="tablink"><roundcube:button name="helpabout" href="?_task=help&_action=about" type="link" label="help.about" title="help.about" class="tablink" /></span>
+<span id="helptablicense" class="tablink"><roundcube:button name="helplicense" href="?_task=help&_action=license" type="link" label="help.license" title="help.license" class="tablink" /></span>
 <roundcube:container name="helptabs" id="helptabsbar" />
 <script type="text/javascript"> if (window.rcmail) rcmail.add_onload(help_init_settings_tabs);</script>
 </div>
-- 
cgit v1.2.3