summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/help/content/about.html1
-rw-r--r--plugins/help/package.xml37
-rw-r--r--plugins/help/skins/larry/help.css5
-rw-r--r--plugins/help/skins/larry/templates/help.html8
-rw-r--r--plugins/password/package.xml33
-rw-r--r--plugins/password/password.php2
6 files changed, 67 insertions, 19 deletions
diff --git a/plugins/help/content/about.html b/plugins/help/content/about.html
index e3ac97529..6e9632bec 100644
--- a/plugins/help/content/about.html
+++ b/plugins/help/content/about.html
@@ -25,4 +25,3 @@ see <a href="http://roundcube.net/license">roundcube.net/license</a>.
<p><br/>Website: <a href="http://roundcube.net">roundcube.net</a></p>
</div>
-</div>
diff --git a/plugins/help/package.xml b/plugins/help/package.xml
index 2c4fd2cc8..889efd17d 100644
--- a/plugins/help/package.xml
+++ b/plugins/help/package.xml
@@ -13,9 +13,9 @@
<email>alec@alec.pl</email>
<active>yes</active>
</lead>
- <date>2012-01-18</date>
+ <date>2012-11-11</date>
<version>
- <release>1.2</release>
+ <release>1.3</release>
<api>1.2</api>
</version>
<stability>
@@ -30,27 +30,52 @@
<tasks:replace from="@name@" to="name" type="package-info"/>
<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="config.inc.php.dist" role="data"></file>
- <file name="skins/classic/help.css" role="data"></file>
- <file name="skins/classic/help.gif" role="data"></file>
- <file name="skins/classic/templates/help.html" role="data"></file>
+ <file name="localization/bs_BA.inc" role="data"></file>
+ <file name="localization/ca_ES.inc" role="data"></file>
<file name="localization/cs_CZ.inc" role="data"></file>
+ <file name="localization/cy_GB.inc" role="data"></file>
<file name="localization/da_DK.inc" role="data"></file>
+ <file name="localization/de_CH.inc" role="data"></file>
<file name="localization/de_DE.inc" role="data"></file>
+ <file name="localization/en_GB.inc" role="data"></file>
<file name="localization/en_US.inc" role="data"></file>
+ <file name="localization/eo.inc" role="data"></file>
<file name="localization/es_ES.inc" role="data"></file>
<file name="localization/et_EE.inc" role="data"></file>
+ <file name="localization/fa_IR.inc" role="data"></file>
+ <file name="localization/fi_FI.inc" role="data"></file>
<file name="localization/fr_FR.inc" role="data"></file>
<file name="localization/gl_ES.inc" role="data"></file>
+ <file name="localization/he_IL.inc" role="data"></file>
<file name="localization/hu_HU.inc" role="data"></file>
+ <file name="localization/hy_AM.inc" role="data"></file>
+ <file name="localization/it_IT.inc" role="data"></file>
<file name="localization/ja_JP.inc" role="data"></file>
+ <file name="localization/ko_KR.inc" role="data"></file>
+ <file name="localization/lt_LT.inc" role="data"></file>
+ <file name="localization/nb_NB.inc" role="data"></file>
+ <file name="localization/nl_NL.inc" role="data"></file>
<file name="localization/pl_PL.inc" role="data"></file>
<file name="localization/pt_BR.inc" role="data"></file>
+ <file name="localization/pt_PT.inc" role="data"></file>
<file name="localization/ru_RU.inc" role="data"></file>
+ <file name="localization/sk_SK.inc" role="data"></file>
+ <file name="localization/sl_SI.inc" role="data"></file>
+ <file name="localization/sr_CS.inc" role="data"></file>
<file name="localization/sv_SE.inc" role="data"></file>
+ <file name="localization/tr_TR.inc" role="data"></file>
+ <file name="localization/vi_VN.inc" role="data"></file>
+ <file name="localization/zh_CN.inc" role="data"></file>
<file name="localization/zh_TW.inc" role="data"></file>
+ <file name="skins/classic/help.css" role="data"></file>
+ <file name="skins/classic/help.gif" role="data"></file>
+ <file name="skins/classic/templates/help.html" role="data"></file>
+ <file name="skins/larry/help.css" role="data"></file>
+ <file name="skins/larry/help.png" role="data"></file>
+ <file name="skins/larry/templates/help.html" role="data"></file>
</dir>
<!-- / -->
</contents>
diff --git a/plugins/help/skins/larry/help.css b/plugins/help/skins/larry/help.css
index 20caa7a87..931ae1b61 100644
--- a/plugins/help/skins/larry/help.css
+++ b/plugins/help/skins/larry/help.css
@@ -38,3 +38,8 @@
.toolbar a.button.license {
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 9790c1570..63cf0c21c 100644
--- a/plugins/help/skins/larry/templates/help.html
+++ b/plugins/help/skins/larry/templates/help.html
@@ -3,7 +3,6 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/this/help.css" />
</head>
<body>
@@ -18,8 +17,11 @@
<roundcube:container name="helptabs" id="helptabsbar" />
</div>
-<div id="pluginbody" class="uibox offset scroller">
-<roundcube:object name="helpcontent" id="helpcontentframe" style="width:100%; height:99%" src="/watermark.html" />
+<div id="pluginbody" class="uibox offset">
+ <div class="iframebox help_<roundcube:var name='env:action' />">
+ <roundcube:object name="helpcontent" id="helpcontentframe" style="width:100%; height:100%" src="/watermark.html" />
+ </div>
+ <roundcube:object name="message" id="message" class="statusbar" />
</div>
</div>
diff --git a/plugins/password/package.xml b/plugins/password/package.xml
index 29d222409..e639a04ef 100644
--- a/plugins/password/package.xml
+++ b/plugins/password/package.xml
@@ -15,9 +15,9 @@
<email>alec@alec.pl</email>
<active>yes</active>
</lead>
- <date>2012-03-07</date>
+ <date>2012-11-15</date>
<version>
- <release>3.1</release>
+ <release>3.2</release>
<api>2.0</api>
</version>
<stability>
@@ -26,13 +26,7 @@
</stability>
<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
<notes>
-- Added pw_usermod driver (#1487826)
-- Added option password_login_exceptions (#1487826)
-- Added domainfactory driver (#1487882)
-- Added DBMail driver (#1488281)
-- Helper files moved to helpers/ directory from drivers/
-- Added Expect driver (#1488363)
-- Added Samba password (#1488364)
+- Fix wrong (non-specific) error message on crypt or connection error (#1488808)
</notes>
<contents>
<dir baseinstalldir="/" name="/">
@@ -331,5 +325,26 @@
- Fixed drivers namespace issues
</notes>
</release>
+ <release>
+ <date>2012-03-07</date>
+ <version>
+ <release>3.1</release>
+ <api>2.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
+ <notes>
+- Added pw_usermod driver (#1487826)
+- Added option password_login_exceptions (#1487826)
+- Added domainfactory driver (#1487882)
+- Added DBMail driver (#1488281)
+- Helper files moved to helpers/ directory from drivers/
+- Added Expect driver (#1488363)
+- Added Samba password (#1488364)
+ </notes>
+ </release>
</changelog>
</package>
diff --git a/plugins/password/password.php b/plugins/password/password.php
index 320d5d037..cd0f5f1e0 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -280,8 +280,10 @@ class password extends rcube_plugin
return;
case PASSWORD_CRYPT_ERROR;
$reason = $this->gettext('crypterror');
+ break;
case PASSWORD_CONNECT_ERROR;
$reason = $this->gettext('connecterror');
+ break;
case PASSWORD_ERROR:
default:
$reason = $this->gettext('internalerror');
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 16:26:30 +0000