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

Fix opening in new window; keep extwin mode when switching help actions

Browse Source
pull/89/head
Thomas Bruederli 12 years ago
parent d3d1e38d72
commit d8e1016109
5 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
plugins/help/help.js
Unescape Escape View File

@ -13,7 +13,7 @@ if (window.rcmail) {
var url = rcmail.url('help/index', { _rel: rcmail.task + (rcmail.env.action ? '/'+rcmail.env.action : '') });
if (rcmail.env.help_open_extwin) {
rcmail.open_window(url, true, false);
rcmail.open_window(url, 1020, false);
}
else {
rcmail.redirect(url, false);

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

@ -61,6 +61,7 @@ class help extends rcube_plugin
// register UI objects
$rcmail->output->add_handlers(array(
'helpcontent' => array($this, 'content'),
'tablink' => array($this, 'tablink'),
));
if ($rcmail->action == 'about')
@ -73,6 +74,14 @@ class help extends rcube_plugin
$rcmail->output->send('help.help');
}
function tablink($attrib)
{
$rcmail = rcmail::get_instance();
$attrib['name'] = 'helplink' . $attrib['action'];
$attrib['href'] = $rcmail->url(array('_action' => $attrib['action'], '_extwin' => !empty($_REQUEST['_extwin']) ? 1 : null));
return $rcmail->output->button($attrib);
}
function content($attrib)
{
$rcmail = rcmail::get_instance();

14
plugins/help/skins/classic/help.css
Unescape Escape View File

@ -5,6 +5,20 @@
background-image: url('help.gif');
}
.extwin #tabsbar
{
top: 21px;
left: 20px;
right: 100px;
border-bottom: 0;
}
.closelink {
position: absolute;
top: 20px;
right: 20px;
}
.help-box
{
overflow: auto;

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

@ -15,15 +15,20 @@ function help_init_settings_tabs()
}
</script>
</head>
<roundcube:if condition="env:extwin" /><body class="extwin"><roundcube:else /><body><roundcube:endif />
<roundcube:if condition="env:extwin" />
<body class="extwin">
<roundcube:object name="message" id="message" />
<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
<roundcube:else />
<body>
<roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" />
<roundcube:endif />
<div id="tabsbar">
<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>
<span id="helptabindex" class="tablink"><roundcube:object name="tablink" action="index" type="link" label="help.help" title="help.help" /></span>
<span id="helptababout" class="tablink"><roundcube:object name="tablink" action="about" type="link" label="help.about" title="help.about" class="tablink" /></span>
<span id="helptablicense" class="tablink"><roundcube:object name="tablink" 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>

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

@ -11,9 +11,9 @@
<div id="mainscreen">
<div id="helptoolbar" class="toolbar">
<roundcube:button name="helpdefault" href="?_task=help" type="link" label="help.help" title="help.help" class="button help" />
<roundcube:button name="helpabout" href="?_task=help&amp;_action=about" type="link" label="help.about" title="help.about" class="button about" />
<roundcube:button name="helplicense" href="?_task=help&amp;_action=license" type="link" label="help.license" title="help.license" class="button license" />
<roundcube:object name="tablink" action="index" type="link" label="help.help" title="help.help" class="button help" />
<roundcube:object name="tablink" action="about" type="link" label="help.about" title="help.about" class="button about" />
<roundcube:object name="tablink" action="license" type="link" label="help.license" title="help.license" class="button license" />
<roundcube:container name="helptabs" id="helptabsbar" />
</div>

Write Preview
Loading…
Cancel
Save