diff options
Diffstat (limited to 'plugins/help')
52 files changed, 163 insertions, 133 deletions
diff --git a/plugins/help/config.inc.php.dist b/plugins/help/config.inc.php.dist index 7cc8d5f00..d440dbbcc 100644 --- a/plugins/help/config.inc.php.dist +++ b/plugins/help/config.inc.php.dist @@ -1,35 +1,5 @@ <?php // Help content iframe source -// %l will be replaced by the language code resolved using the 'help_language_map' option -$config['help_source'] = 'http://roundcube.net/doc/help/0.9/%l/'; - -// Map task/action combinations to deep-links -// Use '<task>/<action>' or only '<task>' strings as keys -// The values will be appended to the 'help_source' URL -$config['help_index_map'] = array( - 'login' => 'login.html', - 'mail' => 'mail/index.html', - 'mail/compose' => 'mail/compose.html', - 'addressbook' => 'addressbook/index.html', - 'settings' => 'settings/index.html', - 'settings/preferences' => 'settings/preferences.html', - 'settings/folders' => 'settings/folders.html', - 'settings/identities' => 'settings/identities.html', -); - -// Map to translate Roundcube language codes into help document languages -// The '*' entry will be used as default -$config['help_language_map'] = array('*' => 'en_US'); - -// Enter an absolute URL to a page displaying information about this webmail -// Alternatively, create a HTML file under <this-plugin-dir>/content/about.html -$config['help_about_url'] = null; - -// Enter an absolute URL to a page displaying information about this webmail -// Alternatively, put your license text to <this-plugin-dir>/content/license.html -$config['help_license_url'] = null; - -// Determine whether to open the help in a new window -$config['help_open_extwin'] = false; - +// $rcmail_config['help_source'] = 'http://trac.roundcube.net/wiki'; +$rcmail_config['help_source'] = ''; diff --git a/plugins/help/content/license.html b/plugins/help/content/license.html index 9034d46f8..371dbffe1 100644 --- a/plugins/help/content/license.html +++ b/plugins/help/content/license.html @@ -655,7 +655,7 @@ the “copyright” line and a pointer to where the full notice is found GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <http://www.gnu.org/licenses/>. </pre> <p>Also add information on how to contact you by electronic and paper mail.</p> diff --git a/plugins/help/help.php b/plugins/help/help.php index df08caf71..4b11dceb3 100644 --- a/plugins/help/help.php +++ b/plugins/help/help.php @@ -1,10 +1,9 @@ <?php /** - * Roundcube Help Plugin + * Help Plugin * * @author Aleksander 'A.L.E.C' Machniak - * @author Thomas Bruederli <thomas@roundcube.net> * @license GNU GPLv3+ * * Configuration (see config.inc.php.dist) @@ -22,7 +21,8 @@ class help extends rcube_plugin function init() { - $this->load_config(); + $rcmail = rcmail::get_instance(); + $this->add_texts('localization/', false); // register task @@ -33,13 +33,6 @@ class help extends rcube_plugin $this->register_action('about', array($this, 'action')); $this->register_action('license', array($this, 'action')); - $this->add_hook('startup', array($this, 'startup')); - } - - function startup($args) - { - $rcmail = rcmail::get_instance(); - // add taskbar button $this->add_button(array( 'command' => 'help', @@ -49,9 +42,6 @@ class help extends rcube_plugin 'label' => 'help.help', ), 'taskbar'); - $this->include_script('help.js'); - $rcmail->output->set_env('help_open_extwin', $rcmail->config->get('help_open_extwin', false), true); - // add style for taskbar button (must be here) and Help UI $skin_path = $this->local_skin_path(); if (is_file($this->home . "/$skin_path/help.css")) { @@ -63,10 +53,11 @@ class help extends rcube_plugin { $rcmail = rcmail::get_instance(); + $this->load_config(); + // register UI objects $rcmail->output->add_handlers(array( 'helpcontent' => array($this, 'content'), - 'tablink' => array($this, 'tablink'), )); if ($rcmail->action == 'about') @@ -79,52 +70,20 @@ 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(); - switch ($rcmail->action) { - case 'about': - if (is_readable($this->home . '/content/about.html')) { - return @file_get_contents($this->home . '/content/about.html'); - } - $default = $rcmail->url(array('_task' => 'settings', '_action' => 'about', '_framed' => 1)); - $src = $rcmail->config->get('help_about_url', $default); - break; - - case 'license': - if (is_readable($this->home . '/content/license.html')) { - return @file_get_contents($this->home . '/content/license.html'); - } - $src = $rcmail->config->get('help_license_url', 'http://www.gnu.org/licenses/gpl-3.0-standalone.html'); - break; - - default: - $src = $rcmail->config->get('help_source'); - - // resolve task/action for depp linking - $index_map = $rcmail->config->get('help_index_map', array()); - $rel = $_REQUEST['_rel']; - list($task,$action) = explode('/', $rel); - if ($add = $index_map[$rel]) - $src .= $add; - else if ($add = $index_map[$task]) - $src .= $add; - break; + if ($rcmail->action == 'about') { + return @file_get_contents($this->home.'/content/about.html'); + } + else if ($rcmail->action == 'license') { + return @file_get_contents($this->home.'/content/license.html'); } // default content: iframe - if (!empty($src)) { - $attrib['src'] = $this->resolve_language($src); - } + if ($src = $rcmail->config->get('help_source')) + $attrib['src'] = $src; if (empty($attrib['id'])) $attrib['id'] = 'rcmailhelpcontent'; @@ -134,13 +93,4 @@ class help extends rcube_plugin return $rcmail->output->frame($attrib); } - - private function resolve_language($path) - { - // resolve language placeholder - $rcmail = rcmail::get_instance(); - $langmap = $rcmail->config->get('help_language_map', array('*' => 'en_US')); - $lang = !empty($langmap[$_SESSION['language']]) ? $langmap[$_SESSION['language']] : $langmap['*']; - return str_replace('%l', $lang, $path); - } } diff --git a/plugins/help/localization/ar_SA.inc b/plugins/help/localization/ar_SA.inc index 9a9fe727b..c92f79fba 100644 --- a/plugins/help/localization/ar_SA.inc +++ b/plugins/help/localization/ar_SA.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'مساعدة'; $labels['about'] = 'حوْل'; $labels['license'] = 'الرخصة'; + ?> diff --git a/plugins/help/localization/az_AZ.inc b/plugins/help/localization/az_AZ.inc index 5d4bd653d..73fc3659e 100644 --- a/plugins/help/localization/az_AZ.inc +++ b/plugins/help/localization/az_AZ.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Kömək'; $labels['about'] = 'Haqqında'; $labels['license'] = 'Lisenziya'; + ?> diff --git a/plugins/help/localization/ber.inc b/plugins/help/localization/ber.inc index 046e45733..12fe4442e 100644 --- a/plugins/help/localization/ber.inc +++ b/plugins/help/localization/ber.inc @@ -13,4 +13,5 @@ +-----------------------------------------------------------------------+ */ +$labels = array(); diff --git a/plugins/help/localization/br.inc b/plugins/help/localization/br.inc index 5224034d4..3ea6c029c 100644 --- a/plugins/help/localization/br.inc +++ b/plugins/help/localization/br.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Skoazell'; $labels['about'] = 'Diwar-benn'; $labels['license'] = 'Lañvaz'; + ?> diff --git a/plugins/help/localization/bs_BA.inc b/plugins/help/localization/bs_BA.inc index 89a46e4ea..2b502d182 100644 --- a/plugins/help/localization/bs_BA.inc +++ b/plugins/help/localization/bs_BA.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Pomoć'; $labels['about'] = 'O programu'; $labels['license'] = 'Licenca'; + ?> diff --git a/plugins/help/localization/ca_ES.inc b/plugins/help/localization/ca_ES.inc index 4bca2f212..f2630d81f 100644 --- a/plugins/help/localization/ca_ES.inc +++ b/plugins/help/localization/ca_ES.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Ajuda'; $labels['about'] = 'Quant a'; $labels['license'] = 'Llicència'; + ?> diff --git a/plugins/help/localization/cs_CZ.inc b/plugins/help/localization/cs_CZ.inc index 427ef9835..6147c0a7a 100644 --- a/plugins/help/localization/cs_CZ.inc +++ b/plugins/help/localization/cs_CZ.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Nápověda'; $labels['about'] = 'O aplikaci'; $labels['license'] = 'Licence'; + ?> diff --git a/plugins/help/localization/cy_GB.inc b/plugins/help/localization/cy_GB.inc index c9e9fb4c1..a2decbbf9 100644 --- a/plugins/help/localization/cy_GB.inc +++ b/plugins/help/localization/cy_GB.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Cymorth'; $labels['about'] = 'Amdan'; $labels['license'] = 'Trwydded'; + ?> diff --git a/plugins/help/localization/da_DK.inc b/plugins/help/localization/da_DK.inc index af63e50b4..bbb3f61b3 100644 --- a/plugins/help/localization/da_DK.inc +++ b/plugins/help/localization/da_DK.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Hjælp'; $labels['about'] = 'Om'; $labels['license'] = 'Licens'; + ?> diff --git a/plugins/help/localization/de_CH.inc b/plugins/help/localization/de_CH.inc index 0d4267593..964723993 100644 --- a/plugins/help/localization/de_CH.inc +++ b/plugins/help/localization/de_CH.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Hilfe'; $labels['about'] = 'Information'; $labels['license'] = 'Lizenz'; + ?> diff --git a/plugins/help/localization/de_DE.inc b/plugins/help/localization/de_DE.inc index 677125751..250657da6 100644 --- a/plugins/help/localization/de_DE.inc +++ b/plugins/help/localization/de_DE.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Hilfe'; $labels['about'] = 'Über'; $labels['license'] = 'Lizenz'; + ?> diff --git a/plugins/help/localization/en_GB.inc b/plugins/help/localization/en_GB.inc index 1be660728..df8bff280 100644 --- a/plugins/help/localization/en_GB.inc +++ b/plugins/help/localization/en_GB.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Help'; $labels['about'] = 'About'; $labels['license'] = 'Licence'; + ?> diff --git a/plugins/help/localization/en_US.inc b/plugins/help/localization/en_US.inc index b81f02fb9..cf6c0aaaf 100644 --- a/plugins/help/localization/en_US.inc +++ b/plugins/help/localization/en_US.inc @@ -2,10 +2,10 @@ /* +-----------------------------------------------------------------------+ - | plugins/help/localization/<lang>.inc | + | plugins/help/localization/<lang>.inc | | | | Localization file of the Roundcube Webmail Help plugin | - | Copyright (C) 2012-2013, The Roundcube Dev Team | + | Copyright (C) 2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | diff --git a/plugins/help/localization/eo.inc b/plugins/help/localization/eo.inc index 017e1592b..c496c96cb 100644 --- a/plugins/help/localization/eo.inc +++ b/plugins/help/localization/eo.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Helpo'; $labels['about'] = 'Pri'; $labels['license'] = 'Permesilo'; + ?> diff --git a/plugins/help/localization/es_ES.inc b/plugins/help/localization/es_ES.inc index 5425367f4..446172f47 100644 --- a/plugins/help/localization/es_ES.inc +++ b/plugins/help/localization/es_ES.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Ayuda'; $labels['about'] = 'Acerca de'; $labels['license'] = 'Licencia'; + ?> diff --git a/plugins/help/localization/et_EE.inc b/plugins/help/localization/et_EE.inc index fef6b777f..a55348ad9 100644 --- a/plugins/help/localization/et_EE.inc +++ b/plugins/help/localization/et_EE.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Abi'; $labels['about'] = 'Roundcube info'; $labels['license'] = 'Litsents'; + ?> diff --git a/plugins/help/localization/fa_IR.inc b/plugins/help/localization/fa_IR.inc index adb9c5719..016d548ab 100644 --- a/plugins/help/localization/fa_IR.inc +++ b/plugins/help/localization/fa_IR.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'راهنما'; $labels['about'] = 'درباره'; $labels['license'] = 'گواهینامه'; + ?> diff --git a/plugins/help/localization/fi_FI.inc b/plugins/help/localization/fi_FI.inc index 9f11fcee1..1803a6c4d 100644 --- a/plugins/help/localization/fi_FI.inc +++ b/plugins/help/localization/fi_FI.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Ohje'; $labels['about'] = 'Tietoja'; $labels['license'] = 'Lisenssi'; + ?> diff --git a/plugins/help/localization/fr_FR.inc b/plugins/help/localization/fr_FR.inc index 97e00176d..16a33696b 100644 --- a/plugins/help/localization/fr_FR.inc +++ b/plugins/help/localization/fr_FR.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Aide'; $labels['about'] = 'A propos'; $labels['license'] = 'Licence'; + ?> diff --git a/plugins/help/localization/gl_ES.inc b/plugins/help/localization/gl_ES.inc index 74a57427a..432623751 100644 --- a/plugins/help/localization/gl_ES.inc +++ b/plugins/help/localization/gl_ES.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Axuda'; $labels['about'] = 'Acerca de'; -$labels['license'] = 'Licenza'; +$labels['license'] = 'Licencia'; + ?> diff --git a/plugins/help/localization/he_IL.inc b/plugins/help/localization/he_IL.inc index bf75bfb4f..3c56ca1fa 100644 --- a/plugins/help/localization/he_IL.inc +++ b/plugins/help/localization/he_IL.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'עזרה'; $labels['about'] = 'אודות'; $labels['license'] = 'רשיון'; + ?> diff --git a/plugins/help/localization/hu_HU.inc b/plugins/help/localization/hu_HU.inc index d285e670b..8ea50b620 100644 --- a/plugins/help/localization/hu_HU.inc +++ b/plugins/help/localization/hu_HU.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Segítség'; $labels['about'] = 'Névjegy'; $labels['license'] = 'Licenc'; + ?> diff --git a/plugins/help/localization/hy_AM.inc b/plugins/help/localization/hy_AM.inc index 7b106cad4..daf891602 100644 --- a/plugins/help/localization/hy_AM.inc +++ b/plugins/help/localization/hy_AM.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Օգնություն'; $labels['about'] = 'Նկարագիր'; $labels['license'] = 'Արտոնագիր'; + ?> diff --git a/plugins/help/localization/id_ID.inc b/plugins/help/localization/id_ID.inc index 7bad95c65..d4bc3d9a0 100644 --- a/plugins/help/localization/id_ID.inc +++ b/plugins/help/localization/id_ID.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Bantuan'; $labels['about'] = 'Tentang'; $labels['license'] = 'Lisensi'; + ?> diff --git a/plugins/help/localization/it_IT.inc b/plugins/help/localization/it_IT.inc index f88471b4f..18e1cc9e1 100644 --- a/plugins/help/localization/it_IT.inc +++ b/plugins/help/localization/it_IT.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Aiuto'; $labels['about'] = 'Informazioni'; $labels['license'] = 'Licenza'; + ?> diff --git a/plugins/help/localization/ja_JP.inc b/plugins/help/localization/ja_JP.inc index db3d5e5cc..4b91c6d8d 100644 --- a/plugins/help/localization/ja_JP.inc +++ b/plugins/help/localization/ja_JP.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'ヘルプ'; $labels['about'] = 'このプログラムについて'; $labels['license'] = 'ライセンス'; + ?> diff --git a/plugins/help/localization/km_KH.inc b/plugins/help/localization/km_KH.inc index 1dae389bb..4cc29cab0 100644 --- a/plugins/help/localization/km_KH.inc +++ b/plugins/help/localization/km_KH.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'ជំនួយ'; $labels['about'] = 'អំពី'; $labels['license'] = 'អាជ្ញាប័ណ្ណ'; + ?> diff --git a/plugins/help/localization/ko_KR.inc b/plugins/help/localization/ko_KR.inc index 88390e3ff..836da6639 100644 --- a/plugins/help/localization/ko_KR.inc +++ b/plugins/help/localization/ko_KR.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = '도움말'; $labels['about'] = '정보'; $labels['license'] = '라이선스'; + ?> diff --git a/plugins/help/localization/lt_LT.inc b/plugins/help/localization/lt_LT.inc index b10223d3c..6f615bd5a 100644 --- a/plugins/help/localization/lt_LT.inc +++ b/plugins/help/localization/lt_LT.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Žinynas'; $labels['about'] = 'Apie'; $labels['license'] = 'Licencija'; + ?> diff --git a/plugins/help/localization/nb_NO.inc b/plugins/help/localization/nb_NO.inc index 4a2f7986e..702489483 100644 --- a/plugins/help/localization/nb_NO.inc +++ b/plugins/help/localization/nb_NO.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Hjelp'; $labels['about'] = 'Om'; $labels['license'] = 'Lisensvilkår'; + ?> diff --git a/plugins/help/localization/nl_NL.inc b/plugins/help/localization/nl_NL.inc index a6c97e34a..e0e7bcc56 100644 --- a/plugins/help/localization/nl_NL.inc +++ b/plugins/help/localization/nl_NL.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Help'; $labels['about'] = 'Over'; $labels['license'] = 'Licentie'; + ?> diff --git a/plugins/help/localization/nn_NO.inc b/plugins/help/localization/nn_NO.inc index edb7cd619..17a694d80 100644 --- a/plugins/help/localization/nn_NO.inc +++ b/plugins/help/localization/nn_NO.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Hjelp'; $labels['about'] = 'Om'; $labels['license'] = 'Lisens'; + ?> diff --git a/plugins/help/localization/pl_PL.inc b/plugins/help/localization/pl_PL.inc index 817dc9d5a..4884ac602 100644 --- a/plugins/help/localization/pl_PL.inc +++ b/plugins/help/localization/pl_PL.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Pomoc'; $labels['about'] = 'O programie'; $labels['license'] = 'Licencja'; + ?> diff --git a/plugins/help/localization/pt_BR.inc b/plugins/help/localization/pt_BR.inc index 7aff20bf1..79746bdc2 100644 --- a/plugins/help/localization/pt_BR.inc +++ b/plugins/help/localization/pt_BR.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Ajuda'; $labels['about'] = 'Sobre'; $labels['license'] = 'Licença'; + ?> diff --git a/plugins/help/localization/pt_PT.inc b/plugins/help/localization/pt_PT.inc index 4c141c596..657c33ac5 100644 --- a/plugins/help/localization/pt_PT.inc +++ b/plugins/help/localization/pt_PT.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Ajuda'; $labels['about'] = 'Sobre...'; $labels['license'] = 'Licença'; + ?> diff --git a/plugins/help/localization/ru_RU.inc b/plugins/help/localization/ru_RU.inc index b3b7c11de..c1d2e071b 100644 --- a/plugins/help/localization/ru_RU.inc +++ b/plugins/help/localization/ru_RU.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Помощь'; $labels['about'] = 'О программе'; $labels['license'] = 'Лицензия'; + ?> diff --git a/plugins/help/localization/sk_SK.inc b/plugins/help/localization/sk_SK.inc index ca88dbbe0..99d3082bd 100644 --- a/plugins/help/localization/sk_SK.inc +++ b/plugins/help/localization/sk_SK.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Nápoveda'; $labels['about'] = 'O aplikácii'; $labels['license'] = 'Licencia'; + ?> diff --git a/plugins/help/localization/sl_SI.inc b/plugins/help/localization/sl_SI.inc index 509e66749..9e84d4cda 100644 --- a/plugins/help/localization/sl_SI.inc +++ b/plugins/help/localization/sl_SI.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Pomoč'; $labels['about'] = 'Vizitka'; $labels['license'] = 'Licenca'; + ?> diff --git a/plugins/help/localization/sr_CS.inc b/plugins/help/localization/sr_CS.inc index e0cf7ccf1..a514c1cfe 100644 --- a/plugins/help/localization/sr_CS.inc +++ b/plugins/help/localization/sr_CS.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Помоћ'; $labels['about'] = 'Info'; $labels['license'] = 'Licenca'; + ?> diff --git a/plugins/help/localization/sv_SE.inc b/plugins/help/localization/sv_SE.inc index 184efca40..ab23f8c69 100644 --- a/plugins/help/localization/sv_SE.inc +++ b/plugins/help/localization/sv_SE.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Hjälp'; $labels['about'] = 'Om'; $labels['license'] = 'Licens'; + ?> diff --git a/plugins/help/localization/tr_TR.inc b/plugins/help/localization/tr_TR.inc index b11f033a3..cad257409 100644 --- a/plugins/help/localization/tr_TR.inc +++ b/plugins/help/localization/tr_TR.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Yardım'; $labels['about'] = 'Hakkında'; $labels['license'] = 'Lisans'; + ?> diff --git a/plugins/help/localization/vi_VN.inc b/plugins/help/localization/vi_VN.inc index b3aff3c0f..bd5fa57b6 100644 --- a/plugins/help/localization/vi_VN.inc +++ b/plugins/help/localization/vi_VN.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = 'Trợ giúp'; $labels['about'] = 'Giới thiệu'; $labels['license'] = 'Bản quyền'; + ?> diff --git a/plugins/help/localization/zh_CN.inc b/plugins/help/localization/zh_CN.inc index c2bbd1705..59719477b 100644 --- a/plugins/help/localization/zh_CN.inc +++ b/plugins/help/localization/zh_CN.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = '帮助'; $labels['about'] = '关于'; -$labels['license'] = '许可协议'; +$labels['license'] = '授权信息'; + ?> diff --git a/plugins/help/localization/zh_TW.inc b/plugins/help/localization/zh_TW.inc index 59c7d8aae..9fc68e482 100644 --- a/plugins/help/localization/zh_TW.inc +++ b/plugins/help/localization/zh_TW.inc @@ -15,7 +15,10 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/ */ + +$labels = array(); $labels['help'] = '說明'; $labels['about'] = '關於'; $labels['license'] = '許可證'; + ?> diff --git a/plugins/help/package.xml b/plugins/help/package.xml index d39143ba1..889efd17d 100644 --- a/plugins/help/package.xml +++ b/plugins/help/package.xml @@ -5,7 +5,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> <name>help</name> <channel>pear.roundcube.net</channel> - <summary>Online Help for Roundcube</summary> + <summary>Help for Roundcube</summary> <description>Plugin adds a new item (Help) in taskbar.</description> <lead> <name>Aleksander Machniak</name> @@ -13,10 +13,10 @@ <email>alec@alec.pl</email> <active>yes</active> </lead> - <date>2013-07-03</date> + <date>2012-11-11</date> <version> - <release>1.4</release> - <api>1.4</api> + <release>1.3</release> + <api>1.2</api> </version> <stability> <release>stable</release> @@ -31,6 +31,7 @@ <tasks:replace from="@package_version@" to="version" type="package-info"/> </file> <file name="config.inc.php.dist" role="data"></file> + <file name="content/about.html" role="data"></file> <file name="content/license.html" role="data"></file> <file name="localization/bs_BA.inc" role="data"></file> <file name="localization/ca_ES.inc" role="data"></file> diff --git a/plugins/help/skins/classic/help.css b/plugins/help/skins/classic/help.css index c45b8f0b0..8f67f111e 100644 --- a/plugins/help/skins/classic/help.css +++ b/plugins/help/skins/classic/help.css @@ -5,23 +5,9 @@ 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; + overflow: auto; background-color: #F2F2F2; } diff --git a/plugins/help/skins/classic/templates/help.html b/plugins/help/skins/classic/templates/help.html index 3d5b22869..2e430ecf3 100644 --- a/plugins/help/skins/classic/templates/help.html +++ b/plugins/help/skins/classic/templates/help.html @@ -7,28 +7,23 @@ <script type="text/javascript"> function help_init_settings_tabs() { - var action, tab = '#helptabindex'; + var action, tab = '#helptabdefault'; if (window.rcmail && (action = rcmail.env.action)) { - tab = '#helptab' + (action ? action : 'index'); + tab = '#helptab' + (action ? action : 'default'); } $(tab).addClass('tablink-selected'); } </script> </head> -<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: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> +<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> diff --git a/plugins/help/skins/larry/help.css b/plugins/help/skins/larry/help.css index d9af6e15e..c2e369af6 100644 --- a/plugins/help/skins/larry/help.css +++ b/plugins/help/skins/larry/help.css @@ -39,6 +39,7 @@ background: url(help.png) center -130px no-repeat; } +.iframebox.help_about, .iframebox.help_license { overflow: auto; } diff --git a/plugins/help/skins/larry/templates/help.html b/plugins/help/skins/larry/templates/help.html index bfd3f1141..39caaa62f 100644 --- a/plugins/help/skins/larry/templates/help.html +++ b/plugins/help/skins/larry/templates/help.html @@ -4,16 +4,16 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> </head> -<roundcube:if condition="env:extwin" /><body class="extwin"><roundcube:else /><body><roundcube:endif /> +<body> <roundcube:include file="/includes/header.html" /> <div id="mainscreen"> <div id="helptoolbar" class="toolbar"> -<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:button name="helpdefault" href="?_task=help" type="link" label="help.help" title="help.help" class="button help" /> +<roundcube:button name="helpabout" href="?_task=help&_action=about" type="link" label="help.about" title="help.about" class="button about" /> +<roundcube:button name="helplicense" href="?_task=help&_action=license" type="link" label="help.license" title="help.license" class="button license" /> <roundcube:container name="helptabs" id="helptabsbar" /> </div> |