banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
pull/85/head
Aleksander Machniak 12 years ago
parent 86d13b73b8
commit eabc0564cd
6 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File

3
plugins/help/help.php
Unescape Escape View File

@ -82,7 +82,8 @@ class help extends rcube_plugin
if (is_readable($this->home . '/content/about.html')) { if (is_readable($this->home . '/content/about.html')) {
return @file_get_contents($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; break;
case 'license': case 'license':

6
plugins/help/skins/classic/templates/help.html
Unescape Escape View File

@ -7,9 +7,9 @@
<script type="text/javascript"> <script type="text/javascript">
function help_init_settings_tabs() function help_init_settings_tabs()
{ {
var action, tab = '#helptabdefault'; var action, tab = '#helptabindex';
if (window.rcmail && (action = rcmail.env.action)) { if (window.rcmail && (action = rcmail.env.action)) {
tab = '#helptab' + (action ? action : 'default'); tab = '#helptab' + (action ? action : 'index');
} }
$(tab).addClass('tablink-selected'); $(tab).addClass('tablink-selected');
} }
@ -21,7 +21,7 @@ function help_init_settings_tabs()
<roundcube:include file="/includes/header.html" /> <roundcube:include file="/includes/header.html" />
<div id="tabsbar"> <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="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> <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" /> <roundcube:container name="helptabs" id="helptabsbar" />

1
plugins/help/skins/larry/help.css
Unescape Escape View File

@ -39,7 +39,6 @@
background: url(help.png) center -130px no-repeat; background: url(help.png) center -130px no-repeat;
} }
.iframebox.help_about,
.iframebox.help_license { .iframebox.help_license {
overflow: auto; overflow: auto;
} }

7
skins/classic/templates/about.html
Unescape Escape View File

@ -7,11 +7,15 @@
</head> </head>
<body> <body>
<roundcube:if condition="!request:_framed" />
<roundcube:include file="/includes/taskbar.html" /> <roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" /> <roundcube:include file="/includes/header.html" />
<roundcube:include file="/includes/settingstabs.html" /> <roundcube:include file="/includes/settingstabs.html" />
<div id="mainscreen" class="box darkbg crop"> <div id="mainscreen" class="box darkbg crop">
<roundcube:endif />
<div class="readtext"> <div class="readtext">
<div id="license"> <div id="license">
<roundcube:object name="aboutcontent" /> <roundcube:object name="aboutcontent" />
@ -29,7 +33,10 @@ Some <a href="http://roundcube.net/license">exceptions</a> for skins &amp; plugi
<roundcube:object name="pluginlist" id="pluginlist" class="records-table" cellspacing="0" /> <roundcube:object name="pluginlist" id="pluginlist" class="records-table" cellspacing="0" />
</div> </div>
<roundcube:if condition="!request:_framed" />
</div> </div>
<roundcube:endif />
</body> </body>
</html> </html>

4
skins/larry/templates/about.html
Unescape Escape View File

@ -4,7 +4,11 @@
<title><roundcube:object name="pagetitle" /></title> <title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" /> <roundcube:include file="/includes/links.html" />
</head> </head>
<roundcube:if condition="request:_framed" />
<body class="iframe fullheight">
<roundcube:else />
<body class="ui-widget-content"> <body class="ui-widget-content">
<roundcube:endif />
<div class="readtext"> <div class="readtext">
<roundcube:object name="aboutcontent" /> <roundcube:object name="aboutcontent" />

Write Preview
Loading…
Cancel
Save