Help plugin: CSS fixes, content frame scrollbar fix, about page (classic skin) fix

4 files changed, 6 insertions, 6 deletions

diff --git a/plugins/help/help.php b/plugins/help/help.php
index 66c4256a0..ab665d0a8 100644
--- a/plugins/help/help.php
+++ b/plugins/help/help.php
@@ -82,7 +82,8 @@ class help extends rcube_plugin
                 if (is_readable($this->home . '/content/about.html')) {
                     return @file_get_contents($this->home . '/content/about.html');
                 }
-                $src = $rcmail->config->get('help_about_url', $rcmail->url(array('_task' => 'settings', '_action' => 'about')));
+                $default = $rcmail->url(array('_task' => 'settings', '_action' => 'about', '_framed' => 1));
+                $src     = $rcmail->config->get('help_about_url', $default);
                 break;
 
             case 'license':
diff --git a/plugins/help/skins/classic/help.css b/plugins/help/skins/classic/help.css
index 8f67f111e..ad5b7dab4 100644
--- a/plugins/help/skins/classic/help.css
+++ b/plugins/help/skins/classic/help.css
@@ -7,7 +7,7 @@
 
 .help-box
 {
-  overflow: auto;  
+  overflow: auto;
   background-color: #F2F2F2;
 }
 
diff --git a/plugins/help/skins/classic/templates/help.html b/plugins/help/skins/classic/templates/help.html
index 8a398e7b3..5bc342044 100644
--- a/plugins/help/skins/classic/templates/help.html
+++ b/plugins/help/skins/classic/templates/help.html
@@ -7,9 +7,9 @@
 <script type="text/javascript">
 function help_init_settings_tabs()
 {
-    var action, tab = '#helptabdefault';
+    var action, tab = '#helptabindex';
     if (window.rcmail && (action = rcmail.env.action)) {
-        tab = '#helptab' + (action ? action : 'default');
+        tab = '#helptab' + (action ? action : 'index');
     }
     $(tab).addClass('tablink-selected');
 }
@@ -21,7 +21,7 @@ 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=help" type="link" label="help.help" title="help.help" /></span>
+<span id="helptabindex" class="tablink"><roundcube:button name="helpindex" href="?_task=help" type="link" label="help.help" title="help.help" /></span>
 <span id="helptababout" class="tablink"><roundcube:button name="helpabout" href="?_task=help&amp;_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&amp;_action=license" type="link" label="help.license" title="help.license" class="tablink" /></span>
 <roundcube:container name="helptabs" id="helptabsbar" />
diff --git a/plugins/help/skins/larry/help.css b/plugins/help/skins/larry/help.css
index c2e369af6..d9af6e15e 100644
--- a/plugins/help/skins/larry/help.css
+++ b/plugins/help/skins/larry/help.css
@@ -39,7 +39,6 @@
 	background: url(help.png) center -130px no-repeat;
 }
 
-.iframebox.help_about,
 .iframebox.help_license {
 	overflow: auto;
 }