From 64726aa44f0c7307150a3d89903f6d0b96bdb2ee Mon Sep 17 00:00:00 2001 From: Tom N Harris Date: Fri, 29 Oct 2010 18:33:48 -0400 Subject: Remember current page when saving configuration --- lib/plugins/config/admin.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 49712b73f..a628578ca 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -110,6 +110,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { ptln('
'.$this->getLang('updated').'
'); ptln('
'); + ptln(''); formSecurityToken(); $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki')); -- cgit v1.2.3 From 5d85efc6906bd57ed94bd1fceb7fe09d6a795866 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 1 Nov 2010 10:25:35 +0100 Subject: Add comment (see #1942, f338aa80, 64726aa44) --- lib/plugins/config/admin.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index a628578ca..d245d3fce 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -109,6 +109,9 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { elseif ($this->_changed) ptln('
'.$this->getLang('updated').'
'); + // POST to script() instead of wl($ID) so config manager still works if + // rewrite config is broken. Add $ID as hidden field to remember + // current ID in most cases. ptln(''); ptln(''); formSecurityToken(); -- cgit v1.2.3 From 317d85c9da899f7720469b4831116604488ba503 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 5 Nov 2010 10:23:20 +0100 Subject: style fixes for RTL languages FS#2089 --- lib/tpl/default/rtl.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib') diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index f66a670e0..e40dd966d 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -145,3 +145,11 @@ div.dokuwiki blockquote { text-align: right; } +/* Search corrections */ +div.dokuwiki ul.search_quickhits li { + float: right; +} + +div#qsearch__out { + text-align: right; +} -- cgit v1.2.3 From dab7d18d7edb3ebd430dd4915be8564aeeb511c2 Mon Sep 17 00:00:00 2001 From: Choicky Chou Date: Sun, 7 Nov 2010 10:00:16 +0100 Subject: Chinese Language update --- lib/plugins/acl/lang/zh/lang.php | 1 + lib/plugins/config/lang/zh/lang.php | 3 ++- lib/plugins/plugin/lang/zh/lang.php | 9 +++++---- lib/plugins/popularity/lang/zh/lang.php | 1 + lib/plugins/revert/lang/zh/lang.php | 1 + lib/plugins/usermanager/lang/zh/lang.php | 1 + 6 files changed, 11 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php index e806ad434..d79a78089 100644 --- a/lib/plugins/acl/lang/zh/lang.php +++ b/lib/plugins/acl/lang/zh/lang.php @@ -10,6 +10,7 @@ * @author mr.jinyi@gmail.com * @author ben * @author lainme + * @author caii */ $lang['admin_acl'] = '访问控制列表（ACL）管理器'; $lang['acl_group'] = '组'; diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index 6345451d5..0419968c7 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -10,6 +10,7 @@ * @author mr.jinyi@gmail.com * @author ben * @author lainme + * @author caii */ $lang['menu'] = '配置设置'; $lang['error'] = '由于非法参数，设置没有更新。请检查您做的改动并重新提交。 @@ -115,7 +116,7 @@ $lang['jpg_quality'] = 'JPG 压缩质量（0-100）'; $lang['subscribers'] = '启用页面订阅支持'; $lang['subscribe_time'] = '订阅列表和摘要发送的时间间隔（秒）；这应当小于指定的最近更改保留时间（recent_days）。 '; -$lang['compress'] = '使 CSS 和 javascript 输出更紧密'; +$lang['compress'] = '使 CSS 和 javascript 的输出更紧密'; $lang['hidepages'] = '隐藏匹配的界面（正则表达式）'; $lang['send404'] = '发送 "HTTP 404/页面没有找到" 错误信息给不存在的页面'; $lang['sitemap'] = '生成 Google sitemap（天）'; diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php index d5b456604..af2db4ee5 100644 --- a/lib/plugins/plugin/lang/zh/lang.php +++ b/lib/plugins/plugin/lang/zh/lang.php @@ -10,6 +10,7 @@ * @author mr.jinyi@gmail.com * @author ben * @author lainme + * @author caii */ $lang['menu'] = '插件管理器'; $lang['download'] = '下载并安装新的插件'; @@ -51,7 +52,7 @@ $lang['error_dircreate'] = '无法创建用于接收下载文件的'; $lang['error_decompress'] = '插件管理器无法解压下载的文件。这可能是由于下载出现错误，遇到这种情况，请您再次尝试;或者是压缩格式无法识别，遇到这种情况，您需要手动下载并安装该插件。'; $lang['error_copy'] = '尝试安装插件 %s 的相关文件时产生一个复制错误：磁盘空间已满或文件访问权限错误。这可能是由于一个安装了一部分的插件，并使得您的维基系统不稳定。'; $lang['error_delete'] = '尝试删除插件 %s 时产生一个错误。最有可能的情况是文件或路径的访问权限不够'; -$lang['enabled'] = '%s 插件开'; -$lang['notenabled'] = '%s插件打开失败，请检查文件权限。'; -$lang['disabled'] = '%s 插件关'; -$lang['notdisabled'] = '%s插件关闭失败，请检查文件权限。'; +$lang['enabled'] = '%s 插件启用'; +$lang['notenabled'] = '%s插件启用失败，请检查文件权限。'; +$lang['disabled'] = '%s 插件禁用'; +$lang['notdisabled'] = '%s插件禁用失败，请检查文件权限。'; diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php index ee13b9f77..191b9c1af 100644 --- a/lib/plugins/popularity/lang/zh/lang.php +++ b/lib/plugins/popularity/lang/zh/lang.php @@ -9,6 +9,7 @@ * @author mr.jinyi@gmail.com * @author ben * @author lainme + * @author caii */ $lang['name'] = '人气反馈（载入可能需要一些时间）'; $lang['submit'] = '发送数据'; diff --git a/lib/plugins/revert/lang/zh/lang.php b/lib/plugins/revert/lang/zh/lang.php index 36c8267d6..5ff1ed426 100644 --- a/lib/plugins/revert/lang/zh/lang.php +++ b/lib/plugins/revert/lang/zh/lang.php @@ -10,6 +10,7 @@ * @author mr.jinyi@gmail.com * @author ben * @author lainme + * @author caii */ $lang['menu'] = '还原管理器'; $lang['filter'] = '搜索包含垃圾信息的页面'; diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php index bae5454d4..5836d3346 100644 --- a/lib/plugins/usermanager/lang/zh/lang.php +++ b/lib/plugins/usermanager/lang/zh/lang.php @@ -9,6 +9,7 @@ * @author mr.jinyi@gmail.com * @author ben * @author lainme + * @author caii */ $lang['menu'] = '用户管理器'; $lang['noauth'] = '（用户认证不可用）'; -- cgit v1.2.3 From 6d25230660047b2ed41895662830f40bb504acfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 5 Nov 2010 19:38:12 +0200 Subject: - copy over identical gif/jpg/png/jpeg fileicons --- lib/images/fileicons/gif.png | Bin 1001 -> 1001 bytes lib/images/fileicons/jpg.png | Bin 1001 -> 1001 bytes lib/images/fileicons/png.png | Bin 1001 -> 1001 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'lib') diff --git a/lib/images/fileicons/gif.png b/lib/images/fileicons/gif.png index b4c07a912..aa4cc23a5 100644 Binary files a/lib/images/fileicons/gif.png and b/lib/images/fileicons/gif.png differ diff --git a/lib/images/fileicons/jpg.png b/lib/images/fileicons/jpg.png index 1fb6cc1fb..aa4cc23a5 100644 Binary files a/lib/images/fileicons/jpg.png and b/lib/images/fileicons/jpg.png differ diff --git a/lib/images/fileicons/png.png b/lib/images/fileicons/png.png index f0b5b00ee..aa4cc23a5 100644 Binary files a/lib/images/fileicons/png.png and b/lib/images/fileicons/png.png differ -- cgit v1.2.3 From 498b41e8fc3117e4c504d88f0b9f6e52901cde0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 5 Nov 2010 19:40:36 +0200 Subject: - copy over identical sxd,odi,odg fileicons --- lib/images/fileicons/odg.png | Bin 788 -> 788 bytes lib/images/fileicons/sxd.png | Bin 788 -> 788 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'lib') diff --git a/lib/images/fileicons/odg.png b/lib/images/fileicons/odg.png index 434f18262..74f6303d3 100644 Binary files a/lib/images/fileicons/odg.png and b/lib/images/fileicons/odg.png differ diff --git a/lib/images/fileicons/sxd.png b/lib/images/fileicons/sxd.png index 5801bb23a..74f6303d3 100644 Binary files a/lib/images/fileicons/sxd.png and b/lib/images/fileicons/sxd.png differ -- cgit v1.2.3 From d22e55a482c55a0d2d5a02059052a7e67bad753c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 5 Nov 2010 19:43:09 +0200 Subject: - copy over identical sxc,ods,odc fileicons --- lib/images/fileicons/ods.png | Bin 749 -> 749 bytes lib/images/fileicons/sxc.png | Bin 749 -> 749 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'lib') diff --git a/lib/images/fileicons/ods.png b/lib/images/fileicons/ods.png index 2ab1273f0..47f65c84d 100644 Binary files a/lib/images/fileicons/ods.png and b/lib/images/fileicons/ods.png differ diff --git a/lib/images/fileicons/sxc.png b/lib/images/fileicons/sxc.png index 419c183c1..47f65c84d 100644 Binary files a/lib/images/fileicons/sxc.png and b/lib/images/fileicons/sxc.png differ -- cgit v1.2.3 From b1f351c4d88309fe4eb69180f83c2a1c5988fd40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 5 Nov 2010 19:44:12 +0200 Subject: - copy over identical html,htm fileicons --- lib/images/fileicons/html.png | Bin 748 -> 748 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'lib') diff --git a/lib/images/fileicons/html.png b/lib/images/fileicons/html.png index 672cbce42..1a6812185 100644 Binary files a/lib/images/fileicons/html.png and b/lib/images/fileicons/html.png differ -- cgit v1.2.3 From 2fb33dcf5c001498d49d2beaba4f394aa435230e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 5 Nov 2010 19:45:02 +0200 Subject: - copy over identical sxi,odp fileicons --- lib/images/fileicons/odp.png | Bin 744 -> 744 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'lib') diff --git a/lib/images/fileicons/odp.png b/lib/images/fileicons/odp.png index a5c77f845..2a94290d7 100644 Binary files a/lib/images/fileicons/odp.png and b/lib/images/fileicons/odp.png differ -- cgit v1.2.3 From 4ad466ff6bff4815a9582afd3e37808635fe297b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 5 Nov 2010 20:04:47 +0200 Subject: - copy over identical tgz,gz fileicons --- lib/images/fileicons/tgz.png | Bin 716 -> 716 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'lib') diff --git a/lib/images/fileicons/tgz.png b/lib/images/fileicons/tgz.png index 141acf564..2426bd169 100644 Binary files a/lib/images/fileicons/tgz.png and b/lib/images/fileicons/tgz.png differ -- cgit v1.2.3 From 9c1c56fd8f997025e879c7a36f6d3c5022b925ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 5 Nov 2010 20:05:47 +0200 Subject: - copy over identical sxw,odt fileicons --- lib/images/fileicons/sxw.png | Bin 577 -> 577 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'lib') diff --git a/lib/images/fileicons/sxw.png b/lib/images/fileicons/sxw.png index 6da97beb3..b0c21fc1f 100644 Binary files a/lib/images/fileicons/sxw.png and b/lib/images/fileicons/sxw.png differ -- cgit v1.2.3