From e0dd04a6493f1b7f7133f75c08f9ea55ee8bd50a Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 14 Oct 2011 16:39:36 +0200 Subject: Added bcrypt support for password hashes This method require PHP 5.3+ it will fail otherwise! --- lib/plugins/config/settings/config.metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5f2c32ea7..ba14eb85a 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -123,7 +123,7 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5','bcrypt')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); -- cgit v1.2.3 From 5505dd9afd380c1676d9d0cef3e10d5be06ffee2 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Sun, 27 Nov 2011 01:22:40 +0100 Subject: Fixed XML-RPC getAttachment method. Without creating an IXR_Base64 object, the file will be encoded as base64, but send as string. The client XML-RPC parser cannot detect that it is meant to be a base64 encoded file. --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index e5e3298ae..3a05c886d 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -311,7 +311,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return new IXR_Error(1, 'The requested file does not exist'); $data = io_readFile($file, false); - $base64 = base64_encode($data); + $base64 = new IXR_Base64($data); return $base64; } -- cgit v1.2.3 From 502a92e072be7b42750b4c9032e7269d1fd7c7b4 Mon Sep 17 00:00:00 2001 From: Patrick Michel Date: Sun, 27 Nov 2011 10:55:27 +0100 Subject: MD5 password hash format of the LDAP RFC FS#2378 This implements the salted MD5 password hash format of the LDAP RFC. The format is quite simple the password, followed by the 8 byte hash in base64 encoding, which results in 32 characters, prepended with the string "{smd5}". --- lib/plugins/config/settings/config.metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5f2c32ea7..c943a2fad 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -123,7 +123,7 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','smd6','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); -- cgit v1.2.3 From 491a2c68bc685e7e0cd4f9622ef4051e4a580d62 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 11:08:07 +0100 Subject: renamed passhash method smd6 to lsmd5 --- lib/plugins/config/settings/config.metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index c943a2fad..0315ecae6 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -123,7 +123,7 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','smd6','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); -- cgit v1.2.3 From 3f3bb97fcdd30282632d96a5bb19d2ea61c01504 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Mon, 28 Nov 2011 20:59:49 +0100 Subject: removed dublicated content --- lib/exe/xmlrpc.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index e5e3298ae..cb8dbf42d 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -21,6 +21,7 @@ if(!$conf['xmlrpc']) die('XML-RPC server not enabled.'); class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { var $methods = array(); var $public_methods = array(); + var $remote; /** * Checks if the current user is allowed to execute non anonymous methods @@ -67,6 +68,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * Constructor. Register methods and run Server */ function dokuwiki_xmlrpc_server(){ + $this->remote = new RemoteAPI(); $this->IXR_IntrospectionServer(); /* DokuWiki's own methods */ @@ -284,16 +286,11 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * Return a raw wiki page */ function rawPage($id,$rev=''){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ + try { + return $this->remote->rawPage($id, $rev); + } catch(RemoteAccessDenied $e) { return new IXR_Error(1, 'You are not allowed to read this page'); } - $text = rawWiki($id,$rev); - if(!$text) { - return pageTemplate($id); - } else { - return $text; - } } /** -- cgit v1.2.3 From 1c122589394bb9150f09facdcd6e75d054eb69a4 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Tue, 29 Nov 2011 19:17:59 +0100 Subject: Using sensefull error codes. Since there are currently a lot of error coded returning 1, that mean completly different thing, i guess it would be very nice to change this. A client should not be forced to parse the error message, the error code should be enough to explain the error. This change suggests some error codes, that have a hierarchical structure. In the following list the categories begin with = and the error codes actually used with -. = 100 Page errors == 110 Page access errors --- 111 User is not allowed to read the requested page --- 112 User is not allowed to edit the page == 120 Page existance errors --- 121 The requested page does not exist == 130 Page edit errors --- 131 Empty page id --- 132 Empty page content --- 133 Page is locked --- 134 Positive wordblock check = 200 Media errors == 210 Media access errors --- 211 User is not allowed to read media --- 215 User is not allowed to list media == 220 Media existance errors --- 221 The requested media does not exist = 300 Search errors == 310 Argument errors --- 311 The provided value is not a valid timestamp == 320 Search result errors --- 321 No chances in specified timeframe --- lib/exe/xmlrpc.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 3a05c886d..5d19725a3 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -286,7 +286,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function rawPage($id,$rev=''){ $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } $text = rawWiki($id,$rev); if(!$text) { @@ -304,11 +304,11 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function getAttachment($id){ $id = cleanID($id); if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ) - return new IXR_Error(1, 'You are not allowed to read this file'); + return new IXR_Error(211, 'You are not allowed to read this file'); $file = mediaFN($id); if (!@ file_exists($file)) - return new IXR_Error(1, 'The requested file does not exist'); + return new IXR_Error(221, 'The requested file does not exist'); $data = io_readFile($file, false); $base64 = new IXR_Base64($data); @@ -342,7 +342,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function htmlPage($id,$rev=''){ $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } return p_wiki_xhtml($id,$rev,false); } @@ -462,7 +462,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { } return $data; } else { - return new IXR_Error(1, 'You are not allowed to list media files.'); + return new IXR_Error(215, 'You are not allowed to list media files.'); } } @@ -479,12 +479,12 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function pageInfo($id,$rev=''){ $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } $file = wikiFN($id,$rev); $time = @filemtime($file); if(!$time){ - return new IXR_Error(10, 'The requested page does not exist'); + return new IXR_Error(121, 'The requested page does not exist'); } $info = getRevisionInfo($id, $time, 1024); @@ -515,22 +515,22 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $minor = $params['minor']; if(empty($id)) - return new IXR_Error(1, 'Empty page ID'); + return new IXR_Error(131, 'Empty page ID'); if(!page_exists($id) && trim($TEXT) == '' ) { - return new IXR_ERROR(1, 'Refusing to write an empty new wiki page'); + return new IXR_ERROR(132, 'Refusing to write an empty new wiki page'); } if(auth_quickaclcheck($id) < AUTH_EDIT) - return new IXR_Error(1, 'You are not allowed to edit this page'); + return new IXR_Error(112, 'You are not allowed to edit this page'); // Check, if page is locked if(checklock($id)) - return new IXR_Error(1, 'The page is currently locked'); + return new IXR_Error(133, 'The page is currently locked'); // SPAM check if(checkwordblock()) - return new IXR_Error(1, 'Positive wordblock check'); + return new IXR_Error(134, 'Positive wordblock check'); // autoset summary on new pages if(!page_exists($id) && empty($sum)) { @@ -635,7 +635,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function listLinks($id) { $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } $links = array(); @@ -684,7 +684,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { */ function getRecentChanges($timestamp) { if(strlen($timestamp) != 10) - return new IXR_Error(20, 'The provided value is not a valid timestamp'); + return new IXR_Error(311, 'The provided value is not a valid timestamp'); $recents = getRecentsSince($timestamp); @@ -705,7 +705,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return $changes; } else { // in case we still have nothing at this point - return new IXR_Error(30, 'There are no changes in the specified timeframe'); + return new IXR_Error(321, 'There are no changes in the specified timeframe'); } } @@ -717,7 +717,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { */ function getRecentMediaChanges($timestamp) { if(strlen($timestamp) != 10) - return new IXR_Error(20, 'The provided value is not a valid timestamp'); + return new IXR_Error(311, 'The provided value is not a valid timestamp'); $recents = getRecentsSince($timestamp, null, '', RECENTS_MEDIA_CHANGES); @@ -738,7 +738,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return $changes; } else { // in case we still have nothing at this point - return new IXR_Error(30, 'There are no changes in the specified timeframe'); + return new IXR_Error(321, 'There are no changes in the specified timeframe'); } } @@ -750,14 +750,14 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function pageVersions($id, $first) { $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } global $conf; $versions = array(); if(empty($id)) - return new IXR_Error(1, 'Empty page ID'); + return new IXR_Error(131, 'Empty page ID'); $revisions = getRevisions($id, $first, $conf['recent']+1); -- cgit v1.2.3 From f3046d2bbd96dc9a501975392e76d6ae539cdf05 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Tue, 29 Nov 2011 20:42:35 +0100 Subject: Second part of the error codes. Forgot some :( Added the new error codes and categories: --- 212 Not allowed to delete media == 230 Media edit error --- 231 Filename not given --- 232 File is still referenced --- 233 Could not delete file --- lib/exe/xmlrpc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 5d19725a3..910271461 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -575,7 +575,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $auth = auth_quickaclcheck(getNS($id).':*'); if(!isset($id)) { - return new IXR_ERROR(1, 'Filename not given.'); + return new IXR_ERROR(231, 'Filename not given.'); } global $conf; @@ -611,11 +611,11 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { if ($res & DOKU_MEDIA_DELETED) { return 0; } elseif ($res & DOKU_MEDIA_NOT_AUTH) { - return new IXR_ERROR(1, "You don't have permissions to delete files."); + return new IXR_ERROR(212, "You don't have permissions to delete files."); } elseif ($res & DOKU_MEDIA_INUSE) { - return new IXR_ERROR(1, 'File is still referenced'); + return new IXR_ERROR(232, 'File is still referenced'); } else { - return new IXR_ERROR(1, 'Could not delete file'); + return new IXR_ERROR(233, 'Could not delete file'); } } -- cgit v1.2.3 From aafb4e36f7fdc95d371cffcf351c3611efd69945 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Thu, 1 Dec 2011 22:33:16 +0100 Subject: Fixed bug in XML-RPC search. The score was randomly transfered as string or as integer. This way it will always be transfered as an integer. --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 910271461..61e6f1e95 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -411,7 +411,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $pages[] = array( 'id' => $id, - 'score' => $score, + 'score' => intval($score), 'rev' => filemtime($file), 'mtime' => filemtime($file), 'size' => filesize($file), -- cgit v1.2.3 From fe092d886946cca23fa8ab1be240a356a1f60492 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 11 Dec 2011 11:24:19 +0100 Subject: transfered bugfix from dokuwiki 97a000f0551735b35606d94d59abc4ff440783a5 --- lib/exe/xmlrpc.php | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index cb8dbf42d..bcbae0a43 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -299,17 +299,16 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * @author Gina Haeussge */ function getAttachment($id){ - $id = cleanID($id); - if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ) - return new IXR_Error(1, 'You are not allowed to read this file'); - - $file = mediaFN($id); - if (!@ file_exists($file)) - return new IXR_Error(1, 'The requested file does not exist'); - - $data = io_readFile($file, false); - $base64 = base64_encode($data); - return $base64; + try { + try { + return $this->remote->getAttachment($id); + } catch (RemoteAccessDenied $e) { + return new IXR_Error(1, 'You are not allowed to read this file'); + } + } + catch (RemoteException $e) { + return new IXR_Error(1, $e->getMessage()); + } } /** @@ -318,18 +317,8 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * @author Gina Haeussge */ function getAttachmentInfo($id){ - $id = cleanID($id); - $info = array( - 'lastModified' => 0, - 'size' => 0, - ); - - $file = mediaFN($id); - if ((auth_quickaclcheck(getNS($id).':*') >= AUTH_READ) && file_exists($file)){ - $info['lastModified'] = new IXR_Date(filemtime($file)); - $info['size'] = filesize($file); - } - + $info = $this->remote->getAttachmentInfo($id); + $info['lastModified'] = new IXR_Date($info['lastModified']); return $info; } -- cgit v1.2.3 From d80d35e22221ff74c4374f34927a5097362e23d8 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Thu, 22 Dec 2011 19:11:31 +0100 Subject: added forgotten remote.php in lib/plugins --- lib/plugins/remote.php | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 lib/plugins/remote.php (limited to 'lib') diff --git a/lib/plugins/remote.php b/lib/plugins/remote.php new file mode 100644 index 000000000..42c2f53c8 --- /dev/null +++ b/lib/plugins/remote.php @@ -0,0 +1,11 @@ + Date: Sun, 8 Jan 2012 14:38:52 +0100 Subject: removed xmlrpc and xmlrpcuser - added remote and remoteuser config option --- lib/plugins/config/lang/ar/lang.php | 2 -- lib/plugins/config/lang/bg/lang.php | 2 -- lib/plugins/config/lang/ca-valencia/lang.php | 2 -- lib/plugins/config/lang/ca/lang.php | 2 -- lib/plugins/config/lang/cs/lang.php | 2 -- lib/plugins/config/lang/da/lang.php | 2 -- lib/plugins/config/lang/de-informal/lang.php | 2 -- lib/plugins/config/lang/de/lang.php | 2 -- lib/plugins/config/lang/el/lang.php | 4 +--- lib/plugins/config/lang/en/lang.php | 4 ++-- lib/plugins/config/lang/eo/lang.php | 2 -- lib/plugins/config/lang/es/lang.php | 2 -- lib/plugins/config/lang/eu/lang.php | 2 -- lib/plugins/config/lang/fa/lang.php | 2 -- lib/plugins/config/lang/fi/lang.php | 2 -- lib/plugins/config/lang/fr/lang.php | 2 -- lib/plugins/config/lang/gl/lang.php | 2 -- lib/plugins/config/lang/he/lang.php | 1 - lib/plugins/config/lang/hu/lang.php | 2 -- lib/plugins/config/lang/ia/lang.php | 2 -- lib/plugins/config/lang/id-ni/lang.php | 1 - lib/plugins/config/lang/it/lang.php | 2 -- lib/plugins/config/lang/ja/lang.php | 2 -- lib/plugins/config/lang/ko/lang.php | 2 -- lib/plugins/config/lang/la/lang.php | 2 -- lib/plugins/config/lang/lv/lang.php | 2 -- lib/plugins/config/lang/mr/lang.php | 2 -- lib/plugins/config/lang/nl/lang.php | 2 -- lib/plugins/config/lang/no/lang.php | 3 --- lib/plugins/config/lang/pl/lang.php | 2 -- lib/plugins/config/lang/pt-br/lang.php | 2 -- lib/plugins/config/lang/pt/lang.php | 2 -- lib/plugins/config/lang/ro/lang.php | 2 -- lib/plugins/config/lang/ru/lang.php | 2 -- lib/plugins/config/lang/sk/lang.php | 2 -- lib/plugins/config/lang/sl/lang.php | 2 -- lib/plugins/config/lang/sq/lang.php | 2 -- lib/plugins/config/lang/sr/lang.php | 2 -- lib/plugins/config/lang/sv/lang.php | 2 -- lib/plugins/config/lang/th/lang.php | 1 - lib/plugins/config/lang/uk/lang.php | 2 -- lib/plugins/config/lang/zh-tw/lang.php | 2 -- lib/plugins/config/lang/zh/lang.php | 2 -- lib/plugins/config/settings/config.metadata.php | 4 ++-- 44 files changed, 5 insertions(+), 87 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php index 63d258485..3855f4ac1 100644 --- a/lib/plugins/config/lang/ar/lang.php +++ b/lib/plugins/config/lang/ar/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'اجراءات أخرى (مفصولة بالف $lang['sneaky_index'] = 'افتراضيا، ستعرض دوكو ويكي كل اسماء النطاقات في عرض الفهرس. تفعيل هذا الخيار سيخفي مالا يملك المستخدم صلاحية قراءته. قد يؤدي هذا إلى اخفاء نطاقات فرعية متاحة. وقد يؤدي لجعل صفحة الفهرس معطلة في بعض اعدادات ACL.'; $lang['auth_security_timeout'] = 'زمن انتهاء أمان المواثقة (ثوان)'; $lang['securecookie'] = 'هل يفرض على كعكات التصفح المعدة عبر HTTPS ان ترسل فقط عبر HTTPS من قبل المتصفح؟ عطل هذا إن كان الولوج للويكي مؤمنا فقط عبر SSL لكن تصفح الويكي غير مؤمن.'; -$lang['xmlrpc'] = 'مكّن/عطل واجهة XML-RPC.'; -$lang['xmlrpcuser'] = 'احصر الوصول لـ XML-RPC بمستخدمين أو مجموعات مفصولة بالفاصلة هنا. اتركها فارغة لتمكين الوصول للجميع.'; $lang['updatecheck'] = 'تحقق من التحديثات و تنبيهات الأمان؟ دوكو ويكي ستحتاج للاتصال ب update.dokuwiki.org لأجل ذلك'; $lang['userewrite'] = 'استعمل عناوين URLs جميلة'; $lang['useslash'] = 'استخدم الشرطة كفاصل النطاق في العناوين'; diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php index ff03fd9e2..8f61e96c0 100644 --- a/lib/plugins/config/lang/bg/lang.php +++ b/lib/plugins/config/lang/bg/lang.php @@ -88,8 +88,6 @@ $lang['sneaky_index'] = 'Стандартно DokuWiki ще показ $lang['auth_security_timeout'] = 'Автоматично проверяване на удостоверяването всеки (сек)'; $lang['securecookie'] = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL. '; -$lang['xmlrpc'] = 'Включване/Изключване на интерфейса XML-RPC.'; -$lang['xmlrpcuser'] = 'Ограничаване на XML-RPC достъпа до отделени със запетая групи или потребители. Оставете празно, за да даде достъп на всеки.'; $lang['updatecheck'] = 'Проверяване за за нови версии и предупреждения за сигурността? Необходимо е Dokiwiki да може да се свързва със update.dokuwiki.org за тази функционалност.'; $lang['userewrite'] = 'Ползване на nice URL адреси'; $lang['useslash'] = 'Ползване на наклонена черта за разделител на именните пространства в URL'; diff --git a/lib/plugins/config/lang/ca-valencia/lang.php b/lib/plugins/config/lang/ca-valencia/lang.php index 76f11a4a5..4a8c10895 100644 --- a/lib/plugins/config/lang/ca-valencia/lang.php +++ b/lib/plugins/config/lang/ca-valencia/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'Atres accions (separades per comes)'; $lang['sneaky_index'] = 'Normalment, DokuWiki mostra tots els espais de noms en la vista d\'índex. Activant esta opció s\'ocultaran aquells per als que l\'usuari no tinga permís de llectura. Açò pot ocultar subespais accessibles i inutilisar l\'índex per a certes configuracions del ACL.'; $lang['auth_security_timeout'] = 'Temps de seguritat màxim per a l\'autenticació (segons)'; $lang['securecookie'] = '¿El navegador deuria enviar per HTTPS només les galletes que s\'han generat per HTTPS? Desactive esta opció quan utilise SSL només en la pàgina d\'inici de sessió.'; -$lang['xmlrpc'] = 'Activar/desactivar interfaç XML-RPC.'; -$lang['xmlrpcuser'] = 'Restringir l\'accés XML-RPC a la llista d\'usuaris i grups separada per comes definida ací. Deixar buit per a donar accés a tots.'; $lang['updatecheck'] = '¿Buscar actualisacions i advertències de seguritat? DokuWiki necessita conectar a update.dokuwiki.org per ad açò.'; $lang['userewrite'] = 'Utilisar URL millorades'; $lang['useslash'] = 'Utilisar \'/\' per a separar espais de noms en les URL'; diff --git a/lib/plugins/config/lang/ca/lang.php b/lib/plugins/config/lang/ca/lang.php index 1a2a22881..84680450a 100644 --- a/lib/plugins/config/lang/ca/lang.php +++ b/lib/plugins/config/lang/ca/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'Altres accions (separades per comes)'; $lang['sneaky_index'] = 'Per defecte, DokuWiki mostrarà tots els espai en la visualització d\'índex. Si activeu aquest paràmetre, s\'ocultaran aquells espais en els quals l\'usuari no té accés de lectura. Això pot fer que s\'ocultin subespais que sí que són accessibles. En algunes configuracions ACL pot fer que l\'índex resulti inutilitzable.'; $lang['auth_security_timeout'] = 'Temps d\'espera de seguretat en l\'autenticació (segons)'; $lang['securecookie'] = 'Les galetes que s\'han creat via HTTPS, només s\'han d\'enviar des del navegador per HTTPS? Inhabiliteu aquesta opció si només l\'inici de sessió del wiki es fa amb SSL i la navegació del wiki es fa sense seguretat.'; -$lang['xmlrpc'] = 'Habilita/inhabilita la interfície XML-RPC'; -$lang['xmlrpcuser'] = 'Restringeix l\'accés per XML-RPC als usuaris o grups següents, separats per comes. Deixeu aquest camp en blanc per donar accés a tothom.'; $lang['updatecheck'] = 'Comprova actualitzacions i avisos de seguretat. DokuWiki necessitarà contactar amb update.dokuwiki.org per utilitzar aquesta característica.'; $lang['userewrite'] = 'Utilitza URL nets'; $lang['useslash'] = 'Utilitza la barra / com a separador d\'espais en els URL'; diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php index bf87e99d5..b9e6049a5 100644 --- a/lib/plugins/config/lang/cs/lang.php +++ b/lib/plugins/config/lang/cs/lang.php @@ -99,8 +99,6 @@ To může mít za následek, že index bude při některých nastaveních ACL nepoužitelný.'; $lang['auth_security_timeout'] = 'Časový limit pro autentikaci (v sekundách)'; $lang['securecookie'] = 'Má prohlížeč posílat cookies nastavené přes HTTPS opět jen přes HTTPS? Vypněte tuto volbu, pokud chcete, aby bylo pomocí SSL zabezpečeno pouze přihlašování do wiki, ale obsah budete prohlížet nezabezpečeně.'; -$lang['xmlrpc'] = 'Povolit/Zakázat rozhraní XML-RPC.'; -$lang['xmlrpcuser'] = 'Omezit přístup pomocí XML-RPC pouze na zde zadané skupiny či uživatele (oddělené čárkami). Necháte-li pole prázdné, dáte přístup komukoliv.'; $lang['updatecheck'] = 'Kontrolovat aktualizace a bezpečnostní varování? DokuWiki potřebuje pro tuto funkci přístup k update.dokuwiki.org'; $lang['userewrite'] = 'Používat "pěkná" URL'; $lang['useslash'] = 'Používat lomítko jako oddělovač jmenných prostorů v URL'; diff --git a/lib/plugins/config/lang/da/lang.php b/lib/plugins/config/lang/da/lang.php index a4c0bba75..7e8fe95af 100644 --- a/lib/plugins/config/lang/da/lang.php +++ b/lib/plugins/config/lang/da/lang.php @@ -92,8 +92,6 @@ $lang['disableactions_other'] = 'Andre muligheder (kommasepareret)'; $lang['sneaky_index'] = 'DokuWiki vil som standard vise alle navnerum i indholdsfortegnelsen. Ved at slå denne valgmulighed til vil skjule de navnerum, hvor brugeren ikke har læsetilladelse. Dette kan føre til, at tilgængelige undernavnerum bliver skjult. Ligeledes kan det også gøre indholdsfortegnelsen ubrugelig med visse ACL-opsætninger.'; $lang['auth_security_timeout'] = 'Tidsudløb for bekræftelse (sekunder)'; $lang['securecookie'] = 'Skal datafiler skabt af HTTPS kun sendes af HTTPS gennem browseren? Slå denne valgmulighed fra hvis kun brugen af din wiki er SSL-beskyttet, mens den almindelige tilgang udefra ikke er sikret.'; -$lang['xmlrpc'] = 'Slå XML-RPC-grænseflade til/fra.'; -$lang['xmlrpcuser'] = 'Begræns XML-RPC-adgang til de nævnte og med komma adskilte grupper eller brugere. Lad den stå tom for at give alle adgang.'; $lang['updatecheck'] = 'Kig efter opdateringer og sikkerhedsadvarsler? DokuWiki er nødt til at kontakte update.dokuwiki.org for at tilgå denne funktion.'; $lang['userewrite'] = 'Brug pæne netadresser'; $lang['useslash'] = 'Brug skråstreg som navnerumsdeler i netadresser'; diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index e63735edf..505d71a40 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -88,8 +88,6 @@ $lang['disableactions_other'] = 'Weitere Aktionen (durch Komma getrennt)'; $lang['sneaky_index'] = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Indexansicht an. Bei Aktivierung dieser Einstellung werden alle Namensräume versteckt, in welchen der Benutzer keine Leserechte hat. Dies könnte dazu führen, dass lesbare Unternamensräume versteckt werden. Dies kann die Indexansicht bei bestimmten Zugangskontrolleinstellungen unbenutzbar machen.'; $lang['auth_security_timeout'] = 'Zeitüberschreitung bei der Authentifizierung (Sekunden)'; $lang['securecookie'] = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktiviere diese Option, wenn nur der Login deines Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.'; -$lang['xmlrpc'] = 'Aktiviere/Deaktiviere die XML-RPC-Schnittstelle'; -$lang['xmlrpcuser'] = 'XML-RPC-Zugriff auf folgende Gruppen oder Benutzer (kommasepariert) beschränken. Wenn du dieses Feld leer lässt, wir der Zugriff jedem gewährt.'; $lang['updatecheck'] = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.'; $lang['userewrite'] = 'Benutze schöne URLs'; $lang['useslash'] = 'Benutze Schrägstrich als Namensraumtrenner in URLs'; diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index 1fb549597..79c6554e3 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -99,8 +99,6 @@ $lang['disableactions_other'] = 'Andere Aktionen (durch Komma getrennt)'; $lang['sneaky_index'] = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Übersicht. Wenn diese Option aktiviert wird, werden alle Namensräume, für die der Benutzer keine Lese-Rechte hat, nicht angezeigt. Dies kann unter Umständen dazu führen, das lesbare Unter-Namensräume nicht angezeigt werden und macht die Übersicht evtl. unbrauchbar in Kombination mit bestimmten ACL Einstellungen.'; $lang['auth_security_timeout'] = 'Authentifikations-Timeout (Sekunden)'; $lang['securecookie'] = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktivieren Sie diese Option, wenn nur der Login Ihres Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.'; -$lang['xmlrpc'] = 'XML-RPC-Zugriff erlauben.'; -$lang['xmlrpcuser'] = 'XML-RPC-Zugriff auf folgende Gruppen oder Benutzer (kommasepariert) beschränken. Wenn Sie dieses Feld leer lassen, wir der Zugriff jedem gewährt.'; $lang['updatecheck'] = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.'; $lang['userewrite'] = 'URL rewriting'; $lang['useslash'] = 'Schrägstrich (/) als Namensraumtrenner in URLs verwenden'; diff --git a/lib/plugins/config/lang/el/lang.php b/lib/plugins/config/lang/el/lang.php index 9f5d121de..093212664 100644 --- a/lib/plugins/config/lang/el/lang.php +++ b/lib/plugins/config/lang/el/lang.php @@ -93,8 +93,6 @@ $lang['disableactions_other'] = 'Άλλες λειτουργίες (διαχω $lang['sneaky_index'] = 'Εξ ορισμού, η εφαρμογή DokuWiki δείχνει όλους τους φακέλους στην προβολή Καταλόγου. Ενεργοποιώντας αυτή την επιλογή, δεν θα εμφανίζονται οι φάκελοι για τους οποίους ο χρήστης δεν έχει δικαιώματα ανάγνωσης αλλά και οι υπο-φάκελοί τους ανεξαρτήτως δικαιωμάτων πρόσβασης.'; $lang['auth_security_timeout'] = 'Διάρκεια χρόνου για ασφάλεια πιστοποίησης (δευτερόλεπτα)'; $lang['securecookie'] = 'Τα cookies που έχουν οριστεί μέσω HTTPS πρέπει επίσης να αποστέλλονται μόνο μέσω HTTPS από τον φυλλομετρητή? Απενεργοποιήστε αυτή την επιλογή όταν μόνο η είσοδος στο wiki σας διασφαλίζεται μέσω SSL αλλά η περιήγηση γίνεται και χωρίς αυτό.'; -$lang['xmlrpc'] = 'Ενεργοποίηση/Απενεργοποίηση της διασύνδεσης XML-RPC '; -$lang['xmlrpcuser'] = 'Περιορισμός XML-RPC πρόσβασης στις ομάδες η τους χρήστες (διαχωριζόμενοι με κόμμα). Αφήστε το κενό για πρόσβαση από όλους.'; $lang['updatecheck'] = 'Έλεγχος για ύπαρξη νέων εκδόσεων και ενημερώσεων ασφαλείας της εφαρμογής? Απαιτείται η σύνδεση με το update.dokuwiki.org για να λειτουργήσει σωστά αυτή η επιλογή.'; $lang['userewrite'] = 'Χρήση ωραίων URLs'; $lang['useslash'] = 'Χρήση slash σαν διαχωριστικό φακέλων στα URLs'; @@ -118,7 +116,7 @@ $lang['jpg_quality'] = 'Ποιότητα συμπίεσης JPG (0-100 $lang['subscribers'] = 'Να επιτρέπεται η εγγραφή στην ενημέρωση αλλαγών σελίδας'; $lang['subscribe_time'] = 'Χρόνος μετά τον οποίο οι λίστες ειδοποιήσεων και τα συνοπτικά θα αποστέλλονται (δευτερόλεπτα). Αυτό θα πρέπει να είναι μικρότερο από τον χρόνο που έχει η ρύθμιση recent_days.'; $lang['compress'] = 'Συμπίεση αρχείων CSS και javascript'; -$lang['cssdatauri'] = 'Το μέγεθος σε bytes στο οποίο οι εικόνες που αναφέρονται σε CSS αρχεία θα πρέπει να είναι ενσωματωμένες για τη μείωση των απαιτήσεων μιας κεφαλίδας αίτησης HTTP . Αυτή η τεχνική δεν θα λειτουργήσει σε IE <8! 400 με 600 bytes είναι μια καλή τιμή. Ορίστε την τιμή 0 για να το απενεργοποιήσετε.'; +$lang['cssdatauri'] = 'Το μέγεθος σε bytes στο οποίο οι εικόνες που αναφέρονται σε CSS αρχεία θα πρέπει να είναι ενσωματωμένες για τη μείωση των απαιτήσεων μιας κεφαλίδας αίτησης HTTP . Αυτή η τεχνική δεν θα λειτουργήσει σε IE <8! 400 με 600 bytes είναι μια καλή τιμή. Ορίστε την τιμή 0 για να το απενεργοποιήσετε.'; $lang['hidepages'] = 'Φίλτρο απόκρυψης σελίδων (regular expressions)'; $lang['send404'] = 'Αποστολή "HTTP 404/Page Not Found" για σελίδες που δεν υπάρχουν'; $lang['sitemap'] = 'Δημιουργία Google sitemap (ημέρες)'; diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 380f2fd1d..27f754c2c 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -107,8 +107,8 @@ $lang['disableactions_other'] = 'Other actions (comma separated)'; $lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; $lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)'; $lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.'; -$lang['xmlrpc'] = 'Enable/disable XML-RPC interface.'; -$lang['xmlrpcuser'] = 'Restrict XML-RPC access to the comma separated groups or users given here. Leave empty to give access to everyone.'; +$lang['remote'] = 'Enable/disable Remote interface.'; +$lang['remoteuser'] = 'Restrict Remote access to the comma separated groups or users given here. Leave empty to give access to everyone.'; /* Advanced Options */ $lang['updatecheck'] = 'Check for updates and security warnings? DokuWiki needs to contact update.dokuwiki.org for this feature.'; diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php index b0411ec14..3acb00545 100644 --- a/lib/plugins/config/lang/eo/lang.php +++ b/lib/plugins/config/lang/eo/lang.php @@ -93,8 +93,6 @@ $lang['disableactions_other'] = 'Aliaj agoj (apartite per komoj)'; $lang['sneaky_index'] = 'Apriore, DokuWiki montras ĉiujn nomspacojn en la indeksa modo. Ebligi tiun ĉi elekteblon kaŝus tion, kion la uzanto ne rajtas legi laŭ ACL. Tio povus rezulti ankaŭan kaŝon de alireblaj subnomspacoj. Kaj tiel la indekso estus neuzebla por kelkaj agordoj de ACL.'; $lang['auth_security_timeout'] = 'Sekureca Templimo por aŭtentigo (sekundoj)'; $lang['securecookie'] = 'Ĉu kuketoj difinitaj per HTTPS nur estu senditaj de la foliumilo per HTTPS? Malebligu tiun ĉi opcion kiam nur la ensaluto al via vikio estas sekurigita per SSL, sed foliumado de la vikio estas farita malsekure.'; -$lang['xmlrpc'] = 'Ebligi/malebligi la interfacon XML-RPC.'; -$lang['xmlrpcuser'] = 'Permesi XML-RPC-an aliron al certaj grupoj aŭ uzantoj, bonvolu meti iliajn komoseparitajn nomojn tie ĉi. Alirebli de ĉiu, ĝin lasu malplena.'; $lang['updatecheck'] = 'Ĉu kontroli aktualigojn kaj sekurecajn avizojn? DokuWiki bezonas kontakti update.dokuwiki.org por tiu ĉi trajto.'; $lang['userewrite'] = 'Uzi netajn URL-ojn'; $lang['useslash'] = 'Uzi frakcistrekon kiel apartigsignaĵo por nomspacoj en URL-oj'; diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php index 1189a6781..fd911433c 100644 --- a/lib/plugins/config/lang/es/lang.php +++ b/lib/plugins/config/lang/es/lang.php @@ -102,8 +102,6 @@ $lang['disableactions_other'] = 'Otras acciones (separadas por coma)'; $lang['sneaky_index'] = 'Por defecto, DokuWiki mostrará todos los namespaces en el index. Habilitando esta opción los ocultará si el usuario no tiene permisos de lectura. Los sub-namespaces pueden resultar inaccesibles. El index puede hacerse poco usable dependiendo de las configuraciones ACL.'; $lang['auth_security_timeout'] = 'Tiempo de Autenticación (en segundos), por motivos de seguridad'; $lang['securecookie'] = 'Las cookies establecidas por HTTPS, ¿el naveagdor solo puede enviarlas por HTTPS? Inhabilite esta opción cuando solo se asegure con SSL la entrada, pero no la navegación de su wiki.'; -$lang['xmlrpc'] = 'Habilitar/Deshabilitar interfaz XML-RPC'; -$lang['xmlrpcuser'] = 'Restringir el acceso XML-RPC a los grupos o usuarios separados por coma mencionados aquí. Dejar en blanco para dar acceso a todo el mundo. '; $lang['updatecheck'] = '¿Comprobar actualizaciones y advertencias de seguridad? Esta característica requiere que DokuWiki se conecte a update.dokuwiki.org.'; $lang['userewrite'] = 'Usar URLs bonitas'; $lang['useslash'] = 'Usar barra (/) como separador de espacios de nombres en las URLs'; diff --git a/lib/plugins/config/lang/eu/lang.php b/lib/plugins/config/lang/eu/lang.php index 9d001d494..97addbb50 100644 --- a/lib/plugins/config/lang/eu/lang.php +++ b/lib/plugins/config/lang/eu/lang.php @@ -83,8 +83,6 @@ $lang['disableactions_other'] = 'Beste ekintzak (komaz bereiztuak)'; $lang['sneaky_index'] = 'Lehenespenez, DokuWiki-k izen-espazio guztiak indize bistan erakutsiko ditu. Aukera hau gaituta, erabiltzaieak irakurtzeko baimenik ez dituen izen-espazioak ezkutatuko dira. Honek atzigarriak diren azpi izen-espazioak ezkutatzen ditu. Agian honek indizea erabili ezin ahal izatea eragingo du AKL ezarpen batzuetan.'; $lang['auth_security_timeout'] = 'Kautotze Segurtasun Denbora-Muga (segunduak)'; $lang['securecookie'] = 'HTTPS bidez ezarritako cookie-ak HTTPS bidez bakarrik bidali beharko lituzke nabigatzaileak? Ezgaitu aukera hau bakarrik saio hasierak SSL bidezko segurtasuna badu baina wiki-areb nabigazioa modu ez seguruan egiten bada. '; -$lang['xmlrpc'] = 'Gaitu/ezgaitu XML-RPC interfazea.'; -$lang['xmlrpcuser'] = 'XML-RPC atzipena mugatu hemen emandako komaz bereiztutako talde eta erabiltzaileei. Utzi hutsik atzipena guztiei emateko.'; $lang['updatecheck'] = 'Konprobatu eguneratze eta segurtasun oharrak? DokuWiki-k honetarako update.dokuwiki.org kontaktatu behar du.'; $lang['userewrite'] = 'Erabili URL politak'; $lang['useslash'] = 'Erabili barra (/) izen-espazio banatzaile moduan URLetan'; diff --git a/lib/plugins/config/lang/fa/lang.php b/lib/plugins/config/lang/fa/lang.php index 42cc3ed05..c1a112365 100644 --- a/lib/plugins/config/lang/fa/lang.php +++ b/lib/plugins/config/lang/fa/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'فعالیت‌های دیگر (با ویرگ $lang['sneaky_index'] = 'به طور پیش‌فرض، DokuWiki در فهرست تمامی فضای‌نام‌ها را نمایش می‌دهد. فعال کردن این گزینه، مواردی را که کاربر حق خواندنشان را ندارد مخفی می‌کند. این گزینه ممکن است باعث دیده نشدن زیرفضای‌نام‌هایی شود که دسترسی خواندن به آن‌ها وجود دارد. و ممکن است باعث شود که فهرست در حالاتی از دسترسی‌ها، غیرقابل استفاده شود.'; $lang['auth_security_timeout'] = 'زمان انقضای معتبرسازی به ثانیه'; $lang['securecookie'] = 'آیا کوکی‌ها باید با قرارداد HTTPS ارسال شوند؟ این گزینه را زمانی که فقط صفحه‌ی ورود ویکی‌تان با SSL امن شده است، اما ویکی را ناامن مرور می‌کنید، غیرفعال نمایید.'; -$lang['xmlrpc'] = 'فعال/غیرفعال کردن XML-RPC'; -$lang['xmlrpcuser'] = 'محمدود کردن دسترسی به XML-RPC توسط گروه های جدا شده توسط ویرگول ویا اعضای داده شده در اینجا. این مکان را خالی بگزارید تا به همه دسترسی داده شود.'; $lang['updatecheck'] = 'هشدارهای به روز رسانی و امنیتی بررسی شود؟ برای این‌کار DokuWiki با سرور update.dokuwiki.org تماس خواهد گرفت.'; $lang['userewrite'] = 'از زیباکننده‌ی آدرس‌ها استفاده شود'; $lang['useslash'] = 'از اسلش «/» برای جداکننده‌ی آدرس فضای‌نام‌ها استفاده شود'; diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php index 9598a0d93..f75a18ecd 100644 --- a/lib/plugins/config/lang/fi/lang.php +++ b/lib/plugins/config/lang/fi/lang.php @@ -88,8 +88,6 @@ $lang['disableactions_other'] = 'Muut toiminnot (pilkulla erotettuna)'; $lang['sneaky_index'] = 'Oletuksena DokuWiki näyttää kaikki nimiavaruudet index-näkymäsä. Tämä asetus piilottaa ne, joihin käyttäjällä ei ole lukuoikeuksia. Tämä voi piilottaa joitakin sallittuja alinimiavaruuksia. Tästä johtuen index-näkymä voi olla käyttökelvoton joillakin ACL-asetuksilla'; $lang['auth_security_timeout'] = 'Autentikoinnin aikakatkaisu (sekunteja)'; $lang['securecookie'] = 'Lähetetäänkö HTTPS:n kautta asetetut evästetiedot HTTPS-yhteydellä? Kytke pois, jos vain wikisi kirjautuminen on suojattu SSL:n avulla, mutta muuten wikiä käytetään ilman suojausta.'; -$lang['xmlrpc'] = 'Käytä/poista XML-RPC liityntää'; -$lang['xmlrpcuser'] = 'Estä XML-RPC:n käyttö pilkulla erotetun listan ryhmille tai käyttäjille. Jätä tyhjäksi salliaksesi käyttö kaikille.'; $lang['updatecheck'] = 'Tarkista päivityksiä ja turvavaroituksia? Tätä varten DokuWikin pitää ottaa yhteys update.dokuwiki.orgiin.'; $lang['userewrite'] = 'Käytä siivottuja URLeja'; $lang['useslash'] = 'Käytä kauttaviivaa nimiavaruuksien erottimena URL-osoitteissa'; diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 8f669a629..42a7f8d07 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -96,8 +96,6 @@ $lang['disableactions_other'] = 'Autres actions (séparées par des virgules)'; $lang['sneaky_index'] = 'Par défaut, DokuWiki affichera toutes les catégories dans la vue par index. Activer cette option permet de cacher celles pour lesquelles l\'utilisateur n\'a pas la permission de lecture. Il peut en résulter le masquage de sous-catégories accessibles. Ceci peut rendre l\'index inutilisable avec certaines ACL.'; $lang['auth_security_timeout'] = 'Délai d\'expiration de sécurité (secondes)'; $lang['securecookie'] = 'Les cookies mis via HTTPS doivent-ils n\'être envoyé par le navigateur que via HTTPS ? Ne désactivez cette option que si la connexion à votre wiki est sécurisée avec SSL mais que la navigation sur le wiki n\'est pas sécurisée.'; -$lang['xmlrpc'] = 'Activer l\'interface XML-RPC.'; -$lang['xmlrpcuser'] = 'Restreindre l\'accès à XML-RPC aux groupes et utilisateurs indiqués ici. Laisser vide afin que tout le monde y ait accès.'; $lang['updatecheck'] = 'Vérifier les mises à jour ? DokuWiki doit pouvoir contacter update.dokuwiki.org.'; $lang['userewrite'] = 'URL esthétiques'; $lang['useslash'] = 'Utiliser « / » comme séparateur de catégorie dans les URL'; diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php index 07d62b7af..861336371 100644 --- a/lib/plugins/config/lang/gl/lang.php +++ b/lib/plugins/config/lang/gl/lang.php @@ -84,8 +84,6 @@ $lang['disableactions_other'] = 'Outras accións (separadas por comas)'; $lang['sneaky_index'] = 'O DokuWiki amosará por defecto todos os nomes de espazo na vista de índice. Se activas isto agocharanse aqueles onde o usuario non teña permisos de lectura.'; $lang['auth_security_timeout'] = 'Tempo Límite de Seguridade de Autenticación (segundos)'; $lang['securecookie'] = 'Deben enviarse só vía HTTPS polo navegador as cookies configuradas vía HTTPS? Desactiva esta opción cando só o inicio de sesión do teu wiki estea asegurado con SSL pero a navegación do mesmo se faga de xeito inseguro.'; -$lang['xmlrpc'] = 'Activar/Desactivar interface XML-RPC'; -$lang['xmlrpcuser'] = 'Restrinxir o acceso mediante XML-RPC á lista separada por comas dos grupos e/ou usuarios proporcionados aquí. Déixao baleiro para darlle acceso a todas as persoas.'; $lang['updatecheck'] = 'Comprobar se hai actualizacións e avisos de seguridade? O DokuWiki precisa contactar con update.dokuwiki.org para executar esta característica.'; $lang['userewrite'] = 'Utilizar URLs amigábeis'; $lang['useslash'] = 'Utilizar a barra inclinada (/) como separador de nome de espazo nos URLs'; diff --git a/lib/plugins/config/lang/he/lang.php b/lib/plugins/config/lang/he/lang.php index e80a1bd7a..b200082c9 100644 --- a/lib/plugins/config/lang/he/lang.php +++ b/lib/plugins/config/lang/he/lang.php @@ -82,7 +82,6 @@ $lang['disableactions_wikicode'] = 'הצגת המקור/יצוא גולמי'; $lang['disableactions_other'] = 'פעולות אחרות (מופרדות בפסיק)'; $lang['sneaky_index'] = 'כברירת מחדל, דוקוויקי יציג את כל מרחבי השמות בתצוגת תוכן הענינים. בחירה באפשרות זאת תסתיר את אלו שבהם למשתמש אין הרשאות קריאה. התוצאה עלולה להיות הסתרת תת מרחבי שמות אליהם יש למשתמש גישה. באופן זה תוכן הענינים עלול להפוך לחסר תועלת עם הגדרות ACL מסוימות'; $lang['auth_security_timeout'] = 'מגבלת אבטח פסק הזמן להזדהות (שניות)'; -$lang['xmlrpc'] = 'לאפשר.לחסום את מנשק XML-RPC'; $lang['updatecheck'] = 'בדיקת עידכוני אבטחה והתראות? על DokuWiki להתקשר אל update.dokuwiki.org לצורך כך.'; $lang['userewrite'] = 'השתמש בכתובות URL יפות'; $lang['useslash'] = 'השתמש בלוכסן להגדרת מרחבי שמות בכתובות'; diff --git a/lib/plugins/config/lang/hu/lang.php b/lib/plugins/config/lang/hu/lang.php index f991b7c95..a1de94160 100644 --- a/lib/plugins/config/lang/hu/lang.php +++ b/lib/plugins/config/lang/hu/lang.php @@ -89,8 +89,6 @@ $lang['disableactions_other'] = 'Egyéb tevékenységek (vesszővel elválasztv $lang['sneaky_index'] = 'Alapértelmezetten minden névtér látszik a DokuWiki áttekintő (index) oldalán. Ezen opció bekapcsolása után azok nem jelennek meg, melyekhez a felhasználónak nincs olvasás joga. De ezzel eltakarhatunk egyébként elérhető al-névtereket is, így bizonyos ACL beállításoknál használhatatlan indexet eredményez ez a beállítás.'; $lang['auth_security_timeout'] = 'Authentikációs biztonsági időablak (másodperc)'; $lang['securecookie'] = 'A böngészők a HTTPS felett beállított sütijüket csak HTTPS felett küldhetik? Kapcsoljuk ki ezt az opciót, ha csak a bejelentkezést védjük SSL-lel, a wiki tartalmának böngészése nyílt forgalommal történik.'; -$lang['xmlrpc'] = 'XML-RPC interfész engedélyezése/tiltása'; -$lang['xmlrpcuser'] = 'Korlátozza XML-RPC hozzáférést az itt megadott vesszővel elválasztott csoportok vagy felhasználók számára. Hagyja üresen, ha mindenki számára biztosítja a hozzáférést.'; $lang['updatecheck'] = 'Frissítések és biztonsági figyelmeztetések figyelése. Ehhez a DokuWikinek kapcsolatba kell lépnie a update.dokuwiki.org-gal.'; $lang['userewrite'] = 'Szép URL-ek használata'; $lang['useslash'] = 'Per-jel használata névtér-elválasztóként az URL-ekben'; diff --git a/lib/plugins/config/lang/ia/lang.php b/lib/plugins/config/lang/ia/lang.php index 689869b89..fdb9d954e 100644 --- a/lib/plugins/config/lang/ia/lang.php +++ b/lib/plugins/config/lang/ia/lang.php @@ -83,8 +83,6 @@ $lang['disableactions_other'] = 'Altere actiones (separate per commas)'; $lang['sneaky_index'] = 'Normalmente, DokuWiki monstra tote le spatios de nomines in le vista del indice. Si iste option es active, illos ubi le usator non ha le permission de lectura essera celate. Isto pote resultar in le celamento de subspatios de nomines accessibile. Isto pote render le indice inusabile con certe configurationes de ACL.'; $lang['auth_security_timeout'] = 'Expiration pro securitate de authentication (secundas)'; $lang['securecookie'] = 'Debe le cookies definite via HTTPS solmente esser inviate via HTTPS per le navigator? Disactiva iste option si solmente le apertura de sessiones a tu wiki es protegite con SSL ma le navigation del wiki es facite sin securitate.'; -$lang['xmlrpc'] = 'Activar/disactivar interfacie XML-RPC.'; -$lang['xmlrpcuser'] = 'Limitar le accesso a XML-RPC al gruppos o usatores date hic, separate per commas. Lassa isto vacue pro dar accesso a omnes.'; $lang['updatecheck'] = 'Verificar si existe actualisationes e advertimentos de securitate? DokuWiki debe contactar update.dokuwiki.org pro exequer iste function.'; $lang['userewrite'] = 'Usar URLs nette'; $lang['useslash'] = 'Usar le barra oblique ("/") como separator de spatios de nomines in URLs'; diff --git a/lib/plugins/config/lang/id-ni/lang.php b/lib/plugins/config/lang/id-ni/lang.php index edde733fb..7b7e14ce5 100644 --- a/lib/plugins/config/lang/id-ni/lang.php +++ b/lib/plugins/config/lang/id-ni/lang.php @@ -5,7 +5,6 @@ * @author Harefa * @author Yustinus Waruwu */ -$lang['xmlrpc'] = 'Orifi/böi\'orifi XML-RPC interface.'; $lang['renderer_xhtml'] = 'Fake Renderer ba zito\'ölö (XHTML) Wiki-output.'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php index c4dd433ed..9c348dcee 100644 --- a/lib/plugins/config/lang/it/lang.php +++ b/lib/plugins/config/lang/it/lang.php @@ -94,8 +94,6 @@ $lang['disableactions_other'] = 'Altre azioni (separate da virgola)'; $lang['sneaky_index'] = 'Normalmente, DokuWiki mostra tutte le categorie nella vista indice. Abilitando questa opzione, saranno nascoste quelle per cui l\'utente non ha il permesso in lettura. Questo potrebbe far sì che alcune sottocategorie accessibili siano nascoste. La pagina indice potrebbe quindi diventare inutilizzabile con alcune configurazioni dell\'ACL.'; $lang['auth_security_timeout'] = 'Tempo di sicurezza per l\'autenticazione (secondi)'; $lang['securecookie'] = 'Devono i cookies impostati tramite HTTPS essere inviati al browser solo tramite HTTPS? Disattiva questa opzione solo quando l\'accesso al tuo wiki viene effettuato con il protocollo SSL ma la navigazione del wiki non risulta sicura.'; -$lang['xmlrpc'] = 'Abilita/disabilita interfaccia XML-RPC.'; -$lang['xmlrpcuser'] = 'Limita l\'accesso XML-RPC ai gruppi o utenti indicati qui (separati da virgola). Lascia il campo vuoto per dare accesso a tutti.'; $lang['updatecheck'] = 'Controllare aggiornamenti e avvisi di sicurezza? DokuWiki deve contattare update.dokuwiki.org per questa funzione.'; $lang['userewrite'] = 'Usa il rewrite delle URL'; $lang['useslash'] = 'Usa la barra rovescia (slash) come separatore nelle URL'; diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php index 19f10af48..61161290d 100644 --- a/lib/plugins/config/lang/ja/lang.php +++ b/lib/plugins/config/lang/ja/lang.php @@ -89,8 +89,6 @@ $lang['disableactions_other'] = 'その他の動作（カンマ区切り）'; $lang['sneaky_index'] = 'デフォルトでは索引にすべての名前空間を表示しますが、この機能はユーザーに閲覧権限のない名前空間を非表示にします。ただし、閲覧が可能な副名前空間まで表示されなくなるため、ACLの設定が適正でない場合は索引機能が使えなくなる場合があります。'; $lang['auth_security_timeout'] = '認証タイムアウト設定（秒）'; $lang['securecookie'] = 'クッキーをHTTPSにてセットする場合は、ブラウザよりHTTPS経由で送信された場合にみに制限しますか？ログインのみをSSLで行う場合は、この機能を無効にしてください。'; -$lang['xmlrpc'] = 'XML-RPCインターフェースを有効/無効にする'; -$lang['xmlrpcuser'] = 'XML-RPCアクセスを指定グループとユーザーに制限します（半角コンマ区切り）。　すべての人にアクセスを許可する場合は空のままにしてください。'; $lang['updatecheck'] = 'DokuWikiの更新とセキュリティに関する情報をチェックしますか？ この機能は update.dokuwiki.org への接続が必要です。'; $lang['userewrite'] = 'URLの書き換え'; $lang['useslash'] = 'URL上の名前空間の区切りにスラッシュを使用'; diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 20cfcdcfe..1c929c25c 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -90,8 +90,6 @@ $lang['sneaky_index'] = '기본적으로, DokuWiki는 색인 목록에 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.'; $lang['auth_security_timeout'] = '인증 보안 초과 시간(초)'; $lang['securecookie'] = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화 하고 위키 페이지는 그렇지 않은경우 꺼야 합니다.'; -$lang['xmlrpc'] = 'XML-RPC 인터페이스 지원/무시'; -$lang['xmlrpcuser'] = '주어진 그룹이나 유저들에게만 XML-RPC접근을 허락하려면 컴마로 구분하여 적으세요. 비어두면 모두에게 허용됩니다.'; $lang['updatecheck'] = '업데이트와 보안 문제를 검사(DokuWiki를 update.dokuwiki.org에 연결해야 합니다.)'; $lang['userewrite'] = 'URL rewriting기능 사용'; $lang['useslash'] = 'URL에서 네임스페이스 구분자로 슬래쉬 문자 사용'; diff --git a/lib/plugins/config/lang/la/lang.php b/lib/plugins/config/lang/la/lang.php index 07d92ae36..057e69974 100644 --- a/lib/plugins/config/lang/la/lang.php +++ b/lib/plugins/config/lang/la/lang.php @@ -82,8 +82,6 @@ $lang['disableactions_other'] = 'Aliae actiones (uirgulis diuisae)'; $lang['sneaky_index'] = 'Hic uicis omnia genera in indice inserit. Si ineptam hanc optionem facias, solum ea, quae Sodales uidere possunt, in indice erunt. Hoc suggreges et suggenera abscondere potest.'; $lang['auth_security_timeout'] = 'Confirmationis Tempus (secundis)'; $lang['securecookie'] = 'Formulae HTTPS mittine solum per HTTPS possunt? Ineptam hanc optio facias, si accessus uicis tutus est, sed interretis non.'; -$lang['xmlrpc'] = 'Aptam\Ineptam XML-RPC administrationem facere'; -$lang['xmlrpcuser'] = 'Accessus XML-RPC gregibus uel Sodalibus in hoc indice astringere. Nihil scribere ut omnes accessum habeant'; $lang['updatecheck'] = 'Nouationes et fiducias inspicerene? Hic uicis connectere update.dokuwiki.org debes.'; $lang['userewrite'] = 'VRL formosis uti'; $lang['useslash'] = 'Repagula in URL, ut genera diuidas, uti'; diff --git a/lib/plugins/config/lang/lv/lang.php b/lib/plugins/config/lang/lv/lang.php index 2f5883269..f95697c46 100644 --- a/lib/plugins/config/lang/lv/lang.php +++ b/lib/plugins/config/lang/lv/lang.php @@ -84,8 +84,6 @@ $lang['disableactions_other'] = 'citas darbības (atdalīt ar komatiem)'; $lang['sneaky_index'] = 'Pēc noklusētā DokuWiki lapu sarakstā parāda visu nodaļu lapas. Ieslēdzot šo parametru, noslēps tās nodaļas, kuras apmeklētājam nav tiesības lasīt. Bet tad tiks arī paslēptas dziļākas, bet atļautas nodaļas. Atsevišķos pieejas tiesību konfigurācijas gadījumos lapu saraksts var nedarboties.'; $lang['auth_security_timeout'] = 'Autorizācijas drošības intervāls (sekundēs)'; $lang['securecookie'] = 'Vai pa HTTPS sūtāmās sīkdatnes sūtīt tikai pa HTTPS? Atslēdz šo iespēju, kad tikai pieteikšanās wiki sistēmā notiek pa SSL šifrētu savienojumu, bet skatīšana - pa nešifrētu.'; -$lang['xmlrpc'] = 'Ieslēgt/izslēgt XML-RPC interfeisu.'; -$lang['xmlrpcuser'] = 'Ierobežot XML-RPC piekļuvi norādītām lietotāju grupām vai lietotājiem (atdalīt ar komatiem!). Atstāt tukšu, lai piekļuve būtu visiem.'; $lang['updatecheck'] = 'Pārbaudīt, vai pieejami atjauninājumi un drošības brīdinājumi? Dokuwiki sazināsies ar update.dokuwiki.org'; $lang['userewrite'] = 'Ērti lasāmas adreses (URL)'; $lang['useslash'] = 'Lietot slīpiņu par URL atdalītāju'; diff --git a/lib/plugins/config/lang/mr/lang.php b/lib/plugins/config/lang/mr/lang.php index 321e05546..4f33bfa7c 100644 --- a/lib/plugins/config/lang/mr/lang.php +++ b/lib/plugins/config/lang/mr/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'इतर क्रिया ( स्वल् $lang['sneaky_index'] = 'सूची दृश्यामधे डिफॉल्ट स्वरूपात डॉक्युविकी सगळे नेमस्पेस दाखवते. हा पर्याय चालू केल्यास सदस्याला वाचण्याची परवानगी नसलेले नेमस्पेस दिसणार नाहीत. यामुळे परवानगी असलेले उप - नेमस्पेस न दिसण्याची शक्यता आहे. यामुळे काही विशिष्ठ ACL सेटिंगसाठी सूची वापरता येण्यासारखी राहणार नाही.'; $lang['auth_security_timeout'] = 'अधिकृत करण्याच्या प्रक्रियेची कालमर्यादा'; $lang['securecookie'] = 'HTTPS वापरून सेट केलेले कूकीज ब्राउजरने HTTPS द्वाराच पाठवले पाहिजेत का? जर तुमच्या विकीचं फ़क्त लॉगिन पानच SSL वापरून सुरक्षित केलं असेल व पानांचं ब्राउजिंग असुरक्षित असेल तर हा पर्याय चालू करू नका.'; -$lang['xmlrpc'] = 'XML-RPC इंटरफेस चालू/बंद करा'; -$lang['xmlrpcuser'] = 'XML-RPC सुविधा फ़क्त इथे स्वल्पविरामाने अलग करून दिलेल्या गट किंवा वापरकर्त्याला उपलब्ध आहेत. सर्वाना ही सुविधा देण्यासाठी ही जागा रिकामी सोडा.'; $lang['updatecheck'] = 'अपडेट आणि सुरक्षिततेविशयी सूचनान्वर पाळत ठेऊ का? या सुविधेसाठी डॉक्युविकीला update.dokuwiki.org शी संपर्क साधावा लागेल.'; $lang['userewrite'] = 'छान छान URL वापर'; $lang['useslash'] = 'URL मधे नेमस्पेस अलग करण्यासाठी \'/\' चिह्न वापरा'; diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index f6574ee2c..6bde9eb4e 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -94,8 +94,6 @@ $lang['disableactions_other'] = 'Andere akties (gescheiden door komma\'s)'; $lang['sneaky_index'] = 'Met de standaardinstellingen zal DokuWiki alle namespaces laten zien in de index. Het inschakelen van deze optie zorgt ervoor dat de namespaces waar de gebruiker geen leestoegang tot heeft, verborgen worden. Dit kan resulteren in het verbergen van subnamespaces waar de gebruiker wel toegang to heeft. Dit kan de index onbruikbaar maken met bepaalde ACL-instellingen.'; $lang['auth_security_timeout'] = 'Authenticatiebeveiligings-timeout (seconden)'; $lang['securecookie'] = 'Moeten cookies die via HTTPS gezet zijn alleen via HTTPS verzonden worden door de browser? Zet deze optie uit als alleen het inloggen op de wiki beveiligd is, maar het gebruik verder niet.'; -$lang['xmlrpc'] = 'Inschakelen/uitschakelen XML-RPC interface.'; -$lang['xmlrpcuser'] = 'Beperk XML-RPC toegang tot de lijst met kommagescheiden groepen of gebruikers die hier zijn opgegeven. Laat leeg om iedereen toegang te geven.'; $lang['updatecheck'] = 'Controleer op nieuwe versies en beveiligingswaarschuwingen? DokuWiki moet hiervoor contact opnemen met update.dokuwiki.org.'; $lang['userewrite'] = 'Gebruik nette URL\'s'; $lang['useslash'] = 'Gebruik slash (/) als scheiding tussen namepaces in URL\'s'; diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php index 3c4890149..2245a8813 100644 --- a/lib/plugins/config/lang/no/lang.php +++ b/lib/plugins/config/lang/no/lang.php @@ -99,9 +99,6 @@ $lang['disableactions_other'] = 'Andre kommandoer (kommaseparert)'; $lang['sneaky_index'] = 'DokuWiki vil som standard vise alle navnerom i innholdsfortegnelsen. Hvis du skrur på dette alternativet vil brukere bare se de navnerommene der de har lesetilgang. Dette kan føre til at tilgjengelige undernavnerom skjules. Det kan gjøre innholdsfortegnelsen ubrukelig med enkelte ACL-oppsett.'; $lang['auth_security_timeout'] = 'Autentisering utløper etter (sekunder)'; $lang['securecookie'] = 'Skal informasjonskapsler satt via HTTPS kun sendes via HTTPS av nettleseren? Skal ikke velges dersom bare innloggingen til din wiki er sikret med SSL, og annen navigering på wikien er usikret.'; -$lang['xmlrpc'] = 'Slå på/slå av XML-RPC-grensesnitt'; -$lang['xmlrpcuser'] = 'Å tillate XML-RPC-adgang til bestemte grupper eller brukere, sette deres navne (kommaseparert) her. Slik får du tilgang til alle, la feltet tomt. -'; $lang['updatecheck'] = 'Se etter oppdateringer og sikkerhetsadvarsler? Denne funksjonen er avhengig av å kontakte update.dokuwiki.org.'; $lang['userewrite'] = 'Bruk pene URLer'; $lang['useslash'] = 'Bruk / som skilletegn mellom navnerom i URLer'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 6e94a2e3d..0e69cc8f1 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -92,8 +92,6 @@ $lang['disableactions_other'] = 'Inne akcje (oddzielone przecinkiem)'; $lang['sneaky_index'] = 'Domyślnie, Dokuwiki pokazuje wszystkie katalogi w indeksie. Włączenie tej opcji ukryje katalogi, do których użytkownik nie ma praw. Może to spowodować ukrycie podkatalogów, do których użytkownik ma prawa. Ta opcja może spowodować błędne działanie indeksu w połączeniu z pewnymi konfiguracjami praw dostępu.'; $lang['auth_security_timeout'] = 'Czas wygaśnięcia uwierzytelnienia (w sekundach)'; $lang['securecookie'] = 'Czy ciasteczka wysłane do przeglądarki przez HTTPS powinny być przez nią odsyłane też tylko przez HTTPS? Odznacz tę opcję tylko wtedy, gdy logowanie użytkowników jest zabezpieczone SSL, ale przeglądanie stron odbywa się bez zabezpieczenia.'; -$lang['xmlrpc'] = 'Włącz/wyłącz interfejs XML-RPC'; -$lang['xmlrpcuser'] = 'Lista użytkowników i grup, którzy mogą korzystać z protokołu XML-RPC. Nazwy grup i użytkowników rozdziel przecinkami, puste pole oznacza dostęp dla wszystkich.'; $lang['updatecheck'] = 'Sprawdzanie aktualizacji i bezpieczeństwa. DokuWiki będzie kontaktować się z serwerem update.dokuwiki.org.'; $lang['userewrite'] = 'Proste adresy URL'; $lang['useslash'] = 'Używanie ukośnika jako separatora w adresie URL'; diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php index 093e60ff8..8c0ef713a 100644 --- a/lib/plugins/config/lang/pt-br/lang.php +++ b/lib/plugins/config/lang/pt-br/lang.php @@ -98,8 +98,6 @@ $lang['disableactions_other'] = 'Outras ações (separadas por vírgula)'; $lang['sneaky_index'] = 'Por padrão, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles que o usuário não tiver permissão de leitura. Isso pode resultar na omissão de subespaços de nomes, tornando o índice inútil para certas configurações de ACL.'; $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)'; $lang['securecookie'] = 'Os cookies definidos via HTTPS devem ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação, de maneira insegura.'; -$lang['xmlrpc'] = 'Habilitar/desabilitar interface XML-RPC.'; -$lang['xmlrpcuser'] = 'Acesso Restrito ao XML-RPC para grupos separados por virgula ou usuários aqui. Deixe em branco para conveder acesso a todos.'; $lang['updatecheck'] = 'Verificar atualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efetuar esse recurso.'; $lang['userewrite'] = 'Usar URLs "limpas"'; $lang['useslash'] = 'Usar a barra como separador de espaços de nomes nas URLs'; diff --git a/lib/plugins/config/lang/pt/lang.php b/lib/plugins/config/lang/pt/lang.php index fe05bd281..d0fe0ac0d 100644 --- a/lib/plugins/config/lang/pt/lang.php +++ b/lib/plugins/config/lang/pt/lang.php @@ -87,8 +87,6 @@ $lang['disableactions_other'] = 'Outras acções (separadas por vírgula)'; $lang['sneaky_index'] = 'Por norma, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles em que o utilizador não tenha permissão de leitura. Isto pode resultar na omissão de sub-ramos acessíveis, que poderá tornar o índice inútil para certas configurações de ACL.'; $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)'; $lang['securecookie'] = 'Os cookies definidos via HTTPS deverão ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação de maneira insegura.'; -$lang['xmlrpc'] = 'Habilitar/desabilitar interface XML-RPC.'; -$lang['xmlrpcuser'] = 'Restringir acesso XML-RPC para os grupos separados por vírgula ou utilizadores inseridos aqui. Deixar vazio para dar acesso a todos.'; $lang['updatecheck'] = 'Verificar por actualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efectuar esta verificação.'; $lang['userewrite'] = 'Usar URLs SEO'; $lang['useslash'] = 'Usar a barra como separador de espaços de nomes nas URLs'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index 6b0a0e91a..5b15ec3dc 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -89,8 +89,6 @@ $lang['disableactions_other'] = 'Alte acţiuni (separate prin virgulă)'; $lang['sneaky_index'] = 'Implicit, DokuWiki va arăta toate numele de spaţii la vizualizarea indexului. Activând această opţiune vor fi ascunse acelea la care utilizatorul nu are drepturi de citire. Aceasta poate determina ascunderea sub-numelor de spaţii accesibile. Aceasta poate face index-ul inutilizabil cu anumite setări ale ACL'; $lang['auth_security_timeout'] = 'Timpul de expirare al Autentificării Securizate (secunde)'; $lang['securecookie'] = 'Cookies-urile setate via HTTPS să fie trimise doar via HTTPS de către browser? Dezactivaţi această opţiune numai când login-ul wiki-ului este securizat cu SSL dar navigarea wiki-ului se realizează nesecurizat.'; -$lang['xmlrpc'] = 'Activează/dezactivează interfaţa XML-RPC'; -$lang['xmlrpcuser'] = 'Restricţionaţi accesul XML-RPC la grupurile sau utilizatorii separaţi prin virgulă daţi aici. Lasaţi gol pentru a da acces tuturor.'; $lang['updatecheck'] = 'Verificare actualizări şi avertismente privind securitatea? DokuWiki trebuie să contacteze update.dokuwiki.org pentru această facilitate.'; $lang['userewrite'] = 'Folosire URL-uri "nice"'; $lang['useslash'] = 'Foloseşte slash-ul ca separator de spaţii de nume în URL-uri'; diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php index f29257a28..cd93526e0 100644 --- a/lib/plugins/config/lang/ru/lang.php +++ b/lib/plugins/config/lang/ru/lang.php @@ -95,8 +95,6 @@ $lang['disableactions_other'] = 'Другие операции (через за $lang['sneaky_index'] = 'По умолчанию, «ДокуВики» показывает в индексе страниц все пространства имён. Включение этой опции скроет пространства имён, для которых пользователь не имеет прав чтения. Это может привести к скрытию доступных вложенных пространств имён и потере функциональности индекса страниц при некоторых конфигурациях прав доступа.'; $lang['auth_security_timeout'] = 'Интервал для безопасности авторизации (сек.)'; $lang['securecookie'] = 'Должны ли куки (cookies), выставленные через HTTPS, отправляться браузером только через HTTPS. Отключите эту опцию в случае, когда только логин вашей вики передаётся через SSL, а обычный просмотр осуществляется в небезопасном режиме.'; -$lang['xmlrpc'] = 'Включить/выключить XML-RPC интерфейс.'; -$lang['xmlrpcuser'] = 'Запретить XML-RPC-доступ для списка групп и пользователей, перечисленных через запятую. Оставьте пустым, если хотите оставить доступ всем.'; $lang['updatecheck'] = 'Проверять наличие обновлений и предупреждений о безопасности? Для этого «ДокуВики» потребуется связываться с сайтом splitbrain.org.'; $lang['userewrite'] = 'Удобочитаемые адреса (URL)'; $lang['useslash'] = 'Использовать слэш'; diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index 72ce10775..d583c5d15 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'Iné akcie (oddelené čiarkou)'; $lang['sneaky_index'] = 'DokuWiki implicitne ukazuje v indexe všetky menné priestory. Povolením tejto voľby sa nezobrazia menné priestory, ku ktorým nemá používateľ právo na čítanie. Dôsledkom môže byť nezobrazenie vnorených prístupných menných priestorov. Táto voľba môže mať za následok nepoužiteľnosť indexu s určitými ACL nastaveniami.'; $lang['auth_security_timeout'] = 'Časový limit pri prihlasovaní (v sekundách)'; $lang['securecookie'] = 'Mal by prehliadač posielať cookies nastavené cez HTTPS posielať iba cez HTTPS (bezpečné) pripojenie? Vypnite túto voľbu iba v prípade, ak je prihlasovanie do Vašej wiki zabezpečené SSL, ale prezeranie wiki je nezabezpečené.'; -$lang['xmlrpc'] = 'Povoliť/zakázať XML-RPC rozhranie.'; -$lang['xmlrpcuser'] = 'Obmedziť XML-RPC prístup iba pre uvedené skupiny alebo používateľov (oddelených čiarkami).'; $lang['updatecheck'] = 'Kontrolovať aktualizácie a bezpečnostné upozornenia? DokuWiki potrebuje pre túto funkciu prístup k update.dokuwiki.org.'; $lang['userewrite'] = 'Používať nice URLs'; $lang['useslash'] = 'Používať lomku (/) ako oddeľovač v URL'; diff --git a/lib/plugins/config/lang/sl/lang.php b/lib/plugins/config/lang/sl/lang.php index dadd01595..03bae8e37 100644 --- a/lib/plugins/config/lang/sl/lang.php +++ b/lib/plugins/config/lang/sl/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'Druga dejanja (z vejico ločen seznam)'; $lang['sneaky_index'] = 'Privzeto pokaže sistem DokuWiki vse imenske prostore v pogledu kazala. Z omogočanjem te možnosti bodo skriti vsi imenski prostori, v katere prijavljen uporabnik nima dovoljenj dostopa. S tem je mogoče preprečiti dostop do podrejenih strani. Možnost lahko vpliva na uporabnost nastavitev nadzora dostopa ACL.'; $lang['auth_security_timeout'] = 'Varnostna časovna omejitev overitve (v sekundah)'; $lang['securecookie'] = 'Ali naj se piškotki poslani preko varne povezave HTTPS v brskalniku pošiljajo le preko HTTPS? Onemogočanje možnosti je priporočljivo le takrat, ko je prijava varovana s protokolom SSL, brskanje po strani pa ni posebej zavarovano.'; -$lang['xmlrpc'] = 'Omogoči/Onemogoči vmesnik XML-RPC.'; -$lang['xmlrpcuser'] = 'Omejitev dostopa do vmesnika XML-RPC z vejico ločenim seznamom skupin in uporabnikov. Prazno polje pomeni, prost dostop za vse uporabnike.'; $lang['updatecheck'] = 'Ali naj sistem preveri za posodobitve in varnostna opozorila.'; $lang['userewrite'] = 'Uporabi olepšan zapis naslovov URL'; $lang['useslash'] = 'Uporabi poševnico kot ločilnik imenskih prostorov v naslovih URL'; diff --git a/lib/plugins/config/lang/sq/lang.php b/lib/plugins/config/lang/sq/lang.php index adeb2a47d..69e283b11 100644 --- a/lib/plugins/config/lang/sq/lang.php +++ b/lib/plugins/config/lang/sq/lang.php @@ -83,8 +83,6 @@ $lang['disableactions_other'] = 'Veprime të tjera (të ndarë me presje)'; $lang['sneaky_index'] = 'Vetiu DokuWiki tregon të gjithë hapësirat e emrit në shikimin e index-it. Aktivizimi i kësaj alternative do të fshehë ato ku përdoruesi nuk ka të drejta leximi. Kjo mund të përfundojë në fshehje të nënhapësirave të emrit të aksesueshme. Kjo mund ta bëjë index-in të papërdorshëm me disa konfigurime të caktuara të ACL-së.'; $lang['auth_security_timeout'] = 'Koha e Përfundimit për Autentikim (sekonda)'; $lang['securecookie'] = 'A duhet që cookies të vendosura nëpërmjet HTTPS të dërgohen vetëm nëpërmjet HTTPS nga shfletuesit? Caktivizojeni këtë alternativë kur vetëm hyrja në wiki-n tuaj sigurohet me SSL por shfletimi i wiki-t bëhet në mënyrë të pasigurtë.'; -$lang['xmlrpc'] = 'Aktivizo/Caktivizo ndërfaqen XML-RPC'; -$lang['xmlrpcuser'] = 'Kufizo aksesin XML-RPC vetëm tek grupet ose përdoruesit e ndarë me presje të dhënë këtu. Lëre bosh për t\'i dhënë akses të gjithëve.'; $lang['updatecheck'] = 'Kontrollo për përditësime dhe paralajmërime sigurie? DokuWiki duhet të kontaktojë me update.dokuwiki.org për këtë veti.'; $lang['userewrite'] = 'Përdor URL të këndshme.'; $lang['useslash'] = 'Përdor / si ndarës të hapësirave të emrit në URL'; diff --git a/lib/plugins/config/lang/sr/lang.php b/lib/plugins/config/lang/sr/lang.php index 5906dcd7e..c675b84e6 100644 --- a/lib/plugins/config/lang/sr/lang.php +++ b/lib/plugins/config/lang/sr/lang.php @@ -84,8 +84,6 @@ $lang['disableactions_other'] = 'Остале наредбе (раздвоје $lang['sneaky_index'] = 'По инсталацији DokuWiki ће у индексу приказати све именске просторе. Укључивањем ове опције именски простори у којима корисник нема право читања ће бити сакривени. Консеквенца је да ће и доступни подпростори бити сакривени. Ово доводи до неупотребљивости Права приступа у неким поставкама.'; $lang['auth_security_timeout'] = 'Временска пауза у аутентификацији (секунде)'; $lang['securecookie'] = 'Да ли колачићи који су постављени преко ХТТПС треба слати веб читачу само преко ХТТПС? Искључите ову опцију само ако је пријављивање на вики заштићено ССЛом а остали део викија незаштићен.'; -$lang['xmlrpc'] = 'Укључи/искључи ИксМЛ-РПЦ интерфејс'; -$lang['xmlrpcuser'] = 'Ограничи ИксМЛ-РПЦ приступ на наведене групе корисника раздвојене зарезом. Остави празно да би свима дао приступ.'; $lang['updatecheck'] = 'Провера надоградњи и сигурносних упозорења? Dokuwiki мора да контактира update.dokuwiki.org ради добијања информација.'; $lang['userewrite'] = 'Направи леп УРЛ'; $lang['useslash'] = 'Користи косу црту у УРЛу за раздвајање именских простора '; diff --git a/lib/plugins/config/lang/sv/lang.php b/lib/plugins/config/lang/sv/lang.php index dfd93d37d..3d8392840 100644 --- a/lib/plugins/config/lang/sv/lang.php +++ b/lib/plugins/config/lang/sv/lang.php @@ -97,8 +97,6 @@ $lang['disableactions_other'] = 'Andra funktioner (kommaseparerade)'; $lang['sneaky_index'] = 'Som standard visar DokuWiki alla namnrymder på indexsidan. Genom att aktivera det här valet döljer man namnrymder som användaren inte har behörighet att läsa. Det kan leda till att man döljer åtkomliga undernamnrymder, och gör indexet oanvändbart med vissa ACL-inställningar.'; $lang['auth_security_timeout'] = 'Autentisieringssäkerhets timeout (sekunder)'; $lang['securecookie'] = 'Skall cookies som sätts via HTTPS endast skickas via HTTPS från webbläsaren? Avaktivera detta alternativ endast om inloggningen till din wiki är säkrad med SSL men läsning av wikin är osäkrad.'; -$lang['xmlrpc'] = 'Aktivera/avaktivera XML-RPC-gränssnitt'; -$lang['xmlrpcuser'] = 'Begränsa XML-RPC tillträde till komma separerade grupper eller användare som ges här. Lämna tomt för att ge tillgång till alla.'; $lang['updatecheck'] = 'Kontrollera uppdateringar och säkerhetsvarningar? DokuWiki behöver kontakta update.dokuwiki.org för den här funktionen.'; $lang['userewrite'] = 'Använd rena webbadresser'; $lang['useslash'] = 'Använd snedstreck för att separera namnrymder i webbadresser'; diff --git a/lib/plugins/config/lang/th/lang.php b/lib/plugins/config/lang/th/lang.php index ce7c55e91..140a287df 100644 --- a/lib/plugins/config/lang/th/lang.php +++ b/lib/plugins/config/lang/th/lang.php @@ -41,7 +41,6 @@ $lang['defaultgroup'] = 'กลุ่มมาตรฐาน'; $lang['profileconfirm'] = 'ใส่รหัสผ่านเพื่อยืนยันการเปลี่ยนแปลงข้อมูล'; $lang['disableactions_check'] = 'ตรวจสอบ'; $lang['auth_security_timeout'] = 'ระยะเวลาที่จะตัดการเชื่อมต่อแบบการใช้งานด้วยสิทธิ์ผู้ใช้ (วินาที)'; -$lang['xmlrpc'] = 'ใช้งาน/ยกเลิก การเชื่อมต่อแบบ XML-RPC'; $lang['userewrite'] = 'แสดงที่อยู่เว็บ (URL) แบบอ่านเข้าใจง่าย'; $lang['cachetime'] = 'ระยะเวลาสำหรับการเก็บแคช (วินาที)'; $lang['locktime'] = 'ระยะเวลานานสุด ที่จะล็อคไม่ให้แก้ไขไฟล์ (วินาที)'; diff --git a/lib/plugins/config/lang/uk/lang.php b/lib/plugins/config/lang/uk/lang.php index 72d7e12f5..375c5d3bf 100644 --- a/lib/plugins/config/lang/uk/lang.php +++ b/lib/plugins/config/lang/uk/lang.php @@ -91,8 +91,6 @@ $lang['disableactions_other'] = 'Інші дії (розділені комам $lang['sneaky_index'] = 'За замовчуванням, ДокуВікі показує всі простори імен в змісті. Активація цієї опції сховає ті простори, де користувач не має прав на читання. Результатом може бути неможливість доступу до певних відкритих просторів імен. Це зробить неможливим використання змісту при певних конфігураціях.'; $lang['auth_security_timeout'] = 'Таймаут аутентифікації (в секундах)'; $lang['securecookie'] = 'Чи повинен браузер надсилати файли cookies тільки через HTTPS? Вимкніть цей параметр, лише тоді, якщо вхід до Вікі захищено SSL, але перегляд сторінок відбувається у незахищеному режимі.'; -$lang['xmlrpc'] = 'Дозволити/заборонити XML-RPC інтерфейс'; -$lang['xmlrpcuser'] = 'Заборонити XML-RPC доступ до користувачів або груп поданих тут та розділених комою. Залишіть поле незаповненим, щоб дозволити доступ усім.'; $lang['updatecheck'] = 'Перевірити наявність оновлень чи попереджень безпеки? Для цього ДокуВікі необхідно зв\'язатися зі update.dokuwiki.org.'; $lang['userewrite'] = 'Красиві URL'; $lang['useslash'] = 'Слеш, як розділювач просторів імен в URL'; diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php index 29aeaec3b..2919ec113 100644 --- a/lib/plugins/config/lang/zh-tw/lang.php +++ b/lib/plugins/config/lang/zh-tw/lang.php @@ -89,8 +89,6 @@ $lang['disableactions_other'] = '其他功能 (逗號分隔)'; $lang['sneaky_index'] = '預設情況下，DokuWiki 會在索引頁會顯示所有命名空間。啟用此選項會隱藏用戶沒有閱讀權限的頁面，但也可能將能閱讀的子頁面一併隱藏。在特定 ACL 設定下，這可能導致索引無法使用。'; $lang['auth_security_timeout'] = '安全認證的計時 (秒)'; $lang['securecookie'] = 'HTTPS 頁面設定的 cookie 是否只能由瀏覽器經 HTTPS 傳送？取消此選項後，只有登入維基會被 SSL 保護而瀏覽時不會。'; -$lang['xmlrpc'] = '啟用/停用 XML-RPC 介面'; -$lang['xmlrpcuser'] = 'XML-RPC 存取權限將局限於在此提供的群組或使用者 (逗號分隔)。若要開放權限給所有人請留白。'; $lang['updatecheck'] = '檢查更新與安全性警告？DokuWiki 需要聯繫 update.dokuwiki.org 才能使用此功能。'; $lang['userewrite'] = '使用好看的 URL'; $lang['useslash'] = '在 URL 中使用斜線作為命名空間的分隔字元'; diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index 7a7f0f504..fa51cb1ef 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -96,8 +96,6 @@ $lang['disableactions_other'] = '其他功能（用英文逗号分隔）'; $lang['sneaky_index'] = '默认情况下，DokuWiki 在索引页会显示所有 namespace。启用该选项能隐藏那些用户没有权限阅读的页面。但也可能将用户能够阅读的子页面一并隐藏。这有可能导致在特定 ACL 设置下，索引功能不可用。'; $lang['auth_security_timeout'] = '认证安全超时（秒）'; $lang['securecookie'] = '要让浏览器须以HTTPS方式传送在HTTPS会话中设置的cookies吗？请只在登录过程为SSL加密而浏览维基为明文的情况下打开此选项。'; -$lang['xmlrpc'] = '启用/禁用 XML-RPC 交互界面。'; -$lang['xmlrpcuser'] = '将 XML-RPC 连接限制在用逗号分隔的组或用户中。留空对所有人开启连接权限。'; $lang['updatecheck'] = '自动检查更新并接收安全警告吗？开启该功能后 DokuWiki 将自动访问 splitbrain.org。'; $lang['userewrite'] = '使用更整洁的 URL'; $lang['useslash'] = '在 URL 中使用斜杠作为命名空间的分隔符'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5f2c32ea7..b95c8d75c 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -136,8 +136,8 @@ $meta['disableactions'] = array('disableactions', $meta['sneaky_index'] = array('onoff'); $meta['auth_security_timeout'] = array('numeric'); $meta['securecookie'] = array('onoff'); -$meta['xmlrpc'] = array('onoff'); -$meta['xmlrpcuser'] = array('string'); +$meta['remote'] = array('onoff'); +$meta['remoteuser'] = array('string'); $meta['_anti_spam'] = array('fieldset'); $meta['usewordblock']= array('onoff'); -- cgit v1.2.3 From 3a13cfe7e12afabb47139702b7f118d63ccf42c2 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 18:10:38 +0100 Subject: set login as public method --- lib/exe/xmlrpc.php | 848 +---------------------------------------------------- 1 file changed, 14 insertions(+), 834 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index bcbae0a43..9888c9a61 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -10,6 +10,7 @@ if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA); define('DOKU_XMLRPC_API_VERSION', 6); require_once(DOKU_INC.'inc/init.php'); +require_once(DOKU_INC.'inc/remote.php'); session_write_close(); //close session if(!$conf['xmlrpc']) die('XML-RPC server not enabled.'); @@ -18,855 +19,34 @@ if(!$conf['xmlrpc']) die('XML-RPC server not enabled.'); * Contains needed wrapper functions and registers all available * XMLRPC functions. */ -class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { - var $methods = array(); - var $public_methods = array(); +class dokuwiki_xmlrpc_server extends IXR_Server { var $remote; /** - * Checks if the current user is allowed to execute non anonymous methods - */ - function checkAuth(){ - global $conf; - global $USERINFO; - - if(!$conf['useacl']) return true; //no ACL - then no checks - if(trim($conf['xmlrpcuser']) == '') return true; //no restrictions - - return auth_isMember($conf['xmlrpcuser'],$_SERVER['REMOTE_USER'],(array) $USERINFO['grps']); - } - - /** - * Adds a callback, extends parent method - * - * add another parameter to define if anonymous access to - * this method should be granted. + * Constructor. Register methods and run Server */ - function addCallback($method, $callback, $args, $help, $public=false){ - if($public) $this->public_methods[] = $method; - return parent::addCallback($method, $callback, $args, $help); + function dokuwiki_xmlrpc_server(){ + $this->remote = new RemoteAPI(); + $this->IXR_Server(); } - /** - * Execute a call, extends parent method - * - * Checks for authentication first - */ function call($methodname, $args){ - if(!in_array($methodname,$this->public_methods) && !$this->checkAuth()){ + try { + //print 'a'; + $result = $this->remote->call($methodname, $args); + return $result; + } catch (RemoteAccessDenied $e) { if (!isset($_SERVER['REMOTE_USER'])) { header('HTTP/1.1 401 Unauthorized'); } else { header('HTTP/1.1 403 Forbidden'); } - return new IXR_Error(-32603, 'server error. not authorized to call method "'.$methodname.'".'); + return new IXR_Error(-32603, 'server error. not authorized to call method'); + } catch (RemoteException $e) { + return new IXR_Error($e->getCode(), $e->getMessage()); } - return parent::call($methodname, $args); } - /** - * Constructor. Register methods and run Server - */ - function dokuwiki_xmlrpc_server(){ - $this->remote = new RemoteAPI(); - $this->IXR_IntrospectionServer(); - - /* DokuWiki's own methods */ - $this->addCallback( - 'dokuwiki.getXMLRPCAPIVersion', - 'this:getAPIVersion', - array('integer'), - 'Returns the XMLRPC API version.', - true - ); - - $this->addCallback( - 'dokuwiki.getVersion', - 'getVersion', - array('string'), - 'Returns the running DokuWiki version.', - true - ); - - $this->addCallback( - 'dokuwiki.login', - 'this:login', - array('integer','string','string'), - 'Tries to login with the given credentials and sets auth cookies.', - true - ); - - $this->addCallback( - 'dokuwiki.getPagelist', - 'this:readNamespace', - array('struct','string','struct'), - 'List all pages within the given namespace.' - ); - - $this->addCallback( - 'dokuwiki.search', - 'this:search', - array('struct','string'), - 'Perform a fulltext search and return a list of matching pages' - ); - - $this->addCallback( - 'dokuwiki.getTime', - 'time', - array('int'), - 'Return the current time at the wiki server.' - ); - - $this->addCallback( - 'dokuwiki.setLocks', - 'this:setLocks', - array('struct','struct'), - 'Lock or unlock pages.' - ); - - - $this->addCallback( - 'dokuwiki.getTitle', - 'this:getTitle', - array('string'), - 'Returns the wiki title.', - true - ); - - $this->addCallback( - 'dokuwiki.appendPage', - 'this:appendPage', - array('int', 'string', 'string', 'struct'), - 'Append text to a wiki page.' - ); - - /* Wiki API v2 http://www.jspwiki.org/wiki/WikiRPCInterface2 */ - $this->addCallback( - 'wiki.getRPCVersionSupported', - 'this:wiki_RPCVersion', - array('int'), - 'Returns 2 with the supported RPC API version.', - true - ); - $this->addCallback( - 'wiki.getPage', - 'this:rawPage', - array('string','string'), - 'Get the raw Wiki text of page, latest version.' - ); - $this->addCallback( - 'wiki.getPageVersion', - 'this:rawPage', - array('string','string','int'), - 'Get the raw Wiki text of page.' - ); - $this->addCallback( - 'wiki.getPageHTML', - 'this:htmlPage', - array('string','string'), - 'Return page in rendered HTML, latest version.' - ); - $this->addCallback( - 'wiki.getPageHTMLVersion', - 'this:htmlPage', - array('string','string','int'), - 'Return page in rendered HTML.' - ); - $this->addCallback( - 'wiki.getAllPages', - 'this:listPages', - array('struct'), - 'Returns a list of all pages. The result is an array of utf8 pagenames.' - ); - $this->addCallback( - 'wiki.getAttachments', - 'this:listAttachments', - array('struct', 'string', 'struct'), - 'Returns a list of all media files.' - ); - $this->addCallback( - 'wiki.getBackLinks', - 'this:listBackLinks', - array('struct','string'), - 'Returns the pages that link to this page.' - ); - $this->addCallback( - 'wiki.getPageInfo', - 'this:pageInfo', - array('struct','string'), - 'Returns a struct with infos about the page.' - ); - $this->addCallback( - 'wiki.getPageInfoVersion', - 'this:pageInfo', - array('struct','string','int'), - 'Returns a struct with infos about the page.' - ); - $this->addCallback( - 'wiki.getPageVersions', - 'this:pageVersions', - array('struct','string','int'), - 'Returns the available revisions of the page.' - ); - $this->addCallback( - 'wiki.putPage', - 'this:putPage', - array('int', 'string', 'string', 'struct'), - 'Saves a wiki page.' - ); - $this->addCallback( - 'wiki.listLinks', - 'this:listLinks', - array('struct','string'), - 'Lists all links contained in a wiki page.' - ); - $this->addCallback( - 'wiki.getRecentChanges', - 'this:getRecentChanges', - array('struct','int'), - 'Returns a struct about all recent changes since given timestamp.' - ); - $this->addCallback( - 'wiki.getRecentMediaChanges', - 'this:getRecentMediaChanges', - array('struct','int'), - 'Returns a struct about all recent media changes since given timestamp.' - ); - $this->addCallback( - 'wiki.aclCheck', - 'this:aclCheck', - array('int', 'string'), - 'Returns the permissions of a given wiki page.' - ); - $this->addCallback( - 'wiki.putAttachment', - 'this:putAttachment', - array('struct', 'string', 'base64', 'struct'), - 'Upload a file to the wiki.' - ); - $this->addCallback( - 'wiki.deleteAttachment', - 'this:deleteAttachment', - array('int', 'string'), - 'Delete a file from the wiki.' - ); - $this->addCallback( - 'wiki.getAttachment', - 'this:getAttachment', - array('base64', 'string'), - 'Download a file from the wiki.' - ); - $this->addCallback( - 'wiki.getAttachmentInfo', - 'this:getAttachmentInfo', - array('struct', 'string'), - 'Returns a struct with infos about the attachment.' - ); - - /** - * Trigger XMLRPC_CALLBACK_REGISTER, action plugins can use this event - * to extend the XMLRPC interface and register their own callbacks. - * - * Event data: - * The XMLRPC server object: - * - * $event->data->addCallback() - register a callback, the second - * paramter has to be of the form "plugin::" - * - * $event->data->callbacks - an array which holds all awaylable - * callbacks - */ - trigger_event('XMLRPC_CALLBACK_REGISTER', $this); - - $this->serve(); - } - - /** - * Return a raw wiki page - */ - function rawPage($id,$rev=''){ - try { - return $this->remote->rawPage($id, $rev); - } catch(RemoteAccessDenied $e) { - return new IXR_Error(1, 'You are not allowed to read this page'); - } - } - - /** - * Return a media file encoded in base64 - * - * @author Gina Haeussge - */ - function getAttachment($id){ - try { - try { - return $this->remote->getAttachment($id); - } catch (RemoteAccessDenied $e) { - return new IXR_Error(1, 'You are not allowed to read this file'); - } - } - catch (RemoteException $e) { - return new IXR_Error(1, $e->getMessage()); - } - } - - /** - * Return info about a media file - * - * @author Gina Haeussge - */ - function getAttachmentInfo($id){ - $info = $this->remote->getAttachmentInfo($id); - $info['lastModified'] = new IXR_Date($info['lastModified']); - return $info; - } - - /** - * Return a wiki page rendered to html - */ - function htmlPage($id,$rev=''){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); - } - return p_wiki_xhtml($id,$rev,false); - } - - /** - * List all pages - we use the indexer list here - */ - function listPages(){ - $list = array(); - $pages = idx_get_indexer()->getPages(); - $pages = array_filter(array_filter($pages,'isVisiblePage'),'page_exists'); - - foreach(array_keys($pages) as $idx) { - $perm = auth_quickaclcheck($pages[$idx]); - if($perm < AUTH_READ) { - continue; - } - $page = array(); - $page['id'] = trim($pages[$idx]); - $page['perms'] = $perm; - $page['size'] = @filesize(wikiFN($pages[$idx])); - $page['lastModified'] = new IXR_Date(@filemtime(wikiFN($pages[$idx]))); - $list[] = $page; - } - - return $list; - } - - /** - * List all pages in the given namespace (and below) - */ - function readNamespace($ns,$opts){ - global $conf; - - if(!is_array($opts)) $opts=array(); - - $ns = cleanID($ns); - $dir = utf8_encodeFN(str_replace(':', '/', $ns)); - $data = array(); - $opts['skipacl'] = 0; // no ACL skipping for XMLRPC - search($data, $conf['datadir'], 'search_allpages', $opts, $dir); - return $data; - } - - /** - * List all pages in the given namespace (and below) - */ - function search($query){ - require_once(DOKU_INC.'inc/fulltext.php'); - - $regex = ''; - $data = ft_pageSearch($query,$regex); - $pages = array(); - - // prepare additional data - $idx = 0; - foreach($data as $id => $score){ - $file = wikiFN($id); - - if($idx < FT_SNIPPET_NUMBER){ - $snippet = ft_snippet($id,$regex); - $idx++; - }else{ - $snippet = ''; - } - - $pages[] = array( - 'id' => $id, - 'score' => $score, - 'rev' => filemtime($file), - 'mtime' => filemtime($file), - 'size' => filesize($file), - 'snippet' => $snippet, - ); - } - return $pages; - } - - /** - * Returns the wiki title. - */ - function getTitle(){ - global $conf; - return $conf['title']; - } - - /** - * List all media files. - * - * Available options are 'recursive' for also including the subnamespaces - * in the listing, and 'pattern' for filtering the returned files against - * a regular expression matching their name. - * - * @author Gina Haeussge - */ - function listAttachments($ns, $options = array()) { - global $conf; - global $lang; - - $ns = cleanID($ns); - - if (!is_array($options)) $options = array(); - $options['skipacl'] = 0; // no ACL skipping for XMLRPC - - - if(auth_quickaclcheck($ns.':*') >= AUTH_READ) { - $dir = utf8_encodeFN(str_replace(':', '/', $ns)); - - $data = array(); - search($data, $conf['mediadir'], 'search_media', $options, $dir); - $len = count($data); - if(!$len) return array(); - - for($i=0; $i<$len; $i++) { - unset($data[$i]['meta']); - $data[$i]['lastModified'] = new IXR_Date($data[$i]['mtime']); - } - return $data; - } else { - return new IXR_Error(1, 'You are not allowed to list media files.'); - } - } - - /** - * Return a list of backlinks - */ - function listBackLinks($id){ - return ft_backlinks(cleanID($id)); - } - - /** - * Return some basic data about a page - */ - function pageInfo($id,$rev=''){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); - } - $file = wikiFN($id,$rev); - $time = @filemtime($file); - if(!$time){ - return new IXR_Error(10, 'The requested page does not exist'); - } - - $info = getRevisionInfo($id, $time, 1024); - - $data = array( - 'name' => $id, - 'lastModified' => new IXR_Date($time), - 'author' => (($info['user']) ? $info['user'] : $info['ip']), - 'version' => $time - ); - - return ($data); - } - - /** - * Save a wiki page - * - * @author Michael Klier - */ - function putPage($id, $text, $params) { - global $TEXT; - global $lang; - global $conf; - - $id = cleanID($id); - $TEXT = cleanText($text); - $sum = $params['sum']; - $minor = $params['minor']; - - if(empty($id)) - return new IXR_Error(1, 'Empty page ID'); - - if(!page_exists($id) && trim($TEXT) == '' ) { - return new IXR_ERROR(1, 'Refusing to write an empty new wiki page'); - } - - if(auth_quickaclcheck($id) < AUTH_EDIT) - return new IXR_Error(1, 'You are not allowed to edit this page'); - - // Check, if page is locked - if(checklock($id)) - return new IXR_Error(1, 'The page is currently locked'); - - // SPAM check - if(checkwordblock()) - return new IXR_Error(1, 'Positive wordblock check'); - - // autoset summary on new pages - if(!page_exists($id) && empty($sum)) { - $sum = $lang['created']; - } - - // autoset summary on deleted pages - if(page_exists($id) && empty($TEXT) && empty($sum)) { - $sum = $lang['deleted']; - } - - lock($id); - - saveWikiText($id,$TEXT,$sum,$minor); - - unlock($id); - - // run the indexer if page wasn't indexed yet - idx_addPage($id); - - return 0; - } - - /** - * Appends text to a wiki page. - */ - function appendPage($id, $text, $params) { - $currentpage = $this->rawPage($id); - if (!is_string($currentpage)) { - return $currentpage; - } - return $this->putPage($id, $currentpage.$text, $params); - } - - /** - * Uploads a file to the wiki. - * - * Michael Klier - */ - function putAttachment($id, $file, $params) { - $id = cleanID($id); - $auth = auth_quickaclcheck(getNS($id).':*'); - - if(!isset($id)) { - return new IXR_ERROR(1, 'Filename not given.'); - } - - global $conf; - - $ftmp = $conf['tmpdir'] . '/' . md5($id.clientIP()); - - // save temporary file - @unlink($ftmp); - if (preg_match('/^[A-Za-z0-9\+\/]*={0,2}$/', $file) === 1) { - // DEPRECATED: Double-decode file if it still looks like base64 - // after first decoding (which is done by the library) - $file = base64_decode($file); - } - io_saveFile($ftmp, $file); - - $res = media_save(array('name' => $ftmp), $id, $params['ow'], $auth, 'rename'); - if (is_array($res)) { - return new IXR_ERROR(-$res[1], $res[0]); - } else { - return $res; - } - } - - /** - * Deletes a file from the wiki. - * - * @author Gina Haeussge - */ - function deleteAttachment($id){ - $id = cleanID($id); - $auth = auth_quickaclcheck(getNS($id).':*'); - $res = media_delete($id, $auth); - if ($res & DOKU_MEDIA_DELETED) { - return 0; - } elseif ($res & DOKU_MEDIA_NOT_AUTH) { - return new IXR_ERROR(1, "You don't have permissions to delete files."); - } elseif ($res & DOKU_MEDIA_INUSE) { - return new IXR_ERROR(1, 'File is still referenced'); - } else { - return new IXR_ERROR(1, 'Could not delete file'); - } - } - - /** - * Returns the permissions of a given wiki page - */ - function aclCheck($id) { - $id = cleanID($id); - return auth_quickaclcheck($id); - } - - /** - * Lists all links contained in a wiki page - * - * @author Michael Klier - */ - function listLinks($id) { - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); - } - $links = array(); - - // resolve page instructions - $ins = p_cached_instructions(wikiFN($id)); - - // instantiate new Renderer - needed for interwiki links - include(DOKU_INC.'inc/parser/xhtml.php'); - $Renderer = new Doku_Renderer_xhtml(); - $Renderer->interwiki = getInterwiki(); - - // parse parse instructions - foreach($ins as $in) { - $link = array(); - switch($in[0]) { - case 'internallink': - $link['type'] = 'local'; - $link['page'] = $in[1][0]; - $link['href'] = wl($in[1][0]); - array_push($links,$link); - break; - case 'externallink': - $link['type'] = 'extern'; - $link['page'] = $in[1][0]; - $link['href'] = $in[1][0]; - array_push($links,$link); - break; - case 'interwikilink': - $url = $Renderer->_resolveInterWiki($in[1][2],$in[1][3]); - $link['type'] = 'extern'; - $link['page'] = $url; - $link['href'] = $url; - array_push($links,$link); - break; - } - } - - return ($links); - } - - /** - * Returns a list of recent changes since give timestamp - * - * @author Michael Hamann - * @author Michael Klier - */ - function getRecentChanges($timestamp) { - if(strlen($timestamp) != 10) - return new IXR_Error(20, 'The provided value is not a valid timestamp'); - - $recents = getRecentsSince($timestamp); - - $changes = array(); - - foreach ($recents as $recent) { - $change = array(); - $change['name'] = $recent['id']; - $change['lastModified'] = new IXR_Date($recent['date']); - $change['author'] = $recent['user']; - $change['version'] = $recent['date']; - $change['perms'] = $recent['perms']; - $change['size'] = @filesize(wikiFN($recent['id'])); - array_push($changes, $change); - } - - if (!empty($changes)) { - return $changes; - } else { - // in case we still have nothing at this point - return new IXR_Error(30, 'There are no changes in the specified timeframe'); - } - } - - /** - * Returns a list of recent media changes since give timestamp - * - * @author Michael Hamann - * @author Michael Klier - */ - function getRecentMediaChanges($timestamp) { - if(strlen($timestamp) != 10) - return new IXR_Error(20, 'The provided value is not a valid timestamp'); - - $recents = getRecentsSince($timestamp, null, '', RECENTS_MEDIA_CHANGES); - - $changes = array(); - - foreach ($recents as $recent) { - $change = array(); - $change['name'] = $recent['id']; - $change['lastModified'] = new IXR_Date($recent['date']); - $change['author'] = $recent['user']; - $change['version'] = $recent['date']; - $change['perms'] = $recent['perms']; - $change['size'] = @filesize(mediaFN($recent['id'])); - array_push($changes, $change); - } - - if (!empty($changes)) { - return $changes; - } else { - // in case we still have nothing at this point - return new IXR_Error(30, 'There are no changes in the specified timeframe'); - } - } - - /** - * Returns a list of available revisions of a given wiki page - * - * @author Michael Klier - */ - function pageVersions($id, $first) { - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); - } - global $conf; - - $versions = array(); - - if(empty($id)) - return new IXR_Error(1, 'Empty page ID'); - - $revisions = getRevisions($id, $first, $conf['recent']+1); - - if(count($revisions)==0 && $first!=0) { - $first=0; - $revisions = getRevisions($id, $first, $conf['recent']+1); - } - - if(count($revisions)>0 && $first==0) { - array_unshift($revisions, ''); // include current revision - array_pop($revisions); // remove extra log entry - } - - $hasNext = false; - if(count($revisions)>$conf['recent']) { - $hasNext = true; - array_pop($revisions); // remove extra log entry - } - - if(!empty($revisions)) { - foreach($revisions as $rev) { - $file = wikiFN($id,$rev); - $time = @filemtime($file); - // we check if the page actually exists, if this is not the - // case this can lead to less pages being returned than - // specified via $conf['recent'] - if($time){ - $info = getRevisionInfo($id, $time, 1024); - if(!empty($info)) { - $data['user'] = $info['user']; - $data['ip'] = $info['ip']; - $data['type'] = $info['type']; - $data['sum'] = $info['sum']; - $data['modified'] = new IXR_Date($info['date']); - $data['version'] = $info['date']; - array_push($versions, $data); - } - } - } - return $versions; - } else { - return array(); - } - } - - /** - * The version of Wiki RPC API supported - */ - function wiki_RPCVersion(){ - return 2; - } - - - /** - * Locks or unlocks a given batch of pages - * - * Give an associative array with two keys: lock and unlock. Both should contain a - * list of pages to lock or unlock - * - * Returns an associative array with the keys locked, lockfail, unlocked and - * unlockfail, each containing lists of pages. - */ - function setLocks($set){ - $locked = array(); - $lockfail = array(); - $unlocked = array(); - $unlockfail = array(); - - foreach((array) $set['lock'] as $id){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_EDIT || checklock($id)){ - $lockfail[] = $id; - }else{ - lock($id); - $locked[] = $id; - } - } - - foreach((array) $set['unlock'] as $id){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_EDIT || !unlock($id)){ - $unlockfail[] = $id; - }else{ - $unlocked[] = $id; - } - } - - return array( - 'locked' => $locked, - 'lockfail' => $lockfail, - 'unlocked' => $unlocked, - 'unlockfail' => $unlockfail, - ); - } - - function getAPIVersion(){ - return DOKU_XMLRPC_API_VERSION; - } - - function login($user,$pass){ - global $conf; - global $auth; - if(!$conf['useacl']) return 0; - if(!$auth) return 0; - - @session_start(); // reopen session for login - if($auth->canDo('external')){ - $ok = $auth->trustExternal($user,$pass,false); - }else{ - $evdata = array( - 'user' => $user, - 'password' => $pass, - 'sticky' => false, - 'silent' => true, - ); - $ok = trigger_event('AUTH_LOGIN_CHECK', $evdata, 'auth_login_wrapper'); - } - session_write_close(); // we're done with the session - - return $ok; - } - - } $server = new dokuwiki_xmlrpc_server(); -- cgit v1.2.3 From f95017850a515969190f54df3d57a00449245bb9 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 18:37:59 +0100 Subject: delegate file and date transformation to remote library --- lib/exe/xmlrpc.php | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 9888c9a61..44b4ba7a0 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -27,6 +27,8 @@ class dokuwiki_xmlrpc_server extends IXR_Server { */ function dokuwiki_xmlrpc_server(){ $this->remote = new RemoteAPI(); + $this->remote->setDateTransformation(array($this, 'toDate')); + $this->remote->setFileTransformation(array($this, 'toFile')); $this->IXR_Server(); } @@ -47,6 +49,14 @@ class dokuwiki_xmlrpc_server extends IXR_Server { } } + function toDate($data) { + return new IXR_Date($data); + } + + function toFile($data) { + return new IXR_Base64($data); + } + } $server = new dokuwiki_xmlrpc_server(); -- cgit v1.2.3 From e61127e4af913a252fbe5c8f427501268501895c Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 19:31:10 +0100 Subject: refactored RemoteAccessDenied to RemoteAccessDeniedException --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 44b4ba7a0..ce9ef1484 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -37,7 +37,7 @@ class dokuwiki_xmlrpc_server extends IXR_Server { //print 'a'; $result = $this->remote->call($methodname, $args); return $result; - } catch (RemoteAccessDenied $e) { + } catch (RemoteAccessDeniedException $e) { if (!isset($_SERVER['REMOTE_USER'])) { header('HTTP/1.1 401 Unauthorized'); } else { -- cgit v1.2.3 From c51f90d7a072929e2b636e986b8ea2121bc5a630 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Tue, 24 Jan 2012 11:12:44 +0100 Subject: let js.php use multiple caches --- lib/exe/js.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index b7f2fd222..c929c9ba5 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -31,8 +31,14 @@ function js_out(){ global $lang; global $config_cascade; + if (isset($_GET['cacheKey'])) { + $cacheKey = strval($_GET['cacheKey']); + } else { + $cacheKey = ''; + } + // The generated script depends on some dynamic options - $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'], + $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].$cacheKey, '.js'); // load minified version for some files -- cgit v1.2.3 From 91e9045718073c3a4ad4ce581e9192f0a87baaf7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 29 Jan 2012 19:15:13 +0000 Subject: added two new config options: tagline and sidebar Templates authors should support these to make the transition between templates easier. Templates which already have a sidebar could first check for $conf['sidebar'] and use it if it's defined, otherwise use their old own sidebar functionality to stay backwards-compatible. --- lib/plugins/config/lang/en/lang.php | 2 ++ lib/plugins/config/settings/config.metadata.php | 2 ++ 2 files changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index a075d7cc2..74ec56345 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -62,6 +62,8 @@ $lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.'; $lang['start'] = 'Start page name'; $lang['title'] = 'Wiki title'; $lang['template'] = 'Template'; +$lang['tagline'] = 'Tagline (if template supports it)'; +$lang['sidebar'] = 'Sidebar page name (if template supports it), empty field disables the sidebar'; $lang['license'] = 'Under which license should your content be released?'; $lang['fullpath'] = 'Reveal full path of pages in the footer'; $lang['recent'] = 'Recent changes'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index d8ad06134..96451e857 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -91,6 +91,8 @@ $meta['title'] = array('string'); $meta['start'] = array('string','_pattern' => '!^[^:;/]+$!'); // don't accept namespaces $meta['lang'] = array('dirchoice','_dir' => DOKU_INC.'inc/lang/'); $meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/','_pattern' => '/^[\w-]+$/'); +$meta['tagline'] = array('string'); +$meta['sidebar'] = array('string'); $meta['license'] = array('license'); $meta['savedir'] = array('savedir'); $meta['basedir'] = array('string'); -- cgit v1.2.3 From b78bf706e2ab1d34498beea00b7ecfda11944eee Mon Sep 17 00:00:00 2001 From: romain Date: Mon, 30 Jan 2012 19:58:55 +0100 Subject: Added support for the %GROUP% wildcard. %GROUP% is the same as %USER% except it's done on each group a user is in. %USER% and %GROUP% cannot be mixed on an ACL line. --- lib/plugins/acl/admin.php | 4 ++-- lib/plugins/config/lang/en/lang.php | 2 ++ lib/plugins/config/lang/fr/lang.php | 2 ++ lib/plugins/config/settings/config.metadata.php | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index a6b0624bc..4d2be8dd0 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -84,7 +84,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { $this->who = '@'.ltrim($auth->cleanGroup($who),'@'); }elseif($_REQUEST['acl_t'] == '__u__' && $who){ $this->who = ltrim($who,'@'); - if($this->who != '%USER%'){ #keep wildcard as is + if($this->who != '%USER%' && $this->who != '%GROUP%'){ #keep wildcard as is $this->who = $auth->cleanUser($this->who); } }elseif($_REQUEST['acl_t'] && @@ -140,7 +140,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { if ($who!='@ALL') { $who = '@'.ltrim($auth->cleanGroup($who),'@'); } - } elseif ($who != '%USER%'){ #keep wildcard as is + } elseif ($who != '%USER%' && $who != '%GROUP%'){ #keep wildcard as is $who = $auth->cleanUser($who); } $who = auth_nameencode($who,true); diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 74ec56345..3d3a6d426 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -95,6 +95,8 @@ $lang['showuseras'] = 'What to display when showing the user that last edited a /* Authentication Options */ $lang['useacl'] = 'Use access control lists'; +$lang['usewildcards'] = 'Use the wildcard %USER% for ACL'; +$lang['groupwildcards'] = 'Use the wildcard %GROUP% for ACL'; $lang['autopasswd'] = 'Autogenerate passwords'; $lang['authtype'] = 'Authentication backend'; $lang['passcrypt'] = 'Password encryption method'; diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 8dcd21032..efa5b8f67 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -83,6 +83,8 @@ $lang['mailguard'] = 'Brouiller les adresses de courriel'; $lang['iexssprotect'] = 'Vérifier la présence de code JavaScript ou HTML malveillant dans les fichiers envoyés'; $lang['showuseras'] = 'Qu\'afficher en montrant les utilisateurs qui ont récemment modifié la page'; $lang['useacl'] = 'Utiliser les listes de contrôle d\'accès (ACL)'; +$lang['usewildcards'] = 'Utiliser le joker %USER% dans les ACL'; +$lang['groupwildcards'] = 'Utiliser le joker %GROUP% dans les ACL'; $lang['autopasswd'] = 'Auto-générer les mots de passe'; $lang['authtype'] = 'Mécanisme d\'authentification'; $lang['passcrypt'] = 'Méthode de chiffrement des mots de passe'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 96451e857..bb034f2db 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -123,6 +123,8 @@ $meta['refshow'] = array('numeric'); $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); +$meta['usewildcards'] = array('onoff'); +$meta['groupwildcards'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); $meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); -- cgit v1.2.3 From 81aca18e6e88c08386c11592dbf4650114aba04f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 1 Feb 2012 20:07:04 +0100 Subject: removed some more occurances of DOKU_TPL* --- lib/exe/css.php | 4 ++-- lib/exe/js.php | 4 ++-- lib/exe/opensearch.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index d54e2e46c..69b512205 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -41,8 +41,8 @@ function css_out(){ $tplinc = DOKU_INC.'lib/tpl/'.$tpl.'/'; $tpldir = DOKU_BASE.'lib/tpl/'.$tpl.'/'; }else{ - $tplinc = DOKU_TPLINC; - $tpldir = DOKU_TPL; + $tplinc = tpl_incdir(); + $tpldir = tpl_basedir(); } // The generated script depends on some dynamic options diff --git a/lib/exe/js.php b/lib/exe/js.php index b7f2fd222..963eebd5f 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -65,7 +65,7 @@ function js_out(){ # disabled for FS#1958 DOKU_INC.'lib/scripts/hotkeys.js', DOKU_INC.'lib/scripts/behaviour.js', DOKU_INC.'lib/scripts/page.js', - DOKU_TPLINC.'script.js', + tpl_incdir().'script.js', ); // add possible plugin scripts and userscript @@ -87,7 +87,7 @@ function js_out(){ // add some global variables print "var DOKU_BASE = '".DOKU_BASE."';"; - print "var DOKU_TPL = '".DOKU_TPL."';"; + print "var DOKU_TPL = '".tpl_basedir()."';"; // FIXME: Move those to JSINFO print "var DOKU_UHN = ".((int) useHeading('navigation')).";"; print "var DOKU_UHC = ".((int) useHeading('content')).";"; diff --git a/lib/exe/opensearch.php b/lib/exe/opensearch.php index 03a1632c4..73939c347 100644 --- a/lib/exe/opensearch.php +++ b/lib/exe/opensearch.php @@ -16,9 +16,9 @@ require_once(DOKU_INC.'inc/init.php'); // try to be clever about the favicon location if(file_exists(DOKU_INC.'favicon.ico')){ $ico = DOKU_URL.'favicon.ico'; -}elseif(file_exists(DOKU_TPLINC.'images/favicon.ico')){ +}elseif(file_exists(tpl_incdir().'images/favicon.ico')){ $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/images/favicon.ico'; -}elseif(file_exists(DOKU_TPLINC.'favicon.ico')){ +}elseif(file_exists(tpl_incdir().'favicon.ico')){ $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/favicon.ico'; }else{ $ico = DOKU_URL.'lib/tpl/default/images/favicon.ico'; -- cgit v1.2.3 From bc9d46afa580ee1191b02e2fe3b03fd863045b8b Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 1 Feb 2012 20:24:11 +0100 Subject: some more DOKU_TPL removal --- lib/plugins/config/admin.php | 6 +++--- lib/plugins/config/settings/config.class.php | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 64906171d..c883e7b6a 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -270,10 +270,10 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { // the same for the active template $tpl = $conf['template']; - if (@file_exists(DOKU_TPLINC.$enlangfile)){ + if (@file_exists(tpl_incdir().$enlangfile)){ $lang = array(); - @include(DOKU_TPLINC.$enlangfile); - if ($conf['lang'] != 'en') @include(DOKU_TPLINC.$langfile); + @include(tpl_incdir().$enlangfile); + if ($conf['lang'] != 'en') @include(tpl_incdir().$langfile); foreach ($lang as $key => $value){ $this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value; } diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index adf7d217a..1cdab607f 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -279,10 +279,10 @@ if (!class_exists('configuration')) { } // the same for the active template - if (@file_exists(DOKU_TPLINC.$file)){ + if (@file_exists(tpl_incdir().$file)){ $meta = array(); - @include(DOKU_TPLINC.$file); - @include(DOKU_TPLINC.$class); + @include(tpl_incdir().$file); + @include(tpl_incdir().$class); if (!empty($meta)) { $metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] = array('fieldset'); } @@ -314,9 +314,9 @@ if (!class_exists('configuration')) { } // the same for the active template - if (@file_exists(DOKU_TPLINC.$file)){ + if (@file_exists(tpl_incdir().$file)){ $conf = array(); - @include(DOKU_TPLINC.$file); + @include(tpl_incdir().$file); foreach ($conf as $key => $value){ $default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value; } -- cgit v1.2.3 From 2203da5b13d5062626a6ecd6b599fb42dc415a06 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 1 Feb 2012 20:35:23 +0100 Subject: increased XMLRPC API version for 1d667b4 --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 61e6f1e95..1264ff333 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -7,7 +7,7 @@ if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA); /** * Increased whenever the API is changed */ -define('DOKU_XMLRPC_API_VERSION', 6); +define('DOKU_XMLRPC_API_VERSION', 7); require_once(DOKU_INC.'inc/init.php'); session_write_close(); //close session -- cgit v1.2.3 From 40d429f51adcff41f289a7961b5d298d2190f3ef Mon Sep 17 00:00:00 2001 From: Begina Felicysym Date: Thu, 2 Feb 2012 20:48:01 +0100 Subject: Polish language update --- lib/plugins/config/lang/pl/lang.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 62c55d328..a04f45c87 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -52,6 +52,8 @@ $lang['cookiedir'] = 'Ścieżka plików ciasteczek. Zostaw puste by $lang['start'] = 'Tytuł strony początkowej'; $lang['title'] = 'Tytuł wiki'; $lang['template'] = 'Motyw'; +$lang['tagline'] = 'Motto (jeśli szablon daje taką możliwość)'; +$lang['sidebar'] = 'Nazwa strony paska bocznego (jeśli szablon je obsługuje), puste pole wyłącza pasek boczny'; $lang['license'] = 'Pod jaką licencją publikować treści wiki?'; $lang['fullpath'] = 'Wyświetlanie pełnych ścieżek'; $lang['recent'] = 'Ilość ostatnich zmian'; -- cgit v1.2.3 From ae6cce187876439c77b53ebd2ae61976274f4a11 Mon Sep 17 00:00:00 2001 From: Matej Urban Date: Thu, 2 Feb 2012 20:49:20 +0100 Subject: Slovak language update --- lib/plugins/acl/lang/sl/help.txt | 10 +++++----- lib/plugins/acl/lang/sl/lang.php | 2 +- lib/plugins/config/lang/sl/lang.php | 15 ++++++++++----- lib/plugins/plugin/lang/sl/admin_plugin.txt | 2 +- lib/plugins/plugin/lang/sl/lang.php | 2 +- lib/plugins/popularity/lang/sl/intro.txt | 10 +++++----- lib/plugins/popularity/lang/sl/submitted.txt | 4 ++-- lib/plugins/revert/lang/sl/intro.txt | 2 +- lib/plugins/usermanager/lang/sl/delete.txt | 2 +- 9 files changed, 27 insertions(+), 22 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/sl/help.txt b/lib/plugins/acl/lang/sl/help.txt index eada41c29..ff096ae0e 100644 --- a/lib/plugins/acl/lang/sl/help.txt +++ b/lib/plugins/acl/lang/sl/help.txt @@ -1,11 +1,11 @@ -=== Hitra pomo === +=== Hitra pomoč === -Na tej strani je mogoe dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori. +Na tej strani je mogoče dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori. Na veli strani so izpisani vsi imenski prostori in strani. -Na obrazcu zgoraj je mogoe pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino. +Na obrazcu zgoraj je mogoče pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino. -V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoe hitro spreminjati ali brisati. +V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoče hitro spreminjati ali brisati. -Ve podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoe najti v [[doku>acl|uradni dokumentaciji ACL]]. +Več podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoče najti v [[doku>acl|uradni dokumentaciji ACL]]. diff --git a/lib/plugins/acl/lang/sl/lang.php b/lib/plugins/acl/lang/sl/lang.php index 3fb391570..44e45e491 100644 --- a/lib/plugins/acl/lang/sl/lang.php +++ b/lib/plugins/acl/lang/sl/lang.php @@ -5,7 +5,7 @@ * @author Dejan Levec * @author Boštjan Seničar * @author Gregor Skumavc (grega.skumavc@gmail.com) - * @author Matej Urbančič (mateju@svn.gnome.org) + * @author Matej Urbančič (mateju@svn.gnome.org) */ $lang['admin_acl'] = 'Upravljanje dostopa'; $lang['acl_group'] = 'Skupina'; diff --git a/lib/plugins/config/lang/sl/lang.php b/lib/plugins/config/lang/sl/lang.php index dadd01595..ba4836823 100644 --- a/lib/plugins/config/lang/sl/lang.php +++ b/lib/plugins/config/lang/sl/lang.php @@ -7,7 +7,6 @@ * @author Gregor Skumavc (grega.skumavc@gmail.com) * @author Matej Urbančič (mateju@svn.gnome.org) */ - $lang['menu'] = 'Splošne nastavitve'; $lang['error'] = 'Nastavitve niso shranjene zaradi neveljavne vrednosti.
Neveljavna vrednost je označena z rdečim robom vnosnega polja.'; $lang['updated'] = 'Nastavitve so uspešno posodobljene.'; @@ -27,7 +26,7 @@ $lang['_authentication'] = 'Nastavitve overjanja'; $lang['_anti_spam'] = 'Nastavitve neželenih sporočil (Anti-Spam)'; $lang['_editing'] = 'Nastavitve urejanja'; $lang['_links'] = 'Nastavitve povezav'; -$lang['_media'] = 'Predstavnostne nastavitve'; +$lang['_media'] = 'Predstavne nastavitve'; $lang['_advanced'] = 'Napredne nastavitve'; $lang['_network'] = 'Omrežne nastavitve'; $lang['_plugin_sufix'] = 'nastavitve'; @@ -41,9 +40,12 @@ $lang['lang'] = 'Jezik vmesnika'; $lang['basedir'] = 'Pot do strežnika (npr. /dokuwiki/). Prazno polje določa samodejno zaznavanje'; $lang['baseurl'] = 'Naslov URL strežnika (npr. http://www.streznik.si). Prazno polje določa samodejno zaznavanje'; $lang['savedir'] = 'Mapa za shranjevanje podatkov'; +$lang['cookiedir'] = 'Pot do piškotka. Prazno polje določa uporabo osnovnega naslova (baseurl)'; $lang['start'] = 'Ime začetne strani wiki'; $lang['title'] = 'Naslov Wiki spletišča'; $lang['template'] = 'Predloga'; +$lang['tagline'] = 'Označna vrstica (ob podpori predloge)'; +$lang['sidebar'] = 'Ime strani stranske vrstice (ob podpori predloge); prazno polje onemogoči stransko vrstico.'; $lang['license'] = 'Pod pogoji katerega dovoljenja je objavljena vsebina?'; $lang['fullpath'] = 'Pokaži polno pot strani v nogi strani'; $lang['recent'] = 'Nedavne spremembe'; @@ -62,8 +64,9 @@ $lang['camelcase'] = 'Uporabi EnoBesedni zapisa za povezave'; $lang['deaccent'] = 'Počisti imena strani'; $lang['useheading'] = 'Uporabi prvi naslov za ime strani'; $lang['refcheck'] = 'Preverjanje sklica predstavnih datotek'; -$lang['refshow'] = 'Število predstavnostnih sklicev za prikaz'; +$lang['refshow'] = 'Število predstavih sklicev za prikaz'; $lang['allowdebug'] = 'Dovoli razhroščevanje (po potrebi!)'; +$lang['mediarevisions'] = 'Ali naj se omogočijo objave predstavnih vsebin?'; $lang['usewordblock'] = 'Zaustavi neželeno besedilo glede na seznam besed'; $lang['indexdelay'] = 'Časovni zamik pred ustvarjanjem kazala (v sekundah)'; $lang['relnofollow'] = 'Uporabni možnost rel="nofollow" pri zunanjih povezavah'; @@ -103,6 +106,7 @@ $lang['fetchsize'] = 'največja dovoljena velikost zunanjega prejema $lang['notify'] = 'Pošlji obvestila o spremembah na določen elektronski naslov'; $lang['registernotify'] = 'Pošlji obvestila o novih vpisanih uporabnikih na določen elektronski naslov'; $lang['mailfrom'] = 'Elektronski naslov za samodejno poslana sporočila'; +$lang['mailprefix'] = 'Predpona zadeve elektronskega sporočila za samodejna sporočila.'; $lang['gzip_output'] = 'Uporabi stiskanje gzip vsebine za xhtml'; $lang['gdlib'] = 'Različica GD Lib'; $lang['im_convert'] = 'Pot do orodja za pretvarjanje slik ImageMagick'; @@ -110,6 +114,7 @@ $lang['jpg_quality'] = 'Kakovost stiskanja datotek JPG (0-100)'; $lang['subscribers'] = 'Omogoči podporo naročanju na strani'; $lang['subscribe_time'] = 'Čas po katerem so poslani povzetki sprememb (v sekundah); Vrednost mora biti krajša od časa, ki je določen z nedavno_dni.'; $lang['compress'] = 'Združi odvod CSS in JavaScript v brskalniku'; +$lang['cssdatauri'] = 'Velikost sklicanih slik v bajtih, ki so navedene v datotekah CSS za zmanjšanje zahtev osveževanja strežnika HTTP. Ta možnost ni podprta v brskalniku MS IE 7 in nižjih različicah! Ustrezne vrednosti so 400 do 600 bajtov. Vrednost 0 onemogoči možnost.'; $lang['hidepages'] = 'Skrij skladne strani (logični izraz)'; $lang['send404'] = 'Pošlji "HTTP 404/Strani ni mogoče najti" pri dostopu do neobstoječih strani'; $lang['sitemap'] = 'Ustvari Google kazalo strani (v dnevih)'; @@ -172,9 +177,9 @@ $lang['compression_o_0'] = 'brez'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'ne uporabi'; -$lang['xsendfile_o_1'] = 'plačniška glava lighttpd (pred različico 1.5)'; +$lang['xsendfile_o_1'] = 'lastniška glava lighttpd (pred različico 1.5)'; $lang['xsendfile_o_2'] = 'običajna glava X-Sendfile'; -$lang['xsendfile_o_3'] = 'plačniška glava Nginx X-Accel-Redirect'; +$lang['xsendfile_o_3'] = 'lastniška glava Nginx X-Accel-Redirect'; $lang['showuseras_o_loginname'] = 'Prijavno ime'; $lang['showuseras_o_username'] = 'Polno ime uporabnika'; $lang['showuseras_o_email'] = 'Elektronski naslov uporabnika (šifriran po določilih varovanja)'; diff --git a/lib/plugins/plugin/lang/sl/admin_plugin.txt b/lib/plugins/plugin/lang/sl/admin_plugin.txt index 2e99c6297..5fd02e1ba 100644 --- a/lib/plugins/plugin/lang/sl/admin_plugin.txt +++ b/lib/plugins/plugin/lang/sl/admin_plugin.txt @@ -1,3 +1,3 @@ ====== Upravljanje vstavkov ====== -Na tej strani je mogoe spreminjati in prilagajati nastavitve Dokuwiki [[doku>plugins|vstavkov]]. Za prejemanje in nameanje vstavkov v ustrezne mape, morajo imeti te doloena ustrezna dovoljenja za pisanje spletnega strenika. +Na tej strani je mogoče spreminjati in prilagajati nastavitve DokuWiki [[doku>plugins|vstavkov]]. Za prejemanje in nameščanje vstavkov v ustrezne mape, morajo imeti te določena ustrezna dovoljenja za pisanje spletnega strežnika. diff --git a/lib/plugins/plugin/lang/sl/lang.php b/lib/plugins/plugin/lang/sl/lang.php index 39ba20139..3e5f8c8af 100644 --- a/lib/plugins/plugin/lang/sl/lang.php +++ b/lib/plugins/plugin/lang/sl/lang.php @@ -7,7 +7,6 @@ * @author Gregor Skumavc (grega.skumavc@gmail.com) * @author Matej Urbančič (mateju@svn.gnome.org) */ - $lang['menu'] = 'Upravljanje vstavkov'; $lang['download'] = 'Prejmi in namesti nov vstavek'; $lang['manage'] = 'Nameščeni vstavki'; @@ -52,3 +51,4 @@ $lang['enabled'] = 'Vstavek %s je omogočen.'; $lang['notenabled'] = 'Vstavka %s ni mogoče omogočiti zaradi neustreznih dovoljen.'; $lang['disabled'] = 'Vstavek %s je onemogočen.'; $lang['notdisabled'] = 'Vstavka %s ni mogoče onemogočiti zaradi neustreznih dovoljen.'; +$lang['packageinstalled'] = 'Paket vstavka (%d vstavkov: %s) je uspešno nameščen.'; diff --git a/lib/plugins/popularity/lang/sl/intro.txt b/lib/plugins/popularity/lang/sl/intro.txt index ceb0e61e6..2c029db63 100644 --- a/lib/plugins/popularity/lang/sl/intro.txt +++ b/lib/plugins/popularity/lang/sl/intro.txt @@ -1,9 +1,9 @@ -====== Poroilo o uporabi ====== +====== Poročilo o uporabi ====== -To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni Dokuwiki strani in omogoa poiljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo naine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statistinimi podatki vpliva tudi na nadaljnji razvoj sistema. +To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni DokuWiki strani in omogoča pošiljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo načine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statističnimi podatki vpliva tudi na nadaljnji razvoj sistema. -Priporoeno je, da poroilo o uporabi poljete vsake toliko asa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spletia in pogostosti uporabe. Vsi podatki so poslani oznaeni s posebno vpisno tevilko, ki omogoa brezimno sledenje. +Priporočeno je, da poročilo o uporabi pošljete vsake toliko časa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spletišča in pogostosti uporabe. Vsi podatki so poslani označeni s posebno vpisno številko, ki omogoča brezimno sledenje. -Zbrani podatki vsebujejo podrobnosti o razliici uporabljenega sistema DokuWiki, tevilo in velikost wiki strani, datotekah, ki so naloene na sistem in podatke o vstavkih ter PHP namestitvi in razliici. +Zbrani podatki vsebujejo podrobnosti o različici uporabljenega sistema DokuWiki, število in velikost wiki strani, datotekah, ki so naložene na sistem in podatke o vstavkih ter PHP namestitvi in različici. -Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Polji podatke", bodo ti poslani na strenik razvijalcev. +Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Pošlji podatke", bodo ti poslani na strežnik razvijalcev. diff --git a/lib/plugins/popularity/lang/sl/submitted.txt b/lib/plugins/popularity/lang/sl/submitted.txt index 988afd837..11ae052f7 100644 --- a/lib/plugins/popularity/lang/sl/submitted.txt +++ b/lib/plugins/popularity/lang/sl/submitted.txt @@ -1,3 +1,3 @@ -====== Poroilo o uporabi ====== +====== Poročilo o uporabi ====== -Podatki so bili uspeno poslani. +Podatki so bili uspešno poslani. diff --git a/lib/plugins/revert/lang/sl/intro.txt b/lib/plugins/revert/lang/sl/intro.txt index c63f281ed..4e2cabf96 100644 --- a/lib/plugins/revert/lang/sl/intro.txt +++ b/lib/plugins/revert/lang/sl/intro.txt @@ -1,3 +1,3 @@ ====== Povrnitev okvarjene vsebine ====== -Na tej strani je mogoe povrniti vsebino wiki strani na izvorne vrednosti po napadu na stran in vpisu neelenih vsebin. Za iskanje strani z neeleno vsebino, uporabite iskalnik z ustreznim nizom (npr. naslov URL), potem pa potrdite, da so najdene strani res z neeleno vsebino in nato povrnite stanje na zadnjo pravo razliico. +Na tej strani je mogoče povrniti vsebino wiki strani na izvorne vrednosti po napadu na stran in vpisu neželenih vsebin. Za iskanje strani z neželeno vsebino, uporabite iskalnik z ustreznim nizom (npr. naslov URL), potem pa potrdite, da so najdene strani res z neželeno vsebino in nato povrnite stanje na zadnjo pravo različico. diff --git a/lib/plugins/usermanager/lang/sl/delete.txt b/lib/plugins/usermanager/lang/sl/delete.txt index 7d9de54e6..1fd4fffe1 100644 --- a/lib/plugins/usermanager/lang/sl/delete.txt +++ b/lib/plugins/usermanager/lang/sl/delete.txt @@ -1 +1 @@ -===== Izbrisanje uporabnika ===== \ No newline at end of file +===== Izbris uporabnika ===== \ No newline at end of file -- cgit v1.2.3 From c7b28ffda48d3e6e225940a74b00ee5011f45b4b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 4 Feb 2012 13:26:50 +0000 Subject: added div.table around non-editable content as well (FS#1980) --- lib/plugins/acl/admin.php | 2 ++ lib/plugins/config/admin.php | 4 ++++ lib/plugins/info/syntax.php | 8 ++++---- lib/plugins/usermanager/admin.php | 4 ++++ 4 files changed, 14 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index a6b0624bc..c3461b78b 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -597,6 +597,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ''.NL; echo ''.NL; echo ''.NL; + echo '
'; echo ''; echo ''; echo ''; @@ -642,6 +643,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ''; echo ''; echo '
'.$this->getLang('where').'
'; + echo '
'; echo ''.NL; } diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index c883e7b6a..9a9bb5329 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -131,6 +131,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { } ptln('
'); ptln(' '.$setting->prompt($this).''); + ptln('
'); ptln(' '); } else { // config settings @@ -151,6 +152,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { } ptln('
'); + ptln('
'); if ($in_fieldset) { ptln('
'); } @@ -161,6 +163,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { usort($undefined_settings, '_setting_natural_comparison'); $this->_print_h1('undefined_settings', $this->getLang('_header_undefined')); ptln('
'); + ptln('
'); ptln(''); $undefined_setting_match = array(); foreach($undefined_settings as $setting) { @@ -175,6 +178,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { ptln(' '); } ptln('
'); + ptln('
'); ptln('
'); } diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php index 026a438bb..9aedbf0aa 100644 --- a/lib/plugins/info/syntax.php +++ b/lib/plugins/info/syntax.php @@ -174,7 +174,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { $hid = $this->_addToTOC($title, 3, $renderer); $doc .= '

'.hsc($title).'

'; $doc .= '
'; - $doc .= ''; + $doc .= '
'; $doc .= ''; if ($method['params']){ @@ -190,7 +190,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { $doc .= ''; } - $doc .= '
Description'.$method['desc']. '
Return value'.hsc(key($method['return'])). ''.hsc(current($method['return'])).'
'; + $doc .= '
'; $doc .= ''; } unset($po); @@ -206,7 +206,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { global $PARSER_MODES; $doc = ''; - $doc .= ''; + $doc .= '
'; foreach($PARSER_MODES as $mode => $modes){ $doc .= ''; $doc .= ''; $doc .= ''; } - $doc .= '
'; @@ -217,7 +217,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { $doc .= '
'; + $doc .= ''; return $doc; } diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 8e90be093..8b646b426 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -149,6 +149,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } ptln("
"); formSecurityToken(); + ptln("
"); ptln(" "); ptln(" "); ptln(" "); @@ -206,6 +207,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln(" "); ptln(" "); ptln("
"); + ptln("
"); ptln("
"); ptln(""); @@ -256,6 +258,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln("
",$indent); formSecurityToken(); + ptln("
",$indent); ptln(" ",$indent); ptln(" ",$indent); ptln(" ",$indent); @@ -295,6 +298,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln(" ",$indent); ptln(" ",$indent); ptln("
".$this->lang["field"]."".$this->lang["value"]."
",$indent); + ptln("
",$indent); foreach ($notes as $note) ptln("
".$note."
",$indent); -- cgit v1.2.3 From 2d74814f032eb77d6ed604f6328edfc229446c3b Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 5 Feb 2012 12:30:02 +0100 Subject: added getapi methods to remote plugin --- lib/plugins/remote.php | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib') diff --git a/lib/plugins/remote.php b/lib/plugins/remote.php index 42c2f53c8..a51f701fb 100644 --- a/lib/plugins/remote.php +++ b/lib/plugins/remote.php @@ -2,10 +2,20 @@ abstract class DokuWiki_Remote_Plugin extends DokuWiki_Plugin { + private $api; + + public function __construct() { + $this->api = new RemoteAPI(); + } + /** * @abstract * @return array Information to all provided methods. {@see RemoteAPI}. */ public abstract function _getMethods(); + protected function getApi() { + return $this->api; + } + } -- cgit v1.2.3 From 750a55de568a82aaa40ca384a17a64804e94f2b9 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 5 Feb 2012 12:33:35 +0100 Subject: corrected comment --- lib/exe/xmlrpc.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index ce9ef1484..a48ac41b0 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -34,7 +34,6 @@ class dokuwiki_xmlrpc_server extends IXR_Server { function call($methodname, $args){ try { - //print 'a'; $result = $this->remote->call($methodname, $args); return $result; } catch (RemoteAccessDeniedException $e) { -- cgit v1.2.3 From 0e336ca8d49c813f535e69d9e727aa58356d5197 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 6 Feb 2012 18:12:57 +0100 Subject: moved files to template hierarchy for merging with core --- lib/tpl/dokuwiki/README | 5 + lib/tpl/dokuwiki/css/_admin.css | 47 +++ lib/tpl/dokuwiki/css/_diff.css | 65 +++ lib/tpl/dokuwiki/css/_edit.css | 128 ++++++ lib/tpl/dokuwiki/css/_fileuploader.css | 112 +++++ lib/tpl/dokuwiki/css/_footnotes.css | 28 ++ lib/tpl/dokuwiki/css/_forms.css | 82 ++++ lib/tpl/dokuwiki/css/_imgdetail.css | 30 ++ lib/tpl/dokuwiki/css/_links.css | 65 +++ lib/tpl/dokuwiki/css/_media_fullscreen.css | 457 +++++++++++++++++++++ lib/tpl/dokuwiki/css/_media_popup.css | 205 +++++++++ lib/tpl/dokuwiki/css/_mediamanager.css | 219 ++++++++++ lib/tpl/dokuwiki/css/_modal.css | 83 ++++ lib/tpl/dokuwiki/css/_recent.css | 69 ++++ lib/tpl/dokuwiki/css/_search.css | 93 +++++ lib/tpl/dokuwiki/css/_tabs.css | 40 ++ lib/tpl/dokuwiki/css/_toc.css | 77 ++++ lib/tpl/dokuwiki/css/basic.css | 381 +++++++++++++++++ lib/tpl/dokuwiki/css/content.css | 148 +++++++ lib/tpl/dokuwiki/css/design.css | 463 +++++++++++++++++++++ lib/tpl/dokuwiki/css/includes.css | 4 + lib/tpl/dokuwiki/css/mobile.css | 192 +++++++++ lib/tpl/dokuwiki/css/pagetools.css | 208 ++++++++++ lib/tpl/dokuwiki/css/print.css | 127 ++++++ lib/tpl/dokuwiki/css/rtl.css | 571 ++++++++++++++++++++++++++ lib/tpl/dokuwiki/css/structure.css | 58 +++ lib/tpl/dokuwiki/detail.php | 144 +++++++ lib/tpl/dokuwiki/images/apple-touch-icon.png | Bin 0 -> 17728 bytes lib/tpl/dokuwiki/images/bullet.png | Bin 0 -> 199 bytes lib/tpl/dokuwiki/images/closed.png | Bin 0 -> 165 bytes lib/tpl/dokuwiki/images/favicon.ico | Bin 0 -> 7406 bytes lib/tpl/dokuwiki/images/link_icon.gif | Bin 0 -> 942 bytes lib/tpl/dokuwiki/images/logo.png | Bin 0 -> 12212 bytes lib/tpl/dokuwiki/images/mail_icon.gif | Bin 0 -> 918 bytes lib/tpl/dokuwiki/images/open.png | Bin 0 -> 174 bytes lib/tpl/dokuwiki/images/pagetools-license.txt | 4 + lib/tpl/dokuwiki/images/pagetools-sprite.png | Bin 0 -> 14507 bytes lib/tpl/dokuwiki/images/pagetools-sprite.xcf | Bin 0 -> 34257 bytes lib/tpl/dokuwiki/images/pagetools.xcf | Bin 0 -> 14393 bytes lib/tpl/dokuwiki/images/resizecol.png | Bin 0 -> 225 bytes lib/tpl/dokuwiki/images/search.png | Bin 0 -> 400 bytes lib/tpl/dokuwiki/images/toc-arrows.png | Bin 0 -> 322 bytes lib/tpl/dokuwiki/images/toc-bullet.png | Bin 0 -> 211 bytes lib/tpl/dokuwiki/images/windows.gif | Bin 0 -> 223 bytes lib/tpl/dokuwiki/main.php | 100 +++++ lib/tpl/dokuwiki/mediamanager.php | 48 +++ lib/tpl/dokuwiki/style.ini | 73 ++++ lib/tpl/dokuwiki/template.info.txt | 7 + lib/tpl/dokuwiki/tpl_footer.php | 6 + lib/tpl/dokuwiki/tpl_functions.php | 30 ++ lib/tpl/dokuwiki/tpl_header.php | 83 ++++ 51 files changed, 4452 insertions(+) create mode 100644 lib/tpl/dokuwiki/README create mode 100644 lib/tpl/dokuwiki/css/_admin.css create mode 100644 lib/tpl/dokuwiki/css/_diff.css create mode 100644 lib/tpl/dokuwiki/css/_edit.css create mode 100644 lib/tpl/dokuwiki/css/_fileuploader.css create mode 100644 lib/tpl/dokuwiki/css/_footnotes.css create mode 100644 lib/tpl/dokuwiki/css/_forms.css create mode 100644 lib/tpl/dokuwiki/css/_imgdetail.css create mode 100644 lib/tpl/dokuwiki/css/_links.css create mode 100644 lib/tpl/dokuwiki/css/_media_fullscreen.css create mode 100644 lib/tpl/dokuwiki/css/_media_popup.css create mode 100644 lib/tpl/dokuwiki/css/_mediamanager.css create mode 100644 lib/tpl/dokuwiki/css/_modal.css create mode 100644 lib/tpl/dokuwiki/css/_recent.css create mode 100644 lib/tpl/dokuwiki/css/_search.css create mode 100644 lib/tpl/dokuwiki/css/_tabs.css create mode 100644 lib/tpl/dokuwiki/css/_toc.css create mode 100644 lib/tpl/dokuwiki/css/basic.css create mode 100644 lib/tpl/dokuwiki/css/content.css create mode 100644 lib/tpl/dokuwiki/css/design.css create mode 100644 lib/tpl/dokuwiki/css/includes.css create mode 100644 lib/tpl/dokuwiki/css/mobile.css create mode 100644 lib/tpl/dokuwiki/css/pagetools.css create mode 100644 lib/tpl/dokuwiki/css/print.css create mode 100644 lib/tpl/dokuwiki/css/rtl.css create mode 100644 lib/tpl/dokuwiki/css/structure.css create mode 100644 lib/tpl/dokuwiki/detail.php create mode 100644 lib/tpl/dokuwiki/images/apple-touch-icon.png create mode 100644 lib/tpl/dokuwiki/images/bullet.png create mode 100644 lib/tpl/dokuwiki/images/closed.png create mode 100644 lib/tpl/dokuwiki/images/favicon.ico create mode 100644 lib/tpl/dokuwiki/images/link_icon.gif create mode 100644 lib/tpl/dokuwiki/images/logo.png create mode 100644 lib/tpl/dokuwiki/images/mail_icon.gif create mode 100644 lib/tpl/dokuwiki/images/open.png create mode 100644 lib/tpl/dokuwiki/images/pagetools-license.txt create mode 100644 lib/tpl/dokuwiki/images/pagetools-sprite.png create mode 100644 lib/tpl/dokuwiki/images/pagetools-sprite.xcf create mode 100644 lib/tpl/dokuwiki/images/pagetools.xcf create mode 100644 lib/tpl/dokuwiki/images/resizecol.png create mode 100644 lib/tpl/dokuwiki/images/search.png create mode 100644 lib/tpl/dokuwiki/images/toc-arrows.png create mode 100644 lib/tpl/dokuwiki/images/toc-bullet.png create mode 100644 lib/tpl/dokuwiki/images/windows.gif create mode 100644 lib/tpl/dokuwiki/main.php create mode 100644 lib/tpl/dokuwiki/mediamanager.php create mode 100644 lib/tpl/dokuwiki/style.ini create mode 100644 lib/tpl/dokuwiki/template.info.txt create mode 100644 lib/tpl/dokuwiki/tpl_footer.php create mode 100644 lib/tpl/dokuwiki/tpl_functions.php create mode 100644 lib/tpl/dokuwiki/tpl_header.php (limited to 'lib') diff --git a/lib/tpl/dokuwiki/README b/lib/tpl/dokuwiki/README new file mode 100644 index 000000000..966fc45f1 --- /dev/null +++ b/lib/tpl/dokuwiki/README @@ -0,0 +1,5 @@ +Starter Template for DokuWiki +http://www.dokuwiki.org/template:starter + +version: 2011-02-20 +author: Anika Henke diff --git a/lib/tpl/dokuwiki/css/_admin.css b/lib/tpl/dokuwiki/css/_admin.css new file mode 100644 index 000000000..e4664367c --- /dev/null +++ b/lib/tpl/dokuwiki/css/_admin.css @@ -0,0 +1,47 @@ +/** + * This file provides styles for the Administration overview + * (?do=admin). + */ + +.dokuwiki ul.admin_tasks { + float: left; + width: 40%; + list-style-type: none; + font-size: 1.125em; +} + +.dokuwiki ul.admin_tasks li { + padding-left: 35px; + margin: 0 0 1em 0; + font-weight: bold; + list-style-type: none; + background: transparent none no-repeat scroll 0 0; + color: inherit; +} + +.dokuwiki ul.admin_tasks li.admin_acl { + background-image: url(../../images/admin/acl.png); +} +.dokuwiki ul.admin_tasks li.admin_usermanager { + background-image: url(../../images/admin/usermanager.png); +} +.dokuwiki ul.admin_tasks li.admin_plugin { + background-image: url(../../images/admin/plugin.png); +} +.dokuwiki ul.admin_tasks li.admin_config { + background-image: url(../../images/admin/config.png); +} +.dokuwiki ul.admin_tasks li.admin_revert { + background-image: url(../../images/admin/revert.png); +} +.dokuwiki ul.admin_tasks li.admin_popularity { + background-image: url(../../images/admin/popularity.png); +} + +/* DokuWiki version below */ +.dokuwiki #admin__version { + clear: left; + float: right; + color: __text_neu__; + background-color: inherit; +} diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css new file mode 100644 index 000000000..62f831213 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_diff.css @@ -0,0 +1,65 @@ +/** + * This file provides styles for the diff view, which shows you + * differences between two versions of a page (?do=diff). + */ + +.dokuwiki table.diff { + width: 100%; + border-width: 0; +} +.dokuwiki table.diff th, +.dokuwiki table.diff td { + vertical-align: top; + padding: 0; + border-width: 0; + /* no style.ini colours because deleted and added lines have a fixed background colour */ + background-color: #fff; + color: #333; +} + +/* table header */ +.dokuwiki table.diff th { + border-bottom: 1px solid __border__; + font-size: 110%; + width: 50%; + font-weight: normal; +} +.dokuwiki table.diff th a { + font-weight: bold; +} +.dokuwiki table.diff th span.user { + font-size: .9em; +} +.dokuwiki table.diff th span.sum { + font-size: .9em; + font-weight: bold; +} +.dokuwiki table.diff th.minor { + color: #999; +} + +/* table body */ +.dokuwiki table.diff td { + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; +} +.dokuwiki table.diff td.diff-blockheader { + font-weight: bold; +} +.dokuwiki table.diff .diff-addedline { + background-color: #cfc; + color: inherit; +} +.dokuwiki table.diff .diff-deletedline { + background-color: #fdd; + color: inherit; +} +.dokuwiki table.diff td.diff-context { + background-color: #eee; + color: inherit; +} +.dokuwiki table.diff td.diff-addedline strong, +.dokuwiki table.diff td.diff-deletedline strong { + color: #f00; + background-color: inherit; + font-weight: bold; +} diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css new file mode 100644 index 000000000..5a3952c90 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_edit.css @@ -0,0 +1,128 @@ +/** + * This file provides styles for the edit view (?do=edit), preview + * and section edit buttons. + */ + +/* edit view +********************************************************************/ + +/*____________ toolbar ____________*/ + +.dokuwiki div.toolbar { + margin-bottom: .5em; + overflow: hidden; +} +.dokuwiki div.toolbar #draft__status { + float: right; + color: __text_alt__; + background-color: inherit; +} +.dokuwiki div.toolbar #tool__bar { + float: left; +} + +/* buttons inside of toolbar */ +.dokuwiki div.toolbar button.toolbutton { +} +/* picker popups (outside of .dokuwiki) */ +div.picker { + width: 300px; + border: 1px solid __border__; + background-color: __background_alt__; + color: inherit; +} +/* picker for headlines */ +div.picker.pk_hl { + width: auto; +} + +/* buttons inside of picker */ +div.picker button.pickerbutton, +div.picker button.toolbutton { + padding: .1em .35em; + border-width: 0; +} + +/*____________ edit textarea ____________*/ + +.dokuwiki textarea.edit { + /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */ + width: 700px; + min-width: 100%; + max-width: 100%; + margin-bottom: .5em; +} + +/*____________ below the textarea ____________*/ + +.dokuwiki #wiki__editbar { + overflow: hidden; + margin-bottom: .5em; +} + +/* size and wrap controls */ +.dokuwiki #wiki__editbar #size__ctl { + float: right; +} +.dokuwiki #wiki__editbar #size__ctl img { + cursor: pointer; +} + +/* edit buttons */ +.dokuwiki #wiki__editbar .editButtons { + display: inline; + margin-right: 1em; +} +.dokuwiki #wiki__editbar .editButtons input { +} + +/* summary input and minor changes checkbox */ +.dokuwiki #wiki__editbar .summary { + display: inline; +} +.dokuwiki #wiki__editbar .summary label { + vertical-align: middle; + white-space: nowrap; +} +.dokuwiki #wiki__editbar .summary label span { + vertical-align: middle; +} +.dokuwiki #wiki__editbar .summary input { +} +/* change background colour if summary is missing */ +.dokuwiki #wiki__editbar .summary input.missing { + color: __text__; + background-color: #ffcccc; +} + +/* preview +********************************************************************/ + +.dokuwiki div.preview { + border: dotted __border__; + border-width: .2em 0; + padding: 1.4em 0; + margin-bottom: 1.4em; +} + +/* section edit buttons +********************************************************************/ + +.dokuwiki .secedit { + float: right; + margin-top: -1.4em; +} +.dokuwiki .secedit input.button { + font-size: 75%; +} + +/* generic style for section highlighting (including headings) */ +.dokuwiki .section_highlight { +} +/* style for section highlighting (only sections below headings) */ +.dokuwiki div.section_highlight { + margin: -3em -1em -.01em -1em; /* negative side margin = side padding + side border */ + padding: 3em .5em .01em .5em; + border: solid __background_alt__; + border-width: 0 .5em; +} diff --git a/lib/tpl/dokuwiki/css/_fileuploader.css b/lib/tpl/dokuwiki/css/_fileuploader.css new file mode 100644 index 000000000..42004de28 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_fileuploader.css @@ -0,0 +1,112 @@ +/** + * This file provides the styles for the file uploader + * used in the media manager (both fullscreen and popup). + */ + +.qq-uploader { + position: relative; + width: 100%; +} + +.qq-uploader .error { + color: #f00; + background-color: #fff; +} + +/* select file button */ + +.qq-upload-button { + display: inline-block; + text-decoration: none; + font-size: 100%; + cursor: pointer; + margin: 1px 1px 5px; +} + +* html .qq-upload-button, +*+html .qq-upload-button { + display: inline; +} + +.qq-upload-button-focus { + outline: 1px dotted; +} + +/* drop area */ + +.qq-upload-drop-area { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + min-height: 70px; + z-index: 2; + background: __background_neu__; + color: __text__; + text-align: center; +} + +.qq-upload-drop-area span { + display: block; + position: absolute; + top: 50%; + width: 100%; + margin-top: -8px; + font-size: 120%; +} + +.qq-upload-drop-area-active { + background: __background_alt__; +} + +/* list of files to upload */ + +div.qq-uploader ul { + margin: 0; + padding: 0; + list-style: none; +} + +.qq-uploader li { + margin: 0 0 5px; + color: __text__; +} + +.qq-uploader li span, +.qq-uploader li input, +.qq-uploader li a { + margin-right: 5px; +} + +.qq-upload-file { + display: block; + font-weight: bold; +} + +.qq-upload-spinner { + display: inline-block; + background: url("../../images/throbber.gif"); + width: 15px; + height: 15px; + vertical-align: text-bottom; +} + +.qq-upload-size, +.qq-upload-cancel { + font-size: 85%; +} + +.qq-upload-failed-text { + display: none; +} +.qq-upload-fail .qq-upload-failed-text { + display: inline; +} + +.qq-action-container * { + vertical-align: middle; +} +.qq-overwrite-check input { + margin-left: 10px; +} diff --git a/lib/tpl/dokuwiki/css/_footnotes.css b/lib/tpl/dokuwiki/css/_footnotes.css new file mode 100644 index 000000000..a20f2964e --- /dev/null +++ b/lib/tpl/dokuwiki/css/_footnotes.css @@ -0,0 +1,28 @@ +/** + * This file provides styles for footnotes. + */ + +/*____________ footnotes inside the text ____________*/ + +/* link to footnote inside the text */ +.dokuwiki sup a.fn_top { +} +/* JSpopup */ +div.insitu-footnote { + max-width: 40%; + min-width: 5em; +} + +/*____________ footnotes at the bottom of the page ____________*/ + +.dokuwiki div.footnotes { + border-top: 1px solid __border__; + padding: .5em 0 0 0; + margin: 1em 0 0 0; + clear: both; +} +.dokuwiki div.footnotes div.fn { +} +.dokuwiki div.footnotes div.fn sup a.fn_bot { + font-weight: bold; +} diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css new file mode 100644 index 000000000..804584725 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -0,0 +1,82 @@ + +/* TODO */ + +/** + * This file provides styles for forms in general and specifically + * for ?do= + * - login + * - resendpwd + * - register + * - profile + * - subscribe + */ + +/* ---------------- forms ------------------------ */ + +.dokuwiki form { + border: none; + display: inline; +} + +.dokuwiki label.block { + display: block; + text-align: right; + font-weight: bold; +} + +.dokuwiki label.simple { + display: block; + text-align: left; + font-weight: normal; +} + +.dokuwiki label.block input.edit { + width: 50%; +} + +.dokuwiki label span { + vertical-align: middle; +} + +.dokuwiki fieldset { + width: 400px; + text-align: center; + border: 1px solid __border__; + padding: 0.5em; + margin: auto; +} + + +.dokuwiki input.edit, +.dokuwiki select.edit { + vertical-align: middle; +} +.dokuwiki select.edit { + padding: 0.1em 0; +} + + +.dokuwiki input.button, +.dokuwiki button.button { + vertical-align: middle; +} + +/** + * Styles for the subscription page + */ + +form#subscribe__form { + display: block; + width: 400px; + text-align: center; +} + +form#subscribe__form fieldset { + text-align: left; + margin: 0.5em 0; +} + +form#subscribe__form label { + display: block; + margin: 0 0.5em 0.5em; +} diff --git a/lib/tpl/dokuwiki/css/_imgdetail.css b/lib/tpl/dokuwiki/css/_imgdetail.css new file mode 100644 index 000000000..a3e0f55f5 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_imgdetail.css @@ -0,0 +1,30 @@ +/** + * This file provides styles for the image detail page (detail.php). + */ + +#dokuwiki__detail { + padding: 1em; +} +#dokuwiki__detail h1 { +} + +#dokuwiki__detail img { + float: left; + margin: 0 1.5em .5em 0; +} +#dokuwiki__detail div.img_detail { + float: left; +} + +#dokuwiki__detail div.img_detail h2 { +} +#dokuwiki__detail div.img_detail dl { +} +#dokuwiki__detail div.img_detail dl dt { +} +#dokuwiki__detail div.img_detail dl dd { +} + +#dokuwiki__detail p.back { + clear: both; +} diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css new file mode 100644 index 000000000..6b19c3a24 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_links.css @@ -0,0 +1,65 @@ +/** + * This file provides styles for all types of links. + */ + +/*____________ links to wiki pages ____________*/ + +/* existing wikipage */ +.dokuwiki a.wikilink1 { + color: __existing__; + background-color: inherit; +} +/* not existing wikipage */ +.dokuwiki a.wikilink2 { + color: __missing__; + background-color: inherit; + text-decoration: none; +} +.dokuwiki a.wikilink2:link, +.dokuwiki a.wikilink2:visited { + border-bottom: 1px dashed; +} +.dokuwiki a.wikilink2:hover, +.dokuwiki a.wikilink2:active, +.dokuwiki a.wikilink2:focus { + border-bottom-width: 0; +} + +/* any link to current page */ +.dokuwiki span.curid a { + font-weight: bold; +} + +/*____________ other link types ____________*/ + +.dokuwiki a.urlextern, +.dokuwiki a.windows, +.dokuwiki a.mail, +.dokuwiki a.mediafile, +.dokuwiki a.interwiki { + background-repeat: no-repeat; + background-position: 0 center; + padding: 0 0 0 20px; +} +/* external link */ +.dokuwiki a.urlextern { + background-image: url(images/link_icon.gif); + padding: 0 0 0 17px; +} +/* windows share */ +.dokuwiki a.windows { + background-image: url(images/windows.gif); +} +/* email link */ +.dokuwiki a.mail { + background-image: url(images/mail_icon.gif); +} + +/* icons of the following are set by dokuwiki in lib/exe/css.php */ +/* link to some embedded media */ +.dokuwiki a.mediafile { +} +/* interwiki link */ +.dokuwiki a.interwiki { + padding: 0 0 0 17px; +} diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css new file mode 100644 index 000000000..3bf48e9ec --- /dev/null +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -0,0 +1,457 @@ +/** + * This file provides the styles for the fullscreen media manager + * (?do=media). + * + * What most templates would probably need to change (depending on + * their site width) are the 4 min-width's (search for @change). + */ + + +/*____________ structure ____________*/ + +#mediamanager__page h1 { + margin-bottom: .5em; +} + +#mediamanager__page { + /* min-width must be summary of all 3 panels' min-widths */ + min-width: 50em; /* @change */ + width: 100%; + text-align: left; +} + +#mediamanager__page .panel { + float: left; +} + +#mediamanager__page .namespaces { + width: 20%; + min-width: 10em; /* @change */ +} +#mediamanager__page .filelist { + width: 50%; + min-width: 25em; /* @change */ +} +#mediamanager__page .file { + width: 30%; + min-width: 15em; /* @change */ +} + +#mediamanager__page .panelHeader { + background-color: __background_alt__; + margin: 0 10px 10px 0; + padding: 10px 10px 8px; + text-align: left; + min-height: 20px; + overflow: hidden; +} + +#mediamanager__page .panelContent { + overflow-y: auto; + overflow-x: hidden; + padding: 0; + margin: 0 10px 10px 0; + position: relative; +} + +#mediamanager__page .file .panelHeader, +#mediamanager__page .file .panelContent { + margin-right: 0; +} + +#mediamanager__page .ui-resizable-e { + width: 6px; + right: 2px; + background: transparent url(images/resizecol.png) center center no-repeat; +} +#mediamanager__page .ui-resizable-e:hover { + background-color: __background_alt__; +} + + +#mediamanager__page dd { + margin: 0; +} + +#mediamanager__page .panelHeader h3 { + float: left; + font-weight: normal; + font-size: 1em; + padding: 0; + margin: 0 0 3px; +} + + +/*____________ namespaces panel ____________*/ + +#mediamanager__page .namespaces h2 { + font-size: 1em; + display: inline-block; + border-width: 0; + padding: .3em .8em; + margin: 0 .3em 0 0; + border-radius: .5em .5em 0 0; + font-weight: normal; + background-color: __background_alt__; + color: __text__; + line-height: 1.4em; +} +* html #mediamanager__page .namespaces h2, +*+html #mediamanager__page .namespaces h2 { + display: inline; +} + +#mediamanager__page .namespaces ul { + margin-left: .2em; + margin-bottom: 0; + padding: 0; + list-style: none; +} +#mediamanager__page .namespaces ul ul { + margin-left: 1em; +} +#mediamanager__page .namespaces ul ul li { + margin: 0; +} + +#mediamanager__page .namespaces ul .selected { + background-color: __highlight__; + font-weight: bold; +} + + +/*____________ file list panel ____________*/ + +/* file list header */ + +#mediamanager__page .panelHeader form.options { + float: right; + margin-top: -3px; +} + +#mediamanager__page .panelHeader ul { + list-style: none; + margin: 0; + padding: 0; +} +#mediamanager__page .panelHeader ul li { + color: __text__; + float: left; + line-height: 1; + padding-left: 3px; +} + +#mediamanager__page .panelHeader ul li.listType { + padding-left: 30px; + background: url('../../images/icon-list.png') 3px 1px no-repeat; +} +#mediamanager__page .panelHeader ul li.sortBy { + padding-left: 30px; + background: url('../../images/icon-sort.png') 3px 1px no-repeat; +} + +#mediamanager__page .panelHeader form.options .ui-buttonset label{ + font-size: 90%; + margin-right: -0.4em; +} +#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text { + padding: .3em .5em; + line-height: 1; +} + +/* file list content */ + +#mediamanager__page .filelist ul { + padding: 0; + margin: 0; +} + +#mediamanager__page .filelist .panelContent ul li:hover { + background-color: __background_alt__; +} + +#mediamanager__page .filelist li dt a { + vertical-align: middle; + display: table-cell; + overflow: hidden; +} +* html #mediamanager__page .filelist .thumbs li dt a, +*+html #mediamanager__page .filelist .thumbs li dt a { + display: block; +} +* html #mediamanager__page .filelist .rows li dt a, +*+html #mediamanager__page .filelist .rows li dt a { + display: inline; +} + +/* file list as thumbs */ + +#mediamanager__page .filelist .thumbs li { + width: 100px; + min-height: 130px; + display: inline-block; + display: -moz-inline-stack; + /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */ + margin: 0 6px 10px 0; + background-color: __background_neu__; + color: __text__; + padding: 5px; + vertical-align: top; + text-align: center; + position: relative; + line-height: 1.2; +} +* html #mediamanager__page .filelist .thumbs li, +*+html #mediamanager__page .filelist .thumbs li { + display: inline; + zoom: 1; +} + +#mediamanager__page .filelist .thumbs li dt a { + width: 100px; + height: 90px; +} + +#mediamanager__page .filelist .thumbs li dt a img { + max-width: 90px; + max-height: 90px; +} + +#mediamanager__page .filelist .thumbs li .name, +#mediamanager__page .filelist .thumbs li .size, +#mediamanager__page .filelist .thumbs li .filesize, +#mediamanager__page .filelist .thumbs li .date { + display: block; + overflow: hidden; + text-overflow: ellipsis; + width: 90px; + white-space: nowrap; +} +#mediamanager__page .filelist .thumbs li .name { + padding: 5px 0; + font-weight: bold; +} +#mediamanager__page .filelist .thumbs li .date { + font-style: italic; + white-space: normal; +} + +/* file list as rows */ + +#mediamanager__page .filelist .rows li { + list-style: none; + display: block; + position: relative; + max-height: 50px; + margin: 0; + margin-bottom: 3px; + background-color: __background__; + color: __text__; + overflow: hidden; +} + +#mediamanager__page .filelist .rows li:nth-child(2n+1) { + background-color: __background_neu__; +} + +#mediamanager__page .filelist .rows li dt { + float: left; + width: 10%; + height: 40px; + text-align: center; +} + +#mediamanager__page .filelist .rows li dt a { + width: 100px; + height: 40px; +} + +#mediamanager__page .filelist .rows li dt a img { + max-width: 40px; + max-height: 40px; +} + +#mediamanager__page .filelist .rows li .name, +#mediamanager__page .filelist .rows li .size, +#mediamanager__page .filelist .rows li .filesize, +#mediamanager__page .filelist .rows li .date { + overflow: hidden; + text-overflow: ellipsis; + float: left; + margin-left: 1%; + white-space: nowrap; +} + +#mediamanager__page .filelist .rows li .name { + width: 30%; + font-weight: bold; +} +#mediamanager__page .filelist .rows li .size, +#mediamanager__page .filelist .rows li .filesize { + width: 15%; +} +#mediamanager__page .filelist .rows li .date { + width: 20%; + font-style: italic; + white-space: normal; +} + +/* upload form */ + +#mediamanager__page div.upload { + padding-bottom: 0.5em; +} + +/*____________ file panel ____________*/ + +#mediamanager__page .file ul.actions { + text-align: center; + margin: 0 0 5px; + padding: 0; + list-style: none; +} +#mediamanager__page .file ul.actions li { + display: inline; + margin: 0; +} + +#mediamanager__page .file div.image { + margin-bottom: 5px; + text-align: center; +} + +#mediamanager__page .file div.image img { + width: 100%; +} + +#mediamanager__page .file dl { + margin-bottom: 0; +} +#mediamanager__page .file dl dt { + font-weight: bold; + display: block; + background-color: __background_alt__; +} +#mediamanager__page .file dl dd { + display: block; + background-color: __background_neu__; +} + + +/* file meta data edit form */ + +#mediamanager__page form.meta div.row { + margin-bottom: 5px; +} + +#mediamanager__page form.meta label span { + display: block; +} + +#mediamanager__page form.meta input { + width: 50%; +} + +#mediamanager__page form.meta input.button { + width: auto; +} + +#mediamanager__page form.meta textarea.edit { + height: 6em; + width: 95%; + min-width: 95%; + max-width: 95%; +} + +/* file revisions form */ + +#mediamanager__page #page__revisions ul { + margin-left: 10px; + padding: 0; + list-style-type: none; +} + +#mediamanager__page #page__revisions ul li div.li div { + font-size: 90%; + color: __text_neu__; + padding-left: 18px; +} + +#mediamanager__page #page__revisions ul li div.li input { + position: relative; + top: 1px; +} + +/* file diff view */ + +#mediamanager__diff table { + table-layout: fixed; + border-width: 0; +} + +#mediamanager__diff td, +#mediamanager__diff th { + width: 48%; + margin: 0 5px 10px 0; + padding: 0; + vertical-align: top; + text-align: left; + border-color: __background__; +} + +#mediamanager__diff th { + font-weight: normal; + background-color: __background__; + line-height: 1.2; +} +#mediamanager__diff th a { + font-weight: bold; +} +#mediamanager__diff th span { + font-size: 90%; +} + +#mediamanager__diff dl dd strong{ + background-color: __highlight__; + color: __text__; + font-weight: normal; +} + +/* image diff views */ + +#mediamanager__page .file form.diffView { + margin-bottom: 10px; + display: block; +} + +#mediamanager__diff div.slider { + margin: 10px; + width: 95%; +} + +#mediamanager__diff .imageDiff { + position: relative; +} +#mediamanager__diff .imageDiff .image1, +#mediamanager__diff .imageDiff .image2 { + width: 97%; +} +#mediamanager__diff .imageDiff .image2 { + position: absolute; + top: 0; + left: 0; +} + +#mediamanager__diff .imageDiff.opacity .image2 { + opacity: 0.5; +} + +#mediamanager__diff .imageDiff.portions .image2 { + border-right: 1px solid red; + overflow: hidden; +} + +#mediamanager__diff .imageDiff img { + width: 100%; +} + diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css new file mode 100644 index 000000000..0469c8e60 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_media_popup.css @@ -0,0 +1,205 @@ +/** + * This file provides styles for the media manager popup + * (mediamanager.php). + */ + +/*____________ structure ____________*/ + +html.popup { + overflow: auto; +} + +#media__manager { + height: 100%; + overflow: hidden; +} + +#mediamgr__aside { + width: 30%; + height: 100%; + overflow: auto; + position: absolute; + left: 0; + border-right: 1px solid __border__; +} +#mediamgr__aside .pad { + padding: .5em; +} + +#mediamgr__content { + width: 69.7%; + height: 100%; + overflow: auto; + position: absolute; + right: 0; +} +#mediamgr__content .pad { + padding: .5em; +} + +#media__manager h1, +#media__manager h2 { + font-size: 1.5em; + margin-bottom: .5em; + padding-bottom: .2em; + border-bottom: 1px solid __border__; +} + +/* left side +********************************************************************/ + +/*____________ options ____________*/ + +#media__opts { + margin-bottom: .5em; +} + +#media__opts input { + margin-right: .3em; +} +#media__opts label { +} + +/*____________ tree ____________*/ + +#media__tree ul { + padding-left: .2em; +} +#media__tree ul li { + clear: left; + list-style-type: none; + list-style-image: none; + margin-left: 0; +} +#media__tree ul li img { + float: left; + padding: .5em .3em 0 0; +} +#media__tree ul li div.li { + display: inline; +} +#media__tree ul li li { + margin-left: 1.5em; +} + +/* right side +********************************************************************/ + +/*____________ upload form ____________*/ + +/* upload info */ +#media__content div.upload { + font-size: .9em; + margin-bottom: .5em; +} + +#mediamanager__uploader { + margin-bottom: 1em; +} +#mediamanager__uploader p { + margin-bottom: .5em; +} + +/*____________ file list ____________*/ + +#media__content img.load { + margin: 1em auto; +} + +#media__content .odd, +#media__content .even { + padding: .5em; +} +#media__content .odd { + background-color: __background_alt__; +} +#media__content .even { +} +/* highlight newly uploaded or edited file */ +#media__content #scroll__here { + border: 1px dashed __border__; +} + +/* link which inserts media file */ +#media__content a.mediafile { + margin-right: 1.5em; + font-weight: bold; +} +#media__content span.info { +} +#media__content img.btn { + vertical-align: text-bottom; +} + +/* info how to insert media, if JS disabled */ +#media__content div.example { + color: __text_neu__; + margin-left: 1em; +} + +#media__content div.detail { + padding: .2em 0; +} +#media__content div.detail div.thumb { + float: left; + margin: 0 .5em 0 18px; +} +#media__content div.detail div.thumb a { + display: block; + cursor: pointer; +} +#media__content div.detail p { + margin-bottom: 0; +} + + +/*____________ media search ____________*/ + +form#dw__mediasearch { +} +form#dw__mediasearch p { +} +form#dw__mediasearch label { +} +form#dw__mediasearch label span { +} +form#dw__mediasearch input.edit { +} +form#dw__mediasearch input.button { +} + + +/* meta edit form +********************************************************************/ + +#media__content form.meta { +} + +#media__content form.meta div.metafield { + clear: left; + margin-bottom: .5em; + overflow: hidden; +} + +#media__content form.meta label { + display: block; + width: 25%; + float: left; + font-weight: bold; + clear: left; +} +#media__content form.meta .edit { + float: left; + width: 70%; + margin: 0; +} +#media__content form.meta textarea.edit { + /* needed because of IE8 hack in _edit.css for textarea.edit: */ + max-width: 70%; + min-width: 70%; +} + +#media__content form.meta div.buttons { + clear: left; + margin: .2em 0 0 25%; +} diff --git a/lib/tpl/dokuwiki/css/_mediamanager.css b/lib/tpl/dokuwiki/css/_mediamanager.css new file mode 100644 index 000000000..d47e581ff --- /dev/null +++ b/lib/tpl/dokuwiki/css/_mediamanager.css @@ -0,0 +1,219 @@ +/** + * This file provides styles for the media manager + * (mediamanager.php). + */ + +/*____________ structure ____________*/ + +html.popup { + overflow: auto; +} + +#media__manager { + height: 100%; + overflow: hidden; +} + +#mediamgr__aside { + width: 30%; + height: 100%; + overflow: auto; + position: absolute; + left: 0; + border-right: 1px solid __border__; +} +#mediamgr__aside .pad { + padding: .5em; +} + +#mediamgr__content { + width: 69.7%; + height: 100%; + overflow: auto; + position: absolute; + right: 0; +} +#mediamgr__content .pad { + padding: .5em; +} + +#media__manager h1, +#media__manager h2 { + font-size: 1.5em; + margin-bottom: .5em; + padding-bottom: .2em; + border-bottom: 1px solid __border__; +} + +/* left side +********************************************************************/ + +/*____________ options ____________*/ + +#media__opts { + margin-bottom: .5em; +} + +#media__opts input { + margin-right: .3em; +} +#media__opts label { +} + +/*____________ tree ____________*/ + +#media__tree ul { + padding-left: .2em; +} +#media__tree ul li { + clear: left; + list-style-type: none; + list-style-image: none; + margin-left: 0; +} +#media__tree ul li img { + float: left; + padding: .5em .3em 0 0; +} +#media__tree ul li div.li { + display: inline; +} +#media__tree ul li li { + margin-left: 1.5em; +} + +/* right side +********************************************************************/ + +/*____________ upload form ____________*/ + +/* upload info */ +#media__content div.upload { + font-size: .9em; + margin-bottom: .5em; +} + +#media__content form#dw__upload, +#media__content div#dw__flashupload { + display: block; + border-bottom: solid 1px __border__; + padding-bottom: 1em; + margin-bottom: 1em; +} +#media__content form#dw__upload p { + margin-bottom: .5em; +} + +#media__content form#dw__upload label { +} +#media__content form#dw__upload label.check { +} +#media__content form#dw__upload input.check { +} +#media__content form#dw__upload input.edit { +} +#media__content form#dw__upload img { +} + +/*____________ file list ____________*/ + +#media__content img.load { + margin: 1em auto; +} + +#media__content .odd, +#media__content .even { + padding: .5em; +} +#media__content .odd { + background-color: __background_alt__; +} +#media__content .even { +} +/* highlight newly uploaded or edited file */ +#media__content #scroll__here { + border: 1px dashed __border__; +} + +/* link which inserts media file */ +#media__content a.mediafile { + margin-right: 1.5em; + font-weight: bold; +} +#media__content span.info { +} +#media__content img.btn { + vertical-align: text-bottom; +} + +/* info how to insert media, if JS disabled */ +#media__content div.example { + color: __text_neu__; + margin-left: 1em; +} + +#media__content div.detail { + padding: .2em 0; +} +#media__content div.detail div.thumb { + float: left; + margin: 0 .5em 0 18px; +} +#media__content div.detail div.thumb a { + display: block; +} +#media__content div.detail p { + margin-bottom: 0; +} + + +/*____________ media search ____________*/ + +form#dw__mediasearch { +} +form#dw__mediasearch p { +} +form#dw__mediasearch label { +} +form#dw__mediasearch label span { +} +form#dw__mediasearch input.edit { +} +form#dw__mediasearch input.button { +} + + +/* meta edit form +********************************************************************/ + +#media__content form.meta { +} + +#media__content form.meta div.metafield { + clear: left; + margin-bottom: .5em; + overflow: hidden; +} + +#media__content form.meta label { + display: block; + width: 25%; + float: left; + font-weight: bold; + clear: left; +} +#media__content form.meta .edit { + float: left; + width: 70%; + margin: 0; +} +#media__content form.meta textarea.edit { + /* needed because of IE8 hack in _edit.css for textarea.edit: */ + max-width: 70%; + min-width: 70%; +} + +#media__content form.meta div.buttons { + clear: left; + margin: .2em 0 0 25%; +} diff --git a/lib/tpl/dokuwiki/css/_modal.css b/lib/tpl/dokuwiki/css/_modal.css new file mode 100644 index 000000000..125f702a8 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_modal.css @@ -0,0 +1,83 @@ +/** + * This file provides styles for modal dialogues. + */ + +.dokuwiki .ui-widget { + font-size: 100%; +} + + +/* link wizard (opens from the link button in the edit toolbar) +********************************************************************/ + +#link__wiz { +} + +#link__wiz_result { + background-color: __background__; + width: 293px; + height: 193px; + overflow: auto; + border: 1px solid __border__; + margin: 3px auto; + text-align: left; + line-height: 1; +} + +#link__wiz_result div { + padding: 3px 3px 3px 0; +} + +#link__wiz_result div a { + display: block; + padding-left: 22px; + min-height: 16px; + background: transparent 3px center no-repeat; +} + +#link__wiz_result div.type_u a { + background-image: url(../../images/up.png); +} +#link__wiz_result div.type_f a { + background-image: url(../../images/page.png); +} +#link__wiz_result div.type_d a { + background-image: url(../../images/ns.png); +} + +#link__wiz_result div.even { + background-color: __background_neu__; +} + +#link__wiz_result div.selected { + background-color: __background_alt__; +} + +#link__wiz_result span { + display: block; + color: __text_neu__; + margin-left: 22px; +} + + +/* media option wizard (opens when inserting media in the media popup) +********************************************************************/ + +#media__popup { + /* for backwards compatibility (not needed since Rincewind) */ + display: none; +} + +#media__popup_content p { + margin: 0 0 .5em; +} + +#media__popup_content label { + margin-right: .5em; + cursor: default; +} + +#media__popup_content .button { + margin-right: 1px; + cursor: pointer; +} diff --git a/lib/tpl/dokuwiki/css/_recent.css b/lib/tpl/dokuwiki/css/_recent.css new file mode 100644 index 000000000..68f0e5826 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_recent.css @@ -0,0 +1,69 @@ +/** + * This file provides styles for the recent changes (?do=recent) and + * old revisions (?do=revisions). + */ + +/*____________ list of revisions / recent changes ____________*/ + +/* select type of revisions (media/pages), should have a class on it's own, but hasn't */ +.dokuwiki #dw__recent label { + margin-bottom: .5em; + display: block; +} + +.dokuwiki #dw__recent ul li, +.dokuwiki #page__revisions ul li { + list-style: none; + margin-left: 0; +} +.dokuwiki #dw__recent ul li span, +.dokuwiki #dw__recent ul li a, +.dokuwiki #page__revisions ul li span, +.dokuwiki #page__revisions ul li a { + vertical-align: middle; +} +.dokuwiki #dw__recent ul li span.user a, +.dokuwiki #page__revisions ul li span.user a { + vertical-align: bottom; +} +.dokuwiki #dw__recent ul li.minor, +.dokuwiki #page__revisions ul li.minor { + opacity: .7; +} + +.dokuwiki #dw__recent li span.date, +.dokuwiki #page__revisions li span.date { +} +.dokuwiki #dw__recent li a.diff_link, +.dokuwiki #page__revisions li a.diff_link { + vertical-align: baseline; +} +.dokuwiki #dw__recent li a.revisions_link, +.dokuwiki #page__revisions li a.revisions_link { + vertical-align: baseline; +} +.dokuwiki #dw__recent li a.wikilink1, +.dokuwiki #dw__recent li a.wikilink2, +.dokuwiki #page__revisions li a.wikilink1, +.dokuwiki #page__revisions li a.wikilink2 { +} +.dokuwiki #dw__recent li span.sum, +.dokuwiki #page__revisions li span.sum { + font-weight: bold; +} +.dokuwiki #dw__recent li span.user, +.dokuwiki #page__revisions li span.user { +} + + +/*____________ page navigator ____________*/ + +.dokuwiki div.pagenav { + text-align: center; + margin: 1.4em 0; +} +.dokuwiki div.pagenav-prev, +.dokuwiki div.pagenav-next { + display: inline; + margin: 0 .5em; +} diff --git a/lib/tpl/dokuwiki/css/_search.css b/lib/tpl/dokuwiki/css/_search.css new file mode 100644 index 000000000..70824fc43 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_search.css @@ -0,0 +1,93 @@ +/** + * This file provides styles for the search results page (?do=search) + * and the AJAX search popup. + */ + +/* search results page +********************************************************************/ + +/* loading gif */ +.dokuwiki #dw__loading { +} + +/*____________ matching pagenames ____________*/ + +.dokuwiki div.search_quickresult { + margin-bottom: 1.4em; +} +.dokuwiki div.search_quickresult h3 { +} +.dokuwiki div.search_quickresult ul { + padding: 0; +} +.dokuwiki div.search_quickresult ul li { + float: left; + width: 12em; + margin: 0 1.5em; +} + +/*____________ search results ____________*/ + +/* container for one search result */ +.dokuwiki div.search_result { + margin-bottom: 1.4em; +} +/* search snippet */ +.dokuwiki div.search_result div.search_snippet { + color: __text_alt__; + background-color: inherit; +} + +/* search hit in normal text */ +.dokuwiki .search_hit { + color: __text__; + background-color: __highlight__; +} +/* search hit in search results */ +.dokuwiki div.search_result strong.search_hit { + font-weight: normal; +} +/* ellipsis separating snippets */ +.dokuwiki div.search_result .search_sep { + color: __text__; + background-color: inherit; +} + +/* "nothing found" at search + media */ +.dokuwiki div.nothing { + margin-bottom: 1.4em; +} + + +/* AJAX quicksearch popup +********************************************************************/ + +.dokuwiki form.search div.no { + position: relative; +} + +/* .JSpopup */ +.dokuwiki form.search div.ajax_qsearch { + position: absolute; + top: 0; + left: -13.5em; /* -( width of #qsearch__in + padding of .ajax_qsearch + a bit more ) */ + width: 12em; + padding: 0.5em; + font-size: .9em; + z-index: 20; + text-align: left; + display: none; +} +.dokuwiki form.search div.ajax_qsearch strong { + display: block; + margin-bottom: .3em; +} +.dokuwiki form.search div.ajax_qsearch ul { + margin: 0 !important; + padding: 0 !important; +} +.dokuwiki form.search div.ajax_qsearch ul li { + margin: 0; + padding: 0; + display: block !important; +} diff --git a/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css new file mode 100644 index 000000000..de544fd2b --- /dev/null +++ b/lib/tpl/dokuwiki/css/_tabs.css @@ -0,0 +1,40 @@ +/** + * This file provides the styles for general tabs. + */ + +.dokuwiki ul.tabs { + padding: 0; + margin: 0; + overflow: hidden; +} +.dokuwiki ul.tabs li { + float: left; + padding: 0; + margin: 0; + list-style: none; +} + +.dokuwiki ul.tabs li strong, +.dokuwiki ul.tabs li a { + float: left; + padding: .3em .8em; + margin: 0 .3em 0 0; + background-color: __background_neu__; + color: __text__; + border-radius: .5em .5em 0 0; +} +.dokuwiki ul.tabs li strong { + font-weight: normal; +} + +.dokuwiki ul.tabs li a:link, +.dokuwiki ul.tabs li a:visited { +} +.dokuwiki ul.tabs li a:hover, +.dokuwiki ul.tabs li a:active, +.dokuwiki ul.tabs li a:focus, +.dokuwiki ul.tabs li strong { + background-color: __background_alt__; + color: __text__; + text-decoration: none; +} diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css new file mode 100644 index 000000000..b78817523 --- /dev/null +++ b/lib/tpl/dokuwiki/css/_toc.css @@ -0,0 +1,77 @@ +/** + * This file provides styles for the TOC (table of contents), the + * sitemap (?do=index) and backlinks (?do=backlink). + */ + +/* toc +********************************************************************/ + +/* toc container */ +.dokuwiki div.toc { + float: right; + margin: 0 0 1.4em 1.4em; + width: 12em; + background-color: __background_alt__; + color: inherit; +} + +/*____________ toc header ____________*/ + +.dokuwiki div.tocheader { + padding: .2em .5em; + font-weight: bold; +} + +.dokuwiki .toc span.toc_open, +.dokuwiki .toc span.toc_close { + float: right; + margin: 0 .2em; +} + +/*____________ toc list ____________*/ + +.dokuwiki #toc__inside { + padding: .2em .5em; +} +.dokuwiki #toc__inside ul { + padding: 0; + margin: 0; +} +.dokuwiki #toc__inside ul li { + list-style: none; + padding: 0; + margin: 0; + line-height: 1.1; +} +.dokuwiki #toc__inside ul li div.li { + padding: .15em 0; +} +.dokuwiki #toc__inside ul ul { + padding-left: 1em; +} +.dokuwiki #toc__inside ul ul li { +} +.dokuwiki #toc__inside ul li a { +} + +/* in case of toc list jumping one level + (e.g. if heading level 3 follows directly after heading level 1) */ +.dokuwiki #toc__inside ul li.clear { +} + + +/* sitemap (and backlinks) +********************************************************************/ + +.dokuwiki ul.idx { + padding-left: 0; +} +.dokuwiki ul.idx li { + list-style-image: url(images/bullet.png); +} +.dokuwiki ul.idx li.open { + list-style-image: url(images/open.png); +} +.dokuwiki ul.idx li.closed { + list-style-image: url(images/closed.png); +} diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css new file mode 100644 index 000000000..ae9be499e --- /dev/null +++ b/lib/tpl/dokuwiki/css/basic.css @@ -0,0 +1,381 @@ +/** + * This file provides the most basic styles. + * + * If you integrate DokuWiki into another project, you might either + * want to integrate this file into the other project as well, or use + * the other project's basic CSS for DokuWiki instead of this one. + * + * @author Anika Henke + */ + +html { + overflow-x: auto; + overflow-y: scroll; +} +html, +body { + color: __text__; + background-color: __background_site__; + background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: -o-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: -ms-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-size: 1px 10em; + background-repeat: repeat-x; + margin: 0; + padding: 0; +} +body { + font: normal 87.5%/1.4 Arial, sans-serif; + /* default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px */ +} + + +/*____________ headers ____________*/ + +h1, +h2, +h3, +h4, +h5, +h6, +caption, +legend { + font-family: Arial, sans-serif; + font-weight: bold; + background-color: inherit; + padding: 0; + line-height: 1.2; + clear: left; /* ideally 'both', but problems with toc */ +} + +h1 { + font-size: 2em; + margin: -.222em 0 0.444em; +} +h2 { + font-size: 1.5em; + margin: 0 0 0.666em; +} +h3 { + font-size: 1.125em; + margin: 0 0 0.888em; +} +h4 { + font-size: 1em; + margin: 0 0 1.0em; +} +h5 { + font-size: .875em; + margin: 0 0 1.1428em; +} +h6 { + font-size: .75em; + margin: 0 0 1.333em; +} +/* bottom margin = 1 / font-size */ + + +/*____________ basic margins and paddings ____________*/ + +p, +ul, +ol, +dl, +pre, +table, +hr, +blockquote, +fieldset, +address { + margin: 0 0 1.4em 0; /* bottom margin = line-height */ + padding: 0; +} + +div { + margin: 0; + padding: 0; +} + + +/*____________ lists ____________*/ + +ul, +ol { + padding: 0 0 0 1.5em; +} +li, +dd { + padding: 0; + margin: 0 0 0 1.5em; +} +dt { + font-weight: bold; + margin: 0; + padding: 0; +} + +li ul, +li ol, +li dl, +dl ul, +dl ol, +dl dl { + margin-bottom: 0; + padding: 0; +} +li li { + font-size: 100%; +} + +ul { list-style: square outside; } +ol { list-style: decimal outside; } +ol ol { list-style-type: lower-alpha; } +ol ol ol { list-style-type: upper-roman; } +ol ol ol ol { list-style-type: upper-alpha; } +ol ol ol ol ol { list-style-type: lower-roman; } + + +/*____________ tables ____________*/ + +table { + border-collapse: collapse; + empty-cells: show; + border-spacing: 0; + border: 1px solid __border__; +} + +caption { + caption-side: top; + text-align: left; + margin: 0 0 .3em; +} + +th, +td { + padding: .3em .5em; + margin: 0; + vertical-align: top; + border: 1px solid __border__; + text-align: left; +} +th { + font-weight: bold; + background-color: __background_alt__; +} + + +/*____________ links ____________*/ + +a { + outline: none; +} +a:link, +a:visited { + text-decoration: none; + color: __link__; +} +a:link:hover, +a:visited:hover, +a:link:focus, +a:visited:focus, +a:link:active, +a:visited:active { + text-decoration: underline; +} + + +/*____________ misc ____________*/ + +img { + border-width: 0; + vertical-align: middle; + color: #666; + background-color: transparent; + font-style: italic; +} +img, +object { + max-width: 100%; +} + +hr { + border-top: solid __border__; + border-bottom: solid __background__; + border-width: 1px 0; + height: 0; + width: 100%; + text-align: center; + clear: both; +} + +acronym, +abbr { + cursor: help; + border-bottom: 1px dotted; + font-style: normal; +} + +pre, +code, +samp, +kbd { + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; + /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ + font-size: 1em; + direction: ltr; + text-align: left; +} +pre { + overflow: auto; + word-wrap: normal; +} + +blockquote { + padding: 0 .5em; + border: solid __border__; + border-width: 0 0 0 .25em; +} +q:before, +q:after { + content: ''; +} + +sub, +sup { + font-size: .8em; + line-height: 1; +} +sub { + vertical-align: sub; +} +sup { + vertical-align: super; +} + +/*____________ forms ____________*/ + +/* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */ + +form { + display: inline; + margin: 0; + padding: 0; +} +fieldset { + padding: 1em 1em 0; + border: 1px solid __text_alt__; +} +legend { + margin: 0; + padding: 0 .1em; +} +label { + vertical-align: middle; + cursor: pointer; +} + +input, +textarea, +button, +select, +optgroup, +option { + font: inherit; + font-weight: normal; + color: #333; + background-color: #fff; + line-height: 1; + margin: 0; + vertical-align: middle; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +optgroup { + font-style: italic; + font-weight: bold; +} +option { + font-style: normal; + font-weight: normal; +} + +input, +textarea, +select { + border: 1px solid #ccc; + box-shadow: inset 0 0 1px #eee; + border-radius: 2px; +} +input:active, +input:focus, +textarea:active, +textarea:focus, +select:active, +select:focus { + border-color: #999; +} +input[type=radio], +input[type=checkbox] { + padding: 0; + border-width: 0; + box-shadow: none; +} + +/* all types of buttons */ +input[type=submit], +input.button, +a.button, +button, +.qq-upload-button { + color: #333; + background-color: #eee; + background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + border: 1px solid #ccc; + border-radius: 2px; + padding: .1em .5em; + cursor: pointer; +} + +input[type=submit]:hover, +input[type=submit]:active, +input[type=submit]:focus, +input.button:hover, +input.button:active, +input.button:focus, +a.button:hover, +a.button:active, +a.button:focus, +button:hover, +button:active, +button:focus, +.qq-upload-button:hover { + border-color: #999; + background-color: #ddd; + background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); + background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); +} + +input::-moz-focus-inner, +button::-moz-focus-inner { + border: 0; + padding: 0; +} + +input[disabled], +button[disabled], +input[readonly], +button[readonly] { + cursor: auto; +} + diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css new file mode 100644 index 000000000..4e9f8cbe1 --- /dev/null +++ b/lib/tpl/dokuwiki/css/content.css @@ -0,0 +1,148 @@ +/** + * This file provides the main design styles for the page content. + * + * @author Anika Henke + * @author Andreas Gohr + * @author Clarence Lee + */ + + +/*____________ section indenting ____________ + +.dokuwiki.page h1 {margin-left: 0;} +.dokuwiki.page h2 {margin-left: .666em;} +.dokuwiki.page h3 {margin-left: 1.776em;} +.dokuwiki.page h4 {margin-left: 3em;} +.dokuwiki.page h5 {margin-left: 4.5712em;} +.dokuwiki.page div.level1 {margin-left: 0;} +.dokuwiki.page div.level2 {margin-left: 1em;} +.dokuwiki.page div.level3 {margin-left: 2em;} +.dokuwiki.page div.level4 {margin-left: 3em;} +.dokuwiki.page div.level5 {margin-left: 4em;} +*/ +/* hx margin-left = (1 / font-size) * .levelx-margin */ + + +/*____________ images ____________*/ + +/* embedded images (styles are already partly set in lib/styles/all.css) */ +.dokuwiki img.media { +} +.dokuwiki img.medialeft { + margin: .5em 1.5em .5em 0; +} +.dokuwiki img.mediaright { + margin: .5em 0 .5em 1.5em; +} +.dokuwiki img.mediacenter { + margin: .5em auto; +} + + +/*____________ lists ____________*/ + +.dokuwiki #dokuwiki__content ul li, +.dokuwiki #dokuwiki__aside ul li { + color: __text_alt__; +} +.dokuwiki #dokuwiki__content ol li, +.dokuwiki #dokuwiki__aside ol li { + color: __text_neu__; +} +.dokuwiki #dokuwiki__content li .li, +.dokuwiki #dokuwiki__aside li .li { + color: __text__; +} + + +/*____________ tables ____________*/ + +.dokuwiki div.table { + width: 100%; + overflow-x: auto; + margin-bottom: 1.4em; +} +.dokuwiki div.table table { + margin-bottom: 0; +} + +.dokuwiki table.inline { + min-width: 50%; + border-width: 0; +} +.dokuwiki table.inline th, +.dokuwiki table.inline td { + border: 1px solid __border__; +} +.dokuwiki table.inline th { + color: inherit; + background-color: __background_alt__; +} +.dokuwiki table.inline td { +} +.dokuwiki table.inline tr:hover td { + background-color: __background_alt__; +} +.dokuwiki table.inline tr:hover th { + background-color: __border__; +} + + +/*____________ code ____________*/ + +.dokuwiki pre, +.dokuwiki tt, +.dokuwiki code, +.dokuwiki samp, +.dokuwiki kbd { + background-color: __background_alt__; + color: __text__; +} +/* fix if background-color hides underlining */ +.dokuwiki em.u code { + text-decoration: underline; +} +.dokuwiki pre { + border: 1px solid __border__; + padding: .75em 1em; +} +/* for code in */ +.dokuwiki pre.file { +} + +/* filenames for downloadable file and code blocks */ +.dokuwiki dl.code, +.dokuwiki dl.file { +} + +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { + background-color: __background_alt__; + background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); + background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%); + background: -o-linear-gradient( top, __background__ 0%, __background_alt__ 100%); + background: -ms-linear-gradient( top, __background__ 0%, __background_alt__ 100%); + background: linear-gradient( top, __background__ 0%, __background_alt__ 100%); + color: inherit; + border: 1px solid __border__; + border-bottom-color: __background_alt__; + border-top-left-radius: .3em; + border-top-right-radius: .3em; + padding: .3em .6em .1em; + margin-bottom: -1px; + float: left; +} +.dokuwiki dl.code dt a, +.dokuwiki dl.file dt a { + background-color: transparent; + font-size: 0.875em; + font-weight: normal; + display: block; + min-height: 16px; +} +.dokuwiki dl.code dd, +.dokuwiki dl.file dd { + margin: 0; + clear: left; +} + diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css new file mode 100644 index 000000000..39d793f99 --- /dev/null +++ b/lib/tpl/dokuwiki/css/design.css @@ -0,0 +1,463 @@ +/** + * This file provides the main design styles for the + * bits that surround the content. + * + * @author Anika Henke + * @author Andreas Gohr + * @author Clarence Lee + */ + +/* header +********************************************************************/ + +#dokuwiki__header { + padding: 2em 0 1.5em; +} + +#dokuwiki__header .headings, +#dokuwiki__header .tools { + margin-bottom: 1.5em; + width: 49%; +} +#dokuwiki__header h1 img { + float: left; + margin-right: .5em; +} +#dokuwiki__header h1 span { + display: block; + padding-top: 10px; +} +#dokuwiki__header h1 { + margin: 0; + font-size: 1.5em; + font-weight: normal; +} +#dokuwiki__header h1 a { + text-decoration: none; + color: __text__; + background-color: inherit; +} +#dokuwiki__header h1 a:hover, +#dokuwiki__header h1 a:active, +#dokuwiki__header h1 a:focus { +} +#dokuwiki__header p.claim { + margin-bottom: 0; + font-size: 0.875em; +} + +#dokuwiki__header .tools { + margin-top: .2em; +} + + +/* tools +********************************************************************/ + +/* highlight selected tool */ +.mode_admin a.action.admin, +.mode_login a.action.login, +.mode_register a.action.register, +.mode_profile a.action.profile, +.mode_recent a.action.recent, +.mode_index a.action.index, +.mode_revisions a.action.revs, +.mode_backlink a.action.backlink, +.mode_subscribe a.action.subscribe { + font-weight: bold; +} + +#dokuwiki__header .tools ul { + padding-left: 0; + margin-bottom: 0; +} +#dokuwiki__header .tools li { + font-size: 0.875em; + margin-left: 1em; + list-style: none; + display: inline; +} +#dokuwiki__header .tools form.search div.ajax_qsearch li { + font-size: 1em; + margin-left: 0; + display: block; + overflow: hidden; + text-overflow: ellipsis; +} + +#dokuwiki__header .mobileTools { + display: none; /* hide mobile tools dropdown to only show in mobile view */ +} + +/*____________ user tools ____________*/ + +#dokuwiki__usertools { + position: absolute; + top: .5em; + right: .5em; + text-align: right; + width: 100%; +} +#dokuwiki__usertools ul { + margin: 0 auto; + padding: 0; + max-width: __site_width__; +} +#dokuwiki__usertools ul li.user { +} + + +/*____________ site tools ____________*/ + +#dokuwiki__sitetools { + text-align: right; +} + +#dokuwiki__sitetools form.search { + display: block; + font-size: 0.875em; + position: relative; +} +#dokuwiki__sitetools form.search input.edit { + width: 18em; + padding: .35em 22px .35em .1em; +} +#dokuwiki__sitetools form.search input.button { + background: transparent url(images/search.png) no-repeat 0 0; + border-width: 0; + width: 19px; + height: 14px; + text-indent: -99999px; + margin-left: -20px; + box-shadow: none; + padding: 0; +} + +#dokuwiki__sitetools ul { + margin-top: 0.5em; +} +#dokuwiki__sitetools li { +} + +/*____________ breadcrumbs ____________*/ + +.dokuwiki div.breadcrumbs { + border-top: 1px solid __border__; + border-bottom: 1px solid __background__; + margin-bottom: .5em; + font-size: 0.875em; + clear: both; +} +.dokuwiki div.breadcrumbs div { + padding: .1em .35em; +} + +.dokuwiki div.breadcrumbs div:only-child { + border-top: 1px solid __background__; + border-bottom: 1px solid __border__; +} +.dokuwiki div.breadcrumbs div:first-child { + border-top: 1px solid __background__; +} +#IE7 .dokuwiki div.breadcrumbs div, +#IE8 .dokuwiki div.breadcrumbs div { + border-bottom: 1px solid __border__; +} +.dokuwiki div.breadcrumbs div:last-child { + border-bottom: 1px solid __border__; +} + +.dokuwiki div.breadcrumbs a { + color: __link__; + background-color: inherit; +} +.dokuwiki div.breadcrumbs .bcsep { + font-size: 0.75em; +} + + +/* sidebar +********************************************************************/ + +#dokuwiki__aside { +} +#dokuwiki__aside .pad { + font-size: 0.875em; + overflow: hidden; + word-wrap: break-word; +} + +/* make sidebar more condensed */ + +#dokuwiki__aside h1 { + margin-bottom: .222em; +} +#dokuwiki__aside h2 { + margin-bottom: .333em; +} +#dokuwiki__aside h3 { + margin-bottom: .444em; +} +#dokuwiki__aside h4 { + margin-bottom: .5em; +} +#dokuwiki__aside h5 { + margin-bottom: .5714em; +} + +#dokuwiki__aside p, +#dokuwiki__aside ul, +#dokuwiki__aside ol, +#dokuwiki__aside dl, +#dokuwiki__aside pre, +#dokuwiki__aside table, +#dokuwiki__aside fieldset, +#dokuwiki__aside hr, +#dokuwiki__aside blockquote, +#dokuwiki__aside address { + margin-bottom: .7em; +} + +#dokuwiki__aside ul, +#dokuwiki__aside ol { + padding-left: 0; +} +#dokuwiki__aside li ul, +#dokuwiki__aside li ol { + margin-bottom: 0; +} + +#dokuwiki__aside a:link, +#dokuwiki__aside a:visited { + color: __link__; + background-color: inherit; +} + + +/* content +********************************************************************/ + +#dokuwiki__content { +} + +.dokuwiki .pageId { + position: absolute; + top: -2.3em; + right: -1em; + overflow: hidden; + padding: 1em 1em 0; +} +.dokuwiki .pageId span { + font-size: 0.875em; + border: solid __background_alt__; + border-width: 1px 1px 0; + background-color: __background__; + color: __text_alt__; + padding: .1em .35em; + border-top-left-radius: 2px; + border-top-right-radius: 2px; + box-shadow: 0 0 .5em #999; + display: block; +} + +.dokuwiki div.page { + background: __background__; + color: inherit; + border: 1px solid #eee; + box-shadow: 0 0 .5em #999; + border-radius: 2px; + padding: 2em; + margin-bottom: .5em; + overflow: hidden; + word-wrap: break-word; +} + +.dokuwiki .docInfo { + font-size: 0.875em; + text-align: right; +} + +/*____________ misc ____________*/ + +/* license note under edit window */ +.dokuwiki div.license { + font-size: 93.75%; +} +/* license note in footer */ +.dokuwiki #dokuwiki__footer div.license { + font-size: 100%; +} + +#IE7 .dokuwiki input.button, +#IE7 .dokuwiki button { + line-height: 1.4; +} + +#acl__tree li { + margin: 0; +} + +.dokuwiki #dokuwiki__content span.curid a { + font-weight: normal; +} +.dokuwiki #dokuwiki__content strong span.curid a { + font-weight: bold; +} + + +/*____________ changes to _edit ____________*/ + +.dokuwiki div.toolbar button.toolbutton { + border-radius: 0; + border-left-width: 0; + padding: .1em .35em; +} +.dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-left-width: 1px; +} +.dokuwiki div.toolbar button.toolbutton:last-child { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} + +.dokuwiki div.section_highlight { + margin: -3em -2em -.01em -2em; + padding: 3em 1em .01em 1em; + border-width: 0 1em; +} + +.dokuwiki textarea.edit { + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; +} + +.dokuwiki div.preview { + margin: 0 -2em; + padding: 2em; +} + + +/*____________ changes to _toc ____________*/ + +.dokuwiki div.toc { + margin: -2em -2em .5em 1.4em; + width: __sidebar_width__; + border-left: 1px solid __border__; + background: __background__; + color: inherit; +} + +.dokuwiki div.tocheader { + padding: .5em 1em; + margin-bottom: 0; + font-size: .875em; + letter-spacing: .1em; +} + +.dokuwiki .toc span.toc_open, +.dokuwiki .toc span.toc_close { + background: transparent url(images/toc-arrows.png) 0 0; + width: 8px; + height: 5px; + margin: .4em 0 0; +} +.dokuwiki .toc span.toc_open { + background-position: 0 -5px; +} + +.dokuwiki .toc span.toc_open span, +.dokuwiki .toc span.toc_close span { + display: none; +} + + +.dokuwiki #toc__inside { + font-size: 0.875em; + padding: .5em 1em 1em; +} +.dokuwiki #toc__inside ul { + padding: 0 0 0 1.2em; +} +.dokuwiki #toc__inside ul li { + list-style-image: url(images/toc-bullet.png); +} +.dokuwiki #toc__inside ul li.clear { + list-style: none; +} +.dokuwiki #toc__inside ul li div.li { + padding: .2em 0; +} + + +/*____________ changes to _imgdetail ____________*/ + +#dokuwiki__detail { + padding: 0; +} +#dokuwiki__detail img { + float: none; + margin-bottom: 1.4em; +} +#dokuwiki__detail div.img_detail { + float: none; +} + +#dokuwiki__detail div.img_detail dl { + overflow: hidden; +} +#dokuwiki__detail div.img_detail dl dt { + float: left; + width: 9em; + text-align: right; + clear: left; +} +#dokuwiki__detail div.img_detail dl dd { + margin-left: 9.5em; +} + + +/*____________ JS popup ____________*/ + +.JSpopup { + background-color: __background__; + color: __text__; + border: 1px solid __border__; + box-shadow: .1em .1em .1em __border__; + border-radius: 2px; + padding: .3em .5em; + font-size: .9em; +} +.dokuwiki form.search div.ajax_qsearch { + top: -.35em; + font-size: 1em; + text-overflow: ellipsis; +} + +.JSpopup ul, +.JSpopup ol { + padding-left: 0; +} + + +/* footer +********************************************************************/ + +.dokuwiki .wrapper { + margin-bottom: 1.4em; +} + +#dokuwiki__footer { + margin-bottom: 1em; +} +#dokuwiki__footer .pad { + font-size: 0.875em; +} +#dokuwiki__footer div.license { + text-align: center; +} +#dokuwiki__footer .license img { + margin: 0 .5em 0 0; + float: none; +} + diff --git a/lib/tpl/dokuwiki/css/includes.css b/lib/tpl/dokuwiki/css/includes.css new file mode 100644 index 000000000..bc189962f --- /dev/null +++ b/lib/tpl/dokuwiki/css/includes.css @@ -0,0 +1,4 @@ +/** + * This file provides styles for included seperate html files + * (added through "include hooks"). + */ diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css new file mode 100644 index 000000000..38242f5be --- /dev/null +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -0,0 +1,192 @@ +/** + * This file provides styles for mobile devices + * and smaller screens (up to 480px and 768px width). + * + * @author Anika Henke + */ + +/* up to 768px screen widths +********************************************************************/ +@media only screen and (max-width: 768px), only screen and (max-device-width: 960px) { + +/* structure */ +#dokuwiki__aside { + width: 100%; + float: none; +} +#dokuwiki__aside .pad { + margin: 0 0 .5em; +} + +.hasSidebar #dokuwiki__content { + float: none; + margin-left: 0; + width: 100%; +} +.hasSidebar #dokuwiki__content .pad { + margin-left: 0; +} + +/* toc */ +.dokuwiki div.toc { + float: none; + margin: 0 0 1em 0; + width: auto; + border-left-width: 0; + border-bottom: 1px solid __border__; +} +.dokuwiki div.tocheader { + padding: 0 0 .5em; +} +.dokuwiki #toc__inside { + padding: .2em 0 .5em; +} + +/* page */ +.dokuwiki div.page { + padding: 1em; +} +.dokuwiki .pageId span { + border-width: 0; + background-color: __background_site__; + color: __text_alt__; + box-shadow: 0 0 0; +} + +/* _edit */ +.dokuwiki div.section_highlight { + margin: -3em -1em -.01em -1em; + padding: 3em .5em .01em .5em; + border-width: 0 .5em; +} +.dokuwiki div.preview { + margin: 0 -1em; + padding: 1em; +} + + +} /* /@media */ + + +/* up to 480px screen widths +********************************************************************/ +@media only screen and (max-width: 480px), only screen and (max-device-width: 960px) { + +/*____________ structure ____________*/ + +#dokuwiki__site { + max-width: 100%; +} +#dokuwiki__site .site { + padding: 0 .5em; +} +#dokuwiki__header { + padding: .5em 0; +} + +/*____________ header ____________*/ + +#dokuwiki__header ul.a11y.skip { + position: static !important; + left: 0 !important; + width: auto !important; + height: auto !important; + float: right; + font-size: 0.875em; + list-style: none; + padding-left: 0; + margin: 0; +} +#dokuwiki__header ul.a11y.skip li { + margin-left: .35em; + display: inline; +} + +#dokuwiki__header .headings, +#dokuwiki__header .tools { + float: none; + text-align: left; + width: auto; + margin-bottom: .5em; +} +#dokuwiki__sitetools { + text-align: left; +} +#dokuwiki__usertools, +#dokuwiki__sitetools ul, +#dokuwiki__sitetools h3, +#dokuwiki__pagetools, +.dokuwiki div.breadcrumbs, /* @todo: maybe move breadcrumbs to the bottom? */ +.dokuwiki .pageId { + display: none; +} + +/* search form */ +#dokuwiki__sitetools form.search { + float: left; + margin: 0 .2em .2em 0; + width: 49%; +} +#dokuwiki__sitetools form.search input.edit { + width: 100% !important; +} +.dokuwiki form.search div.ajax_qsearch { + display: none !important; +} + +/* action dropdown is alternative for all hidden tools */ +#dokuwiki__header .mobileTools { + display: block; + font-size: 0.875em; + margin: 0 0 .2em 0; + float: right; + width: 49%; +} +#dokuwiki__header .mobileTools select { + padding: .3em .1em; + width: 100% !important; +} + + +/*____________ content ____________*/ + +.dokuwiki div.page { + padding: .5em; +} + +/* form elements */ +#config__manager fieldset td.value, +#config__manager td .input, +.dokuwiki fieldset, +.dokuwiki input.edit, +.dokuwiki textarea, +.dokuwiki select { + width: auto !important; + max-width: 100% !important; +} +#config__manager fieldset { + margin-left: 0; + margin-right: 0; +} + +.dokuwiki label.block { + text-align: left; +} +.dokuwiki label.block span { + display: block; +} + +/* _edit */ +.dokuwiki div.section_highlight { + margin: 0; + padding: 0; + border-width: 0; +} +.dokuwiki div.preview { + margin: 0 -.5em; + padding: .5em; +} + + + +} /* /@media */ diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css new file mode 100644 index 000000000..a25032f0b --- /dev/null +++ b/lib/tpl/dokuwiki/css/pagetools.css @@ -0,0 +1,208 @@ +/** + * This file provides the styles for the page tools + * (fly out navigation beside the page to edit, etc). + * + * @author Anika Henke + * @author Andreas Gohr + */ + +#dokuwiki__site .site { + /* give space to the right so the tools won't disappear on smaller screens */ + /* it's 40px because the 30px wide icons will have 5px more spacing to the left and right */ + padding-right: 40px; + /* give the same space to the left to balance it out */ + padding-left: 40px; +} +.dokuwiki div.page { + min-height: 190px; /* 30 (= height of icons) x 6 (= maximum number of possible tools) + 2x5 */ +} +#dokuwiki__usertools { + /* move the tools just outside of the site */ + right: 40px; +} + + +#dokuwiki__pagetools { + position: absolute; + right: -40px; + /* on same vertical level as first headline, because .page has 2em padding */ + top: 2em; +} + +#dokuwiki__pagetools div.tools { + position: fixed; +} + +#dokuwiki__pagetools ul { + position: absolute; + right: 0; + text-align: right; + margin: 0; + padding: 0; + /* add transparent border to prevent jumping when proper border is added on hover */ + border: 1px solid transparent; +} + +#dokuwiki__pagetools ul li { + padding: 0; + margin: 0; + list-style: none; + font-size: 0.875em; +} + +#dokuwiki__pagetools ul li a { + display: block; + min-height: 20px; /* 30 - 2x5 */ + line-height: 20px; + padding: 5px 40px 5px 5px; + background-image: url(images/pagetools-sprite.png); + background-position: right 0; + background-repeat: no-repeat; + /* add transparent border to prevent jumping when proper border is added on focus */ + border: 1px solid transparent; + white-space: nowrap; +} + +/* hide labels accessibly when neither on hover nor on focus */ +#dokuwiki__pagetools ul li a span { + position: absolute; + left: -99999px; +} + +/* show all tools on hover and individual tools on focus */ +#dokuwiki__pagetools:hover ul, +#dokuwiki__pagetools ul li a:focus { + background-color: __background__; + border-color: __border__; + border-radius: 2px; + box-shadow: 2px 2px 2px __text_alt__; +} + +#dokuwiki__pagetools:hover ul li a span, +#dokuwiki__pagetools ul li a:focus span { + display: inline; + position: static; +} + +#dokuwiki__pagetools ul li a:hover, +#dokuwiki__pagetools ul li a:active, +#dokuwiki__pagetools ul li a:focus { + text-decoration: none; +} +#dokuwiki__pagetools ul li a:hover { + background-color: __background_alt__; +} + +/*____________ all available icons in sprite ____________*/ + +#dokuwiki__pagetools ul li a.edit { + background-position: right 0; +} +#dokuwiki__pagetools ul li a.edit:hover, +#dokuwiki__pagetools ul li a.edit:active, +#dokuwiki__pagetools ul li a.edit:focus { + background-position: right -45px; +} + +#dokuwiki__pagetools ul li a.create { + background-position: right -90px; +} +#dokuwiki__pagetools ul li a.create:hover, +#dokuwiki__pagetools ul li a.create:active, +#dokuwiki__pagetools ul li a.create:focus { + background-position: right -135px; +} + +#dokuwiki__pagetools ul li a.show { + background-position: right -270px; +} +#dokuwiki__pagetools ul li a.show:hover, +#dokuwiki__pagetools ul li a.show:active, +#dokuwiki__pagetools ul li a.show:focus { + background-position: right -315px; +} + +#dokuwiki__pagetools ul li a.source { + background-position: right -360px; +} +#dokuwiki__pagetools ul li a.source:hover, +#dokuwiki__pagetools ul li a.source:active, +#dokuwiki__pagetools ul li a.source:focus { + background-position: right -405px; +} + +#dokuwiki__pagetools ul li a.draft { + background-position: right -180px; +} +#dokuwiki__pagetools ul li a.draft:hover, +#dokuwiki__pagetools ul li a.draft:active, +#dokuwiki__pagetools ul li a.draft:focus { + background-position: right -225px; +} + +#dokuwiki__pagetools ul li a.revs { + background-position: right -540px; +} +#dokuwiki__pagetools ul li a.revs:hover, +#dokuwiki__pagetools ul li a.revs:active, +#dokuwiki__pagetools ul li a.revs:focus, +.mode_revisions #dokuwiki__pagetools ul li a.revs { + background-position: right -585px; +} + +#dokuwiki__pagetools ul li a.backlink { + background-position: right -630px; +} +#dokuwiki__pagetools ul li a.backlink:hover, +#dokuwiki__pagetools ul li a.backlink:active, +#dokuwiki__pagetools ul li a.backlink:focus, +.mode_backlink #dokuwiki__pagetools ul li a.backlink { + background-position: right -675px; +} + +#dokuwiki__pagetools ul li a.top { + background-position: right -810px; +} +#dokuwiki__pagetools ul li a.top:hover, +#dokuwiki__pagetools ul li a.top:active, +#dokuwiki__pagetools ul li a.top:focus { + background-position: right -855px; +} + +#dokuwiki__pagetools ul li a.revert { + background-position: right -450px; +} +#dokuwiki__pagetools ul li a.revert:hover, +#dokuwiki__pagetools ul li a.revert:active, +#dokuwiki__pagetools ul li a.revert:focus, +.mode_revert #dokuwiki__pagetools ul li a.revert { + background-position: right -495px; +} + +#dokuwiki__pagetools ul li a.subscribe { + background-position: right -720px; +} +#dokuwiki__pagetools ul li a.subscribe:hover, +#dokuwiki__pagetools ul li a.subscribe:active, +#dokuwiki__pagetools ul li a.subscribe:focus, +.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { + background-position: right -765px; +} + +#dokuwiki__pagetools ul li a.mediaManager { + background-position: right -900px; +} +#dokuwiki__pagetools ul li a.mediaManager:hover, +#dokuwiki__pagetools ul li a.mediaManager:active, +#dokuwiki__pagetools ul li a.mediaManager:focus { + background-position: right -945px; +} + +#dokuwiki__pagetools ul li a.back { + background-position: right -990px; +} +#dokuwiki__pagetools ul li a.back:hover, +#dokuwiki__pagetools ul li a.back:active, +#dokuwiki__pagetools ul li a.back:focus { + background-position: right -1035px; +} diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css new file mode 100644 index 000000000..d20d0f464 --- /dev/null +++ b/lib/tpl/dokuwiki/css/print.css @@ -0,0 +1,127 @@ +/** + * This file provides the styles for printing. + * + * @todo: improve and finish + */ + +body { + /* + font: normal 12pt/1.2 serif; + color: #000; + background-color: #fff; + */ +} + +/* hide certain sections */ +.a11y, +div.notify, div.info, div.success, div.error, +#dokuwiki__header .tools, #dokuwiki__aside, +.dokuwiki .breadcrumbs, .dokuwiki .toc, .dokuwiki .secedit, +#dokuwiki__pagetools, #dokuwiki__footer { + display: none; +} + +.dokuwiki h1, .dokuwiki h2, .dokuwiki h3, .dokuwiki h4, .dokuwiki h5, +.dokuwiki caption, .dokuwiki legend { + clear: both; +} +.dokuwiki ul { list-style: disc outside; } +.dokuwiki ol { list-style: decimal outside; } +.dokuwiki ol ol { list-style-type: lower-alpha; } +.dokuwiki ol ol ol { list-style-type: upper-roman; } +.dokuwiki ol ol ol ol { list-style-type: upper-alpha; } +.dokuwiki ol ol ol ol ol { list-style-type: lower-roman; } + +/* undo icons */ +.dokuwiki a:link, .dokuwiki a:visited { + text-decoration: underline; + color: #333; + background-color: inherit; + background-image: none; + padding: 0; +} + +/* display href after link */ +a.urlextern:after, +a.interwiki:after, +a.mail:after { + content: " [" attr(href) "]"; + font-size: 90%; +} + +/* code blocks */ +.dokuwiki pre { + font-family: monospace; +} +.dokuwiki dl.code dt, .dokuwiki dl.file dt { + font-weight: bold; +} + +/* images */ +.dokuwiki img { border-width: 0; vertical-align: middle; } +.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; float: left; } +.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; float: right; } +.dokuwiki img.mediacenter { margin: .5em auto; display: block; } + +/* align table cells */ +.dokuwiki .leftalign { text-align: left; } +.dokuwiki .centeralign { text-align: center; } +.dokuwiki .rightalign { text-align: right; } + +/* underline */ +.dokuwiki em.u { font-style: normal; text-decoration: underline; } +.dokuwiki em em.u { font-style: italic; } + +div.clearer { + clear: both; + line-height: 0; + height: 0; + overflow: hidden; +} + +.dokuwiki blockquote { + padding: 0 10pt; + margin: 0; + border: solid #ccc; + border-width: 0 0 0 2pt; +} + +/* tables */ +.dokuwiki table { + border-collapse: collapse; + empty-cells: show; + border-spacing: 0; + border: 1pt solid #ccc; +} +.dokuwiki th, .dokuwiki td { + padding: 3pt 5pt; + margin: 0; + vertical-align: top; + border: 1pt solid #666; + text-align: left; +} +.dokuwiki th { + font-weight: bold; +} + + +/*____________ a bit of layout ____________*/ + +#dokuwiki__header { + border-bottom: 2pt solid #ccc; +} +#dokuwiki__header h1 { + font-size: 1.5em; +} +#dokuwiki__header h1 a { + text-decoration: none; +} +#dokuwiki__header h1 img { + float: left; + margin-right: .5em; +} +.dokuwiki div.footnotes { + clear: both; + border-top: 1pt solid #000; + margin-top: 10pt; +} diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css new file mode 100644 index 000000000..790545a1b --- /dev/null +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -0,0 +1,571 @@ +/** + * This file provides layout and design corrections for right-to-left + * languages. + * + * @author Anika Henke + */ + +/*____________ basic ____________*/ + +caption, +td, +th { + text-align: right; +} + +ul, ol { + padding: 0 1.5em 0 0; +} +li, dd { + margin: 0 1.5em 0 0; +} +blockquote { + border-width: 0 .25em 0 0; +} + +h1, h2, h3, h4, h5, h6, +caption, legend { + clear: right; +} + +.a11y { + left: auto; + right: -9000px; +} + + +/*____________ _imgdetail ____________*/ + +#dokuwiki__detail div.content img { + float: right; + margin-right: 0; + margin-left: 1.5em; +} +#dokuwiki__detail div.content div.img_detail { + float: right +} + + +/*____________ _mediamanager ____________*/ + +#mediamgr__aside { + left: auto; + right: 0; + border-right-width: 0; + border-left: 1px solid __border__; +} +#mediamgr__content { + right: auto; + left: 0; +} + +#media__opts input { + margin-right: 0; + margin-left: .3em; +} + +#media__tree ul { + padding-left: 0; + padding-right: .2em; +} +#media__tree ul li { + clear: right; + margin-right: 0; +} +#media__tree ul li img { + float: right; + padding: .5em 0 0 .3em; +} +#media__tree ul li li { + margin-left: 0; + margin-right: 1.5em; +} + +#media__content a.mediafile { + margin-right: 0; + margin-left: 1.5em; +} +#media__content div.detail div.thumb { + float: right; + margin: 0 18px 0 .5em; +} +#media__content form.meta div.metafield { + clear: right; +} +#media__content form.meta label { + float: right; + clear: right; +} +#media__content form.meta .edit { + float: right; +} +#media__content form.meta div.buttons { + clear: right; + margin: .2em 25% 0 0; +} + + +/*____________ _links ____________*/ + +/* if link icons don't work as expected, remove the following lines */ +.dokuwiki a.urlextern, +.dokuwiki a.windows, +.dokuwiki a.mail, +.dokuwiki a.interwiki, +.dokuwiki a.mediafile { + background-position: right center; + padding: 0 17px 0 0; +} + + +/*____________ _toc ____________*/ + +.dokuwiki div.toc { + float: left; + margin: 0 1.4em 1.4em 0; +} +.dokuwiki .toc span.toc_open, +.dokuwiki .toc span.toc_close { + float: left; +} +.dokuwiki #toc__inside ul ul { + padding-left: 0; + padding-right: 1em; +} + +.dokuwiki ul.idx { + padding-right: 0; +} + + +/*____________ _footnotes ____________*/ + + +/*____________ _search ____________*/ + +.dokuwiki div.search_quickresult ul li { + float: right; +} +.dokuwiki form.search div.ajax_qsearch { + left: auto; + right: -13.5em; + text-align: right; +} + + +/*____________ _recent ____________*/ + +.dokuwiki #dw__recent ul li, +.dokuwiki #page__revisions ul li { + margin-right: 0; +} + + +/*____________ _diff ____________*/ + + +/*____________ _edit ____________*/ + +.dokuwiki div.toolbar #draft__status { + float: left; +} +.dokuwiki #wiki__editbar #size__ctl { + float: left; +} +.dokuwiki #wiki__editbar #size__ctl img { + cursor: pointer; +} +.dokuwiki #wiki__editbar .editButtons { + margin-right: 0; + margin-left: 1em; +} + +.dokuwiki .secedit { + float: left; +} + + +/*____________ _modal ____________*/ + +#link__wiz_close { + float: left; +} +#link__wiz_result { + text-align: right; +} +#link__wiz_result div.type_u, +#link__wiz_result div.type_f, +#link__wiz_result div.type_d { + padding: 3px 22px 3px 3px; + background-position: 257px 3px; +} + + +/*____________ _forms ____________*/ + +.dokuwiki label.block { + text-align: left; +} +.dokuwiki label.simple { + text-align: right; +} + +form#subscribe__form fieldset { + text-align: right; +} + + +/*____________ _admin ____________*/ + +.dokuwiki ul.admin_tasks { + float: right; +} +.dokuwiki ul.admin_tasks li { + padding-left: 0; + padding-right: 35px; + background-position: right 0; +} + +.dokuwiki #admin__version { + clear: right; + float: left; +} + + +/*____________ includes ____________*/ + + +/*____________ structure ____________*/ + +#dokuwiki__header .headings { + float: right; + text-align: right; +} +#dokuwiki__header .tools { + float: left; + text-align: left; +} + +#dokuwiki__aside { + float: right; +} +#dokuwiki__aside .pad { + margin: 0 0 0 1.5em; +} + +.hasSidebar #dokuwiki__content { + float: left; + margin-left: 0; + margin-right: -__sidebar_width__; +} +.hasSidebar #dokuwiki__content .pad { + margin-left: 0; + margin-right: __sidebar_width__; +} + +/*____________ design ____________*/ + +#dokuwiki__header h1 img { + float: right; + margin-left: .5em; + margin-right: 0; +} + +#dokuwiki__sitetools form.search input.edit { + padding: .35em .1em .35em 22px; +} +#dokuwiki__sitetools form.search input.button { + background-position: 5px 0; + margin-left: 0; + margin-right: -20px; +} + +#dokuwiki__usertools { + text-align: left; + left: 40px; + right: auto; +} + +#dokuwiki__sitetools { + text-align: left; +} + +#dokuwiki__aside ul, #dokuwiki__aside ol { + padding-right: 0; +} + +.dokuwiki .pageId { + right: auto; + left: -1em; +} + +.dokuwiki .docInfo { + text-align: left; +} + +.dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-left-width: 0; + border-right-width: 1px; +} +.dokuwiki div.toolbar button.toolbutton:last-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-left-width: 1px; +} + +.dokuwiki div.section_highlight { + margin-right: -2em; + border-right-width: 1em; +} + +#dokuwiki__footer .license img { + margin: 0 0 0 .5em; +} + +.dokuwiki div.toc { + margin: -2em 1.4em .5em -2em; + border-left-width: 0; + border-right: 1px solid __border__; +} +.dokuwiki #toc__inside ul { + padding: 0 1.5em 0 0; +} + +#dokuwiki__detail div.img_detail dl dt { + float: right; + text-align: left; + clear: right; +} +#dokuwiki__detail div.img_detail dl dd { + margin-left: 0; + margin-right: 9.5em; +} + + +/*____________ pagetools ____________*/ + +#dokuwiki__usertools { + right: auto; + left: 40px; +} + +#dokuwiki__pagetools { + right: auto; + left: -40px; +} + +#dokuwiki__pagetools ul { + right: auto; + left: 0; + text-align: left; +} + +#dokuwiki__pagetools ul li a { + padding: 5px 5px 5px 40px; + background-position: left 0; +} + +#dokuwiki__pagetools:hover ul, +#dokuwiki__pagetools ul li a:focus { + box-shadow: -2px 2px 2px __text_alt__; +} + +/* all available icons in sprite */ +#dokuwiki__pagetools ul li a.edit { + background-position: left 0; +} +#dokuwiki__pagetools ul li a.edit:hover, +#dokuwiki__pagetools ul li a.edit:active, +#dokuwiki__pagetools ul li a.edit:focus { + background-position: left -45px; +} + +#dokuwiki__pagetools ul li a.create { + background-position: left -90px; +} +#dokuwiki__pagetools ul li a.create:hover, +#dokuwiki__pagetools ul li a.create:active, +#dokuwiki__pagetools ul li a.create:focus { + background-position: left -135px; +} + +#dokuwiki__pagetools ul li a.show { + background-position: left -270px; +} +#dokuwiki__pagetools ul li a.show:hover, +#dokuwiki__pagetools ul li a.show:active, +#dokuwiki__pagetools ul li a.show:focus { + background-position: left -315px; +} + +#dokuwiki__pagetools ul li a.source { + background-position: left -360px; +} +#dokuwiki__pagetools ul li a.source:hover, +#dokuwiki__pagetools ul li a.source:active, +#dokuwiki__pagetools ul li a.source:focus { + background-position: left -405px; +} + +#dokuwiki__pagetools ul li a.draft { + background-position: left -180px; +} +#dokuwiki__pagetools ul li a.draft:hover, +#dokuwiki__pagetools ul li a.draft:active, +#dokuwiki__pagetools ul li a.draft:focus { + background-position: left -225px; +} + +#dokuwiki__pagetools ul li a.revs { + background-position: left -540px; +} +#dokuwiki__pagetools ul li a.revs:hover, +#dokuwiki__pagetools ul li a.revs:active, +#dokuwiki__pagetools ul li a.revs:focus, +.mode_revisions #dokuwiki__pagetools ul li a.revs { + background-position: left -585px; +} + +#dokuwiki__pagetools ul li a.backlink { + background-position: left -630px; +} +#dokuwiki__pagetools ul li a.backlink:hover, +#dokuwiki__pagetools ul li a.backlink:active, +#dokuwiki__pagetools ul li a.backlink:focus, +.mode_backlink #dokuwiki__pagetools ul li a.backlink { + background-position: left -675px; +} + +#dokuwiki__pagetools ul li a.top { + background-position: left -810px; +} +#dokuwiki__pagetools ul li a.top:hover, +#dokuwiki__pagetools ul li a.top:active, +#dokuwiki__pagetools ul li a.top:focus { + background-position: left -855px; +} + +#dokuwiki__pagetools ul li a.revert { + background-position: left -450px; +} +#dokuwiki__pagetools ul li a.revert:hover, +#dokuwiki__pagetools ul li a.revert:active, +#dokuwiki__pagetools ul li a.revert:focus, +.mode_revert #dokuwiki__pagetools ul li a.revert { + background-position: left -495px; +} + +#dokuwiki__pagetools ul li a.subscribe { + background-position: left -720px; +} +#dokuwiki__pagetools ul li a.subscribe:hover, +#dokuwiki__pagetools ul li a.subscribe:active, +#dokuwiki__pagetools ul li a.subscribe:focus, +.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { + background-position: left -765px; +} + +#dokuwiki__pagetools ul li a.mediaManager { + background-position: left -900px; +} +#dokuwiki__pagetools ul li a.mediaManager:hover, +#dokuwiki__pagetools ul li a.mediaManager:active, +#dokuwiki__pagetools ul li a.mediaManager:focus { + background-position: left -945px; +} + +#dokuwiki__pagetools ul li a.back { + background-position: left -990px; +} +#dokuwiki__pagetools ul li a.back:hover, +#dokuwiki__pagetools ul li a.back:active, +#dokuwiki__pagetools ul li a.back:focus { + background-position: left -1035px; +} + + +/*____________ content ____________*/ + +/* section indenting +.dokuwiki .page h1 {margin-left: 0; margin-right: 0;} +.dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} +.dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} +.dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} +.dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} +.dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} +.dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} +.dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} +.dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} +.dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} +*/ + +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { + margin-left: 0; + margin-right: 1em; +} + +.JSpopup ul, +.JSpopup ol { + padding-right: 0; +} + + +/*____________ mobile ____________*/ + +@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { + + +.hasSidebar #dokuwiki__content, +.hasSidebar #dokuwiki__content .pad { + margin-right: 0; +} + +#dokuwiki__header ul.a11y.skip { + left: auto !important; + right: 0 !important; + float: left; + padding-right: 0; +} +#dokuwiki__header ul.a11y.skip li { + margin: 0 .35em 0 0; +} + +#dokuwiki__header .headings, +#dokuwiki__header .tools { + float: none; + text-align: right; + width: auto; +} +#dokuwiki__sitetools { + text-align: right; +} + +#dokuwiki__sitetools form.search { + float: right; + margin: 0 0 .2em .2em; +} + +#dokuwiki__header .mobileTools { + float: left; +} + +.dokuwiki div.toc { + float: none; + margin: 0 0 1em 0; + border-right-width: 0; +} + +.dokuwiki label.block { + text-align: right; +} + + + +} /* /@media */ diff --git a/lib/tpl/dokuwiki/css/structure.css b/lib/tpl/dokuwiki/css/structure.css new file mode 100644 index 000000000..4e3a14be8 --- /dev/null +++ b/lib/tpl/dokuwiki/css/structure.css @@ -0,0 +1,58 @@ +/** + * This file provides styles for the general layout structure. + * + * @author Anika Henke + */ + +body { + margin: 0 auto; +} +#dokuwiki__site { + margin: 0 auto; + max-width: __site_width__; +} +#dokuwiki__site .site { + padding: 0 .5em; +} + +#dokuwiki__header { + width: 100%; +} +#dokuwiki__header .pad { +} + #dokuwiki__header .headings { + float: left; + } + #dokuwiki__header .tools { + float: right; + text-align: right; + } + +#dokuwiki__site .wrapper { + position: relative; +} + + #dokuwiki__aside { + width: __sidebar_width__; + float: left; + position: relative; + display: block; + } + #dokuwiki__aside .pad { + margin: 0 1.5em 0 0; + } + + .hasSidebar #dokuwiki__content { + float: right; + margin-left: -__sidebar_width__; + width: 100%; + } + .hasSidebar #dokuwiki__content .pad { + margin-left: __sidebar_width__; + } + +#dokuwiki__footer { + clear: both; +} +#dokuwiki__footer .pad { +} diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php new file mode 100644 index 000000000..287827253 --- /dev/null +++ b/lib/tpl/dokuwiki/detail.php @@ -0,0 +1,144 @@ + + * @author Anika Henke + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + */ + +// must be run from within DokuWiki +if (!defined('DOKU_INC')) die(); +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ + +$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); +?> + + + + + + <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> + [<?php echo strip_tags($conf['title'])?>] + + + + + + + + + + + + + are added to make it possible to e.g. style a page differently if it's in edit mode, + see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> + +
+ + + +
+ + +
+ + +
+ + +
+ + + + '.$ERROR.''; + else: ?> + +

+ + + +
+
+ $tag){ + $t = array(); + if (!empty($tag[0])) { + $t = array($tag[0]); + } + if(is_array($tag[3])) { + $t = array_merge($t,$tag[3]); + } + $value = tpl_img_getTag($t); + if ($value) { + echo '
'.$lang[$tag[1]].':
'; + if ($tag[2] == 'date') { + echo dformat($value); + } else { + echo hsc($value); + } + echo '
'; + } + } + ?> +
+
+ + +
+ + + + +
+ */ ?> + +
+ +
+ + + +
+

+
+ +
+
+ +
+ + +
+ + + + diff --git a/lib/tpl/dokuwiki/images/apple-touch-icon.png b/lib/tpl/dokuwiki/images/apple-touch-icon.png new file mode 100644 index 000000000..45fa4e7b0 Binary files /dev/null and b/lib/tpl/dokuwiki/images/apple-touch-icon.png differ diff --git a/lib/tpl/dokuwiki/images/bullet.png b/lib/tpl/dokuwiki/images/bullet.png new file mode 100644 index 000000000..5da537443 Binary files /dev/null and b/lib/tpl/dokuwiki/images/bullet.png differ diff --git a/lib/tpl/dokuwiki/images/closed.png b/lib/tpl/dokuwiki/images/closed.png new file mode 100644 index 000000000..3691ebc17 Binary files /dev/null and b/lib/tpl/dokuwiki/images/closed.png differ diff --git a/lib/tpl/dokuwiki/images/favicon.ico b/lib/tpl/dokuwiki/images/favicon.ico new file mode 100644 index 000000000..8b9616abb Binary files /dev/null and b/lib/tpl/dokuwiki/images/favicon.ico differ diff --git a/lib/tpl/dokuwiki/images/link_icon.gif b/lib/tpl/dokuwiki/images/link_icon.gif new file mode 100644 index 000000000..815ccb1b1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/link_icon.gif differ diff --git a/lib/tpl/dokuwiki/images/logo.png b/lib/tpl/dokuwiki/images/logo.png new file mode 100644 index 000000000..8b794dd64 Binary files /dev/null and b/lib/tpl/dokuwiki/images/logo.png differ diff --git a/lib/tpl/dokuwiki/images/mail_icon.gif b/lib/tpl/dokuwiki/images/mail_icon.gif new file mode 100644 index 000000000..50a87a9a0 Binary files /dev/null and b/lib/tpl/dokuwiki/images/mail_icon.gif differ diff --git a/lib/tpl/dokuwiki/images/open.png b/lib/tpl/dokuwiki/images/open.png new file mode 100644 index 000000000..40ff129be Binary files /dev/null and b/lib/tpl/dokuwiki/images/open.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools-license.txt b/lib/tpl/dokuwiki/images/pagetools-license.txt new file mode 100644 index 000000000..299624c62 --- /dev/null +++ b/lib/tpl/dokuwiki/images/pagetools-license.txt @@ -0,0 +1,4 @@ +Icon set: iPhone toolbar icons +Designer: TheWorkingGroup.ca +License: Creative Commons Attribution-Share Alike License [http://creativecommons.org/licenses/by-sa/3.0/] +URL: http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/ diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png new file mode 100644 index 000000000..a0f4036ff Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.xcf b/lib/tpl/dokuwiki/images/pagetools-sprite.xcf new file mode 100644 index 000000000..07c1d83fb Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools-sprite.xcf differ diff --git a/lib/tpl/dokuwiki/images/pagetools.xcf b/lib/tpl/dokuwiki/images/pagetools.xcf new file mode 100644 index 000000000..034b39a42 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools.xcf differ diff --git a/lib/tpl/dokuwiki/images/resizecol.png b/lib/tpl/dokuwiki/images/resizecol.png new file mode 100644 index 000000000..f0111507c Binary files /dev/null and b/lib/tpl/dokuwiki/images/resizecol.png differ diff --git a/lib/tpl/dokuwiki/images/search.png b/lib/tpl/dokuwiki/images/search.png new file mode 100644 index 000000000..2adfc7357 Binary files /dev/null and b/lib/tpl/dokuwiki/images/search.png differ diff --git a/lib/tpl/dokuwiki/images/toc-arrows.png b/lib/tpl/dokuwiki/images/toc-arrows.png new file mode 100644 index 000000000..9f441eb26 Binary files /dev/null and b/lib/tpl/dokuwiki/images/toc-arrows.png differ diff --git a/lib/tpl/dokuwiki/images/toc-bullet.png b/lib/tpl/dokuwiki/images/toc-bullet.png new file mode 100644 index 000000000..a6f0169c3 Binary files /dev/null and b/lib/tpl/dokuwiki/images/toc-bullet.png differ diff --git a/lib/tpl/dokuwiki/images/windows.gif b/lib/tpl/dokuwiki/images/windows.gif new file mode 100644 index 000000000..4f12acce1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/windows.gif differ diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php new file mode 100644 index 000000000..84334a4db --- /dev/null +++ b/lib/tpl/dokuwiki/main.php @@ -0,0 +1,100 @@ + + * @author Clarence Lee + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + */ + +if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ + +$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); +?> + + + + + <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] + + + + + + + + + + + + are added to make it possible to e.g. style a page differently if it's in edit mode, + see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> + +
+ + + +
+ + + +
+ + + + +
+ + + +
+ +
+ +
+ + + + + + +
+ +
+ + +
+ +
+ + +
+

+
+
    + ', ''); + tpl_action('revert', 1, 'li', 0, '', ''); + tpl_action('revisions', 1, 'li', 0, '', ''); + tpl_action('backlink', 1, 'li', 0, '', ''); + tpl_action('subscribe', 1, 'li', 0, '', ''); + tpl_action('top', 1, 'li', 0, '', ''); + ?> +
+
+
+
+ + +
+ +
+ + + diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php new file mode 100644 index 000000000..d7d88f936 --- /dev/null +++ b/lib/tpl/dokuwiki/mediamanager.php @@ -0,0 +1,48 @@ + + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + */ +// must be run from within DokuWiki +if (!defined('DOKU_INC')) die(); +@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ + +?> + + + + + + <?php echo hsc($lang['mediaselect'])?> + [<?php echo strip_tags($conf['title'])?>] + + + + + + + + + +
+ +
+

+ + +
+ + +
+ +
+ +
+
+ + + diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini new file mode 100644 index 000000000..8ac4fbe31 --- /dev/null +++ b/lib/tpl/dokuwiki/style.ini @@ -0,0 +1,73 @@ +; Please see http://www.php.net/manual/en/function.parse-ini-file.php +; for limitations of the ini format used here + +; Define the stylesheets your template uses here. The second value +; defines for which output media the style should be loaded. Currently +; print, screen and rtl are supported. rtl styles are loaded additionally +; to screen styles if a right-to-left language is selected (eg. Hebrew). + +[stylesheets] + +css/basic.css = screen +css/_imgdetail.css = screen +css/_media_popup.css = screen +css/_media_fullscreen.css = screen +css/_fileuploader.css = screen +css/_tabs.css = screen +css/_links.css = screen +css/_toc.css = screen +css/_footnotes.css = screen +css/_search.css = screen +css/_recent.css = screen +css/_diff.css = screen +css/_edit.css = screen +css/_modal.css = screen +css/_forms.css = screen +css/_admin.css = screen +css/structure.css = screen +css/design.css = screen +css/pagetools.css = screen +css/content.css = screen +css/includes.css = screen +css/mobile.css = screen + +css/rtl.css = rtl +css/print.css = print + + +; This section is used to configure some placeholder values used in +; the stylesheets. Changing this file is the simplest method to +; give your wiki a new look. + +[replacements] + +;-------------------------------------------------------------------------- +;------ guaranteed dokuwiki color placeholders that every plugin can use + +; main text and background colors +__text__ = "#333" +__background__ = "#fff" +; alternative text and background colors +__text_alt__ = "#999" +__background_alt__ = "#eee" +; neutral text and background colors +__text_neu__ = "#666" +__background_neu__ = "#ddd" +; border color +__border__ = "#ccc" + +;-------------------------------------------------------------------------- + +__background_site__ = "#fbfaf9" + +; these are used for links +__link__ = "#2b73b7" +__existing__ = "#080" +__missing__ = "#d30" + +; highlighting search snippets +__highlight__ = "#ff9" + +; sidebar width +__site_width__ = "75em" +__sidebar_width__ = "16em" diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt new file mode 100644 index 000000000..e049270ee --- /dev/null +++ b/lib/tpl/dokuwiki/template.info.txt @@ -0,0 +1,7 @@ +base dokuwiki +author Anika Henke, Andreas Gohr, Clarence Lee +email andi@splitbrain.org +date 2012-01-30 +name DokuWiki Template +desc DokuWiki's default template 2012 +url http://www.dokuwiki.org/template diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php new file mode 100644 index 000000000..fcc9d21c7 --- /dev/null +++ b/lib/tpl/dokuwiki/tpl_footer.php @@ -0,0 +1,6 @@ + +
+ +
+ + diff --git a/lib/tpl/dokuwiki/tpl_functions.php b/lib/tpl/dokuwiki/tpl_functions.php new file mode 100644 index 000000000..c024f33e7 --- /dev/null +++ b/lib/tpl/dokuwiki/tpl_functions.php @@ -0,0 +1,30 @@ + + */ +function _tpl_include($fn) { + $confFile = DOKU_CONF.$fn; + $tplFile = dirname(__FILE__).'/'.$fn; + + if (file_exists($confFile)) + include($confFile); + else if (file_exists($tplFile)) + include($tplFile); +} diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php new file mode 100644 index 000000000..91d8876b9 --- /dev/null +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -0,0 +1,83 @@ + +
+ + + + +
+
    +
    • +
+ +

'.$conf['title'].'', + 'accesskey="h" title="[H]"' + ); + ?>

+ +

+ +
+ +
+ + +
+

+
    + would be: tpl_action('edit',0,'li') */ + if ($_SERVER['REMOTE_USER']) { + echo '
  • '; + tpl_userinfo(); /* 'Logged in as ...' */ + echo '
    • '; + } + tpl_action('admin', 1, 'li'); + tpl_action('profile', 1, 'li'); + tpl_action('register', 1, 'li'); + tpl_action('login', 1, 'li'); + ?> +
+
+ + + +
+

+ + +
+ +
+
    + +
+
+ +
+ + + +
+ +
+ + +
+ +
+ + +
+
-- cgit v1.2.3 From 5c0c6845e9d948437a54eb986c9f339dfc4b2c62 Mon Sep 17 00:00:00 2001 From: PCPA Date: Mon, 6 Feb 2012 23:39:40 +0100 Subject: Russian language update --- lib/plugins/acl/lang/ru/lang.php | 1 + lib/plugins/config/lang/ru/lang.php | 6 ++++++ lib/plugins/plugin/lang/ru/lang.php | 2 ++ lib/plugins/popularity/lang/ru/lang.php | 1 + lib/plugins/revert/lang/ru/lang.php | 1 + lib/plugins/usermanager/lang/ru/lang.php | 1 + 6 files changed, 12 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php index 6d04dde21..15ba78ef6 100644 --- a/lib/plugins/acl/lang/ru/lang.php +++ b/lib/plugins/acl/lang/ru/lang.php @@ -15,6 +15,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['admin_acl'] = 'Управление списками контроля доступа'; $lang['acl_group'] = 'Группа'; diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php index f29257a28..01cd1a8d5 100644 --- a/lib/plugins/config/lang/ru/lang.php +++ b/lib/plugins/config/lang/ru/lang.php @@ -16,6 +16,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['menu'] = 'Настройки вики'; $lang['error'] = 'Настройки не были сохранены из-за ошибки в одном из значений. Пожалуйста, проверьте свои изменения и попробуйте ещё раз.
Неправильные значения будут обведены красной рамкой.'; @@ -50,9 +51,12 @@ $lang['lang'] = 'Язык'; $lang['basedir'] = 'Корневая директория (например, /dokuwiki/). Оставьте пустым для автоопределения.'; $lang['baseurl'] = 'Корневой адрес (URL) (например, http://www.yourserver.ru). Оставьте пустым для автоопределения.'; $lang['savedir'] = 'Директория для данных'; +$lang['cookiedir'] = 'Cookie директория. Оставьте пустым для автоопределения.'; $lang['start'] = 'Имя стартовой страницы'; $lang['title'] = 'Название вики'; $lang['template'] = 'Шаблон'; +$lang['tagline'] = 'Слоган (если поддерживается шаблоном)'; +$lang['sidebar'] = 'Боковая панель, пустое поле отключает боковую панель.'; $lang['license'] = 'На условиях какой лицензии будет предоставляться содержимое вики?'; $lang['fullpath'] = 'Полный путь к документу'; $lang['recent'] = 'Недавние изменения (кол-во)'; @@ -73,6 +77,7 @@ $lang['useheading'] = 'Первый заголовок вместо $lang['refcheck'] = 'Проверять ссылки на медиафайлы'; $lang['refshow'] = 'Показывать ссылок на медиафайлы'; $lang['allowdebug'] = 'Включить отладку (отключите!)'; +$lang['mediarevisions'] = 'Включение версий медиафайлов'; $lang['usewordblock'] = 'Блокировать спам по ключевым словам'; $lang['indexdelay'] = 'Задержка перед индексированием'; $lang['relnofollow'] = 'rel="nofollow" для внешних ссылок'; @@ -120,6 +125,7 @@ $lang['jpg_quality'] = 'Качество сжатия JPG (0–100). $lang['subscribers'] = 'Разрешить подписку на изменения'; $lang['subscribe_time'] = 'Интервал рассылки подписок и сводок (сек.). Должен быть меньше, чем значение, указанное в recent_days.'; $lang['compress'] = 'Сжимать файлы CSS и javascript'; +$lang['cssdatauri'] = 'Размер в байтах до которого изображения, указанные в CSS-файлах, должны быть встроены прямо в таблицу стилей, для уменьшения избычтоных HTTP-запросов. Этот метод не будет работать в IE версии 7 и ниже! Установка от 400 до 600 байт является хорошим показателем. Установите 0, чтобы отключить.'; $lang['hidepages'] = 'Скрыть страницы (рег. выражение)'; $lang['send404'] = 'Посылать «HTTP404/Page Not Found»'; $lang['sitemap'] = 'Число дней, через которое нужно создавать (обновлять) карту сайта для поисковиков (Гугл, Яндекс и др.)'; diff --git a/lib/plugins/plugin/lang/ru/lang.php b/lib/plugins/plugin/lang/ru/lang.php index 757b607f5..f011c9954 100644 --- a/lib/plugins/plugin/lang/ru/lang.php +++ b/lib/plugins/plugin/lang/ru/lang.php @@ -16,6 +16,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['menu'] = 'Управление плагинами'; $lang['download'] = 'Скачать и установить новый плагин'; @@ -61,3 +62,4 @@ $lang['enabled'] = 'Плагин %s включён.'; $lang['notenabled'] = 'Не удалось включить плагин %s. Проверьте системные права доступа к файлам.'; $lang['disabled'] = 'Плагин %s отключён.'; $lang['notdisabled'] = 'Не удалось отключить плагин %s. Проверьте системные права доступа к файлам.'; +$lang['packageinstalled'] = 'Пакет (%d плагин(а): %s) успешно установлен.'; diff --git a/lib/plugins/popularity/lang/ru/lang.php b/lib/plugins/popularity/lang/ru/lang.php index 79b3e224d..0e29c795d 100644 --- a/lib/plugins/popularity/lang/ru/lang.php +++ b/lib/plugins/popularity/lang/ru/lang.php @@ -13,6 +13,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['name'] = 'Сбор информации о популярности (для загрузки может потребоваться некоторое время)'; $lang['submit'] = 'Отправить данные'; diff --git a/lib/plugins/revert/lang/ru/lang.php b/lib/plugins/revert/lang/ru/lang.php index 9624d8fd6..4abe37e6a 100644 --- a/lib/plugins/revert/lang/ru/lang.php +++ b/lib/plugins/revert/lang/ru/lang.php @@ -14,6 +14,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['menu'] = 'Менеджер откаток'; $lang['filter'] = 'Поиск спам-страниц'; diff --git a/lib/plugins/usermanager/lang/ru/lang.php b/lib/plugins/usermanager/lang/ru/lang.php index 456ba5b29..eb9f26be6 100644 --- a/lib/plugins/usermanager/lang/ru/lang.php +++ b/lib/plugins/usermanager/lang/ru/lang.php @@ -16,6 +16,7 @@ * @author Aleksandr Selivanov * @author Ladyko Andrey * @author Eugene + * @author Johnny Utah */ $lang['menu'] = 'Управление пользователями'; $lang['noauth'] = '(авторизация пользователей недоступна)'; -- cgit v1.2.3 From e67004f5b686076af0dbf00cf574ac643d003cae Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 7 Feb 2012 19:41:09 +0100 Subject: trigger JS_CACHE_USE in lib/exe/js.php This removes the cachekey parameter again and instead follows @michitux's suggestion to trigger an event for the cache usage --- lib/exe/js.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index c929c9ba5..95ca10e87 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -31,15 +31,9 @@ function js_out(){ global $lang; global $config_cascade; - if (isset($_GET['cacheKey'])) { - $cacheKey = strval($_GET['cacheKey']); - } else { - $cacheKey = ''; - } - // The generated script depends on some dynamic options - $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].$cacheKey, - '.js'); + $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js'); + $cache->_event = 'JS_CACHE_USE'; // load minified version for some files $min = $conf['compress'] ? '.min' : ''; @@ -85,8 +79,8 @@ function js_out(){ // check cache age & handle conditional request // This may exit if a cache can be used - http_cached($cache->cache, - $cache->useCache(array('files' => $cache_files))); + $cache_ok = $cache->useCache(array('files' => $cache_files)); + http_cached($cache->cache, $cache_ok); // start output buffering and build the script ob_start(); -- cgit v1.2.3 From b2a1a44c2b1170a6fdbec637fa077c1469631511 Mon Sep 17 00:00:00 2001 From: Marius Olar Date: Tue, 7 Feb 2012 19:46:28 +0100 Subject: Romanian language update --- lib/plugins/acl/lang/ro/lang.php | 2 +- lib/plugins/config/lang/ro/lang.php | 4 ++-- lib/plugins/plugin/lang/ro/lang.php | 2 +- lib/plugins/popularity/lang/ro/lang.php | 2 +- lib/plugins/revert/lang/ro/lang.php | 2 +- lib/plugins/usermanager/lang/ro/lang.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php index 6d63ad024..c278c918e 100644 --- a/lib/plugins/acl/lang/ro/lang.php +++ b/lib/plugins/acl/lang/ro/lang.php @@ -9,7 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index 5845e3c35..dcdea8f77 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -9,7 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['menu'] = 'Setări de Configurare'; $lang['error'] = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou.
Valorile incorecte vor apărea într-un chenar roşu.'; @@ -68,7 +68,7 @@ $lang['useheading'] = 'Foloseşte primul titlu pentru numele paginii' $lang['refcheck'] = 'Verificare referinţă media'; $lang['refshow'] = 'Numărul de referinţe media de arătat'; $lang['allowdebug'] = 'Permite depanarea dezactivaţi dacă cu e necesar!'; -$lang['mediarevisions'] = 'Activează revizii media?'; +$lang['mediarevisions'] = 'Activare Revizii Media?'; $lang['usewordblock'] = 'Blochează spam-ul pe baza listei de cuvinte'; $lang['indexdelay'] = 'Timpul de întârziere înainte de indexare (sec)'; $lang['relnofollow'] = 'Folosiţi rel="nofollow" pentru legăturile externe'; diff --git a/lib/plugins/plugin/lang/ro/lang.php b/lib/plugins/plugin/lang/ro/lang.php index 798ada1c7..50f6ca6f6 100644 --- a/lib/plugins/plugin/lang/ro/lang.php +++ b/lib/plugins/plugin/lang/ro/lang.php @@ -9,7 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['menu'] = 'Administrează plugin-uri'; $lang['download'] = 'Descarcă şi instalează un nou plugin'; diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php index f3ca8d37e..9e9086b0d 100644 --- a/lib/plugins/popularity/lang/ro/lang.php +++ b/lib/plugins/popularity/lang/ro/lang.php @@ -7,7 +7,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['name'] = 'Feedback de popularitate (încărcarea poate dura mai mult)'; $lang['submit'] = 'Trimite datele'; diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php index 094f4dc71..f1fcf727c 100644 --- a/lib/plugins/revert/lang/ro/lang.php +++ b/lib/plugins/revert/lang/ro/lang.php @@ -9,7 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['menu'] = 'Manager Reveniri'; $lang['filter'] = 'Caută pagini cu posibil spam'; diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php index b8c1f24fc..7aac6cfb0 100644 --- a/lib/plugins/usermanager/lang/ro/lang.php +++ b/lib/plugins/usermanager/lang/ro/lang.php @@ -9,7 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR - * @author Emanuel-Emeric Andrași + * @author Marius Olar */ $lang['menu'] = 'Manager Utilizatori'; $lang['noauth'] = '(autentificarea utilizatorilor nu este disponibilă)'; -- cgit v1.2.3 From a699035c4f7aa040cc4170401b2f9c48966eba5b Mon Sep 17 00:00:00 2001 From: Erial Krale Date: Wed, 15 Feb 2012 23:30:22 +0100 Subject: Korean language update --- lib/plugins/acl/lang/ko/lang.php | 1 + lib/plugins/config/lang/ko/lang.php | 6 ++++++ lib/plugins/plugin/lang/ko/lang.php | 1 + lib/plugins/popularity/lang/ko/lang.php | 1 + lib/plugins/revert/lang/ko/lang.php | 1 + lib/plugins/usermanager/lang/ko/lang.php | 1 + 6 files changed, 11 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php index 6f4e991cb..6b1e77cf8 100644 --- a/lib/plugins/acl/lang/ko/lang.php +++ b/lib/plugins/acl/lang/ko/lang.php @@ -11,6 +11,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['admin_acl'] = '접근 제어 목록 관리'; $lang['acl_group'] = '그룹'; diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 20cfcdcfe..e71b9e3a4 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -8,6 +8,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['menu'] = '환경 설정'; $lang['error'] = '잘못된 값때문에 설정들을 변경할 수 없습니다. 수정한 값들을 검사하고 확인을 누르기 바랍니다. @@ -43,9 +44,12 @@ $lang['lang'] = '언어'; $lang['basedir'] = '기본 디렉토리'; $lang['baseurl'] = '기본 URL'; $lang['savedir'] = '데이타 저장 디렉토리'; +$lang['cookiedir'] = '쿠키 위치. 비워두면 기본 url 위치로 지정됩니다.'; $lang['start'] = '시작 페이지 이름'; $lang['title'] = '위키 제목'; $lang['template'] = '템플릿'; +$lang['tagline'] = '태그 라인 (템플릿이 지원할 때에 한해)'; +$lang['sidebar'] = '사이드바 페이지 이름(템플릿이 지원할 때에 한해). 비워두면 사이드바를 비활성화함'; $lang['license'] = '컨텐트에 어떤 라이센스 정책을 적용하시겠습니까?'; $lang['fullpath'] = '페이지 하단에 전체 경로 보여주기'; $lang['recent'] = '최근에 바뀐 것'; @@ -66,6 +70,7 @@ $lang['useheading'] = '페이지 이름으로 첫 헤드라인 사용 $lang['refcheck'] = '미디어 참조 검사'; $lang['refshow'] = '보여줄 미디어 참조 수'; $lang['allowdebug'] = '디버그 허용 필요하지 않으면 금지!'; +$lang['mediarevisions'] = '미디어 버전 관리를 사용하시겠습니까?'; $lang['usewordblock'] = '금지단어를 사용해 스팸 막기'; $lang['indexdelay'] = '색인 연기 시간(초)'; $lang['relnofollow'] = '외부 링크에 rel="nofollow" 사용'; @@ -115,6 +120,7 @@ $lang['jpg_quality'] = 'JPG 압축 품질 (0-100)'; $lang['subscribers'] = '페이지 갱신 알람 기능'; $lang['subscribe_time'] = ' 구독 목록과 요약이 보내질 경과 시간 (초); 이 것은 recent_days에서 설정된 시간보다 작아야 합니다.'; $lang['compress'] = '최적화된 CSS, javascript 출력'; +$lang['cssdatauri'] = '이미지가 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP request 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! 400 에서 600> 정도면 좋은 효율을 가져옵니다. 0로 지정할 경우 비활성화 됩니다.'; $lang['hidepages'] = '매칭된 페이지 숨기기(정규표현식)'; $lang['send404'] = '존재하지 않는 페이지에 대해 "HTTP 404/Page Not Found" 응답'; $lang['sitemap'] = '구글 사이트맵 생성(날짜)'; diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php index c77c3259d..b15b377a6 100644 --- a/lib/plugins/plugin/lang/ko/lang.php +++ b/lib/plugins/plugin/lang/ko/lang.php @@ -8,6 +8,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['menu'] = '플러그인 관리자'; $lang['download'] = '새로운 플러그인 다운로드 및 설치'; diff --git a/lib/plugins/popularity/lang/ko/lang.php b/lib/plugins/popularity/lang/ko/lang.php index 0f1442d53..01bc51044 100644 --- a/lib/plugins/popularity/lang/ko/lang.php +++ b/lib/plugins/popularity/lang/ko/lang.php @@ -7,6 +7,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['name'] = '인기도 조사 (불러오는데 시간이 걸릴 수 있습니다.)'; $lang['submit'] = '자료 보내기'; diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php index 0163d2754..da689c788 100644 --- a/lib/plugins/revert/lang/ko/lang.php +++ b/lib/plugins/revert/lang/ko/lang.php @@ -7,6 +7,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['menu'] = '복구 관리자'; $lang['filter'] = '스팸 페이지 검색 '; diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php index f2322414a..111267e5f 100644 --- a/lib/plugins/usermanager/lang/ko/lang.php +++ b/lib/plugins/usermanager/lang/ko/lang.php @@ -7,6 +7,7 @@ * @author Song Younghwan * @author SONG Younghwan * @author Seung-Chul Yoo + * @author erial2@gmail.com */ $lang['menu'] = '사용자 관리자'; $lang['noauth'] = '(사용자 인증이 불가능합니다.)'; -- cgit v1.2.3 From c55a2a4155c1ec0a13bcd2394086b7a65293d082 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 03:20:09 +0000 Subject: made styles for .pad and .site divs more specific to avoid interfering with the same classes somewhere else within the page --- lib/tpl/dokuwiki/css/design.css | 4 ++-- lib/tpl/dokuwiki/css/mobile.css | 6 +++--- lib/tpl/dokuwiki/css/pagetools.css | 2 +- lib/tpl/dokuwiki/css/rtl.css | 6 +++--- lib/tpl/dokuwiki/css/structure.css | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 39d793f99..9e76be6ae 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -181,7 +181,7 @@ #dokuwiki__aside { } -#dokuwiki__aside .pad { +#dokuwiki__aside > .pad { font-size: 0.875em; overflow: hidden; word-wrap: break-word; @@ -450,7 +450,7 @@ #dokuwiki__footer { margin-bottom: 1em; } -#dokuwiki__footer .pad { +#dokuwiki__footer > .pad { font-size: 0.875em; } #dokuwiki__footer div.license { diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 38242f5be..1239a90a3 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -14,7 +14,7 @@ width: 100%; float: none; } -#dokuwiki__aside .pad { +#dokuwiki__aside > .pad { margin: 0 0 .5em; } @@ -23,7 +23,7 @@ margin-left: 0; width: 100%; } -.hasSidebar #dokuwiki__content .pad { +.hasSidebar #dokuwiki__content > .pad { margin-left: 0; } @@ -77,7 +77,7 @@ #dokuwiki__site { max-width: 100%; } -#dokuwiki__site .site { +#dokuwiki__site > .site { padding: 0 .5em; } #dokuwiki__header { diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css index a25032f0b..e301b084d 100644 --- a/lib/tpl/dokuwiki/css/pagetools.css +++ b/lib/tpl/dokuwiki/css/pagetools.css @@ -6,7 +6,7 @@ * @author Andreas Gohr */ -#dokuwiki__site .site { +#dokuwiki__site > .site { /* give space to the right so the tools won't disappear on smaller screens */ /* it's 40px because the 30px wide icons will have 5px more spacing to the left and right */ padding-right: 40px; diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css index 790545a1b..e3bb7e27b 100644 --- a/lib/tpl/dokuwiki/css/rtl.css +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -249,7 +249,7 @@ form#subscribe__form fieldset { #dokuwiki__aside { float: right; } -#dokuwiki__aside .pad { +#dokuwiki__aside > .pad { margin: 0 0 0 1.5em; } @@ -258,7 +258,7 @@ form#subscribe__form fieldset { margin-left: 0; margin-right: -__sidebar_width__; } -.hasSidebar #dokuwiki__content .pad { +.hasSidebar #dokuwiki__content > .pad { margin-left: 0; margin-right: __sidebar_width__; } @@ -523,7 +523,7 @@ form#subscribe__form fieldset { .hasSidebar #dokuwiki__content, -.hasSidebar #dokuwiki__content .pad { +.hasSidebar #dokuwiki__content > .pad { margin-right: 0; } diff --git a/lib/tpl/dokuwiki/css/structure.css b/lib/tpl/dokuwiki/css/structure.css index 4e3a14be8..9cca1aa3b 100644 --- a/lib/tpl/dokuwiki/css/structure.css +++ b/lib/tpl/dokuwiki/css/structure.css @@ -11,14 +11,14 @@ body { margin: 0 auto; max-width: __site_width__; } -#dokuwiki__site .site { +#dokuwiki__site > .site { padding: 0 .5em; } #dokuwiki__header { width: 100%; } -#dokuwiki__header .pad { +#dokuwiki__header > .pad { } #dokuwiki__header .headings { float: left; @@ -38,7 +38,7 @@ body { position: relative; display: block; } - #dokuwiki__aside .pad { + #dokuwiki__aside > .pad { margin: 0 1.5em 0 0; } @@ -47,12 +47,12 @@ body { margin-left: -__sidebar_width__; width: 100%; } - .hasSidebar #dokuwiki__content .pad { + .hasSidebar #dokuwiki__content > .pad { margin-left: __sidebar_width__; } #dokuwiki__footer { clear: both; } -#dokuwiki__footer .pad { +#dokuwiki__footer > .pad { } -- cgit v1.2.3 From 4c3ecbf1c41f3608f8fec22cf30ada73662bdf12 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 03:22:32 +0000 Subject: updated RTL styles to latest mobile changes --- lib/tpl/dokuwiki/css/rtl.css | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css index e3bb7e27b..851f70850 100644 --- a/lib/tpl/dokuwiki/css/rtl.css +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -519,7 +519,7 @@ form#subscribe__form fieldset { /*____________ mobile ____________*/ -@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { +@media only screen and (max-width: 768px), only screen and (max-device-width: 960px) { .hasSidebar #dokuwiki__content, @@ -527,6 +527,18 @@ form#subscribe__form fieldset { margin-right: 0; } +.dokuwiki div.toc { + float: none; + margin: 0 0 1em 0; + border-right-width: 0; +} + + +} /* /@media */ + +@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { + + #dokuwiki__header ul.a11y.skip { left: auto !important; right: 0 !important; @@ -556,12 +568,6 @@ form#subscribe__form fieldset { float: left; } -.dokuwiki div.toc { - float: none; - margin: 0 0 1em 0; - border-right-width: 0; -} - .dokuwiki label.block { text-align: right; } -- cgit v1.2.3 From 0bd81194a560aef3cb7ac06e849889fb9fa888b0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 03:23:53 +0000 Subject: fixed swipe diff view --- lib/tpl/dokuwiki/css/_media_fullscreen.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index 3bf48e9ec..9054ab26f 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -453,5 +453,6 @@ #mediamanager__diff .imageDiff img { width: 100%; + max-width: none; } -- cgit v1.2.3 From bb866f2f0a7a6171228b0887a3f92261d78ad556 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 03:25:08 +0000 Subject: fixed lists beside floating content (FS#1950) --- lib/tpl/dokuwiki/css/basic.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index ae9be499e..e1cd1d9a2 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -104,6 +104,7 @@ div { ul, ol { padding: 0 0 0 1.5em; + overflow: hidden; } li, dd { -- cgit v1.2.3 From 8204206b83c57f7a74ac587d2b81f7b04fdc3ba3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 03:26:16 +0000 Subject: deleted another obsolete file --- lib/tpl/dokuwiki/css/_mediamanager.css | 219 --------------------------------- 1 file changed, 219 deletions(-) delete mode 100644 lib/tpl/dokuwiki/css/_mediamanager.css (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_mediamanager.css b/lib/tpl/dokuwiki/css/_mediamanager.css deleted file mode 100644 index d47e581ff..000000000 --- a/lib/tpl/dokuwiki/css/_mediamanager.css +++ /dev/null @@ -1,219 +0,0 @@ -/** - * This file provides styles for the media manager - * (mediamanager.php). - */ - -/*____________ structure ____________*/ - -html.popup { - overflow: auto; -} - -#media__manager { - height: 100%; - overflow: hidden; -} - -#mediamgr__aside { - width: 30%; - height: 100%; - overflow: auto; - position: absolute; - left: 0; - border-right: 1px solid __border__; -} -#mediamgr__aside .pad { - padding: .5em; -} - -#mediamgr__content { - width: 69.7%; - height: 100%; - overflow: auto; - position: absolute; - right: 0; -} -#mediamgr__content .pad { - padding: .5em; -} - -#media__manager h1, -#media__manager h2 { - font-size: 1.5em; - margin-bottom: .5em; - padding-bottom: .2em; - border-bottom: 1px solid __border__; -} - -/* left side -********************************************************************/ - -/*____________ options ____________*/ - -#media__opts { - margin-bottom: .5em; -} - -#media__opts input { - margin-right: .3em; -} -#media__opts label { -} - -/*____________ tree ____________*/ - -#media__tree ul { - padding-left: .2em; -} -#media__tree ul li { - clear: left; - list-style-type: none; - list-style-image: none; - margin-left: 0; -} -#media__tree ul li img { - float: left; - padding: .5em .3em 0 0; -} -#media__tree ul li div.li { - display: inline; -} -#media__tree ul li li { - margin-left: 1.5em; -} - -/* right side -********************************************************************/ - -/*____________ upload form ____________*/ - -/* upload info */ -#media__content div.upload { - font-size: .9em; - margin-bottom: .5em; -} - -#media__content form#dw__upload, -#media__content div#dw__flashupload { - display: block; - border-bottom: solid 1px __border__; - padding-bottom: 1em; - margin-bottom: 1em; -} -#media__content form#dw__upload p { - margin-bottom: .5em; -} - -#media__content form#dw__upload label { -} -#media__content form#dw__upload label.check { -} -#media__content form#dw__upload input.check { -} -#media__content form#dw__upload input.edit { -} -#media__content form#dw__upload img { -} - -/*____________ file list ____________*/ - -#media__content img.load { - margin: 1em auto; -} - -#media__content .odd, -#media__content .even { - padding: .5em; -} -#media__content .odd { - background-color: __background_alt__; -} -#media__content .even { -} -/* highlight newly uploaded or edited file */ -#media__content #scroll__here { - border: 1px dashed __border__; -} - -/* link which inserts media file */ -#media__content a.mediafile { - margin-right: 1.5em; - font-weight: bold; -} -#media__content span.info { -} -#media__content img.btn { - vertical-align: text-bottom; -} - -/* info how to insert media, if JS disabled */ -#media__content div.example { - color: __text_neu__; - margin-left: 1em; -} - -#media__content div.detail { - padding: .2em 0; -} -#media__content div.detail div.thumb { - float: left; - margin: 0 .5em 0 18px; -} -#media__content div.detail div.thumb a { - display: block; -} -#media__content div.detail p { - margin-bottom: 0; -} - - -/*____________ media search ____________*/ - -form#dw__mediasearch { -} -form#dw__mediasearch p { -} -form#dw__mediasearch label { -} -form#dw__mediasearch label span { -} -form#dw__mediasearch input.edit { -} -form#dw__mediasearch input.button { -} - - -/* meta edit form -********************************************************************/ - -#media__content form.meta { -} - -#media__content form.meta div.metafield { - clear: left; - margin-bottom: .5em; - overflow: hidden; -} - -#media__content form.meta label { - display: block; - width: 25%; - float: left; - font-weight: bold; - clear: left; -} -#media__content form.meta .edit { - float: left; - width: 70%; - margin: 0; -} -#media__content form.meta textarea.edit { - /* needed because of IE8 hack in _edit.css for textarea.edit: */ - max-width: 70%; - min-width: 70%; -} - -#media__content form.meta div.buttons { - clear: left; - margin: .2em 0 0 25%; -} -- cgit v1.2.3 From a502f0b0f21a6aeb8022290c1f7c54f81f7de89d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 03:32:04 +0000 Subject: deleted README file from new template --- lib/tpl/dokuwiki/README | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 lib/tpl/dokuwiki/README (limited to 'lib') diff --git a/lib/tpl/dokuwiki/README b/lib/tpl/dokuwiki/README deleted file mode 100644 index 966fc45f1..000000000 --- a/lib/tpl/dokuwiki/README +++ /dev/null @@ -1,5 +0,0 @@ -Starter Template for DokuWiki -http://www.dokuwiki.org/template:starter - -version: 2011-02-20 -author: Anika Henke -- cgit v1.2.3 From 5e5582cecaa7271e3ab1c69c898f9ce0ac383291 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 04:11:59 +0000 Subject: changed the way RTL styles are added Add rtl.css as *screen* style, but append all RTL styles with [dir=rtl]. That has the advantage that all styles are in the same CSS output, so there are no different requests. Later on all styles in rtl.css should be moved to their respective "parent" css file. --- lib/tpl/dokuwiki/css/rtl.css | 326 ++++++++++++++++++++++--------------------- lib/tpl/dokuwiki/style.ini | 2 +- 2 files changed, 168 insertions(+), 160 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css index 851f70850..8a6a9f631 100644 --- a/lib/tpl/dokuwiki/css/rtl.css +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -7,28 +7,36 @@ /*____________ basic ____________*/ -caption, -td, -th { +[dir=rtl] caption, +[dir=rtl] td, +[dir=rtl] th { text-align: right; } -ul, ol { +[dir=rtl] ul, +[dir=rtl] ol { padding: 0 1.5em 0 0; } -li, dd { +[dir=rtl] li, +[dir=rtl] dd { margin: 0 1.5em 0 0; } -blockquote { +[dir=rtl] blockquote { border-width: 0 .25em 0 0; } -h1, h2, h3, h4, h5, h6, -caption, legend { +[dir=rtl] h1, +[dir=rtl] h2, +[dir=rtl] h3, +[dir=rtl] h4, +[dir=rtl] h5, +[dir=rtl] h6, +[dir=rtl] caption, +[dir=rtl] legend { clear: right; } -.a11y { +[dir=rtl] .a11y { left: auto; right: -9000px; } @@ -36,70 +44,70 @@ caption, legend { /*____________ _imgdetail ____________*/ -#dokuwiki__detail div.content img { +[dir=rtl] #dokuwiki__detail div.content img { float: right; margin-right: 0; margin-left: 1.5em; } -#dokuwiki__detail div.content div.img_detail { +[dir=rtl] #dokuwiki__detail div.content div.img_detail { float: right } /*____________ _mediamanager ____________*/ -#mediamgr__aside { +[dir=rtl] #mediamgr__aside { left: auto; right: 0; border-right-width: 0; border-left: 1px solid __border__; } -#mediamgr__content { +[dir=rtl] #mediamgr__content { right: auto; left: 0; } -#media__opts input { +[dir=rtl] #media__opts input { margin-right: 0; margin-left: .3em; } -#media__tree ul { +[dir=rtl] #media__tree ul { padding-left: 0; padding-right: .2em; } -#media__tree ul li { +[dir=rtl] #media__tree ul li { clear: right; margin-right: 0; } -#media__tree ul li img { +[dir=rtl] #media__tree ul li img { float: right; padding: .5em 0 0 .3em; } -#media__tree ul li li { +[dir=rtl] #media__tree ul li li { margin-left: 0; margin-right: 1.5em; } -#media__content a.mediafile { +[dir=rtl] #media__content a.mediafile { margin-right: 0; margin-left: 1.5em; } -#media__content div.detail div.thumb { +[dir=rtl] #media__content div.detail div.thumb { float: right; margin: 0 18px 0 .5em; } -#media__content form.meta div.metafield { +[dir=rtl] #media__content form.meta div.metafield { clear: right; } -#media__content form.meta label { +[dir=rtl] #media__content form.meta label { float: right; clear: right; } -#media__content form.meta .edit { +[dir=rtl] #media__content form.meta .edit { float: right; } -#media__content form.meta div.buttons { +[dir=rtl] #media__content form.meta div.buttons { clear: right; margin: .2em 25% 0 0; } @@ -108,11 +116,11 @@ caption, legend { /*____________ _links ____________*/ /* if link icons don't work as expected, remove the following lines */ -.dokuwiki a.urlextern, -.dokuwiki a.windows, -.dokuwiki a.mail, -.dokuwiki a.interwiki, -.dokuwiki a.mediafile { +[dir=rtl] .dokuwiki a.urlextern, +[dir=rtl] .dokuwiki a.windows, +[dir=rtl] .dokuwiki a.mail, +[dir=rtl] .dokuwiki a.interwiki, +[dir=rtl] .dokuwiki a.mediafile { background-position: right center; padding: 0 17px 0 0; } @@ -120,20 +128,20 @@ caption, legend { /*____________ _toc ____________*/ -.dokuwiki div.toc { +[dir=rtl] .dokuwiki div.toc { float: left; margin: 0 1.4em 1.4em 0; } -.dokuwiki .toc span.toc_open, -.dokuwiki .toc span.toc_close { +[dir=rtl] .dokuwiki .toc span.toc_open, +[dir=rtl] .dokuwiki .toc span.toc_close { float: left; } -.dokuwiki #toc__inside ul ul { +[dir=rtl] .dokuwiki #toc__inside ul ul { padding-left: 0; padding-right: 1em; } -.dokuwiki ul.idx { +[dir=rtl] .dokuwiki ul.idx { padding-right: 0; } @@ -143,10 +151,10 @@ caption, legend { /*____________ _search ____________*/ -.dokuwiki div.search_quickresult ul li { +[dir=rtl] .dokuwiki div.search_quickresult ul li { float: right; } -.dokuwiki form.search div.ajax_qsearch { +[dir=rtl] .dokuwiki form.search div.ajax_qsearch { left: auto; right: -13.5em; text-align: right; @@ -155,8 +163,8 @@ caption, legend { /*____________ _recent ____________*/ -.dokuwiki #dw__recent ul li, -.dokuwiki #page__revisions ul li { +[dir=rtl] .dokuwiki #dw__recent ul li, +[dir=rtl] .dokuwiki #page__revisions ul li { margin-right: 0; } @@ -166,36 +174,36 @@ caption, legend { /*____________ _edit ____________*/ -.dokuwiki div.toolbar #draft__status { +[dir=rtl] .dokuwiki div.toolbar #draft__status { float: left; } -.dokuwiki #wiki__editbar #size__ctl { +[dir=rtl] .dokuwiki #wiki__editbar #size__ctl { float: left; } -.dokuwiki #wiki__editbar #size__ctl img { +[dir=rtl] .dokuwiki #wiki__editbar #size__ctl img { cursor: pointer; } -.dokuwiki #wiki__editbar .editButtons { +[dir=rtl] .dokuwiki #wiki__editbar .editButtons { margin-right: 0; margin-left: 1em; } -.dokuwiki .secedit { +[dir=rtl] .dokuwiki .secedit { float: left; } /*____________ _modal ____________*/ -#link__wiz_close { +[dir=rtl] #link__wiz_close { float: left; } -#link__wiz_result { +[dir=rtl] #link__wiz_result { text-align: right; } -#link__wiz_result div.type_u, -#link__wiz_result div.type_f, -#link__wiz_result div.type_d { +[dir=rtl] #link__wiz_result div.type_u, +[dir=rtl] #link__wiz_result div.type_f, +[dir=rtl] #link__wiz_result div.type_d { padding: 3px 22px 3px 3px; background-position: 257px 3px; } @@ -203,30 +211,30 @@ caption, legend { /*____________ _forms ____________*/ -.dokuwiki label.block { +[dir=rtl] .dokuwiki label.block { text-align: left; } -.dokuwiki label.simple { +[dir=rtl] .dokuwiki label.simple { text-align: right; } -form#subscribe__form fieldset { +[dir=rtl] form#subscribe__form fieldset { text-align: right; } /*____________ _admin ____________*/ -.dokuwiki ul.admin_tasks { +[dir=rtl] .dokuwiki ul.admin_tasks { float: right; } -.dokuwiki ul.admin_tasks li { +[dir=rtl] .dokuwiki ul.admin_tasks li { padding-left: 0; padding-right: 35px; background-position: right 0; } -.dokuwiki #admin__version { +[dir=rtl] .dokuwiki #admin__version { clear: right; float: left; } @@ -237,73 +245,73 @@ form#subscribe__form fieldset { /*____________ structure ____________*/ -#dokuwiki__header .headings { +[dir=rtl] #dokuwiki__header .headings { float: right; text-align: right; } -#dokuwiki__header .tools { +[dir=rtl] #dokuwiki__header .tools { float: left; text-align: left; } -#dokuwiki__aside { +[dir=rtl] #dokuwiki__aside { float: right; } -#dokuwiki__aside > .pad { +[dir=rtl] #dokuwiki__aside > .pad { margin: 0 0 0 1.5em; } -.hasSidebar #dokuwiki__content { +[dir=rtl] .hasSidebar #dokuwiki__content { float: left; margin-left: 0; margin-right: -__sidebar_width__; } -.hasSidebar #dokuwiki__content > .pad { +[dir=rtl] .hasSidebar #dokuwiki__content > .pad { margin-left: 0; margin-right: __sidebar_width__; } /*____________ design ____________*/ -#dokuwiki__header h1 img { +[dir=rtl] #dokuwiki__header h1 img { float: right; margin-left: .5em; margin-right: 0; } -#dokuwiki__sitetools form.search input.edit { +[dir=rtl] #dokuwiki__sitetools form.search input.edit { padding: .35em .1em .35em 22px; } -#dokuwiki__sitetools form.search input.button { +[dir=rtl] #dokuwiki__sitetools form.search input.button { background-position: 5px 0; margin-left: 0; margin-right: -20px; } -#dokuwiki__usertools { +[dir=rtl] #dokuwiki__usertools { text-align: left; left: 40px; right: auto; } -#dokuwiki__sitetools { +[dir=rtl] #dokuwiki__sitetools { text-align: left; } -#dokuwiki__aside ul, #dokuwiki__aside ol { +[dir=rtl] #dokuwiki__aside ul, #dokuwiki__aside ol { padding-right: 0; } -.dokuwiki .pageId { +[dir=rtl] .dokuwiki .pageId { right: auto; left: -1em; } -.dokuwiki .docInfo { +[dir=rtl] .dokuwiki .docInfo { text-align: left; } -.dokuwiki div.toolbar button.toolbutton:first-child { +[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child { border-top-left-radius: 0; border-bottom-left-radius: 0; border-top-right-radius: 4px; @@ -311,7 +319,7 @@ form#subscribe__form fieldset { border-left-width: 0; border-right-width: 1px; } -.dokuwiki div.toolbar button.toolbutton:last-child { +[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child { border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-top-right-radius: 0; @@ -319,30 +327,30 @@ form#subscribe__form fieldset { border-left-width: 1px; } -.dokuwiki div.section_highlight { +[dir=rtl] .dokuwiki div.section_highlight { margin-right: -2em; border-right-width: 1em; } -#dokuwiki__footer .license img { +[dir=rtl] #dokuwiki__footer .license img { margin: 0 0 0 .5em; } -.dokuwiki div.toc { +[dir=rtl] .dokuwiki div.toc { margin: -2em 1.4em .5em -2em; border-left-width: 0; border-right: 1px solid __border__; } -.dokuwiki #toc__inside ul { +[dir=rtl] .dokuwiki #toc__inside ul { padding: 0 1.5em 0 0; } -#dokuwiki__detail div.img_detail dl dt { +[dir=rtl] #dokuwiki__detail div.img_detail dl dt { float: right; text-align: left; clear: right; } -#dokuwiki__detail div.img_detail dl dd { +[dir=rtl] #dokuwiki__detail div.img_detail dl dd { margin-left: 0; margin-right: 9.5em; } @@ -350,142 +358,142 @@ form#subscribe__form fieldset { /*____________ pagetools ____________*/ -#dokuwiki__usertools { +[dir=rtl] #dokuwiki__usertools { right: auto; left: 40px; } -#dokuwiki__pagetools { +[dir=rtl] #dokuwiki__pagetools { right: auto; left: -40px; } -#dokuwiki__pagetools ul { +[dir=rtl] #dokuwiki__pagetools ul { right: auto; left: 0; text-align: left; } -#dokuwiki__pagetools ul li a { +[dir=rtl] #dokuwiki__pagetools ul li a { padding: 5px 5px 5px 40px; background-position: left 0; } -#dokuwiki__pagetools:hover ul, -#dokuwiki__pagetools ul li a:focus { +[dir=rtl] #dokuwiki__pagetools:hover ul, +[dir=rtl] #dokuwiki__pagetools ul li a:focus { box-shadow: -2px 2px 2px __text_alt__; } /* all available icons in sprite */ -#dokuwiki__pagetools ul li a.edit { +[dir=rtl] #dokuwiki__pagetools ul li a.edit { background-position: left 0; } -#dokuwiki__pagetools ul li a.edit:hover, -#dokuwiki__pagetools ul li a.edit:active, -#dokuwiki__pagetools ul li a.edit:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.edit:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.edit:active, +[dir=rtl] #dokuwiki__pagetools ul li a.edit:focus { background-position: left -45px; } -#dokuwiki__pagetools ul li a.create { +[dir=rtl] #dokuwiki__pagetools ul li a.create { background-position: left -90px; } -#dokuwiki__pagetools ul li a.create:hover, -#dokuwiki__pagetools ul li a.create:active, -#dokuwiki__pagetools ul li a.create:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.create:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.create:active, +[dir=rtl] #dokuwiki__pagetools ul li a.create:focus { background-position: left -135px; } -#dokuwiki__pagetools ul li a.show { +[dir=rtl] #dokuwiki__pagetools ul li a.show { background-position: left -270px; } -#dokuwiki__pagetools ul li a.show:hover, -#dokuwiki__pagetools ul li a.show:active, -#dokuwiki__pagetools ul li a.show:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.show:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.show:active, +[dir=rtl] #dokuwiki__pagetools ul li a.show:focus { background-position: left -315px; } -#dokuwiki__pagetools ul li a.source { +[dir=rtl] #dokuwiki__pagetools ul li a.source { background-position: left -360px; } -#dokuwiki__pagetools ul li a.source:hover, -#dokuwiki__pagetools ul li a.source:active, -#dokuwiki__pagetools ul li a.source:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.source:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.source:active, +[dir=rtl] #dokuwiki__pagetools ul li a.source:focus { background-position: left -405px; } -#dokuwiki__pagetools ul li a.draft { +[dir=rtl] #dokuwiki__pagetools ul li a.draft { background-position: left -180px; } -#dokuwiki__pagetools ul li a.draft:hover, -#dokuwiki__pagetools ul li a.draft:active, -#dokuwiki__pagetools ul li a.draft:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.draft:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.draft:active, +[dir=rtl] #dokuwiki__pagetools ul li a.draft:focus { background-position: left -225px; } -#dokuwiki__pagetools ul li a.revs { +[dir=rtl] #dokuwiki__pagetools ul li a.revs { background-position: left -540px; } -#dokuwiki__pagetools ul li a.revs:hover, -#dokuwiki__pagetools ul li a.revs:active, -#dokuwiki__pagetools ul li a.revs:focus, -.mode_revisions #dokuwiki__pagetools ul li a.revs { +[dir=rtl] #dokuwiki__pagetools ul li a.revs:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.revs:active, +[dir=rtl] #dokuwiki__pagetools ul li a.revs:focus, +.mode_revisions [dir=rtl] #dokuwiki__pagetools ul li a.revs { background-position: left -585px; } -#dokuwiki__pagetools ul li a.backlink { +[dir=rtl] #dokuwiki__pagetools ul li a.backlink { background-position: left -630px; } -#dokuwiki__pagetools ul li a.backlink:hover, -#dokuwiki__pagetools ul li a.backlink:active, -#dokuwiki__pagetools ul li a.backlink:focus, -.mode_backlink #dokuwiki__pagetools ul li a.backlink { +[dir=rtl] #dokuwiki__pagetools ul li a.backlink:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.backlink:active, +[dir=rtl] #dokuwiki__pagetools ul li a.backlink:focus, +.mode_backlink [dir=rtl] #dokuwiki__pagetools ul li a.backlink { background-position: left -675px; } -#dokuwiki__pagetools ul li a.top { +[dir=rtl] #dokuwiki__pagetools ul li a.top { background-position: left -810px; } -#dokuwiki__pagetools ul li a.top:hover, -#dokuwiki__pagetools ul li a.top:active, -#dokuwiki__pagetools ul li a.top:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.top:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.top:active, +[dir=rtl] #dokuwiki__pagetools ul li a.top:focus { background-position: left -855px; } -#dokuwiki__pagetools ul li a.revert { +[dir=rtl] #dokuwiki__pagetools ul li a.revert { background-position: left -450px; } -#dokuwiki__pagetools ul li a.revert:hover, -#dokuwiki__pagetools ul li a.revert:active, -#dokuwiki__pagetools ul li a.revert:focus, -.mode_revert #dokuwiki__pagetools ul li a.revert { +[dir=rtl] #dokuwiki__pagetools ul li a.revert:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.revert:active, +[dir=rtl] #dokuwiki__pagetools ul li a.revert:focus, +.mode_revert [dir=rtl] #dokuwiki__pagetools ul li a.revert { background-position: left -495px; } -#dokuwiki__pagetools ul li a.subscribe { +[dir=rtl] #dokuwiki__pagetools ul li a.subscribe { background-position: left -720px; } -#dokuwiki__pagetools ul li a.subscribe:hover, -#dokuwiki__pagetools ul li a.subscribe:active, -#dokuwiki__pagetools ul li a.subscribe:focus, -.mode_subscribe #dokuwiki__pagetools ul li a.subscribe { +[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:active, +[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:focus, +.mode_subscribe [dir=rtl] #dokuwiki__pagetools ul li a.subscribe { background-position: left -765px; } -#dokuwiki__pagetools ul li a.mediaManager { +[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager { background-position: left -900px; } -#dokuwiki__pagetools ul li a.mediaManager:hover, -#dokuwiki__pagetools ul li a.mediaManager:active, -#dokuwiki__pagetools ul li a.mediaManager:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:active, +[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:focus { background-position: left -945px; } -#dokuwiki__pagetools ul li a.back { +[dir=rtl] #dokuwiki__pagetools ul li a.back { background-position: left -990px; } -#dokuwiki__pagetools ul li a.back:hover, -#dokuwiki__pagetools ul li a.back:active, -#dokuwiki__pagetools ul li a.back:focus { +[dir=rtl] #dokuwiki__pagetools ul li a.back:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.back:active, +[dir=rtl] #dokuwiki__pagetools ul li a.back:focus { background-position: left -1035px; } @@ -493,26 +501,26 @@ form#subscribe__form fieldset { /*____________ content ____________*/ /* section indenting -.dokuwiki .page h1 {margin-left: 0; margin-right: 0;} -.dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} -.dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} -.dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} -.dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} -.dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} -.dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} -.dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} -.dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} -.dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} +[dir=rtl] .dokuwiki .page h1 {margin-left: 0; margin-right: 0;} +[dir=rtl] .dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} +[dir=rtl] .dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} +[dir=rtl] .dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} +[dir=rtl] .dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} +[dir=rtl] .dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} +[dir=rtl] .dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} +[dir=rtl] .dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} +[dir=rtl] .dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} +[dir=rtl] .dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} */ -.dokuwiki dl.code dt, -.dokuwiki dl.file dt { +[dir=rtl] .dokuwiki dl.code dt, +[dir=rtl] .dokuwiki dl.file dt { margin-left: 0; margin-right: 1em; } -.JSpopup ul, -.JSpopup ol { +[dir=rtl] .JSpopup ul, +[dir=rtl] .JSpopup ol { padding-right: 0; } @@ -522,12 +530,12 @@ form#subscribe__form fieldset { @media only screen and (max-width: 768px), only screen and (max-device-width: 960px) { -.hasSidebar #dokuwiki__content, -.hasSidebar #dokuwiki__content > .pad { +[dir=rtl] .hasSidebar #dokuwiki__content, +[dir=rtl] .hasSidebar #dokuwiki__content > .pad { margin-right: 0; } -.dokuwiki div.toc { +[dir=rtl] .dokuwiki div.toc { float: none; margin: 0 0 1em 0; border-right-width: 0; @@ -539,36 +547,36 @@ form#subscribe__form fieldset { @media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { -#dokuwiki__header ul.a11y.skip { +[dir=rtl] #dokuwiki__header ul.a11y.skip { left: auto !important; right: 0 !important; float: left; padding-right: 0; } -#dokuwiki__header ul.a11y.skip li { +[dir=rtl] #dokuwiki__header ul.a11y.skip li { margin: 0 .35em 0 0; } -#dokuwiki__header .headings, -#dokuwiki__header .tools { +[dir=rtl] #dokuwiki__header .headings, +[dir=rtl] #dokuwiki__header .tools { float: none; text-align: right; width: auto; } -#dokuwiki__sitetools { +[dir=rtl] #dokuwiki__sitetools { text-align: right; } -#dokuwiki__sitetools form.search { +[dir=rtl] #dokuwiki__sitetools form.search { float: right; margin: 0 0 .2em .2em; } -#dokuwiki__header .mobileTools { +[dir=rtl] #dokuwiki__header .mobileTools { float: left; } -.dokuwiki label.block { +[dir=rtl] .dokuwiki label.block { text-align: right; } diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index 8ac4fbe31..b8e55bcc8 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -30,8 +30,8 @@ css/pagetools.css = screen css/content.css = screen css/includes.css = screen css/mobile.css = screen +css/rtl.css = screen -css/rtl.css = rtl css/print.css = print -- cgit v1.2.3 From efba7aa366d89abfa91f142ff60fe2a33322307e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 04:17:14 +0000 Subject: improved closed item in sitemap for RTL languages --- lib/tpl/dokuwiki/css/rtl.css | 3 +++ lib/tpl/dokuwiki/images/closed-rtl.png | Bin 0 -> 170 bytes 2 files changed, 3 insertions(+) create mode 100644 lib/tpl/dokuwiki/images/closed-rtl.png (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css index 8a6a9f631..baad02758 100644 --- a/lib/tpl/dokuwiki/css/rtl.css +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -144,6 +144,9 @@ [dir=rtl] .dokuwiki ul.idx { padding-right: 0; } +[dir=rtl] .dokuwiki ul.idx li.closed { + list-style-image: url(images/closed-rtl.png); +} /*____________ _footnotes ____________*/ diff --git a/lib/tpl/dokuwiki/images/closed-rtl.png b/lib/tpl/dokuwiki/images/closed-rtl.png new file mode 100644 index 000000000..85ebd59e1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/closed-rtl.png differ -- cgit v1.2.3 From 4a9189579406eb0fc9e00d96592e5589b648e42f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 23 Feb 2012 04:31:16 +0000 Subject: removed left spacing of recent changes list in mobile view --- lib/tpl/dokuwiki/css/mobile.css | 6 ++++++ lib/tpl/dokuwiki/css/rtl.css | 5 +++++ 2 files changed, 11 insertions(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 1239a90a3..e1052f437 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -64,6 +64,12 @@ padding: 1em; } +/* _recent */ +.dokuwiki #dw__recent ul, +.dokuwiki #page__revisions ul { + padding-left: 0; +} + } /* /@media */ diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css index baad02758..e0f81bb21 100644 --- a/lib/tpl/dokuwiki/css/rtl.css +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -544,6 +544,11 @@ border-right-width: 0; } +[dir=rtl] .dokuwiki #dw__recent ul, +[dir=rtl] .dokuwiki #page__revisions ul { + padding-right: 0; +} + } /* /@media */ -- cgit v1.2.3 From a7c93226bd0fa1293e1dc99e679390dc2f8d803c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 2 Mar 2012 08:08:29 +0100 Subject: make RSS contents (media/pages) configurable --- lib/plugins/config/lang/en/lang.php | 1 + lib/plugins/config/settings/config.metadata.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 74ec56345..8718b00ed 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -154,6 +154,7 @@ $lang['rss_content'] = 'What to display in the XML feed items?'; $lang['rss_update'] = 'XML feed update interval (sec)'; $lang['recent_days'] = 'How many recent changes to keep (days)'; $lang['rss_show_summary'] = 'XML feed show summary in title'; +$lang['rss_media'] = 'What kind of changes should be listed in the XML feed?'; /* Target options */ $lang['target____wiki'] = 'Target window for internal links'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index af815e8dc..83f47130c 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -192,9 +192,10 @@ $meta['sitemap'] = array('numeric'); $meta['rss_type'] = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1')); $meta['rss_linkto'] = array('multichoice','_choices' => array('diff','page','rev','current')); $meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html')); +$meta['rss_media'] = array('multichoice','_choices' => array('both','pages','media')); $meta['rss_update'] = array('numeric'); -$meta['recent_days'] = array('numeric'); $meta['rss_show_summary'] = array('onoff'); +$meta['recent_days'] = array('numeric'); $meta['broken_iua'] = array('onoff'); $meta['xsendfile'] = array('multichoice','_choices' => array(0,1,2,3)); $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml')); -- cgit v1.2.3 From 44dae8a743d9c3d83f22e6f38a1685c8326a3b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bohum=C3=ADr=20Z=C3=A1me=C4=8Dn=C3=ADk?= Date: Sun, 4 Mar 2012 17:49:09 +0100 Subject: Czech language update --- lib/plugins/acl/lang/cs/lang.php | 1 + lib/plugins/config/lang/cs/lang.php | 1 + lib/plugins/plugin/lang/cs/lang.php | 1 + lib/plugins/popularity/lang/cs/lang.php | 1 + lib/plugins/revert/lang/cs/lang.php | 1 + lib/plugins/usermanager/lang/cs/lang.php | 1 + 6 files changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php index cc1d97023..a1dce0369 100644 --- a/lib/plugins/acl/lang/cs/lang.php +++ b/lib/plugins/acl/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Lefty * @author Vojta Beran * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik */ $lang['admin_acl'] = 'Správa přístupových práv'; $lang['acl_group'] = 'Skupina'; diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php index bf87e99d5..578198d86 100644 --- a/lib/plugins/config/lang/cs/lang.php +++ b/lib/plugins/config/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Lefty * @author Vojta Beran * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik */ $lang['menu'] = 'Správa nastavení'; $lang['error'] = 'Nastavení nebyla změněna kvůli alespoň jedné neplatné položce, diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php index 0ccabf344..1fd360dca 100644 --- a/lib/plugins/plugin/lang/cs/lang.php +++ b/lib/plugins/plugin/lang/cs/lang.php @@ -11,6 +11,7 @@ * @author Lefty * @author Vojta Beran * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik */ $lang['menu'] = 'Správa pluginů'; $lang['download'] = 'Stáhnout a instalovat plugin'; diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php index 287bcf3b0..d7c58af2e 100644 --- a/lib/plugins/popularity/lang/cs/lang.php +++ b/lib/plugins/popularity/lang/cs/lang.php @@ -8,6 +8,7 @@ * @author Lefty * @author Vojta Beran * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik */ $lang['name'] = 'Průzkum používání (může chviličku trvat, než se natáhne)'; $lang['submit'] = 'Odeslat data'; diff --git a/lib/plugins/revert/lang/cs/lang.php b/lib/plugins/revert/lang/cs/lang.php index cf19381c8..5414ea1e5 100644 --- a/lib/plugins/revert/lang/cs/lang.php +++ b/lib/plugins/revert/lang/cs/lang.php @@ -11,6 +11,7 @@ * @author Lefty * @author Vojta Beran * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik */ $lang['menu'] = 'Obnova zaspamovaných stránek'; $lang['filter'] = 'Hledat zaspamované stránky'; diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php index fe54d4cce..8351c190b 100644 --- a/lib/plugins/usermanager/lang/cs/lang.php +++ b/lib/plugins/usermanager/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Lefty * @author Vojta Beran * @author zbynek.krivka@seznam.cz + * @author Bohumir Zamecnik */ $lang['menu'] = 'Správa uživatelů'; $lang['noauth'] = '(autentizace uživatelů není k dispozici)'; -- cgit v1.2.3 From 0cec12dbebb29837b4bc322d5c1931cd79dc3848 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 10 Mar 2012 17:26:30 +0100 Subject: readded footer buttons from the old template as discussed at https://github.com/splitbrain/dokuwiki/pull/82#r419699 --- lib/tpl/dokuwiki/css/design.css | 14 ++++++++++---- lib/tpl/dokuwiki/images/button-css.png | Bin 0 -> 299 bytes lib/tpl/dokuwiki/images/button-donate.gif | Bin 0 -> 187 bytes lib/tpl/dokuwiki/images/button-dw.png | Bin 0 -> 404 bytes lib/tpl/dokuwiki/images/button-php.gif | Bin 0 -> 207 bytes lib/tpl/dokuwiki/images/button-rss.png | Bin 0 -> 191 bytes lib/tpl/dokuwiki/images/button-xhtml.png | Bin 0 -> 321 bytes lib/tpl/dokuwiki/tpl_footer.php | 15 ++++++++++++++- 8 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 lib/tpl/dokuwiki/images/button-css.png create mode 100644 lib/tpl/dokuwiki/images/button-donate.gif create mode 100644 lib/tpl/dokuwiki/images/button-dw.png create mode 100644 lib/tpl/dokuwiki/images/button-php.gif create mode 100644 lib/tpl/dokuwiki/images/button-rss.png create mode 100644 lib/tpl/dokuwiki/images/button-xhtml.png (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 9e76be6ae..f80251dfe 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -453,11 +453,17 @@ #dokuwiki__footer > .pad { font-size: 0.875em; } -#dokuwiki__footer div.license { +#dokuwiki__footer div.license, +#dokuwiki__footer div.footerbuttons { text-align: center; } -#dokuwiki__footer .license img { - margin: 0 .5em 0 0; - float: none; +#dokuwiki__footer div.license { + margin-bottom: 0.5em; +} +#dokuwiki__footer div.footerbuttons img { + opacity: 0.5; } +#dokuwiki__footer div.footerbuttons a:hover img { + opacity: 1; +} diff --git a/lib/tpl/dokuwiki/images/button-css.png b/lib/tpl/dokuwiki/images/button-css.png new file mode 100644 index 000000000..706325e1c Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-css.png differ diff --git a/lib/tpl/dokuwiki/images/button-donate.gif b/lib/tpl/dokuwiki/images/button-donate.gif new file mode 100644 index 000000000..bba284e21 Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-donate.gif differ diff --git a/lib/tpl/dokuwiki/images/button-dw.png b/lib/tpl/dokuwiki/images/button-dw.png new file mode 100644 index 000000000..97272d968 Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-dw.png differ diff --git a/lib/tpl/dokuwiki/images/button-php.gif b/lib/tpl/dokuwiki/images/button-php.gif new file mode 100644 index 000000000..19aefb08f Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-php.gif differ diff --git a/lib/tpl/dokuwiki/images/button-rss.png b/lib/tpl/dokuwiki/images/button-rss.png new file mode 100644 index 000000000..f2438043f Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-rss.png differ diff --git a/lib/tpl/dokuwiki/images/button-xhtml.png b/lib/tpl/dokuwiki/images/button-xhtml.png new file mode 100644 index 000000000..ec686442c Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-xhtml.png differ diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php index fcc9d21c7..e6fb7661d 100644 --- a/lib/tpl/dokuwiki/tpl_footer.php +++ b/lib/tpl/dokuwiki/tpl_footer.php @@ -1,6 +1,19 @@
- + + +
+ + + href="http://www.dokuwiki.org/donate" title="Donate">Donate + href="http://www.php.net" title="Powered by PHP">Powered by PHP + href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0">Valid XHTML 1.0 + href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS">Valid CSS + href="http://dokuwiki.org/" title="Driven by DokuWiki">Driven by DokuWiki +
-- cgit v1.2.3 From a4380643ef4658cfe5340f5963a54a045a529c5b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 10 Mar 2012 21:04:15 +0000 Subject: improved footer readability and css --- lib/tpl/dokuwiki/css/design.css | 19 ++++++++----------- lib/tpl/dokuwiki/tpl_footer.php | 26 +++++++++++++++----------- 2 files changed, 23 insertions(+), 22 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index f80251dfe..6bf98b90d 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -283,10 +283,6 @@ .dokuwiki div.license { font-size: 93.75%; } -/* license note in footer */ -.dokuwiki #dokuwiki__footer div.license { - font-size: 100%; -} #IE7 .dokuwiki input.button, #IE7 .dokuwiki button { @@ -449,21 +445,22 @@ #dokuwiki__footer { margin-bottom: 1em; + text-align: center; } #dokuwiki__footer > .pad { font-size: 0.875em; } -#dokuwiki__footer div.license, -#dokuwiki__footer div.footerbuttons { - text-align: center; -} + #dokuwiki__footer div.license { margin-bottom: 0.5em; + font-size: 100%; } -#dokuwiki__footer div.footerbuttons img { + +#dokuwiki__footer div.buttons a img { opacity: 0.5; } - -#dokuwiki__footer div.footerbuttons a:hover img { +#dokuwiki__footer div.buttons a:hover img, +#dokuwiki__footer div.buttons a:active img, +#dokuwiki__footer div.buttons a:focus img { opacity: 1; } diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php index e6fb7661d..6b46234d6 100644 --- a/lib/tpl/dokuwiki/tpl_footer.php +++ b/lib/tpl/dokuwiki/tpl_footer.php @@ -1,18 +1,22 @@
+ + +
- -
- - - href="http://www.dokuwiki.org/donate" title="Donate">Donate - href="http://www.php.net" title="Powered by PHP">Powered by PHP - href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0">Valid XHTML 1.0 - href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS">Valid CSS - href="http://dokuwiki.org/" title="Driven by DokuWiki">Driven by DokuWiki + >Donate + >Powered by PHP + >Valid XHTML 1.0 + >Valid CSS + >Driven by DokuWiki
-- cgit v1.2.3 From 83112a8af043de8ff379b16483077b78ffe2204f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 10 Mar 2012 22:53:31 +0100 Subject: Build the pagetools sprite programatically with imagemagick This makes it easier to modify or extend the icons in the sprite. Just place the source files in the pagetools directory and run the build script. --- lib/tpl/dokuwiki/images/pagetools-build.sh | 56 +++++++++++++++++++++ lib/tpl/dokuwiki/images/pagetools-license.txt | 4 -- lib/tpl/dokuwiki/images/pagetools-sprite.png | Bin 14507 -> 10389 bytes lib/tpl/dokuwiki/images/pagetools-sprite.xcf | Bin 34257 -> 0 bytes lib/tpl/dokuwiki/images/pagetools/01_edit.png | Bin 0 -> 740 bytes lib/tpl/dokuwiki/images/pagetools/02_create.png | Bin 0 -> 808 bytes lib/tpl/dokuwiki/images/pagetools/03_draft.png | Bin 0 -> 828 bytes lib/tpl/dokuwiki/images/pagetools/04_show.png | Bin 0 -> 458 bytes lib/tpl/dokuwiki/images/pagetools/05_source.png | Bin 0 -> 753 bytes lib/tpl/dokuwiki/images/pagetools/06_revert.png | Bin 0 -> 752 bytes lib/tpl/dokuwiki/images/pagetools/07_revisions.png | Bin 0 -> 1144 bytes lib/tpl/dokuwiki/images/pagetools/08_backlink.png | Bin 0 -> 844 bytes lib/tpl/dokuwiki/images/pagetools/09_subscribe.png | Bin 0 -> 589 bytes lib/tpl/dokuwiki/images/pagetools/10_top.png | Bin 0 -> 465 bytes .../dokuwiki/images/pagetools/11_mediamanager.png | Bin 0 -> 441 bytes lib/tpl/dokuwiki/images/pagetools/12_back.png | Bin 0 -> 483 bytes lib/tpl/dokuwiki/images/pagetools/license.txt | 4 ++ 17 files changed, 60 insertions(+), 4 deletions(-) create mode 100755 lib/tpl/dokuwiki/images/pagetools-build.sh delete mode 100644 lib/tpl/dokuwiki/images/pagetools-license.txt delete mode 100644 lib/tpl/dokuwiki/images/pagetools-sprite.xcf create mode 100644 lib/tpl/dokuwiki/images/pagetools/01_edit.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/02_create.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/03_draft.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/04_show.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/05_source.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/06_revert.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/07_revisions.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/08_backlink.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/09_subscribe.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/10_top.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/12_back.png create mode 100644 lib/tpl/dokuwiki/images/pagetools/license.txt (limited to 'lib') diff --git a/lib/tpl/dokuwiki/images/pagetools-build.sh b/lib/tpl/dokuwiki/images/pagetools-build.sh new file mode 100755 index 000000000..202e222e9 --- /dev/null +++ b/lib/tpl/dokuwiki/images/pagetools-build.sh @@ -0,0 +1,56 @@ +#!/bin/sh +# +# This script generates a sprite from the unprocessed toolbar icons by combining them +# and overlaying a color layer for the active state +# +# The final sprite is optimized with optipng +# +# The script currently expects a Linux system with current versions of the imagemagick +# and optipng binaries in the path +# +# @author Andreas Gohr + +OUT=`dirname $0` +IN="$OUT/pagetools" + +if [ ! -d "$IN" ]; then + echo "Input folder $IN not found" + exit 1 +fi + +if [ -z "$TEMP" ]; then + TEMP="/tmp" +fi + +if [ ! -d "$TEMP" ]; then + echo "No temp directory available" + exit 1 +fi + +# add up all images twice +montage `for X in $IN/*.png; do echo -n "$X $X "; done` -background transparent -tile 1x -geometry 30x45 -gravity north $TEMP/icons.png + +# darken the image +convert $TEMP/icons.png \( +clone -fill '#cccccc' -colorize 100% \) -compose multiply -composite $TEMP/darkicons.png + +# create the mask to highlight an active icon +convert -size 30x30 xc:'#2b73b7' -gamma 0.7 $TEMP/active.png + +# create the full mask +montage `for X in $IN/*.png; do echo -n "$TEMP/active.png "; done` -background transparent -tile 1x -geometry 30x60+0+15 -gravity south $TEMP/activemask.png + +# apply mask +convert $TEMP/darkicons.png $TEMP/activemask.png \ +\( -clone 0 -alpha extract \) \ +\( -clone 0 -clone 1 -compose overlay -composite \) \ +-delete 0,1 +swap -alpha off -compose copy_opacity -composite $OUT/pagetools-sprite.png + +# optimize final sprite +optipng -o5 $OUT/pagetools-sprite.png + +# remove temporary images +rm -f $TEMP/icons.png +rm -f $TEMP/darkicons.png +rm -f $TEMP/active.png +rm -f $TEMP/activemask.png + diff --git a/lib/tpl/dokuwiki/images/pagetools-license.txt b/lib/tpl/dokuwiki/images/pagetools-license.txt deleted file mode 100644 index 299624c62..000000000 --- a/lib/tpl/dokuwiki/images/pagetools-license.txt +++ /dev/null @@ -1,4 +0,0 @@ -Icon set: iPhone toolbar icons -Designer: TheWorkingGroup.ca -License: Creative Commons Attribution-Share Alike License [http://creativecommons.org/licenses/by-sa/3.0/] -URL: http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/ diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png index a0f4036ff..0e8b4a9bf 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.png and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.xcf b/lib/tpl/dokuwiki/images/pagetools-sprite.xcf deleted file mode 100644 index 07c1d83fb..000000000 Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.xcf and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/pagetools/01_edit.png b/lib/tpl/dokuwiki/images/pagetools/01_edit.png new file mode 100644 index 000000000..ad4a737d8 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/01_edit.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/02_create.png b/lib/tpl/dokuwiki/images/pagetools/02_create.png new file mode 100644 index 000000000..e4fc5d3b1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/02_create.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/03_draft.png b/lib/tpl/dokuwiki/images/pagetools/03_draft.png new file mode 100644 index 000000000..a13d8c3b4 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/03_draft.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/04_show.png b/lib/tpl/dokuwiki/images/pagetools/04_show.png new file mode 100644 index 000000000..6f64b1bd1 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/04_show.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/05_source.png b/lib/tpl/dokuwiki/images/pagetools/05_source.png new file mode 100644 index 000000000..bcc4fa21f Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/05_source.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/06_revert.png b/lib/tpl/dokuwiki/images/pagetools/06_revert.png new file mode 100644 index 000000000..7b8457e5e Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/06_revert.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/07_revisions.png b/lib/tpl/dokuwiki/images/pagetools/07_revisions.png new file mode 100644 index 000000000..d918bce05 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/07_revisions.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/08_backlink.png b/lib/tpl/dokuwiki/images/pagetools/08_backlink.png new file mode 100644 index 000000000..2c0823a72 Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/08_backlink.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png b/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png new file mode 100644 index 000000000..30e039dbc Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/09_subscribe.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/10_top.png b/lib/tpl/dokuwiki/images/pagetools/10_top.png new file mode 100644 index 000000000..e4bf1d49d Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/10_top.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png b/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png new file mode 100644 index 000000000..36116802f Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/11_mediamanager.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/12_back.png b/lib/tpl/dokuwiki/images/pagetools/12_back.png new file mode 100644 index 000000000..d154651ec Binary files /dev/null and b/lib/tpl/dokuwiki/images/pagetools/12_back.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools/license.txt b/lib/tpl/dokuwiki/images/pagetools/license.txt new file mode 100644 index 000000000..299624c62 --- /dev/null +++ b/lib/tpl/dokuwiki/images/pagetools/license.txt @@ -0,0 +1,4 @@ +Icon set: iPhone toolbar icons +Designer: TheWorkingGroup.ca +License: Creative Commons Attribution-Share Alike License [http://creativecommons.org/licenses/by-sa/3.0/] +URL: http://blog.twg.ca/2009/09/free-iphone-toolbar-icons/ -- cgit v1.2.3 From d43eb44110dd836cad0da96d1f027260c2581d89 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 11 Mar 2012 10:48:29 +0100 Subject: Another go at building the pagetool sprite with a script This time PHP and libGD is used so it should work on Windows as well. The image quality is much better this time and the active highlight color is read directly from the template's style.ini --- lib/tpl/dokuwiki/images/pagetools-build.php | 121 +++++++++++++++++++++++++++ lib/tpl/dokuwiki/images/pagetools-build.sh | 56 ------------- lib/tpl/dokuwiki/images/pagetools-sprite.png | Bin 10389 -> 8178 bytes lib/tpl/dokuwiki/images/pagetools.xcf | Bin 14393 -> 0 bytes 4 files changed, 121 insertions(+), 56 deletions(-) create mode 100644 lib/tpl/dokuwiki/images/pagetools-build.php delete mode 100755 lib/tpl/dokuwiki/images/pagetools-build.sh delete mode 100644 lib/tpl/dokuwiki/images/pagetools.xcf (limited to 'lib') diff --git a/lib/tpl/dokuwiki/images/pagetools-build.php b/lib/tpl/dokuwiki/images/pagetools-build.php new file mode 100644 index 000000000..1b7262ad5 --- /dev/null +++ b/lib/tpl/dokuwiki/images/pagetools-build.php @@ -0,0 +1,121 @@ + + * @todo Maybe add some more error checking + */ +$GAMMA = 0.8; +$OPTIPNG = '/usr/bin/optipng'; + +// load input images +$input = glob('pagetools/*.png'); +sort($input); +$cnt = count($input); +if(!$cnt){ + die("No input images found. This script needs to be called from within the image directory!\n"); +} + +// create destination image +$DST = imagecreatetruecolor(30,$cnt*45*2); +imagesavealpha($DST, true); +$C_trans = imagecolorallocatealpha($DST, 0, 0, 0, 127); +imagefill($DST, 0, 0, $C_trans); + +// load highlight color from style.ini +$ini = parse_ini_file('../style.ini',true); +$COLOR = hex2rgb($ini['replacements']['__link__']); +$C_active = imagecolorallocate($DST, $COLOR['r'],$COLOR['g'],$COLOR['b']); + +// add all the icons to the sprite image +for($i=0; $i<$cnt; $i++){ + $base = $i*90; + + $IN = imagecreatefrompng($input[$i]); + imagesavealpha($IN, true); + imagecolorscale($IN,$GAMMA); + imagecopy($DST,$IN, 0,$base, 0,0, 30,30); + imagedestroy($IN); + + $IN = imagecreatefrompng($input[$i]); + imagesavealpha($IN, true); + imagecolorscale($IN,$GAMMA); + imagecopy($DST,$IN, 0,$base+45, 0,0, 30,30); + imagedestroy($IN); + + imagelayereffect($DST, IMG_EFFECT_OVERLAY); + imagefilledrectangle($DST, 0,$base+45, 30,$base+45+30, $C_active); + imagelayereffect($DST, IMG_EFFECT_NORMAL); +} + +// output sprite +imagepng($DST,'pagetools-sprite.png'); +imagedestroy($DST); + +// optimize if possible +if(is_executable($OPTIPNG)){ + system("$OPTIPNG -o5 'pagetools-sprite.png'"); +} + +/** + * Convert a hex color code to an rgb array + */ +function hex2rgb($hex) { + // strip hash + $hex = str_replace('#', '', $hex); + + // normalize short codes + if(strlen($hex) == 3){ + $hex = substr($hex,0,1). + substr($hex,0,1). + substr($hex,1,1). + substr($hex,1,1). + substr($hex,2,1). + substr($hex,2,1); + } + + // calc rgb + return array( + 'r' => hexdec(substr($hex, 0, 2)), + 'g' => hexdec(substr($hex, 2, 2)), + 'b' => hexdec(substr($hex, 4, 2)) + ); +} + +/** + * Scale (darken/lighten) a given image + * + * @param ressource $img The truetype GD image to work on + * @param float $scale Scale the colors by this value ( <1 darkens, >1 lightens) + */ +function imagecolorscale(&$img, $scale){ + $w = imagesx($img); + $h = imagesy($img); + + imagealphablending($img, false); + for($x = 0; $x < $w; $x++){ + for($y = 0; $y < $h; $y++){ + $rgba = imagecolorat($img, $x, $y); + $a = ($rgba >> 24) & 0xFF; + $r = ($rgba >> 16) & 0xFF; + $g = ($rgba >> 8) & 0xFF; + $b = $rgba & 0xFF; + + $r = max(min(round($r*$scale),255),0); + $g = max(min(round($g*$scale),255),0); + $b = max(min(round($b*$scale),255),0); + + $color = imagecolorallocatealpha($img, $r, $g, $b, $a); + imagesetpixel($img, $x, $y, $color); + } + } + imagealphablending($img, true); +} + diff --git a/lib/tpl/dokuwiki/images/pagetools-build.sh b/lib/tpl/dokuwiki/images/pagetools-build.sh deleted file mode 100755 index 202e222e9..000000000 --- a/lib/tpl/dokuwiki/images/pagetools-build.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# This script generates a sprite from the unprocessed toolbar icons by combining them -# and overlaying a color layer for the active state -# -# The final sprite is optimized with optipng -# -# The script currently expects a Linux system with current versions of the imagemagick -# and optipng binaries in the path -# -# @author Andreas Gohr - -OUT=`dirname $0` -IN="$OUT/pagetools" - -if [ ! -d "$IN" ]; then - echo "Input folder $IN not found" - exit 1 -fi - -if [ -z "$TEMP" ]; then - TEMP="/tmp" -fi - -if [ ! -d "$TEMP" ]; then - echo "No temp directory available" - exit 1 -fi - -# add up all images twice -montage `for X in $IN/*.png; do echo -n "$X $X "; done` -background transparent -tile 1x -geometry 30x45 -gravity north $TEMP/icons.png - -# darken the image -convert $TEMP/icons.png \( +clone -fill '#cccccc' -colorize 100% \) -compose multiply -composite $TEMP/darkicons.png - -# create the mask to highlight an active icon -convert -size 30x30 xc:'#2b73b7' -gamma 0.7 $TEMP/active.png - -# create the full mask -montage `for X in $IN/*.png; do echo -n "$TEMP/active.png "; done` -background transparent -tile 1x -geometry 30x60+0+15 -gravity south $TEMP/activemask.png - -# apply mask -convert $TEMP/darkicons.png $TEMP/activemask.png \ -\( -clone 0 -alpha extract \) \ -\( -clone 0 -clone 1 -compose overlay -composite \) \ --delete 0,1 +swap -alpha off -compose copy_opacity -composite $OUT/pagetools-sprite.png - -# optimize final sprite -optipng -o5 $OUT/pagetools-sprite.png - -# remove temporary images -rm -f $TEMP/icons.png -rm -f $TEMP/darkicons.png -rm -f $TEMP/active.png -rm -f $TEMP/activemask.png - diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png index 0e8b4a9bf..bbd7fd361 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.png and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools.xcf b/lib/tpl/dokuwiki/images/pagetools.xcf deleted file mode 100644 index 034b39a42..000000000 Binary files a/lib/tpl/dokuwiki/images/pagetools.xcf and /dev/null differ -- cgit v1.2.3 From 3cc7f979e3049c367082b6c7be205c0d78a4b95f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 11 Mar 2012 12:08:35 +0000 Subject: made images fit better into the horizontal grid, and reduced side spacing a bit --- lib/tpl/dokuwiki/css/content.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index 4e9f8cbe1..c4374fb96 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -27,15 +27,16 @@ /* embedded images (styles are already partly set in lib/styles/all.css) */ .dokuwiki img.media { + margin: .2em 0; } .dokuwiki img.medialeft { - margin: .5em 1.5em .5em 0; + margin: .2em 1em .2em 0; } .dokuwiki img.mediaright { - margin: .5em 0 .5em 1.5em; + margin: .2em 0 .2em 1em; } .dokuwiki img.mediacenter { - margin: .5em auto; + margin: .2em auto; } -- cgit v1.2.3 From 7c5f6a37b17b8743005677cf049f1c173407a055 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 11 Mar 2012 18:15:17 +0000 Subject: removed a few unnecessary classes and elements before IDs in styles --- lib/tpl/dokuwiki/css/_forms.css | 6 +++--- lib/tpl/dokuwiki/css/_search.css | 2 +- lib/tpl/dokuwiki/css/content.css | 12 ++++++------ lib/tpl/dokuwiki/css/design.css | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index 804584725..39a1ec5d3 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -65,18 +65,18 @@ * Styles for the subscription page */ -form#subscribe__form { +#subscribe__form { display: block; width: 400px; text-align: center; } -form#subscribe__form fieldset { +#subscribe__form fieldset { text-align: left; margin: 0.5em 0; } -form#subscribe__form label { +#subscribe__form label { display: block; margin: 0 0.5em 0.5em; } diff --git a/lib/tpl/dokuwiki/css/_search.css b/lib/tpl/dokuwiki/css/_search.css index 70824fc43..c124c1e86 100644 --- a/lib/tpl/dokuwiki/css/_search.css +++ b/lib/tpl/dokuwiki/css/_search.css @@ -7,7 +7,7 @@ ********************************************************************/ /* loading gif */ -.dokuwiki #dw__loading { +#dw__loading { } /*____________ matching pagenames ____________*/ diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index c4374fb96..ca2294950 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -42,16 +42,16 @@ /*____________ lists ____________*/ -.dokuwiki #dokuwiki__content ul li, -.dokuwiki #dokuwiki__aside ul li { +#dokuwiki__content ul li, +#dokuwiki__aside ul li { color: __text_alt__; } -.dokuwiki #dokuwiki__content ol li, -.dokuwiki #dokuwiki__aside ol li { +#dokuwiki__content ol li, +#dokuwiki__aside ol li { color: __text_neu__; } -.dokuwiki #dokuwiki__content li .li, -.dokuwiki #dokuwiki__aside li .li { +#dokuwiki__content li .li, +#dokuwiki__aside li .li { color: __text__; } diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 6bf98b90d..a741de355 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -293,10 +293,10 @@ margin: 0; } -.dokuwiki #dokuwiki__content span.curid a { +#dokuwiki__content span.curid a { font-weight: normal; } -.dokuwiki #dokuwiki__content strong span.curid a { +#dokuwiki__content strong span.curid a { font-weight: bold; } -- cgit v1.2.3 From 693e373640c188e34d63ff4957cb20bccffdeb17 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 11 Mar 2012 18:17:35 +0000 Subject: made print styles more readable and changed media classes to the same as in 3cc7f979e3 --- lib/tpl/dokuwiki/css/print.css | 101 +++++++++++++++++++++++++++++++---------- 1 file changed, 77 insertions(+), 24 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index d20d0f464..f4f81d741 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -14,26 +14,51 @@ body { /* hide certain sections */ .a11y, -div.notify, div.info, div.success, div.error, -#dokuwiki__header .tools, #dokuwiki__aside, -.dokuwiki .breadcrumbs, .dokuwiki .toc, .dokuwiki .secedit, -#dokuwiki__pagetools, #dokuwiki__footer { +div.notify, +div.info, +div.success, +div.error, +#dokuwiki__header .tools, +#dokuwiki__aside, +.dokuwiki .breadcrumbs, +.dokuwiki .toc, +.dokuwiki .secedit, +#dokuwiki__pagetools, +#dokuwiki__footer { display: none; } -.dokuwiki h1, .dokuwiki h2, .dokuwiki h3, .dokuwiki h4, .dokuwiki h5, -.dokuwiki caption, .dokuwiki legend { +.dokuwiki h1, +.dokuwiki h2, +.dokuwiki h3, +.dokuwiki h4, +.dokuwiki h5, +.dokuwiki caption, +.dokuwiki legend { clear: both; } -.dokuwiki ul { list-style: disc outside; } -.dokuwiki ol { list-style: decimal outside; } -.dokuwiki ol ol { list-style-type: lower-alpha; } -.dokuwiki ol ol ol { list-style-type: upper-roman; } -.dokuwiki ol ol ol ol { list-style-type: upper-alpha; } -.dokuwiki ol ol ol ol ol { list-style-type: lower-roman; } +.dokuwiki ul { + list-style: disc outside; +} +.dokuwiki ol { + list-style: decimal outside; +} +.dokuwiki ol ol { + list-style-type: lower-alpha; +} +.dokuwiki ol ol ol { + list-style-type: upper-roman; +} +.dokuwiki ol ol ol ol { + list-style-type: upper-alpha; +} +.dokuwiki ol ol ol ol ol { + list-style-type: lower-roman; +} /* undo icons */ -.dokuwiki a:link, .dokuwiki a:visited { +.dokuwiki a:link, +.dokuwiki a:visited { text-decoration: underline; color: #333; background-color: inherit; @@ -53,24 +78,51 @@ a.mail:after { .dokuwiki pre { font-family: monospace; } -.dokuwiki dl.code dt, .dokuwiki dl.file dt { +.dokuwiki dl.code dt, +.dokuwiki dl.file dt { font-weight: bold; } /* images */ -.dokuwiki img { border-width: 0; vertical-align: middle; } -.dokuwiki img.medialeft { margin: .5em 1.5em .5em 0; float: left; } -.dokuwiki img.mediaright { margin: .5em 0 .5em 1.5em; float: right; } -.dokuwiki img.mediacenter { margin: .5em auto; display: block; } +.dokuwiki img { + border-width: 0; + vertical-align: middle; +} +.dokuwiki img.media { + margin: .2em 0; +} +.dokuwiki img.medialeft { + margin: .2em 1em .2em 0; + float: left; +} +.dokuwiki img.mediaright { + margin: .2em 0 .2em 1em; + float: right; +} +.dokuwiki img.mediacenter { + margin: .2em auto; + display: block; +} /* align table cells */ -.dokuwiki .leftalign { text-align: left; } -.dokuwiki .centeralign { text-align: center; } -.dokuwiki .rightalign { text-align: right; } +.dokuwiki .leftalign { + text-align: left; +} +.dokuwiki .centeralign { + text-align: center; +} +.dokuwiki .rightalign { + text-align: right; +} /* underline */ -.dokuwiki em.u { font-style: normal; text-decoration: underline; } -.dokuwiki em em.u { font-style: italic; } +.dokuwiki em.u { + font-style: normal; + text-decoration: underline; +} +.dokuwiki em em.u { + font-style: italic; +} div.clearer { clear: both; @@ -93,7 +145,8 @@ div.clearer { border-spacing: 0; border: 1pt solid #ccc; } -.dokuwiki th, .dokuwiki td { +.dokuwiki th, +.dokuwiki td { padding: 3pt 5pt; margin: 0; vertical-align: top; -- cgit v1.2.3 From fdf694b216d23b74238db04b0ee0daf4791817d5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 11 Mar 2012 19:58:46 +0000 Subject: added mediamanager link to be highlighted when selected --- lib/tpl/dokuwiki/css/design.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index a741de355..8617c6c48 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -61,6 +61,7 @@ .mode_profile a.action.profile, .mode_recent a.action.recent, .mode_index a.action.index, +.mode_media a.action.media, .mode_revisions a.action.revs, .mode_backlink a.action.backlink, .mode_subscribe a.action.subscribe { -- cgit v1.2.3 From 96946cc94d3ecb3832e2a1ce35c49743e25329e1 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Wed, 21 Mar 2012 11:25:00 +0100 Subject: replaced $HTTP_RAW_POST_DATA with http_get_raw_post_data function --- lib/exe/xmlrpc.php | 3 --- lib/plugins/acl/ajax.php | 11 ++++++----- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 93086e891..cbec90bff 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -1,9 +1,6 @@ */ -//fix for Opera XMLHttpRequests -if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){ - parse_str($HTTP_RAW_POST_DATA, $_POST); -} - if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../'); require_once(DOKU_INC.'inc/init.php'); //close session session_write_close(); +//fix for Opera XMLHttpRequests +$postData = http_get_raw_post_data(); +if(!count($_POST) && !empty($postData)){ + parse_str($postData, $_POST); +} + if(!auth_isadmin()) die('for admins only'); if(!checkSecurityToken()) die('CRSF Attack'); -- cgit v1.2.3 From b967e5fc8fd93226eba7926c13b73b93878f182b Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Thu, 22 Mar 2012 12:11:31 +0100 Subject: removed requires, changed conf check in xmlrpc.php --- lib/exe/xmlrpc.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index cbec90bff..cf3682f11 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -2,10 +2,9 @@ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); require_once(DOKU_INC.'inc/init.php'); -require_once(DOKU_INC.'inc/remote.php'); session_write_close(); //close session -if(!$conf['xmlrpc']) die('XML-RPC server not enabled.'); +if(!$conf['remote']) die('XML-RPC server not enabled.'); /** * Contains needed wrapper functions and registers all available -- cgit v1.2.3 From f914ba96dd52d197d1dbdf3dca68bf7dfc3b8380 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 23 Mar 2012 10:07:03 +0100 Subject: more verbose remote API config setting explanation --- lib/plugins/config/lang/en/lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index fe9e5458b..2151d7543 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -110,8 +110,8 @@ $lang['disableactions_other'] = 'Other actions (comma separated)'; $lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; $lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)'; $lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.'; -$lang['remote'] = 'Enable/disable Remote interface.'; -$lang['remoteuser'] = 'Restrict Remote access to the comma separated groups or users given here. Leave empty to give access to everyone.'; +$lang['remote'] = 'Enable the remote API system. This allows other applications to access the wiki via XML-RPC or other mechanisms.'; +$lang['remoteuser'] = 'Restrict remote API access to the comma separated groups or users given here. Leave empty to give access to everyone.'; /* Advanced Options */ $lang['updatecheck'] = 'Check for updates and security warnings? DokuWiki needs to contact update.dokuwiki.org for this feature.'; -- cgit v1.2.3 From ee9b1ae4b3919f79050bb3c4478203d648810645 Mon Sep 17 00:00:00 2001 From: Taisuke Shimamoto Date: Fri, 23 Mar 2012 11:07:23 +0100 Subject: Japanese language update --- lib/plugins/acl/lang/ja/lang.php | 1 + lib/plugins/config/lang/ja/lang.php | 6 ++++++ lib/plugins/plugin/lang/ja/lang.php | 1 + lib/plugins/popularity/lang/ja/lang.php | 1 + lib/plugins/revert/lang/ja/lang.php | 1 + lib/plugins/usermanager/lang/ja/lang.php | 1 + 6 files changed, 11 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ja/lang.php b/lib/plugins/acl/lang/ja/lang.php index 831fd2d5c..5bebb58a9 100644 --- a/lib/plugins/acl/lang/ja/lang.php +++ b/lib/plugins/acl/lang/ja/lang.php @@ -8,6 +8,7 @@ * @author Ikuo Obataya * @author Daniel Dupriest * @author Kazutaka Miyasaka + * @author Taisuke Shimamoto */ $lang['admin_acl'] = 'アクセスコントロール管理'; $lang['acl_group'] = 'グループ'; diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php index f1d2e3e8f..fb263fe00 100644 --- a/lib/plugins/config/lang/ja/lang.php +++ b/lib/plugins/config/lang/ja/lang.php @@ -8,6 +8,7 @@ * @author Ikuo Obataya * @author Daniel Dupriest * @author Kazutaka Miyasaka + * @author Taisuke Shimamoto */ $lang['menu'] = 'サイト設定'; $lang['error'] = '不正な値が存在するため、設定は更新されませんでした。入力値を確認してから、再度更新してください。 @@ -48,6 +49,8 @@ $lang['cookiedir'] = 'Cookie のパス。空欄にすると baseurl $lang['start'] = 'スタートページ名'; $lang['title'] = 'WIKIタイトル'; $lang['template'] = 'テンプレート'; +$lang['tagline'] = 'キャッチフレーズ (テンプレートが対応していれば)'; +$lang['sidebar'] = 'サイドバー用ページ名 (テンプレートが対応していれば)。空欄でサイドバー無効。'; $lang['license'] = '作成した内容をどのライセンスでリリースしますか？'; $lang['fullpath'] = 'ページのフッターに絶対パスを表示'; $lang['recent'] = '最近の変更表示数'; @@ -91,6 +94,8 @@ $lang['disableactions_other'] = 'その他の動作（カンマ区切り）'; $lang['sneaky_index'] = 'デフォルトでは索引にすべての名前空間を表示しますが、この機能はユーザーに閲覧権限のない名前空間を非表示にします。ただし、閲覧が可能な副名前空間まで表示されなくなるため、ACLの設定が適正でない場合は索引機能が使えなくなる場合があります。'; $lang['auth_security_timeout'] = '認証タイムアウト設定（秒）'; $lang['securecookie'] = 'クッキーをHTTPSにてセットする場合は、ブラウザよりHTTPS経由で送信された場合にみに制限しますか？ログインのみをSSLで行う場合は、この機能を無効にしてください。'; +$lang['xmlrpc'] = 'XML-RPCインターフェースを有効/無効にする'; +$lang['xmlrpcuser'] = 'XML-RPCアクセスを指定グループとユーザーに制限します（半角コンマ区切り）。　すべての人にアクセスを許可する場合は空のままにしてください。'; $lang['updatecheck'] = 'DokuWikiの更新とセキュリティに関する情報をチェックしますか？ この機能は update.dokuwiki.org への接続が必要です。'; $lang['userewrite'] = 'URLの書き換え'; $lang['useslash'] = 'URL上の名前空間の区切りにスラッシュを使用'; @@ -130,6 +135,7 @@ $lang['rss_content'] = 'XMLフィードに何を表示させますか $lang['rss_update'] = 'RSSフィードの更新間隔（秒）'; $lang['recent_days'] = '最近の変更とする期間（日数）'; $lang['rss_show_summary'] = 'フィードのタイトルにサマリーを表示'; +$lang['rss_media'] = 'XMLフィードで、どんな種類の変更を記載するか'; $lang['target____wiki'] = '内部リンクの表示先'; $lang['target____interwiki'] = 'InterWikiリンクの表示先'; $lang['target____extern'] = '外部リンクの表示先'; diff --git a/lib/plugins/plugin/lang/ja/lang.php b/lib/plugins/plugin/lang/ja/lang.php index a96dcc9be..d366806c3 100644 --- a/lib/plugins/plugin/lang/ja/lang.php +++ b/lib/plugins/plugin/lang/ja/lang.php @@ -8,6 +8,7 @@ * @author Ikuo Obataya * @author Daniel Dupriest * @author Kazutaka Miyasaka + * @author Taisuke Shimamoto */ $lang['menu'] = 'プラグイン管理'; $lang['download'] = 'プラグインのダウンロードとインストール'; diff --git a/lib/plugins/popularity/lang/ja/lang.php b/lib/plugins/popularity/lang/ja/lang.php index 736924bb1..f5e280db5 100644 --- a/lib/plugins/popularity/lang/ja/lang.php +++ b/lib/plugins/popularity/lang/ja/lang.php @@ -6,6 +6,7 @@ * @author Daniel Dupriest * @author Kazutaka Miyasaka * @author Yuji Takenaka + * @author Taisuke Shimamoto */ $lang['name'] = '利用状況調査（ロードに少し時間が掛かります）'; $lang['submit'] = 'データ送信'; diff --git a/lib/plugins/revert/lang/ja/lang.php b/lib/plugins/revert/lang/ja/lang.php index 0cd8c6f9b..bb5a9c150 100644 --- a/lib/plugins/revert/lang/ja/lang.php +++ b/lib/plugins/revert/lang/ja/lang.php @@ -5,6 +5,7 @@ * @author Ikuo Obataya * @author Daniel Dupriest * @author Kazutaka Miyasaka + * @author Taisuke Shimamoto */ $lang['menu'] = '復元管理'; $lang['filter'] = 'スパムを受けたページを検索'; diff --git a/lib/plugins/usermanager/lang/ja/lang.php b/lib/plugins/usermanager/lang/ja/lang.php index 321bbafe8..b5fd556dc 100644 --- a/lib/plugins/usermanager/lang/ja/lang.php +++ b/lib/plugins/usermanager/lang/ja/lang.php @@ -6,6 +6,7 @@ * @author Ikuo Obataya * @author Daniel Dupriest * @author Kazutaka Miyasaka + * @author Taisuke Shimamoto */ $lang['menu'] = 'ユーザー管理'; $lang['noauth'] = '（ユーザー認証が無効です）'; -- cgit v1.2.3 From a4ffa98be918b511b2a80d03d5ce147dc1cef0b7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 23 Mar 2012 23:31:53 +0000 Subject: updated template.info.txt --- lib/tpl/dokuwiki/template.info.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt index e049270ee..3f904c6c8 100644 --- a/lib/tpl/dokuwiki/template.info.txt +++ b/lib/tpl/dokuwiki/template.info.txt @@ -1,7 +1,7 @@ base dokuwiki author Anika Henke, Andreas Gohr, Clarence Lee email andi@splitbrain.org -date 2012-01-30 +date 2012-03-24 name DokuWiki Template -desc DokuWiki's default template 2012 -url http://www.dokuwiki.org/template +desc DokuWiki's default template since 2012 +url http://www.dokuwiki.org/template:dokuwiki -- cgit v1.2.3 From 57fc5eddedf96b52f76700b70686359a594b2031 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 23 Mar 2012 23:58:44 +0000 Subject: removed a few comments in new template files --- lib/tpl/dokuwiki/detail.php | 9 +-------- lib/tpl/dokuwiki/main.php | 15 ++++----------- lib/tpl/dokuwiki/tpl_header.php | 7 ++----- 3 files changed, 7 insertions(+), 24 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 287827253..90ae492bd 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -30,14 +30,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show - - - - are added to make it possible to e.g. style a page differently if it's in edit mode, - see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> -
@@ -53,7 +46,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
- + - - - - are added to make it possible to e.g. style a page differently if it's in edit mode, - see http://www.dokuwiki.org/devel:action_modes for a list of action modes */ ?> -
@@ -45,9 +38,9 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
- + - +
@@ -61,12 +54,12 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show - +
-
+
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 91d8876b9..9a391aedc 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -1,7 +1,7 @@
- +
@@ -12,7 +12,7 @@

    - would be: tpl_action('edit',0,'li') */ if ($_SERVER['REMOTE_USER']) { echo '
  • '; tpl_userinfo(); /* 'Logged in as ...' */ @@ -52,7 +50,6 @@

    -
    -- cgit v1.2.3 From 80cc5b3efdcbdce9ccef38b5936973387b37828a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 24 Mar 2012 00:03:08 +0000 Subject: removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950) --- lib/tpl/dokuwiki/css/basic.css | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index e1cd1d9a2..ae9be499e 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -104,7 +104,6 @@ div { ul, ol { padding: 0 0 0 1.5em; - overflow: hidden; } li, dd { -- cgit v1.2.3 From 3ce88cce949483f963c881c3c868bd49c4d989c0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 24 Mar 2012 00:24:47 +0000 Subject: added explanation to todo in _forms.css --- lib/tpl/dokuwiki/css/_forms.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index 39a1ec5d3..0c82f5f8c 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -1,5 +1,5 @@ -/* TODO */ +/* TODO: this file is not up to the best standards and will be fixed after an overhaul of the form code */ /** * This file provides styles for forms in general and specifically -- cgit v1.2.3 From e601443821436ad3b9cd9b8ec9a478a50d77d3e0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 24 Mar 2012 00:32:53 +0000 Subject: wrapped X-UA-Compatible meta tag with conditional comments --- lib/tpl/dokuwiki/detail.php | 2 +- lib/tpl/dokuwiki/main.php | 2 +- lib/tpl/dokuwiki/mediamanager.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 90ae492bd..baa454edc 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -18,7 +18,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show lang="" dir=""> - + <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> [<?php echo strip_tags($conf['title'])?>] diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 44a8d4a19..9bc221711 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -18,7 +18,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> + <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]--> <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php index d7d88f936..0651b448d 100644 --- a/lib/tpl/dokuwiki/mediamanager.php +++ b/lib/tpl/dokuwiki/mediamanager.php @@ -15,7 +15,7 @@ if (!defined('DOKU_INC')) die(); lang="" dir="" class="popup"> - + <?php echo hsc($lang['mediaselect'])?> [<?php echo strip_tags($conf['title'])?>] -- cgit v1.2.3 From 5e984c56d67aafecf27d7fddd922484a0318c9db Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sat, 24 Mar 2012 11:51:44 +0000 Subject: added accidentally removed '<?php' back in (was in 57fc5edd) --- lib/tpl/dokuwiki/tpl_header.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 9a391aedc..35b3cf636 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -32,6 +32,7 @@ <div id="dokuwiki__usertools"> <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3> <ul> + <?php if ($_SERVER['REMOTE_USER']) { echo '<li class="user">'; tpl_userinfo(); /* 'Logged in as ...' */ -- cgit v1.2.3 From ea62d5316150a9477d962aff311f9c6f64f68db7 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sat, 24 Mar 2012 17:44:25 +0000 Subject: deleted very old (and unused) images --- lib/images/arrow_down.gif | Bin 273 -> 0 bytes lib/images/arrow_up.gif | Bin 274 -> 0 bytes lib/images/at.gif | Bin 57 -> 0 bytes lib/images/close.png | Bin 137 -> 0 bytes lib/images/del.png | Bin 355 -> 0 bytes lib/images/edit.gif | Bin 142 -> 0 bytes lib/images/icon-file.png | Bin 3363 -> 0 bytes lib/images/icon-thumb.png | Bin 969 -> 0 bytes lib/images/list-minus.gif | Bin 64 -> 0 bytes lib/images/list-plus.gif | Bin 67 -> 0 bytes lib/images/pencil.png | Bin 391 -> 0 bytes 11 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 lib/images/arrow_down.gif delete mode 100644 lib/images/arrow_up.gif delete mode 100644 lib/images/at.gif delete mode 100644 lib/images/close.png delete mode 100644 lib/images/del.png delete mode 100644 lib/images/edit.gif delete mode 100644 lib/images/icon-file.png delete mode 100644 lib/images/icon-thumb.png delete mode 100644 lib/images/list-minus.gif delete mode 100644 lib/images/list-plus.gif delete mode 100644 lib/images/pencil.png (limited to 'lib') diff --git a/lib/images/arrow_down.gif b/lib/images/arrow_down.gif deleted file mode 100644 index ff13b9585..000000000 Binary files a/lib/images/arrow_down.gif and /dev/null differ diff --git a/lib/images/arrow_up.gif b/lib/images/arrow_up.gif deleted file mode 100644 index d491c18db..000000000 Binary files a/lib/images/arrow_up.gif and /dev/null differ diff --git a/lib/images/at.gif b/lib/images/at.gif deleted file mode 100644 index 8bdf40d54..000000000 Binary files a/lib/images/at.gif and /dev/null differ diff --git a/lib/images/close.png b/lib/images/close.png deleted file mode 100644 index 4ccef0603..000000000 Binary files a/lib/images/close.png and /dev/null differ diff --git a/lib/images/del.png b/lib/images/del.png deleted file mode 100644 index e59ded55f..000000000 Binary files a/lib/images/del.png and /dev/null differ diff --git a/lib/images/edit.gif b/lib/images/edit.gif deleted file mode 100644 index a2a23de7b..000000000 Binary files a/lib/images/edit.gif and /dev/null differ diff --git a/lib/images/icon-file.png b/lib/images/icon-file.png deleted file mode 100644 index d350c8c31..000000000 Binary files a/lib/images/icon-file.png and /dev/null differ diff --git a/lib/images/icon-thumb.png b/lib/images/icon-thumb.png deleted file mode 100644 index ccc7a101d..000000000 Binary files a/lib/images/icon-thumb.png and /dev/null differ diff --git a/lib/images/list-minus.gif b/lib/images/list-minus.gif deleted file mode 100644 index 36902f159..000000000 Binary files a/lib/images/list-minus.gif and /dev/null differ diff --git a/lib/images/list-plus.gif b/lib/images/list-plus.gif deleted file mode 100644 index adc3fac8a..000000000 Binary files a/lib/images/list-plus.gif and /dev/null differ diff --git a/lib/images/pencil.png b/lib/images/pencil.png deleted file mode 100644 index 78142b61e..000000000 Binary files a/lib/images/pencil.png and /dev/null differ -- cgit v1.2.3 From 42ff673048d169bcbec5e4bb17619d66e6f6f61d Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 25 Mar 2012 14:41:39 +0100 Subject: fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447) * removed all occurrences of '-moz-linear-gradient' * added SVG as fallback for Firefox, IE9 and other browsers to page background and buttons --- lib/tpl/dokuwiki/css/basic.css | 13 ++++++++----- lib/tpl/dokuwiki/css/content.css | 2 +- lib/tpl/dokuwiki/images/page-background.svg | 8 ++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 lib/tpl/dokuwiki/images/page-background.svg (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index ae9be499e..dce632b9a 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -16,7 +16,8 @@ html, body { color: __text__; background-color: __background_site__; - background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: url(images/page-background.svg); + /*background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); see FS#2447*/ background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); background-image: -o-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); background-image: -ms-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); @@ -333,7 +334,8 @@ button, .qq-upload-button { color: #333; background-color: #eee; - background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+); + /*background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); see FS#2447*/ background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); @@ -359,10 +361,11 @@ button:focus, .qq-upload-button:hover { border-color: #999; background-color: #ddd; - background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+); + /*background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); see FS#2447*/ background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); - background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); - background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); + background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); } diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index ca2294950..7cb7c6edf 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -119,7 +119,7 @@ .dokuwiki dl.code dt, .dokuwiki dl.file dt { background-color: __background_alt__; - background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); + /*background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); see FS#2447 */ background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%); background: -o-linear-gradient( top, __background__ 0%, __background_alt__ 100%); background: -ms-linear-gradient( top, __background__ 0%, __background_alt__ 100%); diff --git a/lib/tpl/dokuwiki/images/page-background.svg b/lib/tpl/dokuwiki/images/page-background.svg new file mode 100644 index 000000000..086341ddf --- /dev/null +++ b/lib/tpl/dokuwiki/images/page-background.svg @@ -0,0 +1,8 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%"> + <linearGradient id="g" x1="0%" y1="0%" x2="0%" y2="100%"> + <stop offset="0" stop-color="#dddddd" /> + <stop offset="0.1" stop-color="#eeeeee" /> + <stop offset="0.4" stop-color="#fbfaf9" /> + </linearGradient> + <rect x="0" y="0" width="100%" height="100%" fill="url(#g)" /> +</svg> \ No newline at end of file -- cgit v1.2.3 From 9d421a3d3c1411a47d49f43cfc1f798f6a96ab8c Mon Sep 17 00:00:00 2001 From: Erial Krale <erial2@gmail.com> Date: Mon, 26 Mar 2012 20:44:07 +0200 Subject: Korean language update --- lib/plugins/config/lang/ko/lang.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 55207a37a..82863b684 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -95,6 +95,8 @@ $lang['sneaky_index'] = '기본적으로, DokuWiki는 색인 목록에 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.'; $lang['auth_security_timeout'] = '인증 보안 초과 시간(초)'; $lang['securecookie'] = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화 하고 위키 페이지는 그렇지 않은경우 꺼야 합니다.'; +$lang['xmlrpc'] = 'XML-RPC 인터페이스 지원/무시'; +$lang['xmlrpcuser'] = '주어진 그룹이나 유저들에게만 XML-RPC접근을 허락하려면 컴마로 구분하여 적으세요. 비어두면 모두에게 허용됩니다.'; $lang['updatecheck'] = '업데이트와 보안 문제를 검사(DokuWiki를 update.dokuwiki.org에 연결해야 합니다.)'; $lang['userewrite'] = 'URL rewriting기능 사용'; $lang['useslash'] = 'URL에서 네임스페이스 구분자로 슬래쉬 문자 사용'; @@ -135,6 +137,7 @@ $lang['rss_content'] = 'XML feed 항목들에 표시되는 내용은?' $lang['rss_update'] = 'XML feed 갱신 주기(초)'; $lang['recent_days'] = '최근 바뀐 페이지 기준 시간(날짜)'; $lang['rss_show_summary'] = 'XML feed 제목에서 요약정보 보여주기'; +$lang['rss_media'] = '어떤 규격으로 XML 피드를 받아보시겠습니까?'; $lang['target____wiki'] = '내부 링크들에 대한 타겟 윈도우 '; $lang['target____interwiki'] = 'InterWiki 링크들에 대한 타겟 윈도우'; $lang['target____extern'] = '외부 링크들에 대한 타겟 윈도우'; -- cgit v1.2.3 From 51b120f658e9d28fa503e2adf78771e1abfc4d35 Mon Sep 17 00:00:00 2001 From: Kiril LastName <neohidra@gmail.com> Date: Tue, 3 Apr 2012 22:58:41 +0300 Subject: BG: language update --- lib/plugins/config/lang/bg/lang.php | 74 +++++++++++++++++++++++++++++++++---- 1 file changed, 66 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php index 25f1da91a..0bc25a8e5 100644 --- a/lib/plugins/config/lang/bg/lang.php +++ b/lib/plugins/config/lang/bg/lang.php @@ -7,19 +7,28 @@ * @author Viktor Usunov <usun0v@mail.bg> * @author Kiril <neohidra@gmail.com> */ + +// for admin plugins, the menu prompt to be displayed in the admin menu +// if set here, the plugin doesn't need to override the getMenuText() method $lang['menu'] = 'Настройки'; + $lang['error'] = 'Обновяването на настройките не е възможно, поради невалидна стойност, моля, прегледайте промените си и пробвайте отново. -<br />Неверните стойности ще бъдат обградени с червена рамка.'; + <br />Неверните стойности ще бъдат обградени с червена рамка.'; $lang['updated'] = 'Обновяването на настройките е успешно.'; $lang['nochoice'] = '(няма друг възможен избор)'; -$lang['locked'] = 'Обновяването на файла с настройките не е възможно, ако това не е нарочно, проверете,<br /> дали името на локалния файл с настройки и правата са верни.'; -$lang['danger'] = 'Внимание: промяна на опцията може да направи wiki-то и менюто за настройване недостъпни.'; +$lang['locked'] = 'Обновяването на файла с настройките не е възможно, ако това не е нарочно, проверете,<br /> + дали името на локалния файл с настройки и правата са верни.'; +$lang['danger'] = 'Внимание: промяна на опцията може да направи Wiki-то и менюто за настройване недостъпни.'; $lang['warning'] = 'Предупреждение: промяна на опцията може предизвика нежелани последици.'; $lang['security'] = 'Предупреждение: промяна на опцията може да представлява риск за сигурността.'; -$lang['_configuration_manager'] = 'Диспечер на настройките'; + +/* --- Config Setting Headers --- */ +$lang['_configuration_manager'] = 'Диспечер на настройките'; //same as heading in intro.txt $lang['_header_dokuwiki'] = 'Настройки на DokuWiki'; $lang['_header_plugin'] = 'Настройки на приставки'; $lang['_header_template'] = 'Настройки на шаблони'; + +/* --- Config Setting Groups --- */ $lang['_header_undefined'] = 'Неопределени настройки'; $lang['_basic'] = 'Основни настройки'; $lang['_display'] = 'Настройки за изобразяване'; @@ -30,11 +39,20 @@ $lang['_links'] = 'Настройки на препратките $lang['_media'] = 'Настройки на медията'; $lang['_advanced'] = 'Допълнителни настройки'; $lang['_network'] = 'Мрежови настройки'; +// The settings group name for plugins and templates can be set with +// plugin_settings_name and template_settings_name respectively. If one +// of these lang properties is not set, the group name will be generated +// from the plugin or template name and the localized suffix. $lang['_plugin_sufix'] = ' - настройки на приставката'; $lang['_template_sufix'] = ' - настройки на шаблона'; + +/* --- Undefined Setting Messages --- */ $lang['_msg_setting_undefined'] = 'Няма метаданни за настройките.'; $lang['_msg_setting_no_class'] = 'Няма клас настройки.'; $lang['_msg_setting_no_default'] = 'Няма стандартна стойност.'; + +/* -------------------- Config Options --------------------------- */ + $lang['fmode'] = 'Режим (права) за създаване на файлове'; $lang['dmode'] = 'Режим (права) за създаване на директории'; $lang['lang'] = 'Език'; @@ -45,6 +63,8 @@ $lang['cookiedir'] = 'Път за бисквитките. Остав $lang['start'] = 'Име на началната страница'; $lang['title'] = 'Име на Wiki-то'; $lang['template'] = 'Шаблон'; +$lang['tagline'] = 'Подзаглавие - изобразява се под името на Wiki страницата (ако се поддържа от шаблона)'; +$lang['sidebar'] = 'Име на страницата за страничната лента (ако се поддържа от шаблона). Ако оставите полето празно лентата ще бъде изключена'; $lang['license'] = 'Под какъв лиценз да бъде публикувано съдържанието?'; $lang['fullpath'] = 'Показване на пълния път до страниците в долния колонтитул.'; $lang['recent'] = 'Скорошни промени'; @@ -66,12 +86,15 @@ $lang['refcheck'] = 'Проверка за препратка къ $lang['refshow'] = 'Брой на показваните медийни препратки'; $lang['allowdebug'] = 'Включване на режи debug - <b>изключете, ако не е нужен!</b>'; $lang['mediarevisions'] = 'Да се пазят ли стари версии на качените файлове (Mediarevisions)?'; + $lang['usewordblock'] = 'Блокиране на SPAM въз основа на на списък от думи'; $lang['indexdelay'] = 'Забавяне преди индексиране (сек)'; $lang['relnofollow'] = 'Ползване на rel="nofollow" за външни препратки'; $lang['mailguard'] = 'Промяна на адресите на ел. поща (във форма непозволяваща пращането на SPAM)'; $lang['iexssprotect'] = 'Проверяване на качените файлове за вероятен зловреден JavaScript и HTML код'; $lang['showuseras'] = 'Какво да се показва за потребителя, който последно е променил страницата'; + +/* Authentication Options */ $lang['useacl'] = 'Ползване на списъци за достъп'; $lang['autopasswd'] = 'Автоматично генериране на пароли, на нови потребители и пращане по пощата'; $lang['authtype'] = 'Метод за удостоверяване'; @@ -87,8 +110,11 @@ $lang['disableactions_wikicode'] = 'Преглед на кода/Експорт $lang['disableactions_other'] = 'Други действия (разделени със запетая)'; $lang['sneaky_index'] = 'Стандартно DokuWiki ще показва всички именни пространства в индекса. Опцията скрива тези, за които потребителят няма права за четене. Това може да доведе и до скриване на иначе достъпни подименни пространства. С определени настройки на списъците за контрол на достъпа (ACL) може да направи индекса неизползваем. '; $lang['auth_security_timeout'] = 'Автоматично проверяване на удостоверяването всеки (сек)'; -$lang['securecookie'] = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL. -'; +$lang['securecookie'] = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL.'; +$lang['remote'] = 'Включване на системата за отдалечен API достъп. Това ще позволи на приложения да се свързват с DokuWiki чрез XML-RPC или друг механизъм.'; +$lang['remoteuser'] = 'Ограничаване на отдалечения API достъп - активиране само за следните групи и потребители (отделени със запетая). Ако оставите полето празно всеки ще има достъп достъп.'; + +/* Advanced Options */ $lang['updatecheck'] = 'Проверяване за за нови версии и предупреждения за сигурността? Необходимо е Dokiwiki да може да се свързва със update.dokuwiki.org за тази функционалност.'; $lang['userewrite'] = 'Ползване на nice URL адреси'; $lang['useslash'] = 'Ползване на наклонена черта за разделител на именните пространства в URL'; @@ -118,72 +144,104 @@ $lang['send404'] = 'Пращане на "HTTP 404/Page Not Found" $lang['sitemap'] = 'Генериране на Google sitemap (дни)'; $lang['broken_iua'] = 'Отметнете, ако ignore_user_abort функцията не работи. Може да попречи на търсенето в страниците. Знае се, че комбинацията IIS+PHP/CGI е лоша. Вижте <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Грешка 852</a> за повече информация.'; $lang['xsendfile'] = 'Ползване на Х-Sendfile header, за да може уебсървъра да дава статични файлове? Вашият уебсървър трябва да го поддържа.'; -$lang['renderer_xhtml'] = 'Представяне на основните изходни данни (xhtml) от wiki-то с'; +$lang['renderer_xhtml'] = 'Представяне на основните изходни данни (xhtml) от Wiki-то с'; $lang['renderer__core'] = '%s (ядрото на DokuWiki)'; $lang['renderer__plugin'] = '%s (приставка)'; $lang['rememberme'] = 'Ползване на постоянни бисквитки за вписване (за функцията "Запомни ме")'; + $lang['rss_type'] = 'Тип на XML емисията'; $lang['rss_linkto'] = 'XML емисията препраща към'; $lang['rss_content'] = 'Какво да показват елементите на XML емисията?'; $lang['rss_update'] = 'Интервал на актуализиране на XML емисията (сек)'; $lang['recent_days'] = 'Колко от скорошните промени да се пазят (дни)'; $lang['rss_show_summary'] = 'Показване на обобщение в заглавието на XML емисията'; +$lang['rss_media'] = 'Кой тип промени да се включват в XML мисията?'; + +/* Target options */ $lang['target____wiki'] = 'Прозорец за вътрешни препратки'; -$lang['target____interwiki'] = 'Прозорец за препратки в wiki-то'; +$lang['target____interwiki'] = 'Прозорец за препратки към други Wiki сайтове'; $lang['target____extern'] = 'Прозорец за външни препратки'; $lang['target____media'] = 'Прозорец за медийни препратки'; $lang['target____windows'] = 'Прозорец за препратки към Windows'; + +/* Proxy Options */ $lang['proxy____host'] = 'Име на прокси сървър'; $lang['proxy____port'] = 'Порт за проксито'; $lang['proxy____user'] = 'Потребител за проксито'; $lang['proxy____pass'] = 'Парола за проксито'; $lang['proxy____ssl'] = 'Ползване на SSL при свързване с проксито'; $lang['proxy____except'] = 'Регулярен израз определящ за кои URL адреси да не се ползва прокси сървър.'; + +/* Safemode Hack */ $lang['safemodehack'] = 'Ползване на хака safemode'; $lang['ftp____host'] = 'FTP сървър за хака safemode'; $lang['ftp____port'] = 'FTP порт за хака safemode'; $lang['ftp____user'] = 'FTP потребител за хака safemode'; $lang['ftp____pass'] = 'FTP парола за хака safemode'; $lang['ftp____root'] = 'FTP главна директория за хака safemode'; + $lang['license_o_'] = 'Нищо не е избрано'; + +/* typography options */ $lang['typography_o_0'] = 'без'; $lang['typography_o_1'] = 'с изключение на единични кавички'; $lang['typography_o_2'] = 'включително единични кавички (не винаги работи)'; + +/* userewrite options */ $lang['userewrite_o_0'] = 'без'; $lang['userewrite_o_1'] = 'файлът .htaccess'; $lang['userewrite_o_2'] = 'вътрешно от DokuWiki '; + +/* deaccent options */ $lang['deaccent_o_0'] = 'изключено'; $lang['deaccent_o_1'] = 'премахване на акценти'; $lang['deaccent_o_2'] = 'транслитерация'; + +/* gdlib options */ $lang['gdlib_o_0'] = 'GD Lib не е достъпна'; $lang['gdlib_o_1'] = 'Версия 1.x'; $lang['gdlib_o_2'] = 'Автоматично разпознаване'; + +/* rss_type options */ $lang['rss_type_o_rss'] = 'RSS версия 0.91'; $lang['rss_type_o_rss1'] = 'RSS версия 1.0'; $lang['rss_type_o_rss2'] = 'RSS версия 2.0'; $lang['rss_type_o_atom'] = 'Atom версия 0.3'; $lang['rss_type_o_atom1'] = 'Atom версия 1.0'; + +/* rss_content options */ $lang['rss_content_o_abstract'] = 'Извлечение'; $lang['rss_content_o_diff'] = 'Обединени разлики'; $lang['rss_content_o_htmldiff'] = 'Таблица с разликите в HTML формат'; $lang['rss_content_o_html'] = 'Цялото съдържание на HTML страницата'; + +/* rss_linkto options */ $lang['rss_linkto_o_diff'] = 'изглед на разликите'; $lang['rss_linkto_o_page'] = 'променената страница'; $lang['rss_linkto_o_rev'] = 'списък на версиите'; $lang['rss_linkto_o_current'] = 'текущата страница'; + +/* compression options */ $lang['compression_o_0'] = 'без'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; + +/* xsendfile header */ $lang['xsendfile_o_0'] = 'не използвайте'; $lang['xsendfile_o_1'] = 'Специфичен lighttpd header (преди версия 1.5)'; $lang['xsendfile_o_2'] = 'Стандартен X-Sendfile header'; $lang['xsendfile_o_3'] = 'Специфичен Nginx X-Accel-Redirect header за пренасочване'; + +/* Display user info */ $lang['showuseras_o_loginname'] = 'Име за вписване'; $lang['showuseras_o_username'] = 'Пълно потребителско име'; $lang['showuseras_o_email'] = 'Ел, поща (променени според настройките на mailguard)'; $lang['showuseras_o_email_link'] = 'Ел. поща под формата на връзка тип mailto:'; + +/* useheading options */ $lang['useheading_o_0'] = 'Никога'; $lang['useheading_o_navigation'] = 'Само за навигация'; $lang['useheading_o_content'] = 'Само за съдържанието на Wiki-то'; $lang['useheading_o_1'] = 'Винаги'; + $lang['readdircache'] = 'Максимален период за съхраняване кеша на readdir (сек)'; -- cgit v1.2.3 From e5d4768d27336a3af2fc36af663d21a1a57d0ee1 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sat, 7 Apr 2012 20:20:22 +0200 Subject: added tpl_includeFile() to core --- lib/tpl/dokuwiki/detail.php | 7 +++---- lib/tpl/dokuwiki/main.php | 11 +++++------ lib/tpl/dokuwiki/mediamanager.php | 3 +-- lib/tpl/dokuwiki/tpl_footer.php | 2 +- lib/tpl/dokuwiki/tpl_header.php | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index baa454edc..a3516a7ed 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -9,7 +9,6 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" @@ -26,7 +25,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php tpl_metaheaders()?> <meta name="viewport" content="width=device-width,initial-scale=1" /> <?php echo tpl_favicon(array('favicon', 'mobile')) ?> - <?php _tpl_include('meta.html') ?> + <?php tpl_includeFile('meta.html') ?> </head> <body> @@ -47,7 +46,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <div class="page group"> <?php tpl_flush() ?> - <?php _tpl_include('pageheader.html') ?> + <?php tpl_includeFile('pageheader.html') ?> <!-- detail start --> <?php if($ERROR): @@ -95,7 +94,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php endif; ?> </div> <!-- detail stop --> - <?php _tpl_include('pagefooter.html') ?> + <?php tpl_includeFile('pagefooter.html') ?> <?php tpl_flush() ?> <?php /* doesn't make sense like this; @todo: maybe add tpl_imginfo()? diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 9bc221711..57c94f174 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -9,7 +9,6 @@ */ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" @@ -23,7 +22,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php tpl_metaheaders() ?> <meta name="viewport" content="width=device-width,initial-scale=1" /> <?php echo tpl_favicon(array('favicon', 'mobile')) ?> - <?php _tpl_include('meta.html') ?> + <?php tpl_includeFile('meta.html') ?> </head> <body> @@ -39,9 +38,9 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <!-- ********** ASIDE ********** --> <div id="dokuwiki__aside"><div class="pad include group"> <?php tpl_flush() ?> - <?php _tpl_include('sidebarheader.html') ?> + <?php tpl_includeFile('sidebarheader.html') ?> <?php tpl_include_page($conf['sidebar']) ?> - <?php _tpl_include('sidebarfooter.html') ?> + <?php tpl_includeFile('sidebarfooter.html') ?> </div></div><!-- /aside --> <?php endif; ?> @@ -52,11 +51,11 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <div class="page group"> <?php tpl_flush() ?> - <?php _tpl_include('pageheader.html') ?> + <?php tpl_includeFile('pageheader.html') ?> <!-- wikipage start --> <?php tpl_content() ?> <!-- wikipage stop --> - <?php _tpl_include('pagefooter.html') ?> + <?php tpl_includeFile('pagefooter.html') ?> </div> <div class="docInfo"><?php tpl_pageinfo() ?></div> diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php index 0651b448d..1f3b9661b 100644 --- a/lib/tpl/dokuwiki/mediamanager.php +++ b/lib/tpl/dokuwiki/mediamanager.php @@ -7,7 +7,6 @@ */ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -23,7 +22,7 @@ if (!defined('DOKU_INC')) die(); <?php tpl_metaheaders()?> <meta name="viewport" content="width=device-width,initial-scale=1" /> <?php echo tpl_favicon(array('favicon', 'mobile')) ?> - <?php _tpl_include('meta.html') ?> + <?php tpl_includeFile('meta.html') ?> </head> <body> diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php index 6b46234d6..41ddabda2 100644 --- a/lib/tpl/dokuwiki/tpl_footer.php +++ b/lib/tpl/dokuwiki/tpl_footer.php @@ -20,4 +20,4 @@ </div> </div></div><!-- /footer --> -<?php _tpl_include('footer.html') ?> +<?php tpl_includeFile('footer.html') ?> diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 35b3cf636..1d2517ee1 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -2,7 +2,7 @@ <div id="dokuwiki__header"><div class="pad group"> <?php html_msgarea() ?> - <?php _tpl_include('header.html') ?> + <?php tpl_includeFile('header.html') ?> <div class="headings group"> <ul class="a11y skip"> -- cgit v1.2.3 From 0bf9967d124e9bd2b91b4f580ac99e1e981e36b9 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sat, 7 Apr 2012 20:21:06 +0200 Subject: removed obsolete template file --- lib/tpl/dokuwiki/tpl_functions.php | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 lib/tpl/dokuwiki/tpl_functions.php (limited to 'lib') diff --git a/lib/tpl/dokuwiki/tpl_functions.php b/lib/tpl/dokuwiki/tpl_functions.php deleted file mode 100644 index c024f33e7..000000000 --- a/lib/tpl/dokuwiki/tpl_functions.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php -/** - * Template Functions - * - * This file provides template specific custom functions that are - * not provided by the DokuWiki core. - * It is common practice to start each function with an underscore - * to make sure it won't interfere with future core functions. - */ - -// must be run from within DokuWiki -if (!defined('DOKU_INC')) die(); - -/* @todo: add this function to the core and delete this file */ - -/** - * Include additional html file from conf directory if it exists, otherwise use - * file in the template's root directory. - * - * @author Anika Henke <anika@selfthinker.org> - */ -function _tpl_include($fn) { - $confFile = DOKU_CONF.$fn; - $tplFile = dirname(__FILE__).'/'.$fn; - - if (file_exists($confFile)) - include($confFile); - else if (file_exists($tplFile)) - include($tplFile); -} -- cgit v1.2.3 From dbd59867496d5e3c5d37e9c3852db29a6a2370c4 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sat, 7 Apr 2012 22:24:18 +0100 Subject: removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary --- lib/tpl/dokuwiki/css/basic.css | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index dce632b9a..c8e0c435e 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -17,11 +17,7 @@ body { color: __text__; background-color: __background_site__; background-image: url(images/page-background.svg); - /*background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); see FS#2447*/ - background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: -o-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: -ms-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); background-size: 1px 10em; background-repeat: repeat-x; margin: 0; @@ -335,11 +331,7 @@ button, color: #333; background-color: #eee; background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+); - /*background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); see FS#2447*/ - background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); border: 1px solid #ccc; border-radius: 2px; padding: .1em .5em; @@ -361,12 +353,8 @@ button:focus, .qq-upload-button:hover { border-color: #999; background-color: #ddd; - background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+); - /*background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); see FS#2447*/ - background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); - background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); - background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); - background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+); + background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); } input::-moz-focus-inner, -- cgit v1.2.3 From 16cc7ed7a97c7525c006a0355bd0c1277c256cab Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 8 Apr 2012 16:20:09 +0100 Subject: removed names from footnotes and removed anchors from headings altogether --- lib/tpl/default/design.css | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index a94f814aa..6e249372b 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -265,11 +265,6 @@ div.dokuwiki a:active { text-decoration: underline; } -div.dokuwiki h1 a, -div.dokuwiki h2 a, -div.dokuwiki h3 a, -div.dokuwiki h4 a, -div.dokuwiki h5 a, div.dokuwiki a.nolink { color: __text__ !important; text-decoration: none !important; -- cgit v1.2.3 From 940db3a35fd0feb1f5540a789e79c4a3e192c115 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 8 Apr 2012 16:28:39 +0100 Subject: use abbr instead of deprecated acronym --- lib/tpl/default/design.css | 2 +- lib/tpl/default/print.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 6e249372b..1124cfe92 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -382,7 +382,7 @@ div.dokuwiki img.middle { vertical-align: middle; } -div.dokuwiki acronym { +div.dokuwiki abbr { cursor: help; border-bottom: 1px dotted __text__; } diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css index 45b60aad2..4387dc4bf 100644 --- a/lib/tpl/default/print.css +++ b/lib/tpl/default/print.css @@ -200,7 +200,7 @@ a.fn_bot { font-weight: bold; } -acronym { +abbr { border: 0; } -- cgit v1.2.3 From 8e38227f7e8647e3f99b6ce1cbaae4041bd959df Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 8 Apr 2012 17:45:05 +0100 Subject: renamed smiley image class to 'icon' (FS#1970) --- lib/tpl/default/design.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 1124cfe92..9d2cc1844 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -378,7 +378,7 @@ div.dokuwiki img.mediacenter { } /* smileys */ -div.dokuwiki img.middle { +div.dokuwiki img.icon { vertical-align: middle; } -- cgit v1.2.3 From 0607bfee2c4334d31415541abb89026e77c7628a Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 8 Apr 2012 20:01:24 +0100 Subject: added some wanting classes --- lib/tpl/default/_mediamanager.css | 6 +++--- lib/tpl/dokuwiki/css/_edit.css | 27 ++++++++++++++------------ lib/tpl/dokuwiki/css/_recent.css | 41 +++++++++++++-------------------------- lib/tpl/dokuwiki/css/mobile.css | 3 +-- lib/tpl/dokuwiki/css/rtl.css | 14 ++++++------- 5 files changed, 39 insertions(+), 52 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 68fa2e97f..8c605f69a 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -343,18 +343,18 @@ /*____________ Revisions form ____________*/ -#mediamanager__page #page__revisions ul { +#mediamanager__page form.changes ul { margin-left: 10px; list-style-type: none; } -#mediamanager__page #page__revisions ul li div.li div { +#mediamanager__page form.changes ul li div.li div { font-size: 90%; color: __text_neu__; padding-left: 18px; } -#mediamanager__page #page__revisions ul li div.li input { +#mediamanager__page form.changes ul li div.li input { position: relative; top: 1px; } diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css index 5a3952c90..0a5106575 100644 --- a/lib/tpl/dokuwiki/css/_edit.css +++ b/lib/tpl/dokuwiki/css/_edit.css @@ -6,18 +6,21 @@ /* edit view ********************************************************************/ +.dokuwiki div.editBox { +} + /*____________ toolbar ____________*/ .dokuwiki div.toolbar { margin-bottom: .5em; overflow: hidden; } -.dokuwiki div.toolbar #draft__status { +#draft__status { float: right; color: __text_alt__; background-color: inherit; } -.dokuwiki div.toolbar #tool__bar { +#tool__bar { float: left; } @@ -55,42 +58,42 @@ div.picker button.toolbutton { /*____________ below the textarea ____________*/ -.dokuwiki #wiki__editbar { +.dokuwiki div.editBar { overflow: hidden; margin-bottom: .5em; } /* size and wrap controls */ -.dokuwiki #wiki__editbar #size__ctl { +#size__ctl { float: right; } -.dokuwiki #wiki__editbar #size__ctl img { +#size__ctl img { cursor: pointer; } /* edit buttons */ -.dokuwiki #wiki__editbar .editButtons { +.dokuwiki .editBar .editButtons { display: inline; margin-right: 1em; } -.dokuwiki #wiki__editbar .editButtons input { +.dokuwiki .editBar .editButtons input { } /* summary input and minor changes checkbox */ -.dokuwiki #wiki__editbar .summary { +.dokuwiki .editBar .summary { display: inline; } -.dokuwiki #wiki__editbar .summary label { +.dokuwiki .editBar .summary label { vertical-align: middle; white-space: nowrap; } -.dokuwiki #wiki__editbar .summary label span { +.dokuwiki .editBar .summary label span { vertical-align: middle; } -.dokuwiki #wiki__editbar .summary input { +.dokuwiki .editBar .summary input { } /* change background colour if summary is missing */ -.dokuwiki #wiki__editbar .summary input.missing { +.dokuwiki .editBar .summary input.missing { color: __text__; background-color: #ffcccc; } diff --git a/lib/tpl/dokuwiki/css/_recent.css b/lib/tpl/dokuwiki/css/_recent.css index 68f0e5826..426e06fb4 100644 --- a/lib/tpl/dokuwiki/css/_recent.css +++ b/lib/tpl/dokuwiki/css/_recent.css @@ -5,54 +5,41 @@ /*____________ list of revisions / recent changes ____________*/ -/* select type of revisions (media/pages), should have a class on it's own, but hasn't */ -.dokuwiki #dw__recent label { +/* select type of revisions (media/pages) */ +.dokuwiki .changeType { margin-bottom: .5em; - display: block; } -.dokuwiki #dw__recent ul li, -.dokuwiki #page__revisions ul li { +.dokuwiki form.changes ul li { list-style: none; margin-left: 0; } -.dokuwiki #dw__recent ul li span, -.dokuwiki #dw__recent ul li a, -.dokuwiki #page__revisions ul li span, -.dokuwiki #page__revisions ul li a { +.dokuwiki form.changes ul li span, +.dokuwiki form.changes ul li a { vertical-align: middle; } -.dokuwiki #dw__recent ul li span.user a, -.dokuwiki #page__revisions ul li span.user a { +.dokuwiki form.changes ul li span.user a { vertical-align: bottom; } -.dokuwiki #dw__recent ul li.minor, -.dokuwiki #page__revisions ul li.minor { +.dokuwiki form.changes ul li.minor { opacity: .7; } -.dokuwiki #dw__recent li span.date, -.dokuwiki #page__revisions li span.date { +.dokuwiki form.changes li span.date { } -.dokuwiki #dw__recent li a.diff_link, -.dokuwiki #page__revisions li a.diff_link { +.dokuwiki form.changes li a.diff_link { vertical-align: baseline; } -.dokuwiki #dw__recent li a.revisions_link, -.dokuwiki #page__revisions li a.revisions_link { +.dokuwiki form.changes li a.revisions_link { vertical-align: baseline; } -.dokuwiki #dw__recent li a.wikilink1, -.dokuwiki #dw__recent li a.wikilink2, -.dokuwiki #page__revisions li a.wikilink1, -.dokuwiki #page__revisions li a.wikilink2 { +.dokuwiki form.changes li a.wikilink1, +.dokuwiki form.changes li a.wikilink2 { } -.dokuwiki #dw__recent li span.sum, -.dokuwiki #page__revisions li span.sum { +.dokuwiki form.changes li span.sum { font-weight: bold; } -.dokuwiki #dw__recent li span.user, -.dokuwiki #page__revisions li span.user { +.dokuwiki form.changes li span.user { } diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index e1052f437..b923c811c 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -65,8 +65,7 @@ } /* _recent */ -.dokuwiki #dw__recent ul, -.dokuwiki #page__revisions ul { +.dokuwiki form.changes ul { padding-left: 0; } diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css index e0f81bb21..f36591548 100644 --- a/lib/tpl/dokuwiki/css/rtl.css +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -166,8 +166,7 @@ /*____________ _recent ____________*/ -[dir=rtl] .dokuwiki #dw__recent ul li, -[dir=rtl] .dokuwiki #page__revisions ul li { +[dir=rtl] .dokuwiki form.changes ul li { margin-right: 0; } @@ -177,16 +176,16 @@ /*____________ _edit ____________*/ -[dir=rtl] .dokuwiki div.toolbar #draft__status { +[dir=rtl] #draft__status { float: left; } -[dir=rtl] .dokuwiki #wiki__editbar #size__ctl { +[dir=rtl] #size__ctl { float: left; } -[dir=rtl] .dokuwiki #wiki__editbar #size__ctl img { +[dir=rtl] #size__ctl img { cursor: pointer; } -[dir=rtl] .dokuwiki #wiki__editbar .editButtons { +[dir=rtl] .dokuwiki .editBar .editButtons { margin-right: 0; margin-left: 1em; } @@ -544,8 +543,7 @@ border-right-width: 0; } -[dir=rtl] .dokuwiki #dw__recent ul, -[dir=rtl] .dokuwiki #page__revisions ul { +[dir=rtl] .dokuwiki form.changes ul { padding-right: 0; } -- cgit v1.2.3 From 6c47a78cc56b2c460658675c694bd178c31a1830 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 14:15:29 +0100 Subject: load only one stylesheet for all modes instead of three Instead of three stylesheets for 'all', 'screen' and 'print' modes, they are all loaded into a single stylesheet by wrapping all screen styles in a "@media screen {}" and all print styles in a "@media print {}". The 'all' mode is not wrapped in anything. Potential issues with existing CSS: If any of your screen or print CSS files already contain any "@media" syntax, the CSS will probably break. In that case please add any CSS with "@media" in it to the 'all' mode instead! Also, the 'rtl' mode is hereby deprecated. Please just prefix any RTL styles within your normal CSS files with "[dir=rtl]". This also fixes that RTL styles cannot be added for 'all' or 'print' modes. --- lib/exe/css.php | 125 +++++++++++++++++++++++++++------------------ lib/tpl/dokuwiki/style.ini | 4 +- 2 files changed, 78 insertions(+), 51 deletions(-) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index 69b512205..5468376c6 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -9,6 +9,7 @@ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); if(!defined('NOSESSION')) define('NOSESSION',true); // we do not use a session or authentication here (better caching) if(!defined('DOKU_DISABLE_GZIP_OUTPUT')) define('DOKU_DISABLE_GZIP_OUTPUT',1); // we gzip ourself here +if(!defined('NL')) define('NL',"\n"); require_once(DOKU_INC.'inc/init.php'); // Main (don't run when UNIT test) @@ -30,10 +31,12 @@ function css_out(){ global $lang; global $config_cascade; - $mediatype = 'screen'; - if (isset($_REQUEST['s']) && - in_array($_REQUEST['s'], array('all', 'print', 'feed'))) { - $mediatype = $_REQUEST['s']; + if (isset($_REQUEST['s']) && ($_REQUEST['s'] == 'feed')) { + $mediatypes = array('feed'); + $type = 'feed'; + } else { + $mediatypes = array('screen', 'all', 'print'); + $type = ''; } $tpl = trim(preg_replace('/[^\w-]+/','',$_REQUEST['t'])); @@ -46,7 +49,7 @@ function css_out(){ } // The generated script depends on some dynamic options - $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tplinc.$mediatype,'.css'); + $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tplinc.$type,'.css'); // load template styles $tplstyles = array(); @@ -57,57 +60,79 @@ function css_out(){ } } - // Array of needed files and their web locations, the latter ones - // are needed to fix relative paths in the stylesheets - $files = array(); - // load core styles - $files[DOKU_INC.'lib/styles/'.$mediatype.'.css'] = DOKU_BASE.'lib/styles/'; - // load jQuery-UI theme - $files[DOKU_INC.'lib/scripts/jquery/jquery-ui-theme/smoothness.css'] = DOKU_BASE.'lib/scripts/jquery/jquery-ui-theme/'; - // load plugin styles - $files = array_merge($files, css_pluginstyles($mediatype)); - // load template styles - if (isset($tplstyles[$mediatype])) { - $files = array_merge($files, $tplstyles[$mediatype]); - } - // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility - if (isset($config_cascade['userstyle']['default'])) { - $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default']; - } - // load user styles - if(isset($config_cascade['userstyle'][$mediatype])){ - $files[$config_cascade['userstyle'][$mediatype]] = DOKU_BASE; - } - // load rtl styles - // @todo: this currently adds the rtl styles only to the 'screen' media type - // but 'print' and 'all' should also be supported - if ($mediatype=='screen') { - if($lang['direction'] == 'rtl'){ - if (isset($tplstyles['rtl'])) $files = array_merge($files, $tplstyles['rtl']); + // start output buffering + ob_start(); + + foreach($mediatypes as $mediatype) { + // Array of needed files and their web locations, the latter ones + // are needed to fix relative paths in the stylesheets + $files = array(); + // load core styles + $files[DOKU_INC.'lib/styles/'.$mediatype.'.css'] = DOKU_BASE.'lib/styles/'; + // load jQuery-UI theme + if ($mediatype == 'screen') { + //$files[DOKU_INC.'lib/scripts/jquery/jquery-ui-theme/smoothness.css'] = DOKU_BASE.'lib/scripts/jquery/jquery-ui-theme/'; + } + // load plugin styles + $files = array_merge($files, css_pluginstyles($mediatype)); + // load template styles + if (isset($tplstyles[$mediatype])) { + $files = array_merge($files, $tplstyles[$mediatype]); + } + // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility + if (isset($config_cascade['userstyle']['default'])) { + $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default']; + } + // load user styles + if(isset($config_cascade['userstyle'][$mediatype])){ + $files[$config_cascade['userstyle'][$mediatype]] = DOKU_BASE; + } + // load rtl styles + // note: this adds the rtl styles only to the 'screen' media type + // @deprecated 2012-04-09: rtl will cease to be a mode of its own, + // please use "[dir=rtl]" in any css file in all, screen or print mode instead + if ($mediatype=='screen') { + if($lang['direction'] == 'rtl'){ + if (isset($tplstyles['rtl'])) $files = array_merge($files, $tplstyles['rtl']); + } } - } - $cache_files = array_merge(array_keys($files), getConfigFiles('main')); - $cache_files[] = $tplinc.'style.ini'; - $cache_files[] = __FILE__; + $cache_files = array_merge(array_keys($files), getConfigFiles('main')); + $cache_files[] = $tplinc.'style.ini'; + $cache_files[] = __FILE__; - // check cache age & handle conditional request - // This may exit if a cache can be used - http_cached($cache->cache, - $cache->useCache(array('files' => $cache_files))); + // check cache age & handle conditional request + // This may exit if a cache can be used + http_cached($cache->cache, + $cache->useCache(array('files' => $cache_files))); - // start output buffering and build the stylesheet - ob_start(); + // build the stylesheet - // print the default classes for interwiki links and file downloads - css_interwiki(); - css_filetypes(); + // print the default classes for interwiki links and file downloads + if ($mediatype == 'screen') { + css_interwiki(); + css_filetypes(); + } - // load files - foreach($files as $file => $location){ - print css_loadfile($file, $location); + // load files + $css_content = ''; + foreach($files as $file => $location){ + $css_content .= css_loadfile($file, $location); + } + switch ($mediatype) { + case 'screen': + print NL.'@media screen { /* START screen styles */'.NL.$css_content.NL.'} /* /@media END screen styles */'.NL; + break; + case 'print': + print NL.'@media print { /* START print styles */'.NL.$css_content.NL.'} /* /@media END print styles */'.NL; + break; + case 'all': + case 'feed': + default: + print NL.'/* START rest styles */ '.NL.$css_content.NL.'/* END rest styles */'.NL; + break; + } } - // end output buffering and get contents $css = ob_get_contents(); ob_end_clean(); @@ -275,6 +300,8 @@ function css_pluginstyles($mediatype='screen'){ if ($mediatype=='screen') { $list[DOKU_PLUGIN."$p/style.css"] = DOKU_BASE."lib/plugins/$p/"; } + // @deprecated 2012-04-09: rtl will cease to be a mode of its own, + // please use "[dir=rtl]" in any css file in all, screen or print mode instead if($lang['direction'] == 'rtl'){ $list[DOKU_PLUGIN."$p/rtl.css"] = DOKU_BASE."lib/plugins/$p/"; } diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index b8e55bcc8..b52d7e652 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -29,10 +29,10 @@ css/design.css = screen css/pagetools.css = screen css/content.css = screen css/includes.css = screen -css/mobile.css = screen css/rtl.css = screen -css/print.css = print +css/mobile.css = all +css/print.css = print ; This section is used to configure some placeholder values used in -- cgit v1.2.3 From 57b34425d6b0c774aaa255035325b58e6d18a9e7 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 14:16:48 +0100 Subject: moved the mobile part of the rtl styles (including @media) into mobile.css --- lib/tpl/dokuwiki/css/mobile.css | 42 +++++++++++++++++++++++++ lib/tpl/dokuwiki/css/rtl.css | 68 +++-------------------------------------- 2 files changed, 46 insertions(+), 64 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index b923c811c..6aacb4674 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -27,6 +27,11 @@ margin-left: 0; } +[dir=rtl] .hasSidebar #dokuwiki__content, +[dir=rtl] .hasSidebar #dokuwiki__content > .pad { + margin-right: 0; +} + /* toc */ .dokuwiki div.toc { float: none; @@ -35,6 +40,11 @@ border-left-width: 0; border-bottom: 1px solid __border__; } +[dir=rtl] .dokuwiki div.toc { + float: none; + margin: 0 0 1em 0; + border-right-width: 0; +} .dokuwiki div.tocheader { padding: 0 0 .5em; } @@ -68,6 +78,9 @@ .dokuwiki form.changes ul { padding-left: 0; } +[dir=rtl] .dokuwiki form.changes ul { + padding-right: 0; +} } /* /@media */ @@ -102,10 +115,19 @@ padding-left: 0; margin: 0; } +[dir=rtl] #dokuwiki__header ul.a11y.skip { + left: auto !important; + right: 0 !important; + float: left; + padding-right: 0; +} #dokuwiki__header ul.a11y.skip li { margin-left: .35em; display: inline; } +[dir=rtl] #dokuwiki__header ul.a11y.skip li { + margin: 0 .35em 0 0; +} #dokuwiki__header .headings, #dokuwiki__header .tools { @@ -114,9 +136,18 @@ width: auto; margin-bottom: .5em; } +[dir=rtl] #dokuwiki__header .headings, +[dir=rtl] #dokuwiki__header .tools { + float: none; + text-align: right; + width: auto; +} #dokuwiki__sitetools { text-align: left; } +[dir=rtl] #dokuwiki__sitetools { + text-align: right; +} #dokuwiki__usertools, #dokuwiki__sitetools ul, #dokuwiki__sitetools h3, @@ -132,6 +163,11 @@ margin: 0 .2em .2em 0; width: 49%; } +[dir=rtl] #dokuwiki__sitetools form.search { + float: right; + margin: 0 0 .2em .2em; +} + #dokuwiki__sitetools form.search input.edit { width: 100% !important; } @@ -147,6 +183,9 @@ float: right; width: 49%; } +[dir=rtl] #dokuwiki__header .mobileTools { + float: left; +} #dokuwiki__header .mobileTools select { padding: .3em .1em; width: 100% !important; @@ -177,6 +216,9 @@ .dokuwiki label.block { text-align: left; } +[dir=rtl] .dokuwiki label.block { + text-align: right; +} .dokuwiki label.block span { display: block; } diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css index f36591548..2a8336b7f 100644 --- a/lib/tpl/dokuwiki/css/rtl.css +++ b/lib/tpl/dokuwiki/css/rtl.css @@ -255,6 +255,10 @@ float: left; text-align: left; } +[dir=rtl] #dokuwiki__header .tools li { + margin-right: 1em; + margin-left: 0; +} [dir=rtl] #dokuwiki__aside { float: right; @@ -525,67 +529,3 @@ [dir=rtl] .JSpopup ol { padding-right: 0; } - - -/*____________ mobile ____________*/ - -@media only screen and (max-width: 768px), only screen and (max-device-width: 960px) { - - -[dir=rtl] .hasSidebar #dokuwiki__content, -[dir=rtl] .hasSidebar #dokuwiki__content > .pad { - margin-right: 0; -} - -[dir=rtl] .dokuwiki div.toc { - float: none; - margin: 0 0 1em 0; - border-right-width: 0; -} - -[dir=rtl] .dokuwiki form.changes ul { - padding-right: 0; -} - - -} /* /@media */ - -@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) { - - -[dir=rtl] #dokuwiki__header ul.a11y.skip { - left: auto !important; - right: 0 !important; - float: left; - padding-right: 0; -} -[dir=rtl] #dokuwiki__header ul.a11y.skip li { - margin: 0 .35em 0 0; -} - -[dir=rtl] #dokuwiki__header .headings, -[dir=rtl] #dokuwiki__header .tools { - float: none; - text-align: right; - width: auto; -} -[dir=rtl] #dokuwiki__sitetools { - text-align: right; -} - -[dir=rtl] #dokuwiki__sitetools form.search { - float: right; - margin: 0 0 .2em .2em; -} - -[dir=rtl] #dokuwiki__header .mobileTools { - float: left; -} - -[dir=rtl] .dokuwiki label.block { - text-align: right; -} - - - -} /* /@media */ -- cgit v1.2.3 From 6322e09da839741cbf92ac5201e51e41a05b5191 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 14:29:50 +0100 Subject: minor changes to gradients: quotes around data-uris and commented css solution --- lib/tpl/dokuwiki/css/basic.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index c8e0c435e..9c69a1196 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -17,7 +17,7 @@ body { color: __text__; background-color: __background_site__; background-image: url(images/page-background.svg); - background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + /*background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em);*/ background-size: 1px 10em; background-repeat: repeat-x; margin: 0; @@ -330,8 +330,8 @@ button, .qq-upload-button { color: #333; background-color: #eee; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+); - background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+"); + /*background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);*/ border: 1px solid #ccc; border-radius: 2px; padding: .1em .5em; @@ -353,8 +353,8 @@ button:focus, .qq-upload-button:hover { border-color: #999; background-color: #ddd; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+); - background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); + background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+"); + /*background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);*/ } input::-moz-focus-inner, -- cgit v1.2.3 From 49e5a707012739fbb9dc8ee53daaa3784c9a0fc1 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 15:03:01 +0100 Subject: moved contents of rtl.css into other CSS files --- lib/tpl/dokuwiki/css/_admin.css | 12 + lib/tpl/dokuwiki/css/_edit.css | 13 + lib/tpl/dokuwiki/css/_forms.css | 9 + lib/tpl/dokuwiki/css/_imgdetail.css | 8 + lib/tpl/dokuwiki/css/_links.css | 10 + lib/tpl/dokuwiki/css/_media_popup.css | 64 +++- lib/tpl/dokuwiki/css/_modal.css | 11 + lib/tpl/dokuwiki/css/_recent.css | 3 + lib/tpl/dokuwiki/css/_search.css | 8 + lib/tpl/dokuwiki/css/_toc.css | 18 ++ lib/tpl/dokuwiki/css/basic.css | 35 +++ lib/tpl/dokuwiki/css/content.css | 16 + lib/tpl/dokuwiki/css/design.css | 80 +++++ lib/tpl/dokuwiki/css/pagetools.css | 121 ++++++++ lib/tpl/dokuwiki/css/rtl.css | 531 ---------------------------------- lib/tpl/dokuwiki/css/structure.css | 23 ++ lib/tpl/dokuwiki/style.ini | 1 - 17 files changed, 425 insertions(+), 538 deletions(-) delete mode 100644 lib/tpl/dokuwiki/css/rtl.css (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_admin.css b/lib/tpl/dokuwiki/css/_admin.css index e4664367c..c8f3694b5 100644 --- a/lib/tpl/dokuwiki/css/_admin.css +++ b/lib/tpl/dokuwiki/css/_admin.css @@ -9,6 +9,9 @@ list-style-type: none; font-size: 1.125em; } +[dir=rtl] .dokuwiki ul.admin_tasks { + float: right; +} .dokuwiki ul.admin_tasks li { padding-left: 35px; @@ -18,6 +21,11 @@ background: transparent none no-repeat scroll 0 0; color: inherit; } +[dir=rtl] .dokuwiki ul.admin_tasks li { + padding-left: 0; + padding-right: 35px; + background-position: right 0; +} .dokuwiki ul.admin_tasks li.admin_acl { background-image: url(../../images/admin/acl.png); @@ -45,3 +53,7 @@ color: __text_neu__; background-color: inherit; } +[dir=rtl] .dokuwiki #admin__version { + clear: right; + float: left; +} diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css index 0a5106575..374ddeb96 100644 --- a/lib/tpl/dokuwiki/css/_edit.css +++ b/lib/tpl/dokuwiki/css/_edit.css @@ -20,6 +20,9 @@ color: __text_alt__; background-color: inherit; } +[dir=rtl] #draft__status { + float: left; +} #tool__bar { float: left; } @@ -67,6 +70,9 @@ div.picker button.toolbutton { #size__ctl { float: right; } +[dir=rtl] #size__ctl { + float: left; +} #size__ctl img { cursor: pointer; } @@ -76,6 +82,10 @@ div.picker button.toolbutton { display: inline; margin-right: 1em; } +[dir=rtl] .dokuwiki .editBar .editButtons { + margin-right: 0; + margin-left: 1em; +} .dokuwiki .editBar .editButtons input { } @@ -115,6 +125,9 @@ div.picker button.toolbutton { float: right; margin-top: -1.4em; } +[dir=rtl] .dokuwiki .secedit { + float: left; +} .dokuwiki .secedit input.button { font-size: 75%; } diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index 0c82f5f8c..fb07e989a 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -23,12 +23,18 @@ text-align: right; font-weight: bold; } +[dir=rtl] .dokuwiki label.block { + text-align: left; +} .dokuwiki label.simple { display: block; text-align: left; font-weight: normal; } +[dir=rtl] .dokuwiki label.simple { + text-align: right; +} .dokuwiki label.block input.edit { width: 50%; @@ -75,6 +81,9 @@ text-align: left; margin: 0.5em 0; } +[dir=rtl] #subscribe__form fieldset { + text-align: right; +} #subscribe__form label { display: block; diff --git a/lib/tpl/dokuwiki/css/_imgdetail.css b/lib/tpl/dokuwiki/css/_imgdetail.css index a3e0f55f5..a07400028 100644 --- a/lib/tpl/dokuwiki/css/_imgdetail.css +++ b/lib/tpl/dokuwiki/css/_imgdetail.css @@ -12,9 +12,17 @@ float: left; margin: 0 1.5em .5em 0; } +[dir=rtl] #dokuwiki__detail div.content img { + float: right; + margin-right: 0; + margin-left: 1.5em; +} #dokuwiki__detail div.img_detail { float: left; } +[dir=rtl] #dokuwiki__detail div.content div.img_detail { + float: right +} #dokuwiki__detail div.img_detail h2 { } diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css index 6b19c3a24..ef34a6706 100644 --- a/lib/tpl/dokuwiki/css/_links.css +++ b/lib/tpl/dokuwiki/css/_links.css @@ -63,3 +63,13 @@ .dokuwiki a.interwiki { padding: 0 0 0 17px; } + +/* RTL corrections; if link icons don't work as expected, remove the following lines */ +[dir=rtl] .dokuwiki a.urlextern, +[dir=rtl] .dokuwiki a.windows, +[dir=rtl] .dokuwiki a.mail, +[dir=rtl] .dokuwiki a.interwiki, +[dir=rtl] .dokuwiki a.mediafile { + background-position: right center; + padding: 0 17px 0 0; +} diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css index 0469c8e60..c776e6b8a 100644 --- a/lib/tpl/dokuwiki/css/_media_popup.css +++ b/lib/tpl/dokuwiki/css/_media_popup.css @@ -22,6 +22,12 @@ html.popup { left: 0; border-right: 1px solid __border__; } +[dir=rtl] #mediamgr__aside { + left: auto; + right: 0; + border-right-width: 0; + border-left: 1px solid __border__; +} #mediamgr__aside .pad { padding: .5em; } @@ -33,6 +39,10 @@ html.popup { position: absolute; right: 0; } +[dir=rtl] #mediamgr__content { + right: auto; + left: 0; +} #mediamgr__content .pad { padding: .5em; } @@ -57,6 +67,10 @@ html.popup { #media__opts input { margin-right: .3em; } +[dir=rtl] #media__opts input { + margin-right: 0; + margin-left: .3em; +} #media__opts label { } @@ -65,22 +79,38 @@ html.popup { #media__tree ul { padding-left: .2em; } +[dir=rtl] #media__tree ul { + padding-left: 0; + padding-right: .2em; +} #media__tree ul li { clear: left; list-style-type: none; list-style-image: none; margin-left: 0; } +[dir=rtl] #media__tree ul li { + clear: right; + margin-right: 0; +} #media__tree ul li img { float: left; padding: .5em .3em 0 0; } +[dir=rtl] #media__tree ul li img { + float: right; + padding: .5em 0 0 .3em; +} #media__tree ul li div.li { display: inline; } #media__tree ul li li { margin-left: 1.5em; } +[dir=rtl] #media__tree ul li li { + margin-left: 0; + margin-right: 1.5em; +} /* right side ********************************************************************/ @@ -125,6 +155,10 @@ html.popup { margin-right: 1.5em; font-weight: bold; } +[dir=rtl] #media__content a.mediafile { + margin-right: 0; + margin-left: 1.5em; +} #media__content span.info { } #media__content img.btn { @@ -144,6 +178,10 @@ html.popup { float: left; margin: 0 .5em 0 18px; } +[dir=rtl] #media__content div.detail div.thumb { + float: right; + margin: 0 18px 0 .5em; +} #media__content div.detail div.thumb a { display: block; cursor: pointer; @@ -155,17 +193,17 @@ html.popup { /*____________ media search ____________*/ -form#dw__mediasearch { +#dw__mediasearch { } -form#dw__mediasearch p { +#dw__mediasearch p { } -form#dw__mediasearch label { +#dw__mediasearch label { } -form#dw__mediasearch label span { +#dw__mediasearch label span { } -form#dw__mediasearch input.edit { +#dw__mediasearch input.edit { } -form#dw__mediasearch input.button { +#dw__mediasearch input.button { } @@ -180,6 +218,9 @@ form#dw__mediasearch input.button { margin-bottom: .5em; overflow: hidden; } +[dir=rtl] #media__content form.meta div.metafield { + clear: right; +} #media__content form.meta label { display: block; @@ -188,11 +229,18 @@ form#dw__mediasearch input.button { font-weight: bold; clear: left; } +[dir=rtl] #media__content form.meta label { + float: right; + clear: right; +} #media__content form.meta .edit { float: left; width: 70%; margin: 0; } +[dir=rtl] #media__content form.meta .edit { + float: right; +} #media__content form.meta textarea.edit { /* needed because of IE8 hack in _edit.css for textarea.edit: */ max-width: 70%; @@ -203,3 +251,7 @@ form#dw__mediasearch input.button { clear: left; margin: .2em 0 0 25%; } +[dir=rtl] #media__content form.meta div.buttons { + clear: right; + margin: .2em 25% 0 0; +} diff --git a/lib/tpl/dokuwiki/css/_modal.css b/lib/tpl/dokuwiki/css/_modal.css index 125f702a8..a3d3be194 100644 --- a/lib/tpl/dokuwiki/css/_modal.css +++ b/lib/tpl/dokuwiki/css/_modal.css @@ -13,6 +13,10 @@ #link__wiz { } +[dir=rtl] #link__wiz_close { + float: left; +} + #link__wiz_result { background-color: __background__; width: 293px; @@ -23,6 +27,9 @@ text-align: left; line-height: 1; } +[dir=rtl] #link__wiz_result { + text-align: right; +} #link__wiz_result div { padding: 3px 3px 3px 0; @@ -34,6 +41,10 @@ min-height: 16px; background: transparent 3px center no-repeat; } +[dir=rtl] #link__wiz_result div a { + padding: 3px 22px 3px 3px; + background-position: 257px 3px; +} #link__wiz_result div.type_u a { background-image: url(../../images/up.png); diff --git a/lib/tpl/dokuwiki/css/_recent.css b/lib/tpl/dokuwiki/css/_recent.css index 426e06fb4..d73bb9463 100644 --- a/lib/tpl/dokuwiki/css/_recent.css +++ b/lib/tpl/dokuwiki/css/_recent.css @@ -14,6 +14,9 @@ list-style: none; margin-left: 0; } +[dir=rtl] .dokuwiki form.changes ul li { + margin-right: 0; +} .dokuwiki form.changes ul li span, .dokuwiki form.changes ul li a { vertical-align: middle; diff --git a/lib/tpl/dokuwiki/css/_search.css b/lib/tpl/dokuwiki/css/_search.css index c124c1e86..446efe331 100644 --- a/lib/tpl/dokuwiki/css/_search.css +++ b/lib/tpl/dokuwiki/css/_search.css @@ -25,6 +25,9 @@ width: 12em; margin: 0 1.5em; } +[dir=rtl] .dokuwiki div.search_quickresult ul li { + float: right; +} /*____________ search results ____________*/ @@ -78,6 +81,11 @@ text-align: left; display: none; } +[dir=rtl] .dokuwiki form.search div.ajax_qsearch { + left: auto; + right: -13.5em; + text-align: right; +} .dokuwiki form.search div.ajax_qsearch strong { display: block; margin-bottom: .3em; diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css index b78817523..f89bce6c1 100644 --- a/lib/tpl/dokuwiki/css/_toc.css +++ b/lib/tpl/dokuwiki/css/_toc.css @@ -14,6 +14,10 @@ background-color: __background_alt__; color: inherit; } +[dir=rtl] .dokuwiki div.toc { + float: left; + margin: 0 1.4em 1.4em 0; +} /*____________ toc header ____________*/ @@ -27,6 +31,10 @@ float: right; margin: 0 .2em; } +[dir=rtl] .dokuwiki .toc span.toc_open, +[dir=rtl] .dokuwiki .toc span.toc_close { + float: left; +} /*____________ toc list ____________*/ @@ -49,6 +57,10 @@ .dokuwiki #toc__inside ul ul { padding-left: 1em; } +[dir=rtl] .dokuwiki #toc__inside ul ul { + padding-left: 0; + padding-right: 1em; +} .dokuwiki #toc__inside ul ul li { } .dokuwiki #toc__inside ul li a { @@ -66,6 +78,9 @@ .dokuwiki ul.idx { padding-left: 0; } +[dir=rtl] .dokuwiki ul.idx { + padding-right: 0; +} .dokuwiki ul.idx li { list-style-image: url(images/bullet.png); } @@ -75,3 +90,6 @@ .dokuwiki ul.idx li.closed { list-style-image: url(images/closed.png); } +[dir=rtl] .dokuwiki ul.idx li.closed { + list-style-image: url(images/closed-rtl.png); +} diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 9c69a1196..e7590dbb7 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -370,3 +370,38 @@ button[readonly] { cursor: auto; } +/*____________ rtl corrections ____________*/ + +[dir=rtl] caption, +[dir=rtl] td, +[dir=rtl] th { + text-align: right; +} + +[dir=rtl] ul, +[dir=rtl] ol { + padding: 0 1.5em 0 0; +} +[dir=rtl] li, +[dir=rtl] dd { + margin: 0 1.5em 0 0; +} +[dir=rtl] blockquote { + border-width: 0 .25em 0 0; +} + +[dir=rtl] h1, +[dir=rtl] h2, +[dir=rtl] h3, +[dir=rtl] h4, +[dir=rtl] h5, +[dir=rtl] h6, +[dir=rtl] caption, +[dir=rtl] legend { + clear: right; +} + +[dir=rtl] .a11y { + left: auto; + right: -9000px; +} diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index 7cb7c6edf..ebeb4e17e 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -19,6 +19,17 @@ .dokuwiki.page div.level3 {margin-left: 2em;} .dokuwiki.page div.level4 {margin-left: 3em;} .dokuwiki.page div.level5 {margin-left: 4em;} + +[dir=rtl] .dokuwiki .page h1 {margin-left: 0; margin-right: 0;} +[dir=rtl] .dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} +[dir=rtl] .dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} +[dir=rtl] .dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} +[dir=rtl] .dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} +[dir=rtl] .dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} +[dir=rtl] .dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} +[dir=rtl] .dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} +[dir=rtl] .dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} +[dir=rtl] .dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} */ /* hx margin-left = (1 / font-size) * .levelx-margin */ @@ -133,6 +144,11 @@ margin-bottom: -1px; float: left; } +[dir=rtl] .dokuwiki dl.code dt, +[dir=rtl] .dokuwiki dl.file dt { + margin-left: 0; + margin-right: 1em; +} .dokuwiki dl.code dt a, .dokuwiki dl.file dt a { background-color: transparent; diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 8617c6c48..f73985ed7 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -23,6 +23,11 @@ float: left; margin-right: .5em; } +[dir=rtl] #dokuwiki__header h1 img { + float: right; + margin-left: .5em; + margin-right: 0; +} #dokuwiki__header h1 span { display: block; padding-top: 10px; @@ -78,6 +83,10 @@ list-style: none; display: inline; } +[dir=rtl] #dokuwiki__header .tools li { + margin-right: 1em; + margin-left: 0; +} #dokuwiki__header .tools form.search div.ajax_qsearch li { font-size: 1em; margin-left: 0; @@ -99,6 +108,11 @@ text-align: right; width: 100%; } +[dir=rtl] #dokuwiki__usertools { + text-align: left; + left: 40px; + right: auto; +} #dokuwiki__usertools ul { margin: 0 auto; padding: 0; @@ -113,6 +127,9 @@ #dokuwiki__sitetools { text-align: right; } +[dir=rtl] #dokuwiki__sitetools { + text-align: left; +} #dokuwiki__sitetools form.search { display: block; @@ -123,6 +140,9 @@ width: 18em; padding: .35em 22px .35em .1em; } +[dir=rtl] #dokuwiki__sitetools form.search input.edit { + padding: .35em .1em .35em 22px; +} #dokuwiki__sitetools form.search input.button { background: transparent url(images/search.png) no-repeat 0 0; border-width: 0; @@ -133,6 +153,11 @@ box-shadow: none; padding: 0; } +[dir=rtl] #dokuwiki__sitetools form.search input.button { + background-position: 5px 0; + margin-left: 0; + margin-right: -20px; +} #dokuwiki__sitetools ul { margin-top: 0.5em; @@ -223,6 +248,10 @@ #dokuwiki__aside ol { padding-left: 0; } +[dir=rtl] #dokuwiki__aside ul, +[dir=rtl] #dokuwiki__aside ol { + padding-right: 0; +} #dokuwiki__aside li ul, #dokuwiki__aside li ol { margin-bottom: 0; @@ -248,6 +277,10 @@ overflow: hidden; padding: 1em 1em 0; } +[dir=rtl] .dokuwiki .pageId { + right: auto; + left: -1em; +} .dokuwiki .pageId span { font-size: 0.875em; border: solid __background_alt__; @@ -277,6 +310,9 @@ font-size: 0.875em; text-align: right; } +[dir=rtl] .dokuwiki .docInfo { + text-align: left; +} /*____________ misc ____________*/ @@ -314,16 +350,35 @@ border-bottom-left-radius: 4px; border-left-width: 1px; } +[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-left-width: 0; + border-right-width: 1px; +} .dokuwiki div.toolbar button.toolbutton:last-child { border-top-right-radius: 4px; border-bottom-right-radius: 4px; } +[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-left-width: 1px; +} .dokuwiki div.section_highlight { margin: -3em -2em -.01em -2em; padding: 3em 1em .01em 1em; border-width: 0 1em; } +[dir=rtl] .dokuwiki div.section_highlight { + margin-right: -2em; + border-right-width: 1em; +} .dokuwiki textarea.edit { font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; @@ -344,6 +399,11 @@ background: __background__; color: inherit; } +[dir=rtl] .dokuwiki div.toc { + margin: -2em 1.4em .5em -2em; + border-left-width: 0; + border-right: 1px solid __border__; +} .dokuwiki div.tocheader { padding: .5em 1em; @@ -376,6 +436,9 @@ .dokuwiki #toc__inside ul { padding: 0 0 0 1.2em; } +[dir=rtl] .dokuwiki #toc__inside ul { + padding: 0 1.5em 0 0; +} .dokuwiki #toc__inside ul li { list-style-image: url(images/toc-bullet.png); } @@ -409,9 +472,18 @@ text-align: right; clear: left; } +[dir=rtl] #dokuwiki__detail div.img_detail dl dt { + float: right; + text-align: left; + clear: right; +} #dokuwiki__detail div.img_detail dl dd { margin-left: 9.5em; } +[dir=rtl] #dokuwiki__detail div.img_detail dl dd { + margin-left: 0; + margin-right: 9.5em; +} /*____________ JS popup ____________*/ @@ -435,6 +507,10 @@ .JSpopup ol { padding-left: 0; } +[dir=rtl] .JSpopup ul, +[dir=rtl] .JSpopup ol { + padding-right: 0; +} /* footer @@ -457,6 +533,10 @@ font-size: 100%; } +[dir=rtl] #dokuwiki__footer .license img { + margin: 0 0 0 .5em; +} + #dokuwiki__footer div.buttons a img { opacity: 0.5; } diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css index e301b084d..f691d82a7 100644 --- a/lib/tpl/dokuwiki/css/pagetools.css +++ b/lib/tpl/dokuwiki/css/pagetools.css @@ -20,6 +20,10 @@ /* move the tools just outside of the site */ right: 40px; } +[dir=rtl] #dokuwiki__usertools { + right: auto; + left: 40px; +} #dokuwiki__pagetools { @@ -28,6 +32,10 @@ /* on same vertical level as first headline, because .page has 2em padding */ top: 2em; } +[dir=rtl] #dokuwiki__pagetools { + right: auto; + left: -40px; +} #dokuwiki__pagetools div.tools { position: fixed; @@ -42,6 +50,11 @@ /* add transparent border to prevent jumping when proper border is added on hover */ border: 1px solid transparent; } +[dir=rtl] #dokuwiki__pagetools ul { + right: auto; + left: 0; + text-align: left; +} #dokuwiki__pagetools ul li { padding: 0; @@ -62,6 +75,10 @@ border: 1px solid transparent; white-space: nowrap; } +[dir=rtl] #dokuwiki__pagetools ul li a { + padding: 5px 5px 5px 40px; + background-position: left 0; +} /* hide labels accessibly when neither on hover nor on focus */ #dokuwiki__pagetools ul li a span { @@ -77,6 +94,10 @@ border-radius: 2px; box-shadow: 2px 2px 2px __text_alt__; } +[dir=rtl] #dokuwiki__pagetools:hover ul, +[dir=rtl] #dokuwiki__pagetools ul li a:focus { + box-shadow: -2px 2px 2px __text_alt__; +} #dokuwiki__pagetools:hover ul li a span, #dokuwiki__pagetools ul li a:focus span { @@ -103,6 +124,14 @@ #dokuwiki__pagetools ul li a.edit:focus { background-position: right -45px; } +[dir=rtl] #dokuwiki__pagetools ul li a.edit { + background-position: left 0; +} +[dir=rtl] #dokuwiki__pagetools ul li a.edit:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.edit:active, +[dir=rtl] #dokuwiki__pagetools ul li a.edit:focus { + background-position: left -45px; +} #dokuwiki__pagetools ul li a.create { background-position: right -90px; @@ -112,6 +141,14 @@ #dokuwiki__pagetools ul li a.create:focus { background-position: right -135px; } +[dir=rtl] #dokuwiki__pagetools ul li a.create { + background-position: left -90px; +} +[dir=rtl] #dokuwiki__pagetools ul li a.create:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.create:active, +[dir=rtl] #dokuwiki__pagetools ul li a.create:focus { + background-position: left -135px; +} #dokuwiki__pagetools ul li a.show { background-position: right -270px; @@ -121,6 +158,14 @@ #dokuwiki__pagetools ul li a.show:focus { background-position: right -315px; } +[dir=rtl] #dokuwiki__pagetools ul li a.show { + background-position: left -270px; +} +[dir=rtl] #dokuwiki__pagetools ul li a.show:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.show:active, +[dir=rtl] #dokuwiki__pagetools ul li a.show:focus { + background-position: left -315px; +} #dokuwiki__pagetools ul li a.source { background-position: right -360px; @@ -130,6 +175,14 @@ #dokuwiki__pagetools ul li a.source:focus { background-position: right -405px; } +[dir=rtl] #dokuwiki__pagetools ul li a.source { + background-position: left -360px; +} +[dir=rtl] #dokuwiki__pagetools ul li a.source:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.source:active, +[dir=rtl] #dokuwiki__pagetools ul li a.source:focus { + background-position: left -405px; +} #dokuwiki__pagetools ul li a.draft { background-position: right -180px; @@ -139,6 +192,14 @@ #dokuwiki__pagetools ul li a.draft:focus { background-position: right -225px; } +[dir=rtl] #dokuwiki__pagetools ul li a.draft { + background-position: left -180px; +} +[dir=rtl] #dokuwiki__pagetools ul li a.draft:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.draft:active, +[dir=rtl] #dokuwiki__pagetools ul li a.draft:focus { + background-position: left -225px; +} #dokuwiki__pagetools ul li a.revs { background-position: right -540px; @@ -149,6 +210,15 @@ .mode_revisions #dokuwiki__pagetools ul li a.revs { background-position: right -585px; } +[dir=rtl] #dokuwiki__pagetools ul li a.revs { + background-position: left -540px; +} +[dir=rtl] #dokuwiki__pagetools ul li a.revs:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.revs:active, +[dir=rtl] #dokuwiki__pagetools ul li a.revs:focus, +.mode_revisions [dir=rtl] #dokuwiki__pagetools ul li a.revs { + background-position: left -585px; +} #dokuwiki__pagetools ul li a.backlink { background-position: right -630px; @@ -159,6 +229,15 @@ .mode_backlink #dokuwiki__pagetools ul li a.backlink { background-position: right -675px; } +[dir=rtl] #dokuwiki__pagetools ul li a.backlink { + background-position: left -630px; +} +[dir=rtl] #dokuwiki__pagetools ul li a.backlink:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.backlink:active, +[dir=rtl] #dokuwiki__pagetools ul li a.backlink:focus, +.mode_backlink [dir=rtl] #dokuwiki__pagetools ul li a.backlink { + background-position: left -675px; +} #dokuwiki__pagetools ul li a.top { background-position: right -810px; @@ -168,6 +247,14 @@ #dokuwiki__pagetools ul li a.top:focus { background-position: right -855px; } +[dir=rtl] #dokuwiki__pagetools ul li a.top { + background-position: left -810px; +} +[dir=rtl] #dokuwiki__pagetools ul li a.top:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.top:active, +[dir=rtl] #dokuwiki__pagetools ul li a.top:focus { + background-position: left -855px; +} #dokuwiki__pagetools ul li a.revert { background-position: right -450px; @@ -178,6 +265,15 @@ .mode_revert #dokuwiki__pagetools ul li a.revert { background-position: right -495px; } +[dir=rtl] #dokuwiki__pagetools ul li a.revert { + background-position: left -450px; +} +[dir=rtl] #dokuwiki__pagetools ul li a.revert:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.revert:active, +[dir=rtl] #dokuwiki__pagetools ul li a.revert:focus, +.mode_revert [dir=rtl] #dokuwiki__pagetools ul li a.revert { + background-position: left -495px; +} #dokuwiki__pagetools ul li a.subscribe { background-position: right -720px; @@ -188,6 +284,15 @@ .mode_subscribe #dokuwiki__pagetools ul li a.subscribe { background-position: right -765px; } +[dir=rtl] #dokuwiki__pagetools ul li a.subscribe { + background-position: left -720px; +} +[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:active, +[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:focus, +.mode_subscribe [dir=rtl] #dokuwiki__pagetools ul li a.subscribe { + background-position: left -765px; +} #dokuwiki__pagetools ul li a.mediaManager { background-position: right -900px; @@ -197,6 +302,14 @@ #dokuwiki__pagetools ul li a.mediaManager:focus { background-position: right -945px; } +[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager { + background-position: left -900px; +} +[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:active, +[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:focus { + background-position: left -945px; +} #dokuwiki__pagetools ul li a.back { background-position: right -990px; @@ -206,3 +319,11 @@ #dokuwiki__pagetools ul li a.back:focus { background-position: right -1035px; } +[dir=rtl] #dokuwiki__pagetools ul li a.back { + background-position: left -990px; +} +[dir=rtl] #dokuwiki__pagetools ul li a.back:hover, +[dir=rtl] #dokuwiki__pagetools ul li a.back:active, +[dir=rtl] #dokuwiki__pagetools ul li a.back:focus { + background-position: left -1035px; +} diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css deleted file mode 100644 index 2a8336b7f..000000000 --- a/lib/tpl/dokuwiki/css/rtl.css +++ /dev/null @@ -1,531 +0,0 @@ -/** - * This file provides layout and design corrections for right-to-left - * languages. - * - * @author Anika Henke <anika@selfthinker.org> - */ - -/*____________ basic ____________*/ - -[dir=rtl] caption, -[dir=rtl] td, -[dir=rtl] th { - text-align: right; -} - -[dir=rtl] ul, -[dir=rtl] ol { - padding: 0 1.5em 0 0; -} -[dir=rtl] li, -[dir=rtl] dd { - margin: 0 1.5em 0 0; -} -[dir=rtl] blockquote { - border-width: 0 .25em 0 0; -} - -[dir=rtl] h1, -[dir=rtl] h2, -[dir=rtl] h3, -[dir=rtl] h4, -[dir=rtl] h5, -[dir=rtl] h6, -[dir=rtl] caption, -[dir=rtl] legend { - clear: right; -} - -[dir=rtl] .a11y { - left: auto; - right: -9000px; -} - - -/*____________ _imgdetail ____________*/ - -[dir=rtl] #dokuwiki__detail div.content img { - float: right; - margin-right: 0; - margin-left: 1.5em; -} -[dir=rtl] #dokuwiki__detail div.content div.img_detail { - float: right -} - - -/*____________ _mediamanager ____________*/ - -[dir=rtl] #mediamgr__aside { - left: auto; - right: 0; - border-right-width: 0; - border-left: 1px solid __border__; -} -[dir=rtl] #mediamgr__content { - right: auto; - left: 0; -} - -[dir=rtl] #media__opts input { - margin-right: 0; - margin-left: .3em; -} - -[dir=rtl] #media__tree ul { - padding-left: 0; - padding-right: .2em; -} -[dir=rtl] #media__tree ul li { - clear: right; - margin-right: 0; -} -[dir=rtl] #media__tree ul li img { - float: right; - padding: .5em 0 0 .3em; -} -[dir=rtl] #media__tree ul li li { - margin-left: 0; - margin-right: 1.5em; -} - -[dir=rtl] #media__content a.mediafile { - margin-right: 0; - margin-left: 1.5em; -} -[dir=rtl] #media__content div.detail div.thumb { - float: right; - margin: 0 18px 0 .5em; -} -[dir=rtl] #media__content form.meta div.metafield { - clear: right; -} -[dir=rtl] #media__content form.meta label { - float: right; - clear: right; -} -[dir=rtl] #media__content form.meta .edit { - float: right; -} -[dir=rtl] #media__content form.meta div.buttons { - clear: right; - margin: .2em 25% 0 0; -} - - -/*____________ _links ____________*/ - -/* if link icons don't work as expected, remove the following lines */ -[dir=rtl] .dokuwiki a.urlextern, -[dir=rtl] .dokuwiki a.windows, -[dir=rtl] .dokuwiki a.mail, -[dir=rtl] .dokuwiki a.interwiki, -[dir=rtl] .dokuwiki a.mediafile { - background-position: right center; - padding: 0 17px 0 0; -} - - -/*____________ _toc ____________*/ - -[dir=rtl] .dokuwiki div.toc { - float: left; - margin: 0 1.4em 1.4em 0; -} -[dir=rtl] .dokuwiki .toc span.toc_open, -[dir=rtl] .dokuwiki .toc span.toc_close { - float: left; -} -[dir=rtl] .dokuwiki #toc__inside ul ul { - padding-left: 0; - padding-right: 1em; -} - -[dir=rtl] .dokuwiki ul.idx { - padding-right: 0; -} -[dir=rtl] .dokuwiki ul.idx li.closed { - list-style-image: url(images/closed-rtl.png); -} - - -/*____________ _footnotes ____________*/ - - -/*____________ _search ____________*/ - -[dir=rtl] .dokuwiki div.search_quickresult ul li { - float: right; -} -[dir=rtl] .dokuwiki form.search div.ajax_qsearch { - left: auto; - right: -13.5em; - text-align: right; -} - - -/*____________ _recent ____________*/ - -[dir=rtl] .dokuwiki form.changes ul li { - margin-right: 0; -} - - -/*____________ _diff ____________*/ - - -/*____________ _edit ____________*/ - -[dir=rtl] #draft__status { - float: left; -} -[dir=rtl] #size__ctl { - float: left; -} -[dir=rtl] #size__ctl img { - cursor: pointer; -} -[dir=rtl] .dokuwiki .editBar .editButtons { - margin-right: 0; - margin-left: 1em; -} - -[dir=rtl] .dokuwiki .secedit { - float: left; -} - - -/*____________ _modal ____________*/ - -[dir=rtl] #link__wiz_close { - float: left; -} -[dir=rtl] #link__wiz_result { - text-align: right; -} -[dir=rtl] #link__wiz_result div.type_u, -[dir=rtl] #link__wiz_result div.type_f, -[dir=rtl] #link__wiz_result div.type_d { - padding: 3px 22px 3px 3px; - background-position: 257px 3px; -} - - -/*____________ _forms ____________*/ - -[dir=rtl] .dokuwiki label.block { - text-align: left; -} -[dir=rtl] .dokuwiki label.simple { - text-align: right; -} - -[dir=rtl] form#subscribe__form fieldset { - text-align: right; -} - - -/*____________ _admin ____________*/ - -[dir=rtl] .dokuwiki ul.admin_tasks { - float: right; -} -[dir=rtl] .dokuwiki ul.admin_tasks li { - padding-left: 0; - padding-right: 35px; - background-position: right 0; -} - -[dir=rtl] .dokuwiki #admin__version { - clear: right; - float: left; -} - - -/*____________ includes ____________*/ - - -/*____________ structure ____________*/ - -[dir=rtl] #dokuwiki__header .headings { - float: right; - text-align: right; -} -[dir=rtl] #dokuwiki__header .tools { - float: left; - text-align: left; -} -[dir=rtl] #dokuwiki__header .tools li { - margin-right: 1em; - margin-left: 0; -} - -[dir=rtl] #dokuwiki__aside { - float: right; -} -[dir=rtl] #dokuwiki__aside > .pad { - margin: 0 0 0 1.5em; -} - -[dir=rtl] .hasSidebar #dokuwiki__content { - float: left; - margin-left: 0; - margin-right: -__sidebar_width__; -} -[dir=rtl] .hasSidebar #dokuwiki__content > .pad { - margin-left: 0; - margin-right: __sidebar_width__; -} - -/*____________ design ____________*/ - -[dir=rtl] #dokuwiki__header h1 img { - float: right; - margin-left: .5em; - margin-right: 0; -} - -[dir=rtl] #dokuwiki__sitetools form.search input.edit { - padding: .35em .1em .35em 22px; -} -[dir=rtl] #dokuwiki__sitetools form.search input.button { - background-position: 5px 0; - margin-left: 0; - margin-right: -20px; -} - -[dir=rtl] #dokuwiki__usertools { - text-align: left; - left: 40px; - right: auto; -} - -[dir=rtl] #dokuwiki__sitetools { - text-align: left; -} - -[dir=rtl] #dokuwiki__aside ul, #dokuwiki__aside ol { - padding-right: 0; -} - -[dir=rtl] .dokuwiki .pageId { - right: auto; - left: -1em; -} - -[dir=rtl] .dokuwiki .docInfo { - text-align: left; -} - -[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - border-left-width: 0; - border-right-width: 1px; -} -[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-left-width: 1px; -} - -[dir=rtl] .dokuwiki div.section_highlight { - margin-right: -2em; - border-right-width: 1em; -} - -[dir=rtl] #dokuwiki__footer .license img { - margin: 0 0 0 .5em; -} - -[dir=rtl] .dokuwiki div.toc { - margin: -2em 1.4em .5em -2em; - border-left-width: 0; - border-right: 1px solid __border__; -} -[dir=rtl] .dokuwiki #toc__inside ul { - padding: 0 1.5em 0 0; -} - -[dir=rtl] #dokuwiki__detail div.img_detail dl dt { - float: right; - text-align: left; - clear: right; -} -[dir=rtl] #dokuwiki__detail div.img_detail dl dd { - margin-left: 0; - margin-right: 9.5em; -} - - -/*____________ pagetools ____________*/ - -[dir=rtl] #dokuwiki__usertools { - right: auto; - left: 40px; -} - -[dir=rtl] #dokuwiki__pagetools { - right: auto; - left: -40px; -} - -[dir=rtl] #dokuwiki__pagetools ul { - right: auto; - left: 0; - text-align: left; -} - -[dir=rtl] #dokuwiki__pagetools ul li a { - padding: 5px 5px 5px 40px; - background-position: left 0; -} - -[dir=rtl] #dokuwiki__pagetools:hover ul, -[dir=rtl] #dokuwiki__pagetools ul li a:focus { - box-shadow: -2px 2px 2px __text_alt__; -} - -/* all available icons in sprite */ -[dir=rtl] #dokuwiki__pagetools ul li a.edit { - background-position: left 0; -} -[dir=rtl] #dokuwiki__pagetools ul li a.edit:hover, -[dir=rtl] #dokuwiki__pagetools ul li a.edit:active, -[dir=rtl] #dokuwiki__pagetools ul li a.edit:focus { - background-position: left -45px; -} - -[dir=rtl] #dokuwiki__pagetools ul li a.create { - background-position: left -90px; -} -[dir=rtl] #dokuwiki__pagetools ul li a.create:hover, -[dir=rtl] #dokuwiki__pagetools ul li a.create:active, -[dir=rtl] #dokuwiki__pagetools ul li a.create:focus { - background-position: left -135px; -} - -[dir=rtl] #dokuwiki__pagetools ul li a.show { - background-position: left -270px; -} -[dir=rtl] #dokuwiki__pagetools ul li a.show:hover, -[dir=rtl] #dokuwiki__pagetools ul li a.show:active, -[dir=rtl] #dokuwiki__pagetools ul li a.show:focus { - background-position: left -315px; -} - -[dir=rtl] #dokuwiki__pagetools ul li a.source { - background-position: left -360px; -} -[dir=rtl] #dokuwiki__pagetools ul li a.source:hover, -[dir=rtl] #dokuwiki__pagetools ul li a.source:active, -[dir=rtl] #dokuwiki__pagetools ul li a.source:focus { - background-position: left -405px; -} - -[dir=rtl] #dokuwiki__pagetools ul li a.draft { - background-position: left -180px; -} -[dir=rtl] #dokuwiki__pagetools ul li a.draft:hover, -[dir=rtl] #dokuwiki__pagetools ul li a.draft:active, -[dir=rtl] #dokuwiki__pagetools ul li a.draft:focus { - background-position: left -225px; -} - -[dir=rtl] #dokuwiki__pagetools ul li a.revs { - background-position: left -540px; -} -[dir=rtl] #dokuwiki__pagetools ul li a.revs:hover, -[dir=rtl] #dokuwiki__pagetools ul li a.revs:active, -[dir=rtl] #dokuwiki__pagetools ul li a.revs:focus, -.mode_revisions [dir=rtl] #dokuwiki__pagetools ul li a.revs { - background-position: left -585px; -} - -[dir=rtl] #dokuwiki__pagetools ul li a.backlink { - background-position: left -630px; -} -[dir=rtl] #dokuwiki__pagetools ul li a.backlink:hover, -[dir=rtl] #dokuwiki__pagetools ul li a.backlink:active, -[dir=rtl] #dokuwiki__pagetools ul li a.backlink:focus, -.mode_backlink [dir=rtl] #dokuwiki__pagetools ul li a.backlink { - background-position: left -675px; -} - -[dir=rtl] #dokuwiki__pagetools ul li a.top { - background-position: left -810px; -} -[dir=rtl] #dokuwiki__pagetools ul li a.top:hover, -[dir=rtl] #dokuwiki__pagetools ul li a.top:active, -[dir=rtl] #dokuwiki__pagetools ul li a.top:focus { - background-position: left -855px; -} - -[dir=rtl] #dokuwiki__pagetools ul li a.revert { - background-position: left -450px; -} -[dir=rtl] #dokuwiki__pagetools ul li a.revert:hover, -[dir=rtl] #dokuwiki__pagetools ul li a.revert:active, -[dir=rtl] #dokuwiki__pagetools ul li a.revert:focus, -.mode_revert [dir=rtl] #dokuwiki__pagetools ul li a.revert { - background-position: left -495px; -} - -[dir=rtl] #dokuwiki__pagetools ul li a.subscribe { - background-position: left -720px; -} -[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:hover, -[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:active, -[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:focus, -.mode_subscribe [dir=rtl] #dokuwiki__pagetools ul li a.subscribe { - background-position: left -765px; -} - -[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager { - background-position: left -900px; -} -[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:hover, -[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:active, -[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:focus { - background-position: left -945px; -} - -[dir=rtl] #dokuwiki__pagetools ul li a.back { - background-position: left -990px; -} -[dir=rtl] #dokuwiki__pagetools ul li a.back:hover, -[dir=rtl] #dokuwiki__pagetools ul li a.back:active, -[dir=rtl] #dokuwiki__pagetools ul li a.back:focus { - background-position: left -1035px; -} - - -/*____________ content ____________*/ - -/* section indenting -[dir=rtl] .dokuwiki .page h1 {margin-left: 0; margin-right: 0;} -[dir=rtl] .dokuwiki .page h2 {margin-left: 0; margin-right: .666em;} -[dir=rtl] .dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;} -[dir=rtl] .dokuwiki .page h4 {margin-left: 0; margin-right: 3em;} -[dir=rtl] .dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;} -[dir=rtl] .dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;} -[dir=rtl] .dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;} -[dir=rtl] .dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;} -[dir=rtl] .dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;} -[dir=rtl] .dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;} -*/ - -[dir=rtl] .dokuwiki dl.code dt, -[dir=rtl] .dokuwiki dl.file dt { - margin-left: 0; - margin-right: 1em; -} - -[dir=rtl] .JSpopup ul, -[dir=rtl] .JSpopup ol { - padding-right: 0; -} diff --git a/lib/tpl/dokuwiki/css/structure.css b/lib/tpl/dokuwiki/css/structure.css index 9cca1aa3b..5e2eab3bc 100644 --- a/lib/tpl/dokuwiki/css/structure.css +++ b/lib/tpl/dokuwiki/css/structure.css @@ -23,10 +23,18 @@ body { #dokuwiki__header .headings { float: left; } + [dir=rtl] #dokuwiki__header .headings { + float: right; + text-align: right; + } #dokuwiki__header .tools { float: right; text-align: right; } + [dir=rtl] #dokuwiki__header .tools { + float: left; + text-align: left; + } #dokuwiki__site .wrapper { position: relative; @@ -38,18 +46,33 @@ body { position: relative; display: block; } + [dir=rtl] #dokuwiki__aside { + float: right; + } #dokuwiki__aside > .pad { margin: 0 1.5em 0 0; } + [dir=rtl] #dokuwiki__aside > .pad { + margin: 0 0 0 1.5em; + } .hasSidebar #dokuwiki__content { float: right; margin-left: -__sidebar_width__; width: 100%; } + [dir=rtl] .hasSidebar #dokuwiki__content { + float: left; + margin-left: 0; + margin-right: -__sidebar_width__; + } .hasSidebar #dokuwiki__content > .pad { margin-left: __sidebar_width__; } + [dir=rtl] .hasSidebar #dokuwiki__content > .pad { + margin-left: 0; + margin-right: __sidebar_width__; + } #dokuwiki__footer { clear: both; diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index b52d7e652..08d1a4273 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -29,7 +29,6 @@ css/design.css = screen css/pagetools.css = screen css/content.css = screen css/includes.css = screen -css/rtl.css = screen css/mobile.css = all css/print.css = print -- cgit v1.2.3 From d5acc30de20298eb6ed7545e70484599c4d95867 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 17:36:33 +0100 Subject: rewrote and improved HTML for TOC Attention: Template authors need to adjust their CSS! Original structure: div.toc > div#toc__header.tocheader.toctoggle > span#toc__toggle.toc_close|toc_open > span div#toc__inside > ul.toc > li.level1 > div.li > span.li > a.toc New structure: div#dw__toc.open|close > h3 > strong > span ul.toc > li.toc > div.li > a --- lib/scripts/page.js | 16 ++++++++-------- lib/tpl/default/design.css | 33 ++++++++++++++++----------------- lib/tpl/default/print.css | 2 +- lib/tpl/default/rtl.css | 18 ++++++++++++------ lib/tpl/dokuwiki/css/_toc.css | 30 ++++++++++++++---------------- lib/tpl/dokuwiki/css/design.css | 26 ++++++++++++-------------- lib/tpl/dokuwiki/css/print.css | 2 +- 7 files changed, 64 insertions(+), 63 deletions(-) (limited to 'lib') diff --git a/lib/scripts/page.js b/lib/scripts/page.js index 5da4a9cc0..6e7d7faf7 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -96,26 +96,26 @@ dw_page = { * Adds the toggle switch to the TOC */ initTocToggle: function() { - var $header, $clicky, $toc, $tocul, setClicky; - $header = jQuery('#toc__header'); + var $wrapper, $header, $clicky, $toc, $tocul, setClicky; + $wrapper = jQuery('#dw__toc'); + $header = jQuery('h3', $wrapper); if(!$header.length) { return; } - $toc = jQuery('#toc__inside'); - $tocul = $toc.children('ul.toc'); + $toc = jQuery('div', $wrapper).first(); + $tocul = jQuery('ul', $toc); setClicky = function(hiding){ if(hiding){ $clicky.html('<span>+</span>'); - $clicky[0].className = 'toc_open'; + $wrapper.addClass('close').removeClass('open'); }else{ $clicky.html('<span>−</span>'); - $clicky[0].className = 'toc_close'; + $wrapper.addClass('open').removeClass('close'); } }; - $clicky = jQuery(document.createElement('span')) - .attr('id','toc__toggle'); + $clicky = jQuery(document.createElement('strong')); $header.css('cursor','pointer') .click(function () { var hidden; diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 9d2cc1844..48438527e 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -547,7 +547,7 @@ div.dokuwiki table.inline td { /* ---------- table of contents ------------------- */ -div.dokuwiki div.toc { +div.dokuwiki #dw__toc { margin: 1.2em 0 0 2em; float: right; width: 200px; @@ -555,46 +555,45 @@ div.dokuwiki div.toc { clear: both; } -div.dokuwiki div.tocheader { +div.dokuwiki #dw__toc h3 { border: 1px solid __border__; background-color: __background_alt__; text-align: left; font-weight: bold; padding: 3px; - margin-bottom: 2px; + margin: 0 0 2px 0; + font-size: 1em; } -div.dokuwiki span.toc_open, -div.dokuwiki span.toc_close { +div.dokuwiki #dw__toc h3 strong { border: 0.4em solid __background_alt__; float: right; display: block; margin: 0.4em 3px 0 0; } -div.dokuwiki span.toc_open span, -div.dokuwiki span.toc_close span { +div.dokuwiki #dw__toc h3 strong span { display: none; } -div.dokuwiki span.toc_open { +div.dokuwiki #dw__toc.close h3 strong { margin-top: 0.4em; border-top: 0.4em solid __text__; } -div.dokuwiki span.toc_close { +div.dokuwiki #dw__toc.open h3 strong { margin-top: 0; border-bottom: 0.4em solid __text__; } -div.dokuwiki #toc__inside { +div.dokuwiki #dw__toc > div { border: 1px solid __border__; background-color: __background__; text-align: left; padding: 0.5em 0 0.7em 0; } -div.dokuwiki ul.toc { +div.dokuwiki #dw__toc ul { list-style-type: none; list-style-image: none; line-height: 1.2em; @@ -602,23 +601,23 @@ div.dokuwiki ul.toc { margin: 0; } -div.dokuwiki ul.toc li { +div.dokuwiki #dw__toc ul li { background: transparent url(images/tocdot2.gif) 0 0.6em no-repeat; padding-left: 0.4em; } -div.dokuwiki ul.toc li.clear { +div.dokuwiki #dw__toc ul li.clear { background-image: none; padding-left: 0.4em; } -div.dokuwiki a.toc:link, -div.dokuwiki a.toc:visited { +div.dokuwiki #dw__toc a:link, +div.dokuwiki #dw__toc a:visited { color: __extern__; } -div.dokuwiki a.toc:hover, -div.dokuwiki a.toc:active { +div.dokuwiki #dw__toc a:hover, +div.dokuwiki #dw__toc a:active { color: __text__; } diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css index 4387dc4bf..f83e8c97c 100644 --- a/lib/tpl/default/print.css +++ b/lib/tpl/default/print.css @@ -224,5 +224,5 @@ table.inline td { border: 1px solid #000000; } -.toc, .footerinc, .header, .bar, .user { display: none; } +#dw__toc, .footerinc, .header, .bar, .user { display: none; } diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index 82c85839b..32a8ddb6d 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -89,30 +89,36 @@ div.dokuwiki div.level4 { margin-left: 0px; margin-right: 63px; } div.dokuwiki div.level5 { margin-left: 0px; margin-right: 83px; } /* TOC control */ -div.dokuwiki div.toc { +div.dokuwiki #dw__toc { float: left; + margin: 1.2em 2em 0 0; } -div.dokuwiki div.tocheader { +div.dokuwiki #dw__toc h3 { text-align: right; } -div.dokuwiki #toc__inside { +div.dokuwiki #dw__toc h3 strong { + float: left; + margin: 0.4em 0 0 3px; +} + +div.dokuwiki #dw__toc > div { text-align: right; } -div.dokuwiki ul.toc { +div.dokuwiki #dw__toc ul { padding: 0; padding-right: 1em; } -div.dokuwiki ul.toc li { +div.dokuwiki #dw__toc ul li { background-position: right 0.6em; padding-right: 0.4em; direction: rtl; } -div.dokuwiki ul.toc li.clear { +div.dokuwiki #dw__toc ul li.clear { padding-right: 0.4em; } diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css index f89bce6c1..e62bb0a7a 100644 --- a/lib/tpl/dokuwiki/css/_toc.css +++ b/lib/tpl/dokuwiki/css/_toc.css @@ -7,68 +7,66 @@ ********************************************************************/ /* toc container */ -.dokuwiki div.toc { +#dw__toc { float: right; margin: 0 0 1.4em 1.4em; width: 12em; background-color: __background_alt__; color: inherit; } -[dir=rtl] .dokuwiki div.toc { +[dir=rtl] #dw__toc { float: left; margin: 0 1.4em 1.4em 0; } /*____________ toc header ____________*/ -.dokuwiki div.tocheader { +#dw__toc h3 { padding: .2em .5em; font-weight: bold; } -.dokuwiki .toc span.toc_open, -.dokuwiki .toc span.toc_close { +#dw__toc h3 strong { float: right; margin: 0 .2em; } -[dir=rtl] .dokuwiki .toc span.toc_open, -[dir=rtl] .dokuwiki .toc span.toc_close { +[dir=rtl] #dw__toc h3 strong { float: left; } /*____________ toc list ____________*/ -.dokuwiki #toc__inside { +#dw__toc > div { padding: .2em .5em; } -.dokuwiki #toc__inside ul { +#dw__toc ul { padding: 0; margin: 0; } -.dokuwiki #toc__inside ul li { +#dw__toc ul li { list-style: none; padding: 0; margin: 0; line-height: 1.1; } -.dokuwiki #toc__inside ul li div.li { +#dw__toc ul li div.li { padding: .15em 0; } -.dokuwiki #toc__inside ul ul { +#dw__toc ul ul { padding-left: 1em; } -[dir=rtl] .dokuwiki #toc__inside ul ul { +[dir=rtl] #dw__toc ul ul { padding-left: 0; padding-right: 1em; } -.dokuwiki #toc__inside ul ul li { +#dw__toc ul ul li { } -.dokuwiki #toc__inside ul li a { +#dw__toc ul li a { } /* in case of toc list jumping one level (e.g. if heading level 3 follows directly after heading level 1) */ -.dokuwiki #toc__inside ul li.clear { +#dw__toc ul li.clear { } diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index f73985ed7..8ebeca6da 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -392,60 +392,58 @@ /*____________ changes to _toc ____________*/ -.dokuwiki div.toc { +#dw__toc { margin: -2em -2em .5em 1.4em; width: __sidebar_width__; border-left: 1px solid __border__; background: __background__; color: inherit; } -[dir=rtl] .dokuwiki div.toc { +[dir=rtl] #dw__toc { margin: -2em 1.4em .5em -2em; border-left-width: 0; border-right: 1px solid __border__; } -.dokuwiki div.tocheader { +#dw__toc h3 { padding: .5em 1em; margin-bottom: 0; font-size: .875em; letter-spacing: .1em; } -.dokuwiki .toc span.toc_open, -.dokuwiki .toc span.toc_close { +#dw__toc h3 strong { background: transparent url(images/toc-arrows.png) 0 0; width: 8px; height: 5px; margin: .4em 0 0; } -.dokuwiki .toc span.toc_open { +#dw__toc.close strong { background-position: 0 -5px; } -.dokuwiki .toc span.toc_open span, -.dokuwiki .toc span.toc_close span { +#dw__toc strong span { display: none; } -.dokuwiki #toc__inside { +#dw__toc > div { font-size: 0.875em; padding: .5em 1em 1em; } -.dokuwiki #toc__inside ul { +#dw__toc ul { padding: 0 0 0 1.2em; } -[dir=rtl] .dokuwiki #toc__inside ul { +[dir=rtl] #dw__toc ul { padding: 0 1.5em 0 0; } -.dokuwiki #toc__inside ul li { +#dw__toc ul li { list-style-image: url(images/toc-bullet.png); } -.dokuwiki #toc__inside ul li.clear { +#dw__toc ul li.clear { list-style: none; } -.dokuwiki #toc__inside ul li div.li { +#dw__toc ul li div.li { padding: .2em 0; } diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index f4f81d741..f6bf64dd9 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -21,7 +21,7 @@ div.error, #dokuwiki__header .tools, #dokuwiki__aside, .dokuwiki .breadcrumbs, -.dokuwiki .toc, +#dw__toc, .dokuwiki .secedit, #dokuwiki__pagetools, #dokuwiki__footer { -- cgit v1.2.3 From 91b05b6bf9cb9fd3aeced777159422f4e8114a9c Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 19:06:15 +0100 Subject: improved HTML for search results Attention: Template authors need to adjust their CSS! Original structure: div.search_result > a.wikilink1 > span.search_cnt br div.search_snippet New structure: dl.search_results > dt > a.wikilink1 dd --- lib/tpl/default/design.css | 14 +++++++++++--- lib/tpl/dokuwiki/css/_search.css | 20 ++++++++++++++------ 2 files changed, 25 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 48438527e..300b62a15 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -706,12 +706,20 @@ div.insitu-footnote { } /* --------------- search result formating --------------- */ -div.dokuwiki .search_result { - margin-bottom: 6px; +#dw__loading { + text-align: center; + margin-bottom: 1em; +} + +div.dokuwiki .search_results { padding: 0 10px 0 30px; } -div.dokuwiki .search_snippet { +div.dokuwiki .search_results dt { + margin-bottom: 3px; +} +div.dokuwiki .search_results dd { + margin-bottom: 6px; color: __text_other__; font-size: 12px; margin-left: 20px; diff --git a/lib/tpl/dokuwiki/css/_search.css b/lib/tpl/dokuwiki/css/_search.css index 446efe331..0090308c9 100644 --- a/lib/tpl/dokuwiki/css/_search.css +++ b/lib/tpl/dokuwiki/css/_search.css @@ -8,6 +8,8 @@ /* loading gif */ #dw__loading { + text-align: center; + margin-bottom: 1.4em; } /*____________ matching pagenames ____________*/ @@ -31,14 +33,20 @@ /*____________ search results ____________*/ -/* container for one search result */ -.dokuwiki div.search_result { - margin-bottom: 1.4em; +.dokuwiki dl.search_results { + margin-bottom: 1.2em; +} + +/* search heading */ +.dokuwiki dl.search_results dt { + font-weight: normal; + margin-bottom: .2em; } /* search snippet */ -.dokuwiki div.search_result div.search_snippet { +.dokuwiki dl.search_results dd { color: __text_alt__; background-color: inherit; + margin: 0 0 1.2em 0; } /* search hit in normal text */ @@ -47,11 +55,11 @@ background-color: __highlight__; } /* search hit in search results */ -.dokuwiki div.search_result strong.search_hit { +.dokuwiki .search_results strong.search_hit { font-weight: normal; } /* ellipsis separating snippets */ -.dokuwiki div.search_result .search_sep { +.dokuwiki .search_results .search_sep { color: __text__; background-color: inherit; } -- cgit v1.2.3 From 3d2fd76a6a87ddf4a45c05091799c09500265307 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 19:08:20 +0100 Subject: added accidentally removed jquery-ui styles back again --- lib/exe/css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index 5468376c6..1b2b0c86b 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -71,7 +71,7 @@ function css_out(){ $files[DOKU_INC.'lib/styles/'.$mediatype.'.css'] = DOKU_BASE.'lib/styles/'; // load jQuery-UI theme if ($mediatype == 'screen') { - //$files[DOKU_INC.'lib/scripts/jquery/jquery-ui-theme/smoothness.css'] = DOKU_BASE.'lib/scripts/jquery/jquery-ui-theme/'; + $files[DOKU_INC.'lib/scripts/jquery/jquery-ui-theme/smoothness.css'] = DOKU_BASE.'lib/scripts/jquery/jquery-ui-theme/'; } // load plugin styles $files = array_merge($files, css_pluginstyles($mediatype)); -- cgit v1.2.3 From 79504989f948613597d5516c9b31ba7e1529a303 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 19:49:03 +0100 Subject: moved plugins' rtl.css to their style.css counterpart (part of FS#2185) --- lib/plugins/acl/rtl.css | 40 ---------------------------------- lib/plugins/acl/style.css | 31 +++++++++++++++++++++++++++ lib/plugins/config/rtl.css | 45 -------------------------------------- lib/plugins/config/style.css | 36 +++++++++++++++++++++++++++++++ lib/plugins/plugin/rtl.css | 51 -------------------------------------------- lib/plugins/plugin/style.css | 39 +++++++++++++++++++++++++++++++++ 6 files changed, 106 insertions(+), 136 deletions(-) delete mode 100644 lib/plugins/acl/rtl.css delete mode 100644 lib/plugins/config/rtl.css delete mode 100644 lib/plugins/plugin/rtl.css (limited to 'lib') diff --git a/lib/plugins/acl/rtl.css b/lib/plugins/acl/rtl.css deleted file mode 100644 index e79abe596..000000000 --- a/lib/plugins/acl/rtl.css +++ /dev/null @@ -1,40 +0,0 @@ -div#acl_manager div#acl__tree { - float: right; - text-align: right; -} - -div#acl_manager div#acl__tree li { - padding-left: 0em; - padding-right: 1em; -} - -div#acl_manager div#acl__tree ul img { - margin-left: 0.25em; - margin-right: 0em; -} - - -div#acl_manager div#acl__detail { - float: left; -} - -div#acl_manager .aclgroup { - background: transparent url(pix/group.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .acluser { - background: transparent url(pix/user.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .aclpage { - background: transparent url(pix/page.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .aclns { - background: transparent url(pix/ns.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css index b7154aa78..2eee4f41c 100644 --- a/lib/plugins/acl/style.css +++ b/lib/plugins/acl/style.css @@ -8,6 +8,10 @@ div#acl_manager div#acl__tree { border: 1px solid __border__; text-align: left; } +[dir=rtl] div#acl_manager div#acl__tree { + float: right; + text-align: right; +} div#acl_manager div#acl__tree a.cur { background-color: __highlight__; @@ -24,11 +28,19 @@ div#acl_manager div#acl__tree li { padding-left: 1em; list-style-image: none; } +[dir=rtl] div#acl_manager div#acl__tree li { + padding-left: 0em; + padding-right: 1em; +} div#acl_manager div#acl__tree ul img { margin-right: 0.25em; cursor: pointer; } +[dir=rtl] div#acl_manager div#acl__tree ul img { + margin-left: 0.25em; + margin-right: 0em; +} div#acl_manager div#acl__detail { width: 73%; @@ -36,6 +48,9 @@ div#acl_manager div#acl__detail { float: right; overflow: auto; } +[dir=rtl] div#acl_manager div#acl__detail { + float: left; +} div#acl_manager div#acl__detail fieldset { width: 90%; @@ -56,21 +71,37 @@ div#acl_manager .aclgroup { background: transparent url(pix/group.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclgroup { + background: transparent url(pix/group.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .acluser { background: transparent url(pix/user.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .acluser { + background: transparent url(pix/user.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .aclpage { background: transparent url(pix/page.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclpage { + background: transparent url(pix/page.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .aclns { background: transparent url(pix/ns.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclns { + background: transparent url(pix/ns.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager label.disabled { color: __text_neu__!important; diff --git a/lib/plugins/config/rtl.css b/lib/plugins/config/rtl.css deleted file mode 100644 index b8b9660e2..000000000 --- a/lib/plugins/config/rtl.css +++ /dev/null @@ -1,45 +0,0 @@ -#config__manager fieldset { - clear: both; -} - -#config__manager fieldset td { - text-align: right; -} - -#config__manager label { - text-align: right; -} - -#config__manager td.value input.checkbox { - float: right; - padding-left: 0; - padding-right: 0.7em; -} - -#config__manager td.value label { - float: left; -} - -#config__manager td.label { - padding: 0.8em 1em 0.6em 0; -} - -#config__manager td.label span.outkey { - float: right; - margin-right: 1em; -} - -#config__manager td.label label { - clear: right; -} - -#config__manager td.label img { - float: left; -} - -#config__manager .selection { - width: 14.8em; - float: right; - margin: 0 0 2px 0.3em; -} - diff --git a/lib/plugins/config/style.css b/lib/plugins/config/style.css index 65c44a758..1be94feb9 100644 --- a/lib/plugins/config/style.css +++ b/lib/plugins/config/style.css @@ -15,6 +15,9 @@ color: __text__; padding: 0 1em; } +[dir=rtl] #config__manager fieldset { + clear: both; +} #config__manager legend { font-size: 1.25em; } @@ -28,25 +31,49 @@ #config__manager fieldset td { text-align: left; } +[dir=rtl] #config__manager fieldset td { + text-align: right; +} #config__manager fieldset td.value { /* fixed data column width */ width: 31em; } +[dir=rtl] #config__manager label { + text-align: right; +} +[dir=rtl] #config__manager td.value input.checkbox { + float: right; + padding-left: 0; + padding-right: 0.7em; +} +[dir=rtl] #config__manager td.value label { + float: left; +} + #config__manager td.label { padding: 0.8em 0 0.6em 1em; vertical-align: top; } +[dir=rtl] #config__manager td.label { + padding: 0.8em 1em 0.6em 0; +} #config__manager td.label label { clear: left; display: block; } +[dir=rtl] #config__manager td.label label { + clear: right; +} #config__manager td.label img { padding: 0 10px; vertical-align: middle; float: right; } +[dir=rtl] #config__manager td.label img { + float: left; +} #config__manager td.label span.outkey { font-size: 70%; @@ -60,6 +87,10 @@ position: relative; z-index: 1; } +[dir=rtl] #config__manager td.label span.outkey { + float: right; + margin-right: 1em; +} #config__manager td input.edit { width: 30em; @@ -106,6 +137,11 @@ float: left; margin: 0 0.3em 2px 0; } +[dir=rtl] #config__manager .selection { + width: 14.8em; + float: right; + margin: 0 0 2px 0.3em; +} #config__manager .selection label { float: right; diff --git a/lib/plugins/plugin/rtl.css b/lib/plugins/plugin/rtl.css deleted file mode 100644 index 6ababd8e0..000000000 --- a/lib/plugins/plugin/rtl.css +++ /dev/null @@ -1,51 +0,0 @@ - -#plugin__manager .pm_menu, -#plugin__manager .pm_info, -#plugin__manager p, -#plugin__manager label { - text-align: right; -} - -#plugin__manager .pm_menu { - float: right; -} - -#plugin__manager .pm_info { - float: left; -} - -#plugin__manager .pm_info dt { - float: right; - clear: right; -} - -#plugin__manager .pm_info dd { - margin: 0 7em 0 0; -} - -#plugin__manager .common fieldset { - text-align: right; -} - - -#plugin__manager .plugins .legend { - text-align: right; - float: right; -} - -#plugin__manager .plugins .enable { - float: right; - margin-right: 0; - margin-left: 0.5em; -} - -#plugin__manager .plugins .button { - float: left; - margin-right: 0.5em; -} - - -#plugin__manager .plugins fieldset.buttons .button { - float: right; -} - diff --git a/lib/plugins/plugin/style.css b/lib/plugins/plugin/style.css index de6cca579..9433e6001 100644 --- a/lib/plugins/plugin/style.css +++ b/lib/plugins/plugin/style.css @@ -52,15 +52,28 @@ text-align: left; } +[dir=rtl] #plugin__manager .pm_menu, +[dir=rtl] #plugin__manager .pm_info, +[dir=rtl] #plugin__manager p, +[dir=rtl] #plugin__manager label { + text-align: right; +} + #plugin__manager .pm_menu { float: left; width: 48%; } +[dir=rtl] #plugin__manager .pm_menu { + float: right; +} #plugin__manager .pm_info { float: right; width: 50%; } +[dir=rtl] #plugin__manager .pm_info { + float: left; +} #plugin__manager .common fieldset { margin: 0; @@ -68,6 +81,9 @@ text-align: left; border: none; } +[dir=rtl] #plugin__manager .common fieldset { + text-align: right; +} #plugin__manager .common label { padding: 0 0 0.5em 0; @@ -111,6 +127,10 @@ padding: 0; clear: none; } +[dir=rtl] #plugin__manager .plugins .legend { + text-align: right; + float: right; +} #plugin__manager .plugins .button { font-size: 95%; @@ -123,6 +143,13 @@ #plugin__manager .plugins fieldset.buttons .button { float: left; } +[dir=rtl] #plugin__manager .plugins .button { + float: left; + margin-right: 0.5em; +} +[dir=rtl] #plugin__manager .plugins fieldset.buttons .button { + float: right; +} #plugin__manager .pm_info h3 { margin-left: 0; @@ -140,17 +167,29 @@ margin: 0; padding: 0; } +[dir=rtl] #plugin__manager .pm_info dt { + float: right; + clear: right; +} #plugin__manager .pm_info dd { margin: 0 0 0 7em; padding: 0; background: none; } +[dir=rtl] #plugin__manager .pm_info dd { + margin: 0 7em 0 0; +} #plugin__manager .plugins .enable { float: left; width: auto; margin-right: 0.5em; } +[dir=rtl] #plugin__manager .plugins .enable { + float: right; + margin-right: 0; + margin-left: 0.5em; +} /* end admin plugin styles */ -- cgit v1.2.3 From 47260a57d569ff440e40a675d0afde195befbfcd Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 19:52:06 +0100 Subject: added minimal RTL print styles (part of FS#2185) --- lib/tpl/dokuwiki/css/print.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index f4f81d741..58b8a5f0d 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -137,6 +137,9 @@ div.clearer { border: solid #ccc; border-width: 0 0 0 2pt; } +[dir=rtl] .dokuwiki blockquote { + border-width: 0 2pt 0 0; +} /* tables */ .dokuwiki table { @@ -153,6 +156,10 @@ div.clearer { border: 1pt solid #666; text-align: left; } +[dir=rtl] .dokuwiki th, +[dir=rtl] .dokuwiki td { + text-align: right; +} .dokuwiki th { font-weight: bold; } @@ -173,6 +180,11 @@ div.clearer { float: left; margin-right: .5em; } +[dir=rtl] #dokuwiki__header h1 img { + float: right; + margin-right: 0; + margin-left: .5em; +} .dokuwiki div.footnotes { clear: both; border-top: 1pt solid #000; -- cgit v1.2.3 From bd28ae8066c753421603f70737fa91fa9697ec58 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 19:54:20 +0100 Subject: when there's not enough space for images, make sure they stay proportional (might be FS#2480) --- lib/tpl/dokuwiki/css/basic.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index c8e0c435e..7ffe42ec4 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -195,6 +195,7 @@ img { img, object { max-width: 100%; + height: auto; } hr { -- cgit v1.2.3 From bed6e6e5baa092db263210240784e7e640729579 Mon Sep 17 00:00:00 2001 From: Usama Akkad <uahello@gmail.com> Date: Wed, 11 Apr 2012 23:02:09 +0200 Subject: Arabic Language Update --- lib/plugins/config/lang/ar/lang.php | 11 +++++++++++ lib/plugins/plugin/lang/ar/lang.php | 1 + 2 files changed, 12 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php index 3855f4ac1..2e55446ec 100644 --- a/lib/plugins/config/lang/ar/lang.php +++ b/lib/plugins/config/lang/ar/lang.php @@ -41,9 +41,13 @@ $lang['lang'] = 'لغة الواجهة'; $lang['basedir'] = 'مسار الخادوم (مثال. <code>/dokuwiki/</code>) اترك فارغا للاكتشاف التلقائي.'; $lang['baseurl'] = 'عنوان الخادوم (مثال. <code>http://www.yourserver.com</code>). اترك فارغا للاكتشاف التلقائي.'; $lang['savedir'] = 'دليل حفظ البيانات'; +$lang['cookiedir'] = 'مسار الكعكات. اترك فارغا لاستخدام baseurl.'; $lang['start'] = 'اسم صفحة البداية'; $lang['title'] = 'عنوان الويكي'; $lang['template'] = 'القالب'; +$lang['tagline'] = 'Tagline (في حال دعم القالب له) +'; +$lang['sidebar'] = 'اسم صفحة الشريط الجانبي (في حال دعم القالب له). تركه فارغا يعطل الشريط الجانبي.'; $lang['license'] = 'تحت أي رخصة تريد اصدار المحتوى؟'; $lang['fullpath'] = 'اظهر المحتوى الكامل للصفحات في '; $lang['recent'] = 'أحدث التغييرات'; @@ -64,6 +68,7 @@ $lang['useheading'] = 'استخدم اول ترويسة كأسم لل $lang['refcheck'] = 'التحقق من مرجع الوسائط'; $lang['refshow'] = 'عدد مراجع الوسائط لتعرض'; $lang['allowdebug'] = 'مكّن التنقيح <b>عطّلها إن لم تكن بحاجلة لها!</b>'; +$lang['mediarevisions'] = 'تفعيل إصدارات الوسائط؟'; $lang['usewordblock'] = 'احجز الغثاء بناء على قائمة كلمات'; $lang['indexdelay'] = 'التأخير قبل الفهرسة (ثوان)'; $lang['relnofollow'] = 'استخدم rel="nofollow" للروابط الخارجية'; @@ -86,6 +91,8 @@ $lang['disableactions_other'] = 'اجراءات أخرى (مفصولة بالف $lang['sneaky_index'] = 'افتراضيا، ستعرض دوكو ويكي كل اسماء النطاقات في عرض الفهرس. تفعيل هذا الخيار سيخفي مالا يملك المستخدم صلاحية قراءته. قد يؤدي هذا إلى اخفاء نطاقات فرعية متاحة. وقد يؤدي لجعل صفحة الفهرس معطلة في بعض اعدادات ACL.'; $lang['auth_security_timeout'] = 'زمن انتهاء أمان المواثقة (ثوان)'; $lang['securecookie'] = 'هل يفرض على كعكات التصفح المعدة عبر HTTPS ان ترسل فقط عبر HTTPS من قبل المتصفح؟ عطل هذا إن كان الولوج للويكي مؤمنا فقط عبر SSL لكن تصفح الويكي غير مؤمن.'; +$lang['remote'] = 'مكّن نظام API البعيد. يسمح هذا لبرامج أخرى بالوصول للويكي عبر XML-RPC أو آليات أخرى.'; +$lang['remoteuser'] = 'احصر الوصول البعيد ل API لمستخدمين ومجموعات يفصل بينها بالفاصلة هنا. اترك فارغا لتمكين الجميع.'; $lang['updatecheck'] = 'تحقق من التحديثات و تنبيهات الأمان؟ دوكو ويكي ستحتاج للاتصال ب update.dokuwiki.org لأجل ذلك'; $lang['userewrite'] = 'استعمل عناوين URLs جميلة'; $lang['useslash'] = 'استخدم الشرطة كفاصل النطاق في العناوين'; @@ -109,10 +116,13 @@ $lang['jpg_quality'] = 'دقة ضغط JPG (0-100)'; $lang['subscribers'] = 'مكن دعم اشتراك الصفحة'; $lang['subscribe_time'] = 'المهلة بعد ارسال قوائم الاشتراكات والملخصات (ثوان); هذا يجب أن يكون أقل من الوقت المخصص في أيام أحدث التغييرات.'; $lang['compress'] = 'رُص مخرجات CSS و جافا سكربت'; +$lang['cssdatauri'] = 'الحجم بالبايتات للصور المذكورة في CSS التي ستُضمن في صفحة-التنسيق لخفض طلبات HTTP. لن تعمل هذه التقنية في IE 7 أو أقل! <code>400</code> إلى <code>600</code> بايت تعد قيمة جيدة. اضبط إلى <code>0</code> لتعطلها.'; $lang['hidepages'] = 'أخف الصفحات المنطبق عليها (تعابير شرطية)'; $lang['send404'] = 'ارسل "HTTP 404/Page Not Found" للصفحات غير الموجودة'; $lang['sitemap'] = 'ولد خرائط موقع جوجل (أيام)'; +$lang['broken_iua'] = 'هل الوظيفة ignore_user_abort معطلة على جهازك؟ قد يؤدي ذلك لتعطيل فهرسة البحث. IIS+PHP/CGI تعرف بأنها لاتعمل. أنظر <a href="http://bugs.splitbrain.org/?do=details&task_id=852">العلة 852</a> لمزيد من المعلومات.'; $lang['xsendfile'] = 'استخدم ترويسة X-Sendfile لتمكين خادم الوب من تقديم ملفات ثابتة؟ يجب أن يكون خادم الوب داعما له.'; +$lang['renderer_xhtml'] = 'المحرك ليستخدم لمخرجات الويكي الأساسية وفق (xhtml).'; $lang['renderer__core'] = '%s (نواة دوكو ويكي)'; $lang['renderer__plugin'] = '%s (ملحق)'; $lang['rememberme'] = 'اسمح بكعكات الدخول الدائم (تذكرني)'; @@ -122,6 +132,7 @@ $lang['rss_content'] = 'مالذي يعرض في عناصر تلقيم $lang['rss_update'] = 'تحديث تلقيم XML (ثوان)'; $lang['recent_days'] = 'مدة إبقاء أحدث التغييرات (ايام)'; $lang['rss_show_summary'] = 'تلقيم XML يظهر ملخصا في العنوان'; +$lang['rss_media'] = 'مانوع التغييرات التي ستدرج في تغذية XML؟'; $lang['target____wiki'] = 'النافذة الهدف للروابط الداخلية'; $lang['target____interwiki'] = 'النافذة الهدف للروابط الممرة interwiki'; $lang['target____extern'] = 'النافذة الهدف للروابط الخارجية'; diff --git a/lib/plugins/plugin/lang/ar/lang.php b/lib/plugins/plugin/lang/ar/lang.php index fbc6d3c36..8327e5ce3 100644 --- a/lib/plugins/plugin/lang/ar/lang.php +++ b/lib/plugins/plugin/lang/ar/lang.php @@ -50,3 +50,4 @@ $lang['enabled'] = 'الاضافة %s فُعلت. '; $lang['notenabled'] = 'تعذر تفعيل الاضافة %s، تحقق من اذونات الملف.'; $lang['disabled'] = 'عُطلت الإضافة %s.'; $lang['notdisabled'] = 'تعذر تعطيل الإضافة %s، تحقق من اذونات الملف.'; +$lang['packageinstalled'] = 'حزمة الإضافة (%d plugin(s): %Xs) ثبتت بنجاج.'; -- cgit v1.2.3 From 026b314868ee80aca644bf4107f78d8e8052b43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel-Emeric=20Andra=C5=9Fi?= <em.andrasi@mandrivausers.ro> Date: Sun, 15 Apr 2012 12:47:43 +0200 Subject: Romanian language update --- lib/plugins/acl/lang/ro/lang.php | 1 + lib/plugins/config/lang/ro/lang.php | 6 ++++++ lib/plugins/plugin/lang/ro/lang.php | 1 + lib/plugins/popularity/lang/ro/lang.php | 1 + lib/plugins/revert/lang/ro/lang.php | 1 + lib/plugins/usermanager/lang/ro/lang.php | 1 + 6 files changed, 11 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php index c278c918e..4d093216b 100644 --- a/lib/plugins/acl/lang/ro/lang.php +++ b/lib/plugins/acl/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index d638e1eec..72b205b90 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Setări de Configurare'; $lang['error'] = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou. <br /> Valorile incorecte vor apărea într-un chenar roşu.'; @@ -48,6 +49,8 @@ $lang['cookiedir'] = 'Cale Cookie. Lăsați gol pentru a utiliza bas $lang['start'] = 'Numele paginii de start'; $lang['title'] = 'Titlul wiki'; $lang['template'] = 'Şablon'; +$lang['tagline'] = 'Slogan (dacă templateul suportă opțiunea)'; +$lang['sidebar'] = 'Numele paginii barei laterale (dacă templateul suportă opțiunea), câmpul lăsat gol dezactivează bara laterală'; $lang['license'] = 'Sub ce licenţă va fi publicat conţinutul?'; $lang['fullpath'] = 'Arată calea completă a paginii în subsol'; $lang['recent'] = 'Modificări recente'; @@ -91,6 +94,8 @@ $lang['disableactions_other'] = 'Alte acţiuni (separate prin virgulă)'; $lang['sneaky_index'] = 'Implicit, DokuWiki va arăta toate numele de spaţii la vizualizarea indexului. Activând această opţiune vor fi ascunse acelea la care utilizatorul nu are drepturi de citire. Aceasta poate determina ascunderea sub-numelor de spaţii accesibile. Aceasta poate face index-ul inutilizabil cu anumite setări ale ACL'; $lang['auth_security_timeout'] = 'Timpul de expirare al Autentificării Securizate (secunde)'; $lang['securecookie'] = 'Cookies-urile setate via HTTPS să fie trimise doar via HTTPS de către browser? Dezactivaţi această opţiune numai când login-ul wiki-ului este securizat cu SSL dar navigarea wiki-ului se realizează nesecurizat.'; +$lang['remote'] = 'Activează sistemul remote API. Acesta permite altor aplicații să acceseze wiki-ul via XML-RPC sau alte mecanisme.'; +$lang['remoteuser'] = 'Restricționează accesul sistemului remote API la grupurile sau utilizatorii următori (separați prin virgulă). Lăsați câmpul gol pentru a da acces către toți.'; $lang['updatecheck'] = 'Verificare actualizări şi avertismente privind securitatea? DokuWiki trebuie să contacteze update.dokuwiki.org pentru această facilitate.'; $lang['userewrite'] = 'Folosire URL-uri "nice"'; $lang['useslash'] = 'Foloseşte slash-ul ca separator de spaţii de nume în URL-uri'; @@ -130,6 +135,7 @@ $lang['rss_content'] = 'Ce să afişez în obiectele fluxurilor XML'; $lang['rss_update'] = 'Intervalul de actualizare a fluxului XML (sec)'; $lang['recent_days'] = 'Câte modificări recente să se păstreze?'; $lang['rss_show_summary'] = 'Fluxul XML arată rezumat în titlu'; +$lang['rss_media'] = 'Ce fel de modificări ar trebui afișate în fluxul XML?'; $lang['target____wiki'] = 'Fereastra ţintă pentru legăturile interne'; $lang['target____interwiki'] = 'Fereastra ţintă pentru legăturile interwiki'; $lang['target____extern'] = 'Fereastra ţintă pentru legăturile externe'; diff --git a/lib/plugins/plugin/lang/ro/lang.php b/lib/plugins/plugin/lang/ro/lang.php index 50f6ca6f6..c57647e0b 100644 --- a/lib/plugins/plugin/lang/ro/lang.php +++ b/lib/plugins/plugin/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Administrează plugin-uri'; $lang['download'] = 'Descarcă şi instalează un nou plugin'; diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php index 9e9086b0d..8ba119dcb 100644 --- a/lib/plugins/popularity/lang/ro/lang.php +++ b/lib/plugins/popularity/lang/ro/lang.php @@ -8,6 +8,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['name'] = 'Feedback de popularitate (încărcarea poate dura mai mult)'; $lang['submit'] = 'Trimite datele'; diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php index f1fcf727c..5ea802575 100644 --- a/lib/plugins/revert/lang/ro/lang.php +++ b/lib/plugins/revert/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Manager Reveniri'; $lang['filter'] = 'Caută pagini cu posibil spam'; diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php index 7aac6cfb0..1b33cc4f8 100644 --- a/lib/plugins/usermanager/lang/ro/lang.php +++ b/lib/plugins/usermanager/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Manager Utilizatori'; $lang['noauth'] = '(autentificarea utilizatorilor nu este disponibilă)'; -- cgit v1.2.3 From 2398a2b54196667d6659d3d0489212b271c43703 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sun, 15 Apr 2012 13:25:05 +0200 Subject: made it possible to disable HTML mails in the config --- lib/plugins/config/lang/en/lang.php | 1 + lib/plugins/config/settings/config.metadata.php | 1 + 2 files changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 380f2fd1d..fc27e5158 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -127,6 +127,7 @@ $lang['notify'] = 'Send change notifications to this email address'; $lang['registernotify'] = 'Send info on newly registered users to this email address'; $lang['mailfrom'] = 'Email address to use for automatic mails'; $lang['mailprefix'] = 'Email subject prefix to use for automatic mails'; +$lang['htmlmail'] = 'Send better looking but larger in size HTML multipart emails. Disable for plain text only mails.'; $lang['gzip_output'] = 'Use gzip Content-Encoding for xhtml'; $lang['gdlib'] = 'GD Lib version'; $lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5f2c32ea7..60ea6a4c2 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -179,6 +179,7 @@ $meta['fnencode'] = array('multichoice','_choices' => array('url','safe','utf $meta['autoplural'] = array('onoff'); $meta['mailfrom'] = array('richemail'); $meta['mailprefix'] = array('string'); +$meta['htmlmail'] = array('onoff'); $meta['compress'] = array('onoff'); $meta['cssdatauri'] = array('numeric','_pattern' => '/^\d+$/'); $meta['gzip_output'] = array('onoff'); -- cgit v1.2.3 From 7cd0713ea65947455fd790e72d67409e261fcd1f Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sun, 15 Apr 2012 14:57:20 +0200 Subject: rearranged the config options We had a lot of options lumped together under "Advanced Settings". I introduced two more categories and move a few options to other existing categories. I also reordered the appropriate entries in the source files to make it easier to find stuff when extending the options. --- lib/plugins/config/lang/en/lang.php | 124 +++++++++++++----------- lib/plugins/config/settings/config.metadata.php | 40 ++++---- 2 files changed, 91 insertions(+), 73 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 2151d7543..3ce70528f 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -36,6 +36,8 @@ $lang['_anti_spam'] = 'Anti-Spam Settings'; $lang['_editing'] = 'Editing Settings'; $lang['_links'] = 'Link Settings'; $lang['_media'] = 'Media Settings'; +$lang['_notifications'] = 'Notification Settings'; +$lang['_syndication'] = 'Syndication Settings'; $lang['_advanced'] = 'Advanced Settings'; $lang['_network'] = 'Network Settings'; // The settings group name for plugins and templates can be set with @@ -52,28 +54,32 @@ $lang['_msg_setting_no_default'] = 'No default value.'; /* -------------------- Config Options --------------------------- */ -$lang['fmode'] = 'File creation mode'; -$lang['dmode'] = 'Directory creation mode'; -$lang['lang'] = 'Interface language'; -$lang['basedir'] = 'Server path (eg. <code>/dokuwiki/</code>). Leave blank for autodetection.'; -$lang['baseurl'] = 'Server URL (eg. <code>http://www.yourserver.com</code>). Leave blank for autodetection.'; -$lang['savedir'] = 'Directory for saving data'; -$lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.'; -$lang['start'] = 'Start page name'; +/* Basic Settings */ $lang['title'] = 'Wiki title'; +$lang['start'] = 'Start page name'; +$lang['lang'] = 'Interface language'; $lang['template'] = 'Template'; $lang['tagline'] = 'Tagline (if template supports it)'; $lang['sidebar'] = 'Sidebar page name (if template supports it), empty field disables the sidebar'; $lang['license'] = 'Under which license should your content be released?'; -$lang['fullpath'] = 'Reveal full path of pages in the footer'; +$lang['savedir'] = 'Directory for saving data'; +$lang['basedir'] = 'Server path (eg. <code>/dokuwiki/</code>). Leave blank for autodetection.'; +$lang['baseurl'] = 'Server URL (eg. <code>http://www.yourserver.com</code>). Leave blank for autodetection.'; +$lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.'; +$lang['dmode'] = 'Directory creation mode'; +$lang['fmode'] = 'File creation mode'; +$lang['allowdebug'] = 'Allow debug <b>disable if not needed!</b>'; + +/* Display Settings */ $lang['recent'] = 'Recent changes'; +$lang['recent_days'] = 'How many recent changes to keep (days)'; $lang['breadcrumbs'] = 'Number of breadcrumbs'; $lang['youarehere'] = 'Hierarchical breadcrumbs'; +$lang['fullpath'] = 'Reveal full path of pages in the footer'; $lang['typography'] = 'Do typographical replacements'; -$lang['htmlok'] = 'Allow embedded HTML'; -$lang['phpok'] = 'Allow embedded PHP'; $lang['dformat'] = 'Date format (see PHP\'s <a href="http://www.php.net/strftime">strftime</a> function)'; $lang['signature'] = 'Signature'; +$lang['showuseras'] = 'What to display when showing the user that last edited a page'; $lang['toptoclevel'] = 'Top level for table of contents'; $lang['tocminheads'] = 'Minimum amount of headlines that determines whether the TOC is built'; $lang['maxtoclevel'] = 'Maximum level for table of contents'; @@ -81,19 +87,10 @@ $lang['maxseclevel'] = 'Maximum section edit level'; $lang['camelcase'] = 'Use CamelCase for links'; $lang['deaccent'] = 'Clean pagenames'; $lang['useheading'] = 'Use first heading for pagenames'; -$lang['refcheck'] = 'Media reference check'; -$lang['refshow'] = 'Number of media references to show'; -$lang['allowdebug'] = 'Allow debug <b>disable if not needed!</b>'; -$lang['mediarevisions'] = 'Enable Mediarevisions?'; - -$lang['usewordblock']= 'Block spam based on wordlist'; -$lang['indexdelay'] = 'Time delay before indexing (sec)'; -$lang['relnofollow'] = 'Use rel="nofollow" on external links'; -$lang['mailguard'] = 'Obfuscate email addresses'; -$lang['iexssprotect']= 'Check uploaded files for possibly malicious JavaScript or HTML code'; -$lang['showuseras'] = 'What to display when showing the user that last edited a page'; +$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; +$lang['hidepages'] = 'Hide matching pages (regular expressions)'; -/* Authentication Options */ +/* Authentication Settings */ $lang['useacl'] = 'Use access control lists'; $lang['autopasswd'] = 'Autogenerate passwords'; $lang['authtype'] = 'Authentication backend'; @@ -102,66 +99,82 @@ $lang['defaultgroup']= 'Default group'; $lang['superuser'] = 'Superuser - group, user or comma separated list user1,@group1,user2 with full access to all pages and functions regardless of the ACL settings'; $lang['manager'] = 'Manager - group, user or comma separated list user1,@group1,user2 with access to certain management functions'; $lang['profileconfirm'] = 'Confirm profile changes with password'; +$lang['rememberme'] = 'Allow permanent login cookies (remember me)'; $lang['disableactions'] = 'Disable DokuWiki actions'; $lang['disableactions_check'] = 'Check'; $lang['disableactions_subscription'] = 'Subscribe/Unsubscribe'; $lang['disableactions_wikicode'] = 'View source/Export Raw'; $lang['disableactions_other'] = 'Other actions (comma separated)'; -$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; $lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)'; $lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.'; $lang['remote'] = 'Enable the remote API system. This allows other applications to access the wiki via XML-RPC or other mechanisms.'; $lang['remoteuser'] = 'Restrict remote API access to the comma separated groups or users given here. Leave empty to give access to everyone.'; +/* Anti-Spam Settings */ +$lang['usewordblock']= 'Block spam based on wordlist'; +$lang['relnofollow'] = 'Use rel="nofollow" on external links'; +$lang['indexdelay'] = 'Time delay before indexing (sec)'; +$lang['mailguard'] = 'Obfuscate email addresses'; +$lang['iexssprotect']= 'Check uploaded files for possibly malicious JavaScript or HTML code'; + +/* Editing Settings */ +$lang['usedraft'] = 'Automatically save a draft while editing'; +$lang['htmlok'] = 'Allow embedded HTML'; +$lang['phpok'] = 'Allow embedded PHP'; +$lang['locktime'] = 'Maximum age for lock files (sec)'; +$lang['cachetime'] = 'Maximum age for cache (sec)'; + +/* Link settings */ +$lang['target____wiki'] = 'Target window for internal links'; +$lang['target____interwiki'] = 'Target window for interwiki links'; +$lang['target____extern'] = 'Target window for external links'; +$lang['target____media'] = 'Target window for media links'; +$lang['target____windows'] = 'Target window for windows links'; + +/* Media Settings */ +$lang['mediarevisions'] = 'Enable Mediarevisions?'; +$lang['refcheck'] = 'Media reference check'; +$lang['refshow'] = 'Number of media references to show'; +$lang['gdlib'] = 'GD Lib version'; +$lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; +$lang['jpg_quality'] = 'JPG compression quality (0-100)'; +$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from extern'; + +/* Notification Settings */ +$lang['subscribers'] = 'Allow users to subscribe to page changes by email'; +$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.'; +$lang['notify'] = 'Send change notifications to this email address'; +$lang['registernotify'] = 'Send info on newly registered users to this email address'; +$lang['mailfrom'] = 'Email address to use for automatic mails'; +$lang['mailprefix'] = 'Email subject prefix to use for automatic mails'; + +/* Syndication Settings */ +$lang['sitemap'] = 'Generate Google sitemap (days)'; +$lang['rss_type'] = 'XML feed type'; +$lang['rss_linkto'] = 'XML feed links to'; +$lang['rss_content'] = 'What to display in the XML feed items?'; +$lang['rss_update'] = 'XML feed update interval (sec)'; +$lang['rss_show_summary'] = 'XML feed show summary in title'; +$lang['rss_media'] = 'What kind of changes should be listed in the XML feed?'; + /* Advanced Options */ $lang['updatecheck'] = 'Check for updates and security warnings? DokuWiki needs to contact update.dokuwiki.org for this feature.'; $lang['userewrite'] = 'Use nice URLs'; $lang['useslash'] = 'Use slash as namespace separator in URLs'; -$lang['usedraft'] = 'Automatically save a draft while editing'; $lang['sepchar'] = 'Page name word separator'; $lang['canonical'] = 'Use fully canonical URLs'; $lang['fnencode'] = 'Method for encoding non-ASCII filenames.'; $lang['autoplural'] = 'Check for plural forms in links'; $lang['compression'] = 'Compression method for attic files'; -$lang['cachetime'] = 'Maximum age for cache (sec)'; -$lang['locktime'] = 'Maximum age for lock files (sec)'; -$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from extern'; -$lang['notify'] = 'Send change notifications to this email address'; -$lang['registernotify'] = 'Send info on newly registered users to this email address'; -$lang['mailfrom'] = 'Email address to use for automatic mails'; -$lang['mailprefix'] = 'Email subject prefix to use for automatic mails'; $lang['gzip_output'] = 'Use gzip Content-Encoding for xhtml'; -$lang['gdlib'] = 'GD Lib version'; -$lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; -$lang['jpg_quality'] = 'JPG compression quality (0-100)'; -$lang['subscribers'] = 'Enable page subscription support'; -$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.'; $lang['compress'] = 'Compact CSS and javascript output'; $lang['cssdatauri'] = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE 7 and below! <code>400</code> to <code>600</code> bytes is a good value. Set <code>0</code> to disable.'; -$lang['hidepages'] = 'Hide matching pages (regular expressions)'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages'; -$lang['sitemap'] = 'Generate Google sitemap (days)'; $lang['broken_iua'] = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a> for more info.'; $lang['xsendfile'] = 'Use the X-Sendfile header to let the webserver deliver static files? Your webserver needs to support this.'; $lang['renderer_xhtml'] = 'Renderer to use for main (xhtml) wiki output'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; -$lang['rememberme'] = 'Allow permanent login cookies (remember me)'; - -$lang['rss_type'] = 'XML feed type'; -$lang['rss_linkto'] = 'XML feed links to'; -$lang['rss_content'] = 'What to display in the XML feed items?'; -$lang['rss_update'] = 'XML feed update interval (sec)'; -$lang['recent_days'] = 'How many recent changes to keep (days)'; -$lang['rss_show_summary'] = 'XML feed show summary in title'; -$lang['rss_media'] = 'What kind of changes should be listed in the XML feed?'; - -/* Target options */ -$lang['target____wiki'] = 'Target window for internal links'; -$lang['target____interwiki'] = 'Target window for interwiki links'; -$lang['target____extern'] = 'Target window for external links'; -$lang['target____media'] = 'Target window for media links'; -$lang['target____windows'] = 'Target window for windows links'; /* Proxy Options */ $lang['proxy____host'] = 'Proxy servername'; @@ -179,6 +192,7 @@ $lang['ftp____user'] = 'FTP user name for safemode hack'; $lang['ftp____pass'] = 'FTP password for safemode hack'; $lang['ftp____root'] = 'FTP root directory for safemode hack'; +/* License Options */ $lang['license_o_'] = 'None chosen'; /* typography options */ diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index a472a954b..e610ac4d4 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -104,6 +104,7 @@ $meta['allowdebug'] = array('onoff'); $meta['_display'] = array('fieldset'); $meta['recent'] = array('numeric'); +$meta['recent_days'] = array('numeric'); $meta['breadcrumbs'] = array('numeric','_min' => 0); $meta['youarehere'] = array('onoff'); $meta['fullpath'] = array('onoff'); @@ -118,8 +119,8 @@ $meta['maxseclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); // $meta['camelcase'] = array('onoff'); $meta['deaccent'] = array('multichoice','_choices' => array(0,1,2)); $meta['useheading'] = array('multichoice','_choices' => array(0,'navigation','content',1)); -$meta['refcheck'] = array('onoff'); -$meta['refshow'] = array('numeric'); +$meta['sneaky_index'] = array('onoff'); +$meta['hidepages'] = array('string'); $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); @@ -131,11 +132,9 @@ $meta['superuser'] = array('string'); $meta['manager'] = array('string'); $meta['profileconfirm'] = array('onoff'); $meta['rememberme'] = array('onoff'); -$meta['registernotify'] = array('email'); $meta['disableactions'] = array('disableactions', '_choices' => array('backlink','index','recent','revisions','search','subscription','register','resendpwd','profile','edit','wikicode','check'), '_combine' => array('subscription' => array('subscribe','unsubscribe'), 'wikicode' => array('source','export_raw'))); -$meta['sneaky_index'] = array('onoff'); $meta['auth_security_timeout'] = array('numeric'); $meta['securecookie'] = array('onoff'); $meta['remote'] = array('onoff'); @@ -152,9 +151,6 @@ $meta['_editing'] = array('fieldset'); $meta['usedraft'] = array('onoff'); $meta['htmlok'] = array('onoff'); $meta['phpok'] = array('onoff'); -$meta['notify'] = array('email', '_multiple' => true); -$meta['subscribers'] = array('onoff'); -$meta['subscribe_time'] = array('numeric'); $meta['locktime'] = array('numeric'); $meta['cachetime'] = array('numeric'); @@ -171,6 +167,25 @@ $meta['gdlib'] = array('multichoice','_choices' => array(0,1,2)); $meta['im_convert'] = array('im_convert'); $meta['jpg_quality'] = array('numeric','_pattern' => '/^100$|^[1-9]?[0-9]$/'); //(0-100) $meta['fetchsize'] = array('numeric'); +$meta['refcheck'] = array('onoff'); +$meta['refshow'] = array('numeric'); + +$meta['_notifications'] = array('fieldset'); +$meta['subscribers'] = array('onoff'); +$meta['subscribe_time'] = array('numeric'); +$meta['notify'] = array('email', '_multiple' => true); +$meta['registernotify'] = array('email'); +$meta['mailfrom'] = array('richemail'); +$meta['mailprefix'] = array('string'); + +$meta['_syndication'] = array('fieldset'); +$meta['sitemap'] = array('numeric'); +$meta['rss_type'] = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1')); +$meta['rss_linkto'] = array('multichoice','_choices' => array('diff','page','rev','current')); +$meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html')); +$meta['rss_media'] = array('multichoice','_choices' => array('both','pages','media')); +$meta['rss_update'] = array('numeric'); +$meta['rss_show_summary'] = array('onoff'); $meta['_advanced'] = array('fieldset'); $meta['updatecheck'] = array('onoff'); @@ -180,22 +195,11 @@ $meta['sepchar'] = array('sepchar'); $meta['canonical'] = array('onoff'); $meta['fnencode'] = array('multichoice','_choices' => array('url','safe','utf-8')); $meta['autoplural'] = array('onoff'); -$meta['mailfrom'] = array('richemail'); -$meta['mailprefix'] = array('string'); $meta['compress'] = array('onoff'); $meta['cssdatauri'] = array('numeric','_pattern' => '/^\d+$/'); $meta['gzip_output'] = array('onoff'); -$meta['hidepages'] = array('string'); $meta['send404'] = array('onoff'); $meta['compression'] = array('compression'); -$meta['sitemap'] = array('numeric'); -$meta['rss_type'] = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1')); -$meta['rss_linkto'] = array('multichoice','_choices' => array('diff','page','rev','current')); -$meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html')); -$meta['rss_media'] = array('multichoice','_choices' => array('both','pages','media')); -$meta['rss_update'] = array('numeric'); -$meta['rss_show_summary'] = array('onoff'); -$meta['recent_days'] = array('numeric'); $meta['broken_iua'] = array('onoff'); $meta['xsendfile'] = array('multichoice','_choices' => array(0,1,2,3)); $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml')); -- cgit v1.2.3 From b5cc8f4b6bd4593e984fa6009532fae8eda57a7f Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sun, 15 Apr 2012 15:11:29 +0200 Subject: extended some config options a bit, to make more clear what they do --- lib/plugins/config/lang/en/lang.php | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 3ce70528f..42f34de74 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -55,10 +55,10 @@ $lang['_msg_setting_no_default'] = 'No default value.'; /* -------------------- Config Options --------------------------- */ /* Basic Settings */ -$lang['title'] = 'Wiki title'; -$lang['start'] = 'Start page name'; +$lang['title'] = 'Wiki title aka. your wiki\'s name'; +$lang['start'] = 'Page name to use as the starting point for each namespace'; $lang['lang'] = 'Interface language'; -$lang['template'] = 'Template'; +$lang['template'] = 'Template aka. the design of the wiki.'; $lang['tagline'] = 'Tagline (if template supports it)'; $lang['sidebar'] = 'Sidebar page name (if template supports it), empty field disables the sidebar'; $lang['license'] = 'Under which license should your content be released?'; @@ -71,31 +71,31 @@ $lang['fmode'] = 'File creation mode'; $lang['allowdebug'] = 'Allow debug <b>disable if not needed!</b>'; /* Display Settings */ -$lang['recent'] = 'Recent changes'; +$lang['recent'] = 'Number of entries per page in the recent changes'; $lang['recent_days'] = 'How many recent changes to keep (days)'; -$lang['breadcrumbs'] = 'Number of breadcrumbs'; -$lang['youarehere'] = 'Hierarchical breadcrumbs'; +$lang['breadcrumbs'] = 'Number of "trace" breadcrumbs. Set to 0 to disable.'; +$lang['youarehere'] = 'Use hierarchical breadcrumbs (you probably want to disable the above option then)'; $lang['fullpath'] = 'Reveal full path of pages in the footer'; $lang['typography'] = 'Do typographical replacements'; $lang['dformat'] = 'Date format (see PHP\'s <a href="http://www.php.net/strftime">strftime</a> function)'; -$lang['signature'] = 'Signature'; +$lang['signature'] = 'What to insert with the signature button in the editor'; $lang['showuseras'] = 'What to display when showing the user that last edited a page'; $lang['toptoclevel'] = 'Top level for table of contents'; $lang['tocminheads'] = 'Minimum amount of headlines that determines whether the TOC is built'; $lang['maxtoclevel'] = 'Maximum level for table of contents'; $lang['maxseclevel'] = 'Maximum section edit level'; $lang['camelcase'] = 'Use CamelCase for links'; -$lang['deaccent'] = 'Clean pagenames'; +$lang['deaccent'] = 'How to clean pagenames'; $lang['useheading'] = 'Use first heading for pagenames'; -$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; -$lang['hidepages'] = 'Hide matching pages (regular expressions)'; +$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the sitemap. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces which may make the index unusable with certain ACL setups.'; +$lang['hidepages'] = 'Hide pages matching this regular expressions from search, the sitemap and other automatic indexes'; /* Authentication Settings */ $lang['useacl'] = 'Use access control lists'; $lang['autopasswd'] = 'Autogenerate passwords'; $lang['authtype'] = 'Authentication backend'; $lang['passcrypt'] = 'Password encryption method'; -$lang['defaultgroup']= 'Default group'; +$lang['defaultgroup']= 'Default group, all new users will be placed in this group'; $lang['superuser'] = 'Superuser - group, user or comma separated list user1,@group1,user2 with full access to all pages and functions regardless of the ACL settings'; $lang['manager'] = 'Manager - group, user or comma separated list user1,@group1,user2 with access to certain management functions'; $lang['profileconfirm'] = 'Confirm profile changes with password'; @@ -133,23 +133,23 @@ $lang['target____windows'] = 'Target window for windows links'; /* Media Settings */ $lang['mediarevisions'] = 'Enable Mediarevisions?'; -$lang['refcheck'] = 'Media reference check'; -$lang['refshow'] = 'Number of media references to show'; +$lang['refcheck'] = 'Check if a media file is still in use before deleting it'; +$lang['refshow'] = 'Number of media references to show when the above setting is enabled'; $lang['gdlib'] = 'GD Lib version'; $lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; $lang['jpg_quality'] = 'JPG compression quality (0-100)'; -$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from extern'; +$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from external URLs, eg. to cache and resize external images.'; /* Notification Settings */ $lang['subscribers'] = 'Allow users to subscribe to page changes by email'; $lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.'; -$lang['notify'] = 'Send change notifications to this email address'; -$lang['registernotify'] = 'Send info on newly registered users to this email address'; -$lang['mailfrom'] = 'Email address to use for automatic mails'; -$lang['mailprefix'] = 'Email subject prefix to use for automatic mails'; +$lang['notify'] = 'Always send change notifications to this email address'; +$lang['registernotify'] = 'Always send info on newly registered users to this email address'; +$lang['mailfrom'] = 'Sender email address to use for automatic mails'; +$lang['mailprefix'] = 'Email subject prefix to use for automatic mails. Leave blank to use the wiki title'; /* Syndication Settings */ -$lang['sitemap'] = 'Generate Google sitemap (days)'; +$lang['sitemap'] = 'Generate Google sitemap this often (in days). 0 to disable'; $lang['rss_type'] = 'XML feed type'; $lang['rss_linkto'] = 'XML feed links to'; $lang['rss_content'] = 'What to display in the XML feed items?'; @@ -170,7 +170,7 @@ $lang['gzip_output'] = 'Use gzip Content-Encoding for xhtml'; $lang['compress'] = 'Compact CSS and javascript output'; $lang['cssdatauri'] = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE 7 and below! <code>400</code> to <code>600</code> bytes is a good value. Set <code>0</code> to disable.'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages'; -$lang['broken_iua'] = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a> for more info.'; +$lang['broken_iua'] = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See <a href="http://bugs.dokuwiki.org/?do=details&task_id=852">Bug 852</a> for more info.'; $lang['xsendfile'] = 'Use the X-Sendfile header to let the webserver deliver static files? Your webserver needs to support this.'; $lang['renderer_xhtml'] = 'Renderer to use for main (xhtml) wiki output'; $lang['renderer__core'] = '%s (dokuwiki core)'; -- cgit v1.2.3 From 237afca1bdc4d34f518cf7d33239ccc8d2de6dd9 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 19:49:03 +0100 Subject: moved plugins' rtl.css to their style.css counterpart (part of FS#2185) --- lib/plugins/acl/rtl.css | 40 ---------------------------------- lib/plugins/acl/style.css | 31 +++++++++++++++++++++++++++ lib/plugins/config/rtl.css | 45 -------------------------------------- lib/plugins/config/style.css | 36 +++++++++++++++++++++++++++++++ lib/plugins/plugin/rtl.css | 51 -------------------------------------------- lib/plugins/plugin/style.css | 39 +++++++++++++++++++++++++++++++++ 6 files changed, 106 insertions(+), 136 deletions(-) delete mode 100644 lib/plugins/acl/rtl.css delete mode 100644 lib/plugins/config/rtl.css delete mode 100644 lib/plugins/plugin/rtl.css (limited to 'lib') diff --git a/lib/plugins/acl/rtl.css b/lib/plugins/acl/rtl.css deleted file mode 100644 index e79abe596..000000000 --- a/lib/plugins/acl/rtl.css +++ /dev/null @@ -1,40 +0,0 @@ -div#acl_manager div#acl__tree { - float: right; - text-align: right; -} - -div#acl_manager div#acl__tree li { - padding-left: 0em; - padding-right: 1em; -} - -div#acl_manager div#acl__tree ul img { - margin-left: 0.25em; - margin-right: 0em; -} - - -div#acl_manager div#acl__detail { - float: left; -} - -div#acl_manager .aclgroup { - background: transparent url(pix/group.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .acluser { - background: transparent url(pix/user.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .aclpage { - background: transparent url(pix/page.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .aclns { - background: transparent url(pix/ns.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css index b7154aa78..2eee4f41c 100644 --- a/lib/plugins/acl/style.css +++ b/lib/plugins/acl/style.css @@ -8,6 +8,10 @@ div#acl_manager div#acl__tree { border: 1px solid __border__; text-align: left; } +[dir=rtl] div#acl_manager div#acl__tree { + float: right; + text-align: right; +} div#acl_manager div#acl__tree a.cur { background-color: __highlight__; @@ -24,11 +28,19 @@ div#acl_manager div#acl__tree li { padding-left: 1em; list-style-image: none; } +[dir=rtl] div#acl_manager div#acl__tree li { + padding-left: 0em; + padding-right: 1em; +} div#acl_manager div#acl__tree ul img { margin-right: 0.25em; cursor: pointer; } +[dir=rtl] div#acl_manager div#acl__tree ul img { + margin-left: 0.25em; + margin-right: 0em; +} div#acl_manager div#acl__detail { width: 73%; @@ -36,6 +48,9 @@ div#acl_manager div#acl__detail { float: right; overflow: auto; } +[dir=rtl] div#acl_manager div#acl__detail { + float: left; +} div#acl_manager div#acl__detail fieldset { width: 90%; @@ -56,21 +71,37 @@ div#acl_manager .aclgroup { background: transparent url(pix/group.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclgroup { + background: transparent url(pix/group.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .acluser { background: transparent url(pix/user.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .acluser { + background: transparent url(pix/user.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .aclpage { background: transparent url(pix/page.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclpage { + background: transparent url(pix/page.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .aclns { background: transparent url(pix/ns.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclns { + background: transparent url(pix/ns.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager label.disabled { color: __text_neu__!important; diff --git a/lib/plugins/config/rtl.css b/lib/plugins/config/rtl.css deleted file mode 100644 index b8b9660e2..000000000 --- a/lib/plugins/config/rtl.css +++ /dev/null @@ -1,45 +0,0 @@ -#config__manager fieldset { - clear: both; -} - -#config__manager fieldset td { - text-align: right; -} - -#config__manager label { - text-align: right; -} - -#config__manager td.value input.checkbox { - float: right; - padding-left: 0; - padding-right: 0.7em; -} - -#config__manager td.value label { - float: left; -} - -#config__manager td.label { - padding: 0.8em 1em 0.6em 0; -} - -#config__manager td.label span.outkey { - float: right; - margin-right: 1em; -} - -#config__manager td.label label { - clear: right; -} - -#config__manager td.label img { - float: left; -} - -#config__manager .selection { - width: 14.8em; - float: right; - margin: 0 0 2px 0.3em; -} - diff --git a/lib/plugins/config/style.css b/lib/plugins/config/style.css index 65c44a758..1be94feb9 100644 --- a/lib/plugins/config/style.css +++ b/lib/plugins/config/style.css @@ -15,6 +15,9 @@ color: __text__; padding: 0 1em; } +[dir=rtl] #config__manager fieldset { + clear: both; +} #config__manager legend { font-size: 1.25em; } @@ -28,25 +31,49 @@ #config__manager fieldset td { text-align: left; } +[dir=rtl] #config__manager fieldset td { + text-align: right; +} #config__manager fieldset td.value { /* fixed data column width */ width: 31em; } +[dir=rtl] #config__manager label { + text-align: right; +} +[dir=rtl] #config__manager td.value input.checkbox { + float: right; + padding-left: 0; + padding-right: 0.7em; +} +[dir=rtl] #config__manager td.value label { + float: left; +} + #config__manager td.label { padding: 0.8em 0 0.6em 1em; vertical-align: top; } +[dir=rtl] #config__manager td.label { + padding: 0.8em 1em 0.6em 0; +} #config__manager td.label label { clear: left; display: block; } +[dir=rtl] #config__manager td.label label { + clear: right; +} #config__manager td.label img { padding: 0 10px; vertical-align: middle; float: right; } +[dir=rtl] #config__manager td.label img { + float: left; +} #config__manager td.label span.outkey { font-size: 70%; @@ -60,6 +87,10 @@ position: relative; z-index: 1; } +[dir=rtl] #config__manager td.label span.outkey { + float: right; + margin-right: 1em; +} #config__manager td input.edit { width: 30em; @@ -106,6 +137,11 @@ float: left; margin: 0 0.3em 2px 0; } +[dir=rtl] #config__manager .selection { + width: 14.8em; + float: right; + margin: 0 0 2px 0.3em; +} #config__manager .selection label { float: right; diff --git a/lib/plugins/plugin/rtl.css b/lib/plugins/plugin/rtl.css deleted file mode 100644 index 6ababd8e0..000000000 --- a/lib/plugins/plugin/rtl.css +++ /dev/null @@ -1,51 +0,0 @@ - -#plugin__manager .pm_menu, -#plugin__manager .pm_info, -#plugin__manager p, -#plugin__manager label { - text-align: right; -} - -#plugin__manager .pm_menu { - float: right; -} - -#plugin__manager .pm_info { - float: left; -} - -#plugin__manager .pm_info dt { - float: right; - clear: right; -} - -#plugin__manager .pm_info dd { - margin: 0 7em 0 0; -} - -#plugin__manager .common fieldset { - text-align: right; -} - - -#plugin__manager .plugins .legend { - text-align: right; - float: right; -} - -#plugin__manager .plugins .enable { - float: right; - margin-right: 0; - margin-left: 0.5em; -} - -#plugin__manager .plugins .button { - float: left; - margin-right: 0.5em; -} - - -#plugin__manager .plugins fieldset.buttons .button { - float: right; -} - diff --git a/lib/plugins/plugin/style.css b/lib/plugins/plugin/style.css index de6cca579..9433e6001 100644 --- a/lib/plugins/plugin/style.css +++ b/lib/plugins/plugin/style.css @@ -52,15 +52,28 @@ text-align: left; } +[dir=rtl] #plugin__manager .pm_menu, +[dir=rtl] #plugin__manager .pm_info, +[dir=rtl] #plugin__manager p, +[dir=rtl] #plugin__manager label { + text-align: right; +} + #plugin__manager .pm_menu { float: left; width: 48%; } +[dir=rtl] #plugin__manager .pm_menu { + float: right; +} #plugin__manager .pm_info { float: right; width: 50%; } +[dir=rtl] #plugin__manager .pm_info { + float: left; +} #plugin__manager .common fieldset { margin: 0; @@ -68,6 +81,9 @@ text-align: left; border: none; } +[dir=rtl] #plugin__manager .common fieldset { + text-align: right; +} #plugin__manager .common label { padding: 0 0 0.5em 0; @@ -111,6 +127,10 @@ padding: 0; clear: none; } +[dir=rtl] #plugin__manager .plugins .legend { + text-align: right; + float: right; +} #plugin__manager .plugins .button { font-size: 95%; @@ -123,6 +143,13 @@ #plugin__manager .plugins fieldset.buttons .button { float: left; } +[dir=rtl] #plugin__manager .plugins .button { + float: left; + margin-right: 0.5em; +} +[dir=rtl] #plugin__manager .plugins fieldset.buttons .button { + float: right; +} #plugin__manager .pm_info h3 { margin-left: 0; @@ -140,17 +167,29 @@ margin: 0; padding: 0; } +[dir=rtl] #plugin__manager .pm_info dt { + float: right; + clear: right; +} #plugin__manager .pm_info dd { margin: 0 0 0 7em; padding: 0; background: none; } +[dir=rtl] #plugin__manager .pm_info dd { + margin: 0 7em 0 0; +} #plugin__manager .plugins .enable { float: left; width: auto; margin-right: 0.5em; } +[dir=rtl] #plugin__manager .plugins .enable { + float: right; + margin-right: 0; + margin-left: 0.5em; +} /* end admin plugin styles */ -- cgit v1.2.3 From 60bb88f04355d34b37fa3f9b3cfcaea279f584bf Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 19:52:06 +0100 Subject: added minimal RTL print styles (part of FS#2185) --- lib/tpl/dokuwiki/css/print.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index f4f81d741..58b8a5f0d 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -137,6 +137,9 @@ div.clearer { border: solid #ccc; border-width: 0 0 0 2pt; } +[dir=rtl] .dokuwiki blockquote { + border-width: 0 2pt 0 0; +} /* tables */ .dokuwiki table { @@ -153,6 +156,10 @@ div.clearer { border: 1pt solid #666; text-align: left; } +[dir=rtl] .dokuwiki th, +[dir=rtl] .dokuwiki td { + text-align: right; +} .dokuwiki th { font-weight: bold; } @@ -173,6 +180,11 @@ div.clearer { float: left; margin-right: .5em; } +[dir=rtl] #dokuwiki__header h1 img { + float: right; + margin-right: 0; + margin-left: .5em; +} .dokuwiki div.footnotes { clear: both; border-top: 1pt solid #000; -- cgit v1.2.3 From e4fc8c0eb3b0e6f52f35489d8764af7edb23792c Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 19:54:20 +0100 Subject: when there's not enough space for images, make sure they stay proportional (might be FS#2480) --- lib/tpl/dokuwiki/css/basic.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index c8e0c435e..7ffe42ec4 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -195,6 +195,7 @@ img { img, object { max-width: 100%; + height: auto; } hr { -- cgit v1.2.3 From 50da7978b031b566117cfe95fa7341d506207766 Mon Sep 17 00:00:00 2001 From: Usama Akkad <uahello@gmail.com> Date: Wed, 11 Apr 2012 23:02:09 +0200 Subject: Arabic Language Update --- lib/plugins/config/lang/ar/lang.php | 11 +++++++++++ lib/plugins/plugin/lang/ar/lang.php | 1 + 2 files changed, 12 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php index 3855f4ac1..2e55446ec 100644 --- a/lib/plugins/config/lang/ar/lang.php +++ b/lib/plugins/config/lang/ar/lang.php @@ -41,9 +41,13 @@ $lang['lang'] = 'لغة الواجهة'; $lang['basedir'] = 'مسار الخادوم (مثال. <code>/dokuwiki/</code>) اترك فارغا للاكتشاف التلقائي.'; $lang['baseurl'] = 'عنوان الخادوم (مثال. <code>http://www.yourserver.com</code>). اترك فارغا للاكتشاف التلقائي.'; $lang['savedir'] = 'دليل حفظ البيانات'; +$lang['cookiedir'] = 'مسار الكعكات. اترك فارغا لاستخدام baseurl.'; $lang['start'] = 'اسم صفحة البداية'; $lang['title'] = 'عنوان الويكي'; $lang['template'] = 'القالب'; +$lang['tagline'] = 'Tagline (في حال دعم القالب له) +'; +$lang['sidebar'] = 'اسم صفحة الشريط الجانبي (في حال دعم القالب له). تركه فارغا يعطل الشريط الجانبي.'; $lang['license'] = 'تحت أي رخصة تريد اصدار المحتوى؟'; $lang['fullpath'] = 'اظهر المحتوى الكامل للصفحات في '; $lang['recent'] = 'أحدث التغييرات'; @@ -64,6 +68,7 @@ $lang['useheading'] = 'استخدم اول ترويسة كأسم لل $lang['refcheck'] = 'التحقق من مرجع الوسائط'; $lang['refshow'] = 'عدد مراجع الوسائط لتعرض'; $lang['allowdebug'] = 'مكّن التنقيح <b>عطّلها إن لم تكن بحاجلة لها!</b>'; +$lang['mediarevisions'] = 'تفعيل إصدارات الوسائط؟'; $lang['usewordblock'] = 'احجز الغثاء بناء على قائمة كلمات'; $lang['indexdelay'] = 'التأخير قبل الفهرسة (ثوان)'; $lang['relnofollow'] = 'استخدم rel="nofollow" للروابط الخارجية'; @@ -86,6 +91,8 @@ $lang['disableactions_other'] = 'اجراءات أخرى (مفصولة بالف $lang['sneaky_index'] = 'افتراضيا، ستعرض دوكو ويكي كل اسماء النطاقات في عرض الفهرس. تفعيل هذا الخيار سيخفي مالا يملك المستخدم صلاحية قراءته. قد يؤدي هذا إلى اخفاء نطاقات فرعية متاحة. وقد يؤدي لجعل صفحة الفهرس معطلة في بعض اعدادات ACL.'; $lang['auth_security_timeout'] = 'زمن انتهاء أمان المواثقة (ثوان)'; $lang['securecookie'] = 'هل يفرض على كعكات التصفح المعدة عبر HTTPS ان ترسل فقط عبر HTTPS من قبل المتصفح؟ عطل هذا إن كان الولوج للويكي مؤمنا فقط عبر SSL لكن تصفح الويكي غير مؤمن.'; +$lang['remote'] = 'مكّن نظام API البعيد. يسمح هذا لبرامج أخرى بالوصول للويكي عبر XML-RPC أو آليات أخرى.'; +$lang['remoteuser'] = 'احصر الوصول البعيد ل API لمستخدمين ومجموعات يفصل بينها بالفاصلة هنا. اترك فارغا لتمكين الجميع.'; $lang['updatecheck'] = 'تحقق من التحديثات و تنبيهات الأمان؟ دوكو ويكي ستحتاج للاتصال ب update.dokuwiki.org لأجل ذلك'; $lang['userewrite'] = 'استعمل عناوين URLs جميلة'; $lang['useslash'] = 'استخدم الشرطة كفاصل النطاق في العناوين'; @@ -109,10 +116,13 @@ $lang['jpg_quality'] = 'دقة ضغط JPG (0-100)'; $lang['subscribers'] = 'مكن دعم اشتراك الصفحة'; $lang['subscribe_time'] = 'المهلة بعد ارسال قوائم الاشتراكات والملخصات (ثوان); هذا يجب أن يكون أقل من الوقت المخصص في أيام أحدث التغييرات.'; $lang['compress'] = 'رُص مخرجات CSS و جافا سكربت'; +$lang['cssdatauri'] = 'الحجم بالبايتات للصور المذكورة في CSS التي ستُضمن في صفحة-التنسيق لخفض طلبات HTTP. لن تعمل هذه التقنية في IE 7 أو أقل! <code>400</code> إلى <code>600</code> بايت تعد قيمة جيدة. اضبط إلى <code>0</code> لتعطلها.'; $lang['hidepages'] = 'أخف الصفحات المنطبق عليها (تعابير شرطية)'; $lang['send404'] = 'ارسل "HTTP 404/Page Not Found" للصفحات غير الموجودة'; $lang['sitemap'] = 'ولد خرائط موقع جوجل (أيام)'; +$lang['broken_iua'] = 'هل الوظيفة ignore_user_abort معطلة على جهازك؟ قد يؤدي ذلك لتعطيل فهرسة البحث. IIS+PHP/CGI تعرف بأنها لاتعمل. أنظر <a href="http://bugs.splitbrain.org/?do=details&task_id=852">العلة 852</a> لمزيد من المعلومات.'; $lang['xsendfile'] = 'استخدم ترويسة X-Sendfile لتمكين خادم الوب من تقديم ملفات ثابتة؟ يجب أن يكون خادم الوب داعما له.'; +$lang['renderer_xhtml'] = 'المحرك ليستخدم لمخرجات الويكي الأساسية وفق (xhtml).'; $lang['renderer__core'] = '%s (نواة دوكو ويكي)'; $lang['renderer__plugin'] = '%s (ملحق)'; $lang['rememberme'] = 'اسمح بكعكات الدخول الدائم (تذكرني)'; @@ -122,6 +132,7 @@ $lang['rss_content'] = 'مالذي يعرض في عناصر تلقيم $lang['rss_update'] = 'تحديث تلقيم XML (ثوان)'; $lang['recent_days'] = 'مدة إبقاء أحدث التغييرات (ايام)'; $lang['rss_show_summary'] = 'تلقيم XML يظهر ملخصا في العنوان'; +$lang['rss_media'] = 'مانوع التغييرات التي ستدرج في تغذية XML؟'; $lang['target____wiki'] = 'النافذة الهدف للروابط الداخلية'; $lang['target____interwiki'] = 'النافذة الهدف للروابط الممرة interwiki'; $lang['target____extern'] = 'النافذة الهدف للروابط الخارجية'; diff --git a/lib/plugins/plugin/lang/ar/lang.php b/lib/plugins/plugin/lang/ar/lang.php index fbc6d3c36..8327e5ce3 100644 --- a/lib/plugins/plugin/lang/ar/lang.php +++ b/lib/plugins/plugin/lang/ar/lang.php @@ -50,3 +50,4 @@ $lang['enabled'] = 'الاضافة %s فُعلت. '; $lang['notenabled'] = 'تعذر تفعيل الاضافة %s، تحقق من اذونات الملف.'; $lang['disabled'] = 'عُطلت الإضافة %s.'; $lang['notdisabled'] = 'تعذر تعطيل الإضافة %s، تحقق من اذونات الملف.'; +$lang['packageinstalled'] = 'حزمة الإضافة (%d plugin(s): %Xs) ثبتت بنجاج.'; -- cgit v1.2.3 From a48c834625c8fb17e4081cfd6121f14042dcf468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel-Emeric=20Andra=C5=9Fi?= <em.andrasi@mandrivausers.ro> Date: Sun, 15 Apr 2012 12:47:43 +0200 Subject: Romanian language update --- lib/plugins/acl/lang/ro/lang.php | 1 + lib/plugins/config/lang/ro/lang.php | 6 ++++++ lib/plugins/plugin/lang/ro/lang.php | 1 + lib/plugins/popularity/lang/ro/lang.php | 1 + lib/plugins/revert/lang/ro/lang.php | 1 + lib/plugins/usermanager/lang/ro/lang.php | 1 + 6 files changed, 11 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php index c278c918e..4d093216b 100644 --- a/lib/plugins/acl/lang/ro/lang.php +++ b/lib/plugins/acl/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index d638e1eec..72b205b90 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Setări de Configurare'; $lang['error'] = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou. <br /> Valorile incorecte vor apărea într-un chenar roşu.'; @@ -48,6 +49,8 @@ $lang['cookiedir'] = 'Cale Cookie. Lăsați gol pentru a utiliza bas $lang['start'] = 'Numele paginii de start'; $lang['title'] = 'Titlul wiki'; $lang['template'] = 'Şablon'; +$lang['tagline'] = 'Slogan (dacă templateul suportă opțiunea)'; +$lang['sidebar'] = 'Numele paginii barei laterale (dacă templateul suportă opțiunea), câmpul lăsat gol dezactivează bara laterală'; $lang['license'] = 'Sub ce licenţă va fi publicat conţinutul?'; $lang['fullpath'] = 'Arată calea completă a paginii în subsol'; $lang['recent'] = 'Modificări recente'; @@ -91,6 +94,8 @@ $lang['disableactions_other'] = 'Alte acţiuni (separate prin virgulă)'; $lang['sneaky_index'] = 'Implicit, DokuWiki va arăta toate numele de spaţii la vizualizarea indexului. Activând această opţiune vor fi ascunse acelea la care utilizatorul nu are drepturi de citire. Aceasta poate determina ascunderea sub-numelor de spaţii accesibile. Aceasta poate face index-ul inutilizabil cu anumite setări ale ACL'; $lang['auth_security_timeout'] = 'Timpul de expirare al Autentificării Securizate (secunde)'; $lang['securecookie'] = 'Cookies-urile setate via HTTPS să fie trimise doar via HTTPS de către browser? Dezactivaţi această opţiune numai când login-ul wiki-ului este securizat cu SSL dar navigarea wiki-ului se realizează nesecurizat.'; +$lang['remote'] = 'Activează sistemul remote API. Acesta permite altor aplicații să acceseze wiki-ul via XML-RPC sau alte mecanisme.'; +$lang['remoteuser'] = 'Restricționează accesul sistemului remote API la grupurile sau utilizatorii următori (separați prin virgulă). Lăsați câmpul gol pentru a da acces către toți.'; $lang['updatecheck'] = 'Verificare actualizări şi avertismente privind securitatea? DokuWiki trebuie să contacteze update.dokuwiki.org pentru această facilitate.'; $lang['userewrite'] = 'Folosire URL-uri "nice"'; $lang['useslash'] = 'Foloseşte slash-ul ca separator de spaţii de nume în URL-uri'; @@ -130,6 +135,7 @@ $lang['rss_content'] = 'Ce să afişez în obiectele fluxurilor XML'; $lang['rss_update'] = 'Intervalul de actualizare a fluxului XML (sec)'; $lang['recent_days'] = 'Câte modificări recente să se păstreze?'; $lang['rss_show_summary'] = 'Fluxul XML arată rezumat în titlu'; +$lang['rss_media'] = 'Ce fel de modificări ar trebui afișate în fluxul XML?'; $lang['target____wiki'] = 'Fereastra ţintă pentru legăturile interne'; $lang['target____interwiki'] = 'Fereastra ţintă pentru legăturile interwiki'; $lang['target____extern'] = 'Fereastra ţintă pentru legăturile externe'; diff --git a/lib/plugins/plugin/lang/ro/lang.php b/lib/plugins/plugin/lang/ro/lang.php index 50f6ca6f6..c57647e0b 100644 --- a/lib/plugins/plugin/lang/ro/lang.php +++ b/lib/plugins/plugin/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Administrează plugin-uri'; $lang['download'] = 'Descarcă şi instalează un nou plugin'; diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php index 9e9086b0d..8ba119dcb 100644 --- a/lib/plugins/popularity/lang/ro/lang.php +++ b/lib/plugins/popularity/lang/ro/lang.php @@ -8,6 +8,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['name'] = 'Feedback de popularitate (încărcarea poate dura mai mult)'; $lang['submit'] = 'Trimite datele'; diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php index f1fcf727c..5ea802575 100644 --- a/lib/plugins/revert/lang/ro/lang.php +++ b/lib/plugins/revert/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Manager Reveniri'; $lang['filter'] = 'Caută pagini cu posibil spam'; diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php index 7aac6cfb0..1b33cc4f8 100644 --- a/lib/plugins/usermanager/lang/ro/lang.php +++ b/lib/plugins/usermanager/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Manager Utilizatori'; $lang['noauth'] = '(autentificarea utilizatorilor nu este disponibilă)'; -- cgit v1.2.3 From 317250bbd42ed1958306901e7fb549432c405b67 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sun, 15 Apr 2012 14:57:20 +0200 Subject: rearranged the config options We had a lot of options lumped together under "Advanced Settings". I introduced two more categories and move a few options to other existing categories. I also reordered the appropriate entries in the source files to make it easier to find stuff when extending the options. --- lib/plugins/config/lang/en/lang.php | 124 +++++++++++++----------- lib/plugins/config/settings/config.metadata.php | 40 ++++---- 2 files changed, 91 insertions(+), 73 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 2151d7543..3ce70528f 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -36,6 +36,8 @@ $lang['_anti_spam'] = 'Anti-Spam Settings'; $lang['_editing'] = 'Editing Settings'; $lang['_links'] = 'Link Settings'; $lang['_media'] = 'Media Settings'; +$lang['_notifications'] = 'Notification Settings'; +$lang['_syndication'] = 'Syndication Settings'; $lang['_advanced'] = 'Advanced Settings'; $lang['_network'] = 'Network Settings'; // The settings group name for plugins and templates can be set with @@ -52,28 +54,32 @@ $lang['_msg_setting_no_default'] = 'No default value.'; /* -------------------- Config Options --------------------------- */ -$lang['fmode'] = 'File creation mode'; -$lang['dmode'] = 'Directory creation mode'; -$lang['lang'] = 'Interface language'; -$lang['basedir'] = 'Server path (eg. <code>/dokuwiki/</code>). Leave blank for autodetection.'; -$lang['baseurl'] = 'Server URL (eg. <code>http://www.yourserver.com</code>). Leave blank for autodetection.'; -$lang['savedir'] = 'Directory for saving data'; -$lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.'; -$lang['start'] = 'Start page name'; +/* Basic Settings */ $lang['title'] = 'Wiki title'; +$lang['start'] = 'Start page name'; +$lang['lang'] = 'Interface language'; $lang['template'] = 'Template'; $lang['tagline'] = 'Tagline (if template supports it)'; $lang['sidebar'] = 'Sidebar page name (if template supports it), empty field disables the sidebar'; $lang['license'] = 'Under which license should your content be released?'; -$lang['fullpath'] = 'Reveal full path of pages in the footer'; +$lang['savedir'] = 'Directory for saving data'; +$lang['basedir'] = 'Server path (eg. <code>/dokuwiki/</code>). Leave blank for autodetection.'; +$lang['baseurl'] = 'Server URL (eg. <code>http://www.yourserver.com</code>). Leave blank for autodetection.'; +$lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.'; +$lang['dmode'] = 'Directory creation mode'; +$lang['fmode'] = 'File creation mode'; +$lang['allowdebug'] = 'Allow debug <b>disable if not needed!</b>'; + +/* Display Settings */ $lang['recent'] = 'Recent changes'; +$lang['recent_days'] = 'How many recent changes to keep (days)'; $lang['breadcrumbs'] = 'Number of breadcrumbs'; $lang['youarehere'] = 'Hierarchical breadcrumbs'; +$lang['fullpath'] = 'Reveal full path of pages in the footer'; $lang['typography'] = 'Do typographical replacements'; -$lang['htmlok'] = 'Allow embedded HTML'; -$lang['phpok'] = 'Allow embedded PHP'; $lang['dformat'] = 'Date format (see PHP\'s <a href="http://www.php.net/strftime">strftime</a> function)'; $lang['signature'] = 'Signature'; +$lang['showuseras'] = 'What to display when showing the user that last edited a page'; $lang['toptoclevel'] = 'Top level for table of contents'; $lang['tocminheads'] = 'Minimum amount of headlines that determines whether the TOC is built'; $lang['maxtoclevel'] = 'Maximum level for table of contents'; @@ -81,19 +87,10 @@ $lang['maxseclevel'] = 'Maximum section edit level'; $lang['camelcase'] = 'Use CamelCase for links'; $lang['deaccent'] = 'Clean pagenames'; $lang['useheading'] = 'Use first heading for pagenames'; -$lang['refcheck'] = 'Media reference check'; -$lang['refshow'] = 'Number of media references to show'; -$lang['allowdebug'] = 'Allow debug <b>disable if not needed!</b>'; -$lang['mediarevisions'] = 'Enable Mediarevisions?'; - -$lang['usewordblock']= 'Block spam based on wordlist'; -$lang['indexdelay'] = 'Time delay before indexing (sec)'; -$lang['relnofollow'] = 'Use rel="nofollow" on external links'; -$lang['mailguard'] = 'Obfuscate email addresses'; -$lang['iexssprotect']= 'Check uploaded files for possibly malicious JavaScript or HTML code'; -$lang['showuseras'] = 'What to display when showing the user that last edited a page'; +$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; +$lang['hidepages'] = 'Hide matching pages (regular expressions)'; -/* Authentication Options */ +/* Authentication Settings */ $lang['useacl'] = 'Use access control lists'; $lang['autopasswd'] = 'Autogenerate passwords'; $lang['authtype'] = 'Authentication backend'; @@ -102,66 +99,82 @@ $lang['defaultgroup']= 'Default group'; $lang['superuser'] = 'Superuser - group, user or comma separated list user1,@group1,user2 with full access to all pages and functions regardless of the ACL settings'; $lang['manager'] = 'Manager - group, user or comma separated list user1,@group1,user2 with access to certain management functions'; $lang['profileconfirm'] = 'Confirm profile changes with password'; +$lang['rememberme'] = 'Allow permanent login cookies (remember me)'; $lang['disableactions'] = 'Disable DokuWiki actions'; $lang['disableactions_check'] = 'Check'; $lang['disableactions_subscription'] = 'Subscribe/Unsubscribe'; $lang['disableactions_wikicode'] = 'View source/Export Raw'; $lang['disableactions_other'] = 'Other actions (comma separated)'; -$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; $lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)'; $lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.'; $lang['remote'] = 'Enable the remote API system. This allows other applications to access the wiki via XML-RPC or other mechanisms.'; $lang['remoteuser'] = 'Restrict remote API access to the comma separated groups or users given here. Leave empty to give access to everyone.'; +/* Anti-Spam Settings */ +$lang['usewordblock']= 'Block spam based on wordlist'; +$lang['relnofollow'] = 'Use rel="nofollow" on external links'; +$lang['indexdelay'] = 'Time delay before indexing (sec)'; +$lang['mailguard'] = 'Obfuscate email addresses'; +$lang['iexssprotect']= 'Check uploaded files for possibly malicious JavaScript or HTML code'; + +/* Editing Settings */ +$lang['usedraft'] = 'Automatically save a draft while editing'; +$lang['htmlok'] = 'Allow embedded HTML'; +$lang['phpok'] = 'Allow embedded PHP'; +$lang['locktime'] = 'Maximum age for lock files (sec)'; +$lang['cachetime'] = 'Maximum age for cache (sec)'; + +/* Link settings */ +$lang['target____wiki'] = 'Target window for internal links'; +$lang['target____interwiki'] = 'Target window for interwiki links'; +$lang['target____extern'] = 'Target window for external links'; +$lang['target____media'] = 'Target window for media links'; +$lang['target____windows'] = 'Target window for windows links'; + +/* Media Settings */ +$lang['mediarevisions'] = 'Enable Mediarevisions?'; +$lang['refcheck'] = 'Media reference check'; +$lang['refshow'] = 'Number of media references to show'; +$lang['gdlib'] = 'GD Lib version'; +$lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; +$lang['jpg_quality'] = 'JPG compression quality (0-100)'; +$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from extern'; + +/* Notification Settings */ +$lang['subscribers'] = 'Allow users to subscribe to page changes by email'; +$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.'; +$lang['notify'] = 'Send change notifications to this email address'; +$lang['registernotify'] = 'Send info on newly registered users to this email address'; +$lang['mailfrom'] = 'Email address to use for automatic mails'; +$lang['mailprefix'] = 'Email subject prefix to use for automatic mails'; + +/* Syndication Settings */ +$lang['sitemap'] = 'Generate Google sitemap (days)'; +$lang['rss_type'] = 'XML feed type'; +$lang['rss_linkto'] = 'XML feed links to'; +$lang['rss_content'] = 'What to display in the XML feed items?'; +$lang['rss_update'] = 'XML feed update interval (sec)'; +$lang['rss_show_summary'] = 'XML feed show summary in title'; +$lang['rss_media'] = 'What kind of changes should be listed in the XML feed?'; + /* Advanced Options */ $lang['updatecheck'] = 'Check for updates and security warnings? DokuWiki needs to contact update.dokuwiki.org for this feature.'; $lang['userewrite'] = 'Use nice URLs'; $lang['useslash'] = 'Use slash as namespace separator in URLs'; -$lang['usedraft'] = 'Automatically save a draft while editing'; $lang['sepchar'] = 'Page name word separator'; $lang['canonical'] = 'Use fully canonical URLs'; $lang['fnencode'] = 'Method for encoding non-ASCII filenames.'; $lang['autoplural'] = 'Check for plural forms in links'; $lang['compression'] = 'Compression method for attic files'; -$lang['cachetime'] = 'Maximum age for cache (sec)'; -$lang['locktime'] = 'Maximum age for lock files (sec)'; -$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from extern'; -$lang['notify'] = 'Send change notifications to this email address'; -$lang['registernotify'] = 'Send info on newly registered users to this email address'; -$lang['mailfrom'] = 'Email address to use for automatic mails'; -$lang['mailprefix'] = 'Email subject prefix to use for automatic mails'; $lang['gzip_output'] = 'Use gzip Content-Encoding for xhtml'; -$lang['gdlib'] = 'GD Lib version'; -$lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; -$lang['jpg_quality'] = 'JPG compression quality (0-100)'; -$lang['subscribers'] = 'Enable page subscription support'; -$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.'; $lang['compress'] = 'Compact CSS and javascript output'; $lang['cssdatauri'] = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE 7 and below! <code>400</code> to <code>600</code> bytes is a good value. Set <code>0</code> to disable.'; -$lang['hidepages'] = 'Hide matching pages (regular expressions)'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages'; -$lang['sitemap'] = 'Generate Google sitemap (days)'; $lang['broken_iua'] = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a> for more info.'; $lang['xsendfile'] = 'Use the X-Sendfile header to let the webserver deliver static files? Your webserver needs to support this.'; $lang['renderer_xhtml'] = 'Renderer to use for main (xhtml) wiki output'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; -$lang['rememberme'] = 'Allow permanent login cookies (remember me)'; - -$lang['rss_type'] = 'XML feed type'; -$lang['rss_linkto'] = 'XML feed links to'; -$lang['rss_content'] = 'What to display in the XML feed items?'; -$lang['rss_update'] = 'XML feed update interval (sec)'; -$lang['recent_days'] = 'How many recent changes to keep (days)'; -$lang['rss_show_summary'] = 'XML feed show summary in title'; -$lang['rss_media'] = 'What kind of changes should be listed in the XML feed?'; - -/* Target options */ -$lang['target____wiki'] = 'Target window for internal links'; -$lang['target____interwiki'] = 'Target window for interwiki links'; -$lang['target____extern'] = 'Target window for external links'; -$lang['target____media'] = 'Target window for media links'; -$lang['target____windows'] = 'Target window for windows links'; /* Proxy Options */ $lang['proxy____host'] = 'Proxy servername'; @@ -179,6 +192,7 @@ $lang['ftp____user'] = 'FTP user name for safemode hack'; $lang['ftp____pass'] = 'FTP password for safemode hack'; $lang['ftp____root'] = 'FTP root directory for safemode hack'; +/* License Options */ $lang['license_o_'] = 'None chosen'; /* typography options */ diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index a472a954b..e610ac4d4 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -104,6 +104,7 @@ $meta['allowdebug'] = array('onoff'); $meta['_display'] = array('fieldset'); $meta['recent'] = array('numeric'); +$meta['recent_days'] = array('numeric'); $meta['breadcrumbs'] = array('numeric','_min' => 0); $meta['youarehere'] = array('onoff'); $meta['fullpath'] = array('onoff'); @@ -118,8 +119,8 @@ $meta['maxseclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); // $meta['camelcase'] = array('onoff'); $meta['deaccent'] = array('multichoice','_choices' => array(0,1,2)); $meta['useheading'] = array('multichoice','_choices' => array(0,'navigation','content',1)); -$meta['refcheck'] = array('onoff'); -$meta['refshow'] = array('numeric'); +$meta['sneaky_index'] = array('onoff'); +$meta['hidepages'] = array('string'); $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); @@ -131,11 +132,9 @@ $meta['superuser'] = array('string'); $meta['manager'] = array('string'); $meta['profileconfirm'] = array('onoff'); $meta['rememberme'] = array('onoff'); -$meta['registernotify'] = array('email'); $meta['disableactions'] = array('disableactions', '_choices' => array('backlink','index','recent','revisions','search','subscription','register','resendpwd','profile','edit','wikicode','check'), '_combine' => array('subscription' => array('subscribe','unsubscribe'), 'wikicode' => array('source','export_raw'))); -$meta['sneaky_index'] = array('onoff'); $meta['auth_security_timeout'] = array('numeric'); $meta['securecookie'] = array('onoff'); $meta['remote'] = array('onoff'); @@ -152,9 +151,6 @@ $meta['_editing'] = array('fieldset'); $meta['usedraft'] = array('onoff'); $meta['htmlok'] = array('onoff'); $meta['phpok'] = array('onoff'); -$meta['notify'] = array('email', '_multiple' => true); -$meta['subscribers'] = array('onoff'); -$meta['subscribe_time'] = array('numeric'); $meta['locktime'] = array('numeric'); $meta['cachetime'] = array('numeric'); @@ -171,6 +167,25 @@ $meta['gdlib'] = array('multichoice','_choices' => array(0,1,2)); $meta['im_convert'] = array('im_convert'); $meta['jpg_quality'] = array('numeric','_pattern' => '/^100$|^[1-9]?[0-9]$/'); //(0-100) $meta['fetchsize'] = array('numeric'); +$meta['refcheck'] = array('onoff'); +$meta['refshow'] = array('numeric'); + +$meta['_notifications'] = array('fieldset'); +$meta['subscribers'] = array('onoff'); +$meta['subscribe_time'] = array('numeric'); +$meta['notify'] = array('email', '_multiple' => true); +$meta['registernotify'] = array('email'); +$meta['mailfrom'] = array('richemail'); +$meta['mailprefix'] = array('string'); + +$meta['_syndication'] = array('fieldset'); +$meta['sitemap'] = array('numeric'); +$meta['rss_type'] = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1')); +$meta['rss_linkto'] = array('multichoice','_choices' => array('diff','page','rev','current')); +$meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html')); +$meta['rss_media'] = array('multichoice','_choices' => array('both','pages','media')); +$meta['rss_update'] = array('numeric'); +$meta['rss_show_summary'] = array('onoff'); $meta['_advanced'] = array('fieldset'); $meta['updatecheck'] = array('onoff'); @@ -180,22 +195,11 @@ $meta['sepchar'] = array('sepchar'); $meta['canonical'] = array('onoff'); $meta['fnencode'] = array('multichoice','_choices' => array('url','safe','utf-8')); $meta['autoplural'] = array('onoff'); -$meta['mailfrom'] = array('richemail'); -$meta['mailprefix'] = array('string'); $meta['compress'] = array('onoff'); $meta['cssdatauri'] = array('numeric','_pattern' => '/^\d+$/'); $meta['gzip_output'] = array('onoff'); -$meta['hidepages'] = array('string'); $meta['send404'] = array('onoff'); $meta['compression'] = array('compression'); -$meta['sitemap'] = array('numeric'); -$meta['rss_type'] = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1')); -$meta['rss_linkto'] = array('multichoice','_choices' => array('diff','page','rev','current')); -$meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html')); -$meta['rss_media'] = array('multichoice','_choices' => array('both','pages','media')); -$meta['rss_update'] = array('numeric'); -$meta['rss_show_summary'] = array('onoff'); -$meta['recent_days'] = array('numeric'); $meta['broken_iua'] = array('onoff'); $meta['xsendfile'] = array('multichoice','_choices' => array(0,1,2,3)); $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml')); -- cgit v1.2.3 From 6d7edc55c6d4356a6bbcb96dc231150ed846e5e5 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sun, 15 Apr 2012 15:11:29 +0200 Subject: extended some config options a bit, to make more clear what they do --- lib/plugins/config/lang/en/lang.php | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 3ce70528f..42f34de74 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -55,10 +55,10 @@ $lang['_msg_setting_no_default'] = 'No default value.'; /* -------------------- Config Options --------------------------- */ /* Basic Settings */ -$lang['title'] = 'Wiki title'; -$lang['start'] = 'Start page name'; +$lang['title'] = 'Wiki title aka. your wiki\'s name'; +$lang['start'] = 'Page name to use as the starting point for each namespace'; $lang['lang'] = 'Interface language'; -$lang['template'] = 'Template'; +$lang['template'] = 'Template aka. the design of the wiki.'; $lang['tagline'] = 'Tagline (if template supports it)'; $lang['sidebar'] = 'Sidebar page name (if template supports it), empty field disables the sidebar'; $lang['license'] = 'Under which license should your content be released?'; @@ -71,31 +71,31 @@ $lang['fmode'] = 'File creation mode'; $lang['allowdebug'] = 'Allow debug <b>disable if not needed!</b>'; /* Display Settings */ -$lang['recent'] = 'Recent changes'; +$lang['recent'] = 'Number of entries per page in the recent changes'; $lang['recent_days'] = 'How many recent changes to keep (days)'; -$lang['breadcrumbs'] = 'Number of breadcrumbs'; -$lang['youarehere'] = 'Hierarchical breadcrumbs'; +$lang['breadcrumbs'] = 'Number of "trace" breadcrumbs. Set to 0 to disable.'; +$lang['youarehere'] = 'Use hierarchical breadcrumbs (you probably want to disable the above option then)'; $lang['fullpath'] = 'Reveal full path of pages in the footer'; $lang['typography'] = 'Do typographical replacements'; $lang['dformat'] = 'Date format (see PHP\'s <a href="http://www.php.net/strftime">strftime</a> function)'; -$lang['signature'] = 'Signature'; +$lang['signature'] = 'What to insert with the signature button in the editor'; $lang['showuseras'] = 'What to display when showing the user that last edited a page'; $lang['toptoclevel'] = 'Top level for table of contents'; $lang['tocminheads'] = 'Minimum amount of headlines that determines whether the TOC is built'; $lang['maxtoclevel'] = 'Maximum level for table of contents'; $lang['maxseclevel'] = 'Maximum section edit level'; $lang['camelcase'] = 'Use CamelCase for links'; -$lang['deaccent'] = 'Clean pagenames'; +$lang['deaccent'] = 'How to clean pagenames'; $lang['useheading'] = 'Use first heading for pagenames'; -$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; -$lang['hidepages'] = 'Hide matching pages (regular expressions)'; +$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the sitemap. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces which may make the index unusable with certain ACL setups.'; +$lang['hidepages'] = 'Hide pages matching this regular expressions from search, the sitemap and other automatic indexes'; /* Authentication Settings */ $lang['useacl'] = 'Use access control lists'; $lang['autopasswd'] = 'Autogenerate passwords'; $lang['authtype'] = 'Authentication backend'; $lang['passcrypt'] = 'Password encryption method'; -$lang['defaultgroup']= 'Default group'; +$lang['defaultgroup']= 'Default group, all new users will be placed in this group'; $lang['superuser'] = 'Superuser - group, user or comma separated list user1,@group1,user2 with full access to all pages and functions regardless of the ACL settings'; $lang['manager'] = 'Manager - group, user or comma separated list user1,@group1,user2 with access to certain management functions'; $lang['profileconfirm'] = 'Confirm profile changes with password'; @@ -133,23 +133,23 @@ $lang['target____windows'] = 'Target window for windows links'; /* Media Settings */ $lang['mediarevisions'] = 'Enable Mediarevisions?'; -$lang['refcheck'] = 'Media reference check'; -$lang['refshow'] = 'Number of media references to show'; +$lang['refcheck'] = 'Check if a media file is still in use before deleting it'; +$lang['refshow'] = 'Number of media references to show when the above setting is enabled'; $lang['gdlib'] = 'GD Lib version'; $lang['im_convert'] = 'Path to ImageMagick\'s convert tool'; $lang['jpg_quality'] = 'JPG compression quality (0-100)'; -$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from extern'; +$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from external URLs, eg. to cache and resize external images.'; /* Notification Settings */ $lang['subscribers'] = 'Allow users to subscribe to page changes by email'; $lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.'; -$lang['notify'] = 'Send change notifications to this email address'; -$lang['registernotify'] = 'Send info on newly registered users to this email address'; -$lang['mailfrom'] = 'Email address to use for automatic mails'; -$lang['mailprefix'] = 'Email subject prefix to use for automatic mails'; +$lang['notify'] = 'Always send change notifications to this email address'; +$lang['registernotify'] = 'Always send info on newly registered users to this email address'; +$lang['mailfrom'] = 'Sender email address to use for automatic mails'; +$lang['mailprefix'] = 'Email subject prefix to use for automatic mails. Leave blank to use the wiki title'; /* Syndication Settings */ -$lang['sitemap'] = 'Generate Google sitemap (days)'; +$lang['sitemap'] = 'Generate Google sitemap this often (in days). 0 to disable'; $lang['rss_type'] = 'XML feed type'; $lang['rss_linkto'] = 'XML feed links to'; $lang['rss_content'] = 'What to display in the XML feed items?'; @@ -170,7 +170,7 @@ $lang['gzip_output'] = 'Use gzip Content-Encoding for xhtml'; $lang['compress'] = 'Compact CSS and javascript output'; $lang['cssdatauri'] = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE 7 and below! <code>400</code> to <code>600</code> bytes is a good value. Set <code>0</code> to disable.'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages'; -$lang['broken_iua'] = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a> for more info.'; +$lang['broken_iua'] = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See <a href="http://bugs.dokuwiki.org/?do=details&task_id=852">Bug 852</a> for more info.'; $lang['xsendfile'] = 'Use the X-Sendfile header to let the webserver deliver static files? Your webserver needs to support this.'; $lang['renderer_xhtml'] = 'Renderer to use for main (xhtml) wiki output'; $lang['renderer__core'] = '%s (dokuwiki core)'; -- cgit v1.2.3 From f693efbc01fe2c38ff68e30c9710d633a7ec5cee Mon Sep 17 00:00:00 2001 From: Tobias Sarnowski <sarnowski@cosmocode.de> Date: Wed, 18 Apr 2012 09:43:29 +0200 Subject: added missing testing plugin with tests to test tests --- .../dummy_plugin_integration_test.test.php | 32 ++++++++++++++++++++++ .../testing/_testing/dummy_plugin_test.test.php | 9 ++++++ lib/plugins/testing/action.php | 13 +++++++++ lib/plugins/testing/plugin.testing.txt | 5 ++++ 4 files changed, 59 insertions(+) create mode 100644 lib/plugins/testing/_testing/dummy_plugin_integration_test.test.php create mode 100644 lib/plugins/testing/_testing/dummy_plugin_test.test.php create mode 100644 lib/plugins/testing/action.php create mode 100644 lib/plugins/testing/plugin.testing.txt (limited to 'lib') diff --git a/lib/plugins/testing/_testing/dummy_plugin_integration_test.test.php b/lib/plugins/testing/_testing/dummy_plugin_integration_test.test.php new file mode 100644 index 000000000..5982c6933 --- /dev/null +++ b/lib/plugins/testing/_testing/dummy_plugin_integration_test.test.php @@ -0,0 +1,32 @@ +<?php + +/** + * @group integration + */ +class TestingDummyPluginIntegrationTest extends DokuWikiTest { + + function setUp() { + $this->pluginsEnabled = array( + 'testing' + ); + + parent::setUp(); + } + + function testTestingPluginEnabled() { + global $EVENT_HANDLER; + + $request = new TestRequest(); + $hookTriggered = false; + + $EVENT_HANDLER->register_hook('TESTING_PLUGIN_INSTALLED', 'AFTER', null, + function() use (&$hookTriggered) { + $hookTriggered = true; + } + ); + + $request->execute(); + + $this->assertTrue($hookTriggered, 'Testing plugin did not trigger!'); + } +} diff --git a/lib/plugins/testing/_testing/dummy_plugin_test.test.php b/lib/plugins/testing/_testing/dummy_plugin_test.test.php new file mode 100644 index 000000000..eee825fbd --- /dev/null +++ b/lib/plugins/testing/_testing/dummy_plugin_test.test.php @@ -0,0 +1,9 @@ +<?php + +class TestingDummyPluginTest extends DokuWikiTest { + + function testNothing() { + $this->assertTrue(true, 'wow, you really fucked up'); + } + +} diff --git a/lib/plugins/testing/action.php b/lib/plugins/testing/action.php new file mode 100644 index 000000000..22a670eee --- /dev/null +++ b/lib/plugins/testing/action.php @@ -0,0 +1,13 @@ +<?php + +class action_plugin_testing extends DokuWiki_Action_Plugin { + function register(&$controller) { + $controller->register_hook('DOKUWIKI_STARTED', 'AFTER', $this, 'dokuwikiStarted'); + } + + function dokuwikiStarted() { + $param = array(); + trigger_event('TESTING_PLUGIN_INSTALLED', $param); + msg('hohoho'); + } +} diff --git a/lib/plugins/testing/plugin.testing.txt b/lib/plugins/testing/plugin.testing.txt new file mode 100644 index 000000000..840a46d1e --- /dev/null +++ b/lib/plugins/testing/plugin.testing.txt @@ -0,0 +1,5 @@ +author Tobias Sarnowski +email tobias@trustedco.de +date 2012-04-17 +name Testing Plugin +desc Used to test the test framework. -- cgit v1.2.3 From 5a0eec47d375f076d810160503bdd303f8cf62a0 Mon Sep 17 00:00:00 2001 From: Tobias Sarnowski <sarnowski@cosmocode.de> Date: Wed, 18 Apr 2012 12:41:00 +0200 Subject: for consistency, also use _test directory for plugins --- .../_test/dummy_plugin_integration_test.test.php | 32 ++++++++++++++++++++++ .../testing/_test/dummy_plugin_test.test.php | 9 ++++++ .../dummy_plugin_integration_test.test.php | 32 ---------------------- .../testing/_testing/dummy_plugin_test.test.php | 9 ------ 4 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 lib/plugins/testing/_test/dummy_plugin_integration_test.test.php create mode 100644 lib/plugins/testing/_test/dummy_plugin_test.test.php delete mode 100644 lib/plugins/testing/_testing/dummy_plugin_integration_test.test.php delete mode 100644 lib/plugins/testing/_testing/dummy_plugin_test.test.php (limited to 'lib') diff --git a/lib/plugins/testing/_test/dummy_plugin_integration_test.test.php b/lib/plugins/testing/_test/dummy_plugin_integration_test.test.php new file mode 100644 index 000000000..5982c6933 --- /dev/null +++ b/lib/plugins/testing/_test/dummy_plugin_integration_test.test.php @@ -0,0 +1,32 @@ +<?php + +/** + * @group integration + */ +class TestingDummyPluginIntegrationTest extends DokuWikiTest { + + function setUp() { + $this->pluginsEnabled = array( + 'testing' + ); + + parent::setUp(); + } + + function testTestingPluginEnabled() { + global $EVENT_HANDLER; + + $request = new TestRequest(); + $hookTriggered = false; + + $EVENT_HANDLER->register_hook('TESTING_PLUGIN_INSTALLED', 'AFTER', null, + function() use (&$hookTriggered) { + $hookTriggered = true; + } + ); + + $request->execute(); + + $this->assertTrue($hookTriggered, 'Testing plugin did not trigger!'); + } +} diff --git a/lib/plugins/testing/_test/dummy_plugin_test.test.php b/lib/plugins/testing/_test/dummy_plugin_test.test.php new file mode 100644 index 000000000..eee825fbd --- /dev/null +++ b/lib/plugins/testing/_test/dummy_plugin_test.test.php @@ -0,0 +1,9 @@ +<?php + +class TestingDummyPluginTest extends DokuWikiTest { + + function testNothing() { + $this->assertTrue(true, 'wow, you really fucked up'); + } + +} diff --git a/lib/plugins/testing/_testing/dummy_plugin_integration_test.test.php b/lib/plugins/testing/_testing/dummy_plugin_integration_test.test.php deleted file mode 100644 index 5982c6933..000000000 --- a/lib/plugins/testing/_testing/dummy_plugin_integration_test.test.php +++ /dev/null @@ -1,32 +0,0 @@ -<?php - -/** - * @group integration - */ -class TestingDummyPluginIntegrationTest extends DokuWikiTest { - - function setUp() { - $this->pluginsEnabled = array( - 'testing' - ); - - parent::setUp(); - } - - function testTestingPluginEnabled() { - global $EVENT_HANDLER; - - $request = new TestRequest(); - $hookTriggered = false; - - $EVENT_HANDLER->register_hook('TESTING_PLUGIN_INSTALLED', 'AFTER', null, - function() use (&$hookTriggered) { - $hookTriggered = true; - } - ); - - $request->execute(); - - $this->assertTrue($hookTriggered, 'Testing plugin did not trigger!'); - } -} diff --git a/lib/plugins/testing/_testing/dummy_plugin_test.test.php b/lib/plugins/testing/_testing/dummy_plugin_test.test.php deleted file mode 100644 index eee825fbd..000000000 --- a/lib/plugins/testing/_testing/dummy_plugin_test.test.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php - -class TestingDummyPluginTest extends DokuWikiTest { - - function testNothing() { - $this->assertTrue(true, 'wow, you really fucked up'); - } - -} -- cgit v1.2.3 From b2a3342a5ee467dde700d5c67249400d5eb01f86 Mon Sep 17 00:00:00 2001 From: Tim Roes <mail@timroes.de> Date: Wed, 18 Apr 2012 14:58:27 +0200 Subject: Added more detail error code for unauthorized calls in xmlrpc interface. --- lib/exe/xmlrpc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index cf3682f11..5e6c197d0 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -30,10 +30,11 @@ class dokuwiki_xmlrpc_server extends IXR_Server { } catch (RemoteAccessDeniedException $e) { if (!isset($_SERVER['REMOTE_USER'])) { header('HTTP/1.1 401 Unauthorized'); + return new IXR_Error(-32603, "server error. not authorized to call method $methodname"); } else { header('HTTP/1.1 403 Forbidden'); + return new IXR_Error(-32604, "server error. forbidden to call the method $methodname"); } - return new IXR_Error(-32603, "server error. not authorized to call method $methodname"); } catch (RemoteException $e) { return new IXR_Error($e->getCode(), $e->getMessage()); } -- cgit v1.2.3 From 56ef9b96cf85ba4b1e5df37ac113143f102d3642 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <gohr@cosmocode.de> Date: Thu, 19 Apr 2012 11:23:45 +0200 Subject: some more debug output in the indexer webbug --- lib/exe/indexer.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 95e2af05b..738a29503 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -55,6 +55,8 @@ exit; function runTrimRecentChanges($media_changes = false) { global $conf; + echo "runTrimRecentChanges($media_changes): started".NL; + $fn = ($media_changes ? $conf['media_changelog'] : $conf['changelog']); // Trim the Recent Changes @@ -70,6 +72,7 @@ function runTrimRecentChanges($media_changes = false) { if (count($lines)<=$conf['recent']) { // nothing to trim io_unlock($fn); + echo "runTrimRecentChanges($media_changes): finished".NL; return false; } @@ -91,6 +94,7 @@ function runTrimRecentChanges($media_changes = false) { // nothing to trim @unlink($fn.'_tmp'); io_unlock($fn); + echo "runTrimRecentChanges($media_changes): finished".NL; return false; } @@ -114,10 +118,12 @@ function runTrimRecentChanges($media_changes = false) { } else { io_unlock($fn); } + echo "runTrimRecentChanges($media_changes): finished".NL; return true; } // nothing done + echo "runTrimRecentChanges($media_changes): finished".NL; return false; } @@ -160,11 +166,12 @@ function runSitemapper(){ * @author Adrian Lang <lang@cosmocode.de> */ function sendDigest() { - echo 'sendDigest(): start'.NL; + echo 'sendDigest(): started'.NL; global $ID; global $conf; if (!$conf['subscribers']) { - return; + echo 'sendDigest(): disabled'.NL; + return false; } $subscriptions = subscription_find($ID, array('style' => '(digest|list)', 'escaped' => true)); @@ -243,6 +250,8 @@ function sendDigest() { // restore current user info $USERINFO = $olduinfo; $_SERVER['REMOTE_USER'] = $olduser; + echo 'sendDigest(): finished'.NL; + return true; } /** -- cgit v1.2.3 From ffec60bb97c533511a24cb03a6a7ea2b58c9b8a3 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Fri, 20 Apr 2012 14:18:20 +0200 Subject: some tweaks to the pagetool css FS#2481 --- lib/tpl/dokuwiki/css/pagetools.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css index e301b084d..bfa22cb2e 100644 --- a/lib/tpl/dokuwiki/css/pagetools.css +++ b/lib/tpl/dokuwiki/css/pagetools.css @@ -14,7 +14,9 @@ padding-left: 40px; } .dokuwiki div.page { + height: 190px; min-height: 190px; /* 30 (= height of icons) x 6 (= maximum number of possible tools) + 2x5 */ + height: auto; } #dokuwiki__usertools { /* move the tools just outside of the site */ @@ -27,10 +29,12 @@ right: -40px; /* on same vertical level as first headline, because .page has 2em padding */ top: 2em; + width: 40px; } #dokuwiki__pagetools div.tools { position: fixed; + width: 40px; } #dokuwiki__pagetools ul { @@ -66,7 +70,8 @@ /* hide labels accessibly when neither on hover nor on focus */ #dokuwiki__pagetools ul li a span { position: absolute; - left: -99999px; + clip: rect(0 0 0 0); /* IE7, IE6 */ + clip: rect(0, 0, 0, 0); } /* show all tools on hover and individual tools on focus */ -- cgit v1.2.3 From c8388e443bcd0c09a0b142b31819d48abd559aa0 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Fri, 20 Apr 2012 17:20:17 +0200 Subject: made TOC togling script more generic Instead of a dedicated function to toggle the TOC we now have a function that allows to use this functionality everywhere. This will be used to toggle the sidebar in the mobile view (in an upcoming patch). Note, this required some changes to the CSS (to make it more generic). The CSS is still located in the TOC sections but should probably be moved into its own section instead. --- lib/scripts/page.js | 57 ++++++++++++++++++++++++++--------------- lib/tpl/default/design.css | 10 +++++--- lib/tpl/default/rtl.css | 3 ++- lib/tpl/dokuwiki/css/_toc.css | 6 +++-- lib/tpl/dokuwiki/css/design.css | 8 +++--- lib/tpl/dokuwiki/main.php | 11 +++++--- 6 files changed, 61 insertions(+), 34 deletions(-) (limited to 'lib') diff --git a/lib/scripts/page.js b/lib/scripts/page.js index 6e7d7faf7..84af1f18b 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -10,7 +10,7 @@ dw_page = { init: function(){ dw_page.sectionHighlight(); jQuery('a.fn_top').mouseover(dw_page.footnoteDisplay); - dw_page.initTocToggle(); + dw_page.makeToggle('#dw__toc h3','#dw__toc > div'); }, /** @@ -93,47 +93,64 @@ dw_page = { }, /** - * Adds the toggle switch to the TOC + * Makes an element foldable by clicking its handle + * + * This is used for the TOC toggling, but can be used for other elements + * as well. A state indicator is inserted into the handle and can be styled + * by CSS. + * + * @param selector handle What should be clicked to toggle + * @param selector content This element will be toggled */ - initTocToggle: function() { - var $wrapper, $header, $clicky, $toc, $tocul, setClicky; - $wrapper = jQuery('#dw__toc'); - $header = jQuery('h3', $wrapper); - if(!$header.length) { - return; - } - $toc = jQuery('div', $wrapper).first(); - $tocul = jQuery('ul', $toc); + makeToggle: function(handle, content){ + var $handle, $content, $clicky, $child, setClicky; + $handle = jQuery(handle); + if(!$handle.length) return; + $content = jQuery(content); + if(!$content.length) return; + + // we animate the children + $child = $content.children(); + // class/display toggling setClicky = function(hiding){ if(hiding){ $clicky.html('<span>+</span>'); - $wrapper.addClass('close').removeClass('open'); + $handle.addClass('toggle_open'); + $handle.removeClass('toggle_close'); }else{ $clicky.html('<span>−</span>'); - $wrapper.addClass('open').removeClass('close'); + $handle.addClass('toggle_close'); + $handle.removeClass('toggle_open'); } }; - $clicky = jQuery(document.createElement('strong')); - $header.css('cursor','pointer') + // the state indicator + $clicky = jQuery(document.createElement('strong')) + .addClass('toggle'); + + // click function + $handle.css('cursor','pointer') .click(function () { var hidden; - // Assert that $toc instantly takes the whole TOC space - $toc.css('height', $toc.height()).show(); + // Assert that content instantly takes the whole space + $content.css('height', $content.height()).show(); - hidden = $tocul.stop(true, true).is(':hidden'); + // stop any running animation and get current state + hidden = $child.stop(true, true).is(':hidden'); + // update the state setClicky(!hidden); // Start animation and assure that $toc is hidden/visible - $tocul.dw_toggle(hidden, function () { - $toc.toggle(hidden); + $child.dw_toggle(hidden, function () { + $content.toggle(hidden); }); }) .prepend($clicky); + // initial state setClicky(); } }; diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 300b62a15..44ccc0343 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -565,23 +565,25 @@ div.dokuwiki #dw__toc h3 { font-size: 1em; } -div.dokuwiki #dw__toc h3 strong { +div.dokuwiki .toggle_close .toggle, +div.dokuwiki .toggle_open .toggle { border: 0.4em solid __background_alt__; float: right; display: block; margin: 0.4em 3px 0 0; } -div.dokuwiki #dw__toc h3 strong span { +div.dokuwiki .toggle_open .toggle span, +div.dokuwiki .toggle_close .toggle span { display: none; } -div.dokuwiki #dw__toc.close h3 strong { +div.dokuwiki .toggle_close .toggle { margin-top: 0.4em; border-top: 0.4em solid __text__; } -div.dokuwiki #dw__toc.open h3 strong { +div.dokuwiki .toggle_open .toggle { margin-top: 0; border-bottom: 0.4em solid __text__; } diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index 32a8ddb6d..b9dd82902 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -98,7 +98,8 @@ div.dokuwiki #dw__toc h3 { text-align: right; } -div.dokuwiki #dw__toc h3 strong { +div.dokuwiki .toggle_close .toggle, +div.dokuwiki .toggle_open .toggle { float: left; margin: 0.4em 0 0 3px; } diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css index e62bb0a7a..71cc4096a 100644 --- a/lib/tpl/dokuwiki/css/_toc.css +++ b/lib/tpl/dokuwiki/css/_toc.css @@ -26,11 +26,13 @@ font-weight: bold; } -#dw__toc h3 strong { +.toggle_open .toggle, +.toggle_close .toggle { float: right; margin: 0 .2em; } -[dir=rtl] #dw__toc h3 strong { +[dir=rtl] .toggle_open .toggle, +[dir=rtl] .toggle_close .toggle { float: left; } diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 8ebeca6da..2d0af6ad1 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -412,17 +412,19 @@ letter-spacing: .1em; } -#dw__toc h3 strong { +.toggle_open .toggle, +.toggle_close .toggle { background: transparent url(images/toc-arrows.png) 0 0; width: 8px; height: 5px; margin: .4em 0 0; } -#dw__toc.close strong { +.toggle_close .toggle { background-position: 0 -5px; } -#dw__toc strong span { +.toggle_open .toggle span, +.toggle_close .toggle span { display: none; } diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 57c94f174..5e8eb7517 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -37,10 +37,13 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php if($showSidebar): ?> <!-- ********** ASIDE ********** --> <div id="dokuwiki__aside"><div class="pad include group"> - <?php tpl_flush() ?> - <?php tpl_includeFile('sidebarheader.html') ?> - <?php tpl_include_page($conf['sidebar']) ?> - <?php tpl_includeFile('sidebarfooter.html') ?> + <div class="a11y toggle"><?php echo hsc(ucfirst($conf['sidebar'])) ?></div> + <div class="aside group"> + <?php tpl_flush() ?> + <?php tpl_includeFile('sidebarheader.html') ?> + <?php tpl_include_page($conf['sidebar']) ?> + <?php tpl_includeFile('sidebarfooter.html') ?> + </div> </div></div><!-- /aside --> <?php endif; ?> -- cgit v1.2.3 From 290a80647ab295141f3bae29efd1b1691c5bab01 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Fri, 20 Apr 2012 18:04:37 +0200 Subject: mobile styles for the TOC structure changes --- lib/tpl/dokuwiki/css/mobile.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 6aacb4674..34955888c 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -33,22 +33,22 @@ } /* toc */ -.dokuwiki div.toc { +#dw__toc { float: none; margin: 0 0 1em 0; width: auto; border-left-width: 0; border-bottom: 1px solid __border__; } -[dir=rtl] .dokuwiki div.toc { +[dir=rtl] #dw__toc { float: none; margin: 0 0 1em 0; border-right-width: 0; } -.dokuwiki div.tocheader { +#dw__toc h3 { padding: 0 0 .5em; } -.dokuwiki #toc__inside { +#dw__toc > div { padding: .2em 0 .5em; } -- cgit v1.2.3 From 5dcb125169a39581162871578f00a8da6c7c10dd Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Fri, 20 Apr 2012 18:18:41 +0200 Subject: collapse sidebar in mobile view FS#2473 --- lib/tpl/dokuwiki/css/mobile.css | 22 ++++++++++++++++++++++ lib/tpl/dokuwiki/main.php | 2 +- lib/tpl/dokuwiki/script.js | 9 +++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 lib/tpl/dokuwiki/script.js (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 34955888c..31a0a87c8 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -14,10 +14,30 @@ width: 100%; float: none; } + #dokuwiki__aside > .pad { margin: 0 0 .5em; + + /* style like the page */ + background: __background__; + color: inherit; + border: 1px solid #eee; + box-shadow: 0 0 .5em #999; + border-radius: 2px; + padding: 1em; + margin-bottom: .5em; + overflow: hidden; + word-wrap: break-word; +} + +#dokuwiki__aside h3.aside { + padding: 0 0 .5em; + font-size: .875em; + letter-spacing: .1em; + border-bottom: 1px solid __border__; } + .hasSidebar #dokuwiki__content { float: none; margin-left: 0; @@ -45,6 +65,7 @@ margin: 0 0 1em 0; border-right-width: 0; } + #dw__toc h3 { padding: 0 0 .5em; } @@ -194,6 +215,7 @@ /*____________ content ____________*/ +#dokuwiki__aside > .pad, .dokuwiki div.page { padding: .5em; } diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 5e8eb7517..4883cc5f0 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -37,7 +37,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php if($showSidebar): ?> <!-- ********** ASIDE ********** --> <div id="dokuwiki__aside"><div class="pad include group"> - <div class="a11y toggle"><?php echo hsc(ucfirst($conf['sidebar'])) ?></div> + <h3 class="aside a11y"><?php echo hsc(ucfirst($conf['sidebar'])) ?></h3> <div class="aside group"> <?php tpl_flush() ?> <?php tpl_includeFile('sidebarheader.html') ?> diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js new file mode 100644 index 000000000..dd9c17561 --- /dev/null +++ b/lib/tpl/dokuwiki/script.js @@ -0,0 +1,9 @@ +jQuery(function(){ + // check if we are in mobile mode + if(jQuery('div.mobileTools').css('display') == 'none') return; + + // toc and sidebar hiding + dw_page.makeToggle('#dokuwiki__aside h3.aside','#dokuwiki__aside div.aside'); + jQuery('#dw__toc > h3').click(); + jQuery('#dokuwiki__aside h3.aside').removeClass('a11y').click(); +}); -- cgit v1.2.3 From 48722ac855c79944285cbe8958fe5ed03bd835ed Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 22 Apr 2012 21:19:59 +0100 Subject: improved toc changes and sidebar toggling --- lib/scripts/page.js | 11 +++++------ lib/tpl/default/design.css | 10 ++++------ lib/tpl/default/rtl.css | 3 +-- lib/tpl/dokuwiki/css/_toc.css | 8 +++----- lib/tpl/dokuwiki/css/design.css | 13 +++++++------ lib/tpl/dokuwiki/css/mobile.css | 41 +++++++++++++++++++---------------------- lib/tpl/dokuwiki/css/print.css | 1 + lib/tpl/dokuwiki/main.php | 4 ++-- lib/tpl/dokuwiki/script.js | 7 ++++--- 9 files changed, 46 insertions(+), 52 deletions(-) (limited to 'lib') diff --git a/lib/scripts/page.js b/lib/scripts/page.js index 84af1f18b..74dec37fb 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -116,18 +116,17 @@ dw_page = { setClicky = function(hiding){ if(hiding){ $clicky.html('<span>+</span>'); - $handle.addClass('toggle_open'); - $handle.removeClass('toggle_close'); + $handle.addClass('closed'); + $handle.removeClass('open'); }else{ $clicky.html('<span>−</span>'); - $handle.addClass('toggle_close'); - $handle.removeClass('toggle_open'); + $handle.addClass('open'); + $handle.removeClass('closed'); } }; // the state indicator - $clicky = jQuery(document.createElement('strong')) - .addClass('toggle'); + $clicky = jQuery(document.createElement('strong')); // click function $handle.css('cursor','pointer') diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css index 44ccc0343..3405ec258 100644 --- a/lib/tpl/default/design.css +++ b/lib/tpl/default/design.css @@ -565,25 +565,23 @@ div.dokuwiki #dw__toc h3 { font-size: 1em; } -div.dokuwiki .toggle_close .toggle, -div.dokuwiki .toggle_open .toggle { +div.dokuwiki .toggle strong { border: 0.4em solid __background_alt__; float: right; display: block; margin: 0.4em 3px 0 0; } -div.dokuwiki .toggle_open .toggle span, -div.dokuwiki .toggle_close .toggle span { +div.dokuwiki .toggle span { display: none; } -div.dokuwiki .toggle_close .toggle { +div.dokuwiki .toggle.closed strong { margin-top: 0.4em; border-top: 0.4em solid __text__; } -div.dokuwiki .toggle_open .toggle { +div.dokuwiki .toggle.open strong { margin-top: 0; border-bottom: 0.4em solid __text__; } diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index b9dd82902..8b2837874 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -98,8 +98,7 @@ div.dokuwiki #dw__toc h3 { text-align: right; } -div.dokuwiki .toggle_close .toggle, -div.dokuwiki .toggle_open .toggle { +div.dokuwiki .toggle strong { float: left; margin: 0.4em 0 0 3px; } diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css index 71cc4096a..0d1b976d1 100644 --- a/lib/tpl/dokuwiki/css/_toc.css +++ b/lib/tpl/dokuwiki/css/_toc.css @@ -21,18 +21,16 @@ /*____________ toc header ____________*/ -#dw__toc h3 { +.dokuwiki h3.toggle { padding: .2em .5em; font-weight: bold; } -.toggle_open .toggle, -.toggle_close .toggle { +.dokuwiki .toggle strong { float: right; margin: 0 .2em; } -[dir=rtl] .toggle_open .toggle, -[dir=rtl] .toggle_close .toggle { +[dir=rtl] .dokuwiki .toggle strong { float: left; } diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 2d0af6ad1..1bc667fb5 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -405,26 +405,27 @@ border-right: 1px solid __border__; } -#dw__toc h3 { +.dokuwiki h3.toggle { padding: .5em 1em; margin-bottom: 0; font-size: .875em; letter-spacing: .1em; } +#dokuwiki__aside h3.toggle { + display: none; +} -.toggle_open .toggle, -.toggle_close .toggle { +.dokuwiki .toggle strong { background: transparent url(images/toc-arrows.png) 0 0; width: 8px; height: 5px; margin: .4em 0 0; } -.toggle_close .toggle { +.dokuwiki .toggle.closed strong { background-position: 0 -5px; } -.toggle_open .toggle span, -.toggle_close .toggle span { +.dokuwiki .toggle strong span { display: none; } diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 31a0a87c8..b57b60e9b 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -15,10 +15,10 @@ float: none; } -#dokuwiki__aside > .pad { +#dokuwiki__aside > .pad, +[dir=rtl] #dokuwiki__aside > .pad { margin: 0 0 .5em; - - /* style like the page */ + /* style like .page */ background: __background__; color: inherit; border: 1px solid #eee; @@ -26,18 +26,8 @@ border-radius: 2px; padding: 1em; margin-bottom: .5em; - overflow: hidden; - word-wrap: break-word; } -#dokuwiki__aside h3.aside { - padding: 0 0 .5em; - font-size: .875em; - letter-spacing: .1em; - border-bottom: 1px solid __border__; -} - - .hasSidebar #dokuwiki__content { float: none; margin-left: 0; @@ -66,10 +56,11 @@ border-right-width: 0; } -#dw__toc h3 { - padding: 0 0 .5em; +.dokuwiki h3.toggle { + padding: 0 .5em .5em 0; } -#dw__toc > div { +#dw__toc > div, +#dokuwiki__aside div.content { padding: .2em 0 .5em; } @@ -77,12 +68,6 @@ .dokuwiki div.page { padding: 1em; } -.dokuwiki .pageId span { - border-width: 0; - background-color: __background_site__; - color: __text_alt__; - box-shadow: 0 0 0; -} /* _edit */ .dokuwiki div.section_highlight { @@ -123,6 +108,18 @@ padding: .5em 0; } +#dokuwiki__aside h3.toggle { + font-size: 1em; +} +#dokuwiki__aside h3.toggle.closed { + margin-bottom: 0; + padding-bottom: 0; +} +#dokuwiki__aside h3.toggle.open { + border-bottom: 1px solid __border__; +} + + /*____________ header ____________*/ #dokuwiki__header ul.a11y.skip { diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index f6bf64dd9..9f43f5131 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -22,6 +22,7 @@ div.error, #dokuwiki__aside, .dokuwiki .breadcrumbs, #dw__toc, +h3.toggle, .dokuwiki .secedit, #dokuwiki__pagetools, #dokuwiki__footer { diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 4883cc5f0..d8e85850f 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -37,8 +37,8 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php if($showSidebar): ?> <!-- ********** ASIDE ********** --> <div id="dokuwiki__aside"><div class="pad include group"> - <h3 class="aside a11y"><?php echo hsc(ucfirst($conf['sidebar'])) ?></h3> - <div class="aside group"> + <h3 class="toggle"><?php echo hsc(ucfirst($conf['sidebar'])) ?></h3> + <div class="content"> <?php tpl_flush() ?> <?php tpl_includeFile('sidebarheader.html') ?> <?php tpl_include_page($conf['sidebar']) ?> diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index dd9c17561..b31d3dc08 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -3,7 +3,8 @@ jQuery(function(){ if(jQuery('div.mobileTools').css('display') == 'none') return; // toc and sidebar hiding - dw_page.makeToggle('#dokuwiki__aside h3.aside','#dokuwiki__aside div.aside'); - jQuery('#dw__toc > h3').click(); - jQuery('#dokuwiki__aside h3.aside').removeClass('a11y').click(); + dw_page.makeToggle('#dokuwiki__aside h3.toggle','#dokuwiki__aside div.content'); + + jQuery('#dw__toc h3.toggle').click(); + jQuery('#dokuwiki__aside h3.toggle').show().click(); }); -- cgit v1.2.3 From 22ef1e32c51ac82df8d6a03e1e95876100e8f6c1 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Mon, 23 Apr 2012 12:24:08 +0200 Subject: added option to disable reverse DNS lookups --- lib/plugins/config/lang/en/lang.php | 3 +++ lib/plugins/config/settings/config.metadata.php | 1 + 2 files changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index d588e02f8..83c843b3a 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -177,6 +177,9 @@ $lang['renderer_xhtml'] = 'Renderer to use for main (xhtml) wiki output'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; +/* Network Options */ +$lang['dnslookups'] = 'DokuWiki will lookup hostnames for remote IP addresses of users editing pages. If you have a slow or non working DNS server or don\'t want this feature, disable this option'; + /* Proxy Options */ $lang['proxy____host'] = 'Proxy servername'; $lang['proxy____port'] = 'Proxy port'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 997495b2e..3607f56c6 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -207,6 +207,7 @@ $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => ar $meta['readdircache'] = array('numeric'); $meta['_network'] = array('fieldset'); +$meta['dnslookups'] = array('onoff'); $meta['proxy____host'] = array('string','_pattern' => '#^(|[a-z0-9\-\.+]+)$#i'); $meta['proxy____port'] = array('numericopt'); $meta['proxy____user'] = array('string'); -- cgit v1.2.3 From 23684d4a1920ae8e92fda68725e49035614f3d8a Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Tue, 24 Apr 2012 22:21:05 +0200 Subject: some cleanup for the testing plugin --- lib/plugins/testing/action.php | 10 ++++++++-- lib/plugins/testing/plugin.info.txt | 6 ++++++ lib/plugins/testing/plugin.testing.txt | 5 ----- 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 lib/plugins/testing/plugin.info.txt delete mode 100644 lib/plugins/testing/plugin.testing.txt (limited to 'lib') diff --git a/lib/plugins/testing/action.php b/lib/plugins/testing/action.php index 22a670eee..e829847b6 100644 --- a/lib/plugins/testing/action.php +++ b/lib/plugins/testing/action.php @@ -1,5 +1,11 @@ <?php - +/** + * Plugin for testing the test system + * + * This plugin doesn't really do anything and should always be disabled + * + * @author Tobias Sarnowski <tobias@trustedco.de> + */ class action_plugin_testing extends DokuWiki_Action_Plugin { function register(&$controller) { $controller->register_hook('DOKUWIKI_STARTED', 'AFTER', $this, 'dokuwikiStarted'); @@ -8,6 +14,6 @@ class action_plugin_testing extends DokuWiki_Action_Plugin { function dokuwikiStarted() { $param = array(); trigger_event('TESTING_PLUGIN_INSTALLED', $param); - msg('hohoho'); + msg('The testing plugin is enabled and should be disabled.',-1); } } diff --git a/lib/plugins/testing/plugin.info.txt b/lib/plugins/testing/plugin.info.txt new file mode 100644 index 000000000..a514d7774 --- /dev/null +++ b/lib/plugins/testing/plugin.info.txt @@ -0,0 +1,6 @@ +base testing +author Tobias Sarnowski +email tobias@trustedco.de +date 2012-04-24 +name Testing Plugin +desc Used to test the test framework. Should always be disabled. diff --git a/lib/plugins/testing/plugin.testing.txt b/lib/plugins/testing/plugin.testing.txt deleted file mode 100644 index 840a46d1e..000000000 --- a/lib/plugins/testing/plugin.testing.txt +++ /dev/null @@ -1,5 +0,0 @@ -author Tobias Sarnowski -email tobias@trustedco.de -date 2012-04-17 -name Testing Plugin -desc Used to test the test framework. -- cgit v1.2.3 From fa44d8f1a09e815a2c77b65bb47ef6481aa0b3b6 Mon Sep 17 00:00:00 2001 From: Tim Roes <mail@timroes.de> Date: Fri, 27 Apr 2012 12:59:40 +0200 Subject: Changed style of notification messages --- lib/styles/screen.css | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/styles/screen.css b/lib/styles/screen.css index 101ed3529..f97149745 100644 --- a/lib/styles/screen.css +++ b/lib/styles/screen.css @@ -10,36 +10,40 @@ div.success, div.notify { color: #000; background-repeat: no-repeat; - background-position: .5em 0; - border-bottom: 1px solid; + background-position: .5em 50%; + border: 1px solid; font-size: 90%; - margin: 0; + margin: 0.5em 0; + padding: 0.4em; padding-left: 3em; overflow: hidden; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; } div.error { background-color: #fcc; background-image: url(../images/error.png); - border-bottom-color: #faa; + border-color: #ebb; } div.info { background-color: #ccf; background-image: url(../images/info.png); - border-bottom-color: #aaf; + border-color: #bbe; } div.success { background-color: #cfc; background-image: url(../images/success.png); - border-bottom-color: #afa; + border-color: #beb; } div.notify { background-color: #ffc; background-image: url(../images/notify.png); - border-bottom-color: #ffa; + border-color: #eeb; } /* modal windows */ -- cgit v1.2.3 From 14704953412e3710917a7595b4d1e9e6d0f6e7fe Mon Sep 17 00:00:00 2001 From: Yannick Aure <yannick.aure@gmail.com> Date: Fri, 27 Apr 2012 15:14:54 +0200 Subject: French language update --- lib/plugins/acl/lang/fr/lang.php | 1 + lib/plugins/config/lang/fr/lang.php | 101 ++++++++++++++++--------------- lib/plugins/plugin/lang/fr/lang.php | 1 + lib/plugins/popularity/lang/fr/lang.php | 1 + lib/plugins/revert/lang/fr/lang.php | 1 + lib/plugins/usermanager/lang/fr/lang.php | 1 + 6 files changed, 58 insertions(+), 48 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php index a33a52bf0..7db8ae4ac 100644 --- a/lib/plugins/acl/lang/fr/lang.php +++ b/lib/plugins/acl/lang/fr/lang.php @@ -22,6 +22,7 @@ * @author Johan Guilbaud <guilbaud.johan@gmail.com> * @author schplurtz@laposte.net * @author skimpax@gmail.com + * @author Yannick Aure <yannick.aure@gmail.com> */ $lang['admin_acl'] = 'Gestion de la liste des contrôles d\'accès (ACL)'; $lang['acl_group'] = 'Groupe'; diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 4a67a0fc8..591e9f2fb 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -17,6 +17,7 @@ * @author Johan Guilbaud <guilbaud.johan@gmail.com> * @author schplurtz@laposte.net * @author skimpax@gmail.com + * @author Yannick Aure <yannick.aure@gmail.com> */ $lang['menu'] = 'Paramètres de configuration'; $lang['error'] = 'Paramètres non modifiés en raison d\'une valeur non valide, vérifiez vos réglages et réessayez. <br />Les valeurs erronées sont entourées d\'une bordure rouge.'; @@ -38,6 +39,8 @@ $lang['_anti_spam'] = 'Paramètres anti-spam'; $lang['_editing'] = 'Paramètres d\'édition'; $lang['_links'] = 'Paramètres des liens'; $lang['_media'] = 'Paramètres média'; +$lang['_notifications'] = 'Paramètres de Notification'; +$lang['_syndication'] = 'Paramètres de Syndication'; $lang['_advanced'] = 'Paramètres avancés'; $lang['_network'] = 'Paramètres réseaux'; $lang['_plugin_sufix'] = 'Paramètres de module'; @@ -45,26 +48,27 @@ $lang['_template_sufix'] = 'Paramètres de modèle'; $lang['_msg_setting_undefined'] = 'Pas de métadonnée de paramètres.'; $lang['_msg_setting_no_class'] = 'Pas de classe de paramètres.'; $lang['_msg_setting_no_default'] = 'Pas de valeur par défaut.'; -$lang['fmode'] = 'Mode de création des fichiers'; -$lang['dmode'] = 'Mode de création des répertoires'; +$lang['title'] = 'Titre du wiki'; +$lang['start'] = 'Nom de la page d\'accueil'; $lang['lang'] = 'Langue'; +$lang['template'] = 'Modèle'; +$lang['license'] = 'Sous quelle licence doit être placé le contenu ?'; +$lang['savedir'] = 'Répertoire de stockage'; $lang['basedir'] = 'Répertoire de base (ex. : <code>/dokuwiki/</code>). Laisser vide pour une détection automatique.'; $lang['baseurl'] = 'URL de base. Laisser vide pour une détection automatique.'; -$lang['savedir'] = 'Répertoire de stockage'; $lang['cookiedir'] = 'Chemin des cookies. Laissez vide pour utiliser l\'URL de base.'; -$lang['start'] = 'Nom de la page d\'accueil'; -$lang['title'] = 'Titre du wiki'; -$lang['template'] = 'Modèle'; -$lang['license'] = 'Sous quelle licence doit être placé le contenu ?'; -$lang['fullpath'] = 'Utiliser le chemin complet dans le pied de page'; +$lang['dmode'] = 'Mode de création des répertoires'; +$lang['fmode'] = 'Mode de création des fichiers'; +$lang['allowdebug'] = 'Debug (<strong>Ne l\'activez que si vous en avez besoin !</strong>)'; $lang['recent'] = 'Nombre de derniers changements à afficher'; +$lang['recent_days'] = 'Signaler les pages modifiées depuis (en jours)'; $lang['breadcrumbs'] = 'Nombre de traces à afficher'; $lang['youarehere'] = 'Traces hiérarchiques'; +$lang['fullpath'] = 'Utiliser le chemin complet dans le pied de page'; $lang['typography'] = 'Effectuer des améliorations typographiques'; -$lang['htmlok'] = 'Permettre HTML dans les pages'; -$lang['phpok'] = 'Permettre PHP dans les pages'; $lang['dformat'] = 'Format de date (cf. fonction <a href="http://fr.php.net/strftime">strftime</a> de PHP)'; $lang['signature'] = 'Signature'; +$lang['showuseras'] = 'Qu\'afficher en montrant les utilisateurs qui ont récemment modifié la page'; $lang['toptoclevel'] = 'Niveau le plus haut à afficher dans la table des matières'; $lang['tocminheads'] = 'Nombre minimum de titres pour qu\'une table des matières soit construite'; $lang['maxtoclevel'] = 'Niveau maximum pour figurer dans la table des matières'; @@ -72,16 +76,8 @@ $lang['maxseclevel'] = 'Niveau maximum pour modifier des sections'; $lang['camelcase'] = 'Utiliser CamelCase pour les liens'; $lang['deaccent'] = 'Retirer les accents dans les noms de pages'; $lang['useheading'] = 'Utiliser le titre de premier niveau'; -$lang['refcheck'] = 'Vérifier les références de média'; -$lang['refshow'] = 'Nombre de références de média à montrer'; -$lang['allowdebug'] = 'Debug (<strong>Ne l\'activez que si vous en avez besoin !</strong>)'; -$lang['mediarevisions'] = 'Activer les révisions (gestion de versions) des médias'; -$lang['usewordblock'] = 'Bloquer le spam selon les mots utilisés'; -$lang['indexdelay'] = 'Délai avant l\'indexation (en secondes)'; -$lang['relnofollow'] = 'Utiliser rel="nofollow" sur les liens extérieurs'; -$lang['mailguard'] = 'Brouiller les adresses de courriel'; -$lang['iexssprotect'] = 'Vérifier la présence de code JavaScript ou HTML malveillant dans les fichiers envoyés'; -$lang['showuseras'] = 'Qu\'afficher en montrant les utilisateurs qui ont récemment modifié la page'; +$lang['sneaky_index'] = 'Par défaut, DokuWiki affichera toutes les catégories dans la vue par index. Activer cette option permet de cacher celles pour lesquelles l\'utilisateur n\'a pas la permission de lecture. Il peut en résulter le masquage de sous-catégories accessibles. Ceci peut rendre l\'index inutilisable avec certaines ACL.'; +$lang['hidepages'] = 'Cacher les pages correspondant à (expression régulière)'; $lang['useacl'] = 'Utiliser les listes de contrôle d\'accès (ACL)'; $lang['autopasswd'] = 'Auto-générer les mots de passe'; $lang['authtype'] = 'Mécanisme d\'authentification'; @@ -90,59 +86,68 @@ $lang['defaultgroup'] = 'Groupe par défaut'; $lang['superuser'] = 'Superuser - groupe, utilisateur ou liste séparée par des virgules user1,@group1,user2 ayant un accès complet à toutes les pages quelque soit le paramétrage des ACL'; $lang['manager'] = 'Manager - groupe, utilisateur ou liste séparée par des virgules user1,@group1,user2 ayant accès à certaines fonctions de gestion'; $lang['profileconfirm'] = 'Confirmer par mot de passe les modifications de profil'; +$lang['rememberme'] = 'Permettre de conserver de manière permanente les cookies de connexion (mémoriser)'; $lang['disableactions'] = 'Actions à désactiver dans DokuWiki'; $lang['disableactions_check'] = 'Vérifier'; $lang['disableactions_subscription'] = 'Abonnement aux pages'; $lang['disableactions_wikicode'] = 'Afficher le texte source'; $lang['disableactions_other'] = 'Autres actions (séparées par des virgules)'; -$lang['sneaky_index'] = 'Par défaut, DokuWiki affichera toutes les catégories dans la vue par index. Activer cette option permet de cacher celles pour lesquelles l\'utilisateur n\'a pas la permission de lecture. Il peut en résulter le masquage de sous-catégories accessibles. Ceci peut rendre l\'index inutilisable avec certaines ACL.'; $lang['auth_security_timeout'] = 'Délai d\'expiration de sécurité (secondes)'; $lang['securecookie'] = 'Les cookies mis via HTTPS doivent-ils n\'être envoyé par le navigateur que via HTTPS ? Ne désactivez cette option que si la connexion à votre wiki est sécurisée avec SSL mais que la navigation sur le wiki n\'est pas sécurisée.'; +$lang['remote'] = 'Active l\'API système distante. Ceci autorise d\'autres applications à accéder au wiki via XML-RPC ou d\'autres mécanismes.'; +$lang['usewordblock'] = 'Bloquer le spam selon les mots utilisés'; +$lang['relnofollow'] = 'Utiliser rel="nofollow" sur les liens extérieurs'; +$lang['indexdelay'] = 'Délai avant l\'indexation (en secondes)'; +$lang['mailguard'] = 'Brouiller les adresses de courriel'; +$lang['iexssprotect'] = 'Vérifier la présence de code JavaScript ou HTML malveillant dans les fichiers envoyés'; +$lang['usedraft'] = 'Enregistrer automatiquement un brouillon pendant l\'édition'; +$lang['htmlok'] = 'Permettre HTML dans les pages'; +$lang['phpok'] = 'Permettre PHP dans les pages'; +$lang['locktime'] = 'Âge maximum des fichiers verrous (en secondes)'; +$lang['cachetime'] = 'Âge maximum d\'un fichier en cache (en secondes)'; +$lang['target____wiki'] = 'Cible pour liens internes'; +$lang['target____interwiki'] = 'Cible pour liens interwiki'; +$lang['target____extern'] = 'Cible pour liens externes'; +$lang['target____media'] = 'Cible pour liens média'; +$lang['target____windows'] = 'Cible pour liens vers partages Windows'; +$lang['mediarevisions'] = 'Activer les révisions (gestion de versions) des médias'; +$lang['refcheck'] = 'Vérifier les références de média'; +$lang['refshow'] = 'Nombre de références de média à montrer'; +$lang['gdlib'] = 'Version de GD Lib'; +$lang['im_convert'] = 'Chemin vers l\'outil de conversion d\'ImageMagick'; +$lang['jpg_quality'] = 'Qualité de la compression JPEG (0-100)'; +$lang['fetchsize'] = 'Taille maximale (en octets) du fichier que fetch.php peut télécharger'; +$lang['subscribers'] = 'Activer l\'abonnement aux pages'; +$lang['subscribe_time'] = 'Délai après lequel les listes d\'abonnement et résumés sont envoyés (en secondes). Devrait être plus petit que le délai précisé dans recent_days.'; +$lang['notify'] = 'Notifier les modifications à cette adresse de courriel'; +$lang['registernotify'] = 'Envoyer un courriel annonçant les nouveaux utilisateurs enregistrés à cette adresse'; +$lang['mailfrom'] = 'Expéditeur des notifications par courriel du wiki'; +$lang['mailprefix'] = 'Préfixe à utiliser dans les objets des courriels automatiques'; +$lang['sitemap'] = 'Fréquence de génération une carte Google du site (en jours)'; +$lang['rss_type'] = 'Type de flux RSS'; +$lang['rss_linkto'] = 'Lien du flux RSS vers'; +$lang['rss_content'] = 'Quel contenu afficher dans le flux RSS ?'; +$lang['rss_update'] = 'Fréquence de mise à jour du flux RSS (en secondes)'; +$lang['rss_show_summary'] = 'Le flux XML affiche le résumé dans le titre'; +$lang['rss_media'] = 'Quels types de changements devraient être listés dans le flux XML?'; $lang['updatecheck'] = 'Vérifier les mises à jour ? DokuWiki doit pouvoir contacter update.dokuwiki.org.'; $lang['userewrite'] = 'URL esthétiques'; $lang['useslash'] = 'Utiliser « / » comme séparateur de catégorie dans les URL'; -$lang['usedraft'] = 'Enregistrer automatiquement un brouillon pendant l\'édition'; $lang['sepchar'] = 'Séparateur de mots dans les noms de page'; $lang['canonical'] = 'Utiliser des URL canoniques'; $lang['fnencode'] = 'Méthode pour l\'encodage des fichiers non-ASCII'; $lang['autoplural'] = 'Rechercher les formes plurielles dans les liens'; $lang['compression'] = 'Méthode de compression pour les fichiers dans attic'; -$lang['cachetime'] = 'Âge maximum d\'un fichier en cache (en secondes)'; -$lang['locktime'] = 'Âge maximum des fichiers verrous (en secondes)'; -$lang['fetchsize'] = 'Taille maximale (en octets) du fichier que fetch.php peut télécharger'; -$lang['notify'] = 'Notifier les modifications à cette adresse de courriel'; -$lang['registernotify'] = 'Envoyer un courriel annonçant les nouveaux utilisateurs enregistrés à cette adresse'; -$lang['mailfrom'] = 'Expéditeur des notifications par courriel du wiki'; -$lang['mailprefix'] = 'Préfixe à utiliser dans les objets des courriels automatiques'; $lang['gzip_output'] = 'Utiliser Content-Encoding gzip pour XHTML'; -$lang['gdlib'] = 'Version de GD Lib'; -$lang['im_convert'] = 'Chemin vers l\'outil de conversion d\'ImageMagick'; -$lang['jpg_quality'] = 'Qualité de la compression JPEG (0-100)'; -$lang['subscribers'] = 'Activer l\'abonnement aux pages'; -$lang['subscribe_time'] = 'Délai après lequel les listes d\'abonnement et résumés sont envoyés (en secondes). Devrait être plus petit que le délai précisé dans recent_days.'; $lang['compress'] = 'Compresser CSS et JavaScript'; $lang['cssdatauri'] = 'Taille maximale en octets pour inclure dans les feuilles de styles CSS, les images qui y sont référencées. Cette technique minimise les requêtes HTTP. Pour IE, ceci ne fonctionne qu\'à partir de la version 8 ! Valeurs correctes entre <code>400</code> et <code>600</code>. <code>0</code> pour désactiver.'; -$lang['hidepages'] = 'Cacher les pages correspondant à (expression régulière)'; $lang['send404'] = 'Renvoyer "HTTP 404/Page Non Trouvée" pour les pages introuvables'; -$lang['sitemap'] = 'Fréquence de génération une carte Google du site (en jours)'; $lang['broken_iua'] = 'La fonction ignore_user_abort est-elle opérationnelle sur votre système ? Ceci peut empêcher le fonctionnement de l\'index de recherche. IIS+PHP/ CGI dysfonctionne. Voir le <a href="http://bugs.splitbrain.org/?do=details&task_id=852">bug 852</a> pour plus d\'info.'; $lang['xsendfile'] = 'Utiliser l\'en-tête X-Sendfile pour permettre au serveur Web de délivrer des fichiers statiques ? Votre serveur Web doit supporter cette fonctionnalité.'; $lang['renderer_xhtml'] = 'Moteur de rendu du format de sortie principal (XHTML)'; $lang['renderer__core'] = '%s (cœur de dokuwiki)'; $lang['renderer__plugin'] = '%s (module externe)'; -$lang['rememberme'] = 'Permettre de conserver de manière permanente les cookies de connexion (mémoriser)'; -$lang['rss_type'] = 'Type de flux RSS'; -$lang['rss_linkto'] = 'Lien du flux RSS vers'; -$lang['rss_content'] = 'Quel contenu afficher dans le flux RSS ?'; -$lang['rss_update'] = 'Fréquence de mise à jour du flux RSS (en secondes)'; -$lang['recent_days'] = 'Signaler les pages modifiées depuis (en jours)'; -$lang['rss_show_summary'] = 'Le flux XML affiche le résumé dans le titre'; -$lang['target____wiki'] = 'Cible pour liens internes'; -$lang['target____interwiki'] = 'Cible pour liens interwiki'; -$lang['target____extern'] = 'Cible pour liens externes'; -$lang['target____media'] = 'Cible pour liens média'; -$lang['target____windows'] = 'Cible pour liens vers partages Windows'; $lang['proxy____host'] = 'Proxy - Serveur hôte'; $lang['proxy____port'] = 'Proxy - Numéro de port'; $lang['proxy____user'] = 'Proxy - Identifiant'; diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php index bb0b49872..bf7a3739a 100644 --- a/lib/plugins/plugin/lang/fr/lang.php +++ b/lib/plugins/plugin/lang/fr/lang.php @@ -17,6 +17,7 @@ * @author Johan Guilbaud <guilbaud.johan@gmail.com> * @author schplurtz@laposte.net * @author skimpax@gmail.com + * @author Yannick Aure <yannick.aure@gmail.com> */ $lang['menu'] = 'Gestion des modules externes'; $lang['download'] = 'Télécharger et installer un nouveau module'; diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php index 9ff7a7e8b..f235fd0fa 100644 --- a/lib/plugins/popularity/lang/fr/lang.php +++ b/lib/plugins/popularity/lang/fr/lang.php @@ -14,6 +14,7 @@ * @author Johan Guilbaud <guilbaud.johan@gmail.com> * @author schplurtz@laposte.net * @author skimpax@gmail.com + * @author Yannick Aure <yannick.aure@gmail.com> */ $lang['name'] = 'Enquête de popularité (peut nécessiter un certain temps pour être chargée)'; $lang['submit'] = 'Envoyer les données'; diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php index 9c5194b31..75c8bab68 100644 --- a/lib/plugins/revert/lang/fr/lang.php +++ b/lib/plugins/revert/lang/fr/lang.php @@ -15,6 +15,7 @@ * @author Johan Guilbaud <guilbaud.johan@gmail.com> * @author schplurtz@laposte.net * @author skimpax@gmail.com + * @author Yannick Aure <yannick.aure@gmail.com> */ $lang['menu'] = 'Gestionnaire de réversions'; $lang['filter'] = 'Trouver les pages spammées '; diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php index 948262a8f..882312820 100644 --- a/lib/plugins/usermanager/lang/fr/lang.php +++ b/lib/plugins/usermanager/lang/fr/lang.php @@ -16,6 +16,7 @@ * @author Johan Guilbaud <guilbaud.johan@gmail.com> * @author schplurtz@laposte.net * @author skimpax@gmail.com + * @author Yannick Aure <yannick.aure@gmail.com> */ $lang['menu'] = 'Gestion des utilisateurs'; $lang['noauth'] = '(authentification utilisateur non disponible)'; -- cgit v1.2.3 From 98fb3f18ab505241d412ef4892e24c97b73efcd5 Mon Sep 17 00:00:00 2001 From: Osaka <mr.osaka@gmail.com> Date: Fri, 27 Apr 2012 15:16:01 +0200 Subject: Japanese language update --- lib/plugins/config/lang/ja/lang.php | 106 ++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 52 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php index fb263fe00..a89123f8c 100644 --- a/lib/plugins/config/lang/ja/lang.php +++ b/lib/plugins/config/lang/ja/lang.php @@ -32,6 +32,8 @@ $lang['_anti_spam'] = 'スパム対策'; $lang['_editing'] = '編集'; $lang['_links'] = 'リンク'; $lang['_media'] = 'メディア'; +$lang['_notifications'] = '通知設定'; +$lang['_syndication'] = 'RSS配信設定'; $lang['_advanced'] = '高度な設定'; $lang['_network'] = 'ネットワーク'; $lang['_plugin_sufix'] = 'プラグイン設定'; @@ -39,28 +41,29 @@ $lang['_template_sufix'] = 'テンプレート設定'; $lang['_msg_setting_undefined'] = '設定のためのメタデータがありません。'; $lang['_msg_setting_no_class'] = '設定クラスがありません。'; $lang['_msg_setting_no_default'] = '初期値が設定されていません。'; -$lang['fmode'] = 'ファイル作成マスク'; -$lang['dmode'] = 'フォルダ作成マスク'; -$lang['lang'] = '使用言語'; -$lang['basedir'] = 'サーバのパス (例: <code>/dokuwiki/</code>)。空欄にすると自動的に検出します。'; -$lang['baseurl'] = 'サーバの URL (例: <code>http://www.yourserver.com</code>)。空欄にすると自動的に検出します。'; -$lang['savedir'] = '保存ディレクトリ'; -$lang['cookiedir'] = 'Cookie のパス。空欄にすると baseurl を使用します。'; -$lang['start'] = 'スタートページ名'; $lang['title'] = 'WIKIタイトル'; +$lang['start'] = 'スタートページ名'; +$lang['lang'] = '使用言語'; $lang['template'] = 'テンプレート'; $lang['tagline'] = 'キャッチフレーズ (テンプレートが対応していれば)'; $lang['sidebar'] = 'サイドバー用ページ名 (テンプレートが対応していれば)。空欄でサイドバー無効。'; $lang['license'] = '作成した内容をどのライセンスでリリースしますか？'; -$lang['fullpath'] = 'ページのフッターに絶対パスを表示'; +$lang['savedir'] = '保存ディレクトリ'; +$lang['basedir'] = 'サーバのパス (例: <code>/dokuwiki/</code>)。空欄にすると自動的に検出します。'; +$lang['baseurl'] = 'サーバの URL (例: <code>http://www.yourserver.com</code>)。空欄にすると自動的に検出します。'; +$lang['cookiedir'] = 'Cookie のパス。空欄にすると baseurl を使用します。'; +$lang['dmode'] = 'フォルダ作成マスク'; +$lang['fmode'] = 'ファイル作成マスク'; +$lang['allowdebug'] = 'デバッグモード（<b>必要で無いときは無効にしてください</b>）'; $lang['recent'] = '最近の変更表示数'; +$lang['recent_days'] = '最近の変更とする期間（日数）'; $lang['breadcrumbs'] = 'トレース（パンくず）表示数'; $lang['youarehere'] = '現在位置を表示'; +$lang['fullpath'] = 'ページのフッターに絶対パスを表示'; $lang['typography'] = 'タイポグラフィー変換'; -$lang['htmlok'] = 'HTML埋め込み'; -$lang['phpok'] = 'PHP埋め込み'; $lang['dformat'] = '日付フォーマット（PHPの<a href="http://www.php.net/strftime">strftime</a>関数を参照）'; $lang['signature'] = '署名'; +$lang['showuseras'] = '最終編集者の情報として表示する内容'; $lang['toptoclevel'] = '目次 トップレベル見出し'; $lang['tocminheads'] = '目次を生成するための最小見出し数'; $lang['maxtoclevel'] = '目次 表示限度見出し'; @@ -68,16 +71,8 @@ $lang['maxseclevel'] = '編集可能見出し'; $lang['camelcase'] = 'キャメルケースリンク'; $lang['deaccent'] = 'ページ名アクセント'; $lang['useheading'] = '最初の見出しをページ名とする'; -$lang['refcheck'] = 'メディア参照元チェック'; -$lang['refshow'] = 'メディア参照元表示数'; -$lang['allowdebug'] = 'デバッグモード（<b>必要で無いときは無効にしてください</b>）'; -$lang['mediarevisions'] = 'メディアファイルの履歴を有効にしますか?'; -$lang['usewordblock'] = '単語リストに基づくスパムブロック'; -$lang['indexdelay'] = 'インデックスを許可（何秒後）'; -$lang['relnofollow'] = 'rel="nofollow"を付加'; -$lang['mailguard'] = 'メールアドレス保護'; -$lang['iexssprotect'] = 'アップロードファイルに悪意のあるJavaScriptやHTMLが含まれていないかチェックする'; -$lang['showuseras'] = '最終編集者の情報として表示する内容'; +$lang['sneaky_index'] = 'デフォルトでは索引にすべての名前空間を表示しますが、この機能はユーザーに閲覧権限のない名前空間を非表示にします。ただし、閲覧が可能な副名前空間まで表示されなくなるため、ACLの設定が適正でない場合は索引機能が使えなくなる場合があります。'; +$lang['hidepages'] = '非公開ページ（Regex）'; $lang['useacl'] = 'アクセス管理を行う（ACL）'; $lang['autopasswd'] = 'パスワードの自動生成（ACL）'; $lang['authtype'] = '認証方法（ACL）'; @@ -86,61 +81,68 @@ $lang['defaultgroup'] = 'デフォルトグループ（ACL）'; $lang['superuser'] = 'スーパーユーザー（ACL）'; $lang['manager'] = 'マネージャー（特定の管理機能を使用可能なユーザーもしくはグループ）'; $lang['profileconfirm'] = 'プロフィール変更時に現在のパスワードを要求（ACL）'; +$lang['rememberme'] = 'ログイン用クッキーを永久に保持することを許可（ログインを保持）'; $lang['disableactions'] = 'DokuWiki の動作を無効にする'; $lang['disableactions_check'] = 'チェック'; $lang['disableactions_subscription'] = '登録 / 解除'; $lang['disableactions_wikicode'] = 'ソース閲覧 / 生データ出力'; $lang['disableactions_other'] = 'その他の動作（カンマ区切り）'; -$lang['sneaky_index'] = 'デフォルトでは索引にすべての名前空間を表示しますが、この機能はユーザーに閲覧権限のない名前空間を非表示にします。ただし、閲覧が可能な副名前空間まで表示されなくなるため、ACLの設定が適正でない場合は索引機能が使えなくなる場合があります。'; $lang['auth_security_timeout'] = '認証タイムアウト設定（秒）'; $lang['securecookie'] = 'クッキーをHTTPSにてセットする場合は、ブラウザよりHTTPS経由で送信された場合にみに制限しますか？ログインのみをSSLで行う場合は、この機能を無効にしてください。'; -$lang['xmlrpc'] = 'XML-RPCインターフェースを有効/無効にする'; -$lang['xmlrpcuser'] = 'XML-RPCアクセスを指定グループとユーザーに制限します（半角コンマ区切り）。　すべての人にアクセスを許可する場合は空のままにしてください。'; +$lang['remote'] = 'リモートAPIを有効化します。有効化するとXML-RPCまたは他の手段でwikiにアプリケーションがアクセスすることを許可します。'; +$lang['remoteuser'] = 'カンマ区切りで書かれたグループ名、またはユーザ名だけにリモートAPIへのアクセスを許可します。空白の場合は、すべてのユーザにアクセスを許可します。'; +$lang['usewordblock'] = '単語リストに基づくスパムブロック'; +$lang['relnofollow'] = 'rel="nofollow"を付加'; +$lang['indexdelay'] = 'インデックスを許可（何秒後）'; +$lang['mailguard'] = 'メールアドレス保護'; +$lang['iexssprotect'] = 'アップロードファイルに悪意のあるJavaScriptやHTMLが含まれていないかチェックする'; +$lang['usedraft'] = '編集中の自動保存（ドラフト）機能を使用'; +$lang['htmlok'] = 'HTML埋め込み'; +$lang['phpok'] = 'PHP埋め込み'; +$lang['locktime'] = 'ファイルロック期限（秒）'; +$lang['cachetime'] = 'キャッシュ保持時間（秒）'; +$lang['target____wiki'] = '内部リンクの表示先'; +$lang['target____interwiki'] = 'InterWikiリンクの表示先'; +$lang['target____extern'] = '外部リンクの表示先'; +$lang['target____media'] = 'メディアリンクの表示先'; +$lang['target____windows'] = 'Windowsリンクの表示先'; +$lang['mediarevisions'] = 'メディアファイルの履歴を有効にしますか?'; +$lang['refcheck'] = 'メディア参照元チェック'; +$lang['refshow'] = 'メディア参照元表示数'; +$lang['gdlib'] = 'GDlibバージョン'; +$lang['im_convert'] = 'ImageMagick変換ツールへのパス'; +$lang['jpg_quality'] = 'JPG圧縮品質（0-100）'; +$lang['fetchsize'] = '外部からのダウンロード最大サイズ'; +$lang['subscribers'] = '更新通知機能'; +$lang['subscribe_time'] = '購読リストと概要を送信する期間（秒）。「最近の変更とする期間」で指定した期間より小さくしてください。'; +$lang['notify'] = '変更を通知するメールアドレス'; +$lang['registernotify'] = '新規ユーザー登録を通知するメールアドレス'; +$lang['mailfrom'] = 'メール送信時の送信元アドレス'; +$lang['mailprefix'] = '自動メールの題名に使用する接頭語'; +$lang['sitemap'] = 'Googleサイトマップ作成頻度（日数）'; +$lang['rss_type'] = 'RSSフィード形式'; +$lang['rss_linkto'] = 'RSS内リンク先'; +$lang['rss_content'] = 'XMLフィードに何を表示させますか？'; +$lang['rss_update'] = 'RSSフィードの更新間隔（秒）'; +$lang['rss_show_summary'] = 'フィードのタイトルにサマリーを表示'; +$lang['rss_media'] = 'XMLフィードで、どんな種類の変更を記載するか'; $lang['updatecheck'] = 'DokuWikiの更新とセキュリティに関する情報をチェックしますか？ この機能は update.dokuwiki.org への接続が必要です。'; $lang['userewrite'] = 'URLの書き換え'; $lang['useslash'] = 'URL上の名前空間の区切りにスラッシュを使用'; -$lang['usedraft'] = '編集中の自動保存（ドラフト）機能を使用'; $lang['sepchar'] = 'ページ名の単語区切り文字'; $lang['canonical'] = 'canonical URL（正準URL）を使用'; $lang['fnencode'] = '非アスキーファイル名のエンコーディング方法'; $lang['autoplural'] = '自動複数形処理'; $lang['compression'] = 'アーカイブファイルの圧縮方法'; -$lang['cachetime'] = 'キャッシュ保持時間（秒）'; -$lang['locktime'] = 'ファイルロック期限（秒）'; -$lang['fetchsize'] = '外部からのダウンロード最大サイズ'; -$lang['notify'] = '変更を通知するメールアドレス'; -$lang['registernotify'] = '新規ユーザー登録を通知するメールアドレス'; -$lang['mailfrom'] = 'メール送信時の送信元アドレス'; -$lang['mailprefix'] = '自動メールの題名に使用する接頭語'; $lang['gzip_output'] = 'xhtmlに対するコンテンツ圧縮（gzip）を使用'; -$lang['gdlib'] = 'GDlibバージョン'; -$lang['im_convert'] = 'ImageMagick変換ツールへのパス'; -$lang['jpg_quality'] = 'JPG圧縮品質（0-100）'; -$lang['subscribers'] = '更新通知機能'; -$lang['subscribe_time'] = '購読リストと概要を送信する期間（秒）。「最近の変更とする期間」で指定した期間より小さくしてください。'; $lang['compress'] = 'CSSとJavaScriptを圧縮'; $lang['cssdatauri'] = 'HTTP リクエスト数によるオーバーヘッドを減らすため、CSS ファイルから参照される画像ファイルのサイズがここで指定するバイト数以内の場合は CSS ファイル内に Data URI として埋め込みます。このテクニックは IE7 以下では動作しません! <code>400</code> から <code>600</code> バイトがちょうどよい値です。<code>0</code> を指定すると埋め込み処理は行われません。'; -$lang['hidepages'] = '非公開ページ（Regex）'; $lang['send404'] = '文書が存在しないページに"HTTP404/Page Not Found"を使用'; -$lang['sitemap'] = 'Googleサイトマップ作成頻度（日数）'; $lang['broken_iua'] = 'ignore_user_abort関数が破損している恐れがあります。そのため、検索インデックスが動作しない可能性があります。IIS+PHP/CGIの組み合わせで破損することが判明しています。詳しくは<a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a>を参照してください。'; $lang['xsendfile'] = 'ウェブサーバーが静的ファイルを生成するために X-Sendfile ヘッダーを使用しますか？なお、この機能をウェブサーバーがサポートしている必要があります。'; $lang['renderer_xhtml'] = 'Wikiの出力（xhtml）にレンダラーを使用する'; $lang['renderer__core'] = '%s （Dokuwikiコア）'; $lang['renderer__plugin'] = '%s （プラグイン）'; -$lang['rememberme'] = 'ログイン用クッキーを永久に保持することを許可（ログインを保持）'; -$lang['rss_type'] = 'RSSフィード形式'; -$lang['rss_linkto'] = 'RSS内リンク先'; -$lang['rss_content'] = 'XMLフィードに何を表示させますか？'; -$lang['rss_update'] = 'RSSフィードの更新間隔（秒）'; -$lang['recent_days'] = '最近の変更とする期間（日数）'; -$lang['rss_show_summary'] = 'フィードのタイトルにサマリーを表示'; -$lang['rss_media'] = 'XMLフィードで、どんな種類の変更を記載するか'; -$lang['target____wiki'] = '内部リンクの表示先'; -$lang['target____interwiki'] = 'InterWikiリンクの表示先'; -$lang['target____extern'] = '外部リンクの表示先'; -$lang['target____media'] = 'メディアリンクの表示先'; -$lang['target____windows'] = 'Windowsリンクの表示先'; $lang['proxy____host'] = 'プロキシ - サーバー名'; $lang['proxy____port'] = 'プロキシ - ポート'; $lang['proxy____user'] = 'プロキシ - ユーザー名'; -- cgit v1.2.3 From bdc67fe7b11d95a896a62142b9cf675bd5e51d94 Mon Sep 17 00:00:00 2001 From: Robert Bogenschneider <robog@gmx.de> Date: Fri, 27 Apr 2012 15:18:35 +0200 Subject: Esperanto language update --- lib/plugins/acl/lang/eo/help.txt | 4 +- lib/plugins/acl/lang/eo/lang.php | 24 ++++---- lib/plugins/config/lang/eo/intro.txt | 4 +- lib/plugins/config/lang/eo/lang.php | 89 ++++++++++++++-------------- lib/plugins/plugin/lang/eo/admin_plugin.txt | 2 +- lib/plugins/plugin/lang/eo/lang.php | 24 ++++---- lib/plugins/popularity/lang/eo/intro.txt | 6 +- lib/plugins/popularity/lang/eo/lang.php | 10 ++-- lib/plugins/popularity/lang/eo/submitted.txt | 2 +- lib/plugins/revert/lang/eo/lang.php | 8 +-- lib/plugins/usermanager/lang/eo/intro.txt | 2 +- lib/plugins/usermanager/lang/eo/lang.php | 22 ++++--- lib/plugins/usermanager/lang/eo/list.txt | 2 +- 13 files changed, 96 insertions(+), 103 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/eo/help.txt b/lib/plugins/acl/lang/eo/help.txt index cc3f63e5a..488e84a1b 100644 --- a/lib/plugins/acl/lang/eo/help.txt +++ b/lib/plugins/acl/lang/eo/help.txt @@ -6,6 +6,6 @@ La maldekstra panelo montras ĉiujn disponeblajn nomspacojn kaj paĝojn. La suba agordilo permesas al vi rigardi kaj modifi la rajtojn de elektita uzanto aŭ grupo. -En la suba tabelo ĉiuj aktuale difinitaj alirkontrolaj reguloj estas montritaj. Vi povas uzi ĝin por rapide forigi aŭ ŝanĝi multoblajn regulojn. +En la suba tabelo ĉiuj aktuale difinitaj alirkontrolaj reguloj estas montrataj. Vi povas uzi ĝin por rapide forigi aŭ ŝanĝi multoblajn regulojn. -Legado de la [[doku>acl|oficiala dokumentaro pri ACL]] povus helpi vin bone kompreni kiel alirkontrolo funkcias en DokuWiki. \ No newline at end of file +Legi la [[doku>acl|oficialan dokumentaron pri ACL]] povus helpi vin bone kompreni kiel alirkontrolo funkcias en DokuWiki. diff --git a/lib/plugins/acl/lang/eo/lang.php b/lib/plugins/acl/lang/eo/lang.php index 72ce576ee..de75c2dd7 100644 --- a/lib/plugins/acl/lang/eo/lang.php +++ b/lib/plugins/acl/lang/eo/lang.php @@ -1,6 +1,6 @@ <?php /** - * Esperantolanguage file + * Esperanto language file * * @author Felipe Castro <fefcas@uol.com.br> * @author Felipo Kastro <fefcas@gmail.com> @@ -8,9 +8,7 @@ * @author Robert Bogenschneider <robog@gmx.de> * @author Erik Pedersen <erik pedersen@shaw.ca> * @author Erik Pedersen <erik.pedersen@shaw.ca> - * @author Robert Bogenschneider <robog@GMX.de> - * @author Robert BOGENSCHNEIDER <robog@gmx.de> - * @author Robert BOGENSCHNEIDER <bogi@UEA.org> + * @author Robert Bogenschneider <bogi@uea.org> */ $lang['admin_acl'] = 'Administrado de Alirkontrola Listo (ACL)'; $lang['acl_group'] = 'Grupo'; @@ -19,13 +17,13 @@ $lang['acl_perms'] = 'Rajtoj por'; $lang['page'] = 'Paĝo'; $lang['namespace'] = 'Nomspaco'; $lang['btn_select'] = 'Elekti'; -$lang['p_user_id'] = 'Uzanto <b class="acluser">%s</b> aktuale havas la jenajn rajtojn en la paĝo <b class="aclpage">%s</b>: <i>%s</i>.'; -$lang['p_user_ns'] = 'Uzanto <b class="acluser">%s</b> aktuale havas la jenajn rajtojn en la nomspaco <b class="aclns">%s</b>: <i>%s</i>.'; -$lang['p_group_id'] = 'Anoj de la grupo <b class="aclgroup">%s</b> aktuale havas la jenajn rajtojn en la paĝo <b class="aclpage">%s</b>: <i>%s</i>.'; -$lang['p_group_ns'] = 'Anoj de la grupo <b class="aclgroup">%s</b> aktuale havas la jenajn rajtojn en la nomspaco <b class="aclns">%s</b>: <i>%s</i>.'; -$lang['p_choose_id'] = 'Bonvolu <b>enmeti uzanton aŭ grupon</b> en la suba agordilo por rigardi aŭ redakti la aron da rajtoj por la paĝo <b class="aclpage">%s</b>.'; -$lang['p_choose_ns'] = 'Bonvolu <b>enmeti uzanton aŭ grupon</b> en la suba agordilo por rigardi aŭ redakti la aron da rajtoj por la nomspaco <b class="aclns">%s</b>.'; -$lang['p_inherited'] = 'Rimarko: tiuj rajtoj ne estis rekte difinitaj, sed ili estis hereditaj el aliaj pli superaj grupoj aŭ nomspacoj.'; +$lang['p_user_id'] = 'Uzanto <b class="acluser">%s</b> aktuale havas la jenajn rajtojn en la paĝo <b class="aclpage">%s</b>: <i>%s</i>.'; +$lang['p_user_ns'] = 'Uzanto <b class="acluser">%s</b> aktuale havas la jenajn rajtojn en la nomspaco <b class="aclns">%s</b>: <i>%s</i>.'; +$lang['p_group_id'] = 'Anoj de la grupo <b class="aclgroup">%s</b> aktuale havas la jenajn rajtojn en la paĝo <b class="aclpage">%s</b>: <i>%s</i>.'; +$lang['p_group_ns'] = 'Anoj de la grupo <b class="aclgroup">%s</b> aktuale havas la jenajn rajtojn en la nomspaco <b class="aclns">%s</b>: <i>%s</i>.'; +$lang['p_choose_id'] = 'Bonvolu <b>enmeti uzanton aŭ grupon</b> en la suban agordilon por rigardi aŭ redakti la aron da rajtoj por la paĝo <b class="aclpage">%s</b>.'; +$lang['p_choose_ns'] = 'Bonvolu <b>enmeti uzanton aŭ grupon</b> en la suban agordilon por rigardi aŭ redakti la aron da rajtoj por la nomspaco <b class="aclns">%s</b>.'; +$lang['p_inherited'] = 'Rimarko: tiuj rajtoj ne estas rekte difinitaj, sed ili herediĝas el aliaj pli supraj grupoj aŭ nomspacoj.'; $lang['p_isadmin'] = 'Rimarko: la elektita grupo aŭ uzanto ĉiam havas plenan rajtaron ĉar ĝi estas difinita kiel superuzanto.'; $lang['p_include'] = 'Plialtaj permesoj inkluzivas malpli altajn. La permesoj por Krei, Alŝuti kaj Forigi nur aplikeblas al nomspacoj, ne al paĝoj.'; $lang['current'] = 'Aktuala regularo ACL'; @@ -38,5 +36,5 @@ $lang['acl_perm2'] = 'Redakti'; $lang['acl_perm4'] = 'Krei'; $lang['acl_perm8'] = 'Alŝuti'; $lang['acl_perm16'] = 'Forigi'; -$lang['acl_new'] = 'Aldoni novan Enmetaĵon'; -$lang['acl_mod'] = 'Modifi Enmetaĵon'; +$lang['acl_new'] = 'Aldoni novan enmetaĵon'; +$lang['acl_mod'] = 'Modifi enmetaĵon'; diff --git a/lib/plugins/config/lang/eo/intro.txt b/lib/plugins/config/lang/eo/intro.txt index c717d9a4d..5ed2f0ecb 100644 --- a/lib/plugins/config/lang/eo/intro.txt +++ b/lib/plugins/config/lang/eo/intro.txt @@ -1,7 +1,7 @@ ====== Administrilo de Agordoj ====== -Uzu tiun ĉi paĝon por kontroli la difinojn de via DokuWiki-instalo. Por helpo pri specifaj difinoj aliru al [[doku>config]]. Por pli detaloj pri tiu ĉi kromaĵo, vidu [[doku>plugin:config]]. +Uzu tiun ĉi paĝon por kontroli la difinojn de via DokuWiki-instalo. Por helpo pri specifaj difinoj aliru al [[doku>config]]. Por pli detaloj pri tiu ĉi kromaĵo, vidu [[doku>plugin:config]]. -Difinoj montrataj kun hela ruĝa fono estas protektitaj kaj ne povas esti modifataj per tiu ĉi kromaĵo. Difinoj kun blua fono estas aprioraj valoroj kaj difinoj montrataj kun blanka fono estis iam difinataj por tiu ĉi specifa instalo. Ambaŭ blua kaj blanka difinoj povas esti modifataj. +Difinoj montrataj kun helruĝa fono estas protektitaj kaj ne povas esti modifataj per tiu ĉi kromaĵo. Difinoj kun blua fono estas aprioraj valoroj kaj difinoj montrataj kun blanka fono iam difiniĝis por tiu ĉi specifa instalo. Ambaŭ blua kaj blanka difinoj povas esti modifataj. Memoru premi la butonon **Registri** antaŭ ol eliri tiun ĉi paĝon, male viaj modifoj perdiĝus. diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php index 3acb00545..de3c95bb5 100644 --- a/lib/plugins/config/lang/eo/lang.php +++ b/lib/plugins/config/lang/eo/lang.php @@ -9,17 +9,15 @@ * @author Robert Bogenschneider <robog@gmx.de> * @author Erik Pedersen <erik pedersen@shaw.ca> * @author Erik Pedersen <erik.pedersen@shaw.ca> - * @author Robert Bogenschneider <robog@GMX.de> - * @author Robert BOGENSCHNEIDER <robog@gmx.de> - * @author Robert BOGENSCHNEIDER <bogi@UEA.org> + * @author Robert Bogenschneider <bogi@uea.org> */ $lang['menu'] = 'Agordaj Difinoj'; $lang['error'] = 'La difinoj ne estas ĝisdatigitaj pro malvalida valoro: bonvolu revizii viajn ŝanĝojn kaj resubmeti ilin. -<br />La malkorekta(j) valoro(j) estas ĉirkaŭita(j) de ruĝa kadro.'; -$lang['updated'] = 'La difinoj estis sukcese ĝisdatigitaj.'; +<br />La malkorekta(j) valoro(j) estas ĉirkaŭita(j) de ruĝa kadro.'; +$lang['updated'] = 'La difinoj sukcese ĝisdatiĝis.'; $lang['nochoice'] = '(neniu alia elekto disponeblas)'; -$lang['locked'] = 'La difin-dosiero ne povas esti ĝisdatigita; se tio ne estas intenca, <br /> certiĝu, ke la dosieroj de lokaj difinoj havas korektajn nomojn kaj permesojn.'; -$lang['danger'] = 'Danĝero: ŝanĝo tiun opcion povus igi vian vikion kaj la agordan menuon neatingebla.'; +$lang['locked'] = 'La difin-dosiero ne povas esti ĝisdatigita; se tio ne estas intenca, <br /> certiĝu, ke la dosieroj de lokaj difinoj havas korektajn nomojn kaj permesojn.'; +$lang['danger'] = 'Danĝero: ŝanĝi tiun opcion povus igi vian vikion kaj la agordan menuon neatingebla.'; $lang['warning'] = 'Averto: ŝanĝi tiun opcion povus rezulti en neatendita konduto.'; $lang['security'] = 'Sekureca averto: ŝanĝi tiun opcion povus krei sekurecan riskon.'; $lang['_configuration_manager'] = 'Administrilo de agordoj'; @@ -38,7 +36,7 @@ $lang['_advanced'] = 'Fakaj difinoj'; $lang['_network'] = 'Difinoj por reto'; $lang['_plugin_sufix'] = 'Difinoj por kromaĵoj'; $lang['_template_sufix'] = 'Difinoj por ŝablonoj'; -$lang['_msg_setting_undefined'] = 'Neniu difinanta metadatenaro.'; +$lang['_msg_setting_undefined'] = 'Neniu difinanta metadatumaro.'; $lang['_msg_setting_no_class'] = 'Neniu difinanta klaso.'; $lang['_msg_setting_no_default'] = 'Neniu apriora valoro.'; $lang['fmode'] = 'Reĝimo de dosiero-kreado'; @@ -46,11 +44,13 @@ $lang['dmode'] = 'Reĝimo de dosierujo-kreado'; $lang['lang'] = 'Lingvo'; $lang['basedir'] = 'Baza dosierujo'; $lang['baseurl'] = 'Baza URL'; -$lang['savedir'] = 'Dosierujo por konservi datenaron'; +$lang['savedir'] = 'Dosierujo por konservi datumaron'; $lang['cookiedir'] = 'Kuketopado. Lasu malplena por uzi baseurl.'; $lang['start'] = 'Nomo de la hejmpaĝo'; $lang['title'] = 'Titolo de la vikio'; $lang['template'] = 'Ŝablono'; +$lang['tagline'] = 'Moto (se la ŝablono antaûvidas tion)'; +$lang['sidebar'] = 'Nomo de la flanka paĝo (se la ŝablono antaûvidas tion), malplena kampo malebligas la flankan paĝon'; $lang['license'] = 'Laŭ kiu permesilo via enhavo devus esti publikigita?'; $lang['fullpath'] = 'Montri la kompletan padon de la paĝoj en la piedlinio'; $lang['recent'] = 'Freŝaj ŝanĝoj'; @@ -59,10 +59,10 @@ $lang['youarehere'] = 'Hierarkiaj paderoj'; $lang['typography'] = 'Fari tipografiajn anstataŭigojn'; $lang['htmlok'] = 'Ebligi enmeton de HTML-aĵoj'; $lang['phpok'] = 'Ebligi enmeton de PHP-aĵoj'; -$lang['dformat'] = 'Formato de datoj (vidu la PHP-an funkcion <a href="http://www.php.net/strftime">strftime</a>)'; +$lang['dformat'] = 'Formato de datoj (vidu la PHP-an funkcion <a href="http://www.php.net/strftime">strftime</a>)'; $lang['signature'] = 'Subskribo'; $lang['toptoclevel'] = 'Supera nivelo por la enhavtabelo'; -$lang['tocminheads'] = 'Minimuma kvanto da ĉeftitoloj, kiu difinas ĉu la TOC estas kreita.'; +$lang['tocminheads'] = 'Minimuma kvanto da ĉeftitoloj, kiu difinas ĉu la TOC estas kreata.'; $lang['maxtoclevel'] = 'Maksimuma nivelo por la enhavtabelo'; $lang['maxseclevel'] = 'Maksimuma nivelo por redakti sekciojn'; $lang['camelcase'] = 'Uzi KamelUsklecon por ligiloj'; @@ -70,34 +70,37 @@ $lang['deaccent'] = 'Netaj paĝnomoj'; $lang['useheading'] = 'Uzi unuan titolon por paĝnomoj'; $lang['refcheck'] = 'Kontrolo por referencoj al aŭdvidaĵoj'; $lang['refshow'] = 'Nombro da referencoj al aŭdvidaĵoj por montri'; -$lang['allowdebug'] = 'Ebligi kodumpurigadon <b>malebligu se ne necese!</b>'; +$lang['allowdebug'] = 'Ebligi kodumpurigadon <b>malebligu se ne necese!<;/b>'; +$lang['mediarevisions'] = 'Ĉu ebligi reviziadon de aŭdvidaĵoj?'; $lang['usewordblock'] = 'Bloki spamon surbaze de vortlisto'; $lang['indexdelay'] = 'Prokrasto antaŭ ol indeksi (en sekundoj)'; -$lang['relnofollow'] = 'Uzi rel="nofollow" kun eksteraj ligiloj'; +$lang['relnofollow'] = 'Uzi rel="nofollow" kun eksteraj ligiloj'; $lang['mailguard'] = 'Nebuligi retadresojn'; $lang['iexssprotect'] = 'Ekzameni elŝutaĵojn kontraŭ eblaj malicaj ĴavaSkripto aŭ HTML-a kodumaĵo'; -$lang['showuseras'] = 'Kion montrigi dum indiko al la uzanto kiu laste redaktis paĝon.'; +$lang['showuseras'] = 'Kiel indiki la lastan redaktinton'; $lang['useacl'] = 'Uzi alirkontrolajn listojn'; $lang['autopasswd'] = 'Aŭtomate krei pasvortojn'; $lang['authtype'] = 'Tipo de identiĝo'; $lang['passcrypt'] = 'Metodo por ĉifri pasvortojn'; $lang['defaultgroup'] = 'Antaŭdifinita grupo'; -$lang['superuser'] = 'Superanto - grupo, uzanto aŭ listo (apartite per komoj), kiu plene alireblas al ĉiuj paĝoj kaj funkcioj, sendepende de la reguloj ACL'; +$lang['superuser'] = 'Superanto - grupo, uzanto aŭ listo (disigita per komoj), kiu plene alireblas al ĉiuj paĝoj kaj funkcioj, sendepende de la reguloj ACL'; $lang['manager'] = 'Administranto - grupo, uzanto aŭ listo (apartite per komoj), kiu havas alirpermeson al kelkaj administraj funkcioj'; $lang['profileconfirm'] = 'Konfirmi ŝanĝojn en la trajtaro per pasvorto'; $lang['disableactions'] = 'Malebligi DokuWiki-ajn agojn'; $lang['disableactions_check'] = 'Kontroli'; $lang['disableactions_subscription'] = 'Aliĝi/Malaliĝi'; -$lang['disableactions_wikicode'] = 'Rigardi vikitekston/Eksporti krudaĵon'; -$lang['disableactions_other'] = 'Aliaj agoj (apartite per komoj)'; -$lang['sneaky_index'] = 'Apriore, DokuWiki montras ĉiujn nomspacojn en la indeksa modo. Ebligi tiun ĉi elekteblon kaŝus tion, kion la uzanto ne rajtas legi laŭ ACL. Tio povus rezulti ankaŭan kaŝon de alireblaj subnomspacoj. Kaj tiel la indekso estus neuzebla por kelkaj agordoj de ACL.'; -$lang['auth_security_timeout'] = 'Sekureca Templimo por aŭtentigo (sekundoj)'; -$lang['securecookie'] = 'Ĉu kuketoj difinitaj per HTTPS nur estu senditaj de la foliumilo per HTTPS? Malebligu tiun ĉi opcion kiam nur la ensaluto al via vikio estas sekurigita per SSL, sed foliumado de la vikio estas farita malsekure.'; +$lang['disableactions_wikicode'] = 'Rigardi vikitekston/Eksporti fontotekston'; +$lang['disableactions_other'] = 'Aliaj agoj (disigita per komoj)'; +$lang['sneaky_index'] = 'Apriore, DokuWiki montras ĉiujn nomspacojn en la indeksa modo. Ebligi tiun ĉi elekteblon kaŝus tion, kion la uzanto ne rajtas legi laŭ ACL. Tio povus rezulti ankaŭan kaŝon de alireblaj subnomspacoj. Tiel la indekso estus neuzebla por kelkaj agordoj de ACL.'; +$lang['auth_security_timeout'] = 'Sekureca tempolimo por aŭtentigo (sekundoj)'; +$lang['securecookie'] = 'Ĉu kuketoj difinitaj per HTTPS sendiĝu de la foliumilo nur per HTTPS? Malebligu tiun ĉi opcion kiam nur la ensaluto al via vikio estas sekurigita per SSL, sed foliumado de la vikio estas farita malsekure.'; +$lang['xmlrpc'] = 'Ebligi/malebligi la interfacon XML-RPC.'; +$lang['xmlrpcuser'] = 'Permesi XML-RPC-an aliron al certaj grupoj aŭ uzantoj, bonvolu meti iliajn komodisigitajn nomojn tien ĉi. Lasu ĝin malplena, se ĉiu povu aliri.'; $lang['updatecheck'] = 'Ĉu kontroli aktualigojn kaj sekurecajn avizojn? DokuWiki bezonas kontakti update.dokuwiki.org por tiu ĉi trajto.'; $lang['userewrite'] = 'Uzi netajn URL-ojn'; -$lang['useslash'] = 'Uzi frakcistrekon kiel apartigsignaĵo por nomspacoj en URL-oj'; +$lang['useslash'] = 'Uzi frakcistrekon kiel disigsignaĵon por nomspacoj en URL-oj'; $lang['usedraft'] = 'Aŭtomate konservi skizon dum redaktado'; -$lang['sepchar'] = 'Apartigsignaĵo de vortoj en paĝnomoj'; +$lang['sepchar'] = 'Disigsignaĵo de vortoj en paĝnomoj'; $lang['canonical'] = 'Uzi tute evidentajn URL-ojn'; $lang['fnencode'] = 'Kodiga metodo por ne-ASCII-aj dosiernomoj.'; $lang['autoplural'] = 'Kontroli pluralajn formojn en ligiloj'; @@ -116,13 +119,13 @@ $lang['jpg_quality'] = 'Kompaktiga kvalito de JPG (0-100)'; $lang['subscribers'] = 'Ebligi subtenon de avizoj pri ŝanĝoj sur paĝoj'; $lang['subscribe_time'] = 'Tempo, post kiu abonlistoj kaj kolektaĵoj sendiĝas (sek); Tio estu pli malgranda ol la tempo indikita en recent_days.'; $lang['compress'] = 'Kompaktigi CSS-ajn kaj ĵavaskriptajn elmetojn'; -$lang['cssdatauri'] = 'Grandeco en bitokoj, ĝis kiom en CSS-dosieroj referencitaj bildoj estu enmetataj rekte en la stilfolion por malgrandigi vanan HTTP-kapan trafikon. Tiu tekniko ne funkcias en IE 7 aŭ pli frua! -<code>400</code> ĝis <code>600</code> bitokoj estas bona grandeco. Indiku <code>0</code> por malebligi enmeton.'; +$lang['cssdatauri'] = 'Grandeco en bitokoj, ĝis kiom en CSS-dosieroj referencitaj bildoj enmetiĝu rekte en la stilfolion por malgrandigi vanan HTTP-kapan trafikon. Tiu tekniko ne funkcias en IE 7 aŭ pli frua! +<code>400</code> ĝis <code>600</code> bitokoj estas bona grandeco. Indiku <code>0</code> por malebligi enmeton.'; $lang['hidepages'] = 'Kaŝi kongruantajn paĝojn (laŭ regulaj esprimoj)'; -$lang['send404'] = 'Sendi la mesaĝon "HTTP 404/Paĝo ne trovita" por ne ekzistantaj paĝoj'; -$lang['sitemap'] = 'Krei Guglan paĝarmapon "sitemap" (po kiom tagoj)'; -$lang['broken_iua'] = 'Ĉu la funkcio "ignore_user_abort" difektas en via sistemo? Tio povus misfunkciigi la serĉindekson. IIS+PHP/CGI estas konata kiel fuŝaĵo. Vidu <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Cimon 852</a> por pli da informoj.'; -$lang['xsendfile'] = 'Ĉu uzi la kaplinion X-Sendfile por ebligi al la retservilo liveri fiksajn dosierojn? Via retservilo bezonus subteni tion.'; +$lang['send404'] = 'Sendi la mesaĝon "HTTP 404/Paĝo ne trovita" por ne ekzistantaj paĝoj'; +$lang['sitemap'] = 'Krei Guglan paĝarmapon "sitemap" (po kiom tagoj)'; +$lang['broken_iua'] = 'Ĉu la funkcio "ignore_user_abort" difektas en via sistemo? Tio povus misfunkciigi la serĉindekson. IIS+PHP/CGI estas konata kiel fuŝaĵo. Vidu <a href="http://bugs.splitbrain.org/?do=details&task_id=852&">Cimon 852</a> por pli da informoj.'; +$lang['xsendfile'] = 'Ĉu uzi la kaplinion X-Sendfile por ebligi al la retservilo liveri fiksajn dosierojn? Via retservilo subtenu tion.'; $lang['renderer_xhtml'] = 'Prezentilo por la ĉefa vikia rezulto (xhtml)'; $lang['renderer__core'] = '%s (DokuWiki-a kerno)'; $lang['renderer__plugin'] = '%s (kromaĵo)'; @@ -133,16 +136,16 @@ $lang['rss_content'] = 'Kion montri en la XML-aj novaĵ-flueroj?'; $lang['rss_update'] = 'Intertempo por ĝisdatigi XML-an novaĵ-fluon (sek.)'; $lang['recent_days'] = 'Kiom da freŝaj ŝanĝoj por teni (tagoj)'; $lang['rss_show_summary'] = 'XML-a novaĵ-fluo montras resumon en la titolo'; -$lang['target____wiki'] = 'Parametro "target" (celo) por internaj ligiloj'; -$lang['target____interwiki'] = 'Parametro "target" (celo) por intervikiaj ligiloj'; -$lang['target____extern'] = 'Parametro "target" (celo) por eksteraj ligiloj'; -$lang['target____media'] = 'Parametro "target" (celo) por aŭdvidaĵaj ligiloj'; -$lang['target____windows'] = 'Parametro "target" (celo) por Vindozaj ligiloj'; -$lang['proxy____host'] = 'Retservilnomo de la "Proxy"'; -$lang['proxy____port'] = 'Pordo ĉe la "Proxy"'; -$lang['proxy____user'] = 'Uzantonomo ĉe la "Proxy"'; -$lang['proxy____pass'] = 'Pasvorto ĉe la "Proxy"'; -$lang['proxy____ssl'] = 'Uzi SSL por konekti al la "Proxy"'; +$lang['target____wiki'] = 'Parametro "target" (celo) por internaj ligiloj'; +$lang['target____interwiki'] = 'Parametro "target" (celo) por intervikiaj ligiloj'; +$lang['target____extern'] = 'Parametro "target" (celo) por eksteraj ligiloj'; +$lang['target____media'] = 'Parametro "target" (celo) por aŭdvidaĵaj ligiloj'; +$lang['target____windows'] = 'Parametro "target" (celo) por Vindozaj ligiloj'; +$lang['proxy____host'] = 'Retservilnomo de la "Proxy"'; +$lang['proxy____port'] = 'Pordo ĉe la "Proxy"'; +$lang['proxy____user'] = 'Uzantonomo ĉe la "Proxy"'; +$lang['proxy____pass'] = 'Pasvorto ĉe la "Proxy"'; +$lang['proxy____ssl'] = 'Uzi SSL por konekti al la "Proxy"'; $lang['proxy____except'] = 'Regula esprimo por URL-oj, kiujn la servilo preterrigardu.'; $lang['safemodehack'] = 'Ebligi sekuran modon'; $lang['ftp____host'] = 'FTP-a servilo por sekura modo'; @@ -150,7 +153,7 @@ $lang['ftp____port'] = 'FTP-a pordo por sekura modo'; $lang['ftp____user'] = 'FTP-a uzantonomo por sekura modo'; $lang['ftp____pass'] = 'FTP-a pasvorto por sekura modo'; $lang['ftp____root'] = 'FTP-a superuzanta (root) subdosierujo por sekura modo'; -$lang['license_o_'] = 'Nenio elektite'; +$lang['license_o_'] = 'Nenio elektita'; $lang['typography_o_0'] = 'nenio'; $lang['typography_o_1'] = 'Nur duoblaj citiloj'; $lang['typography_o_2'] = 'Ĉiaj citiloj (eble ne ĉiam funkcios)'; @@ -169,8 +172,8 @@ $lang['rss_type_o_rss2'] = 'RSS 2.0'; $lang['rss_type_o_atom'] = 'Atom 0.3'; $lang['rss_type_o_atom1'] = 'Atom 1.0'; $lang['rss_content_o_abstract'] = 'Resumo'; -$lang['rss_content_o_diff'] = 'Unuigita "Diff"'; -$lang['rss_content_o_htmldiff'] = '"Diff"-tabelo formatita laŭ HTML'; +$lang['rss_content_o_diff'] = 'Unuigita "Diff"'; +$lang['rss_content_o_htmldiff'] = '"Diff"-tabelo formatita laŭ HTML'; $lang['rss_content_o_html'] = 'Enhavo laŭ kompleta HTML-paĝo'; $lang['rss_linkto_o_diff'] = 'diferenca rigardo'; $lang['rss_linkto_o_page'] = 'la reviziita paĝo'; @@ -180,12 +183,12 @@ $lang['compression_o_0'] = 'nenio'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'ne uzi'; -$lang['xsendfile_o_1'] = 'Propra kaplinio "lighttpd" (antaŭ versio 1.5)'; +$lang['xsendfile_o_1'] = 'Propra kaplinio "lighttpd" (antaŭ versio 1.5)'; $lang['xsendfile_o_2'] = 'Ordinara kaplinio X-Sendfile'; $lang['xsendfile_o_3'] = 'Propra kaplinio Nginx X-Accel-Redirect'; $lang['showuseras_o_loginname'] = 'Ensalut-nomo'; $lang['showuseras_o_username'] = 'Kompleta nomo de uzanto'; -$lang['showuseras_o_email'] = 'Retadreso de uzanto (sekur-montrita laŭ agordo de mailguard)'; +$lang['showuseras_o_email'] = 'Retadreso de uzanto (sekur-montrita laŭ agordo de nebuligo)'; $lang['showuseras_o_email_link'] = 'Retadreso de uzanto kiel mailto:-ligilo'; $lang['useheading_o_0'] = 'Neniam'; $lang['useheading_o_navigation'] = 'Nur foliumado'; diff --git a/lib/plugins/plugin/lang/eo/admin_plugin.txt b/lib/plugins/plugin/lang/eo/admin_plugin.txt index 8cc59843b..c97dddf56 100644 --- a/lib/plugins/plugin/lang/eo/admin_plugin.txt +++ b/lib/plugins/plugin/lang/eo/admin_plugin.txt @@ -1,3 +1,3 @@ ====== Administrado de Kromaĵoj ====== -En tiu ĉi paĝo vi povas administri ĉion pri DokuWiki-aj [[doku>plugins|kromaĵoj]]. Por sukcesi elŝuti kaj instali kromaĵon, via dosierujo de kromaĵoj devas esti konservebla por la retservilo. +En tiu ĉi paĝo vi povas administri ĉion pri DokuWiki-aj [[doku>plugins|kromaĵoj]]. Por sukcesi elŝuti kaj instali kromaĵon, via dosierujo de kromaĵoj devas esti konservebla por la retservilo. diff --git a/lib/plugins/plugin/lang/eo/lang.php b/lib/plugins/plugin/lang/eo/lang.php index ab9af73e1..36e7eadff 100644 --- a/lib/plugins/plugin/lang/eo/lang.php +++ b/lib/plugins/plugin/lang/eo/lang.php @@ -6,19 +6,17 @@ * @author Felipe Castro <fefcas@gmail.com> * @author Felipe Castro <fefcas (cxe) gmail (punkto) com> * @author Felipo Kastro <fefcas@gmail.com> - * @author Robert Bogenschneider <robog@gmx.de> * @author Erik Pedersen <erik pedersen@shaw.ca> * @author Erik Pedersen <erik.pedersen@shaw.ca> - * @author Robert Bogenschneider <robog@GMX.de> * @author Robert BOGENSCHNEIDER <robog@gmx.de> - * @author Robert BOGENSCHNEIDER <bogi@UEA.org> + * @author Robert Bogenschneider <bogi@uea.org> */ $lang['menu'] = 'Administri Kromaĵojn'; $lang['download'] = 'Elŝuti kaj instali novan kromaĵon'; $lang['manage'] = 'Instalitaj kromaĵoj'; -$lang['btn_info'] = 'info'; -$lang['btn_update'] = 'ĝisdatigo'; -$lang['btn_delete'] = 'forigi'; +$lang['btn_info'] = 'Info'; +$lang['btn_update'] = 'Ĝisdatigo'; +$lang['btn_delete'] = 'Forigi'; $lang['btn_settings'] = 'agordoj'; $lang['btn_download'] = 'Elŝuti'; $lang['btn_enable'] = 'Konservi'; @@ -29,16 +27,16 @@ $lang['source'] = 'Fonto:'; $lang['unknown'] = 'nekonate'; $lang['updating'] = 'Ĝisdatiganta ...'; $lang['updated'] = 'Kromaĵo %s estas sukcese ĝisdatigita'; -$lang['updates'] = 'La jenaj kromaĵoj estas sukcese ĝisdatigitaj'; +$lang['updates'] = 'Jenaj kromaĵoj estas sukcese ĝisdatigitaj'; $lang['update_none'] = 'Neniu ĝisdatigo troviĝas.'; $lang['deleting'] = 'Foriganta ...'; $lang['deleted'] = 'Kromaĵo %s estas forigita.'; $lang['downloading'] = 'Elŝutanta ...'; $lang['downloaded'] = 'La kromaĵo %s estas sukcese instalita'; -$lang['downloads'] = 'La jenaj kromaĵoj estas sukcese instalitaj:'; +$lang['downloads'] = 'Jenaj kromaĵoj estas sukcese instalitaj:'; $lang['download_none'] = 'Neniu kromaĵo troveblas, aŭ eble okazis nekonata problemo dum elŝuto kaj instalo.'; $lang['plugin'] = 'Kromaĵo:'; -$lang['components'] = 'Komponeroj'; +$lang['components'] = 'Komponantoj'; $lang['noinfo'] = 'Tiu ĉi kromaĵo liveris neniun informon: eble ĝi ne validas.'; $lang['name'] = 'Nomo:'; $lang['date'] = 'Dato:'; @@ -50,11 +48,11 @@ $lang['error'] = 'Nekonata eraro okazis.'; $lang['error_download'] = 'Maleblas elŝuti la kromaĵan dosieron: %s'; $lang['error_badurl'] = 'Suspektinda malbona URL - maleblas difini la dosieran nomon el la URL'; $lang['error_dircreate'] = 'Maleblas krei provizoran dosierujon por ricevi elŝutaĵon'; -$lang['error_decompress'] = 'La administrilo de kromaĵoj ne kapablis malkompakti la elŝutitan dosieron. Tio povas esti pro malkompleta elŝuto, tiaokaze vi devus provi refoje; aŭ eble la kompakta formato ne estas konata, tiaokaze vi bezonos elŝuti kaj instali la kromaĵon permane.'; -$lang['error_copy'] = 'Okazis eraro de dosierkopio dum provo instali dosierojn por la kromaĵo <em>%s</em>: la disko povus esti plenplena aŭ aliro-rajtoj povus esti misdifinitaj. Tio povus rezulti en malkomplete instalita kromaĵo kaj igi vian vikion malstabila.'; -$lang['error_delete'] = 'Okazis eraro dum provo forigi la kromaĵon <em>%s</em>. Plejprobable tio sekvas de nesufiĉa rajto por aliri la dosieron aŭ ties ujon.'; +$lang['error_decompress'] = 'La administrilo de kromaĵoj ne kapablis malkompakti la elŝutitan dosieron. Tio povas esti pro malkompleta elŝuto, tiaokaze provu refoje; aŭ eble la kompakta formato ne estas konata, tiaokaze elŝutu kaj instalu la kromaĵon permane.'; +$lang['error_copy'] = 'Okazis eraro de dosierkopio dum provo instali dosierojn por la kromaĵo <em>%s&</em>: la disko povus esti plenplena aŭ aliro-rajtoj povus esti misdifinitaj. Tio povus rezulti en malkomplete instalita kromaĵo kaj igi vian vikion malstabila.'; +$lang['error_delete'] = 'Okazis eraro dum provo forigi la kromaĵon <em>%s</em>. Verŝajne tio sekvas de nesufiĉa rajto por aliri la dosieron aŭ ties ujon.'; $lang['enabled'] = 'La kromaĵo %s estas ebligita.'; $lang['notenabled'] = 'La kromaĵo %s ne povis esti ebligita, kontrolu dosier-permesojn.'; $lang['disabled'] = 'La kromaĵo %s estas malebligita.'; $lang['notdisabled'] = 'La kromaĵo %s ne povis esti malebligita, kontrolu dosier-permesojn.'; -$lang['packageinstalled'] = 'Kromaĵa pakaĵo (%d kromaĵo(j): %s) sukcese instalitaj.'; +$lang['packageinstalled'] = 'Kromaĵa pakaĵo (%d kromaĵo(j): %s) sukcese instalita.'; diff --git a/lib/plugins/popularity/lang/eo/intro.txt b/lib/plugins/popularity/lang/eo/intro.txt index 8d9b3dde8..fd37efc70 100644 --- a/lib/plugins/popularity/lang/eo/intro.txt +++ b/lib/plugins/popularity/lang/eo/intro.txt @@ -1,9 +1,9 @@ ====== Populareca enketo ====== -Tiu ĉi ilo prenas anoniman datenaron pri via vikio kaj ebligas al vi sendi ĝin reen al la kodumantoj de DokuWiki. Tio helpas ke ili komprenu kiel DokuWiki estas uzata kaj certigas ke estontaj disvolviĝaj decidoj estos subtenataj de statistikoj pri reala aplikado. +Tiu ĉi ilo prenas anoniman datenaron pri via vikio kaj ebligas al vi sendi ĝin reen al la kodumantoj de DokuWiki. Tio helpas al ili kompreni kiel DokuWiki estas uzata kaj certigas ke estontaj disvolviĝaj decidoj estos subtenataj de statistikoj pri reala aplikado. Ni instigas vin ripeti tiun agon iam kaj tiam por teni la disvolvigantojn informitaj, dum via vikio kreskas. Viaj resendotaj datenaroj estos identigitaj per anonima ID. -La kolektita datenaro enhavas informon pri versio de la instalita DokuWiki, nombro kaj grandeco de la paĝoj kaj dosieroj, instalitaj kromaĵoj kaj informoj pri via PHP-sistemo. +La kolektita datumaro enhavas informon pri versio de la instalita DokuWiki, nombro kaj grandeco de la paĝoj kaj dosieroj, instalitaj kromaĵoj kaj informoj pri via PHP-sistemo. -La kruda datenaro sendota estas montrita sube. Bonvole uzu la butonon "Sendi datumaron" por transŝuti tiun informaron. \ No newline at end of file +La kruda datumaro sendota estas montrita sube. Bonvolu uzi la butonon "Sendi datumaron" por transŝuti tiun informaron. diff --git a/lib/plugins/popularity/lang/eo/lang.php b/lib/plugins/popularity/lang/eo/lang.php index e992e12ce..c2bca23b1 100644 --- a/lib/plugins/popularity/lang/eo/lang.php +++ b/lib/plugins/popularity/lang/eo/lang.php @@ -7,14 +7,12 @@ * @author Robert Bogenschneider <robog@gmx.de> * @author Erik Pedersen <erik pedersen@shaw.ca> * @author Erik Pedersen <erik.pedersen@shaw.ca> - * @author Robert Bogenschneider <robog@GMX.de> - * @author Robert BOGENSCHNEIDER <robog@gmx.de> - * @author Robert BOGENSCHNEIDER <bogi@UEA.org> + * @author Robert Bogenschneider <bogi@uea.org> */ $lang['name'] = 'Populareca enketo (eble la ŝargo prokrastos iomete)'; $lang['submit'] = 'Sendi datumaron'; $lang['autosubmit'] = 'Aŭtomate sendi datumaron monate'; -$lang['submissionFailed'] = 'La datumaro ne povis esti sendata pro la jena eraro:'; +$lang['submissionFailed'] = 'La datumaro ne povis esti sendata tial:'; $lang['submitDirectly'] = 'Vi povas sendi vi mem la datumaron per la sekva informilo.'; -$lang['autosubmitError'] = 'La lasta aŭtomata sendo malsukcesis, pro la jena eraro:'; -$lang['lastSent'] = 'La datumaro estas sendita'; +$lang['autosubmitError'] = 'La lasta aŭtomata sendo malsukcesis, tial:'; +$lang['lastSent'] = 'La datumaro sendiĝis'; diff --git a/lib/plugins/popularity/lang/eo/submitted.txt b/lib/plugins/popularity/lang/eo/submitted.txt index c2bce4e9f..095439bf3 100644 --- a/lib/plugins/popularity/lang/eo/submitted.txt +++ b/lib/plugins/popularity/lang/eo/submitted.txt @@ -1,3 +1,3 @@ ====== Enketo pri Populareco ====== -La datumoj estis senditaj sukcese. \ No newline at end of file +La datumoj sendiĝis sukcese. diff --git a/lib/plugins/revert/lang/eo/lang.php b/lib/plugins/revert/lang/eo/lang.php index a893fb145..05eec26a8 100644 --- a/lib/plugins/revert/lang/eo/lang.php +++ b/lib/plugins/revert/lang/eo/lang.php @@ -9,16 +9,14 @@ * @author Robert Bogenschneider <robog@gmx.de> * @author Erik Pedersen <erik pedersen@shaw.ca> * @author Erik Pedersen <erik.pedersen@shaw.ca> - * @author Robert Bogenschneider <robog@GMX.de> - * @author Robert BOGENSCHNEIDER <robog@gmx.de> - * @author Robert BOGENSCHNEIDER <bogi@UEA.org> + * @author Robert Bogenschneider <bogi@uea.org> */ $lang['menu'] = 'Administrado de restarigo'; $lang['filter'] = 'Serĉi spamecajn paĝojn'; $lang['revert'] = 'Restarigi la elektitajn paĝojn'; $lang['reverted'] = '%s estas restarigita al revizio %s'; $lang['removed'] = '%s estas forigita'; -$lang['revstart'] = 'Restariga procezo estas ekigita. Tio povas daŭri longan tempon. Se la skripto tro prokrastos antaŭ plenumo, vi bezonos restarigi po pli etaj blokoj.'; +$lang['revstart'] = 'Restariga procezo ekis. Tio povas daŭri longan tempon. Se la skripto tro prokrastos antaŭ plenumo, vi restarigu po pli etaj blokoj.'; $lang['revstop'] = 'Restariga procezo plenumiĝis sukcese.'; $lang['note1'] = 'Rimarko: tiu ĉi serĉo distingas usklecon'; -$lang['note2'] = 'Rimarko: la paĝo restariĝos al la lasta versio ne enhavanta la menditan spaman terminon <i>%s</i>.'; +$lang['note2'] = 'Rimarko: la paĝo restariĝos al la lasta versio ne enhavanta la menditan spaman terminon <i>%s</i>.'; diff --git a/lib/plugins/usermanager/lang/eo/intro.txt b/lib/plugins/usermanager/lang/eo/intro.txt index 2ef373f66..5b5a94001 100644 --- a/lib/plugins/usermanager/lang/eo/intro.txt +++ b/lib/plugins/usermanager/lang/eo/intro.txt @@ -1 +1 @@ -====== Administrado de Uzantoj ====== \ No newline at end of file +====== Administrado de uzantoj ====== diff --git a/lib/plugins/usermanager/lang/eo/lang.php b/lib/plugins/usermanager/lang/eo/lang.php index b5f1abc0e..75782fe23 100644 --- a/lib/plugins/usermanager/lang/eo/lang.php +++ b/lib/plugins/usermanager/lang/eo/lang.php @@ -9,9 +9,7 @@ * @author Robert Bogenschneider <robog@gmx.de> * @author Erik Pedersen <erik pedersen@shaw.ca> * @author Erik Pedersen <erik.pedersen@shaw.ca> - * @author Robert Bogenschneider <robog@GMX.de> - * @author Robert BOGENSCHNEIDER <robog@gmx.de> - * @author Robert BOGENSCHNEIDER <bogi@UEA.org> + * @author Robert Bogenschneider <bogi@uea.org> */ $lang['menu'] = 'Administrado de uzantoj'; $lang['noauth'] = '(identiĝo de uzantoj ne disponeblas)'; @@ -20,7 +18,7 @@ $lang['badauth'] = 'tiu identiĝa procezo ne validas'; $lang['user_id'] = 'Uzanto'; $lang['user_pass'] = 'Pasvorto'; $lang['user_name'] = 'Vera nomo'; -$lang['user_mail'] = 'Retadreso'; +$lang['user_mail'] = 'Retpoŝtadreso'; $lang['user_groups'] = 'Grupoj'; $lang['field'] = 'Kampo'; $lang['value'] = 'Valoro'; @@ -35,22 +33,22 @@ $lang['search_prompt'] = 'Fari serĉon'; $lang['clear'] = 'Refari serĉan filtron'; $lang['filter'] = 'Filtro'; $lang['summary'] = 'Montriĝas uzantoj %1$d-%2$d el %3$d trovitaj. %4$d uzantoj entute.'; -$lang['nonefound'] = 'Neniu uzantoj troviĝas. %d uzantoj entute.'; -$lang['delete_ok'] = '%d uzantoj estis forigitaj'; +$lang['nonefound'] = 'Neniuj uzantoj troviĝas. %d uzantoj entute.'; +$lang['delete_ok'] = '%d uzantoj forigiĝis'; $lang['delete_fail'] = '%d malsukcesis esti forigitaj.'; -$lang['update_ok'] = 'Tiu uzanto estis sukcese ĝisdatigita'; +$lang['update_ok'] = 'Tiu uzanto sukcese ĝisdatiĝis'; $lang['update_fail'] = 'Malsukceso okazis por ĝisdatigi tiun uzanton'; $lang['update_exists'] = 'Malsukceso okazis por ŝanĝi la nomon de tiu uzanto: la enmetita nomo (%s) jam ekzistas (ĉiuj aliaj ŝanĝoj estos aplikitaj)'; $lang['start'] = 'Ekigi'; $lang['prev'] = 'antaŭe'; $lang['next'] = 'sekve'; $lang['last'] = 'laste'; -$lang['edit_usermissing'] = 'La elektita uzanto ne estis trovita: tiu nomo povis esti forigita aŭ ŝanĝita aliloke.'; +$lang['edit_usermissing'] = 'La elektita uzanto ne troviĝis: tiu nomo povis esti forigita aŭ ŝanĝita aliloke.'; $lang['user_notify'] = 'Avizi uzanton'; $lang['note_notify'] = 'Avizantaj mesaĝoj estos sendataj nur se la uzanto ekhavos novan pasvorton.'; $lang['note_group'] = 'Novaj uzantoj estos aldonitaj al la komuna grupo (%s) se neniu alia estos specifita.'; -$lang['note_pass'] = 'La pasvorto estos aŭtomate kreita se la kampo estos lasita malplena kaj \'aviso al uzantoj\' estos ebligita.'; -$lang['add_ok'] = 'La uzanto estis sukcese aldonita'; -$lang['add_fail'] = 'Malsukceso okazis por aldoni uzulon'; -$lang['notify_ok'] = 'Avizanta mesaĝo estis sendita'; +$lang['note_pass'] = 'La pasvorto estos aŭtomate kreita se la kampo estos lasita malplena kaj \'avizo al uzantoj\' estos ebligita.'; +$lang['add_ok'] = 'La uzanto sukcese aldoniĝis'; +$lang['add_fail'] = 'Ne eblis aldoni uzanton'; +$lang['notify_ok'] = 'Avizanta mesaĝo sendiĝis'; $lang['notify_fail'] = 'La avizanta mesaĝo ne povis esti sendita'; diff --git a/lib/plugins/usermanager/lang/eo/list.txt b/lib/plugins/usermanager/lang/eo/list.txt index 714671afb..5be7222a9 100644 --- a/lib/plugins/usermanager/lang/eo/list.txt +++ b/lib/plugins/usermanager/lang/eo/list.txt @@ -1 +1 @@ -===== Listo de Uzantoj ===== \ No newline at end of file +===== Listo de uzantoj ===== -- cgit v1.2.3 From ca53ac989366b6c0519b74dc7152cb5e68c6bbad Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Fri, 4 May 2012 15:12:37 +0200 Subject: Correctly handle multiline strings in JS compressor See http://stackoverflow.com/questions/805107/how-to-create-multiline-strings for info on them. --- lib/exe/js.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index 4b72014b2..7c54f3e2e 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -307,7 +307,10 @@ function js_compress($s){ $j += 1; } } - $result .= substr($s,$i,$j+1); + $string = substr($s,$i,$j+1); + // remove multiline markers: + $string = str_replace("\\\n",'',$string); + $result .= $string; $i = $i + $j + 1; continue; } @@ -322,7 +325,10 @@ function js_compress($s){ $j += 1; } } - $result .= substr($s,$i,$j+1); + $string = substr($s,$i,$j+1); + // remove multiline markers: + $string = str_replace("\\\n",'',$string); + $result .= $string; $i = $i + $j + 1; continue; } -- cgit v1.2.3 From 15bc9cbc65dcb460c9027a127b889109847e287b Mon Sep 17 00:00:00 2001 From: Tim Roes <mail@timroes.de> Date: Mon, 7 May 2012 16:59:32 +0200 Subject: Removed vendor specific border radius --- lib/styles/screen.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib') diff --git a/lib/styles/screen.css b/lib/styles/screen.css index f97149745..3bf1ea0fc 100644 --- a/lib/styles/screen.css +++ b/lib/styles/screen.css @@ -18,8 +18,6 @@ div.notify { padding-left: 3em; overflow: hidden; border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; } div.error { -- cgit v1.2.3 From ae992f53831c105d6deacfef79d7723b22a00033 Mon Sep 17 00:00:00 2001 From: Tim Roes <mail@timroes.de> Date: Mon, 7 May 2012 17:07:51 +0200 Subject: Changed padding and margin like @selfthinker suggested --- lib/styles/screen.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/styles/screen.css b/lib/styles/screen.css index 3bf1ea0fc..8ada48932 100644 --- a/lib/styles/screen.css +++ b/lib/styles/screen.css @@ -10,12 +10,12 @@ div.success, div.notify { color: #000; background-repeat: no-repeat; - background-position: .5em 50%; + background-position: 8px 50%; border: 1px solid; font-size: 90%; - margin: 0.5em 0; + margin: 0 0 0.5em; padding: 0.4em; - padding-left: 3em; + padding-left: 32px; overflow: hidden; border-radius: 5px; } -- cgit v1.2.3 From f34e94ddf468613b81daeb0021d06d6e7ec97125 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 7 May 2012 23:21:18 +0100 Subject: added icons for user and site tools (FS#2450) --- lib/tpl/dokuwiki/css/design.css | 61 ++++++++++++++++++++++++++ lib/tpl/dokuwiki/images/sitetools-license.txt | 4 ++ lib/tpl/dokuwiki/images/sitetools.png | Bin 0 -> 3186 bytes 3 files changed, 65 insertions(+) create mode 100644 lib/tpl/dokuwiki/images/sitetools-license.txt create mode 100644 lib/tpl/dokuwiki/images/sitetools.png (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 8617c6c48..c64ccc710 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -86,6 +86,17 @@ text-overflow: ellipsis; } +#dokuwiki__usertools a.action, +#dokuwiki__sitetools a.action { + padding-left: 20px; + background: transparent url(images/sitetools.png) no-repeat 0 0; +} +[dir=rtl] #dokuwiki__usertools a.action, +[dir=rtl] #dokuwiki__sitetools a.action { + padding-left: 0; + padding-right: 20px; +} + #dokuwiki__header .mobileTools { display: none; /* hide mobile tools dropdown to only show in mobile view */ } @@ -107,6 +118,37 @@ #dokuwiki__usertools ul li.user { } +#dokuwiki__usertools a.action.admin { + background-position: left -96px; +} +[dir=rtl] #dokuwiki__usertools a.action.admin { + background-position: right -96px; +} +#dokuwiki__usertools a.action.profile { + background-position: left -128px; +} +[dir=rtl] #dokuwiki__usertools a.action.profile { + background-position: right -128px; +} +#dokuwiki__usertools a.action.register { + background-position: left -160px; +} +[dir=rtl] #dokuwiki__usertools a.action.register { + background-position: right -160px; +} +#dokuwiki__usertools a.action.login { + background-position: left -192px; +} +[dir=rtl] #dokuwiki__usertools a.action.login { + background-position: right -192px; +} +#dokuwiki__usertools a.action.logout { + background-position: left -224px; +} +[dir=rtl] #dokuwiki__usertools a.action.logout { + background-position: right -224px; +} + /*____________ site tools ____________*/ @@ -140,6 +182,25 @@ #dokuwiki__sitetools li { } +#dokuwiki__sitetools a.action.recent { + background-position: left 0; +} +[dir=rtl] #dokuwiki__sitetools a.action.recent { + background-position: right 0; +} +#dokuwiki__sitetools a.action.media { + background-position: left -32px; +} +[dir=rtl] #dokuwiki__sitetools a.action.media { + background-position: right -32px; +} +#dokuwiki__sitetools a.action.index { + background-position: left -64px; +} +[dir=rtl] #dokuwiki__sitetools a.action.index { + background-position: right -64px; +} + /*____________ breadcrumbs ____________*/ .dokuwiki div.breadcrumbs { diff --git a/lib/tpl/dokuwiki/images/sitetools-license.txt b/lib/tpl/dokuwiki/images/sitetools-license.txt new file mode 100644 index 000000000..833694e63 --- /dev/null +++ b/lib/tpl/dokuwiki/images/sitetools-license.txt @@ -0,0 +1,4 @@ +Icon set: Dusseldorf +Designer: pc.de +License: Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/] +URL: http://pc.de/icons/#Dusseldorf diff --git a/lib/tpl/dokuwiki/images/sitetools.png b/lib/tpl/dokuwiki/images/sitetools.png new file mode 100644 index 000000000..62a17a0c3 Binary files /dev/null and b/lib/tpl/dokuwiki/images/sitetools.png differ -- cgit v1.2.3 From f6e1661406b3af965d76120b9acd30c507977e4e Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 7 May 2012 23:57:42 +0100 Subject: changed old link icons to use icons from same icon set as sitetools --- lib/tpl/dokuwiki/css/_links.css | 6 +++--- lib/tpl/dokuwiki/images/email.png | Bin 0 -> 630 bytes lib/tpl/dokuwiki/images/external-link.png | Bin 0 -> 947 bytes lib/tpl/dokuwiki/images/icons-license.txt | 5 +++++ lib/tpl/dokuwiki/images/link_icon.gif | Bin 942 -> 0 bytes lib/tpl/dokuwiki/images/mail_icon.gif | Bin 918 -> 0 bytes lib/tpl/dokuwiki/images/sitetools-license.txt | 4 ---- lib/tpl/dokuwiki/images/unc.png | Bin 0 -> 553 bytes lib/tpl/dokuwiki/images/windows.gif | Bin 223 -> 0 bytes 9 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 lib/tpl/dokuwiki/images/email.png create mode 100644 lib/tpl/dokuwiki/images/external-link.png create mode 100644 lib/tpl/dokuwiki/images/icons-license.txt delete mode 100644 lib/tpl/dokuwiki/images/link_icon.gif delete mode 100644 lib/tpl/dokuwiki/images/mail_icon.gif delete mode 100644 lib/tpl/dokuwiki/images/sitetools-license.txt create mode 100644 lib/tpl/dokuwiki/images/unc.png delete mode 100644 lib/tpl/dokuwiki/images/windows.gif (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css index 6b19c3a24..58b611635 100644 --- a/lib/tpl/dokuwiki/css/_links.css +++ b/lib/tpl/dokuwiki/css/_links.css @@ -43,16 +43,16 @@ } /* external link */ .dokuwiki a.urlextern { - background-image: url(images/link_icon.gif); + background-image: url(images/external-link.png); padding: 0 0 0 17px; } /* windows share */ .dokuwiki a.windows { - background-image: url(images/windows.gif); + background-image: url(images/unc.png); } /* email link */ .dokuwiki a.mail { - background-image: url(images/mail_icon.gif); + background-image: url(images/email.png); } /* icons of the following are set by dokuwiki in lib/exe/css.php */ diff --git a/lib/tpl/dokuwiki/images/email.png b/lib/tpl/dokuwiki/images/email.png new file mode 100644 index 000000000..4ba4aad2f Binary files /dev/null and b/lib/tpl/dokuwiki/images/email.png differ diff --git a/lib/tpl/dokuwiki/images/external-link.png b/lib/tpl/dokuwiki/images/external-link.png new file mode 100644 index 000000000..60fc8716b Binary files /dev/null and b/lib/tpl/dokuwiki/images/external-link.png differ diff --git a/lib/tpl/dokuwiki/images/icons-license.txt b/lib/tpl/dokuwiki/images/icons-license.txt new file mode 100644 index 000000000..7e12bbbd4 --- /dev/null +++ b/lib/tpl/dokuwiki/images/icons-license.txt @@ -0,0 +1,5 @@ +Icons for: sitetools.png, email.png, external-link.png and unc.png +Icon set: Dusseldorf +Designer: pc.de +License: Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/] +URL: http://pc.de/icons/#Dusseldorf diff --git a/lib/tpl/dokuwiki/images/link_icon.gif b/lib/tpl/dokuwiki/images/link_icon.gif deleted file mode 100644 index 815ccb1b1..000000000 Binary files a/lib/tpl/dokuwiki/images/link_icon.gif and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/mail_icon.gif b/lib/tpl/dokuwiki/images/mail_icon.gif deleted file mode 100644 index 50a87a9a0..000000000 Binary files a/lib/tpl/dokuwiki/images/mail_icon.gif and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/sitetools-license.txt b/lib/tpl/dokuwiki/images/sitetools-license.txt deleted file mode 100644 index 833694e63..000000000 --- a/lib/tpl/dokuwiki/images/sitetools-license.txt +++ /dev/null @@ -1,4 +0,0 @@ -Icon set: Dusseldorf -Designer: pc.de -License: Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/] -URL: http://pc.de/icons/#Dusseldorf diff --git a/lib/tpl/dokuwiki/images/unc.png b/lib/tpl/dokuwiki/images/unc.png new file mode 100644 index 000000000..6dd3d365c Binary files /dev/null and b/lib/tpl/dokuwiki/images/unc.png differ diff --git a/lib/tpl/dokuwiki/images/windows.gif b/lib/tpl/dokuwiki/images/windows.gif deleted file mode 100644 index 4f12acce1..000000000 Binary files a/lib/tpl/dokuwiki/images/windows.gif and /dev/null differ -- cgit v1.2.3 From c7ed57e282e091fd8eb74bc3dbc8b8381a45acef Mon Sep 17 00:00:00 2001 From: Roman Franchuk <franchukrom@gmail.com> Date: Tue, 22 May 2012 17:50:38 +0200 Subject: Ukrainian language update --- lib/plugins/config/lang/uk/intro.txt | 4 +- lib/plugins/config/lang/uk/lang.php | 131 ++++++++++++++++++----------------- 2 files changed, 68 insertions(+), 67 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/uk/intro.txt b/lib/plugins/config/lang/uk/intro.txt index 7255c30f9..87abe1be3 100644 --- a/lib/plugins/config/lang/uk/intro.txt +++ b/lib/plugins/config/lang/uk/intro.txt @@ -1,6 +1,6 @@ -====== Настройка конфігурації ====== +====== Налаштування Вікі ====== -Використовуйте цю сторінку для настройки ДокуВікі. Для довідок щодо конкретних параметрів дивіться [[doku>config]]. Для більш детальної інформації про цей доданок дивіться [[doku>plugin:config]]. +Використовуйте цю сторінку для налаштування ДокуВікі. Для довідок щодо конкретних параметрів дивіться [[doku>config]]. Для більш детальної інформації про цей доданок дивіться [[doku>plugin:config]]. Параметри, що виділені червоним кольором тла захищені та не можуть бути змінені за допомогою цього доданка. Параметри, з синім кольором тла мають значення по замовчуванню, а параметри з білим тлом були встановлені для цієї локальної інсталяції. Сині та білі параметри можуть бути змінені. diff --git a/lib/plugins/config/lang/uk/lang.php b/lib/plugins/config/lang/uk/lang.php index 375c5d3bf..3d463fc72 100644 --- a/lib/plugins/config/lang/uk/lang.php +++ b/lib/plugins/config/lang/uk/lang.php @@ -11,54 +11,56 @@ * @author Ulrikhe Lukoie <lukoie@gmail>.com * @author Kate Arzamastseva pshns@ukr.net */ -$lang['menu'] = 'Настройка конфігурації'; +$lang['menu'] = 'Налаштування Вікі'; $lang['error'] = 'Параметри не збережено через помилкові значення. Будь ласка, перегляньте ваші зміни та спробуйте ще раз <br />Помилкові значення будуть виділені червоною рамкою.'; $lang['updated'] = 'Параметри успішно збережено.'; $lang['nochoice'] = '(інших варіантів не існує)'; -$lang['locked'] = 'Неможливо записати файл настройки. Переконайтеся, <br /> +$lang['locked'] = 'Неможливо записати файл налаштувань. Переконайтеся, <br /> що ім\'я та права доступу для локального файлу вказано правильно.'; $lang['danger'] = 'УВАГА! Зміна цього параметру може призвести до недоступності вашої Вікі та меню конфігурації.'; $lang['warning'] = 'УВАГА! Зміна цього параметру може призвести до непередбачуваних наслідків.'; $lang['security'] = 'УВАГА! Зміна цього параметру може призвести до послаблення безпеки вашої Вікі.'; $lang['_configuration_manager'] = 'Управління конфігурацією'; -$lang['_header_dokuwiki'] = 'Настройки ДокуВікі'; -$lang['_header_plugin'] = 'Настройки Доданків'; -$lang['_header_template'] = 'Настройки шаблонів'; -$lang['_header_undefined'] = 'Невизначені настройки'; -$lang['_basic'] = 'Базові настройки'; -$lang['_display'] = 'Настройки дисплея'; -$lang['_authentication'] = 'Настройки автентифікації'; -$lang['_anti_spam'] = 'Настройки Анти-спаму'; -$lang['_editing'] = 'Настройки редагування'; -$lang['_links'] = 'Настройки посилань'; -$lang['_media'] = 'Настройки медіа'; -$lang['_advanced'] = 'Розширені настройки'; -$lang['_network'] = 'Настройки мережі'; -$lang['_plugin_sufix'] = 'Настройки (доданок)'; -$lang['_template_sufix'] = 'Настройки (шаблон)'; +$lang['_header_dokuwiki'] = 'Налаштування ДокуВікі'; +$lang['_header_plugin'] = 'Налаштування Доданків'; +$lang['_header_template'] = 'Налаштування шаблонів'; +$lang['_header_undefined'] = 'Невизначені налаштування'; +$lang['_basic'] = 'Базові налаштування'; +$lang['_display'] = 'Налаштування відображення'; +$lang['_authentication'] = 'Налаштування автентифікації'; +$lang['_anti_spam'] = 'Налаштування Анти-спаму'; +$lang['_editing'] = 'Налаштування редагування'; +$lang['_links'] = 'Налаштування посилань'; +$lang['_media'] = 'Налаштування медіа'; +$lang['_notifications'] = 'Налаштування сповіщень'; +$lang['_advanced'] = 'Розширені налаштування'; +$lang['_network'] = 'Налаштування мережі'; +$lang['_plugin_sufix'] = 'Налаштування (доданок)'; +$lang['_template_sufix'] = 'Налаштування (шаблон)'; $lang['_msg_setting_undefined'] = 'Немає метаданих параметру.'; $lang['_msg_setting_no_class'] = 'Немає класу параметру.'; $lang['_msg_setting_no_default'] = 'Немає значення за замовчуванням.'; -$lang['fmode'] = 'Права для створених файлів'; -$lang['dmode'] = 'Права для створених папок'; -$lang['lang'] = 'Мова'; -$lang['basedir'] = 'Коренева папка'; -$lang['baseurl'] = 'Кореневий URL'; -$lang['savedir'] = 'Папка для збереження даних'; -$lang['start'] = 'Назва стартової сторінки'; $lang['title'] = 'Назва Вікі'; +$lang['start'] = 'Назва стартової сторінки'; +$lang['lang'] = 'Мова'; $lang['template'] = 'Шаблон'; $lang['license'] = 'Під якою ліцензією слід публікувати вміст?'; -$lang['fullpath'] = 'Повний шлях до документу'; +$lang['savedir'] = 'Папка для збереження даних'; +$lang['basedir'] = 'Коренева папка'; +$lang['baseurl'] = 'Кореневий URL'; +$lang['dmode'] = 'Права для створених папок'; +$lang['fmode'] = 'Права для створених файлів'; +$lang['allowdebug'] = 'Дозволити відлагодження <b>вимкніть, якщо не потрібно!</b>'; $lang['recent'] = 'Останні зміни'; +$lang['recent_days'] = 'Скільки останніх змін пам\'ятати (дні)'; $lang['breadcrumbs'] = 'Ви відвідали (кількість сторінок, що показується)'; $lang['youarehere'] = 'Показувати "Ви тут"'; +$lang['fullpath'] = 'Повний шлях до документу'; $lang['typography'] = 'Замінювати типографські символи'; -$lang['htmlok'] = 'Дозволити HTML'; -$lang['phpok'] = 'Дозволити PHP'; $lang['dformat'] = 'Формат дати (дивіться функцію <a href="http://www.php.net/strftime">strftime</a> PHP)'; $lang['signature'] = 'Підпис'; +$lang['showuseras'] = 'Що вказувати при відображенні користувача, який востаннє редагував сторінку'; $lang['toptoclevel'] = 'Мінімальний рівень для змісту'; $lang['tocminheads'] = 'Мінімальна кількість заголовків, необхідна для створення таблиці змісту'; $lang['maxtoclevel'] = 'Максимальний рівень для таблиці змісту'; @@ -66,15 +68,8 @@ $lang['maxseclevel'] = 'Максимальний рівень секц $lang['camelcase'] = 'Використовувати CamelCase'; $lang['deaccent'] = 'Транслітерація в іменах сторінок'; $lang['useheading'] = 'Першій заголовок замість імені'; -$lang['refcheck'] = 'Перевіряти посилання на медіа-файлі'; -$lang['refshow'] = 'Показувати кількість медіа-посилань'; -$lang['allowdebug'] = 'Дозволити відлагодження <b>вимкніть, якщо не потрібно!</b>'; -$lang['usewordblock'] = 'Блокувати спам по списку слів'; -$lang['indexdelay'] = 'Затримка перед індексацією'; -$lang['relnofollow'] = 'Використовувати rel="nofollow"'; -$lang['mailguard'] = 'Кодувати адреси e-mail'; -$lang['iexssprotect'] = 'Перевірте оновлені файли на можливі заборонені Javascript чи HTML коди'; -$lang['showuseras'] = 'Що вказувати при відображенні користувача, який востаннє редагував сторінку'; +$lang['sneaky_index'] = 'За замовчуванням, ДокуВікі показує всі простори імен в змісті. Активація цієї опції сховає ті простори, де користувач не має прав на читання. Результатом може бути неможливість доступу до певних відкритих просторів імен. Це зробить неможливим використання змісту при певних конфігураціях.'; +$lang['hidepages'] = 'Ховати сторінки (regular expressions)'; $lang['useacl'] = 'Використовувати ACL'; $lang['autopasswd'] = 'Автоматичне створення паролів'; $lang['authtype'] = 'Аутентифікація'; @@ -83,57 +78,63 @@ $lang['defaultgroup'] = 'Група за замовчуванням'; $lang['superuser'] = 'Суперкористувач'; $lang['manager'] = 'Менеджер - група, користувач чи розділений комами список user1,@group1,user2 з правами до певних функцій керування'; $lang['profileconfirm'] = 'Підтверджувати зміни профілю паролем'; +$lang['rememberme'] = 'Дозволити постійні файли cookies для входу (Запам\'ятати мене)'; $lang['disableactions'] = 'Заборонити дії ДокуВікі'; $lang['disableactions_check'] = 'Перевірити'; $lang['disableactions_subscription'] = 'Підписатись/Відписатись'; $lang['disableactions_wikicode'] = 'Переглянути код/Експорт'; $lang['disableactions_other'] = 'Інші дії (розділені комами)'; -$lang['sneaky_index'] = 'За замовчуванням, ДокуВікі показує всі простори імен в змісті. Активація цієї опції сховає ті простори, де користувач не має прав на читання. Результатом може бути неможливість доступу до певних відкритих просторів імен. Це зробить неможливим використання змісту при певних конфігураціях.'; $lang['auth_security_timeout'] = 'Таймаут аутентифікації (в секундах)'; $lang['securecookie'] = 'Чи повинен браузер надсилати файли cookies тільки через HTTPS? Вимкніть цей параметр, лише тоді, якщо вхід до Вікі захищено SSL, але перегляд сторінок відбувається у незахищеному режимі.'; +$lang['usewordblock'] = 'Блокувати спам по списку слів'; +$lang['relnofollow'] = 'Використовувати rel="nofollow"'; +$lang['indexdelay'] = 'Затримка перед індексацією'; +$lang['mailguard'] = 'Кодувати адреси e-mail'; +$lang['iexssprotect'] = 'Перевірте оновлені файли на можливі заборонені Javascript чи HTML коди'; +$lang['usedraft'] = 'Автоматично зберігати чернетку при редагуванні'; +$lang['htmlok'] = 'Дозволити HTML'; +$lang['phpok'] = 'Дозволити PHP'; +$lang['locktime'] = 'Час блокування (сек)'; +$lang['cachetime'] = 'Максимальний вік кешу (сек)'; +$lang['target____wiki'] = 'Target для внутрішніх посилань'; +$lang['target____interwiki'] = 'Target для інтерВікі-посилань'; +$lang['target____extern'] = 'Target для зовнішніх посилань'; +$lang['target____media'] = 'Target для медіа-посилань'; +$lang['target____windows'] = 'Target для посилань на мережеві папки'; +$lang['refcheck'] = 'Перевіряти посилання на медіа-файлі'; +$lang['refshow'] = 'Показувати кількість медіа-посилань'; +$lang['gdlib'] = 'Версія GD Lib'; +$lang['im_convert'] = 'Шлях до ImageMagick'; +$lang['jpg_quality'] = 'Якість компресії JPG (0-100)'; +$lang['fetchsize'] = 'Максимальний розмір (в байтах), що fetch.php може завантажувати з зовні'; +$lang['subscribers'] = 'Підписка на зміни'; +$lang['subscribe_time'] = 'Час, після якого список підписки та дайджести будуть надіслані (сек.); Має бути меншим за час, вказаний у перемінній recent_days'; +$lang['notify'] = 'E-mail для сповіщень'; +$lang['registernotify'] = 'Надсилати інформацію про нових користувачів на цю адресу'; +$lang['mailfrom'] = 'E-mail для автоматичних повідомлень'; +$lang['mailprefix'] = 'Префікс теми повідомлення, що використовується в автоматичній розсилці електронних листів'; +$lang['sitemap'] = 'Створювати мапу сайту для Google (дні)'; +$lang['rss_type'] = 'тип RSS'; +$lang['rss_linkto'] = 'посилання в RSS'; +$lang['rss_content'] = 'Що відображати в пунктах XML-feed'; +$lang['rss_update'] = 'Інтервал оновлення RSS (сек)'; +$lang['rss_show_summary'] = 'Показувати підсумки змін в заголовку XML-feed'; $lang['updatecheck'] = 'Перевірити наявність оновлень чи попереджень безпеки? Для цього ДокуВікі необхідно зв\'язатися зі update.dokuwiki.org.'; $lang['userewrite'] = 'Красиві URL'; $lang['useslash'] = 'Слеш, як розділювач просторів імен в URL'; -$lang['usedraft'] = 'Автоматично зберігати чернетку при редагуванні'; $lang['sepchar'] = 'Розділювач слів у імені сторінки'; $lang['canonical'] = 'Канонічні URL'; $lang['fnencode'] = 'Метод для кодування імен файлів, що містять не ASCII символи.'; $lang['autoplural'] = 'Перевіряти множину у посиланнях'; $lang['compression'] = 'Метод стиснення attic файлів'; -$lang['cachetime'] = 'Максимальний вік кешу (сек)'; -$lang['locktime'] = 'Час блокування (сек)'; -$lang['fetchsize'] = 'Максимальний розмір (в байтах), що fetch.php може завантажувати з зовні'; -$lang['notify'] = 'E-mail для сповіщень'; -$lang['registernotify'] = 'Надсилати інформацію про нових користувачів на цю адресу'; -$lang['mailfrom'] = 'E-mail для автоматичних повідомлень'; -$lang['mailprefix'] = 'Префікс теми повідомлення, що використовується в автоматичній розсилці електронних листів'; $lang['gzip_output'] = 'Використовувати gzip, як Content-Encoding для xhtml'; -$lang['gdlib'] = 'Версія GD Lib'; -$lang['im_convert'] = 'Шлях до ImageMagick'; -$lang['jpg_quality'] = 'Якість компресії JPG (0-100)'; -$lang['subscribers'] = 'Підписка на зміни'; -$lang['subscribe_time'] = 'Час, після якого список підписки та дайджести будуть надіслані (сек.); Має бути меншим за час, вказаний у перемінній recent_days'; $lang['compress'] = 'Стискати файли CSS та javascript'; -$lang['hidepages'] = 'Ховати сторінки (regular expressions)'; $lang['send404'] = 'Надсилати "HTTP 404/Сторінка не знайдена " для неіснуючих сторінок'; -$lang['sitemap'] = 'Створювати мапу сайту для Google (дні)'; $lang['broken_iua'] = 'У вашій системі зіпсована функція ignore_user_abort? Це може зіпсувати пошукову систему. IIS+PHP/CGI не працює. Дивіться <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a> для отримання додаткової інформації'; $lang['xsendfile'] = 'Використовувати заголовок X-Sendfile для доставки статичних файлів веб сервером? Ваш веб сервер повинен підтримувати цю функцію.'; $lang['renderer_xhtml'] = 'Транслятор (Renderer) для основного виводу wiki (xhtml)'; $lang['renderer__core'] = '%s (ядро докуВікі)'; $lang['renderer__plugin'] = '%s (доданок)'; -$lang['rememberme'] = 'Дозволити постійні файли cookies для входу (Запам\'ятати мене)'; -$lang['rss_type'] = 'тип RSS'; -$lang['rss_linkto'] = 'посилання в RSS'; -$lang['rss_content'] = 'Що відображати в пунктах XML-feed'; -$lang['rss_update'] = 'Інтервал оновлення RSS (сек)'; -$lang['recent_days'] = 'Скільки останніх змін пам\'ятати (дні)'; -$lang['rss_show_summary'] = 'Показувати підсумки змін в заголовку XML-feed'; -$lang['target____wiki'] = 'Target для внутрішніх посилань'; -$lang['target____interwiki'] = 'Target для інтерВікі-посилань'; -$lang['target____extern'] = 'Target для зовнішніх посилань'; -$lang['target____media'] = 'Target для медіа-посилань'; -$lang['target____windows'] = 'Target для посилань на мережеві папки'; $lang['proxy____host'] = 'Адреса Proxy'; $lang['proxy____port'] = 'Порт Proxy'; $lang['proxy____user'] = 'Користувач Proxy'; @@ -181,7 +182,7 @@ $lang['xsendfile_o_2'] = 'Стандартний X-Sendfile заголо $lang['xsendfile_o_3'] = 'Фірмовий заголовок Nginx X-Accel-Redirect'; $lang['showuseras_o_loginname'] = 'Логін'; $lang['showuseras_o_username'] = 'Повне ім’я користувача'; -$lang['showuseras_o_email'] = 'E-mail користувача (прихована відповідно до настройок)'; +$lang['showuseras_o_email'] = 'E-mail користувача (прихована відповідно до налаштувань)'; $lang['showuseras_o_email_link'] = 'E-mail користувача як посилання mailto:'; $lang['useheading_o_0'] = 'Ніколи'; $lang['useheading_o_navigation'] = 'Лише для навігації'; -- cgit v1.2.3 From f32f3fdf247618fa521b53042b833cc41d37b0a2 Mon Sep 17 00:00:00 2001 From: Erial Krale <erial2@gmail.com> Date: Tue, 22 May 2012 17:51:35 +0200 Subject: Korean language update --- lib/plugins/config/lang/ko/lang.php | 112 +++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 54 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 82863b684..dc22a78df 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -31,6 +31,8 @@ $lang['_anti_spam'] = '안티-스팸 설정'; $lang['_editing'] = '편집 설정'; $lang['_links'] = '링크 설정'; $lang['_media'] = '미디어 설정'; +$lang['_notifications'] = '공지 설정'; +$lang['_syndication'] = '신디케이션 설정'; $lang['_advanced'] = '진보된 설정'; $lang['_network'] = '네트워크 설정'; $lang['_plugin_sufix'] = 'Plugin 설정'; @@ -38,28 +40,29 @@ $lang['_template_sufix'] = 'Template 설정'; $lang['_msg_setting_undefined'] = '설정되지 않은 메타데이타.'; $lang['_msg_setting_no_class'] = '설정되지 않은 클래스.'; $lang['_msg_setting_no_default'] = '기본값 없음.'; -$lang['fmode'] = '파일 생성 모드'; -$lang['dmode'] = '디렉토리 생성 모드'; -$lang['lang'] = '언어'; -$lang['basedir'] = '기본 디렉토리'; -$lang['baseurl'] = '기본 URL'; -$lang['savedir'] = '데이타 저장 디렉토리'; -$lang['cookiedir'] = '쿠키 위치. 비워두면 기본 url 위치로 지정됩니다.'; -$lang['start'] = '시작 페이지 이름'; $lang['title'] = '위키 제목'; +$lang['start'] = '시작 페이지 이름'; +$lang['lang'] = '언어'; $lang['template'] = '템플릿'; $lang['tagline'] = '태그 라인 (템플릿이 지원할 때에 한해)'; $lang['sidebar'] = '사이드바 페이지 이름(템플릿이 지원할 때에 한해). 비워두면 사이드바를 비활성화함'; $lang['license'] = '컨텐트에 어떤 라이센스 정책을 적용하시겠습니까?'; -$lang['fullpath'] = '페이지 하단에 전체 경로 보여주기'; +$lang['savedir'] = '데이타 저장 디렉토리'; +$lang['basedir'] = '기본 디렉토리'; +$lang['baseurl'] = '기본 URL'; +$lang['cookiedir'] = '쿠키 위치. 비워두면 기본 url 위치로 지정됩니다.'; +$lang['dmode'] = '디렉토리 생성 모드'; +$lang['fmode'] = '파일 생성 모드'; +$lang['allowdebug'] = '디버그 허용 <b>필요하지 않으면 금지!</b>'; $lang['recent'] = '최근에 바뀐 것'; +$lang['recent_days'] = '최근 바뀐 페이지 기준 시간(날짜)'; $lang['breadcrumbs'] = '위치 추적 수'; $lang['youarehere'] = '계층형 위치 추적'; +$lang['fullpath'] = '페이지 하단에 전체 경로 보여주기'; $lang['typography'] = '기호 대체'; -$lang['htmlok'] = 'HTML 내장 허용'; -$lang['phpok'] = 'PHP 내장 허용'; $lang['dformat'] = '날짜 포맷 (PHP <a href="http://www.php.net/strftime">strftime</a> 기능) 참조'; $lang['signature'] = '서명'; +$lang['showuseras'] = '마지막으로 페이지를 수정한 사용자를 보여줄지 여부'; $lang['toptoclevel'] = '목차 최상위 항목'; $lang['tocminheads'] = '목차 표시 여부를 결정할 최소한의 표제 항목의 수'; $lang['maxtoclevel'] = '목차 최대 단계'; @@ -67,16 +70,10 @@ $lang['maxseclevel'] = '섹션 최대 편집 단계'; $lang['camelcase'] = '링크에 CamelCase 사용'; $lang['deaccent'] = '악센트 없는 페이지 이름'; $lang['useheading'] = '페이지 이름으로 첫 헤드라인 사용'; -$lang['refcheck'] = '미디어 참조 검사'; -$lang['refshow'] = '보여줄 미디어 참조 수'; -$lang['allowdebug'] = '디버그 허용 <b>필요하지 않으면 금지!</b>'; -$lang['mediarevisions'] = '미디어 버전 관리를 사용하시겠습니까?'; -$lang['usewordblock'] = '금지단어를 사용해 스팸 막기'; -$lang['indexdelay'] = '색인 연기 시간(초)'; -$lang['relnofollow'] = '외부 링크에 rel="nofollow" 사용'; -$lang['mailguard'] = '이메일 주소를 알아볼 수 없게'; -$lang['iexssprotect'] = '업로드 파일의 악성 Javascript, HTML 코드 가능성 여부를 검사'; -$lang['showuseras'] = '마지막으로 페이지를 수정한 사용자를 보여줄지 여부'; +$lang['sneaky_index'] = '기본적으로, DokuWiki는 색인 목록에 모든 네임스페이스들을 보여줍니다. +이 옵션을 설정하면 사용자가 읽기 권한을 가지고 있지 않은 네임스페이스들은 보여주지 않습니다. 접근 가능한 하위 네임스페이스들 보이지않게 설정하면 자동으로 설정됩니다. +특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.'; +$lang['hidepages'] = '매칭된 페이지 숨기기(정규표현식)'; $lang['useacl'] = '접근 제어 목록(ACL) 사용'; $lang['autopasswd'] = '자동으로 만들어진 패스워드'; $lang['authtype'] = '인증 백-엔드'; @@ -85,64 +82,71 @@ $lang['defaultgroup'] = '기본 그룹'; $lang['superuser'] = '슈퍼 유저'; $lang['manager'] = '관리자 - 관리 기능들을 사용할 수 있는 그룹이나 사용자'; $lang['profileconfirm'] = '개인정보 변경시 암호 재확인'; +$lang['rememberme'] = '로그인 정보 저장 허용'; $lang['disableactions'] = 'DokuWiki Action 금지'; $lang['disableactions_check'] = '검사'; $lang['disableactions_subscription'] = '구독 신청/해지'; $lang['disableactions_wikicode'] = '문서 소스 보기'; $lang['disableactions_other'] = '다른 Action(comma로 구분)'; -$lang['sneaky_index'] = '기본적으로, DokuWiki는 색인 목록에 모든 네임스페이스들을 보여줍니다. -이 옵션을 설정하면 사용자가 읽기 권한을 가지고 있지 않은 네임스페이스들은 보여주지 않습니다. 접근 가능한 하위 네임스페이스들 보이지않게 설정하면 자동으로 설정됩니다. -특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.'; $lang['auth_security_timeout'] = '인증 보안 초과 시간(초)'; $lang['securecookie'] = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화 하고 위키 페이지는 그렇지 않은경우 꺼야 합니다.'; -$lang['xmlrpc'] = 'XML-RPC 인터페이스 지원/무시'; -$lang['xmlrpcuser'] = '주어진 그룹이나 유저들에게만 XML-RPC접근을 허락하려면 컴마로 구분하여 적으세요. 비어두면 모두에게 허용됩니다.'; +$lang['remote'] = '원격 API를 활성화 합니다. 이 항목을 허용하면 XML-RPC 및 기타 메카니즘을 통해 다른 어플리케이션으로 접근가능합니다.'; +$lang['remoteuser'] = '이 항목에 입력된 콤마로 나눠진 그룹이나 사용자에게 원격 API 접근을 제한합니다. 빈칸으로 두면 모두에게 허용합니다.'; +$lang['usewordblock'] = '금지단어를 사용해 스팸 막기'; +$lang['relnofollow'] = '외부 링크에 rel="nofollow" 사용'; +$lang['indexdelay'] = '색인 연기 시간(초)'; +$lang['mailguard'] = '이메일 주소를 알아볼 수 없게'; +$lang['iexssprotect'] = '업로드 파일의 악성 Javascript, HTML 코드 가능성 여부를 검사'; +$lang['usedraft'] = '편집하는 동안 자동으로 문서 초안 저장'; +$lang['htmlok'] = 'HTML 내장 허용'; +$lang['phpok'] = 'PHP 내장 허용'; +$lang['locktime'] = '쵀대 파일 잠금 시간(초)'; +$lang['cachetime'] = '최대 캐쉬 생존 시간(초)'; +$lang['target____wiki'] = '내부 링크들에 대한 타겟 윈도우 '; +$lang['target____interwiki'] = 'InterWiki 링크들에 대한 타겟 윈도우'; +$lang['target____extern'] = '외부 링크들에 대한 타겟 윈도우'; +$lang['target____media'] = '미디어 링크들에 대한 타겟 윈도우'; +$lang['target____windows'] = '윈도우 링크들에 대한 타겟 윈도우'; +$lang['mediarevisions'] = '미디어 버전 관리를 사용하시겠습니까?'; +$lang['refcheck'] = '미디어 참조 검사'; +$lang['refshow'] = '보여줄 미디어 참조 수'; +$lang['gdlib'] = 'GD 라이브러리 버전'; +$lang['im_convert'] = 'ImageMagick 위치'; +$lang['jpg_quality'] = 'JPG 압축 품질 (0-100)'; +$lang['fetchsize'] = 'fetch.php가 외부에서 다운로드할 수도 있는 최대 크기(바이트)'; +$lang['subscribers'] = '페이지 갱신 알람 기능'; +$lang['subscribe_time'] = ' 구독 목록과 요약이 보내질 경과 시간 (초); 이 것은 recent_days에서 설정된 시간보다 작아야 합니다.'; +$lang['notify'] = '이메일 알람 기능'; +$lang['registernotify'] = '신규 등록자 알람 기능'; +$lang['mailfrom'] = '자동으로 보내지는 메일 발신자'; +$lang['mailprefix'] = '자동으로 보내지는 메일의 제목 말머리 내용'; +$lang['htmlmail'] = '용량은 좀 더 크지만 보기 좋은 HTML 태그가 포함된 메일을 발송합니다. 텍스트만의 메일을 보내고자하면 체크를 꺼주세요.'; +$lang['sitemap'] = '구글 사이트맵 생성(날짜)'; +$lang['rss_type'] = 'XML feed 타잎'; +$lang['rss_linkto'] = 'XML feed 링크 정보'; +$lang['rss_content'] = 'XML feed 항목들에 표시되는 내용은?'; +$lang['rss_update'] = 'XML feed 갱신 주기(초)'; +$lang['rss_show_summary'] = 'XML feed 제목에서 요약정보 보여주기'; +$lang['rss_media'] = '어떤 규격으로 XML 피드를 받아보시겠습니까?'; $lang['updatecheck'] = '업데이트와 보안 문제를 검사(DokuWiki를 update.dokuwiki.org에 연결해야 합니다.)'; $lang['userewrite'] = 'URL rewriting기능 사용'; $lang['useslash'] = 'URL에서 네임스페이스 구분자로 슬래쉬 문자 사용'; -$lang['usedraft'] = '편집하는 동안 자동으로 문서 초안 저장'; $lang['sepchar'] = '페이지 이름 단어 구분자'; $lang['canonical'] = '완전한 canonical URL 사용'; $lang['fnencode'] = '아스키가 아닌 파일이름을 인코딩 하는 방법.'; $lang['autoplural'] = '링크 연결시 plural폼 검사'; $lang['compression'] = 'attic파일 압축 방법 선택'; -$lang['cachetime'] = '최대 캐쉬 생존 시간(초)'; -$lang['locktime'] = '쵀대 파일 잠금 시간(초)'; -$lang['fetchsize'] = 'fetch.php가 외부에서 다운로드할 수도 있는 최대 크기(바이트)'; -$lang['notify'] = '이메일 알람 기능'; -$lang['registernotify'] = '신규 등록자 알람 기능'; -$lang['mailfrom'] = '자동으로 보내지는 메일 발신자'; -$lang['mailprefix'] = '자동으로 보내지는 메일의 제목 말머리 내용'; $lang['gzip_output'] = 'xhml 내용 gzip 압축 여부'; -$lang['gdlib'] = 'GD 라이브러리 버전'; -$lang['im_convert'] = 'ImageMagick 위치'; -$lang['jpg_quality'] = 'JPG 압축 품질 (0-100)'; -$lang['subscribers'] = '페이지 갱신 알람 기능'; -$lang['subscribe_time'] = ' 구독 목록과 요약이 보내질 경과 시간 (초); 이 것은 recent_days에서 설정된 시간보다 작아야 합니다.'; $lang['compress'] = '최적화된 CSS, javascript 출력'; $lang['cssdatauri'] = '이미지가 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP request 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! <code>400</code> 에서 <code>600></code> 정도면 좋은 효율을 가져옵니다. <code>0</code>로 지정할 경우 비활성화 됩니다.'; -$lang['hidepages'] = '매칭된 페이지 숨기기(정규표현식)'; $lang['send404'] = '존재하지 않는 페이지에 대해 "HTTP 404/Page Not Found" 응답'; -$lang['sitemap'] = '구글 사이트맵 생성(날짜)'; $lang['broken_iua'] = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있으면 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a>를 참고하기 바랍니다.'; $lang['xsendfile'] = '웹 서버 static 파일 전송 지원을 위해 X-Sendfile 헤더를 사용한다면 이 옵션을 사용합니다. 웹 서버가 이 기능을 지원해야 합니다.'; $lang['renderer_xhtml'] = '주 (xhtml) 위키 출력 처리기'; $lang['renderer__core'] = '%s (DokuWiki 내부 기능)'; $lang['renderer__plugin'] = '%s (DokuWiki 플러그인)'; -$lang['rememberme'] = '로그인 정보 저장 허용'; -$lang['rss_type'] = 'XML feed 타잎'; -$lang['rss_linkto'] = 'XML feed 링크 정보'; -$lang['rss_content'] = 'XML feed 항목들에 표시되는 내용은?'; -$lang['rss_update'] = 'XML feed 갱신 주기(초)'; -$lang['recent_days'] = '최근 바뀐 페이지 기준 시간(날짜)'; -$lang['rss_show_summary'] = 'XML feed 제목에서 요약정보 보여주기'; -$lang['rss_media'] = '어떤 규격으로 XML 피드를 받아보시겠습니까?'; -$lang['target____wiki'] = '내부 링크들에 대한 타겟 윈도우 '; -$lang['target____interwiki'] = 'InterWiki 링크들에 대한 타겟 윈도우'; -$lang['target____extern'] = '외부 링크들에 대한 타겟 윈도우'; -$lang['target____media'] = '미디어 링크들에 대한 타겟 윈도우'; -$lang['target____windows'] = '윈도우 링크들에 대한 타겟 윈도우'; +$lang['dnslookups'] = '이 옵션을 체크하면 도쿠위키가 페이지를 수정하는 사용자의 호스트 네임과 원격 IP주소를 확인합니다. 서버가 느리거나, DNS를 운영하지 않거나 이 기능을 원치 않으면 비활성화 시켜주세요.'; $lang['proxy____host'] = '프록시 서버 이름'; $lang['proxy____port'] = '프록시 서버 포트'; $lang['proxy____user'] = '프록시 사용자 이름'; -- cgit v1.2.3 From 10544f7eec93e72b8939a7d741b5fd4ef4b0a4e9 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <gohr@cosmocode.de> Date: Wed, 23 May 2012 09:14:14 +0200 Subject: added .ico to allowed mime types the new template allows to use a favicon in media/wiki/favicon.ico so we should support uploading it as well. --- lib/images/fileicons/ico.png | Bin 0 -> 907 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/images/fileicons/ico.png (limited to 'lib') diff --git a/lib/images/fileicons/ico.png b/lib/images/fileicons/ico.png new file mode 100644 index 000000000..1d9dd562a Binary files /dev/null and b/lib/images/fileicons/ico.png differ -- cgit v1.2.3 From db53782ebab12a3f1419389603f95f3596210808 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 27 May 2012 11:09:45 +0100 Subject: Revert "removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary" This reverts commit dbd59867496d5e3c5d37e9c3852db29a6a2370c4. --- lib/tpl/dokuwiki/css/basic.css | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 7ffe42ec4..0c8b0c13f 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -17,7 +17,11 @@ body { color: __text__; background-color: __background_site__; background-image: url(images/page-background.svg); - background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + /*background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); see FS#2447*/ + background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: -o-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: -ms-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); background-size: 1px 10em; background-repeat: repeat-x; margin: 0; @@ -332,7 +336,11 @@ button, color: #333; background-color: #eee; background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+); - background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + /*background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); see FS#2447*/ + background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); border: 1px solid #ccc; border-radius: 2px; padding: .1em .5em; @@ -354,8 +362,12 @@ button:focus, .qq-upload-button:hover { border-color: #999; background-color: #ddd; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+); - background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); + background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+); + /*background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); see FS#2447*/ + background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); + background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); + background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); + background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); } input::-moz-focus-inner, -- cgit v1.2.3 From eae330b6dbdac1213ca6407b1bef7b706ed17066 Mon Sep 17 00:00:00 2001 From: lainme <lainme993@gmail.com> Date: Tue, 12 Jun 2012 20:08:23 +0200 Subject: chinese language update. related to FS#2360 --- lib/plugins/config/lang/zh/lang.php | 106 ++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 48 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index 5b7229c62..832dfe749 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -38,6 +38,8 @@ $lang['_anti_spam'] = '反垃圾邮件/评论设置'; $lang['_editing'] = '编辑设置'; $lang['_links'] = '链接设置'; $lang['_media'] = '媒体设置'; +$lang['_notifications'] = '通知设置'; +$lang['_syndication'] = '聚合设置'; $lang['_advanced'] = '高级设置'; $lang['_network'] = '网络设置'; $lang['_plugin_sufix'] = '插件设置'; @@ -45,26 +47,29 @@ $lang['_template_sufix'] = '模板设置'; $lang['_msg_setting_undefined'] = '设置的元数据不存在。'; $lang['_msg_setting_no_class'] = '设置的分类不存在。'; $lang['_msg_setting_no_default'] = '设置的默认值不存在。'; -$lang['fmode'] = '文件的创建模式'; -$lang['dmode'] = '文件夹的创建模式'; +$lang['title'] = '维基站点的标题'; +$lang['start'] = '开始页面的名称'; $lang['lang'] = '语言'; +$lang['template'] = '模版'; +$lang['tagline'] = '副标题 （如果模板支持此功能）'; +$lang['sidebar'] = '侧边栏的页面名称 （如果模板支持此功能），留空以禁用侧边栏'; +$lang['license'] = '您愿意让你贡献的内容在何种许可方式下发布？'; +$lang['savedir'] = '保存数据的目录'; $lang['basedir'] = '根目录'; $lang['baseurl'] = '根路径（URL）'; -$lang['savedir'] = '保存数据的目录'; $lang['cookiedir'] = 'Cookie 路径。留空以使用 baseurl。'; -$lang['start'] = '开始页面的名称'; -$lang['title'] = '维基站点的标题'; -$lang['template'] = '模版'; -$lang['license'] = '您愿意让你贡献的内容在何种许可方式下发布？'; -$lang['fullpath'] = '在页面底部显示完整路径'; +$lang['dmode'] = '文件夹的创建模式'; +$lang['fmode'] = '文件的创建模式'; +$lang['allowdebug'] = '允许调试 <b>如果您不需要调试，请勿勾选！</b>'; $lang['recent'] = '最近更新'; +$lang['recent_days'] = '保留多少天的最近更改（天）'; $lang['breadcrumbs'] = '显示“足迹”的数量'; $lang['youarehere'] = '显示“您在这里”'; +$lang['fullpath'] = '在页面底部显示完整路径'; $lang['typography'] = '进行字符替换'; -$lang['htmlok'] = '允许嵌入式 HTML'; -$lang['phpok'] = '允许嵌入式 PHP'; $lang['dformat'] = '日期格式（参见 PHP 的 <a href="http://www.php.net/strftime">strftime</a> 功能）'; $lang['signature'] = '签名样式'; +$lang['showuseras'] = '显示用户为'; $lang['toptoclevel'] = '目录的最顶层'; $lang['tocminheads'] = '头条数目的最小数目，这将用于决定是否创建目录列表（TOC）'; $lang['maxtoclevel'] = '目录的最多层次'; @@ -72,15 +77,8 @@ $lang['maxseclevel'] = '段落编辑的最多层次'; $lang['camelcase'] = '对链接使用 CamelCase'; $lang['deaccent'] = '清理页面名称'; $lang['useheading'] = '使用“标题 H1”作为页面名称'; -$lang['refcheck'] = '检查媒体与页面的挂钩情况'; -$lang['refshow'] = '显示媒体与页面挂钩情况的数量'; -$lang['allowdebug'] = '允许调试 <b>如果您不需要调试，请勿勾选！</b>'; -$lang['usewordblock'] = '根据 wordlist 阻止垃圾评论'; -$lang['indexdelay'] = '构建索引前的时间延滞（秒）'; -$lang['relnofollow'] = '对外部链接使用 rel="nofollow" 标签'; -$lang['mailguard'] = '弄乱邮件地址（保护用户的邮件地址）'; -$lang['iexssprotect'] = '检验上传的文件以避免可能存在的恶意 JavaScript 或 HTML 代码'; -$lang['showuseras'] = '显示用户为'; +$lang['sneaky_index'] = '默认情况下，DokuWiki 在索引页会显示所有 namespace。启用该选项能隐藏那些用户没有权限阅读的页面。但也可能将用户能够阅读的子页面一并隐藏。这有可能导致在特定 ACL 设置下，索引功能不可用。'; +$lang['hidepages'] = '隐藏匹配的界面（正则表达式）'; $lang['useacl'] = '使用访问控制列表（ACL）'; $lang['autopasswd'] = '自动生成密码'; $lang['authtype'] = '认证后台管理方式'; @@ -89,59 +87,71 @@ $lang['defaultgroup'] = '默认组'; $lang['superuser'] = '超级用户 - 不论 ACL 如何设置，都能访问所有页面与功能的用户组/用户'; $lang['manager'] = '管理员 - 能访问相应管理功能的用户组/用户'; $lang['profileconfirm'] = '更新个人信息时需要输入当前密码'; +$lang['rememberme'] = '允许在本地机长期保留登录cookies信息（记住我）'; $lang['disableactions'] = '停用 DokuWiki 功能'; $lang['disableactions_check'] = '检查'; $lang['disableactions_subscription'] = '订阅/退订'; $lang['disableactions_wikicode'] = '查看源文件/导出源文件'; $lang['disableactions_other'] = '其他功能（用英文逗号分隔）'; -$lang['sneaky_index'] = '默认情况下，DokuWiki 在索引页会显示所有 namespace。启用该选项能隐藏那些用户没有权限阅读的页面。但也可能将用户能够阅读的子页面一并隐藏。这有可能导致在特定 ACL 设置下，索引功能不可用。'; $lang['auth_security_timeout'] = '认证安全超时（秒）'; $lang['securecookie'] = '要让浏览器须以HTTPS方式传送在HTTPS会话中设置的cookies吗？请只在登录过程为SSL加密而浏览维基为明文的情况下打开此选项。'; +$lang['remote'] = '激活远程 API 系统。这允许其他程序通过 XML-RPC 或其他机制来访问维基。'; +$lang['remoteuser'] = '将远程 API 的访问权限限制在指定的组或用户中，以逗号分隔。留空则允许任何人访问。'; +$lang['usewordblock'] = '根据 wordlist 阻止垃圾评论'; +$lang['relnofollow'] = '对外部链接使用 rel="nofollow" 标签'; +$lang['indexdelay'] = '构建索引前的时间延滞（秒）'; +$lang['mailguard'] = '弄乱邮件地址（保护用户的邮件地址）'; +$lang['iexssprotect'] = '检验上传的文件以避免可能存在的恶意 JavaScript 或 HTML 代码'; +$lang['usedraft'] = '编辑时自动保存一份草稿'; +$lang['htmlok'] = '允许嵌入式 HTML'; +$lang['phpok'] = '允许嵌入式 PHP'; +$lang['locktime'] = '独有编辑权/文件锁定的最长时间（秒）'; +$lang['cachetime'] = '缓存的最长时间（秒）'; +$lang['target____wiki'] = '内部链接的目标窗口'; +$lang['target____interwiki'] = 'Interwiki 链接的目标窗口'; +$lang['target____extern'] = '外部链接的目标窗口'; +$lang['target____media'] = '媒体文件链接的目标窗口'; +$lang['target____windows'] = 'Windows 链接的目标窗口'; +$lang['mediarevisions'] = '激活媒体修订历史？'; +$lang['refcheck'] = '检查媒体与页面的挂钩情况'; +$lang['refshow'] = '显示媒体与页面挂钩情况的数量'; +$lang['gdlib'] = 'GD 库版本'; +$lang['im_convert'] = 'ImageMagick 转换工具的路径'; +$lang['jpg_quality'] = 'JPG 压缩质量（0-100）'; +$lang['fetchsize'] = 'fetch.php 能从外部下载的最大文件大小（字节）'; +$lang['subscribers'] = '启用页面订阅支持'; +$lang['subscribe_time'] = '订阅列表和摘要发送的时间间隔（秒）；这应当小于指定的最近更改保留时间（recent_days）。 +'; +$lang['notify'] = '发送更改通知给这个邮件地址'; +$lang['registernotify'] = '发送新注册用户的信息给这个邮件地址'; +$lang['mailfrom'] = '自动发送邮件时使用的邮件地址'; +$lang['mailprefix'] = '自动发送邮件时使用的邮件地址前缀'; +$lang['htmlmail'] = '发送更加美观，但体积更大的 HTML 多部分邮件。禁用则发送纯文本邮件。'; +$lang['sitemap'] = '生成 Google sitemap（天）'; +$lang['rss_type'] = 'XML feed 类型'; +$lang['rss_linkto'] = 'XML feed 链接到'; +$lang['rss_content'] = 'XML feed 项目中显示什么呢？'; +$lang['rss_update'] = 'XML feed 升级间隔（秒）'; +$lang['rss_show_summary'] = 'XML feed 在标题中显示摘要'; +$lang['rss_media'] = '在 XML 源中应该列出何种类型的更改？'; $lang['updatecheck'] = '自动检查更新并接收安全警告吗？开启该功能后 DokuWiki 将自动访问 splitbrain.org。'; $lang['userewrite'] = '使用更整洁的 URL'; $lang['useslash'] = '在 URL 中使用斜杠作为命名空间的分隔符'; -$lang['usedraft'] = '编辑时自动保存一份草稿'; $lang['sepchar'] = '页面名称中的单词分隔符'; $lang['canonical'] = '使用完全标准的 URL'; $lang['fnencode'] = '非 ASCII 文件名的编码方法。'; $lang['autoplural'] = '在链接中检查多种格式'; $lang['compression'] = 'attic 文件的压缩方式'; -$lang['cachetime'] = '缓存的最长时间（秒）'; -$lang['locktime'] = '独有编辑权/文件锁定的最长时间（秒）'; -$lang['fetchsize'] = 'fetch.php 能从外部下载的最大文件大小（字节）'; -$lang['notify'] = '发送更改通知给这个邮件地址'; -$lang['registernotify'] = '发送新注册用户的信息给这个邮件地址'; -$lang['mailfrom'] = '自动发送邮件时使用的邮件地址'; -$lang['mailprefix'] = '自动发送邮件时使用的邮件地址前缀'; $lang['gzip_output'] = '对 xhtml 使用 gzip 内容编码'; -$lang['gdlib'] = 'GD 库版本'; -$lang['im_convert'] = 'ImageMagick 转换工具的路径'; -$lang['jpg_quality'] = 'JPG 压缩质量（0-100）'; -$lang['subscribers'] = '启用页面订阅支持'; -$lang['subscribe_time'] = '订阅列表和摘要发送的时间间隔（秒）；这应当小于指定的最近更改保留时间（recent_days）。 -'; $lang['compress'] = '使 CSS 和 javascript 的输出更紧密'; $lang['cssdatauri'] = '字节数。CSS 文件引用的图片若小于该字节，则被直接嵌入样式表中来减少 HTTP 请求头的开销。这个技术在 IE 中不起作用。<code>400</code> 到 <code>600</code> 字节是不错的值。设置为 <code>0</code> 则禁用。'; -$lang['hidepages'] = '隐藏匹配的界面（正则表达式）'; $lang['send404'] = '发送 "HTTP 404/页面没有找到" 错误信息给不存在的页面'; -$lang['sitemap'] = '生成 Google sitemap（天）'; $lang['broken_iua'] = 'ignore_user_abort 功能失效了？这有可能导致搜索索引不可用。IIS+PHP/CGI 已损坏。请参阅 <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a> 获取更多信息。'; $lang['xsendfile'] = '使用 X-Sendfile 头让服务器发送状态文件？您的服务器需要支持该功能。'; $lang['renderer_xhtml'] = '主维基页面 (xhtml) 输出使用的渲染'; $lang['renderer__core'] = '%s（DokuWiki 内核）'; $lang['renderer__plugin'] = '%s（插件）'; -$lang['rememberme'] = '允许在本地机长期保留登录cookies信息（记住我）'; -$lang['rss_type'] = 'XML feed 类型'; -$lang['rss_linkto'] = 'XML feed 链接到'; -$lang['rss_content'] = 'XML feed 项目中显示什么呢？'; -$lang['rss_update'] = 'XML feed 升级间隔（秒）'; -$lang['recent_days'] = '保留多少天的最近更改（天）'; -$lang['rss_show_summary'] = 'XML feed 在标题中显示摘要'; -$lang['target____wiki'] = '内部链接的目标窗口'; -$lang['target____interwiki'] = 'Interwiki 链接的目标窗口'; -$lang['target____extern'] = '外部链接的目标窗口'; -$lang['target____media'] = '媒体文件链接的目标窗口'; -$lang['target____windows'] = 'Windows 链接的目标窗口'; +$lang['dnslookups'] = 'Dokuwiki 将会查询用户编辑页面的远程 IP 地址的主机名。如果您的 DNS 服务器比较缓慢或者不工作，或者您不想要这个功能，请禁用此选项。'; $lang['proxy____host'] = '代理服务器的名称'; $lang['proxy____port'] = '代理服务器的端口'; $lang['proxy____user'] = '代理服务器的用户名'; -- cgit v1.2.3 From 9cf8b6e0e4b94473739d2b36a906a848b9410f7f Mon Sep 17 00:00:00 2001 From: Aoi Karasu <aoikarasu@gmail.com> Date: Tue, 12 Jun 2012 20:12:02 +0200 Subject: Polish langauge update --- lib/plugins/acl/lang/pl/lang.php | 1 + lib/plugins/config/lang/pl/lang.php | 106 +++++++++++++++++-------------- lib/plugins/plugin/lang/pl/lang.php | 1 + lib/plugins/popularity/lang/pl/lang.php | 1 + lib/plugins/revert/lang/pl/lang.php | 1 + lib/plugins/usermanager/lang/pl/lang.php | 1 + 6 files changed, 62 insertions(+), 49 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php index 1b10b5232..bef2d2615 100644 --- a/lib/plugins/acl/lang/pl/lang.php +++ b/lib/plugins/acl/lang/pl/lang.php @@ -13,6 +13,7 @@ * @author Grzegorz Widła <dzesdzes@gmail.com> * @author Łukasz Chmaj <teachmeter@gmail.com> * @author Begina Felicysym <begina.felicysym@wp.eu> + * @author Aoi Karasu <aoikarasu@gmail.com> */ $lang['admin_acl'] = 'Zarządzanie uprawnieniami'; $lang['acl_group'] = 'Grupa'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 7ebe5ba92..8441722cd 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -14,6 +14,7 @@ * @author Grzegorz Widła <dzesdzes@gmail.com> * @author Łukasz Chmaj <teachmeter@gmail.com> * @author Begina Felicysym <begina.felicysym@wp.eu> + * @author Aoi Karasu <aoikarasu@gmail.com> */ $lang['menu'] = 'Ustawienia'; $lang['error'] = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu. <br/> Niepoprawne wartości są wyróżnione kolorem czerwonym.'; @@ -35,6 +36,8 @@ $lang['_anti_spam'] = 'Spam'; $lang['_editing'] = 'Edycja'; $lang['_links'] = 'Odnośniki'; $lang['_media'] = 'Media'; +$lang['_notifications'] = 'Ustawienia powiadomień'; +$lang['_syndication'] = 'Ustawienia RSS'; $lang['_advanced'] = 'Zaawansowane'; $lang['_network'] = 'Sieć'; $lang['_plugin_sufix'] = 'Wtyczki'; @@ -42,28 +45,29 @@ $lang['_template_sufix'] = 'Motywy'; $lang['_msg_setting_undefined'] = 'Brak danych o ustawieniu.'; $lang['_msg_setting_no_class'] = 'Brak kategorii ustawień.'; $lang['_msg_setting_no_default'] = 'Brak wartości domyślnej.'; -$lang['fmode'] = 'Tryb tworzenia pliku'; -$lang['dmode'] = 'Tryb tworzenia katalogu'; -$lang['lang'] = 'Język'; -$lang['basedir'] = 'Katalog główny'; -$lang['baseurl'] = 'Główny URL'; -$lang['savedir'] = 'Katalog z danymi'; -$lang['cookiedir'] = 'Ścieżka plików ciasteczek. Zostaw puste by użyć baseurl.'; -$lang['start'] = 'Tytuł strony początkowej'; $lang['title'] = 'Tytuł wiki'; +$lang['start'] = 'Tytuł strony początkowej'; +$lang['lang'] = 'Język'; $lang['template'] = 'Motyw'; $lang['tagline'] = 'Motto (jeśli szablon daje taką możliwość)'; $lang['sidebar'] = 'Nazwa strony paska bocznego (jeśli szablon je obsługuje), puste pole wyłącza pasek boczny'; $lang['license'] = 'Pod jaką licencją publikować treści wiki?'; -$lang['fullpath'] = 'Wyświetlanie pełnych ścieżek'; +$lang['savedir'] = 'Katalog z danymi'; +$lang['basedir'] = 'Katalog główny'; +$lang['baseurl'] = 'Główny URL'; +$lang['cookiedir'] = 'Ścieżka plików ciasteczek. Zostaw puste by użyć baseurl.'; +$lang['dmode'] = 'Tryb tworzenia katalogu'; +$lang['fmode'] = 'Tryb tworzenia pliku'; +$lang['allowdebug'] = 'Debugowanie (niebezpieczne!)'; $lang['recent'] = 'Ilość ostatnich zmian'; +$lang['recent_days'] = 'Ilość ostatnich zmian (w dniach)'; $lang['breadcrumbs'] = 'Długość śladu'; $lang['youarehere'] = 'Ślad według struktury'; +$lang['fullpath'] = 'Wyświetlanie pełnych ścieżek'; $lang['typography'] = 'Konwersja cudzysłowu, myślników itp.'; -$lang['htmlok'] = 'Wstawki HTML'; -$lang['phpok'] = 'Wstawki PHP'; $lang['dformat'] = 'Format daty'; $lang['signature'] = 'Podpis'; +$lang['showuseras'] = 'Sposób wyświetlania nazwy użytkownika, który ostatnio edytował stronę'; $lang['toptoclevel'] = 'Minimalny poziom spisu treści'; $lang['tocminheads'] = 'Minimalna liczba nagłówków niezbędna do wytworzenia spisu treści.'; $lang['maxtoclevel'] = 'Maksymalny poziom spisu treści'; @@ -71,16 +75,8 @@ $lang['maxseclevel'] = 'Maksymalny poziom podziału na sekcje edycyjne $lang['camelcase'] = 'Bikapitalizacja odnośników (CamelCase)'; $lang['deaccent'] = 'Podmieniaj znaki spoza ASCII w nazwach'; $lang['useheading'] = 'Pierwszy nagłówek jako tytuł'; -$lang['refcheck'] = 'Sprawdzanie odwołań przed usunięciem pliku'; -$lang['refshow'] = 'Ilość pokazywanych odwołań do pliku'; -$lang['allowdebug'] = 'Debugowanie (niebezpieczne!)'; -$lang['mediarevisions'] = 'Włączyć wersjonowanie multimediów?'; -$lang['usewordblock'] = 'Blokowanie spamu na podstawie słów'; -$lang['indexdelay'] = 'Okres indeksowania w sekundach'; -$lang['relnofollow'] = 'Nagłówek rel="nofollow" dla odnośników zewnętrznych'; -$lang['mailguard'] = 'Utrudnianie odczytu adresów e-mail'; -$lang['iexssprotect'] = 'Wykrywanie złośliwego kodu JavaScript i HTML w plikach'; -$lang['showuseras'] = 'Sposób wyświetlania nazwy użytkownika, który ostatnio edytował stronę'; +$lang['sneaky_index'] = 'Domyślnie, Dokuwiki pokazuje wszystkie katalogi w indeksie. Włączenie tej opcji ukryje katalogi, do których użytkownik nie ma praw. Może to spowodować ukrycie podkatalogów, do których użytkownik ma prawa. Ta opcja może spowodować błędne działanie indeksu w połączeniu z pewnymi konfiguracjami praw dostępu.'; +$lang['hidepages'] = 'Ukrywanie stron pasujących do wzorca (wyrażenie regularne)'; $lang['useacl'] = 'Kontrola uprawnień ACL'; $lang['autopasswd'] = 'Automatyczne generowanie haseł'; $lang['authtype'] = 'Typ autoryzacji'; @@ -89,58 +85,70 @@ $lang['defaultgroup'] = 'Domyślna grupa'; $lang['superuser'] = 'Administrator - grupa lub użytkownik z pełnymi uprawnieniami'; $lang['manager'] = 'Menadżer - grupa lub użytkownik z uprawnieniami do zarządzania wiki'; $lang['profileconfirm'] = 'Potwierdzanie zmiany profilu hasłem'; +$lang['rememberme'] = 'Pozwól na ciasteczka automatycznie logujące (pamiętaj mnie)'; $lang['disableactions'] = 'Wyłącz akcje DokuWiki'; $lang['disableactions_check'] = 'Sprawdzanie'; $lang['disableactions_subscription'] = 'Subskrypcje'; $lang['disableactions_wikicode'] = 'Pokazywanie źródeł'; $lang['disableactions_other'] = 'Inne akcje (oddzielone przecinkiem)'; -$lang['sneaky_index'] = 'Domyślnie, Dokuwiki pokazuje wszystkie katalogi w indeksie. Włączenie tej opcji ukryje katalogi, do których użytkownik nie ma praw. Może to spowodować ukrycie podkatalogów, do których użytkownik ma prawa. Ta opcja może spowodować błędne działanie indeksu w połączeniu z pewnymi konfiguracjami praw dostępu.'; $lang['auth_security_timeout'] = 'Czas wygaśnięcia uwierzytelnienia (w sekundach)'; $lang['securecookie'] = 'Czy ciasteczka wysłane do przeglądarki przez HTTPS powinny być przez nią odsyłane też tylko przez HTTPS? Odznacz tę opcję tylko wtedy, gdy logowanie użytkowników jest zabezpieczone SSL, ale przeglądanie stron odbywa się bez zabezpieczenia.'; +$lang['remote'] = 'Włącz API zdalnego dostępu. Pozwoli to innym aplikacjom na dostęp do wiki poprzez XML-RPC lub inne mechanizmy.'; +$lang['remoteuser'] = 'Ogranicz dostęp poprzez API zdalnego dostępu do podanych grup lub użytkowników, oddzielonych przecinkami. Pozostaw to pole puste by pozwolić na dostęp be ograniczeń.'; +$lang['usewordblock'] = 'Blokowanie spamu na podstawie słów'; +$lang['relnofollow'] = 'Nagłówek rel="nofollow" dla odnośników zewnętrznych'; +$lang['indexdelay'] = 'Okres indeksowania w sekundach'; +$lang['mailguard'] = 'Utrudnianie odczytu adresów e-mail'; +$lang['iexssprotect'] = 'Wykrywanie złośliwego kodu JavaScript i HTML w plikach'; +$lang['usedraft'] = 'Automatyczne zapisywanie szkicu podczas edycji'; +$lang['htmlok'] = 'Wstawki HTML'; +$lang['phpok'] = 'Wstawki PHP'; +$lang['locktime'] = 'Maksymalny wiek blokad w sekundach'; +$lang['cachetime'] = 'Maksymalny wiek cache w sekundach'; +$lang['target____wiki'] = 'Okno docelowe odnośników wewnętrznych'; +$lang['target____interwiki'] = 'Okno docelowe odnośników do innych wiki'; +$lang['target____extern'] = 'Okno docelowe odnośników zewnętrznych'; +$lang['target____media'] = 'Okno docelowe odnośników do plików'; +$lang['target____windows'] = 'Okno docelowe odnośników zasobów Windows'; +$lang['mediarevisions'] = 'Włączyć wersjonowanie multimediów?'; +$lang['refcheck'] = 'Sprawdzanie odwołań przed usunięciem pliku'; +$lang['refshow'] = 'Ilość pokazywanych odwołań do pliku'; +$lang['gdlib'] = 'Wersja biblioteki GDLib'; +$lang['im_convert'] = 'Ścieżka do programu imagemagick'; +$lang['jpg_quality'] = 'Jakość kompresji JPG (0-100)'; +$lang['fetchsize'] = 'Maksymalny rozmiar pliku (w bajtach) jaki można pobrać z zewnątrz'; +$lang['subscribers'] = 'Subskrypcja'; +$lang['subscribe_time'] = 'Czas po którym są wysyłane listy subskrypcji i streszczenia (sek.); Powinna być to wartość większa niż podana w zmiennej recent_days.'; +$lang['notify'] = 'Wysyłanie powiadomień na adres e-mail'; +$lang['registernotify'] = 'Prześlij informacje o nowych użytkownikach na adres e-mail'; +$lang['mailfrom'] = 'Adres e-mail tego wiki'; +$lang['mailprefix'] = 'Prefiks tematu e-mail do automatycznych wiadomości'; +$lang['htmlmail'] = 'Wysyłaj wiadomości e-mail w formacie HTML, które wyglądają lepiej, lecz ich rozmiar jest większy. Wyłącz wysyłanie wiadomości zawierających tekst niesformatowany.'; +$lang['sitemap'] = 'Okres generowania Google Sitemap (w dniach)'; +$lang['rss_type'] = 'Typ RSS'; +$lang['rss_linkto'] = 'Odnośniki w RSS'; +$lang['rss_content'] = 'Rodzaj informacji wyświetlanych w RSS '; +$lang['rss_update'] = 'Okres aktualizacji RSS (w sekundach)'; +$lang['rss_show_summary'] = 'Podsumowanie w tytule'; +$lang['rss_media'] = 'Rodzaj zmian wyświetlanych w RSS'; $lang['updatecheck'] = 'Sprawdzanie aktualizacji i bezpieczeństwa. DokuWiki będzie kontaktować się z serwerem update.dokuwiki.org.'; $lang['userewrite'] = 'Proste adresy URL'; $lang['useslash'] = 'Używanie ukośnika jako separatora w adresie URL'; -$lang['usedraft'] = 'Automatyczne zapisywanie szkicu podczas edycji'; $lang['sepchar'] = 'Znak rozdzielający wyrazy nazw'; $lang['canonical'] = 'Kanoniczne adresy URL'; $lang['fnencode'] = 'Metoda kodowana nazw pików bez użycia ASCII.'; $lang['autoplural'] = 'Automatyczne tworzenie liczby mnogiej'; $lang['compression'] = 'Metoda kompresji dla usuniętych plików'; -$lang['cachetime'] = 'Maksymalny wiek cache w sekundach'; -$lang['locktime'] = 'Maksymalny wiek blokad w sekundach'; -$lang['fetchsize'] = 'Maksymalny rozmiar pliku (w bajtach) jaki można pobrać z zewnątrz'; -$lang['notify'] = 'Wysyłanie powiadomień na adres e-mail'; -$lang['registernotify'] = 'Prześlij informacje o nowych użytkownikach na adres e-mail'; -$lang['mailfrom'] = 'Adres e-mail tego wiki'; -$lang['mailprefix'] = 'Prefiks tematu e-mail do automatycznych wiadomości'; $lang['gzip_output'] = 'Używaj kodowania GZIP dla zawartości XHTML'; -$lang['gdlib'] = 'Wersja biblioteki GDLib'; -$lang['im_convert'] = 'Ścieżka do programu imagemagick'; -$lang['jpg_quality'] = 'Jakość kompresji JPG (0-100)'; -$lang['subscribers'] = 'Subskrypcja'; -$lang['subscribe_time'] = 'Czas po którym są wysyłane listy subskrypcji i streszczenia (sek.); Powinna być to wartość większa niż podana w zmiennej recent_days.'; $lang['compress'] = 'Kompresja arkuszy CSS i plików JavaScript'; $lang['cssdatauri'] = 'Rozmiar w bajtach, poniżej którego odwołania do obrazów w plikach CSS powinny być osadzone bezpośrednio w arkuszu stylów by zmniejszyć ogólne żądania nagłówków HTTP. Technika ta nie działa w IE 7 i poniżej! <code>400</code> do <code>600</code> bajtów jest dobrą wartością. Ustaw <code>0</code> aby wyłączyć.'; -$lang['hidepages'] = 'Ukrywanie stron pasujących do wzorca (wyrażenie regularne)'; $lang['send404'] = 'Nagłówek "HTTP 404/Page Not Found" dla nieistniejących stron'; -$lang['sitemap'] = 'Okres generowania Google Sitemap (w dniach)'; $lang['broken_iua'] = 'Czy funkcja "ignore_user_abort" działa? Jeśli nie, może to powodować problemy z indeksem przeszukiwania. Funkcja nie działa przy konfiguracji oprogramowania IIS+PHP/CGI. Szczegółowe informacje: <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a>.'; $lang['xsendfile'] = 'Użyj nagłówka HTTP X-Sendfile w celu przesyłania statycznych plików. Serwer HTTP musi obsługiwać ten nagłówek.'; $lang['renderer_xhtml'] = 'Mechanizm renderowania głównej treści strony (xhtml)'; $lang['renderer__core'] = '%s (dokuwiki)'; $lang['renderer__plugin'] = '%s (wtyczka)'; -$lang['rememberme'] = 'Pozwól na ciasteczka automatycznie logujące (pamiętaj mnie)'; -$lang['rss_type'] = 'Typ RSS'; -$lang['rss_linkto'] = 'Odnośniki w RSS'; -$lang['rss_content'] = 'Rodzaj informacji wyświetlanych w RSS '; -$lang['rss_update'] = 'Okres aktualizacji RSS (w sekundach)'; -$lang['recent_days'] = 'Ilość ostatnich zmian (w dniach)'; -$lang['rss_show_summary'] = 'Podsumowanie w tytule'; -$lang['target____wiki'] = 'Okno docelowe odnośników wewnętrznych'; -$lang['target____interwiki'] = 'Okno docelowe odnośników do innych wiki'; -$lang['target____extern'] = 'Okno docelowe odnośników zewnętrznych'; -$lang['target____media'] = 'Okno docelowe odnośników do plików'; -$lang['target____windows'] = 'Okno docelowe odnośników zasobów Windows'; +$lang['dnslookups'] = 'DokiWiki wyszuka nazwy hostów dla zdalnych adresów IP użytkowników edytujących strony. Jeśli twój serwer DNS działa zbyt wolno, uległ awarii lub nie chcesz używać wyszukiwania, wyłącz tę opcję.'; $lang['proxy____host'] = 'Proxy - serwer'; $lang['proxy____port'] = 'Proxy - port'; $lang['proxy____user'] = 'Proxy - nazwa użytkownika'; diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php index 02459f1de..1d3bbbc03 100644 --- a/lib/plugins/plugin/lang/pl/lang.php +++ b/lib/plugins/plugin/lang/pl/lang.php @@ -14,6 +14,7 @@ * @author Grzegorz Widła <dzesdzes@gmail.com> * @author Łukasz Chmaj <teachmeter@gmail.com> * @author Begina Felicysym <begina.felicysym@wp.eu> + * @author Aoi Karasu <aoikarasu@gmail.com> */ $lang['menu'] = 'Menadżer wtyczek'; $lang['download'] = 'Ściągnij i zainstaluj nową wtyczkę'; diff --git a/lib/plugins/popularity/lang/pl/lang.php b/lib/plugins/popularity/lang/pl/lang.php index 64d772d54..76a9464bd 100644 --- a/lib/plugins/popularity/lang/pl/lang.php +++ b/lib/plugins/popularity/lang/pl/lang.php @@ -12,6 +12,7 @@ * @author Grzegorz Widła <dzesdzes@gmail.com> * @author Łukasz Chmaj <teachmeter@gmail.com> * @author Begina Felicysym <begina.felicysym@wp.eu> + * @author Aoi Karasu <aoikarasu@gmail.com> */ $lang['name'] = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)'; $lang['submit'] = 'Wyślij dane'; diff --git a/lib/plugins/revert/lang/pl/lang.php b/lib/plugins/revert/lang/pl/lang.php index 30ab60fda..462841292 100644 --- a/lib/plugins/revert/lang/pl/lang.php +++ b/lib/plugins/revert/lang/pl/lang.php @@ -11,6 +11,7 @@ * @author Grzegorz Widła <dzesdzes@gmail.com> * @author Łukasz Chmaj <teachmeter@gmail.com> * @author Begina Felicysym <begina.felicysym@wp.eu> + * @author Aoi Karasu <aoikarasu@gmail.com> */ $lang['menu'] = 'Menadżer przywracania'; $lang['filter'] = 'Wyszukaj uszkodzone strony'; diff --git a/lib/plugins/usermanager/lang/pl/lang.php b/lib/plugins/usermanager/lang/pl/lang.php index 5bbf84370..cfc0ba327 100644 --- a/lib/plugins/usermanager/lang/pl/lang.php +++ b/lib/plugins/usermanager/lang/pl/lang.php @@ -12,6 +12,7 @@ * @author Grzegorz Widła <dzesdzes@gmail.com> * @author Łukasz Chmaj <teachmeter@gmail.com> * @author Begina Felicysym <begina.felicysym@wp.eu> + * @author Aoi Karasu <aoikarasu@gmail.com> */ $lang['menu'] = 'Menadżer użytkowników'; $lang['noauth'] = '(uwierzytelnienie użytkownika niemożliwe)'; -- cgit v1.2.3 From 87a99fa3f2b3acb3a82613dda4b0cb402de7efe5 Mon Sep 17 00:00:00 2001 From: Matteo Pasotti <xquiet.eu@xquiet.eu> Date: Tue, 12 Jun 2012 20:14:03 +0200 Subject: Italian language update --- lib/plugins/acl/lang/it/lang.php | 1 + lib/plugins/config/lang/it/lang.php | 104 +++++++++++++++++-------------- lib/plugins/plugin/lang/it/lang.php | 2 + lib/plugins/popularity/lang/it/lang.php | 1 + lib/plugins/revert/lang/it/lang.php | 1 + lib/plugins/usermanager/lang/it/lang.php | 1 + 6 files changed, 63 insertions(+), 47 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php index f789b979f..a55a2c0f3 100644 --- a/lib/plugins/acl/lang/it/lang.php +++ b/lib/plugins/acl/lang/it/lang.php @@ -13,6 +13,7 @@ * @author robocap <robocap1@gmail.com> * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta <jacopo.corbetta@gmail.com> + * @author Matteo Pasotti <matteo@xquiet.eu> */ $lang['admin_acl'] = 'Gestione Lista Controllo Accessi (ACL)'; $lang['acl_group'] = 'Gruppo'; diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php index 9c348dcee..91c92bd85 100644 --- a/lib/plugins/config/lang/it/lang.php +++ b/lib/plugins/config/lang/it/lang.php @@ -13,6 +13,7 @@ * @author robocap <robocap1@gmail.com> * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta <jacopo.corbetta@gmail.com> + * @author Matteo Pasotti <matteo@xquiet.eu> */ $lang['menu'] = 'Configurazione Wiki'; $lang['error'] = 'Impostazioni non aggiornate a causa di un valore non corretto, controlla le modifiche apportate e salva di nuovo. @@ -36,6 +37,7 @@ $lang['_anti_spam'] = 'Impostazioni Anti-Spam'; $lang['_editing'] = 'Impostazioni Modifica'; $lang['_links'] = 'Impostazioni Collegamenti'; $lang['_media'] = 'Impostazioni File'; +$lang['_notifications'] = 'Impostazioni di notifica'; $lang['_advanced'] = 'Impostazioni Avanzate'; $lang['_network'] = 'Impostazioni Rete'; $lang['_plugin_sufix'] = 'Impostazioni Plugin'; @@ -43,25 +45,28 @@ $lang['_template_sufix'] = 'Impostazioni Modello'; $lang['_msg_setting_undefined'] = 'Nessun metadato definito.'; $lang['_msg_setting_no_class'] = 'Nessuna classe definita.'; $lang['_msg_setting_no_default'] = 'Nessun valore predefinito.'; -$lang['fmode'] = 'Permessi per i nuovi file'; -$lang['dmode'] = 'Permessi per le nuove directory'; -$lang['lang'] = 'Lingua'; -$lang['basedir'] = 'Directory di base'; -$lang['baseurl'] = 'URL di base'; -$lang['savedir'] = 'Directory per il salvataggio dei dati'; -$lang['start'] = 'Nome della pagina iniziale'; $lang['title'] = 'Titolo del wiki'; +$lang['start'] = 'Nome della pagina iniziale'; +$lang['lang'] = 'Lingua'; $lang['template'] = 'Modello'; +$lang['sidebar'] = 'Nome pagina in barra laterale (se il template lo supporta), il campo vuoto disabilita la barra laterale'; $lang['license'] = 'Sotto quale licenza vorresti rilasciare il tuo contenuto?'; -$lang['fullpath'] = 'Mostra il percorso completo delle pagine'; +$lang['savedir'] = 'Directory per il salvataggio dei dati'; +$lang['basedir'] = 'Directory di base'; +$lang['baseurl'] = 'URL di base'; +$lang['cookiedir'] = 'Percorso cookie. Lascia in bianco per usare baseurl.'; +$lang['dmode'] = 'Permessi per le nuove directory'; +$lang['fmode'] = 'Permessi per i nuovi file'; +$lang['allowdebug'] = 'Abilita il debug <b>(disabilitare se non serve!)</b>'; $lang['recent'] = 'Ultime modifiche'; +$lang['recent_days'] = 'Quante modifiche recenti tenere (giorni)'; $lang['breadcrumbs'] = 'Numero di breadcrumb'; $lang['youarehere'] = 'Breadcrumb gerarchici'; +$lang['fullpath'] = 'Mostra il percorso completo delle pagine'; $lang['typography'] = 'Abilita la sostituzione tipografica'; -$lang['htmlok'] = 'Consenti HTML incorporato'; -$lang['phpok'] = 'Consenti PHP incorporato'; $lang['dformat'] = 'Formato delle date (vedi la funzione <a href="http://www.php.net/strftime">strftime</a> di PHP)'; $lang['signature'] = 'Firma'; +$lang['showuseras'] = 'Cosa visualizzare quando si mostra l\'ultimo utente che ha modificato una pagina'; $lang['toptoclevel'] = 'Livello superiore per l\'indice'; $lang['tocminheads'] = 'Ammontare minimo di intestazioni che determinano la creazione del TOC'; $lang['maxtoclevel'] = 'Numero massimo di livelli per l\'indice'; @@ -69,15 +74,8 @@ $lang['maxseclevel'] = 'Livello massimo per le sezioni modificabili'; $lang['camelcase'] = 'Usa CamelCase per i collegamenti'; $lang['deaccent'] = 'Pulizia dei nomi di pagina'; $lang['useheading'] = 'Usa la prima intestazione come nome di pagina'; -$lang['refcheck'] = 'Controlla i riferimenti ai file'; -$lang['refshow'] = 'Numero di riferimenti da visualizzare'; -$lang['allowdebug'] = 'Abilita il debug <b>(disabilitare se non serve!)</b>'; -$lang['usewordblock'] = 'Blocca lo spam in base alla blacklist'; -$lang['indexdelay'] = 'Intervallo di tempo prima dell\'indicizzazione'; -$lang['relnofollow'] = 'Usa rel="nofollow" nei collegamenti esterni'; -$lang['mailguard'] = 'Oscuramento indirizzi email'; -$lang['iexssprotect'] = 'Controlla i file caricati in cerca di possibile codice JavaScript o HTML maligno.'; -$lang['showuseras'] = 'Cosa visualizzare quando si mostra l\'ultimo utente che ha modificato una pagina'; +$lang['sneaky_index'] = 'Normalmente, DokuWiki mostra tutte le categorie nella vista indice. Abilitando questa opzione, saranno nascoste quelle per cui l\'utente non ha il permesso in lettura. Questo potrebbe far sì che alcune sottocategorie accessibili siano nascoste. La pagina indice potrebbe quindi diventare inutilizzabile con alcune configurazioni dell\'ACL.'; +$lang['hidepages'] = 'Nascondi le pagine che soddisfano la condizione (inserire un\'espressione regolare)'; $lang['useacl'] = 'Usa lista di controllo accessi (ACL)'; $lang['autopasswd'] = 'Genera password in automatico'; $lang['authtype'] = 'Sistema di autenticazione'; @@ -86,57 +84,69 @@ $lang['defaultgroup'] = 'Gruppo predefinito'; $lang['superuser'] = 'Amministratore - gruppo, utente o elenco di utenti separati da virgole (user1,@group1,user2) con accesso completo a tutte le pagine e le funzioni che riguardano le impostazioni ACL'; $lang['manager'] = 'Gestore - gruppo, utente o elenco di utenti separati da virgole (user1,@group1,user2) con accesso a determinate funzioni di gestione'; $lang['profileconfirm'] = 'Richiedi la password per modifiche al profilo'; +$lang['rememberme'] = 'Permetti i cookies di accesso permanenti (ricordami)'; $lang['disableactions'] = 'Disabilita azioni DokuWiki'; $lang['disableactions_check'] = 'Controlla'; $lang['disableactions_subscription'] = 'Sottoscrivi/Rimuovi sottoscrizione'; $lang['disableactions_wikicode'] = 'Mostra sorgente/Esporta Raw'; $lang['disableactions_other'] = 'Altre azioni (separate da virgola)'; -$lang['sneaky_index'] = 'Normalmente, DokuWiki mostra tutte le categorie nella vista indice. Abilitando questa opzione, saranno nascoste quelle per cui l\'utente non ha il permesso in lettura. Questo potrebbe far sì che alcune sottocategorie accessibili siano nascoste. La pagina indice potrebbe quindi diventare inutilizzabile con alcune configurazioni dell\'ACL.'; $lang['auth_security_timeout'] = 'Tempo di sicurezza per l\'autenticazione (secondi)'; $lang['securecookie'] = 'Devono i cookies impostati tramite HTTPS essere inviati al browser solo tramite HTTPS? Disattiva questa opzione solo quando l\'accesso al tuo wiki viene effettuato con il protocollo SSL ma la navigazione del wiki non risulta sicura.'; +$lang['remote'] = 'Abilita il sistema di API remoto. Questo permette ad altre applicazioni di accedere al wiki tramite XML-RPC o altri meccanismi.'; +$lang['remoteuser'] = 'Restringi l\'accesso dell\'aPI remota ai gruppi o utenti qui specificati separati da virgola. Lascia vuoto per dare accesso a chiunque.'; +$lang['usewordblock'] = 'Blocca lo spam in base alla blacklist'; +$lang['relnofollow'] = 'Usa rel="nofollow" nei collegamenti esterni'; +$lang['indexdelay'] = 'Intervallo di tempo prima dell\'indicizzazione'; +$lang['mailguard'] = 'Oscuramento indirizzi email'; +$lang['iexssprotect'] = 'Controlla i file caricati in cerca di possibile codice JavaScript o HTML maligno.'; +$lang['usedraft'] = 'Salva una bozza in automatico in fase di modifica'; +$lang['htmlok'] = 'Consenti HTML incorporato'; +$lang['phpok'] = 'Consenti PHP incorporato'; +$lang['locktime'] = 'Durata dei file di lock (sec)'; +$lang['cachetime'] = 'Durata della cache (sec)'; +$lang['target____wiki'] = 'Finestra di destinazione per i collegamenti interni'; +$lang['target____interwiki'] = 'Finestra di destinazione per i collegamenti interwiki'; +$lang['target____extern'] = 'Finestra di destinazione per i collegamenti esterni'; +$lang['target____media'] = 'Finestra di destinazione per i collegamenti ai file'; +$lang['target____windows'] = 'Finestra di destinazione per i collegamenti alle risorse condivise'; +$lang['mediarevisions'] = 'Abilita Mediarevisions?'; +$lang['refcheck'] = 'Controlla i riferimenti ai file'; +$lang['refshow'] = 'Numero di riferimenti da visualizzare'; +$lang['gdlib'] = 'Versione GD Lib '; +$lang['im_convert'] = 'Percorso per il convertitore di ImageMagick'; +$lang['jpg_quality'] = 'Qualità di compressione JPG (0-100)'; +$lang['fetchsize'] = 'Dimensione massima (bytes) scaricabile da fetch.php da extern'; +$lang['subscribers'] = 'Abilita la sottoscrizione alle pagine'; +$lang['subscribe_time'] = 'Tempo dopo il quale le liste di sottoscrizione e i riassunti vengono inviati (sec); Dovrebbe essere inferiore al tempo specificato in recent_days.'; +$lang['notify'] = 'Invia notifiche sulle modifiche a questo indirizzo'; +$lang['registernotify'] = 'Invia informazioni sui nuovi utenti registrati a questo indirizzo email'; +$lang['mailfrom'] = 'Mittente per le mail automatiche'; +$lang['mailprefix'] = 'Prefisso da inserire nell\'oggetto delle mail automatiche'; +$lang['htmlmail'] = 'Invia email HTML multipart più gradevoli ma più ingombranti in dimensione. Disabilita per mail in puro testo.'; +$lang['sitemap'] = 'Genera una sitemap Google (giorni)'; +$lang['rss_type'] = 'Tipo di feed XML'; +$lang['rss_linkto'] = 'Collega i feed XML a'; +$lang['rss_content'] = 'Cosa mostrare negli elementi dei feed XML?'; +$lang['rss_update'] = 'Intervallo di aggiornamento dei feed XML (sec)'; +$lang['rss_show_summary'] = 'I feed XML riportano un sommario nel titolo'; +$lang['rss_media'] = 'Quale tipo di cambiamento dovrebbe essere elencato nel feed XML?'; $lang['updatecheck'] = 'Controllare aggiornamenti e avvisi di sicurezza? DokuWiki deve contattare update.dokuwiki.org per questa funzione.'; $lang['userewrite'] = 'Usa il rewrite delle URL'; $lang['useslash'] = 'Usa la barra rovescia (slash) come separatore nelle URL'; -$lang['usedraft'] = 'Salva una bozza in automatico in fase di modifica'; $lang['sepchar'] = 'Separatore di parole nei nomi di pagina'; $lang['canonical'] = 'Usa URL canoniche'; $lang['fnencode'] = 'Metodo per codificare i filenames non-ASCII.'; $lang['autoplural'] = 'Controlla il plurale nei collegamenti'; $lang['compression'] = 'Usa la compressione per i file dell\'archivio'; -$lang['cachetime'] = 'Durata della cache (sec)'; -$lang['locktime'] = 'Durata dei file di lock (sec)'; -$lang['fetchsize'] = 'Dimensione massima (bytes) scaricabile da fetch.php da extern'; -$lang['notify'] = 'Invia notifiche sulle modifiche a questo indirizzo'; -$lang['registernotify'] = 'Invia informazioni sui nuovi utenti registrati a questo indirizzo email'; -$lang['mailfrom'] = 'Mittente per le mail automatiche'; -$lang['mailprefix'] = 'Prefisso da inserire nell\'oggetto delle mail automatiche'; $lang['gzip_output'] = 'Usa il Content-Encoding gzip per xhtml'; -$lang['gdlib'] = 'Versione GD Lib '; -$lang['im_convert'] = 'Percorso per il convertitore di ImageMagick'; -$lang['jpg_quality'] = 'Qualità di compressione JPG (0-100)'; -$lang['subscribers'] = 'Abilita la sottoscrizione alle pagine'; -$lang['subscribe_time'] = 'Tempo dopo il quale le liste di sottoscrizione e i riassunti vengono inviati (sec); Dovrebbe essere inferiore al tempo specificato in recent_days.'; $lang['compress'] = 'Comprimi i file CSS e javascript'; -$lang['hidepages'] = 'Nascondi le pagine che soddisfano la condizione (inserire un\'espressione regolare)'; $lang['send404'] = 'Invia "HTTP 404/Pagina non trovata" per le pagine inesistenti'; -$lang['sitemap'] = 'Genera una sitemap Google (giorni)'; $lang['broken_iua'] = 'La funzione ignore_user_abort non funziona sul tuo sistema? Questo potrebbe far sì che l\'indice di ricerca sia inutilizzabile. È noto che nella configurazione IIS+PHP/CGI non funziona. Vedi il<a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a> per maggiori informazioni.'; $lang['xsendfile'] = 'Usare l\'header X-Sendfile per permettere al webserver di fornire file statici? Questa funzione deve essere supportata dal tuo webserver.'; $lang['renderer_xhtml'] = 'Renderer da usare per la visualizzazione del wiki (xhtml)'; $lang['renderer__core'] = '%s (dokuwiki)'; $lang['renderer__plugin'] = '%s (plugin)'; -$lang['rememberme'] = 'Permetti i cookies di accesso permanenti (ricordami)'; -$lang['rss_type'] = 'Tipo di feed XML'; -$lang['rss_linkto'] = 'Collega i feed XML a'; -$lang['rss_content'] = 'Cosa mostrare negli elementi dei feed XML?'; -$lang['rss_update'] = 'Intervallo di aggiornamento dei feed XML (sec)'; -$lang['recent_days'] = 'Quante modifiche recenti tenere (giorni)'; -$lang['rss_show_summary'] = 'I feed XML riportano un sommario nel titolo'; -$lang['target____wiki'] = 'Finestra di destinazione per i collegamenti interni'; -$lang['target____interwiki'] = 'Finestra di destinazione per i collegamenti interwiki'; -$lang['target____extern'] = 'Finestra di destinazione per i collegamenti esterni'; -$lang['target____media'] = 'Finestra di destinazione per i collegamenti ai file'; -$lang['target____windows'] = 'Finestra di destinazione per i collegamenti alle risorse condivise'; +$lang['dnslookups'] = 'Dokuwiki farà il lookup dei nomi host per ricavare l\'indirizzo IP remoto degli utenti che modificano le pagine. Se hai un DNS lento o non funzionante o se non vuoi questa funzione, disabilita l\'opzione'; $lang['proxy____host'] = 'Nome server proxy'; $lang['proxy____port'] = 'Porta proxy'; $lang['proxy____user'] = 'Nome utente proxy'; diff --git a/lib/plugins/plugin/lang/it/lang.php b/lib/plugins/plugin/lang/it/lang.php index e675c5530..3994948a0 100644 --- a/lib/plugins/plugin/lang/it/lang.php +++ b/lib/plugins/plugin/lang/it/lang.php @@ -13,6 +13,7 @@ * @author robocap <robocap1@gmail.com> * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta <jacopo.corbetta@gmail.com> + * @author Matteo Pasotti <matteo@xquiet.eu> */ $lang['menu'] = 'Gestione Plugin'; $lang['download'] = 'Scarica e installa un nuovo plugin'; @@ -58,3 +59,4 @@ $lang['enabled'] = 'Plugin %s abilitato.'; $lang['notenabled'] = 'Impossibile abilitare il plugin %s, verifica i permessi dei file.'; $lang['disabled'] = 'Plugin %s disabilitato.'; $lang['notdisabled'] = 'Impossibile disabilitare il plugin %s, verifica i permessi dei file.'; +$lang['packageinstalled'] = 'Pacchetto plugin (%d plugin(s): %s) installato con successo.'; diff --git a/lib/plugins/popularity/lang/it/lang.php b/lib/plugins/popularity/lang/it/lang.php index a7852f22c..9bf4ca8c6 100644 --- a/lib/plugins/popularity/lang/it/lang.php +++ b/lib/plugins/popularity/lang/it/lang.php @@ -9,6 +9,7 @@ * @author robocap <robocap1@gmail.com> * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta <jacopo.corbetta@gmail.com> + * @author Matteo Pasotti <matteo@xquiet.eu> */ $lang['name'] = 'Raccolta dati sul wiki (può impiegare del tempo per caricarsi)'; $lang['submit'] = 'Invia dati'; diff --git a/lib/plugins/revert/lang/it/lang.php b/lib/plugins/revert/lang/it/lang.php index 79565655b..a0b676d77 100644 --- a/lib/plugins/revert/lang/it/lang.php +++ b/lib/plugins/revert/lang/it/lang.php @@ -10,6 +10,7 @@ * @author robocap <robocap1@gmail.com> * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta <jacopo.corbetta@gmail.com> + * @author Matteo Pasotti <matteo@xquiet.eu> */ $lang['menu'] = 'Gestore di ripristini'; $lang['filter'] = 'Cerca pagine con spam'; diff --git a/lib/plugins/usermanager/lang/it/lang.php b/lib/plugins/usermanager/lang/it/lang.php index 34c510def..1e948baab 100644 --- a/lib/plugins/usermanager/lang/it/lang.php +++ b/lib/plugins/usermanager/lang/it/lang.php @@ -12,6 +12,7 @@ * @author robocap <robocap1@gmail.com> * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta <jacopo.corbetta@gmail.com> + * @author Matteo Pasotti <matteo@xquiet.eu> */ $lang['menu'] = 'Gestione Utenti'; $lang['noauth'] = '(autenticazione non disponibile)'; -- cgit v1.2.3 From b2a83e66e70296a7a38e7524050a7a4268cc36f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= <aranet100@gmail.com> Date: Wed, 13 Jun 2012 22:11:54 +0200 Subject: Korean language update --- lib/plugins/acl/lang/ko/help.txt | 10 +- lib/plugins/acl/lang/ko/lang.php | 33 ++--- lib/plugins/config/lang/ko/intro.txt | 7 +- lib/plugins/config/lang/ko/lang.php | 201 ++++++++++++++------------- lib/plugins/plugin/lang/ko/admin_plugin.txt | 2 +- lib/plugins/plugin/lang/ko/lang.php | 49 +++---- lib/plugins/popularity/lang/ko/intro.txt | 6 +- lib/plugins/popularity/lang/ko/lang.php | 1 + lib/plugins/popularity/lang/ko/submitted.txt | 2 +- lib/plugins/revert/lang/ko/intro.txt | 2 +- lib/plugins/revert/lang/ko/lang.php | 13 +- lib/plugins/usermanager/lang/ko/lang.php | 35 ++--- 12 files changed, 183 insertions(+), 178 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt index 516198ee5..d022a0913 100644 --- a/lib/plugins/acl/lang/ko/help.txt +++ b/lib/plugins/acl/lang/ko/help.txt @@ -1,11 +1,11 @@ === 도움말: === -현재 페이지에서 위키 네임스페이스와 페이지에 대한 접근 권한을 추가하거나 삭제할 수 있습니다. +현재 문서에서 위키 이름공간과 문서에 대한 접근 권한을 추가하거나 삭제할 수 있습니다. -왼쪽 영역을 선택가능한 네임스페이스들과 페이지 목록을 보여줍니다. +왼쪽 영역에는 선택 가능한 이름공간과 문서 목록을 보여줍니다. -위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 변경할 수 있습니다. +위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다. -아래 테이블에서 현재 설정된 모든 접근 제어 규칙들을 볼 수 있으며, 즉시 여러 규칙들을 삭제하거나 변경할 수 있습니다. +아래 테이블에서 현재 설정된 모든 접근 제어 규칙들을 볼 수 있으며, 즉시 여러 규칙들을 삭제하거나 바꿀 수 있습니다. -DokuWiki에서 접근 제어가 어떻게 동작되는지 알려면 [[doku>acl|official documentation on ACL]] 읽기 바랍니다. \ No newline at end of file +DokuWiki에서 접근 제어가 어떻게 동작되는지 알려면 [[doku>acl|ACL 공식 문서]]를 읽어보기 바랍니다. \ No newline at end of file diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php index 6b1e77cf8..5465461fa 100644 --- a/lib/plugins/acl/lang/ko/lang.php +++ b/lib/plugins/acl/lang/ko/lang.php @@ -12,32 +12,33 @@ * @author SONG Younghwan <purluno@gmail.com> * @author Seung-Chul Yoo <dryoo@live.com> * @author erial2@gmail.com + * @author Myeongjin <aranet100@gmail.com> */ $lang['admin_acl'] = '접근 제어 목록 관리'; $lang['acl_group'] = '그룹'; $lang['acl_user'] = '사용자'; $lang['acl_perms'] = '권한'; -$lang['page'] = '페이지'; -$lang['namespace'] = '네임스페이스'; +$lang['page'] = '문서'; +$lang['namespace'] = '이름공간'; $lang['btn_select'] = '선택'; -$lang['p_user_id'] = '사용자 <b class="acluser">%s</b>는 현재 <b class="aclpage">%s</b>: <i>%s</i> 페이지 접근이 가능합니다.'; -$lang['p_user_ns'] = '사용자 <b class="acluser">%s</b>는 현재 <b class="aclns">%s</b>: <i>%s</i> 네임스페이스 접근이 가능합니다.'; -$lang['p_group_id'] = '그룹 <b class="aclgroup">%s</b> 사용자는 현재 <b class="aclpage">%s</b>: <i>%s</i> 페이지 접근이 가능합니다.'; -$lang['p_group_ns'] = '그룹 <b class="aclgroup">%s</b> 사용자는 현재 <b class="aclns">%s</b>: <i>%s</i> 네임스페이스 접근이 가능합니다.'; -$lang['p_choose_id'] = '<b class="aclpage">%s</b> 페이지 접근 권한을 보거나 변경하려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.'; -$lang['p_choose_ns'] = '<b class="aclns">%s</b> 네임스페이스 접근 권한을 보거나 변경하려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.'; -$lang['p_inherited'] = '주의: 권한이 명시적으로 설정되지 않았으므로 다른 그룹들이나 상위 네임스페이스로 부터 가져왔습니다.'; -$lang['p_isadmin'] = '주의: 슈퍼유저로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.'; -$lang['p_include'] = '더 높은 접근권한은 하위를 포함합니다. 페이지가 아닌 네임스페이스에는 생성, 업로드, 삭제 권한만 적용됩니다.'; -$lang['current'] = '현 ACL 규칙'; -$lang['where'] = '페이지/네임스페이스'; +$lang['p_user_id'] = '<b class="acluser">%s</b> 사용자는 현재 <b class="aclpage">%s</b>: <i>%s</i> 문서 접근이 가능합니다.'; +$lang['p_user_ns'] = '<b class="acluser">%s</b> 사용자는 현재 <b class="aclns">%s</b>: <i>%s</i> 이름공간 접근이 가능합니다.'; +$lang['p_group_id'] = '<b class="aclgroup">%s</b> 그룹 구성원은 현재 <b class="aclpage">%s</b>: <i>%s</i> 문서 접근이 가능합니다.'; +$lang['p_group_ns'] = '<b class="aclgroup">%s</b> 그룹 구성원은 현재 <b class="aclns">%s</b>: <i>%s</i> 이름공간 접근이 가능합니다.'; +$lang['p_choose_id'] = '<b class="aclpage">%s</b> 문서 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.'; +$lang['p_choose_ns'] = '<b class="aclns">%s</b> 이름공간 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.'; +$lang['p_inherited'] = '참고: 권한이 명시적으로 설정되지 않았으므로 다른 그룹들이나 상위 이름공간으로부터 가져왔습니다.'; +$lang['p_isadmin'] = '참고: 슈퍼유저로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.'; +$lang['p_include'] = '더 높은 접근 권한은 하위를 포함합니다. 문서가 아닌 이름공간에는 만들기, 올리기, 삭제 권한만 적용됩니다.'; +$lang['current'] = '현재 ACL 규칙'; +$lang['where'] = '문서/이름공간'; $lang['who'] = '사용자/그룹'; $lang['perm'] = '접근 권한'; $lang['acl_perm0'] = '없음'; $lang['acl_perm1'] = '읽기'; -$lang['acl_perm2'] = '수정'; -$lang['acl_perm4'] = '생성'; -$lang['acl_perm8'] = '업로드'; +$lang['acl_perm2'] = '편집'; +$lang['acl_perm4'] = '만들기'; +$lang['acl_perm8'] = '올리기'; $lang['acl_perm16'] = '삭제'; $lang['acl_new'] = '새 항목 추가'; $lang['acl_mod'] = '선택 항목 변경'; diff --git a/lib/plugins/config/lang/ko/intro.txt b/lib/plugins/config/lang/ko/intro.txt index 22dd96ef6..895a8c79e 100644 --- a/lib/plugins/config/lang/ko/intro.txt +++ b/lib/plugins/config/lang/ko/intro.txt @@ -1,9 +1,8 @@ ====== 환경 설정 관리 ====== -DokuWiki 설치할 때 설정들을 변경하기 위해 사용하는 페이지입니다. 각 설정에 대한 자세한 도움말이 필요하다면 [[doku>ko:config|설정 문서(번역)]]와 [[doku>config|설정 문서(영문)]]를 참조합니다. +DokuWiki 설치할 때 설정을 변경하기 위해 사용하는 페이지입니다. 각 설정에 대한 자세한 도움말이 필요하다면 [[doku>ko:config|설정 문서 (한국어)]]와 [[doku>config|설정 문서(영어)]]를 참고하세요. -플러그인에 대한 자세한 정보가 필요하다면 [[doku>plugin:config|플러그인 설정]]페이지를 참조합니다. 붉은 배경색으로 보이는 설정들은 이 플러인에서 변경하지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정들은 기본 설정값을 가지고 있습니다. 흰색 배경색으로 보이는 설정들은 특별한 설치를 위해 설정되어 있습니다. 파란색과 흰색 배경 설정들이 수정 가능합니다. - -이페이지를 끝내기 전에 **저장**버튼을 누르지 않으면 설정값들은 적용되지 않습니다. +플러그인에 대한 자세한 정보가 필요하다면 [[doku>plugin:config|플러그인 설정]] 문서를 참고하세요. 붉은 배경색으로 보이는 설정은 이 플러그인에서 변경하지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정은 기본 설정값을 가지고 있습니다. 하얀색 배경색으로 보이는 설정은 특별한 설치를 위해 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 수정 가능합니다. +이 페이지를 끝내기 전에 **저장**버튼을 누르지 않으면 설정값은 적용되지 않습니다. diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index dc22a78df..191c08de6 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -9,155 +9,156 @@ * @author SONG Younghwan <purluno@gmail.com> * @author Seung-Chul Yoo <dryoo@live.com> * @author erial2@gmail.com + * @author Myeongjin <aranet100@gmail.com> */ $lang['menu'] = '환경 설정'; -$lang['error'] = '잘못된 값때문에 설정들을 변경할 수 없습니다. 수정한 값들을 검사하고 확인을 누르기 바랍니다. - <br />잘못된 값(들)은 붉은 선으로 둘러싸여 있습니다.'; +$lang['error'] = '잘못된 값 때문에 설정을 변경할 수 없습니다. 수정한 값을 검토하고 확인을 누르세요. +<br />잘못된 값은 붉은 선으로 둘러싸여 있습니다.'; $lang['updated'] = '설정이 성공적으로 변경되었습니다.'; $lang['nochoice'] = '(다른 선택이 불가능합니다.)'; -$lang['locked'] = '환경 설정 파일을 수정할 수 없습니다. 의도된 행동이 아니라면,<br /> 파일이름과 권한이 맞는지 확인하기 바랍니다. '; -$lang['danger'] = '위험 : 이 옵션을 잘못 수정하면 환경설정 메뉴를 사용할 수 없을 수도 있습니다.'; -$lang['warning'] = '경고 : 이 옵션을 잘못 수정하면 잘못 동작 할 수 있습니다.'; -$lang['security'] = '보안 경고 : 이 옵션은 보안에 위험이 있을 수 있습니다.'; +$lang['locked'] = '환경 설정 파일을 수정할 수 없습니다. 의도한 행동이 아니라면,<br /> +파일 이름과 권한이 맞는지 확인하기 바랍니다. '; +$lang['danger'] = '위험: 이 옵션을 잘못 수정하면 환경설정 메뉴를 사용할 수 없을 수도 있습니다.'; +$lang['warning'] = '경고: 이 옵션을 잘못 수정하면 잘못 동작할 수 있습니다.'; +$lang['security'] = '보안 경고: 이 옵션은 보안에 위험이 있을 수 있습니다.'; $lang['_configuration_manager'] = '환경 설정 관리자'; $lang['_header_dokuwiki'] = 'DokuWiki 설정'; -$lang['_header_plugin'] = 'Plugin 설정'; -$lang['_header_template'] = 'Template 설정'; +$lang['_header_plugin'] = '플러그인 설정'; +$lang['_header_template'] = '템플릿 설정'; $lang['_header_undefined'] = '정의되지 않은 설정'; $lang['_basic'] = '기본 설정'; $lang['_display'] = '화면 표시 설정'; $lang['_authentication'] = '인증 설정'; -$lang['_anti_spam'] = '안티-스팸 설정'; +$lang['_anti_spam'] = '스팸 방지 설정'; $lang['_editing'] = '편집 설정'; $lang['_links'] = '링크 설정'; $lang['_media'] = '미디어 설정'; -$lang['_notifications'] = '공지 설정'; +$lang['_notifications'] = '알림 설정'; $lang['_syndication'] = '신디케이션 설정'; -$lang['_advanced'] = '진보된 설정'; +$lang['_advanced'] = '고급 설정'; $lang['_network'] = '네트워크 설정'; -$lang['_plugin_sufix'] = 'Plugin 설정'; -$lang['_template_sufix'] = 'Template 설정'; -$lang['_msg_setting_undefined'] = '설정되지 않은 메타데이타.'; +$lang['_plugin_sufix'] = '플러그인 설정'; +$lang['_template_sufix'] = '템플릿 설정'; +$lang['_msg_setting_undefined'] = '설정되지 않은 메타데이터.'; $lang['_msg_setting_no_class'] = '설정되지 않은 클래스.'; $lang['_msg_setting_no_default'] = '기본값 없음.'; -$lang['title'] = '위키 제목'; -$lang['start'] = '시작 페이지 이름'; -$lang['lang'] = '언어'; -$lang['template'] = '템플릿'; -$lang['tagline'] = '태그 라인 (템플릿이 지원할 때에 한해)'; -$lang['sidebar'] = '사이드바 페이지 이름(템플릿이 지원할 때에 한해). 비워두면 사이드바를 비활성화함'; -$lang['license'] = '컨텐트에 어떤 라이센스 정책을 적용하시겠습니까?'; +$lang['title'] = '위키 제목(위키 이름)'; +$lang['start'] = '각 이름공간에서 사용할 시작 문서 이름'; +$lang['lang'] = '인터페이스 언어'; +$lang['template'] = '템플릿(위키 디자인)'; +$lang['tagline'] = '태그 라인(템플릿이 지원할 때에 한함)'; +$lang['sidebar'] = '사이드바 문서 이름(템플릿이 지원할 때에 한함). 비워두면 사이드바를 비활성화함'; +$lang['license'] = '컨텐트에 어떤 라이선스를 적용하겠습니까?'; $lang['savedir'] = '데이타 저장 디렉토리'; -$lang['basedir'] = '기본 디렉토리'; -$lang['baseurl'] = '기본 URL'; +$lang['basedir'] = '서버 경로(예를 들어 <code>/dokuwiki/</code>). 자동 감지를 하려면 비우세요.'; +$lang['baseurl'] = '서버 URL(예를 들어 <code>http://www.yourserver.com</code>). 자동 감지를 하려면 비우세요.'; $lang['cookiedir'] = '쿠키 위치. 비워두면 기본 url 위치로 지정됩니다.'; $lang['dmode'] = '디렉토리 생성 모드'; $lang['fmode'] = '파일 생성 모드'; $lang['allowdebug'] = '디버그 허용 <b>필요하지 않으면 금지!</b>'; -$lang['recent'] = '최근에 바뀐 것'; -$lang['recent_days'] = '최근 바뀐 페이지 기준 시간(날짜)'; -$lang['breadcrumbs'] = '위치 추적 수'; -$lang['youarehere'] = '계층형 위치 추적'; -$lang['fullpath'] = '페이지 하단에 전체 경로 보여주기'; +$lang['recent'] = '최근 바뀐 문서당 항목 수'; +$lang['recent_days'] = '최근 바뀐 문서 기준 시간(날짜)'; +$lang['breadcrumbs'] = '위치 "추적" 수. 0으로 설정하면 비활성화함.'; +$lang['youarehere'] = '계층형 위치 추적 (다음 위의 옵션을 비활성화하고 싶습니다)'; +$lang['fullpath'] = '문서 하단에 전체 경로 보여주기'; $lang['typography'] = '기호 대체'; -$lang['dformat'] = '날짜 포맷 (PHP <a href="http://www.php.net/strftime">strftime</a> 기능) 참조'; -$lang['signature'] = '서명'; -$lang['showuseras'] = '마지막으로 페이지를 수정한 사용자를 보여줄지 여부'; +$lang['dformat'] = '날짜 형식 (PHP <a href="http://www.php.net/strftime">strftime</a> 기능 참고)'; +$lang['signature'] = '편집기에서 서명 버튼을 누를 때 삽입할 내용'; +$lang['showuseras'] = '마지막에 문서를 수정한 사용자를 보여줄지 여부'; $lang['toptoclevel'] = '목차 최상위 항목'; -$lang['tocminheads'] = '목차 표시 여부를 결정할 최소한의 표제 항목의 수'; +$lang['tocminheads'] = '목차 표시 여부를 결정할 최소한의 문단 제목 항목의 수'; $lang['maxtoclevel'] = '목차 최대 단계'; -$lang['maxseclevel'] = '섹션 최대 편집 단계'; +$lang['maxseclevel'] = '문단 최대 편집 단계'; $lang['camelcase'] = '링크에 CamelCase 사용'; -$lang['deaccent'] = '악센트 없는 페이지 이름'; -$lang['useheading'] = '페이지 이름으로 첫 헤드라인 사용'; -$lang['sneaky_index'] = '기본적으로, DokuWiki는 색인 목록에 모든 네임스페이스들을 보여줍니다. -이 옵션을 설정하면 사용자가 읽기 권한을 가지고 있지 않은 네임스페이스들은 보여주지 않습니다. 접근 가능한 하위 네임스페이스들 보이지않게 설정하면 자동으로 설정됩니다. -특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.'; -$lang['hidepages'] = '매칭된 페이지 숨기기(정규표현식)'; +$lang['deaccent'] = '문서 이름을 지우는 방법'; +$lang['useheading'] = '문서 이름으로 첫 문단 제목 사용'; +$lang['sneaky_index'] = '기본적으로 DokuWiki는 색인 목록에 모든 이름공간을 보여줍니다. +이 옵션을 설정하면 사용자가 읽기 권한을 가지고 있지 않은 이름공간은 보여주지 않습니다. 접근 가능한 하위 이름공간을 보이지 않게 설정하면 자동으로 설정됩니다. 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.'; +$lang['hidepages'] = '사이트맵과 기타 자동 색인과 같은 찾기에서 정규 표현식과 일치하는 문서 숨기기'; $lang['useacl'] = '접근 제어 목록(ACL) 사용'; -$lang['autopasswd'] = '자동으로 만들어진 패스워드'; +$lang['autopasswd'] = '자동으로 만들어진 비밀번호'; $lang['authtype'] = '인증 백-엔드'; -$lang['passcrypt'] = '패스워드 암호화 방법'; -$lang['defaultgroup'] = '기본 그룹'; -$lang['superuser'] = '슈퍼 유저'; -$lang['manager'] = '관리자 - 관리 기능들을 사용할 수 있는 그룹이나 사용자'; -$lang['profileconfirm'] = '개인정보 변경시 암호 재확인'; -$lang['rememberme'] = '로그인 정보 저장 허용'; -$lang['disableactions'] = 'DokuWiki Action 금지'; +$lang['passcrypt'] = '비밀번호 암호화 방법'; +$lang['defaultgroup'] = '기본 그룹, 모든 새 사용자는 이 그룹에 속합니다'; +$lang['superuser'] = '슈퍼 유저 - ACL 설정과 상관없이 모든 문서와 기능에 대한 전체 접근 권한을 가진 그룹이나 사용자. 사용자1,@그룹1,사용자2 쉼표로 구분한 목록'; +$lang['manager'] = '관리자 - 관리 기능을 사용할 수 있는 그룹이나 사용자. 사용자1,@그룹1,사용자2 쉼표로 구분한 목록'; +$lang['profileconfirm'] = '개인 정보를 바꿀 때 비밀번호 다시 확인'; +$lang['rememberme'] = '항상 로그인 정보 저장 허용 (기억하기)'; +$lang['disableactions'] = 'DokuWiki 활동 금지'; $lang['disableactions_check'] = '검사'; $lang['disableactions_subscription'] = '구독 신청/해지'; -$lang['disableactions_wikicode'] = '문서 소스 보기'; -$lang['disableactions_other'] = '다른 Action(comma로 구분)'; +$lang['disableactions_wikicode'] = '내용 보기/원시 내보대기'; +$lang['disableactions_other'] = '다른 활동(쉼표로 구분)'; $lang['auth_security_timeout'] = '인증 보안 초과 시간(초)'; -$lang['securecookie'] = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화 하고 위키 페이지는 그렇지 않은경우 꺼야 합니다.'; +$lang['securecookie'] = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화하고 위키 문서는 그렇지 않은 경우 비활성화 합니다.'; $lang['remote'] = '원격 API를 활성화 합니다. 이 항목을 허용하면 XML-RPC 및 기타 메카니즘을 통해 다른 어플리케이션으로 접근가능합니다.'; -$lang['remoteuser'] = '이 항목에 입력된 콤마로 나눠진 그룹이나 사용자에게 원격 API 접근을 제한합니다. 빈칸으로 두면 모두에게 허용합니다.'; -$lang['usewordblock'] = '금지단어를 사용해 스팸 막기'; +$lang['remoteuser'] = '이 항목에 입력된 쉼표로 나눠진 그룹이나 사용자에게 원격 API 접근을 제한합니다. 빈칸으로 두면 모두에게 허용합니다.'; +$lang['usewordblock'] = '금지 단어를 사용해 스팸 막기'; $lang['relnofollow'] = '외부 링크에 rel="nofollow" 사용'; $lang['indexdelay'] = '색인 연기 시간(초)'; -$lang['mailguard'] = '이메일 주소를 알아볼 수 없게'; -$lang['iexssprotect'] = '업로드 파일의 악성 Javascript, HTML 코드 가능성 여부를 검사'; +$lang['mailguard'] = '이메일 주소를 알아볼 수 없게 하기'; +$lang['iexssprotect'] = '올린 파일의 악성 자바스크립트, HTML 코드 가능성 여부를 검사'; $lang['usedraft'] = '편집하는 동안 자동으로 문서 초안 저장'; $lang['htmlok'] = 'HTML 내장 허용'; $lang['phpok'] = 'PHP 내장 허용'; $lang['locktime'] = '쵀대 파일 잠금 시간(초)'; $lang['cachetime'] = '최대 캐쉬 생존 시간(초)'; -$lang['target____wiki'] = '내부 링크들에 대한 타겟 윈도우 '; -$lang['target____interwiki'] = 'InterWiki 링크들에 대한 타겟 윈도우'; -$lang['target____extern'] = '외부 링크들에 대한 타겟 윈도우'; -$lang['target____media'] = '미디어 링크들에 대한 타겟 윈도우'; -$lang['target____windows'] = '윈도우 링크들에 대한 타겟 윈도우'; -$lang['mediarevisions'] = '미디어 버전 관리를 사용하시겠습니까?'; -$lang['refcheck'] = '미디어 참조 검사'; -$lang['refshow'] = '보여줄 미디어 참조 수'; +$lang['target____wiki'] = '내부 링크에 대한 타겟 창'; +$lang['target____interwiki'] = '인터위키 링크에 대한 타겟 창'; +$lang['target____extern'] = '외부 링크에 대한 타겟 창'; +$lang['target____media'] = '미디어 링크에 대한 타겟 창'; +$lang['target____windows'] = '창 링크에 대한 타겟 창'; +$lang['mediarevisions'] = '미디어 버전 관리를 사용하겠습니까?'; +$lang['refcheck'] = '미디어 파일을 삭제하기 전에 사용하고 있는지 검사'; +$lang['refshow'] = '위의 설정이 활성화되었을 때 보여줄 미디어 참고 수'; $lang['gdlib'] = 'GD 라이브러리 버전'; -$lang['im_convert'] = 'ImageMagick 위치'; +$lang['im_convert'] = 'ImageMagick 변환 도구 위치'; $lang['jpg_quality'] = 'JPG 압축 품질 (0-100)'; $lang['fetchsize'] = 'fetch.php가 외부에서 다운로드할 수도 있는 최대 크기(바이트)'; -$lang['subscribers'] = '페이지 갱신 알람 기능'; -$lang['subscribe_time'] = ' 구독 목록과 요약이 보내질 경과 시간 (초); 이 것은 recent_days에서 설정된 시간보다 작아야 합니다.'; -$lang['notify'] = '이메일 알람 기능'; -$lang['registernotify'] = '신규 등록자 알람 기능'; +$lang['subscribers'] = '사용자가 이메일로 문서 바뀜에 구독하도록 허용'; +$lang['subscribe_time'] = '구독 목록과 요약이 보내질 경과 시간 (초); 이 것은 recent_days에서 설정된 시간보다 작아야 합니다.'; +$lang['notify'] = '항상 이 이메일 주소로 바뀜 알림을 보냄'; +$lang['registernotify'] = '항상 새 사용자한테 이 이메일 주소로 정보를 보냄'; $lang['mailfrom'] = '자동으로 보내지는 메일 발신자'; -$lang['mailprefix'] = '자동으로 보내지는 메일의 제목 말머리 내용'; -$lang['htmlmail'] = '용량은 좀 더 크지만 보기 좋은 HTML 태그가 포함된 메일을 발송합니다. 텍스트만의 메일을 보내고자하면 체크를 꺼주세요.'; -$lang['sitemap'] = '구글 사이트맵 생성(날짜)'; -$lang['rss_type'] = 'XML feed 타잎'; -$lang['rss_linkto'] = 'XML feed 링크 정보'; -$lang['rss_content'] = 'XML feed 항목들에 표시되는 내용은?'; -$lang['rss_update'] = 'XML feed 갱신 주기(초)'; -$lang['rss_show_summary'] = 'XML feed 제목에서 요약정보 보여주기'; +$lang['mailprefix'] = '자동으로 보내지는 메일의 제목 말머리 내용. 비웠을 경우 위키 제목 사용'; +$lang['htmlmail'] = '용량은 조금 더 크지만 보기 좋은 HTML 태그가 포함된 메일을 발송합니다. 텍스트만의 메일을 보내고자하면 비활성화하세요.'; +$lang['sitemap'] = '구글 사이트맵 생성(날짜). 0일 경우 비활성화'; +$lang['rss_type'] = 'XML 피드 타잎'; +$lang['rss_linkto'] = 'XML 피드 링크 정보'; +$lang['rss_content'] = 'XML 피드 항목에 표시되는 내용은?'; +$lang['rss_update'] = 'XML 피드 갱신 주기(초)'; +$lang['rss_show_summary'] = 'XML 피드 제목에서 요약정보 보여주기'; $lang['rss_media'] = '어떤 규격으로 XML 피드를 받아보시겠습니까?'; -$lang['updatecheck'] = '업데이트와 보안 문제를 검사(DokuWiki를 update.dokuwiki.org에 연결해야 합니다.)'; +$lang['updatecheck'] = '업데이트와 보안 문제를 검사할까요? 이 기능을 사용하려면 DokuWiki를 update.dokuwiki.org에 연결해야 합니다.'; $lang['userewrite'] = 'URL rewriting기능 사용'; -$lang['useslash'] = 'URL에서 네임스페이스 구분자로 슬래쉬 문자 사용'; -$lang['sepchar'] = '페이지 이름 단어 구분자'; +$lang['useslash'] = 'URL에서 이름 구분자로 슬래시 문자 사용'; +$lang['sepchar'] = '문서 이름 단어 구분자'; $lang['canonical'] = '완전한 canonical URL 사용'; -$lang['fnencode'] = '아스키가 아닌 파일이름을 인코딩 하는 방법.'; -$lang['autoplural'] = '링크 연결시 plural폼 검사'; -$lang['compression'] = 'attic파일 압축 방법 선택'; -$lang['gzip_output'] = 'xhml 내용 gzip 압축 여부'; -$lang['compress'] = '최적화된 CSS, javascript 출력'; -$lang['cssdatauri'] = '이미지가 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP request 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! <code>400</code> 에서 <code>600></code> 정도면 좋은 효율을 가져옵니다. <code>0</code>로 지정할 경우 비활성화 됩니다.'; +$lang['fnencode'] = '아스키가 아닌 파일 이름을 인코딩 하는 방법.'; +$lang['autoplural'] = '링크 연결시 복수 양식 검사'; +$lang['compression'] = '첨부 파일 압축 방법 선택'; +$lang['gzip_output'] = 'xhml 내용 gzip 압축 사용'; +$lang['compress'] = '최적화된 CSS, 자바스크립트 출력'; +$lang['cssdatauri'] = '그림이 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP 요청 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! <code>400</code>에서 <code>600</code> 정도면 좋은 효율을 가져옵니다. <code>0</code>로 지정할 경우 비활성화 됩니다.'; $lang['send404'] = '존재하지 않는 페이지에 대해 "HTTP 404/Page Not Found" 응답'; $lang['broken_iua'] = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있으면 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a>를 참고하기 바랍니다.'; $lang['xsendfile'] = '웹 서버 static 파일 전송 지원을 위해 X-Sendfile 헤더를 사용한다면 이 옵션을 사용합니다. 웹 서버가 이 기능을 지원해야 합니다.'; $lang['renderer_xhtml'] = '주 (xhtml) 위키 출력 처리기'; $lang['renderer__core'] = '%s (DokuWiki 내부 기능)'; -$lang['renderer__plugin'] = '%s (DokuWiki 플러그인)'; -$lang['dnslookups'] = '이 옵션을 체크하면 도쿠위키가 페이지를 수정하는 사용자의 호스트 네임과 원격 IP주소를 확인합니다. 서버가 느리거나, DNS를 운영하지 않거나 이 기능을 원치 않으면 비활성화 시켜주세요.'; +$lang['renderer__plugin'] = '%s (플러그인)'; +$lang['dnslookups'] = '이 옵션을 활성화하면 도쿠위키가 문서를 수정하는 사용자의 호스트 네임과 원격 IP 주소를 확인합니다. 서버가 느리거나, DNS를 운영하지 않거나 이 기능을 원치 않으면 비활성화 시켜주세요.'; $lang['proxy____host'] = '프록시 서버 이름'; $lang['proxy____port'] = '프록시 서버 포트'; $lang['proxy____user'] = '프록시 사용자 이름'; -$lang['proxy____pass'] = '프록시 패스워드'; -$lang['proxy____ssl'] = '프록시 연결시 ssl사용'; -$lang['proxy____except'] = '프록시설정이 무시될 URL주소들의 RegEx형식표현'; +$lang['proxy____pass'] = '프록시 비밀번호'; +$lang['proxy____ssl'] = '프록시 연결시 SSL 사용'; +$lang['proxy____except'] = '프록시 설정이 무시될 URL주소의 정규 표현식'; $lang['safemodehack'] = 'safemode hack기능 사용'; $lang['ftp____host'] = 'safemode hack의 FTP 서버'; -$lang['ftp____port'] = 'safemode hack의 FTP port'; +$lang['ftp____port'] = 'safemode hack의 FTP 포트'; $lang['ftp____user'] = 'safemode hack의 FTP 사용자 이름'; -$lang['ftp____pass'] = 'safemode hack의 FTP 패스워드'; +$lang['ftp____pass'] = 'safemode hack의 FTP 비밀번호'; $lang['ftp____root'] = 'safemode hack의 FTP 루트 디렉토리'; $lang['license_o_'] = '선택하지 않음'; $lang['typography_o_0'] = '사용 안함'; @@ -179,12 +180,12 @@ $lang['rss_type_o_atom'] = 'Atom 0.3'; $lang['rss_type_o_atom1'] = 'Atom 1.0'; $lang['rss_content_o_abstract'] = '개요'; $lang['rss_content_o_diff'] = '통합 차이점 목록'; -$lang['rss_content_o_htmldiff'] = '차이점 목록 (HTML 테이블)'; -$lang['rss_content_o_html'] = '내용 (HTML 페이지)'; +$lang['rss_content_o_htmldiff'] = 'HTML 차이점 목록 형식'; +$lang['rss_content_o_html'] = '최대로 HTML 페이지 내용'; $lang['rss_linkto_o_diff'] = '차이점 보기'; -$lang['rss_linkto_o_page'] = '변경 페이지 보기'; -$lang['rss_linkto_o_rev'] = '변경 목록 보기'; -$lang['rss_linkto_o_current'] = '최근 페이지 보기'; +$lang['rss_linkto_o_page'] = '바뀐 문서 보기'; +$lang['rss_linkto_o_rev'] = '바뀐 목록 보기'; +$lang['rss_linkto_o_current'] = '현재 문서 보기'; $lang['compression_o_0'] = '없음'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; @@ -194,10 +195,10 @@ $lang['xsendfile_o_2'] = '표준 X-Sendfile 헤더'; $lang['xsendfile_o_3'] = '비공개 Nginx X-Accel-Redirect 헤더'; $lang['showuseras_o_loginname'] = '로그인 이름'; $lang['showuseras_o_username'] = '사용자 이름'; -$lang['showuseras_o_email'] = '사용자 e-mail 주소(메일주소 보호 셋팅에 따라 안보일 수 있음)'; -$lang['showuseras_o_email_link'] = 'mailto: link로 표현될 사용자 e-mail 주소'; -$lang['useheading_o_0'] = '아니요'; -$lang['useheading_o_navigation'] = '네비게이션에만'; +$lang['showuseras_o_email'] = '사용자 이메일 주소(메일 주소 보호 설정에 따라 안보일 수 있음)'; +$lang['showuseras_o_email_link'] = 'mailto: link로 표현될 사용자 이메일 주소'; +$lang['useheading_o_0'] = '아니오'; +$lang['useheading_o_navigation'] = '둘러보기에만'; $lang['useheading_o_content'] = '위키 내용에만'; $lang['useheading_o_1'] = '항상'; $lang['readdircache'] = 'readdir 캐쉬를 위한 최대 시간 (초)'; diff --git a/lib/plugins/plugin/lang/ko/admin_plugin.txt b/lib/plugins/plugin/lang/ko/admin_plugin.txt index 22ce0e6e6..b553d622b 100644 --- a/lib/plugins/plugin/lang/ko/admin_plugin.txt +++ b/lib/plugins/plugin/lang/ko/admin_plugin.txt @@ -1,5 +1,5 @@ ====== 플러그인 관리 ====== -이 페이지에서 Dokuwiki[[doku>plugins|plugins]]에 관련된 모든 관리 작업을 합니다. 플러그인을 다운로드하거나 설치하기 위해서 웹서버가 플러그인 디렉토리에 대해 쓰기 권한을 가지고 있어야 합니다. +이 페이지에서 Dokuwiki [[doku>plugins|플러그인]]에 관련된 모든 관리 작업을 합니다. 플러그인을 다운로드하거나 설치하기 위해서는 웹 서버가 플러그인 디렉토리에 대해 쓰기 권한을 가지고 있어야 합니다. diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php index b15b377a6..9e1fbfcae 100644 --- a/lib/plugins/plugin/lang/ko/lang.php +++ b/lib/plugins/plugin/lang/ko/lang.php @@ -9,49 +9,50 @@ * @author SONG Younghwan <purluno@gmail.com> * @author Seung-Chul Yoo <dryoo@live.com> * @author erial2@gmail.com + * @author Myeongjin <aranet100@gmail.com> */ $lang['menu'] = '플러그인 관리자'; -$lang['download'] = '새로운 플러그인 다운로드 및 설치'; -$lang['manage'] = '이미 설치된 플러그인들'; +$lang['download'] = '새 플러그인 다운로드 및 설치'; +$lang['manage'] = '이미 설치한 플러그인'; $lang['btn_info'] = '정보'; -$lang['btn_update'] = '갱신'; +$lang['btn_update'] = '업데이트'; $lang['btn_delete'] = '삭제'; $lang['btn_settings'] = '설정'; $lang['btn_download'] = '다운로드'; $lang['btn_enable'] = '저장'; $lang['url'] = 'URL'; -$lang['installed'] = '설치된:'; -$lang['lastupdate'] = '가장 최근에 갱신된:'; -$lang['source'] = '소스:'; -$lang['unknown'] = '알 수 없는'; -$lang['updating'] = '갱신 중 ...'; -$lang['updated'] = '%s 플러그인이 성공적으로 갱신되었습니다.'; -$lang['updates'] = '다음 플러그인들이 성공적으로 갱신되었습니다:'; -$lang['update_none'] = '갱신 가능한 플러그인이 없습니다.'; +$lang['installed'] = '설치됨:'; +$lang['lastupdate'] = '최근 업데이트됨:'; +$lang['source'] = '내용:'; +$lang['unknown'] = '알 수 없음'; +$lang['updating'] = '업데이트 중 ...'; +$lang['updated'] = '%s 플러그인이 성공적으로 업데이트했습니다.'; +$lang['updates'] = '다음 플러그인들이 성공적으로 업데이트했습니다:'; +$lang['update_none'] = '업데이트를 찾을 수 없습니다.'; $lang['deleting'] = '삭제 중 ...'; $lang['deleted'] = '%s 플러그인이 삭제되었습니다.'; $lang['downloading'] = '다운로드 중 ...'; $lang['downloaded'] = '%s 플러그인이 성공적으로 설치되었습니다.'; $lang['downloads'] = '다음 플러그인들이 성공적으로 설치되었습니다:'; -$lang['download_none'] = '플러그인이 없거나 다운로드/설치 중에 알수 없는 문제가 발생했습니다.'; +$lang['download_none'] = '플러그인이 없거나 다운로드 또는 설치 중에 알 수 없는 문제가 발생했습니다.'; $lang['plugin'] = '플러그인:'; -$lang['components'] = '콤퍼넌트들'; -$lang['noinfo'] = '이 플러그인은 어떤 정보도 없습니다. 유효한 플러그인이 아닐 지도 모릅니다.'; +$lang['components'] = '구성 요소'; +$lang['noinfo'] = '이 플러그인은 어떤 정보도 없습니다. 잘못된 플러그인일 수 있습니다.'; $lang['name'] = '이름:'; $lang['date'] = '날짜:'; -$lang['type'] = '타입:'; +$lang['type'] = '종류:'; $lang['desc'] = '설명:'; -$lang['author'] = '제작자:'; +$lang['author'] = '만든이:'; $lang['www'] = '웹:'; $lang['error'] = '알 수 없는 문제가 발생했습니다.'; $lang['error_download'] = '플러그인 파일을 다운로드 할 수 없습니다: %s'; -$lang['error_badurl'] = '잘못된 URL같습니다. - URL에서 파일 이름을 알 수 없습니다.'; +$lang['error_badurl'] = '잘못된 URL 같습니다. - URL에서 파일 이름을 알 수 없습니다.'; $lang['error_dircreate'] = '다운로드를 받기 위한 임시 디렉토리를 만들 수 없습니다.'; -$lang['error_decompress'] = '플러그인 매니저가 다운로드 받은 파일을 압축해제할 수 없습니다.잘못 다운로드 받았을 수도 있으니 다시 한번 시도해보기 바랍니다; 압축 포맷을 알 수 없는 경우에는 다운로드 후 수동으로 직접 설치하기 바랍니다.'; -$lang['error_copy'] = '플러그인 설치하는 동안 파일 복사 에러가 발생했습니다. <em>%s</em>: 디스크가 꽉 찼거나 파일 접근 권한이 잘못된 경우입니다. 플러그인 설치가 부분적으로만 이루어졌을 것입니다.설치가 불완전합니다.'; -$lang['error_delete'] = '<em>%s</em> 플러그인 삭제 도중 에러가 발생했습니다. 대부분의 경우, 불완전한 파일이거나 디렉토리 접근 권한이 잘못된 경우입니다.'; -$lang['enabled'] = '%s 플러그인을 켰습니다.'; -$lang['notenabled'] = '%s 플러그인을 킬 수 없습니다. 파일 권한을 확인하십시오.'; -$lang['disabled'] = '%s 플러그인을 껐습니다.'; -$lang['notdisabled'] = '%s 플러그인을 끌 수 없습니다. 파일 권한을 확인하십시오.'; +$lang['error_decompress'] = '플러그인 관리자가 다운로드 받은 파일을 압축을 풀 수 없습니다. 잘못 다운로드 받았을 수도 있으니 다시 한번 시도해보기 바랍니다. 또는 압축 포맷을 알 수 없는 경우에는 다운로드한 후 수동으로 직접 설치하기 바랍니다.'; +$lang['error_copy'] = '플러그인을 설치하는 동안 파일 복사하는 데 오류가 발생했습니다. <em>%s</em>: 디스크가 꽉 찼거나 파일 접근 권한이 잘못된 경우입니다. 플러그인 설치가 부분적으로만 이루어졌을 것입니다. 설치가 불완전합니다.'; +$lang['error_delete'] = '<em>%s</em> 플러그인을 삭제하는 동안 오류가 발생했습니다. 대부분의 경우 불완전한 파일이거나 디렉토리 접근 권한이 잘못된 경우입니다.'; +$lang['enabled'] = '%s 플러그인을 활성화했습니다.'; +$lang['notenabled'] = '%s 플러그인을 활성화할 수 없습니다. 파일 권한을 확인하십시오.'; +$lang['disabled'] = '%s 플러그인을 비활성화했습니다.'; +$lang['notdisabled'] = '%s 플러그인을 비활성화할 수 없습니다. 파일 권한을 확인하십시오.'; $lang['packageinstalled'] = '플러그인 패키지(%d 개의 플러그인: %s)가 성공적으로 설치되었습니다.'; diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt index e979b71d5..79841fb2b 100644 --- a/lib/plugins/popularity/lang/ko/intro.txt +++ b/lib/plugins/popularity/lang/ko/intro.txt @@ -1,9 +1,9 @@ ====== 인기도 조사 ====== -설치된 위키의 익명 정보를 DokuWiki 개발자들에게 보냅니다. 이 기능은 DokuWiki가 실제 사용자들에게 어떻게 사용되는지 DokuWiki 개발자들에게 알려줌으로써 이 후 개발 시 참고가 됩니다. +설치된 위키의 익명 정보를 DokuWiki 개발자들에게 보냅니다. 이 [[doku>popularity|기능]]은 DokuWiki가 실제 사용자들에게 어떻게 사용되는지 DokuWiki 개발자들에게 알려줌으로써 이 후 개발 시 참고가 됩니다. 설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이타는 익명 ID로 구별되어집니다. -전송 데이타는 설치 DokuWiki 버전, 페이지와 파일 수, 크기, 설치 플러그인, 설치 PHP 정보등을 포함하고 있습니다. +전송 데이타는 설치 DokuWiki 버전, 문서와 파일 수, 크기, 설치 플러그인, 설치 PHP 정보등을 포함하고 있습니다. -실제 보내질 자료는 아래와 같습니다. 정보를 보내려면 "자료 보내기" 버튼을 클릭합니다. +실제 보내질 자료는 아래와 같습니다. 정보를 보내려면 "자료 보내기" 버튼을 클릭합니다. \ No newline at end of file diff --git a/lib/plugins/popularity/lang/ko/lang.php b/lib/plugins/popularity/lang/ko/lang.php index 01bc51044..33a0c88f7 100644 --- a/lib/plugins/popularity/lang/ko/lang.php +++ b/lib/plugins/popularity/lang/ko/lang.php @@ -8,6 +8,7 @@ * @author SONG Younghwan <purluno@gmail.com> * @author Seung-Chul Yoo <dryoo@live.com> * @author erial2@gmail.com + * @author Myeongjin <aranet100@gmail.com> */ $lang['name'] = '인기도 조사 (불러오는데 시간이 걸릴 수 있습니다.)'; $lang['submit'] = '자료 보내기'; diff --git a/lib/plugins/popularity/lang/ko/submitted.txt b/lib/plugins/popularity/lang/ko/submitted.txt index e8b434dc5..12f0efe45 100644 --- a/lib/plugins/popularity/lang/ko/submitted.txt +++ b/lib/plugins/popularity/lang/ko/submitted.txt @@ -1,3 +1,3 @@ ====== 인기도 조사 ====== -자료 전송이 성공적으로 완료되었습니다 \ No newline at end of file +자료 전송이 성공적으로 완료되었습니다. \ No newline at end of file diff --git a/lib/plugins/revert/lang/ko/intro.txt b/lib/plugins/revert/lang/ko/intro.txt index a0164dc4f..7fc310eee 100644 --- a/lib/plugins/revert/lang/ko/intro.txt +++ b/lib/plugins/revert/lang/ko/intro.txt @@ -1,3 +1,3 @@ ====== 복구 관리자 ====== -스팸 공격으로 부터 자동으로 복구하는데 이페이지는 도움이 될 수 있습니다. 스팸 공격받은 페이지 목록을 찾으려면 문자열을 입력하기 바랍니다(예. 스팸 URL), 그 후 검색된 페이지들이 스팸 공격받았는지 확인하고 복구합니다. +스팸 공격으로 부터 자동으로 복구하는데 이 페이지가 도움이 될 수 있습니다. 스팸 공격받은 문서 목록을 찾으려면 문자열을 입력하기 바랍니다(예를 들어 스팸 URL), 그 후 찾은 문서가 스팸 공격을 받았는지 확인하고 복구합니다. diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php index da689c788..c51af470e 100644 --- a/lib/plugins/revert/lang/ko/lang.php +++ b/lib/plugins/revert/lang/ko/lang.php @@ -8,13 +8,14 @@ * @author SONG Younghwan <purluno@gmail.com> * @author Seung-Chul Yoo <dryoo@live.com> * @author erial2@gmail.com + * @author Myeongjin <aranet100@gmail.com> */ $lang['menu'] = '복구 관리자'; -$lang['filter'] = '스팸 페이지 검색 '; -$lang['revert'] = '선택 페이지들 복구'; -$lang['reverted'] = '%s를 이전 버전 %s 으로 복구'; +$lang['filter'] = '스팸 문서 찾기'; +$lang['revert'] = '선택한 문서 복구'; +$lang['reverted'] = '%s를 %s 버전으로 복구'; $lang['removed'] = '%s 삭제'; -$lang['revstart'] = '복구 작업을 시작합니다. 오랜 시간이 걸릴 수 있습니다. 완료되기 전에 스크립트 time out이 발생한다면 더 작은 작업들로 나누어서 복구하기 바랍니다. '; +$lang['revstart'] = '복구 작업을 시작합니다. 오랜 시간이 걸릴 수 있습니다. 완료되기 전에 스크립트 시간 초과가 발생한다면 더 작은 작업들로 나누어서 복구하기 바랍니다.'; $lang['revstop'] = '복구 작업이 성공적으로 끝났습니다.'; -$lang['note1'] = '주의: 대소문자 구별하여 검색합니다.'; -$lang['note2'] = '주의: 이 페이지는 스팸 단어 <i>%s</i>를 포함하지 않은 가장 최근 과거 문서 버전으로 복구됩니다. '; +$lang['note1'] = '참고: 대소문자 구별하여 찾습니다.'; +$lang['note2'] = '참고: 이 문서는 <i>%s</i> 스팸 단어를 포함하지 않은 최근 이전 버전으로 복구됩니다. '; diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php index 111267e5f..cae81798f 100644 --- a/lib/plugins/usermanager/lang/ko/lang.php +++ b/lib/plugins/usermanager/lang/ko/lang.php @@ -8,16 +8,17 @@ * @author SONG Younghwan <purluno@gmail.com> * @author Seung-Chul Yoo <dryoo@live.com> * @author erial2@gmail.com + * @author Myeongjin <aranet100@gmail.com> */ $lang['menu'] = '사용자 관리자'; $lang['noauth'] = '(사용자 인증이 불가능합니다.)'; $lang['nosupport'] = '(사용자 관리가 지원되지 않습니다.)'; $lang['badauth'] = '유효하지 않은 인증 메카니즘입니다.'; $lang['user_id'] = '사용자'; -$lang['user_pass'] = '패스워드'; +$lang['user_pass'] = '비밀번호'; $lang['user_name'] = '실제 이름'; $lang['user_mail'] = '이메일 '; -$lang['user_groups'] = '그룹들'; +$lang['user_groups'] = '그룹'; $lang['field'] = '항목'; $lang['value'] = '값'; $lang['add'] = '추가'; @@ -25,27 +26,27 @@ $lang['delete'] = '삭제'; $lang['delete_selected'] = '삭제 선택'; $lang['edit'] = '수정'; $lang['edit_prompt'] = '이 사용자 수정'; -$lang['modify'] = '변경 저장'; -$lang['search'] = '검색'; -$lang['search_prompt'] = '검색 실행'; -$lang['clear'] = '검색 필터 초기화'; +$lang['modify'] = '바뀜 저장'; +$lang['search'] = '찾기'; +$lang['search_prompt'] = '찾기 실행'; +$lang['clear'] = '찾기 필터 초기화'; $lang['filter'] = '필터'; -$lang['summary'] = '검색된 사용자들 보기(%1$d-%2$d 중 %3$d). 전체 사용자 %4$d 명.'; -$lang['nonefound'] = '검색된 사용자가 없습니다. 전체 사용자 %d 명.'; -$lang['delete_ok'] = '%d 명의 사용자가 삭제되었습니다.'; -$lang['delete_fail'] = '%d 명의 사용자의 삭제가 실패했습니다.'; -$lang['update_ok'] = '사용자 갱신이 성공했습니다.'; -$lang['update_fail'] = '사용자 갱신이 실패했습니다.'; -$lang['update_exists'] = '사용자 이름 변경이 실패했습니다. 사용자 이름(%s)이 이미 존재합니다. (다른 항목들의 변경은 적용됩니다.)'; +$lang['summary'] = '찾은 사용자 보기(%1$d-%2$d 중 %3$d). 전체 사용자 %4$d 명.'; +$lang['nonefound'] = '찾은 사용자가 없습니다. 전체 사용자 %d 명.'; +$lang['delete_ok'] = '사용자 %d명이 삭제되었습니다.'; +$lang['delete_fail'] = '사용자 %d명의 삭제가 실패했습니다.'; +$lang['update_ok'] = '사용자 변경을 성공했습니다.'; +$lang['update_fail'] = '사용자 변경을 실패했습니다.'; +$lang['update_exists'] = '사용자 이름 변경이 실패했습니다. 사용자 이름(%s)이 이미 존재합니다. (다른 항목의 바뀜은 적용됩니다.)'; $lang['start'] = '시작'; $lang['prev'] = '이전'; $lang['next'] = '다음'; $lang['last'] = '마지막'; -$lang['edit_usermissing'] = '선택된 사용자를 찾을 수 없습니다, 사용자 이름이 삭제되거나 변경됐을 수도 있습니다.'; +$lang['edit_usermissing'] = '선택된 사용자를 찾을 수 없습니다. 사용자 이름이 삭제되거나 변경됐을 수도 있습니다.'; $lang['user_notify'] = '사용자에게 알림'; -$lang['note_notify'] = '사용자에게 새로운 암호를 준 경우에만 알림 이메일이 보내집니다.'; -$lang['note_group'] = '새로운 사용자들은 어떤 그룹도 설정하지 않은 경우에 기본 그룹(%s)에 추가됩니다.'; -$lang['note_pass'] = '사용자 통지가 지정되어 있을때, 필드에 아무값도 입력하지 않으면 암호가 자동 생성 됩니다.'; +$lang['note_notify'] = '사용자에게 새로운 비밀번호를 준 경우에만 알림 이메일이 보내집니다.'; +$lang['note_group'] = '새로운 사용자는 어떤 그룹도 설정하지 않은 경우에 기본 그룹(%s)에 추가됩니다.'; +$lang['note_pass'] = '사용자 통지가 지정되어 있을 때 필드에 아무 값도 입력하지 않으면 비밀번호가 자동으로 만들어집니다.'; $lang['add_ok'] = '사용자가 성공적으로 추가되었습니다.'; $lang['add_fail'] = '사용자 추가가 실패했습니다.'; $lang['notify_ok'] = '알림 이메일이 성공적으로 발송되었습니다. '; -- cgit v1.2.3 From b16544225947102f664769aaeb02bd59a25fbaa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= <aranet100@gmail.com> Date: Fri, 22 Jun 2012 09:56:20 +0200 Subject: Korean language update --- lib/plugins/acl/lang/ko/help.txt | 4 +-- lib/plugins/acl/lang/ko/lang.php | 2 +- lib/plugins/config/lang/ko/intro.txt | 7 ++-- lib/plugins/config/lang/ko/lang.php | 56 ++++++++++++++++---------------- lib/plugins/plugin/lang/ko/lang.php | 12 +++---- lib/plugins/popularity/lang/ko/intro.txt | 2 +- lib/plugins/popularity/lang/ko/lang.php | 4 +-- lib/plugins/revert/lang/ko/intro.txt | 2 +- lib/plugins/revert/lang/ko/lang.php | 4 +-- lib/plugins/usermanager/lang/ko/lang.php | 10 +++--- 10 files changed, 51 insertions(+), 52 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt index d022a0913..377636682 100644 --- a/lib/plugins/acl/lang/ko/help.txt +++ b/lib/plugins/acl/lang/ko/help.txt @@ -6,6 +6,6 @@ 위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다. -아래 테이블에서 현재 설정된 모든 접근 제어 규칙들을 볼 수 있으며, 즉시 여러 규칙들을 삭제하거나 바꿀 수 있습니다. +아래 테이블에서 현재 설정된 모든 접근 제어 규칙을 볼 수 있으며, 즉시 여러 규칙을 삭제하거나 바꿀 수 있습니다. -DokuWiki에서 접근 제어가 어떻게 동작되는지 알려면 [[doku>acl|ACL 공식 문서]]를 읽어보기 바랍니다. \ No newline at end of file +DokuWiki에서 접근 제어가 어떻게 동작되는지 알아보려면 [[doku>acl|ACL 공식 문서]]를 읽어보기 바랍니다. \ No newline at end of file diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php index 5465461fa..c8e1ce5cc 100644 --- a/lib/plugins/acl/lang/ko/lang.php +++ b/lib/plugins/acl/lang/ko/lang.php @@ -27,7 +27,7 @@ $lang['p_group_id'] = '<b class="aclgroup">%s</b> 그룹 구성원은 $lang['p_group_ns'] = '<b class="aclgroup">%s</b> 그룹 구성원은 현재 <b class="aclns">%s</b>: <i>%s</i> 이름공간 접근이 가능합니다.'; $lang['p_choose_id'] = '<b class="aclpage">%s</b> 문서 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.'; $lang['p_choose_ns'] = '<b class="aclns">%s</b> 이름공간 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.'; -$lang['p_inherited'] = '참고: 권한이 명시적으로 설정되지 않았으므로 다른 그룹들이나 상위 이름공간으로부터 가져왔습니다.'; +$lang['p_inherited'] = '참고: 권한이 명시적으로 설정되지 않았으므로 다른 그룹이나 상위 이름공간으로부터 가져왔습니다.'; $lang['p_isadmin'] = '참고: 슈퍼유저로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.'; $lang['p_include'] = '더 높은 접근 권한은 하위를 포함합니다. 문서가 아닌 이름공간에는 만들기, 올리기, 삭제 권한만 적용됩니다.'; $lang['current'] = '현재 ACL 규칙'; diff --git a/lib/plugins/config/lang/ko/intro.txt b/lib/plugins/config/lang/ko/intro.txt index 895a8c79e..f6b76ecfc 100644 --- a/lib/plugins/config/lang/ko/intro.txt +++ b/lib/plugins/config/lang/ko/intro.txt @@ -1,8 +1,7 @@ ====== 환경 설정 관리 ====== -DokuWiki 설치할 때 설정을 변경하기 위해 사용하는 페이지입니다. 각 설정에 대한 자세한 도움말이 필요하다면 [[doku>ko:config|설정 문서 (한국어)]]와 [[doku>config|설정 문서(영어)]]를 참고하세요. +DokuWiki 설치할 때 설정을 변경하기 위해 사용하는 페이지입니다. 각 설정에 대한 자세한 도움말이 필요하다면 [[doku>ko:config|설정 문서 (한국어)]]와 [[doku>config|설정 문서 (영어)]]를 참고하세요. -플러그인에 대한 자세한 정보가 필요하다면 [[doku>plugin:config|플러그인 설정]] 문서를 참고하세요. 붉은 배경색으로 보이는 설정은 이 플러그인에서 변경하지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정은 기본 설정값을 가지고 있습니다. 하얀색 배경색으로 보이는 설정은 특별한 설치를 위해 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 수정 가능합니다. - -이 페이지를 끝내기 전에 **저장**버튼을 누르지 않으면 설정값은 적용되지 않습니다. +플러그인에 대한 자세한 정보가 필요하다면 [[doku>plugin:config|플러그인 설정]] 문서를 참고하세요. 빨간 배경색으로 보이는 설정은 이 플러그인에서 변경하지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정은 기본 설정값을 가지고 있습니다. 하얀 배경색으로 보이는 설정은 특별한 설치를 위해 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 수정이 가능합니다. +이 페이지를 끝내기 전에 **저장** 버튼을 누르지 않으면 설정값은 적용되지 않습니다. diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 191c08de6..5f90044e4 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -13,7 +13,7 @@ */ $lang['menu'] = '환경 설정'; $lang['error'] = '잘못된 값 때문에 설정을 변경할 수 없습니다. 수정한 값을 검토하고 확인을 누르세요. -<br />잘못된 값은 붉은 선으로 둘러싸여 있습니다.'; +<br />잘못된 값은 빨간 선으로 둘러싸여 있습니다.'; $lang['updated'] = '설정이 성공적으로 변경되었습니다.'; $lang['nochoice'] = '(다른 선택이 불가능합니다.)'; $lang['locked'] = '환경 설정 파일을 수정할 수 없습니다. 의도한 행동이 아니라면,<br /> @@ -42,22 +42,22 @@ $lang['_template_sufix'] = '템플릿 설정'; $lang['_msg_setting_undefined'] = '설정되지 않은 메타데이터.'; $lang['_msg_setting_no_class'] = '설정되지 않은 클래스.'; $lang['_msg_setting_no_default'] = '기본값 없음.'; -$lang['title'] = '위키 제목(위키 이름)'; +$lang['title'] = '위키 제목 (위키 이름)'; $lang['start'] = '각 이름공간에서 사용할 시작 문서 이름'; $lang['lang'] = '인터페이스 언어'; -$lang['template'] = '템플릿(위키 디자인)'; -$lang['tagline'] = '태그 라인(템플릿이 지원할 때에 한함)'; -$lang['sidebar'] = '사이드바 문서 이름(템플릿이 지원할 때에 한함). 비워두면 사이드바를 비활성화함'; -$lang['license'] = '컨텐트에 어떤 라이선스를 적용하겠습니까?'; +$lang['template'] = '템플릿 (위키 디자인)'; +$lang['tagline'] = '태그 라인 (템플릿이 지원할 때에 한함)'; +$lang['sidebar'] = '사이드바 문서 이름 (템플릿이 지원할 때에 한함). 비워두면 사이드바를 비활성화'; +$lang['license'] = '콘텐츠에 어떤 라이선스를 적용하겠습니까?'; $lang['savedir'] = '데이타 저장 디렉토리'; -$lang['basedir'] = '서버 경로(예를 들어 <code>/dokuwiki/</code>). 자동 감지를 하려면 비우세요.'; -$lang['baseurl'] = '서버 URL(예를 들어 <code>http://www.yourserver.com</code>). 자동 감지를 하려면 비우세요.'; -$lang['cookiedir'] = '쿠키 위치. 비워두면 기본 url 위치로 지정됩니다.'; +$lang['basedir'] = '서버 경로 (예를 들어 <code>/dokuwiki/</code>). 자동 감지를 하려면 비우세요.'; +$lang['baseurl'] = '서버 URL (예를 들어 <code>http://www.yourserver.com</code>). 자동 감지를 하려면 비우세요.'; +$lang['cookiedir'] = '쿠키 위치. 비워두면 기본 URL 위치로 지정됩니다.'; $lang['dmode'] = '디렉토리 생성 모드'; $lang['fmode'] = '파일 생성 모드'; $lang['allowdebug'] = '디버그 허용 <b>필요하지 않으면 금지!</b>'; $lang['recent'] = '최근 바뀐 문서당 항목 수'; -$lang['recent_days'] = '최근 바뀐 문서 기준 시간(날짜)'; +$lang['recent_days'] = '최근 바뀐 문서 기준 시간 (날짜)'; $lang['breadcrumbs'] = '위치 "추적" 수. 0으로 설정하면 비활성화함.'; $lang['youarehere'] = '계층형 위치 추적 (다음 위의 옵션을 비활성화하고 싶습니다)'; $lang['fullpath'] = '문서 하단에 전체 경로 보여주기'; @@ -75,7 +75,7 @@ $lang['useheading'] = '문서 이름으로 첫 문단 제목 사용'; $lang['sneaky_index'] = '기본적으로 DokuWiki는 색인 목록에 모든 이름공간을 보여줍니다. 이 옵션을 설정하면 사용자가 읽기 권한을 가지고 있지 않은 이름공간은 보여주지 않습니다. 접근 가능한 하위 이름공간을 보이지 않게 설정하면 자동으로 설정됩니다. 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.'; $lang['hidepages'] = '사이트맵과 기타 자동 색인과 같은 찾기에서 정규 표현식과 일치하는 문서 숨기기'; -$lang['useacl'] = '접근 제어 목록(ACL) 사용'; +$lang['useacl'] = '접근 제어 목록 (ACL) 사용'; $lang['autopasswd'] = '자동으로 만들어진 비밀번호'; $lang['authtype'] = '인증 백-엔드'; $lang['passcrypt'] = '비밀번호 암호화 방법'; @@ -84,25 +84,25 @@ $lang['superuser'] = '슈퍼 유저 - ACL 설정과 상관없이 모 $lang['manager'] = '관리자 - 관리 기능을 사용할 수 있는 그룹이나 사용자. 사용자1,@그룹1,사용자2 쉼표로 구분한 목록'; $lang['profileconfirm'] = '개인 정보를 바꿀 때 비밀번호 다시 확인'; $lang['rememberme'] = '항상 로그인 정보 저장 허용 (기억하기)'; -$lang['disableactions'] = 'DokuWiki 활동 금지'; +$lang['disableactions'] = 'DokuWiki 활동 비활성화'; $lang['disableactions_check'] = '검사'; $lang['disableactions_subscription'] = '구독 신청/해지'; $lang['disableactions_wikicode'] = '내용 보기/원시 내보대기'; -$lang['disableactions_other'] = '다른 활동(쉼표로 구분)'; -$lang['auth_security_timeout'] = '인증 보안 초과 시간(초)'; +$lang['disableactions_other'] = '다른 활동 (쉼표로 구분)'; +$lang['auth_security_timeout'] = '인증 보안 초과 시간 (초)'; $lang['securecookie'] = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화하고 위키 문서는 그렇지 않은 경우 비활성화 합니다.'; $lang['remote'] = '원격 API를 활성화 합니다. 이 항목을 허용하면 XML-RPC 및 기타 메카니즘을 통해 다른 어플리케이션으로 접근가능합니다.'; $lang['remoteuser'] = '이 항목에 입력된 쉼표로 나눠진 그룹이나 사용자에게 원격 API 접근을 제한합니다. 빈칸으로 두면 모두에게 허용합니다.'; $lang['usewordblock'] = '금지 단어를 사용해 스팸 막기'; $lang['relnofollow'] = '외부 링크에 rel="nofollow" 사용'; -$lang['indexdelay'] = '색인 연기 시간(초)'; +$lang['indexdelay'] = '색인 연기 시간 (초)'; $lang['mailguard'] = '이메일 주소를 알아볼 수 없게 하기'; $lang['iexssprotect'] = '올린 파일의 악성 자바스크립트, HTML 코드 가능성 여부를 검사'; $lang['usedraft'] = '편집하는 동안 자동으로 문서 초안 저장'; $lang['htmlok'] = 'HTML 내장 허용'; $lang['phpok'] = 'PHP 내장 허용'; -$lang['locktime'] = '쵀대 파일 잠금 시간(초)'; -$lang['cachetime'] = '최대 캐쉬 생존 시간(초)'; +$lang['locktime'] = '최대 파일 잠금 시간(초)'; +$lang['cachetime'] = '최대 캐시 생존 시간 (초)'; $lang['target____wiki'] = '내부 링크에 대한 타겟 창'; $lang['target____interwiki'] = '인터위키 링크에 대한 타겟 창'; $lang['target____extern'] = '외부 링크에 대한 타겟 창'; @@ -114,7 +114,7 @@ $lang['refshow'] = '위의 설정이 활성화되었을 때 보여 $lang['gdlib'] = 'GD 라이브러리 버전'; $lang['im_convert'] = 'ImageMagick 변환 도구 위치'; $lang['jpg_quality'] = 'JPG 압축 품질 (0-100)'; -$lang['fetchsize'] = 'fetch.php가 외부에서 다운로드할 수도 있는 최대 크기(바이트)'; +$lang['fetchsize'] = 'fetch.php가 외부에서 다운로드할 수도 있는 최대 크기 (바이트)'; $lang['subscribers'] = '사용자가 이메일로 문서 바뀜에 구독하도록 허용'; $lang['subscribe_time'] = '구독 목록과 요약이 보내질 경과 시간 (초); 이 것은 recent_days에서 설정된 시간보다 작아야 합니다.'; $lang['notify'] = '항상 이 이메일 주소로 바뀜 알림을 보냄'; @@ -122,15 +122,15 @@ $lang['registernotify'] = '항상 새 사용자한테 이 이메일 주 $lang['mailfrom'] = '자동으로 보내지는 메일 발신자'; $lang['mailprefix'] = '자동으로 보내지는 메일의 제목 말머리 내용. 비웠을 경우 위키 제목 사용'; $lang['htmlmail'] = '용량은 조금 더 크지만 보기 좋은 HTML 태그가 포함된 메일을 발송합니다. 텍스트만의 메일을 보내고자하면 비활성화하세요.'; -$lang['sitemap'] = '구글 사이트맵 생성(날짜). 0일 경우 비활성화'; -$lang['rss_type'] = 'XML 피드 타잎'; +$lang['sitemap'] = '구글 사이트맵 생성 (날짜). 0일 경우 비활성화'; +$lang['rss_type'] = 'XML 피드 타입'; $lang['rss_linkto'] = 'XML 피드 링크 정보'; $lang['rss_content'] = 'XML 피드 항목에 표시되는 내용은?'; -$lang['rss_update'] = 'XML 피드 갱신 주기(초)'; +$lang['rss_update'] = 'XML 피드 업데이트 주기 (초)'; $lang['rss_show_summary'] = 'XML 피드 제목에서 요약정보 보여주기'; $lang['rss_media'] = '어떤 규격으로 XML 피드를 받아보시겠습니까?'; $lang['updatecheck'] = '업데이트와 보안 문제를 검사할까요? 이 기능을 사용하려면 DokuWiki를 update.dokuwiki.org에 연결해야 합니다.'; -$lang['userewrite'] = 'URL rewriting기능 사용'; +$lang['userewrite'] = '멋진 URL 사용'; $lang['useslash'] = 'URL에서 이름 구분자로 슬래시 문자 사용'; $lang['sepchar'] = '문서 이름 단어 구분자'; $lang['canonical'] = '완전한 canonical URL 사용'; @@ -179,10 +179,10 @@ $lang['rss_type_o_rss2'] = 'RSS 2.0'; $lang['rss_type_o_atom'] = 'Atom 0.3'; $lang['rss_type_o_atom1'] = 'Atom 1.0'; $lang['rss_content_o_abstract'] = '개요'; -$lang['rss_content_o_diff'] = '통합 차이점 목록'; -$lang['rss_content_o_htmldiff'] = 'HTML 차이점 목록 형식'; -$lang['rss_content_o_html'] = '최대로 HTML 페이지 내용'; -$lang['rss_linkto_o_diff'] = '차이점 보기'; +$lang['rss_content_o_diff'] = '통합 차이 목록'; +$lang['rss_content_o_htmldiff'] = 'HTML 차이 목록 형식'; +$lang['rss_content_o_html'] = '최대 HTML 페이지 내용'; +$lang['rss_linkto_o_diff'] = '차이 보기'; $lang['rss_linkto_o_page'] = '바뀐 문서 보기'; $lang['rss_linkto_o_rev'] = '바뀐 목록 보기'; $lang['rss_linkto_o_current'] = '현재 문서 보기'; @@ -195,10 +195,10 @@ $lang['xsendfile_o_2'] = '표준 X-Sendfile 헤더'; $lang['xsendfile_o_3'] = '비공개 Nginx X-Accel-Redirect 헤더'; $lang['showuseras_o_loginname'] = '로그인 이름'; $lang['showuseras_o_username'] = '사용자 이름'; -$lang['showuseras_o_email'] = '사용자 이메일 주소(메일 주소 보호 설정에 따라 안보일 수 있음)'; +$lang['showuseras_o_email'] = '사용자 이메일 주소 (메일 주소 보호 설정에 따라 안보일 수 있음)'; $lang['showuseras_o_email_link'] = 'mailto: link로 표현될 사용자 이메일 주소'; $lang['useheading_o_0'] = '아니오'; $lang['useheading_o_navigation'] = '둘러보기에만'; $lang['useheading_o_content'] = '위키 내용에만'; $lang['useheading_o_1'] = '항상'; -$lang['readdircache'] = 'readdir 캐쉬를 위한 최대 시간 (초)'; +$lang['readdircache'] = 'readdir 캐시를 위한 최대 시간 (초)'; diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php index 9e1fbfcae..4fc6fd1d9 100644 --- a/lib/plugins/plugin/lang/ko/lang.php +++ b/lib/plugins/plugin/lang/ko/lang.php @@ -22,18 +22,18 @@ $lang['btn_download'] = '다운로드'; $lang['btn_enable'] = '저장'; $lang['url'] = 'URL'; $lang['installed'] = '설치됨:'; -$lang['lastupdate'] = '최근 업데이트됨:'; +$lang['lastupdate'] = '가장 나중에 업데이트됨:'; $lang['source'] = '내용:'; $lang['unknown'] = '알 수 없음'; $lang['updating'] = '업데이트 중 ...'; -$lang['updated'] = '%s 플러그인이 성공적으로 업데이트했습니다.'; -$lang['updates'] = '다음 플러그인들이 성공적으로 업데이트했습니다:'; +$lang['updated'] = '%s 플러그인을 성공적으로 업데이트했습니다'; +$lang['updates'] = '다음 플러그인을 성공적으로 업데이트했습니다'; $lang['update_none'] = '업데이트를 찾을 수 없습니다.'; $lang['deleting'] = '삭제 중 ...'; $lang['deleted'] = '%s 플러그인이 삭제되었습니다.'; $lang['downloading'] = '다운로드 중 ...'; $lang['downloaded'] = '%s 플러그인이 성공적으로 설치되었습니다.'; -$lang['downloads'] = '다음 플러그인들이 성공적으로 설치되었습니다:'; +$lang['downloads'] = '다음 플러그인이 성공적으로 설치되었습니다:'; $lang['download_none'] = '플러그인이 없거나 다운로드 또는 설치 중에 알 수 없는 문제가 발생했습니다.'; $lang['plugin'] = '플러그인:'; $lang['components'] = '구성 요소'; @@ -46,7 +46,7 @@ $lang['author'] = '만든이:'; $lang['www'] = '웹:'; $lang['error'] = '알 수 없는 문제가 발생했습니다.'; $lang['error_download'] = '플러그인 파일을 다운로드 할 수 없습니다: %s'; -$lang['error_badurl'] = '잘못된 URL 같습니다. - URL에서 파일 이름을 알 수 없습니다.'; +$lang['error_badurl'] = '잘못된 URL 같습니다 - URL에서 파일 이름을 알 수 없습니다.'; $lang['error_dircreate'] = '다운로드를 받기 위한 임시 디렉토리를 만들 수 없습니다.'; $lang['error_decompress'] = '플러그인 관리자가 다운로드 받은 파일을 압축을 풀 수 없습니다. 잘못 다운로드 받았을 수도 있으니 다시 한번 시도해보기 바랍니다. 또는 압축 포맷을 알 수 없는 경우에는 다운로드한 후 수동으로 직접 설치하기 바랍니다.'; $lang['error_copy'] = '플러그인을 설치하는 동안 파일 복사하는 데 오류가 발생했습니다. <em>%s</em>: 디스크가 꽉 찼거나 파일 접근 권한이 잘못된 경우입니다. 플러그인 설치가 부분적으로만 이루어졌을 것입니다. 설치가 불완전합니다.'; @@ -55,4 +55,4 @@ $lang['enabled'] = '%s 플러그인을 활성화했습니다.'; $lang['notenabled'] = '%s 플러그인을 활성화할 수 없습니다. 파일 권한을 확인하십시오.'; $lang['disabled'] = '%s 플러그인을 비활성화했습니다.'; $lang['notdisabled'] = '%s 플러그인을 비활성화할 수 없습니다. 파일 권한을 확인하십시오.'; -$lang['packageinstalled'] = '플러그인 패키지(%d 개의 플러그인: %s)가 성공적으로 설치되었습니다.'; +$lang['packageinstalled'] = '플러그인 패키지(플러그인 %d개: %s)가 성공적으로 설치되었습니다.'; diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt index 79841fb2b..0af7ee2cc 100644 --- a/lib/plugins/popularity/lang/ko/intro.txt +++ b/lib/plugins/popularity/lang/ko/intro.txt @@ -1,6 +1,6 @@ ====== 인기도 조사 ====== -설치된 위키의 익명 정보를 DokuWiki 개발자들에게 보냅니다. 이 [[doku>popularity|기능]]은 DokuWiki가 실제 사용자들에게 어떻게 사용되는지 DokuWiki 개발자들에게 알려줌으로써 이 후 개발 시 참고가 됩니다. +설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>popularity|기능]]은 DokuWiki가 실제 사용자에게 어떻게 사용되는지 DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다. 설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이타는 익명 ID로 구별되어집니다. diff --git a/lib/plugins/popularity/lang/ko/lang.php b/lib/plugins/popularity/lang/ko/lang.php index 33a0c88f7..5e6966402 100644 --- a/lib/plugins/popularity/lang/ko/lang.php +++ b/lib/plugins/popularity/lang/ko/lang.php @@ -13,7 +13,7 @@ $lang['name'] = '인기도 조사 (불러오는데 시간이 걸릴 수 있습니다.)'; $lang['submit'] = '자료 보내기'; $lang['autosubmit'] = '자료를 자동으로 매달 한번씩 보내기'; -$lang['submissionFailed'] = '다음과 같은 이유로 자료 전송에 실패했습니다 :'; +$lang['submissionFailed'] = '다음과 같은 이유로 자료 전송에 실패했습니다:'; $lang['submitDirectly'] = '아래의 양식에 맞춰 수동으로 작성된 자료를 보낼 수 있습니다'; -$lang['autosubmitError'] = '다음과 같은 이유로 자동 자료 전송에 실패했습니다 :'; +$lang['autosubmitError'] = '다음과 같은 이유로 자동 자료 전송에 실패했습니다:'; $lang['lastSent'] = '자료가 전송되었습니다'; diff --git a/lib/plugins/revert/lang/ko/intro.txt b/lib/plugins/revert/lang/ko/intro.txt index 7fc310eee..30813fe49 100644 --- a/lib/plugins/revert/lang/ko/intro.txt +++ b/lib/plugins/revert/lang/ko/intro.txt @@ -1,3 +1,3 @@ ====== 복구 관리자 ====== -스팸 공격으로 부터 자동으로 복구하는데 이 페이지가 도움이 될 수 있습니다. 스팸 공격받은 문서 목록을 찾으려면 문자열을 입력하기 바랍니다(예를 들어 스팸 URL), 그 후 찾은 문서가 스팸 공격을 받았는지 확인하고 복구합니다. +스팸 공격으로 부터 자동으로 복구하는데 이 페이지가 도움이 될 수 있습니다. 스팸 공격받은 문서 목록을 찾으려면 문자열을 입력하기 바랍니다 (예를 들어 스팸 URL), 그 후 찾은 문서가 스팸 공격을 받았는지 확인하고 복구합니다. diff --git a/lib/plugins/revert/lang/ko/lang.php b/lib/plugins/revert/lang/ko/lang.php index c51af470e..90cba9bce 100644 --- a/lib/plugins/revert/lang/ko/lang.php +++ b/lib/plugins/revert/lang/ko/lang.php @@ -13,9 +13,9 @@ $lang['menu'] = '복구 관리자'; $lang['filter'] = '스팸 문서 찾기'; $lang['revert'] = '선택한 문서 복구'; -$lang['reverted'] = '%s를 %s 버전으로 복구'; +$lang['reverted'] = '%s 버전을 %s 버전으로 복구'; $lang['removed'] = '%s 삭제'; -$lang['revstart'] = '복구 작업을 시작합니다. 오랜 시간이 걸릴 수 있습니다. 완료되기 전에 스크립트 시간 초과가 발생한다면 더 작은 작업들로 나누어서 복구하기 바랍니다.'; +$lang['revstart'] = '복구 작업을 시작합니다. 오랜 시간이 걸릴 수 있습니다. 완료되기 전에 스크립트 시간 초과가 발생한다면 더 작은 작업으로 나누어서 복구하기 바랍니다.'; $lang['revstop'] = '복구 작업이 성공적으로 끝났습니다.'; $lang['note1'] = '참고: 대소문자 구별하여 찾습니다.'; $lang['note2'] = '참고: 이 문서는 <i>%s</i> 스팸 단어를 포함하지 않은 최근 이전 버전으로 복구됩니다. '; diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php index cae81798f..3754fea90 100644 --- a/lib/plugins/usermanager/lang/ko/lang.php +++ b/lib/plugins/usermanager/lang/ko/lang.php @@ -13,7 +13,7 @@ $lang['menu'] = '사용자 관리자'; $lang['noauth'] = '(사용자 인증이 불가능합니다.)'; $lang['nosupport'] = '(사용자 관리가 지원되지 않습니다.)'; -$lang['badauth'] = '유효하지 않은 인증 메카니즘입니다.'; +$lang['badauth'] = '잘못된 인증 메카니즘'; $lang['user_id'] = '사용자'; $lang['user_pass'] = '비밀번호'; $lang['user_name'] = '실제 이름'; @@ -23,7 +23,7 @@ $lang['field'] = '항목'; $lang['value'] = '값'; $lang['add'] = '추가'; $lang['delete'] = '삭제'; -$lang['delete_selected'] = '삭제 선택'; +$lang['delete_selected'] = '선택 삭제'; $lang['edit'] = '수정'; $lang['edit_prompt'] = '이 사용자 수정'; $lang['modify'] = '바뀜 저장'; @@ -31,9 +31,9 @@ $lang['search'] = '찾기'; $lang['search_prompt'] = '찾기 실행'; $lang['clear'] = '찾기 필터 초기화'; $lang['filter'] = '필터'; -$lang['summary'] = '찾은 사용자 보기(%1$d-%2$d 중 %3$d). 전체 사용자 %4$d 명.'; -$lang['nonefound'] = '찾은 사용자가 없습니다. 전체 사용자 %d 명.'; -$lang['delete_ok'] = '사용자 %d명이 삭제되었습니다.'; +$lang['summary'] = '찾은 사용자 %3$d 중 %1$d-%2$d 보기. 전체 사용자 %4$d명.'; +$lang['nonefound'] = '찾은 사용자가 없습니다. 전체 사용자 %d명.'; +$lang['delete_ok'] = '사용자 %d명이 삭제되었습니다'; $lang['delete_fail'] = '사용자 %d명의 삭제가 실패했습니다.'; $lang['update_ok'] = '사용자 변경을 성공했습니다.'; $lang['update_fail'] = '사용자 변경을 실패했습니다.'; -- cgit v1.2.3 From 1731f979e843c43888c2c26142db87b4801bd98e Mon Sep 17 00:00:00 2001 From: Nguyen The Hung <thehung@vinades.vn> Date: Fri, 22 Jun 2012 10:01:44 +0200 Subject: Vietnamese language update --- lib/plugins/acl/lang/vi/help.txt | 12 +++++++++++ lib/plugins/acl/lang/vi/lang.php | 35 ++++++++++++++++++++++++++------ lib/plugins/config/lang/vi/lang.php | 5 +++++ lib/plugins/plugin/lang/vi/lang.php | 5 +++++ lib/plugins/popularity/lang/vi/lang.php | 5 +++++ lib/plugins/revert/lang/vi/lang.php | 5 +++++ lib/plugins/usermanager/lang/vi/lang.php | 5 +++++ 7 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 lib/plugins/acl/lang/vi/help.txt create mode 100644 lib/plugins/config/lang/vi/lang.php create mode 100644 lib/plugins/plugin/lang/vi/lang.php create mode 100644 lib/plugins/popularity/lang/vi/lang.php create mode 100644 lib/plugins/revert/lang/vi/lang.php create mode 100644 lib/plugins/usermanager/lang/vi/lang.php (limited to 'lib') diff --git a/lib/plugins/acl/lang/vi/help.txt b/lib/plugins/acl/lang/vi/help.txt new file mode 100644 index 000000000..23e258678 --- /dev/null +++ b/lib/plugins/acl/lang/vi/help.txt @@ -0,0 +1,12 @@ +=== Trợ giúp nhanh: === + +Trang này giúp bạn thêm hoặc xóa quyền được cấp cho 1 thư mục hoặc trang wiki của bạn. + +Của sổ bên trái hiển thị tất cả các thư mục và trang văn bản. + +Khung trên đây cho phép bạn xem và sửa quyền của một nhóm hoặc thành viên đã chọn. + +Bảng bên dưới hiển thị tất cả các quyền được cấp. Bạn có thể sửa hoặc hóa các quyền đó một cách nhanh chóng. + +Đọc [[doku>acl|tài liệu chính thức về ACL]] sẽ giúp bạn hiểu hơn về cách phân quyền ở DokuWiki. + diff --git a/lib/plugins/acl/lang/vi/lang.php b/lib/plugins/acl/lang/vi/lang.php index 6237f79ba..ddf764dca 100644 --- a/lib/plugins/acl/lang/vi/lang.php +++ b/lib/plugins/acl/lang/vi/lang.php @@ -3,19 +3,42 @@ * vietnamese language file * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author James Do <jdo@myrealbox.com> + * @author NukeViet <admin@nukeviet.vn> */ -$lang['admin_acl'] = 'Quản lý phép truy nhật {Access Control List}'; +$lang['admin_acl'] = 'Quản lý danh sách quyền truy cập'; $lang['acl_group'] = 'Nhóm'; -$lang['acl_user'] = 'Người'; -$lang['acl_perms'] = 'Phép truy nhập cho'; +$lang['acl_user'] = 'Thành viên'; +$lang['acl_perms'] = 'Cấp phép cho'; $lang['page'] = 'Trang'; -$lang['namespace'] = 'Không gian tên'; +$lang['namespace'] = 'Thư mục'; +$lang['btn_select'] = 'Chọn'; + +$lang['p_user_id'] = 'Thành viên <b class="acluser">%s</b> hiện tại được cấp phép cho trang <b class="aclpage">%s</b>: <i>%s</i>.'; +$lang['p_user_ns'] = 'Thành viên <b class="acluser">%s</b> hiện tại được cấp phép cho thư mục <b class="aclns">%s</b>: <i>%s</i>.'; +$lang['p_group_id'] = 'Thành viên trong nhóm <b class="aclgroup">%s</b> hiện tại được cấp phép cho trang <b class="aclpage">%s</b>: <i>%s</i>.'; +$lang['p_group_ns'] = 'Thành viên trong nhóm <b class="aclgroup">%s</b> hiện tại được cấp phép cho thư mục <b class="aclns">%s</b>: <i>%s</i>.'; + +$lang['p_choose_id'] = 'Hãy <b>nhập tên thành viên hoặc nhóm</b> vào ô trên đây để xem hoặc sửa quyền đã thiết đặt cho trang <b class="aclpage">%s</b>.'; +$lang['p_choose_ns'] = 'Hãy <b>nhập tên thành viên hoặc nhóm</b> vào ô trên đây để xem hoặc sửa quyền đã thiết đặt cho thư mục <b class="aclns">%s</b>.'; + + +$lang['p_inherited'] = 'Ghi chú: Có những quyền không được thể hiện ở đây nhưng nó được cấp phép từ những nhóm hoặc thư mục cấp cao.'; +$lang['p_isadmin'] = 'Ghi chú: Nhóm hoặc thành viên này luôn được cấp đủ quyền vì họ là Quản trị tối cao'; +$lang['p_include'] = 'Một số quyền thấp được thể hiện ở mức cao hơn. Quyền tạo, tải lên và xóa chỉ dành cho thư mục, không dành cho trang.'; + +$lang['current'] = 'Danh sách quyền truy cập hiện tại'; +$lang['where'] = 'Trang/Thư mục'; +$lang['who'] = 'Thành viên/Nhóm'; +$lang['perm'] = 'Quyền'; + +$lang['acl_perm0'] = 'Không'; $lang['acl_perm1'] = 'Đọc'; -$lang['acl_perm2'] = 'Biên soạn'; +$lang['acl_perm2'] = 'Sửa'; $lang['acl_perm4'] = 'Tạo'; $lang['acl_perm8'] = 'Tải lên'; +$lang['acl_perm16'] = 'Xóa'; $lang['acl_new'] = 'Thêm mục mới'; +$lang['acl_mod'] = 'Sửa'; //Setup VIM: ex: et ts=2 : diff --git a/lib/plugins/config/lang/vi/lang.php b/lib/plugins/config/lang/vi/lang.php new file mode 100644 index 000000000..2933d8875 --- /dev/null +++ b/lib/plugins/config/lang/vi/lang.php @@ -0,0 +1,5 @@ +<?php +/** + * Vietnamese language file + * + */ diff --git a/lib/plugins/plugin/lang/vi/lang.php b/lib/plugins/plugin/lang/vi/lang.php new file mode 100644 index 000000000..2933d8875 --- /dev/null +++ b/lib/plugins/plugin/lang/vi/lang.php @@ -0,0 +1,5 @@ +<?php +/** + * Vietnamese language file + * + */ diff --git a/lib/plugins/popularity/lang/vi/lang.php b/lib/plugins/popularity/lang/vi/lang.php new file mode 100644 index 000000000..2933d8875 --- /dev/null +++ b/lib/plugins/popularity/lang/vi/lang.php @@ -0,0 +1,5 @@ +<?php +/** + * Vietnamese language file + * + */ diff --git a/lib/plugins/revert/lang/vi/lang.php b/lib/plugins/revert/lang/vi/lang.php new file mode 100644 index 000000000..2933d8875 --- /dev/null +++ b/lib/plugins/revert/lang/vi/lang.php @@ -0,0 +1,5 @@ +<?php +/** + * Vietnamese language file + * + */ diff --git a/lib/plugins/usermanager/lang/vi/lang.php b/lib/plugins/usermanager/lang/vi/lang.php new file mode 100644 index 000000000..2933d8875 --- /dev/null +++ b/lib/plugins/usermanager/lang/vi/lang.php @@ -0,0 +1,5 @@ +<?php +/** + * Vietnamese language file + * + */ -- cgit v1.2.3 From 87ada0b835f589d890ec6cf9cc99e679f6ffef87 Mon Sep 17 00:00:00 2001 From: Dion Nicolaas <dion@nicolaas.net> Date: Fri, 22 Jun 2012 10:03:21 +0200 Subject: Dutch language update --- lib/plugins/config/lang/nl/lang.php | 111 +++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 51 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index 77b8d6a1a..e0c9d7d7c 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -36,6 +36,8 @@ $lang['_anti_spam'] = 'Anti-spaminstellingen'; $lang['_editing'] = 'Pagina-wijzigingsinstellingen'; $lang['_links'] = 'Link-instellingen'; $lang['_media'] = 'Media-instellingen'; +$lang['_notifications'] = 'Meldingsinstellingen'; +$lang['_syndication'] = 'Syndication-instellingen'; $lang['_advanced'] = 'Geavanceerde instellingen'; $lang['_network'] = 'Netwerkinstellingen'; $lang['_plugin_sufix'] = 'Plugin-instellingen'; @@ -43,26 +45,29 @@ $lang['_template_sufix'] = 'Sjabloon-instellingen'; $lang['_msg_setting_undefined'] = 'Geen metadata voor deze instelling.'; $lang['_msg_setting_no_class'] = 'Geen class voor deze instelling.'; $lang['_msg_setting_no_default'] = 'Geen standaard waarde.'; -$lang['fmode'] = 'Bestandaanmaak-modus (file creation mode)'; -$lang['dmode'] = 'Directory-aanmaak-modus (directory creation mode)'; +$lang['title'] = 'Titel van de wiki'; +$lang['start'] = 'Naam startpagina'; $lang['lang'] = 'Taal'; +$lang['template'] = 'Sjabloon ofwel het design van de wiki.'; +$lang['tagline'] = 'Ondertitel (als het sjabloon dat ondersteunt)'; +$lang['sidebar'] = 'Zijbalk-paginanaam (als het sjabloon dat ondersteunt), leeg veld betekent geen zijbalk'; +$lang['license'] = 'Onder welke licentie zou je tekst moeten worden gepubliceerd?'; +$lang['savedir'] = 'Directory om data op te slaan'; $lang['basedir'] = 'Basisdirectory'; $lang['baseurl'] = 'Basis-URL'; -$lang['savedir'] = 'Directory om data op te slaan'; $lang['cookiedir'] = 'Cookie pad. Laat leeg om de basis URL te gebruiken.'; -$lang['start'] = 'Naam startpagina'; -$lang['title'] = 'Titel van de wiki'; -$lang['template'] = 'Sjabloon'; -$lang['license'] = 'Onder welke licentie zou je tekst moeten worden gepubliceerd?'; -$lang['fullpath'] = 'Volledig pad van pagina\'s in de footer weergeven'; +$lang['dmode'] = 'Directory-aanmaak-modus (directory creation mode)'; +$lang['fmode'] = 'Bestandaanmaak-modus (file creation mode)'; +$lang['allowdebug'] = 'Debug toestaan <b>uitzetten indien niet noodzakelijk!</b>'; $lang['recent'] = 'Recente wijzigingen'; +$lang['recent_days'] = 'Hoeveel recente wijzigingen bewaren (dagen)'; $lang['breadcrumbs'] = 'Aantal broodkruimels'; $lang['youarehere'] = 'Hierarchische broodkruimels'; +$lang['fullpath'] = 'Volledig pad van pagina\'s in de footer weergeven'; $lang['typography'] = 'Breng typografische wijzigingen aan'; -$lang['htmlok'] = 'Embedded HTML toestaan'; -$lang['phpok'] = 'Embedded PHP toestaan'; $lang['dformat'] = 'Datum formaat (zie de PHP <a href="http://www.php.net/strftime">strftime</a> functie)'; $lang['signature'] = 'Ondertekening'; +$lang['showuseras'] = 'Hoe de gebruiker die de pagina het laatst wijzigde weergeven'; $lang['toptoclevel'] = 'Bovenste niveau voor inhoudsopgave'; $lang['tocminheads'] = 'Minimum aantal koppen dat bepaald of een index gemaakt wordt'; $lang['maxtoclevel'] = 'Laagste niveau voor inhoudsopgave'; @@ -70,16 +75,8 @@ $lang['maxseclevel'] = 'Laagste sectiewijzigingsniveau'; $lang['camelcase'] = 'CamelCase gebruiken voor links'; $lang['deaccent'] = 'Paginanamen ontdoen van vreemde tekens'; $lang['useheading'] = 'Eerste kopje voor paginanaam gebruiken'; -$lang['refcheck'] = 'Controleer verwijzingen naar media'; -$lang['refshow'] = 'Aantal te tonen mediaverwijzingen'; -$lang['allowdebug'] = 'Debug toestaan <b>uitzetten indien niet noodzakelijk!</b>'; -$lang['mediarevisions'] = 'Media revisies activeren?'; -$lang['usewordblock'] = 'Blokkeer spam op basis van woordenlijst'; -$lang['indexdelay'] = 'Uitstel voor indexeren (sec)'; -$lang['relnofollow'] = 'Gebruik rel="nofollow" voor externe links'; -$lang['mailguard'] = 'E-mailadressen onherkenbaar maken'; -$lang['iexssprotect'] = 'Controleer geüploade bestanden op mogelijk schadelijke JavaScript of HTML code'; -$lang['showuseras'] = 'Hoe de gebruiker die de pagina het laatst wijzigde weergeven'; +$lang['sneaky_index'] = 'Met de standaardinstellingen zal DokuWiki alle namespaces laten zien in de index. Het inschakelen van deze optie zorgt ervoor dat de namespaces waar de gebruiker geen leestoegang tot heeft, verborgen worden. Dit kan resulteren in het verbergen van subnamespaces waar de gebruiker wel toegang to heeft. Dit kan de index onbruikbaar maken met bepaalde ACL-instellingen.'; +$lang['hidepages'] = 'Verberg deze pagina\'s (regular expressions)'; $lang['useacl'] = 'Gebruik access control lists'; $lang['autopasswd'] = 'Zelf wachtwoorden genereren'; $lang['authtype'] = 'Authenticatiemechanisme'; @@ -88,64 +85,76 @@ $lang['defaultgroup'] = 'Standaardgroep'; $lang['superuser'] = 'Superuser - een groep of gebruiker of kommalijst (gebruiker1,@groep1,gebruiker2) met volledige toegang tot alle pagina\'s en functies, ongeacht de ACL instellingen'; $lang['manager'] = 'Beheerder - een groep of gebruiker of kommalijst (gebruiker1,@groep1,gebruiker2) met toegang tot bepaalde beheersfunctionaliteit'; $lang['profileconfirm'] = 'Bevestig profielwijzigingen met wachtwoord'; +$lang['rememberme'] = 'Permanente login cookie toestaan (onthoud mij)'; $lang['disableactions'] = 'Aangevinkte DokuWiki-akties uitschakelen'; $lang['disableactions_check'] = 'Controleer'; $lang['disableactions_subscription'] = 'Inschrijven/opzeggen'; $lang['disableactions_wikicode'] = 'Bron bekijken/exporteer rauw'; $lang['disableactions_other'] = 'Andere akties (gescheiden door komma\'s)'; -$lang['sneaky_index'] = 'Met de standaardinstellingen zal DokuWiki alle namespaces laten zien in de index. Het inschakelen van deze optie zorgt ervoor dat de namespaces waar de gebruiker geen leestoegang tot heeft, verborgen worden. Dit kan resulteren in het verbergen van subnamespaces waar de gebruiker wel toegang to heeft. Dit kan de index onbruikbaar maken met bepaalde ACL-instellingen.'; $lang['auth_security_timeout'] = 'Authenticatiebeveiligings-timeout (seconden)'; $lang['securecookie'] = 'Moeten cookies die via HTTPS gezet zijn alleen via HTTPS verzonden worden door de browser? Zet deze optie uit als alleen het inloggen op de wiki beveiligd is, maar het gebruik verder niet.'; +$lang['remote'] = 'Activeer het remote API-systeem. Hiermee kunnen andere applicaties de wiki benaderen via XML-RPC of andere mechanismen.'; +$lang['remoteuser'] = 'Beperk toegang tot de remote API tot deze komma-lijst van groepen of gebruikers. Leeg betekent toegang voor iedereen.'; +$lang['usewordblock'] = 'Blokkeer spam op basis van woordenlijst'; +$lang['relnofollow'] = 'Gebruik rel="nofollow" voor externe links'; +$lang['indexdelay'] = 'Uitstel voor indexeren (sec)'; +$lang['mailguard'] = 'E-mailadressen onherkenbaar maken'; +$lang['iexssprotect'] = 'Controleer geüploade bestanden op mogelijk schadelijke JavaScript of HTML code'; +$lang['usedraft'] = 'Sla automatisch een concept op tijdens het wijzigen'; +$lang['htmlok'] = 'Embedded HTML toestaan'; +$lang['phpok'] = 'Embedded PHP toestaan'; +$lang['locktime'] = 'Maximum leeftijd voor lockbestanden (sec)'; +$lang['cachetime'] = 'Maximum leeftijd voor cache (sec)'; +$lang['target____wiki'] = 'Doelvenster voor interne links'; +$lang['target____interwiki'] = 'Doelvenster voor interwiki-links'; +$lang['target____extern'] = 'Doelvenster voor externe links'; +$lang['target____media'] = 'Doelvenster voor medialinks'; +$lang['target____windows'] = 'Doelvenster voor windows links'; +$lang['mediarevisions'] = 'Media revisies activeren?'; +$lang['refcheck'] = 'Controleer verwijzingen naar media'; +$lang['refshow'] = 'Aantal te tonen mediaverwijzingen'; +$lang['gdlib'] = 'Versie GD Lib '; +$lang['im_convert'] = 'Path naar ImageMagick\'s convert tool'; +$lang['jpg_quality'] = 'JPG compressiekwaliteit (0-100)'; +$lang['fetchsize'] = 'Maximum grootte (bytes) die fetch.php mag downloaden van buiten'; +$lang['subscribers'] = 'Ondersteuning pagina-inschrijving aanzetten'; +$lang['subscribe_time'] = 'Inschrijvingsmeldingen en samenvattingen worden na deze tijdsduur (in seconden) verzonden. Deze waarde dient kleiner te zijn dan de tijd ingevuld bij "Hoeveel recente wijzigingen bewaren (dagen)"'; +$lang['notify'] = 'Stuur e-mailnotificaties naar dit adres'; +$lang['registernotify'] = 'Stuur informatie over nieuw aangemelde gebruikers naar dit e-mailadres'; +$lang['mailfrom'] = 'E-mailadres voor automatische e-mail'; +$lang['mailprefix'] = 'Te gebruiken voorvoegsel voor onderwerp automatische email'; +$lang['htmlmail'] = 'Zend multipart HTML e-mail. Dit ziet er beter uit, maar is groter. Uitschakelen betekent e-mail in platte tekst.'; +$lang['sitemap'] = 'Genereer Google sitemap (dagen). 0 betekent uitschakelen.'; +$lang['rss_type'] = 'XML feed type'; +$lang['rss_linkto'] = 'XML feed linkt naar'; +$lang['rss_content'] = 'Wat moet er in de XML feed items weergegeven worden?'; +$lang['rss_update'] = 'XML feed verversingsinterval (sec)'; +$lang['rss_show_summary'] = 'XML feed samenvatting in titel weergeven'; +$lang['rss_media'] = 'Welk type verandering moet in de XML feed worden weergegeven?'; $lang['updatecheck'] = 'Controleer op nieuwe versies en beveiligingswaarschuwingen? DokuWiki moet hiervoor contact opnemen met update.dokuwiki.org.'; $lang['userewrite'] = 'Gebruik nette URL\'s'; $lang['useslash'] = 'Gebruik slash (/) als scheiding tussen namepaces in URL\'s'; -$lang['usedraft'] = 'Sla automatisch een concept op tijdens het wijzigen'; $lang['sepchar'] = 'Woordscheider in paginanamen'; $lang['canonical'] = 'Herleid URL\'s tot hun basisvorm'; $lang['fnencode'] = 'Methode om niet-ASCII bestandsnamen te coderen.'; $lang['autoplural'] = 'Controleer op meervoudsvormen in links'; $lang['compression'] = 'Compressiemethode voor attic-bestanden'; -$lang['cachetime'] = 'Maximum leeftijd voor cache (sec)'; -$lang['locktime'] = 'Maximum leeftijd voor lockbestanden (sec)'; -$lang['fetchsize'] = 'Maximum grootte (bytes) die fetch.php mag downloaden van buiten'; -$lang['notify'] = 'Stuur e-mailnotificaties naar dit adres'; -$lang['registernotify'] = 'Stuur informatie over nieuw aangemelde gebruikers naar dit e-mailadres'; -$lang['mailfrom'] = 'E-mailadres voor automatische e-mail'; -$lang['mailprefix'] = 'Te gebruiken voorvoegsel voor onderwerp automatische email'; $lang['gzip_output'] = 'Gebruik gzip Content-Encoding voor xhtml'; -$lang['gdlib'] = 'Versie GD Lib '; -$lang['im_convert'] = 'Path naar ImageMagick\'s convert tool'; -$lang['jpg_quality'] = 'JPG compressiekwaliteit (0-100)'; -$lang['subscribers'] = 'Ondersteuning pagina-inschrijving aanzetten'; -$lang['subscribe_time'] = 'Inschrijvingsmeldingen en samenvattingen worden na deze tijdsduur (in seconden) verzonden. Deze waarde dient kleiner te zijn dan de tijd ingevuld bij "Hoeveel recente wijzigingen bewaren (dagen)"'; $lang['compress'] = 'Compacte CSS en javascript output'; $lang['cssdatauri'] = 'Maximale omvang in bytes van in CSS gelinkte afbeeldingen die bij de stylesheet moeten worden ingesloten ter reductie van de HTTP request header overhead. Deze techniek werkt niet in IE7 en ouder! <code>400</code> tot <code>600</code> is een geschikte omvang. Stel de omvang in op <code>0</code> om deze functionaliteit uit te schakelen.'; -$lang['hidepages'] = 'Verberg deze pagina\'s (regular expressions)'; $lang['send404'] = 'Stuur "HTTP 404/Page Not Found" voor niet-bestaande pagina\'s'; -$lang['sitemap'] = 'Genereer Google sitemap (dagen)'; $lang['broken_iua'] = 'Is de ignore_user_abort functie onbruikbaar op uw systeem? Dit kan een onbruikbare zoekindex tot gevolg hebben. IIS+PHP/CGI staat hier bekend om. Zie <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Bug 852</a> voor meer informatie.'; $lang['xsendfile'] = 'Gebruik de X-Sendfile header om de webserver statische content te laten versturen? De webserver moet dit wel ondersteunen.'; $lang['renderer_xhtml'] = 'Weergavesysteem voor de standaard (xhtml) wiki-uitvoer'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; -$lang['rememberme'] = 'Permanente login cookie toestaan (onthoud mij)'; -$lang['rss_type'] = 'XML feed type'; -$lang['rss_linkto'] = 'XML feed linkt naar'; -$lang['rss_content'] = 'Wat moet er in de XML feed items weergegeven worden?'; -$lang['rss_update'] = 'XML feed verversingsinterval (sec)'; -$lang['recent_days'] = 'Hoeveel recente wijzigingen bewaren (dagen)'; -$lang['rss_show_summary'] = 'XML feed samenvatting in titel weergeven'; -$lang['target____wiki'] = 'Doelvenster voor interne links'; -$lang['target____interwiki'] = 'Doelvenster voor interwiki-links'; -$lang['target____extern'] = 'Doelvenster voor externe links'; -$lang['target____media'] = 'Doelvenster voor medialinks'; -$lang['target____windows'] = 'Doelvenster voor windows links'; +$lang['dnslookups'] = 'DokuWiki zoekt de hostnamen van IP-adressen van gebruikers die pagina wijzigen op. Schakel deze optie uit als je geen of een langzame DNS server hebt.'; $lang['proxy____host'] = 'Proxy server'; $lang['proxy____port'] = 'Proxy port'; $lang['proxy____user'] = 'Proxy gebruikersnaam'; $lang['proxy____pass'] = 'Proxy wachtwoord'; -$lang['proxy____ssl'] = 'Gebruik SSL om een connectie te maken met de proxy'; -$lang['proxy____except'] = 'Reguliere expressie om URL\'s te bepalen waarvoor de proxy overgeslaan moet worden.'; +$lang['proxy____ssl'] = 'Gebruik SSL om een verbinding te maken met de proxy'; +$lang['proxy____except'] = 'Reguliere expressie om URL\'s te bepalen waarvoor de proxy overgeslagen moet worden.'; $lang['safemodehack'] = 'Safemode hack aanzetten'; $lang['ftp____host'] = 'FTP server voor safemode hack'; $lang['ftp____port'] = 'FTP port voor safemode hack'; @@ -185,7 +194,7 @@ $lang['xsendfile_o_0'] = 'niet gebruiken'; $lang['xsendfile_o_1'] = 'Eigen lighttpd header (voor release 1.5)'; $lang['xsendfile_o_2'] = 'Standaard X-Sendfile header'; $lang['xsendfile_o_3'] = 'Propritary Nginx X-Accel-Redirect header'; -$lang['showuseras_o_loginname'] = 'loginnaam'; +$lang['showuseras_o_loginname'] = 'Loginnaam'; $lang['showuseras_o_username'] = 'Volledige naam'; $lang['showuseras_o_email'] = 'E-mailadres (onherkenbaar gemaakt volgens mailguard-instelling)'; $lang['showuseras_o_email_link'] = 'E-mailadres als mailto: link'; -- cgit v1.2.3 From 44b0470cb5f4a7e78a12354f552748afe03861b9 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Wed, 27 Jun 2012 23:13:49 +0200 Subject: compressed new template graphics with tinypng.org --- lib/tpl/dokuwiki/images/apple-touch-icon.png | Bin 17728 -> 6399 bytes lib/tpl/dokuwiki/images/bullet.png | Bin 199 -> 112 bytes lib/tpl/dokuwiki/images/button-dw.png | Bin 404 -> 398 bytes lib/tpl/dokuwiki/images/button-rss.png | Bin 191 -> 180 bytes lib/tpl/dokuwiki/images/closed-rtl.png | Bin 170 -> 118 bytes lib/tpl/dokuwiki/images/closed.png | Bin 165 -> 119 bytes lib/tpl/dokuwiki/images/email.png | Bin 630 -> 502 bytes lib/tpl/dokuwiki/images/external-link.png | Bin 947 -> 758 bytes lib/tpl/dokuwiki/images/logo.png | Bin 12212 -> 3820 bytes lib/tpl/dokuwiki/images/open.png | Bin 174 -> 118 bytes lib/tpl/dokuwiki/images/pagetools-sprite.png | Bin 8178 -> 5931 bytes lib/tpl/dokuwiki/images/resizecol.png | Bin 225 -> 158 bytes lib/tpl/dokuwiki/images/search.png | Bin 400 -> 316 bytes lib/tpl/dokuwiki/images/sitetools.png | Bin 3186 -> 2225 bytes lib/tpl/dokuwiki/images/toc-arrows.png | Bin 322 -> 225 bytes lib/tpl/dokuwiki/images/toc-bullet.png | Bin 211 -> 121 bytes lib/tpl/dokuwiki/images/unc.png | Bin 553 -> 517 bytes 17 files changed, 0 insertions(+), 0 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/images/apple-touch-icon.png b/lib/tpl/dokuwiki/images/apple-touch-icon.png index 45fa4e7b0..fb5f108c0 100644 Binary files a/lib/tpl/dokuwiki/images/apple-touch-icon.png and b/lib/tpl/dokuwiki/images/apple-touch-icon.png differ diff --git a/lib/tpl/dokuwiki/images/bullet.png b/lib/tpl/dokuwiki/images/bullet.png index 5da537443..5e557b334 100644 Binary files a/lib/tpl/dokuwiki/images/bullet.png and b/lib/tpl/dokuwiki/images/bullet.png differ diff --git a/lib/tpl/dokuwiki/images/button-dw.png b/lib/tpl/dokuwiki/images/button-dw.png index 97272d968..8d6aea898 100644 Binary files a/lib/tpl/dokuwiki/images/button-dw.png and b/lib/tpl/dokuwiki/images/button-dw.png differ diff --git a/lib/tpl/dokuwiki/images/button-rss.png b/lib/tpl/dokuwiki/images/button-rss.png index f2438043f..b7cddadec 100644 Binary files a/lib/tpl/dokuwiki/images/button-rss.png and b/lib/tpl/dokuwiki/images/button-rss.png differ diff --git a/lib/tpl/dokuwiki/images/closed-rtl.png b/lib/tpl/dokuwiki/images/closed-rtl.png index 85ebd59e1..caa027e34 100644 Binary files a/lib/tpl/dokuwiki/images/closed-rtl.png and b/lib/tpl/dokuwiki/images/closed-rtl.png differ diff --git a/lib/tpl/dokuwiki/images/closed.png b/lib/tpl/dokuwiki/images/closed.png index 3691ebc17..e3bd0f9e9 100644 Binary files a/lib/tpl/dokuwiki/images/closed.png and b/lib/tpl/dokuwiki/images/closed.png differ diff --git a/lib/tpl/dokuwiki/images/email.png b/lib/tpl/dokuwiki/images/email.png index 4ba4aad2f..5128be895 100644 Binary files a/lib/tpl/dokuwiki/images/email.png and b/lib/tpl/dokuwiki/images/email.png differ diff --git a/lib/tpl/dokuwiki/images/external-link.png b/lib/tpl/dokuwiki/images/external-link.png index 60fc8716b..084135f95 100644 Binary files a/lib/tpl/dokuwiki/images/external-link.png and b/lib/tpl/dokuwiki/images/external-link.png differ diff --git a/lib/tpl/dokuwiki/images/logo.png b/lib/tpl/dokuwiki/images/logo.png index 8b794dd64..35640279c 100644 Binary files a/lib/tpl/dokuwiki/images/logo.png and b/lib/tpl/dokuwiki/images/logo.png differ diff --git a/lib/tpl/dokuwiki/images/open.png b/lib/tpl/dokuwiki/images/open.png index 40ff129be..5f2d408c5 100644 Binary files a/lib/tpl/dokuwiki/images/open.png and b/lib/tpl/dokuwiki/images/open.png differ diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png index bbd7fd361..898f0f4a6 100644 Binary files a/lib/tpl/dokuwiki/images/pagetools-sprite.png and b/lib/tpl/dokuwiki/images/pagetools-sprite.png differ diff --git a/lib/tpl/dokuwiki/images/resizecol.png b/lib/tpl/dokuwiki/images/resizecol.png index f0111507c..b5aeec004 100644 Binary files a/lib/tpl/dokuwiki/images/resizecol.png and b/lib/tpl/dokuwiki/images/resizecol.png differ diff --git a/lib/tpl/dokuwiki/images/search.png b/lib/tpl/dokuwiki/images/search.png index 2adfc7357..1ab7866fb 100644 Binary files a/lib/tpl/dokuwiki/images/search.png and b/lib/tpl/dokuwiki/images/search.png differ diff --git a/lib/tpl/dokuwiki/images/sitetools.png b/lib/tpl/dokuwiki/images/sitetools.png index 62a17a0c3..dc5764647 100644 Binary files a/lib/tpl/dokuwiki/images/sitetools.png and b/lib/tpl/dokuwiki/images/sitetools.png differ diff --git a/lib/tpl/dokuwiki/images/toc-arrows.png b/lib/tpl/dokuwiki/images/toc-arrows.png index 9f441eb26..4a353e4f6 100644 Binary files a/lib/tpl/dokuwiki/images/toc-arrows.png and b/lib/tpl/dokuwiki/images/toc-arrows.png differ diff --git a/lib/tpl/dokuwiki/images/toc-bullet.png b/lib/tpl/dokuwiki/images/toc-bullet.png index a6f0169c3..fc771b97e 100644 Binary files a/lib/tpl/dokuwiki/images/toc-bullet.png and b/lib/tpl/dokuwiki/images/toc-bullet.png differ diff --git a/lib/tpl/dokuwiki/images/unc.png b/lib/tpl/dokuwiki/images/unc.png index 6dd3d365c..f2aca8815 100644 Binary files a/lib/tpl/dokuwiki/images/unc.png and b/lib/tpl/dokuwiki/images/unc.png differ -- cgit v1.2.3 From bfd0f5975e6e3578b4fa0c712e9779a0861fdc72 Mon Sep 17 00:00:00 2001 From: Tom N Harris <tnharris@whoopdedo.org> Date: Thu, 28 Jun 2012 22:04:10 -0400 Subject: Input wrapper for exe scripts --- lib/exe/css.php | 8 ++++---- lib/exe/detail.php | 4 ++-- lib/exe/fetch.php | 8 ++++---- lib/exe/indexer.php | 7 ++++--- 4 files changed, 14 insertions(+), 13 deletions(-) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index 69b512205..5cc4ab830 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -29,14 +29,14 @@ function css_out(){ global $conf; global $lang; global $config_cascade; + global $INPUT; $mediatype = 'screen'; - if (isset($_REQUEST['s']) && - in_array($_REQUEST['s'], array('all', 'print', 'feed'))) { - $mediatype = $_REQUEST['s']; + if (in_array($INPUT->str('s'), array('all', 'print', 'feed'))) { + $mediatype = $INPUT->str('s'); } - $tpl = trim(preg_replace('/[^\w-]+/','',$_REQUEST['t'])); + $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t'))); if($tpl){ $tplinc = DOKU_INC.'lib/tpl/'.$tpl.'/'; $tpldir = DOKU_BASE.'lib/tpl/'.$tpl.'/'; diff --git a/lib/exe/detail.php b/lib/exe/detail.php index 35186f5dd..ea46bc037 100644 --- a/lib/exe/detail.php +++ b/lib/exe/detail.php @@ -6,9 +6,9 @@ require_once(DOKU_INC.'inc/init.php'); session_write_close(); $IMG = getID('media'); -$ID = cleanID($_REQUEST['id']); +$ID = cleanID($INPUT->str('id')); -if($conf['allowdebug'] && $_REQUEST['debug']){ +if($conf['allowdebug'] && $INPUT->has('debug')){ print '<pre>'; foreach(explode(' ','basedir userewrite baseurl useslash') as $x){ print '$'."conf['$x'] = '".$conf[$x]."';\n"; diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php index 143d40f22..60843460e 100644 --- a/lib/exe/fetch.php +++ b/lib/exe/fetch.php @@ -17,10 +17,10 @@ //get input $MEDIA = stripctl(getID('media',false)); // no cleaning except control chars - maybe external - $CACHE = calc_cache($_REQUEST['cache']); - $WIDTH = (int) $_REQUEST['w']; - $HEIGHT = (int) $_REQUEST['h']; - $REV = (int) @$_REQUEST['rev']; + $CACHE = calc_cache($INPUT->str('cache')); + $WIDTH = $INPUT->int('w'); + $HEIGHT = $INPUT->int('h'); + $REV = &$INPUT->ref('rev'); //sanitize revision $REV = preg_replace('/[^0-9]/','',$REV); diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 738a29503..e149770c0 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -20,10 +20,10 @@ if(!$defer){ sendGIF(); // send gif } -$ID = cleanID($_REQUEST['id']); +$ID = cleanID($INPUT->str('id')); // Catch any possible output (e.g. errors) -$output = isset($_REQUEST['debug']) && $conf['allowdebug']; +$output = $INPUT->has('debug') && $conf['allowdebug']; if(!$output) ob_start(); // run one of the jobs @@ -261,7 +261,8 @@ function sendDigest() { * @author Harry Fuecks <fuecks@gmail.com> */ function sendGIF(){ - if(isset($_REQUEST['debug'])){ + global $INPUT; + if($INPUT->has('debug')){ header('Content-Type: text/plain'); return; } -- cgit v1.2.3 From 8108113c244529ec54f11271a6a15e3d1e0a048f Mon Sep 17 00:00:00 2001 From: Tom N Harris <tnharris@whoopdedo.org> Date: Thu, 28 Jun 2012 22:15:56 -0400 Subject: Input validation for media manager --- lib/exe/mediamanager.php | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'lib') diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index 5f09fe1f8..83166a2f4 100644 --- a/lib/exe/mediamanager.php +++ b/lib/exe/mediamanager.php @@ -11,24 +11,23 @@ session_write_close(); //close session // handle passed message - if($_REQUEST['msg1']) msg(hsc($_REQUEST['msg1']),1); - if($_REQUEST['err']) msg(hsc($_REQUEST['err']),-1); + if($INPUT->str('msg1')) msg(hsc($INPUT->str('msg1')),1); + if($INPUT->str('err')) msg(hsc($INPUT->str('err')),-1); // get namespace to display (either direct or from deletion order) - if($_REQUEST['delete']){ - $DEL = cleanID($_REQUEST['delete']); + if($INPUT->str('delete')){ + $DEL = cleanID($INPUT->str('delete')); $IMG = $DEL; $NS = getNS($DEL); - }elseif($_REQUEST['edit']){ - $IMG = cleanID($_REQUEST['edit']); + }elseif($INPUT->str('edit')){ + $IMG = cleanID($INPUT->str('edit')); $NS = getNS($IMG); - }elseif($_REQUEST['img']){ - $IMG = cleanID($_REQUEST['img']); + }elseif($INPUT->str('img')){ + $IMG = cleanID($INPUT->str('img')); $NS = getNS($IMG); }else{ - $NS = $_REQUEST['ns']; - $NS = cleanID($NS); + $NS = cleanID($INPUT->str('ns')); } // check auth @@ -76,18 +75,18 @@ } // handle meta saving - if($IMG && @array_key_exists('save', $_REQUEST['do'])){ - $JUMPTO = media_metasave($IMG,$AUTH,$_REQUEST['meta']); + if($IMG && @array_key_exists('save', $INPUT->arr('do'))){ + $JUMPTO = media_metasave($IMG,$AUTH,$INPUT->arr('meta')); } - if($IMG && ($_REQUEST['mediado'] == 'save' || @array_key_exists('save', $_REQUEST['mediado']))) { - $JUMPTO = media_metasave($IMG,$AUTH,$_REQUEST['meta']); + if($IMG && ($INPUT->str('mediado') == 'save' || @array_key_exists('save', $INPUT->arr('mediado')))) { + $JUMPTO = media_metasave($IMG,$AUTH,$INPUT->arr('meta')); } - if ($_REQUEST['rev'] && $conf['mediarevisions']) $REV = (int) $_REQUEST['rev']; + if ($INPUT->int('rev') && $conf['mediarevisions']) $REV = $INPUT->int('rev'); - if($_REQUEST['mediado'] == 'restore' && $conf['mediarevisions']){ - $JUMPTO = media_restore($_REQUEST['image'], $REV, $AUTH); + if($INPUT->str('mediado') == 'restore' && $conf['mediarevisions']){ + $JUMPTO = media_restore($INPUT->str('image'), $REV, $AUTH); } // handle deletion @@ -101,7 +100,7 @@ if ($res & DOKU_MEDIA_EMPTY_NS && !$fullscreen) { // current namespace was removed. redirecting to root ns passing msg along send_redirect(DOKU_URL.'lib/exe/mediamanager.php?msg1='. - rawurlencode($msg).'&edid='.$_REQUEST['edid']); + rawurlencode($msg).'&edid='.$INPUT->str('edid')); } msg($msg,1); } elseif ($res & DOKU_MEDIA_INUSE) { -- cgit v1.2.3 From 361f1762edc347181a45a66ba541ba8f144552c0 Mon Sep 17 00:00:00 2001 From: Tom N Harris <tnharris@whoopdedo.org> Date: Fri, 29 Jun 2012 00:03:16 -0400 Subject: fix necessary global declaration --- lib/exe/mediamanager.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php index 83166a2f4..04dd178cc 100644 --- a/lib/exe/mediamanager.php +++ b/lib/exe/mediamanager.php @@ -10,6 +10,7 @@ trigger_event('MEDIAMANAGER_STARTED',$tmp=array()); session_write_close(); //close session + global $INPUT; // handle passed message if($INPUT->str('msg1')) msg(hsc($INPUT->str('msg1')),1); if($INPUT->str('err')) msg(hsc($INPUT->str('err')),-1); -- cgit v1.2.3 From d0f8d50b16073494dc8ccc16905d445467e648cd Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Fri, 29 Jun 2012 15:01:48 +0200 Subject: simplified %GROUP% wildcard support --- lib/plugins/config/lang/en/lang.php | 2 -- lib/plugins/config/lang/fr/lang.php | 2 -- lib/plugins/config/settings/config.metadata.php | 2 -- 3 files changed, 6 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index abc069eab..83c843b3a 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -92,8 +92,6 @@ $lang['hidepages'] = 'Hide pages matching this regular expressions from search /* Authentication Settings */ $lang['useacl'] = 'Use access control lists'; -$lang['usewildcards'] = 'Use the wildcard %USER% for ACL'; -$lang['groupwildcards'] = 'Use the wildcard %GROUP% for ACL'; $lang['autopasswd'] = 'Autogenerate passwords'; $lang['authtype'] = 'Authentication backend'; $lang['passcrypt'] = 'Password encryption method'; diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 5fdcd474c..591e9f2fb 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -79,8 +79,6 @@ $lang['useheading'] = 'Utiliser le titre de premier niveau'; $lang['sneaky_index'] = 'Par défaut, DokuWiki affichera toutes les catégories dans la vue par index. Activer cette option permet de cacher celles pour lesquelles l\'utilisateur n\'a pas la permission de lecture. Il peut en résulter le masquage de sous-catégories accessibles. Ceci peut rendre l\'index inutilisable avec certaines ACL.'; $lang['hidepages'] = 'Cacher les pages correspondant à (expression régulière)'; $lang['useacl'] = 'Utiliser les listes de contrôle d\'accès (ACL)'; -$lang['usewildcards'] = 'Utiliser le joker %USER% dans les ACL'; -$lang['groupwildcards'] = 'Utiliser le joker %GROUP% dans les ACL'; $lang['autopasswd'] = 'Auto-générer les mots de passe'; $lang['authtype'] = 'Mécanisme d\'authentification'; $lang['passcrypt'] = 'Méthode de chiffrement des mots de passe'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 675dca6cc..3607f56c6 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -124,8 +124,6 @@ $meta['hidepages'] = array('string'); $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); -$meta['usewildcards'] = array('onoff'); -$meta['groupwildcards'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); $meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5','bcrypt')); -- cgit v1.2.3 From d14f4018ba7db0f68e767c52d4dc7faba789bf4a Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Fri, 29 Jun 2012 15:29:23 +0100 Subject: improved media queries for mobile and tablet modes --- lib/tpl/dokuwiki/css/mobile.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index b57b60e9b..5edb88cb2 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -7,7 +7,7 @@ /* up to 768px screen widths ********************************************************************/ -@media only screen and (max-width: 768px), only screen and (max-device-width: 960px) { +@media only screen and (max-width: 768px), only screen and (max-device-width: 1024px) { /* structure */ #dokuwiki__aside { @@ -94,7 +94,7 @@ /* up to 480px screen widths ********************************************************************/ -@media only screen and (max-width: 480px), only screen and (max-device-width: 960px) { +@media only screen and (max-width: 480px), only screen and (max-device-width: 768px) { /*____________ structure ____________*/ -- cgit v1.2.3 From a4760d1fcb813f4e4eee4e533b6baace877faf8f Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Fri, 29 Jun 2012 16:07:57 +0100 Subject: try twitter bootstrap version of media queries for mobile and tablet modes --- lib/tpl/dokuwiki/css/mobile.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 5edb88cb2..c5ab6d3a9 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -7,7 +7,7 @@ /* up to 768px screen widths ********************************************************************/ -@media only screen and (max-width: 768px), only screen and (max-device-width: 1024px) { +@media only screen and (max-width: 767px) { /* structure */ #dokuwiki__aside { @@ -94,7 +94,7 @@ /* up to 480px screen widths ********************************************************************/ -@media only screen and (max-width: 480px), only screen and (max-device-width: 768px) { +@media only screen and (max-width: 480px) { /*____________ structure ____________*/ -- cgit v1.2.3 From ddc8fa81b32f1eeabe3f12c2e0d6f48d132b1751 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Fri, 29 Jun 2012 16:23:56 +0100 Subject: adjusted wrong dimension for tablet mode --- lib/tpl/dokuwiki/css/mobile.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index c5ab6d3a9..bf86b004b 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -7,7 +7,7 @@ /* up to 768px screen widths ********************************************************************/ -@media only screen and (max-width: 767px) { +@media only screen and (max-width: 979px) { /* structure */ #dokuwiki__aside { -- cgit v1.2.3 From 30fc91c71951c9911396de78b8acd7d6d4b5d54c Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Fri, 29 Jun 2012 16:34:40 +0100 Subject: adjusted comment in mobile.css to reflect recent changes --- lib/tpl/dokuwiki/css/mobile.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index bf86b004b..4d18113ac 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -5,7 +5,7 @@ * @author Anika Henke <anika@selfthinker.org> */ -/* up to 768px screen widths +/* up to 979px screen widths ********************************************************************/ @media only screen and (max-width: 979px) { -- cgit v1.2.3 From ef7e36e4fd2a168977754f0aac1d855fb651f104 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Fri, 29 Jun 2012 18:27:23 +0200 Subject: make mobile javascript work correctly on orientation change --- lib/tpl/dokuwiki/script.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index b31d3dc08..75575608b 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -1,10 +1,14 @@ -jQuery(function(){ - // check if we are in mobile mode - if(jQuery('div.mobileTools').css('display') == 'none') return; +function tpl_dokuwiki_mobile(){ + // check if we are in mobile or tablet mode be sure to adjust the number + // here when adjusting it in the css + if(document.body.clientWidth > 979) return; // toc and sidebar hiding dw_page.makeToggle('#dokuwiki__aside h3.toggle','#dokuwiki__aside div.content'); jQuery('#dw__toc h3.toggle').click(); jQuery('#dokuwiki__aside h3.toggle').show().click(); -}); +} + +jQuery(tpl_dokuwiki_mobile); +jQuery(window).bind('resize',tpl_dokuwiki_mobile); -- cgit v1.2.3 From 688c5219ce1f6bf1dbda6e733bec881baaa24025 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sat, 30 Jun 2012 12:03:59 +0200 Subject: fixed the toc/sidebar toggling script for real --- lib/scripts/page.js | 50 ++++++++++++++++++++++++++++------------------ lib/tpl/dokuwiki/script.js | 34 +++++++++++++++++++++++-------- 2 files changed, 57 insertions(+), 27 deletions(-) (limited to 'lib') diff --git a/lib/scripts/page.js b/lib/scripts/page.js index 74dec37fb..78943be7a 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -102,7 +102,7 @@ dw_page = { * @param selector handle What should be clicked to toggle * @param selector content This element will be toggled */ - makeToggle: function(handle, content){ + makeToggle: function(handle, content, state){ var $handle, $content, $clicky, $child, setClicky; $handle = jQuery(handle); if(!$handle.length) return; @@ -125,32 +125,44 @@ dw_page = { } }; - // the state indicator - $clicky = jQuery(document.createElement('strong')); + $handle[0].setState = function(state){ + var hidden; + if(!state) state = 1; - // click function - $handle.css('cursor','pointer') - .click(function () { - var hidden; + // Assert that content instantly takes the whole space + $content.css('height', $content.height()).show(); - // Assert that content instantly takes the whole space - $content.css('height', $content.height()).show(); + // stop any running animation + $child.stop(true, true); - // stop any running animation and get current state - hidden = $child.stop(true, true).is(':hidden'); + // was a state given or do we toggle? + if(state === -1) { + hidden = false; + } else if(state === 1) { + hidden = true; + } else { + hidden = $child.is(':hidden'); + } - // update the state - setClicky(!hidden); + // update the state + setClicky(!hidden); - // Start animation and assure that $toc is hidden/visible - $child.dw_toggle(hidden, function () { - $content.toggle(hidden); - }); - }) + // Start animation and assure that $toc is hidden/visible + $child.dw_toggle(hidden, function () { + $content.toggle(hidden); + }); + }; + + // the state indicator + $clicky = jQuery(document.createElement('strong')); + + // click function + $handle.css('cursor','pointer') + .click($handle[0].setState) .prepend($clicky); // initial state - setClicky(); + $handle[0].setState(state); } }; diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index 75575608b..d32cf5cff 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -1,14 +1,32 @@ function tpl_dokuwiki_mobile(){ // check if we are in mobile or tablet mode be sure to adjust the number // here when adjusting it in the css - if(document.body.clientWidth > 979) return; + var $handle = jQuery('#dokuwiki__aside h3.toggle'); + var $toc = jQuery('#dw__toc h3'); + if(document.body.clientWidth > 979) { + console.log('desktop'); + // reset for desktop mode + $handle[0].setState(1); + $handle.hide(); + $toc[0].setState(1); + } else { + console.log('mobile'); + // toc and sidebar hiding + $handle.show(); + $handle[0].setState(-1); + $toc[0].setState(-1); + } +} - // toc and sidebar hiding +jQuery(function(){ + var resizeTimer; dw_page.makeToggle('#dokuwiki__aside h3.toggle','#dokuwiki__aside div.content'); - jQuery('#dw__toc h3.toggle').click(); - jQuery('#dokuwiki__aside h3.toggle').show().click(); -} - -jQuery(tpl_dokuwiki_mobile); -jQuery(window).bind('resize',tpl_dokuwiki_mobile); + tpl_dokuwiki_mobile(); + jQuery(window).bind('resize', + function(){ + if (resizeTimer) clearTimeout(resizeTimer); + resizeTimer = setTimeout(tpl_dokuwiki_mobile,200); + } + ); +}); -- cgit v1.2.3 From e6889ecc099960ca66204d9eab8e4c6ccf0d89bc Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sat, 30 Jun 2012 13:22:51 +0200 Subject: removed debugging and check for TOC/sidebar exisance --- lib/tpl/dokuwiki/script.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index d32cf5cff..5badb5859 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -4,17 +4,23 @@ function tpl_dokuwiki_mobile(){ var $handle = jQuery('#dokuwiki__aside h3.toggle'); var $toc = jQuery('#dw__toc h3'); if(document.body.clientWidth > 979) { - console.log('desktop'); // reset for desktop mode - $handle[0].setState(1); - $handle.hide(); - $toc[0].setState(1); + if($handle.length) { + $handle[0].setState(1); + $handle.hide(); + } + if($toc.length) { + $toc[0].setState(1); + } } else { - console.log('mobile'); // toc and sidebar hiding - $handle.show(); - $handle[0].setState(-1); - $toc[0].setState(-1); + if($handle.length) { + $handle.show(); + $handle[0].setState(-1); + } + if($toc.length) { + $toc[0].setState(-1); + } } } -- cgit v1.2.3 From ea39a99f28e4fd1d71a629dac7a18a12875ae5c8 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sat, 30 Jun 2012 15:10:28 +0200 Subject: use a PNG alpha gradient instead of CSS3 or SVG --- lib/tpl/dokuwiki/css/basic.css | 10 +--------- lib/tpl/dokuwiki/images/page-gradient.png | Bin 0 -> 289 bytes 2 files changed, 1 insertion(+), 9 deletions(-) create mode 100644 lib/tpl/dokuwiki/images/page-gradient.png (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index e0b8cddfe..eb659f12e 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -15,15 +15,7 @@ html { html, body { color: __text__; - background-color: __background_site__; - background-image: url(images/page-background.svg); - /*background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); see FS#2447*/ - background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: -o-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: -ms-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-size: 1px 10em; - background-repeat: repeat-x; + background: __background_site__ url(images/page-gradient.png) top left repeat-x; margin: 0; padding: 0; } diff --git a/lib/tpl/dokuwiki/images/page-gradient.png b/lib/tpl/dokuwiki/images/page-gradient.png new file mode 100644 index 000000000..bbe2efad4 Binary files /dev/null and b/lib/tpl/dokuwiki/images/page-gradient.png differ -- cgit v1.2.3 From ff74ee7c91ff27350da267a1d9145eaba85a01a6 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sat, 30 Jun 2012 15:42:46 +0200 Subject: move down the message area --- lib/tpl/dokuwiki/tpl_header.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 1d2517ee1..f2e720308 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -1,7 +1,6 @@ <!-- ********** HEADER ********** --> <div id="dokuwiki__header"><div class="pad group"> - <?php html_msgarea() ?> <?php tpl_includeFile('header.html') ?> <div class="headings group"> @@ -77,5 +76,7 @@ </div> <?php endif ?> + <?php html_msgarea() ?> + <hr class="a11y" /> </div></div><!-- /header --> -- cgit v1.2.3 From 2329bcd3221cf684db3352d71182139b7d9e5281 Mon Sep 17 00:00:00 2001 From: Christopher Smith <chris@jalakai.co.uk> Date: Sat, 30 Jun 2012 14:51:49 +0100 Subject: separate determination of device class & set as an html class on <html>, only attempt layout changes with device class changes --- lib/tpl/dokuwiki/script.js | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index 5badb5859..069f2526f 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -1,9 +1,38 @@ +/** + * We handle several device classes based on browser width. + * see http://twitter.github.com/bootstrap/scaffolding.html#responsive + * + * - desktop: 980+ + * - mobile: < 980 + * - tablet 481 - 979 (ostensibly for tablets in portrait mode) + * - phone <= 480 + */ +var device_class = 'not yet known'; +var device_classes = 'desktop mobile tablet phone'; + function tpl_dokuwiki_mobile(){ - // check if we are in mobile or tablet mode be sure to adjust the number - // here when adjusting it in the css + + // determine our device pattern + // TODO: consider moving into dokuwiki core + var w = document.body.clientWidth; + if (w > 979) { + if (device_class == 'desktop') return; + device_class = 'desktop'; + } else if (w > 480) { + if (device_class.match(/tablet/)) return; + device_class = 'mobile tablet'; + } else { + if (device_class.match(/phone/)) return; + device_class = 'mobile phone'; + } + + jQuery('html').removeClass(device_classes).addClass(device_class); + + // handle some layout changes based on change in device var $handle = jQuery('#dokuwiki__aside h3.toggle'); var $toc = jQuery('#dw__toc h3'); - if(document.body.clientWidth > 979) { + + if (device_class == 'desktop') { // reset for desktop mode if($handle.length) { $handle[0].setState(1); @@ -12,7 +41,8 @@ function tpl_dokuwiki_mobile(){ if($toc.length) { $toc[0].setState(1); } - } else { + } + if (device_class.match(/mobile/)){ // toc and sidebar hiding if($handle.length) { $handle.show(); -- cgit v1.2.3 From 3f7dd17379d124acdcf7131ba77716d87360cda8 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sat, 30 Jun 2012 15:58:32 +0200 Subject: make sure content column is at least as long as sidebar --- lib/tpl/dokuwiki/script.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index 069f2526f..677e2f53b 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -65,4 +65,11 @@ jQuery(function(){ resizeTimer = setTimeout(tpl_dokuwiki_mobile,200); } ); + + // increase sidebar length to match content (desktop mode only) + var $sb = jQuery('.desktop #dokuwiki__aside'); + if($sb.length) { + var $ct = jQuery('#dokuwiki__content div.page'); + if($sb.height() > $ct.height()) $ct.height($sb.height()); + } }); -- cgit v1.2.3 From 07a4718abe1d352fe94538b40b8a0dfced9c519a Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sat, 30 Jun 2012 15:21:17 +0100 Subject: removed icons for site tools (only left them for user tools) and changed icon for user profile (FS#2450) --- lib/tpl/dokuwiki/css/design.css | 47 ++++++++++------------------------ lib/tpl/dokuwiki/images/sitetools.png | Bin 2225 -> 0 bytes lib/tpl/dokuwiki/images/usertools.png | Bin 0 -> 1541 bytes 3 files changed, 13 insertions(+), 34 deletions(-) delete mode 100644 lib/tpl/dokuwiki/images/sitetools.png create mode 100644 lib/tpl/dokuwiki/images/usertools.png (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index c64ccc710..31fc62390 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -86,13 +86,11 @@ text-overflow: ellipsis; } -#dokuwiki__usertools a.action, -#dokuwiki__sitetools a.action { +#dokuwiki__usertools a.action { padding-left: 20px; - background: transparent url(images/sitetools.png) no-repeat 0 0; + background: transparent url(images/usertools.png) no-repeat 0 0; } -[dir=rtl] #dokuwiki__usertools a.action, -[dir=rtl] #dokuwiki__sitetools a.action { +[dir=rtl] #dokuwiki__usertools a.action { padding-left: 0; padding-right: 20px; } @@ -119,34 +117,34 @@ } #dokuwiki__usertools a.action.admin { - background-position: left -96px; + background-position: left 0; } [dir=rtl] #dokuwiki__usertools a.action.admin { - background-position: right -96px; + background-position: right 0; } #dokuwiki__usertools a.action.profile { - background-position: left -128px; + background-position: left -32px; } [dir=rtl] #dokuwiki__usertools a.action.profile { - background-position: right -128px; + background-position: right -32px; } #dokuwiki__usertools a.action.register { - background-position: left -160px; + background-position: left -64px; } [dir=rtl] #dokuwiki__usertools a.action.register { - background-position: right -160px; + background-position: right -64px; } #dokuwiki__usertools a.action.login { - background-position: left -192px; + background-position: left -96px; } [dir=rtl] #dokuwiki__usertools a.action.login { - background-position: right -192px; + background-position: right -96px; } #dokuwiki__usertools a.action.logout { - background-position: left -224px; + background-position: left -128px; } [dir=rtl] #dokuwiki__usertools a.action.logout { - background-position: right -224px; + background-position: right -128px; } @@ -182,25 +180,6 @@ #dokuwiki__sitetools li { } -#dokuwiki__sitetools a.action.recent { - background-position: left 0; -} -[dir=rtl] #dokuwiki__sitetools a.action.recent { - background-position: right 0; -} -#dokuwiki__sitetools a.action.media { - background-position: left -32px; -} -[dir=rtl] #dokuwiki__sitetools a.action.media { - background-position: right -32px; -} -#dokuwiki__sitetools a.action.index { - background-position: left -64px; -} -[dir=rtl] #dokuwiki__sitetools a.action.index { - background-position: right -64px; -} - /*____________ breadcrumbs ____________*/ .dokuwiki div.breadcrumbs { diff --git a/lib/tpl/dokuwiki/images/sitetools.png b/lib/tpl/dokuwiki/images/sitetools.png deleted file mode 100644 index dc5764647..000000000 Binary files a/lib/tpl/dokuwiki/images/sitetools.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/usertools.png b/lib/tpl/dokuwiki/images/usertools.png new file mode 100644 index 000000000..e99b6596e Binary files /dev/null and b/lib/tpl/dokuwiki/images/usertools.png differ -- cgit v1.2.3 From dbd59995d0f86901e08bbda00f557124aa45a47a Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sat, 30 Jun 2012 16:49:31 +0200 Subject: gradient fixups --- lib/tpl/dokuwiki/images/page-gradient.png | Bin 289 -> 280 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/images/page-gradient.png b/lib/tpl/dokuwiki/images/page-gradient.png index bbe2efad4..8e16a2805 100644 Binary files a/lib/tpl/dokuwiki/images/page-gradient.png and b/lib/tpl/dokuwiki/images/page-gradient.png differ -- cgit v1.2.3 From 765fba804b5fdec8bb6e55774c8258bd89823ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D1=8F=D1=87=D0=B5=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A2?= =?UTF-8?q?=D1=80=D0=B5=D1=82=D1=8C=D1=8F=D0=BA=D0=BE=D0=B2?= <tret2003@gmail.com> Date: Sat, 30 Jun 2012 17:00:57 +0200 Subject: iRussian language update --- lib/plugins/config/lang/ru/lang.php | 100 ++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 49 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php index 098cff534..84dce4a67 100644 --- a/lib/plugins/config/lang/ru/lang.php +++ b/lib/plugins/config/lang/ru/lang.php @@ -38,6 +38,7 @@ $lang['_anti_spam'] = 'Параметры блокировки спа $lang['_editing'] = 'Параметры правки'; $lang['_links'] = 'Параметры ссылок'; $lang['_media'] = 'Параметры медиафайлов'; +$lang['_notifications'] = 'Параметры уведомлений'; $lang['_advanced'] = 'Тонкая настройка'; $lang['_network'] = 'Параметры сети'; $lang['_plugin_sufix'] = 'Параметры плагина'; @@ -45,28 +46,29 @@ $lang['_template_sufix'] = 'Параметры шаблона'; $lang['_msg_setting_undefined'] = 'Не найдены метаданные настроек.'; $lang['_msg_setting_no_class'] = 'Не найден класс настроек.'; $lang['_msg_setting_no_default'] = 'Не задано значение по умолчанию.'; -$lang['fmode'] = 'Права для создаваемых файлов'; -$lang['dmode'] = 'Права для создаваемых директорий'; -$lang['lang'] = 'Язык'; -$lang['basedir'] = 'Корневая директория (например, <code>/dokuwiki/</code>). Оставьте пустым для автоопределения.'; -$lang['baseurl'] = 'Корневой адрес (URL) (например, <code>http://www.yourserver.ru</code>). Оставьте пустым для автоопределения.'; -$lang['savedir'] = 'Директория для данных'; -$lang['cookiedir'] = 'Cookie директория. Оставьте пустым для автоопределения.'; -$lang['start'] = 'Имя стартовой страницы'; $lang['title'] = 'Название вики'; +$lang['start'] = 'Имя стартовой страницы'; +$lang['lang'] = 'Язык'; $lang['template'] = 'Шаблон'; $lang['tagline'] = 'Слоган (если поддерживается шаблоном)'; $lang['sidebar'] = 'Боковая панель, пустое поле отключает боковую панель.'; $lang['license'] = 'На условиях какой лицензии будет предоставляться содержимое вики?'; -$lang['fullpath'] = 'Полный путь к документу'; +$lang['savedir'] = 'Директория для данных'; +$lang['basedir'] = 'Корневая директория (например, <code>/dokuwiki/</code>). Оставьте пустым для автоопределения.'; +$lang['baseurl'] = 'Корневой адрес (URL) (например, <code>http://www.yourserver.ru</code>). Оставьте пустым для автоопределения.'; +$lang['cookiedir'] = 'Cookie директория. Оставьте пустым для автоопределения.'; +$lang['dmode'] = 'Права для создаваемых директорий'; +$lang['fmode'] = 'Права для создаваемых файлов'; +$lang['allowdebug'] = 'Включить отладку (отключите!)'; $lang['recent'] = 'Недавние изменения (кол-во)'; +$lang['recent_days'] = 'На сколько дней назад сохранять недавние изменения'; $lang['breadcrumbs'] = 'Вы посетили (кол-во)'; $lang['youarehere'] = 'Показывать «Вы находитесь здесь»'; +$lang['fullpath'] = 'Полный путь к документу'; $lang['typography'] = 'Типографские символы'; -$lang['htmlok'] = 'Разрешить HTML'; -$lang['phpok'] = 'Разрешить PHP'; $lang['dformat'] = 'Формат даты и времени'; $lang['signature'] = 'Шаблон подписи'; +$lang['showuseras'] = 'Что отображать при показе пользователя, редактировавшего страницу последним'; $lang['toptoclevel'] = 'Мин. уровень в содержании'; $lang['tocminheads'] = 'Мин. количество заголовков, при котором будет составлено содержание'; $lang['maxtoclevel'] = 'Макс. уровень в содержании'; @@ -74,16 +76,8 @@ $lang['maxseclevel'] = 'Макс. уровень для правки'; $lang['camelcase'] = 'Использовать ВикиРегистр для ссылок'; $lang['deaccent'] = 'Транслитерация в именах страниц'; $lang['useheading'] = 'Первый заголовок вместо имени'; -$lang['refcheck'] = 'Проверять ссылки на медиафайлы'; -$lang['refshow'] = 'Показывать ссылок на медиафайлы'; -$lang['allowdebug'] = 'Включить отладку (отключите!)'; -$lang['mediarevisions'] = 'Включение версий медиафайлов'; -$lang['usewordblock'] = 'Блокировать спам по ключевым словам'; -$lang['indexdelay'] = 'Задержка перед индексированием'; -$lang['relnofollow'] = 'rel="nofollow" для внешних ссылок'; -$lang['mailguard'] = 'Кодировать адреса электронной почты'; -$lang['iexssprotect'] = 'Проверять закачанные файлы на наличие потенциально опасного кода JavaScript или HTML'; -$lang['showuseras'] = 'Что отображать при показе пользователя, редактировавшего страницу последним'; +$lang['sneaky_index'] = 'По умолчанию, «ДокуВики» показывает в индексе страниц все пространства имён. Включение этой опции скроет пространства имён, для которых пользователь не имеет прав чтения. Это может привести к скрытию доступных вложенных пространств имён и потере функциональности индекса страниц при некоторых конфигурациях прав доступа.'; +$lang['hidepages'] = 'Скрыть страницы (рег. выражение)'; $lang['useacl'] = 'Использовать списки прав доступа'; $lang['autopasswd'] = 'Автогенерация паролей'; $lang['authtype'] = 'Механизм аутентификации'; @@ -92,58 +86,66 @@ $lang['defaultgroup'] = 'Группа по умолчанию'; $lang['superuser'] = 'Суперпользователь — группа или пользователь с полным доступом ко всем страницам и функциям администрирования, независимо от установок ACL. Перечень разделяйте запятыми: user1,@group1,user2'; $lang['manager'] = 'Менеджер — группа или пользователь с доступом к определённым функциям управления. Перечень разделяйте запятыми: user1,@group1,user2'; $lang['profileconfirm'] = 'Пароль для изменения профиля'; +$lang['rememberme'] = 'Разрешить перманентные куки (cookies) для входа («запомнить меня»)'; $lang['disableactions'] = 'Заблокировать операции «ДокуВики»'; $lang['disableactions_check'] = 'Проверка'; $lang['disableactions_subscription'] = 'Подписка/Отмена подписки'; $lang['disableactions_wikicode'] = 'Показ/экспорт исходного текста'; $lang['disableactions_other'] = 'Другие операции (через запятую)'; -$lang['sneaky_index'] = 'По умолчанию, «ДокуВики» показывает в индексе страниц все пространства имён. Включение этой опции скроет пространства имён, для которых пользователь не имеет прав чтения. Это может привести к скрытию доступных вложенных пространств имён и потере функциональности индекса страниц при некоторых конфигурациях прав доступа.'; $lang['auth_security_timeout'] = 'Интервал для безопасности авторизации (сек.)'; $lang['securecookie'] = 'Должны ли куки (cookies), выставленные через HTTPS, отправляться браузером только через HTTPS. Отключите эту опцию в случае, когда только логин вашей вики передаётся через SSL, а обычный просмотр осуществляется в небезопасном режиме.'; +$lang['remote'] = 'Включить систему API для подключений. Это позволит другим приложениям получить доступ к вики через XML-RPC или другие механизмы.'; +$lang['usewordblock'] = 'Блокировать спам по ключевым словам'; +$lang['relnofollow'] = 'rel="nofollow" для внешних ссылок'; +$lang['indexdelay'] = 'Задержка перед индексированием'; +$lang['mailguard'] = 'Кодировать адреса электронной почты'; +$lang['iexssprotect'] = 'Проверять закачанные файлы на наличие потенциально опасного кода JavaScript или HTML'; +$lang['usedraft'] = 'Автоматически сохранять черновик во время правки'; +$lang['htmlok'] = 'Разрешить HTML'; +$lang['phpok'] = 'Разрешить PHP'; +$lang['locktime'] = 'Время блокировки страницы (сек.)'; +$lang['cachetime'] = 'Время жизни кэш-файла (сек.)'; +$lang['target____wiki'] = 'target для внутренних ссылок'; +$lang['target____interwiki'] = 'target для ссылок между вики'; +$lang['target____extern'] = 'target для внешних ссылок'; +$lang['target____media'] = 'target для ссылок на медиафайлы'; +$lang['target____windows'] = 'target для ссылок на сетевые каталоги'; +$lang['mediarevisions'] = 'Включение версий медиафайлов'; +$lang['refcheck'] = 'Проверять ссылки на медиафайлы'; +$lang['refshow'] = 'Показывать ссылок на медиафайлы'; +$lang['gdlib'] = 'Версия LibGD'; +$lang['im_convert'] = 'Путь к ImageMagick'; +$lang['jpg_quality'] = 'Качество сжатия JPG (0–100). Значение по умолчанию — 70.'; +$lang['fetchsize'] = 'Максимальный размер файла (в байтах), который fetch.php может скачивать с внешнего источника'; +$lang['subscribers'] = 'Разрешить подписку на изменения'; +$lang['subscribe_time'] = 'Интервал рассылки подписок и сводок (сек.). Должен быть меньше, чем значение, указанное в recent_days.'; +$lang['notify'] = 'Электронный адрес для извещений'; +$lang['registernotify'] = 'Посылать информацию о новых зарегистрированных пользователях на этот электронный адрес'; +$lang['mailfrom'] = 'Электронный адрес вики (От:)'; +$lang['mailprefix'] = 'Префикс используемый для автоматического письма станет темой сообщений'; +$lang['sitemap'] = 'Число дней, через которое нужно создавать (обновлять) карту сайта для поисковиков (Гугл, Яндекс и др.)'; +$lang['rss_type'] = 'Тип RSS'; +$lang['rss_linkto'] = 'Ссылки в RSS'; +$lang['rss_content'] = 'Что отображать в строках XML-ленты?'; +$lang['rss_update'] = 'Интервал обновления XML-ленты (сек.)'; +$lang['rss_show_summary'] = 'Показывать краткую выдержку в заголовках XML-ленты'; $lang['updatecheck'] = 'Проверять наличие обновлений и предупреждений о безопасности? Для этого «ДокуВики» потребуется связываться с сайтом <a href="http://www.splitbrain.org/">splitbrain.org</a>.'; $lang['userewrite'] = 'Удобочитаемые адреса (URL)'; $lang['useslash'] = 'Использовать слэш'; -$lang['usedraft'] = 'Автоматически сохранять черновик во время правки'; $lang['sepchar'] = 'Разделитель слов в имени страницы'; $lang['canonical'] = 'Полные канонические адреса (URL)'; $lang['fnencode'] = 'Метод кодирования имён файлов, записанных не ASCII-символами.'; $lang['autoplural'] = 'Автоматическое мн. число'; $lang['compression'] = 'Метод сжатия для архивных файлов'; -$lang['cachetime'] = 'Время жизни кэш-файла (сек.)'; -$lang['locktime'] = 'Время блокировки страницы (сек.)'; -$lang['fetchsize'] = 'Максимальный размер файла (в байтах), который fetch.php может скачивать с внешнего источника'; -$lang['notify'] = 'Электронный адрес для извещений'; -$lang['registernotify'] = 'Посылать информацию о новых зарегистрированных пользователях на этот электронный адрес'; -$lang['mailfrom'] = 'Электронный адрес вики (От:)'; -$lang['mailprefix'] = 'Префикс используемый для автоматического письма станет темой сообщений'; $lang['gzip_output'] = 'Использовать gzip-сжатие для xhtml'; -$lang['gdlib'] = 'Версия LibGD'; -$lang['im_convert'] = 'Путь к ImageMagick'; -$lang['jpg_quality'] = 'Качество сжатия JPG (0–100). Значение по умолчанию — 70.'; -$lang['subscribers'] = 'Разрешить подписку на изменения'; -$lang['subscribe_time'] = 'Интервал рассылки подписок и сводок (сек.). Должен быть меньше, чем значение, указанное в recent_days.'; $lang['compress'] = 'Сжимать файлы CSS и javascript'; $lang['cssdatauri'] = 'Размер в байтах до которого изображения, указанные в CSS-файлах, должны быть встроены прямо в таблицу стилей, для уменьшения избычтоных HTTP-запросов. Этот метод не будет работать в IE версии 7 и ниже! Установка от <code>400</code> до <code>600</code> байт является хорошим показателем. Установите <code>0</code>, чтобы отключить.'; -$lang['hidepages'] = 'Скрыть страницы (рег. выражение)'; $lang['send404'] = 'Посылать «HTTP404/Page Not Found»'; -$lang['sitemap'] = 'Число дней, через которое нужно создавать (обновлять) карту сайта для поисковиков (Гугл, Яндекс и др.)'; $lang['broken_iua'] = 'Возможно, функция ignore_user_abort не работает в вашей системе? Это может привести к потере функциональности индексирования поиска. Эта проблема присутствует, например, в IIS+PHP/CGI. Для дополнительной информации смотрите <a href="http://bugs.splitbrain.org/?do=details&task_id=852">баг 852</a>.'; $lang['xsendfile'] = 'Используете заголовок X-Sendfile для загрузки файлов на веб-сервер? Ваш веб-сервер должен поддерживать это.'; $lang['renderer_xhtml'] = 'Обработчик основного (xhtml) вывода вики'; $lang['renderer__core'] = '%s (ядро dokuwiki)'; $lang['renderer__plugin'] = '%s (плагин)'; -$lang['rememberme'] = 'Разрешить перманентные куки (cookies) для входа («запомнить меня»)'; -$lang['rss_type'] = 'Тип RSS'; -$lang['rss_linkto'] = 'Ссылки в RSS'; -$lang['rss_content'] = 'Что отображать в строках XML-ленты?'; -$lang['rss_update'] = 'Интервал обновления XML-ленты (сек.)'; -$lang['recent_days'] = 'На сколько дней назад сохранять недавние изменения'; -$lang['rss_show_summary'] = 'Показывать краткую выдержку в заголовках XML-ленты'; -$lang['target____wiki'] = 'target для внутренних ссылок'; -$lang['target____interwiki'] = 'target для ссылок между вики'; -$lang['target____extern'] = 'target для внешних ссылок'; -$lang['target____media'] = 'target для ссылок на медиафайлы'; -$lang['target____windows'] = 'target для ссылок на сетевые каталоги'; $lang['proxy____host'] = 'proxy-адрес'; $lang['proxy____port'] = 'proxy-порт'; $lang['proxy____user'] = 'proxy-имя пользователя'; -- cgit v1.2.3 From 8cb31473407c8b9b41f02499dfa3d97eb295cc14 Mon Sep 17 00:00:00 2001 From: lupo49 <post@lupo49.de> Date: Sat, 30 Jun 2012 18:00:18 +0200 Subject: de/de-informal: added missing localization / update existing ones --- lib/plugins/config/lang/de-informal/intro.txt | 2 +- lib/plugins/config/lang/de-informal/lang.php | 11 ++++++++++- lib/plugins/config/lang/de/intro.txt | 2 +- lib/plugins/config/lang/de/lang.php | 11 ++++++++++- 4 files changed, 22 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/de-informal/intro.txt b/lib/plugins/config/lang/de-informal/intro.txt index 7ac1b47d9..df9845ebc 100644 --- a/lib/plugins/config/lang/de-informal/intro.txt +++ b/lib/plugins/config/lang/de-informal/intro.txt @@ -1,4 +1,4 @@ -===== Einstellungs-Manager ===== +===== Konfigurations-Manager ===== Benutze diese Seite zur Kontrolle der Einstellungen deiner DokuWiki-Installation. Für Hilfe zu individuellen Einstellungen gehe zu [[doku>config]]. Für mehr Details über diese Erweiterungen siehe [[doku>plugin:config]]. diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index 52c705b4f..d86c2d809 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -5,7 +5,7 @@ * @author Alexander Fischer <tbanus@os-forge.net> * @author Juergen Schwarzer <jschwarzer@freenet.de> * @author Marcel Metz <marcel_metz@gmx.de> - * @author Matthias Schulte <post@lupo49.de> + * @author Matthias Schulte <dokuwiki@lupo49.de> * @author Christian Wichmann <nospam@zone0.de> * @author Pierre Corell <info@joomla-praxis.de> */ @@ -29,6 +29,8 @@ $lang['_anti_spam'] = 'Anti-Spam-Einstellungen'; $lang['_editing'] = 'Bearbeitungseinstellungen'; $lang['_links'] = 'Link-Einstellungen'; $lang['_media'] = 'Media-Einstellungen'; +$lang['_notifications'] = 'Benachrichtigungs-Konfiguration'; +$lang['_syndication'] = 'Syndication-Konfiguration (RSS)'; $lang['_advanced'] = 'erweiterte Einstellungen'; $lang['_network'] = 'Netzwerk-Einstellungen'; $lang['_plugin_sufix'] = 'Plugin-Einstellungen'; @@ -46,6 +48,8 @@ $lang['cookiedir'] = 'Cookie Pfad. Leer lassen, um die Standard-Url $lang['start'] = 'Name der Startseite'; $lang['title'] = 'Wiki Titel'; $lang['template'] = 'Vorlage'; +$lang['tagline'] = 'Tag-Linie (nur, wenn vom Template unterstützt)'; +$lang['sidebar'] = 'Name der Sidebar-Seite (nur, wenn vom Template unterstützt)), ein leeres Feld deaktiviert die Sidebar'; $lang['license'] = 'Unter welcher Lizenz sollte Ihr Inhalt veröffentlicht werden?'; $lang['fullpath'] = 'Zeige vollen Pfad der Datei in Fußzeile an'; $lang['recent'] = 'letzte Änderungen'; @@ -89,6 +93,8 @@ $lang['disableactions_other'] = 'Weitere Aktionen (durch Komma getrennt)'; $lang['sneaky_index'] = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Indexansicht an. Bei Aktivierung dieser Einstellung werden alle Namensräume versteckt, in welchen der Benutzer keine Leserechte hat. Dies könnte dazu führen, dass lesbare Unternamensräume versteckt werden. Dies kann die Indexansicht bei bestimmten Zugangskontrolleinstellungen unbenutzbar machen.'; $lang['auth_security_timeout'] = 'Zeitüberschreitung bei der Authentifizierung (Sekunden)'; $lang['securecookie'] = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktiviere diese Option, wenn nur der Login deines Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.'; +$lang['remote'] = 'Aktiviert den externen API-Zugang. Diese Option erlaubt es externen Anwendungen von außen auf die XML-RPC-Schnittstelle oder anderweitigen Schnittstellen zuzugreifen.'; +$lang['remoteuser'] = 'Zugriff auf die externen Schnittstellen durch kommaseparierte Angabe von Benutzern oder Gruppen einschränken. Ein leeres Feld erlaubt Zugriff für jeden.'; $lang['updatecheck'] = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.'; $lang['userewrite'] = 'Benutze schöne URLs'; $lang['useslash'] = 'Benutze Schrägstrich als Namensraumtrenner in URLs'; @@ -105,6 +111,7 @@ $lang['notify'] = 'Sende Änderungsbenachrichtigungen an diese E- $lang['registernotify'] = 'Sende Information bei neu registrierten Benutzern an diese E-Mail-Adresse.'; $lang['mailfrom'] = 'Absenderadresse für automatisch erzeugte E-Mails'; $lang['mailprefix'] = 'Präfix für E-Mail-Betreff beim automatischen Versand von Benachrichtigungen'; +$lang['htmlmail'] = 'Versendet optisch angenehmere, aber größere E-Mails im HTML-Format (multipart). Deaktivieren, um Text-Mails zu versenden.'; $lang['gzip_output'] = 'Seiten mit gzip komprimiert ausliefern'; $lang['gdlib'] = 'GD Lib Version'; $lang['im_convert'] = 'Pfad zu ImageMagicks-Konvertierwerkzeug'; @@ -128,11 +135,13 @@ $lang['rss_content'] = 'Was soll in XML-Feedinhalten angezeigt werden? $lang['rss_update'] = 'Aktualisierungsintervall für XML-Feeds (Sekunden)'; $lang['recent_days'] = 'Wie viele Änderungen sollen vorgehalten werden? (Tage)'; $lang['rss_show_summary'] = 'Bearbeitungs-Zusammenfassung im XML-Feed anzeigen'; +$lang['rss_media'] = 'Welche Änderungen sollen im XML-Feed angezeigt werden?'; $lang['target____wiki'] = 'Zielfenstername für interne Links'; $lang['target____interwiki'] = 'Zielfenstername für InterWiki-Links'; $lang['target____extern'] = 'Zielfenstername für externe Links'; $lang['target____media'] = 'Zielfenstername für Medienlinks'; $lang['target____windows'] = 'Zielfenstername für Windows-Freigaben-Links'; +$lang['dnslookups'] = 'DokuWiki löst die IP-Adressen von Benutzern zu deren Hostnamen auf. Wenn du einen langsamen, unbrauchbaren DNS-Server verwendest oder die Funktion nicht benötigst, dann sollte diese Option deaktivert sein.'; $lang['proxy____host'] = 'Proxyadresse'; $lang['proxy____port'] = 'Proxyport'; $lang['proxy____user'] = 'Benutzername für den Proxy'; diff --git a/lib/plugins/config/lang/de/intro.txt b/lib/plugins/config/lang/de/intro.txt index efb807738..b79b5f871 100644 --- a/lib/plugins/config/lang/de/intro.txt +++ b/lib/plugins/config/lang/de/intro.txt @@ -1,4 +1,4 @@ -====== Konfiguration ====== +====== Konfigurations-Manager ====== Dieses Plugin hilft Ihnen bei der Konfiguration von DokuWiki. Hilfe zu den einzelnen Einstellungen finden Sie unter [[doku>config]]. Mehr Information zu diesem Plugin ist unter [[doku>plugin:config]] erhältlich. diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index 1cc4e0a8a..bcbc061a3 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -11,12 +11,12 @@ * @author Arne Pelka <mail@arnepelka.de> * @author Dirk Einecke <dirk@dirkeinecke.de> * @author Blitzi94@gmx.de - * @author Robert Bogenschneider <robog@GMX.de> * @author Robert Bogenschneider <robog@gmx.de> * @author Niels Lange <niels@boldencursief.nl> * @author Christian Wichmann <nospam@zone0.de> * @author Paul Lachewsky <kaeptn.haddock@gmail.com> * @author Pierre Corell <info@joomla-praxis.de> + * @author Matthias Schulte <dokuwiki@lupo49.de> */ $lang['menu'] = 'Konfiguration'; $lang['error'] = 'Die Einstellungen wurden wegen einer fehlerhaften Eingabe nicht gespeichert. @@ -40,6 +40,8 @@ $lang['_anti_spam'] = 'Anti-Spam-Konfiguration'; $lang['_editing'] = 'Bearbeitungs-Konfiguration'; $lang['_links'] = 'Link-Konfiguration'; $lang['_media'] = 'Medien-Konfiguration'; +$lang['_notifications'] = 'Benachrichtigungs-Konfiguration'; +$lang['_syndication'] = 'Syndication-Konfiguration (RSS)'; $lang['_advanced'] = 'Erweiterte Konfiguration'; $lang['_network'] = 'Netzwerk-Konfiguration'; $lang['_plugin_sufix'] = 'Plugin-Konfiguration'; @@ -57,6 +59,8 @@ $lang['cookiedir'] = 'Cookiepfad. Frei lassen, um den gleichen Pfad $lang['start'] = 'Startseitenname'; $lang['title'] = 'Titel des Wikis'; $lang['template'] = 'Designvorlage (Template)'; +$lang['tagline'] = 'Tag-Linie (nur, wenn vom Template unterstützt)'; +$lang['sidebar'] = 'Name der Sidebar-Seite (nur, wenn vom Template unterstützt)), ein leeres Feld deaktiviert die Sidebar'; $lang['license'] = 'Unter welcher Lizenz sollen Ihre Inhalte veröffentlicht werden?'; $lang['fullpath'] = 'Den kompletten Dateipfad im Footer anzeigen'; $lang['recent'] = 'Anzahl der Einträge in der Änderungsliste'; @@ -100,6 +104,8 @@ $lang['disableactions_other'] = 'Andere Aktionen (durch Komma getrennt)'; $lang['sneaky_index'] = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Übersicht. Wenn diese Option aktiviert wird, werden alle Namensräume, für die der Benutzer keine Lese-Rechte hat, nicht angezeigt. Dies kann unter Umständen dazu führen, das lesbare Unter-Namensräume nicht angezeigt werden und macht die Übersicht evtl. unbrauchbar in Kombination mit bestimmten ACL Einstellungen.'; $lang['auth_security_timeout'] = 'Authentifikations-Timeout (Sekunden)'; $lang['securecookie'] = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktivieren Sie diese Option, wenn nur der Login Ihres Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.'; +$lang['remote'] = 'Aktiviert den externen API-Zugang. Diese Option erlaubt es externen Anwendungen von außen auf die XML-RPC-Schnittstelle oder anderweitigen Schnittstellen zuzugreifen.'; +$lang['remoteuser'] = 'Zugriff auf die externen Schnittstellen durch kommaseparierte Angabe von Benutzern oder Gruppen einschränken. Ein leeres Feld erlaubt Zugriff für jeden.'; $lang['updatecheck'] = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.'; $lang['userewrite'] = 'URL rewriting'; $lang['useslash'] = 'Schrägstrich (/) als Namensraumtrenner in URLs verwenden'; @@ -116,6 +122,7 @@ $lang['notify'] = 'Änderungsmitteilungen an diese E-Mail-Adresse $lang['registernotify'] = 'Information über neu registrierte Nutzer an diese E-Mail-Adresse senden'; $lang['mailfrom'] = 'Absender-E-Mail-Adresse für automatische Mails'; $lang['mailprefix'] = 'Präfix für E-Mail-Betreff beim automatischen Versand von Benachrichtigungen'; +$lang['htmlmail'] = 'Versendet optisch angenehmere, aber größere E-Mails im HTML-Format (multipart). Deaktivieren, um Text-Mails zu versenden.'; $lang['gzip_output'] = 'Seiten mit gzip komprimiert ausliefern'; $lang['gdlib'] = 'GD Lib Version'; $lang['im_convert'] = 'Pfad zu ImageMagicks-Konvertierwerkzeug'; @@ -139,11 +146,13 @@ $lang['rss_content'] = 'Welche Inhalte sollen im XML-Feed dargestellt $lang['rss_update'] = 'XML-Feed Aktualisierungsintervall (Sekunden)'; $lang['recent_days'] = 'Wieviele letzte Änderungen sollen einsehbar bleiben? (Tage)'; $lang['rss_show_summary'] = 'Bearbeitungs-Zusammenfassung im XML-Feed anzeigen'; +$lang['rss_media'] = 'Welche Änderungen sollen im XML-Feed angezeigt werden?'; $lang['target____wiki'] = 'Zielfenster für interne Links (target Attribut)'; $lang['target____interwiki'] = 'Zielfenster für InterWiki-Links (target Attribut)'; $lang['target____extern'] = 'Zielfenster für Externe Links (target Attribut)'; $lang['target____media'] = 'Zielfenster für (Bild-)Dateien (target Attribut)'; $lang['target____windows'] = 'Zielfenster für Windows Freigaben (target Attribut)'; +$lang['dnslookups'] = 'DokuWiki löst die IP-Adressen von Benutzern zu deren Hostnamen auf. Wenn du einen langsamen, unbrauchbaren DNS-Server verwendest oder die Funktion nicht benötigst, dann sollte diese Option deaktivert sein.'; $lang['proxy____host'] = 'Proxy-Server'; $lang['proxy____port'] = 'Proxy-Port'; $lang['proxy____user'] = 'Proxy Nutzername'; -- cgit v1.2.3 From 41d7c8ab13524cf5e327a37b9510bdaccf7185f6 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sat, 30 Jun 2012 18:25:44 +0200 Subject: made link icons smaller --- lib/tpl/dokuwiki/css/_links.css | 4 +++- lib/tpl/dokuwiki/images/email.png | Bin 502 -> 631 bytes lib/tpl/dokuwiki/images/external-link.png | Bin 758 -> 808 bytes lib/tpl/dokuwiki/images/unc.png | Bin 517 -> 542 bytes 4 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css index c8f5b7c9e..240e336bd 100644 --- a/lib/tpl/dokuwiki/css/_links.css +++ b/lib/tpl/dokuwiki/css/_links.css @@ -44,15 +44,17 @@ /* external link */ .dokuwiki a.urlextern { background-image: url(images/external-link.png); - padding: 0 0 0 17px; + padding: 0 0 0 15px; } /* windows share */ .dokuwiki a.windows { background-image: url(images/unc.png); + padding: 0 0 0 16px; } /* email link */ .dokuwiki a.mail { background-image: url(images/email.png); + padding: 0 0 0 16px; } /* icons of the following are set by dokuwiki in lib/exe/css.php */ diff --git a/lib/tpl/dokuwiki/images/email.png b/lib/tpl/dokuwiki/images/email.png index 5128be895..37f776a33 100644 Binary files a/lib/tpl/dokuwiki/images/email.png and b/lib/tpl/dokuwiki/images/email.png differ diff --git a/lib/tpl/dokuwiki/images/external-link.png b/lib/tpl/dokuwiki/images/external-link.png index 084135f95..23c825027 100644 Binary files a/lib/tpl/dokuwiki/images/external-link.png and b/lib/tpl/dokuwiki/images/external-link.png differ diff --git a/lib/tpl/dokuwiki/images/unc.png b/lib/tpl/dokuwiki/images/unc.png index f2aca8815..dbd225c2b 100644 Binary files a/lib/tpl/dokuwiki/images/unc.png and b/lib/tpl/dokuwiki/images/unc.png differ -- cgit v1.2.3 From 4e7a6f51c06205a3fa0bace15107df0e5057c8c3 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sat, 30 Jun 2012 18:04:27 +0100 Subject: moved spacing corrections for first line away from h1 to .page in order to fix overlapping issue in Chrome (FS#2542) --- lib/tpl/dokuwiki/css/basic.css | 2 +- lib/tpl/dokuwiki/css/design.css | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index eb659f12e..21bc9b25e 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -45,7 +45,7 @@ legend { h1 { font-size: 2em; - margin: -.222em 0 0.444em; + margin: 0 0 0.444em; } h2 { font-size: 1.5em; diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 4f18b79e8..9466481c5 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -340,7 +340,7 @@ border: 1px solid #eee; box-shadow: 0 0 .5em #999; border-radius: 2px; - padding: 2em; + padding: 1.556em 2em 2em; margin-bottom: .5em; overflow: hidden; word-wrap: break-word; @@ -426,14 +426,14 @@ .dokuwiki div.preview { margin: 0 -2em; - padding: 2em; + padding: 1.556em 2em 2em; } /*____________ changes to _toc ____________*/ #dw__toc { - margin: -2em -2em .5em 1.4em; + margin: -1.556em -2em .5em 1.4em; width: __sidebar_width__; border-left: 1px solid __border__; background: __background__; -- cgit v1.2.3 From e66d3e6dfa7ba6f0cf55b58f0b00b66b52c98321 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sun, 1 Jul 2012 11:41:22 +0200 Subject: Improved sidebar inclusion Template authors now can use tpl_sidebar() to include the sidebar. Sidebars can be defined in subnamespaces as well --- lib/tpl/dokuwiki/detail.php | 2 +- lib/tpl/dokuwiki/main.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index a3516a7ed..5fe1a1ad7 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -10,7 +10,7 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); -$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); +$showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index d8e85850f..e0b046574 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -10,7 +10,7 @@ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ -$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); +$showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang'] ?>" @@ -41,7 +41,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <div class="content"> <?php tpl_flush() ?> <?php tpl_includeFile('sidebarheader.html') ?> - <?php tpl_include_page($conf['sidebar']) ?> + <?php tpl_sidebar() ?> <?php tpl_includeFile('sidebarfooter.html') ?> </div> </div></div><!-- /aside --> -- cgit v1.2.3 From d23e64f3008a799a497ac975a83ef37087b11203 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sun, 1 Jul 2012 14:37:54 +0200 Subject: there's no sidebar in detail.php --- lib/tpl/dokuwiki/detail.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 5fe1a1ad7..cf68aca95 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -10,7 +10,6 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); -$showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" @@ -31,7 +30,7 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show'); <body> <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]--> <div id="dokuwiki__site"><div id="dokuwiki__top" - class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>"> + class="dokuwiki site mode_<?php echo $ACT ?>"> <?php include('tpl_header.php') ?> -- cgit v1.2.3 From 9f6d88deb91f2a191f2d1ef5c10ce42afead458f Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 1 Jul 2012 14:05:20 +0100 Subject: changed 'height' in JS to 'min-height' --- lib/scripts/page.js | 2 +- lib/tpl/dokuwiki/script.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/scripts/page.js b/lib/scripts/page.js index 78943be7a..728887687 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -130,7 +130,7 @@ dw_page = { if(!state) state = 1; // Assert that content instantly takes the whole space - $content.css('height', $content.height()).show(); + $content.css('min-height', $content.height()).show(); // stop any running animation $child.stop(true, true); diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index 677e2f53b..d858bda89 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -7,7 +7,7 @@ * - tablet 481 - 979 (ostensibly for tablets in portrait mode) * - phone <= 480 */ -var device_class = 'not yet known'; +var device_class = ''; // not yet known var device_classes = 'desktop mobile tablet phone'; function tpl_dokuwiki_mobile(){ @@ -67,9 +67,9 @@ jQuery(function(){ ); // increase sidebar length to match content (desktop mode only) - var $sb = jQuery('.desktop #dokuwiki__aside'); - if($sb.length) { - var $ct = jQuery('#dokuwiki__content div.page'); - if($sb.height() > $ct.height()) $ct.height($sb.height()); + var $sidebar = jQuery('.desktop #dokuwiki__aside'); + if($sidebar.length) { + var $content = jQuery('#dokuwiki__content div.page'); + $content.css('min-height', $sidebar.height()); } }); -- cgit v1.2.3 From fc8dc8221b129775d2778687772469c083a67fbe Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 1 Jul 2012 14:48:01 +0100 Subject: improved preview to have same width as resulting page if it would have a sidebar --- lib/tpl/dokuwiki/css/design.css | 14 ++++++++++++-- lib/tpl/dokuwiki/css/mobile.css | 8 ++++---- lib/tpl/dokuwiki/css/structure.css | 8 ++++---- lib/tpl/dokuwiki/main.php | 6 ++++-- 4 files changed, 24 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 9466481c5..d1a00ce0a 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -426,7 +426,17 @@ .dokuwiki div.preview { margin: 0 -2em; - padding: 1.556em 2em 2em; + padding: 0 2em; +} +.dokuwiki.hasSidebar div.preview { + border-right: __sidebar_width__ solid __background_alt__; +} +[dir=rtl] .dokuwiki.hasSidebar div.preview { + border-right-width: 0; + border-left: __sidebar_width__ solid __background_alt__; +} +.dokuwiki div.preview div.pad { + padding: 1.556em 0 2em; } @@ -440,7 +450,7 @@ color: inherit; } [dir=rtl] #dw__toc { - margin: -2em 1.4em .5em -2em; + margin: -1.556em 1.4em .5em -2em; border-left-width: 0; border-right: 1px solid __border__; } diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 4d18113ac..5a72ed095 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -28,17 +28,17 @@ margin-bottom: .5em; } -.hasSidebar #dokuwiki__content { +.showSidebar #dokuwiki__content { float: none; margin-left: 0; width: 100%; } -.hasSidebar #dokuwiki__content > .pad { +.showSidebar #dokuwiki__content > .pad { margin-left: 0; } -[dir=rtl] .hasSidebar #dokuwiki__content, -[dir=rtl] .hasSidebar #dokuwiki__content > .pad { +[dir=rtl] .showSidebar #dokuwiki__content, +[dir=rtl] .showSidebar #dokuwiki__content > .pad { margin-right: 0; } diff --git a/lib/tpl/dokuwiki/css/structure.css b/lib/tpl/dokuwiki/css/structure.css index 5e2eab3bc..00642e90b 100644 --- a/lib/tpl/dokuwiki/css/structure.css +++ b/lib/tpl/dokuwiki/css/structure.css @@ -56,20 +56,20 @@ body { margin: 0 0 0 1.5em; } - .hasSidebar #dokuwiki__content { + .showSidebar #dokuwiki__content { float: right; margin-left: -__sidebar_width__; width: 100%; } - [dir=rtl] .hasSidebar #dokuwiki__content { + [dir=rtl] .showSidebar #dokuwiki__content { float: left; margin-left: 0; margin-right: -__sidebar_width__; } - .hasSidebar #dokuwiki__content > .pad { + .showSidebar #dokuwiki__content > .pad { margin-left: __sidebar_width__; } - [dir=rtl] .hasSidebar #dokuwiki__content > .pad { + [dir=rtl] .showSidebar #dokuwiki__content > .pad { margin-left: 0; margin-right: __sidebar_width__; } diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index e0b046574..effbad64c 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -10,7 +10,8 @@ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ -$showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show'); +$hasSidebar = page_findnearest($conf['sidebar']); +$showSidebar = $hasSidebar && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang'] ?>" @@ -28,7 +29,8 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show'); <body> <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]--> <div id="dokuwiki__site"><div id="dokuwiki__top" - class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>"> + class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'showSidebar' : ''; + ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>"> <?php include('tpl_header.php') ?> -- cgit v1.2.3 From c0670a18504afca86e3544e151035f42daf17200 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 1 Jul 2012 15:18:57 +0100 Subject: switched new default template to HTML5 and added 'no-js' class --- lib/tpl/dokuwiki/detail.php | 7 +++---- lib/tpl/dokuwiki/main.php | 7 +++---- lib/tpl/dokuwiki/mediamanager.php | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index cf68aca95..bb64b42cb 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -10,10 +10,8 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); -?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" - lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>"> +?><!DOCTYPE html> +<html lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="no-js"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]--> @@ -21,6 +19,7 @@ if (!defined('DOKU_INC')) die(); <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> [<?php echo strip_tags($conf['title'])?>] + diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index effbad64c..563d9c949 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -12,14 +12,13 @@ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ $hasSidebar = page_findnearest($conf['sidebar']); $showSidebar = $hasSidebar && ($ACT=='show'); -?> - +?> + <?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] + diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php index 1f3b9661b..4919632c9 100644 --- a/lib/tpl/dokuwiki/mediamanager.php +++ b/lib/tpl/dokuwiki/mediamanager.php @@ -8,10 +8,8 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); -?> - +?> + @@ -19,6 +17,7 @@ if (!defined('DOKU_INC')) die(); [] + -- cgit v1.2.3 From 5e997714aaf42319f9ab4e2df2a4d1bbdabee0e8 Mon Sep 17 00:00:00 2001 From: lupo49 Date: Sun, 1 Jul 2012 20:13:18 +0200 Subject: de/de-informal - language updates for acl and usermanager plugin (synchronize terms) --- lib/plugins/acl/lang/de-informal/lang.php | 4 ++-- lib/plugins/usermanager/lang/de-informal/lang.php | 12 ++++++------ lib/plugins/usermanager/lang/de/lang.php | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php index 3f4b08c2a..05f7df037 100644 --- a/lib/plugins/acl/lang/de-informal/lang.php +++ b/lib/plugins/acl/lang/de-informal/lang.php @@ -5,11 +5,11 @@ * @author Alexander Fischer * @author Juergen Schwarzer * @author Marcel Metz - * @author Matthias Schulte + * @author Matthias Schulte * @author Christian Wichmann * @author Pierre Corell */ -$lang['admin_acl'] = 'Zugriffskontrollsystem Management'; +$lang['admin_acl'] = 'Zugangsverwaltung'; $lang['acl_group'] = 'Gruppe'; $lang['acl_user'] = 'Benutzer'; $lang['acl_perms'] = 'Rechte für'; diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php index dbdce1fbf..e53781c77 100644 --- a/lib/plugins/usermanager/lang/de-informal/lang.php +++ b/lib/plugins/usermanager/lang/de-informal/lang.php @@ -5,11 +5,11 @@ * @author Alexander Fischer * @author Juergen Schwarzer * @author Marcel Metz - * @author Matthias Schulte + * @author Matthias Schulte * @author Christian Wichmann * @author Pierre Corell */ -$lang['menu'] = 'Benutzerverwalter'; +$lang['menu'] = 'Benutzerverwaltung'; $lang['noauth'] = '(Benutzeranmeldung ist nicht verfügbar)'; $lang['nosupport'] = '(Benutzerverwaltung wird nicht unterstützt)'; $lang['badauth'] = 'Ungültige Authentifizierung'; @@ -22,7 +22,7 @@ $lang['field'] = 'Feld'; $lang['value'] = 'Wert'; $lang['add'] = 'Zufügen'; $lang['delete'] = 'Löschen'; -$lang['delete_selected'] = 'Lösche ausgewähltes'; +$lang['delete_selected'] = 'Lösche Ausgewähltes'; $lang['edit'] = 'Bearbeiten'; $lang['edit_prompt'] = 'Bearbeite diesen Benutzer'; $lang['modify'] = 'Änderungen speichern'; @@ -43,10 +43,10 @@ $lang['next'] = 'nächste'; $lang['last'] = 'letzte'; $lang['edit_usermissing'] = 'Der gewählte Benutzer wurde nicht gefunden. Der angegebene Benutzername könnte gelöscht oder an anderer Stelle geändert worden sein.'; $lang['user_notify'] = 'Benutzer benachrichtigen'; -$lang['note_notify'] = 'Benachrichtigungsemails werden nur versandt, wenn der Benutzer ein neues Kennwort erhält.'; +$lang['note_notify'] = 'Benachrichtigungsmails werden nur versandt, wenn der Benutzer ein neues Kennwort erhält.'; $lang['note_group'] = 'Neue Benutzer werden zur Standardgruppe (%s) hinzugefügt, wenn keine Gruppe angegeben wird.'; $lang['note_pass'] = 'Das Passwort wird automatisch erzeugt, wenn das Feld freigelassen wird und der Benutzer Benachrichtigungen aktiviert hat.'; $lang['add_ok'] = 'Benutzer erfolgreich hinzugefügt'; $lang['add_fail'] = 'Hinzufügen des Benutzers fehlgeschlagen'; -$lang['notify_ok'] = 'Benachrichtigungs-Mail wurde versendet'; -$lang['notify_fail'] = 'Benachrichtigungse-Mail konnte nicht gesendet werden'; +$lang['notify_ok'] = 'Benachrichtigungsmail wurde versendet'; +$lang['notify_fail'] = 'Benachrichtigungsemail konnte nicht gesendet werden'; diff --git a/lib/plugins/usermanager/lang/de/lang.php b/lib/plugins/usermanager/lang/de/lang.php index 507fe1f7c..0dd90cc68 100644 --- a/lib/plugins/usermanager/lang/de/lang.php +++ b/lib/plugins/usermanager/lang/de/lang.php @@ -12,11 +12,11 @@ * @author Dirk Einecke * @author Blitzi94@gmx.de * @author Robert Bogenschneider - * @author Robert Bogenschneider * @author Niels Lange * @author Christian Wichmann * @author Paul Lachewsky * @author Pierre Corell + * @author Matthias Schulte */ $lang['menu'] = 'Benutzerverwaltung'; $lang['noauth'] = '(Authentifizierungssystem nicht verfügbar)'; @@ -57,5 +57,5 @@ $lang['note_group'] = 'Neue Nutzer werden der Standard-Gruppe (%s) hi $lang['note_pass'] = 'Das Passwort wird automatisch generiert, wenn das entsprechende Feld leergelassen wird und die Benachrichtigung des Nutzers aktiviert ist.'; $lang['add_ok'] = 'Nutzer erfolgreich angelegt'; $lang['add_fail'] = 'Nutzer konnte nicht angelegt werden'; -$lang['notify_ok'] = 'Benachrichtigungs-Mail wurde versandt'; -$lang['notify_fail'] = 'Benachrichtigungs-Mail konnte nicht versandt werden'; +$lang['notify_ok'] = 'Benachrichtigungsmail wurde versandt'; +$lang['notify_fail'] = 'Benachrichtigungsmail konnte nicht versandt werden'; -- cgit v1.2.3 From a0e07c159740157e1a0618d6df8312d747b86b58 Mon Sep 17 00:00:00 2001 From: Kiril LastName Date: Wed, 4 Jul 2012 12:35:50 +0300 Subject: updated: Bulgarian translation --- lib/plugins/acl/lang/bg/lang.php | 6 +- lib/plugins/config/lang/bg/lang.php | 367 +++++++++++++++++++----------------- 2 files changed, 196 insertions(+), 177 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/bg/lang.php b/lib/plugins/acl/lang/bg/lang.php index e260be918..95201750e 100644 --- a/lib/plugins/acl/lang/bg/lang.php +++ b/lib/plugins/acl/lang/bg/lang.php @@ -20,9 +20,9 @@ $lang['p_group_id'] = 'Членовете на групата Date: Thu, 5 Jul 2012 22:58:24 +0100 Subject: xml compatibility fixes (mainly entities to unicode conversions) --- lib/plugins/acl/admin.php | 8 ++++---- lib/plugins/config/admin.php | 1 + lib/plugins/config/lang/no/lang.php | 4 ++-- lib/plugins/config/settings/config.class.php | 4 ++-- lib/plugins/revert/admin.php | 2 +- lib/plugins/usermanager/admin.php | 2 +- lib/scripts/page.js | 2 +- lib/tpl/default/main.php | 4 ++-- lib/tpl/index.php | 2 +- 9 files changed, 15 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index 1f88c6ff9..a0d2e430e 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -507,7 +507,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { if($item['type']=='d'){ if($item['open']){ $img = DOKU_BASE.'lib/images/minus.gif'; - $alt = '−'; + $alt = '−'; }else{ $img = DOKU_BASE.'lib/images/plus.gif'; $alt = '+'; @@ -747,7 +747,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { //build code $ret .= ''.NL; } @@ -783,7 +783,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ' '.NL; echo ' '.NL; if (!empty($this->specials)) { - echo ' '.NL; + echo ' '.NL; foreach($this->specials as $ug){ if($ug == $this->who){ $sel = ' selected="selected"'; @@ -801,7 +801,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ' '.NL; } if (!empty($this->usersgroups)) { - echo ' '.NL; + echo ' '.NL; foreach($this->usersgroups as $ug){ if($ug == $this->who){ $sel = ' selected="selected"'; diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 9a9bb5329..c5f7ee532 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -118,6 +118,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { // config setting group if ($in_fieldset) { ptln(' '); + ptln('
    '); ptln(' '); } else { $in_fieldset = true; diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php index ec97fe966..b01637dd1 100644 --- a/lib/plugins/config/lang/no/lang.php +++ b/lib/plugins/config/lang/no/lang.php @@ -43,8 +43,8 @@ $lang['_links'] = 'Innstillinger for lenker'; $lang['_media'] = 'Innstillinger for mediafiler'; $lang['_advanced'] = 'Avanserte innstillinger'; $lang['_network'] = 'Nettverksinnstillinger'; -$lang['_plugin_sufix'] = '– innstillinger for tillegg'; -$lang['_template_sufix'] = '– innstillinger for mal'; +$lang['_plugin_sufix'] = '– innstillinger for tillegg'; +$lang['_template_sufix'] = '– innstillinger for mal'; $lang['_msg_setting_undefined'] = 'Ingen innstillingsmetadata'; $lang['_msg_setting_no_class'] = 'Ingen innstillingsklasse'; $lang['_msg_setting_no_default'] = 'Ingen standard verdi'; diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index 1cdab607f..a1430016e 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -452,8 +452,8 @@ if (!class_exists('setting')) { function _out_key($pretty=false,$url=false) { if($pretty){ - $out = str_replace(CM_KEYMARKER,"»",$this->_key); - if ($url && !strstr($out,'»')) {//provide no urls for plugins, etc. + $out = str_replace(CM_KEYMARKER,"»",$this->_key); + if ($url && !strstr($out,'»')) {//provide no urls for plugins, etc. if ($out == 'start') //one exception return ''.$out.''; else diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php index 2aaf1395f..ff5fa69ba 100644 --- a/lib/plugins/revert/admin.php +++ b/lib/plugins/revert/admin.php @@ -159,7 +159,7 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin { echo ' '; echo html_wikilink(':'.$recent['id'],(useHeading('navigation'))?NULL:$recent['id']); - echo ' – '.htmlspecialchars($recent['sum']); + echo ' – '.htmlspecialchars($recent['sum']); echo ' '; echo $recent['user'].' '.$recent['ip']; diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 8b646b426..2bb0a863d 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -153,7 +153,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln(" "); ptln(" "); ptln(" "); - ptln(" "); + ptln(" "); ptln(" "); ptln(" "); diff --git a/lib/scripts/page.js b/lib/scripts/page.js index 728887687..74aca9c06 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -119,7 +119,7 @@ dw_page = { $handle.addClass('closed'); $handle.removeClass('open'); }else{ - $clicky.html('−'); + $clicky.html('−'); $handle.addClass('open'); $handle.removeClass('closed'); } diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index 3e85c58f2..9a14f29a2 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -61,7 +61,7 @@ if (!defined('DOKU_INC')) die();
    -   +  
    @@ -121,7 +121,7 @@ if (!defined('DOKU_INC')) die(); -   +  
    diff --git a/lib/tpl/index.php b/lib/tpl/index.php index 0273e5678..4570f70f5 100644 --- a/lib/tpl/index.php +++ b/lib/tpl/index.php @@ -54,7 +54,7 @@ if ($ini) { echo ''; echo ''; echo ''; -- cgit v1.2.3 From 15f8c9026e596167a72c7d3abaf00621599a5713 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 6 Jul 2012 10:15:12 +0200 Subject: some link icon fixes FS#2548 Made sure all links align as well as possible in a list, giveing them all the same padding. Adjusted the template's icons to use 16x16 size and use the additional space for alignment. Adjusted some of the default interwiki icons (amazon, skype, paypal). --- lib/images/interwiki/amazon.de.gif | Bin 110 -> 132 bytes lib/images/interwiki/amazon.gif | Bin 110 -> 132 bytes lib/images/interwiki/amazon.uk.gif | Bin 110 -> 132 bytes lib/images/interwiki/callto.gif | Bin 178 -> 177 bytes lib/images/interwiki/paypal.gif | Bin 171 -> 138 bytes lib/images/interwiki/skype.gif | Bin 0 -> 157 bytes lib/images/interwiki/skype.png | Bin 675 -> 0 bytes lib/tpl/dokuwiki/css/_links.css | 8 ++------ lib/tpl/dokuwiki/images/email.png | Bin 631 -> 659 bytes lib/tpl/dokuwiki/images/external-link.png | Bin 808 -> 816 bytes lib/tpl/dokuwiki/images/unc.png | Bin 542 -> 553 bytes 11 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 lib/images/interwiki/skype.gif delete mode 100644 lib/images/interwiki/skype.png (limited to 'lib') diff --git a/lib/images/interwiki/amazon.de.gif b/lib/images/interwiki/amazon.de.gif index 6e36a051a..a0d2cd4cb 100644 Binary files a/lib/images/interwiki/amazon.de.gif and b/lib/images/interwiki/amazon.de.gif differ diff --git a/lib/images/interwiki/amazon.gif b/lib/images/interwiki/amazon.gif index 6e36a051a..a0d2cd4cb 100644 Binary files a/lib/images/interwiki/amazon.gif and b/lib/images/interwiki/amazon.gif differ diff --git a/lib/images/interwiki/amazon.uk.gif b/lib/images/interwiki/amazon.uk.gif index 6e36a051a..a0d2cd4cb 100644 Binary files a/lib/images/interwiki/amazon.uk.gif and b/lib/images/interwiki/amazon.uk.gif differ diff --git a/lib/images/interwiki/callto.gif b/lib/images/interwiki/callto.gif index f6d424554..60158c565 100644 Binary files a/lib/images/interwiki/callto.gif and b/lib/images/interwiki/callto.gif differ diff --git a/lib/images/interwiki/paypal.gif b/lib/images/interwiki/paypal.gif index 1d2834062..a2dc89431 100644 Binary files a/lib/images/interwiki/paypal.gif and b/lib/images/interwiki/paypal.gif differ diff --git a/lib/images/interwiki/skype.gif b/lib/images/interwiki/skype.gif new file mode 100644 index 000000000..2c900a8b2 Binary files /dev/null and b/lib/images/interwiki/skype.gif differ diff --git a/lib/images/interwiki/skype.png b/lib/images/interwiki/skype.png deleted file mode 100644 index c70216702..000000000 Binary files a/lib/images/interwiki/skype.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css index 240e336bd..22502f6a9 100644 --- a/lib/tpl/dokuwiki/css/_links.css +++ b/lib/tpl/dokuwiki/css/_links.css @@ -39,22 +39,19 @@ .dokuwiki a.interwiki { background-repeat: no-repeat; background-position: 0 center; - padding: 0 0 0 20px; + padding: 0 0 0 18px; } /* external link */ .dokuwiki a.urlextern { background-image: url(images/external-link.png); - padding: 0 0 0 15px; } /* windows share */ .dokuwiki a.windows { background-image: url(images/unc.png); - padding: 0 0 0 16px; } /* email link */ .dokuwiki a.mail { background-image: url(images/email.png); - padding: 0 0 0 16px; } /* icons of the following are set by dokuwiki in lib/exe/css.php */ @@ -63,7 +60,6 @@ } /* interwiki link */ .dokuwiki a.interwiki { - padding: 0 0 0 17px; } /* RTL corrections; if link icons don't work as expected, remove the following lines */ @@ -73,5 +69,5 @@ [dir=rtl] .dokuwiki a.interwiki, [dir=rtl] .dokuwiki a.mediafile { background-position: right center; - padding: 0 17px 0 0; + padding: 0 18px 0 0; } diff --git a/lib/tpl/dokuwiki/images/email.png b/lib/tpl/dokuwiki/images/email.png index 37f776a33..d1d4a5fd5 100644 Binary files a/lib/tpl/dokuwiki/images/email.png and b/lib/tpl/dokuwiki/images/email.png differ diff --git a/lib/tpl/dokuwiki/images/external-link.png b/lib/tpl/dokuwiki/images/external-link.png index 23c825027..a4d5de17c 100644 Binary files a/lib/tpl/dokuwiki/images/external-link.png and b/lib/tpl/dokuwiki/images/external-link.png differ diff --git a/lib/tpl/dokuwiki/images/unc.png b/lib/tpl/dokuwiki/images/unc.png index dbd225c2b..a552d6e6f 100644 Binary files a/lib/tpl/dokuwiki/images/unc.png and b/lib/tpl/dokuwiki/images/unc.png differ -- cgit v1.2.3 From cefec071bf0633f1422633bdb42089c7acc8240e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 6 Jul 2012 10:14:29 +0100 Subject: styled sidebar toggle title the same in tablet mode as it was in phone mode --- lib/tpl/dokuwiki/css/mobile.css | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 5a72ed095..9138f8031 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -28,6 +28,17 @@ margin-bottom: .5em; } +#dokuwiki__aside h3.toggle { + font-size: 1em; +} +#dokuwiki__aside h3.toggle.closed { + margin-bottom: 0; + padding-bottom: 0; +} +#dokuwiki__aside h3.toggle.open { + border-bottom: 1px solid __border__; +} + .showSidebar #dokuwiki__content { float: none; margin-left: 0; @@ -108,17 +119,6 @@ padding: .5em 0; } -#dokuwiki__aside h3.toggle { - font-size: 1em; -} -#dokuwiki__aside h3.toggle.closed { - margin-bottom: 0; - padding-bottom: 0; -} -#dokuwiki__aside h3.toggle.open { - border-bottom: 1px solid __border__; -} - /*____________ header ____________*/ -- cgit v1.2.3 From 8ec3e0a3184234a895ffdc7831bcb06bf921509e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 7 Jul 2012 09:20:51 +0100 Subject: force same height on search input and tools select in mobile view I hate using heights, but couldn't find any other way --- lib/tpl/dokuwiki/css/mobile.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 9138f8031..8194a1bf9 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -209,6 +209,14 @@ width: 100% !important; } +/* force same height on search input and tools select */ +#dokuwiki__sitetools form.search input.edit, +#dokuwiki__header .mobileTools select { + height: 2.1em; + line-height: 2.1em; + overflow: visible; +} + /*____________ content ____________*/ -- cgit v1.2.3 From d22cdf50593868f32503340eb36962c9642d7c93 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 7 Jul 2012 11:06:48 +0100 Subject: changed meta charset for polyglot markup --- lib/tpl/dokuwiki/detail.php | 2 +- lib/tpl/dokuwiki/main.php | 2 +- lib/tpl/dokuwiki/mediamanager.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index bb64b42cb..a8c5fef8a 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -13,7 +13,7 @@ if (!defined('DOKU_INC')) die(); ?> - + <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 563d9c949..fdc28b975 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -15,7 +15,7 @@ $showSidebar = $hasSidebar && ($ACT=='show'); ?><!DOCTYPE html> <html lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>" class="no-js"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta charset="utf-8" /> <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]--> <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php index 4919632c9..23c9cee79 100644 --- a/lib/tpl/dokuwiki/mediamanager.php +++ b/lib/tpl/dokuwiki/mediamanager.php @@ -11,7 +11,7 @@ if (!defined('DOKU_INC')) die(); ?> - + <?php echo hsc($lang['mediaselect'])?> -- cgit v1.2.3 From 9f2f766c00c72204f3a4bc723177d4fec53d8780 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 8 Jul 2012 12:14:24 +0100 Subject: increased font size for mobile version --- lib/tpl/dokuwiki/css/basic.css | 1 + lib/tpl/dokuwiki/css/mobile.css | 4 ++++ lib/tpl/dokuwiki/style.ini | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 21bc9b25e..d683603ae 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -22,6 +22,7 @@ body { body { font: normal 87.5%/1.4 Arial, sans-serif; /* default font size: 100% => 16px; 93.75% => 15px; 87.5% => 14px; 81.25% => 13px; 75% => 12px */ + -webkit-text-size-adjust: 100%; } diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 8194a1bf9..6e07f23ec 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -107,6 +107,10 @@ ********************************************************************/ @media only screen and (max-width: 480px) { +body { + font-size: 100%; +} + /*____________ structure ____________*/ #dokuwiki__site { diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index 08d1a4273..45e68e3ed 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -67,6 +67,6 @@ __missing__ = "#d30" ; highlighting search snippets __highlight__ = "#ff9" -; sidebar width +; site and sidebar widths __site_width__ = "75em" __sidebar_width__ = "16em" -- cgit v1.2.3 From cc01c067547239aad897eac3b3525d5437f7809b Mon Sep 17 00:00:00 2001 From: Milad D <m.dastanzand@gmail.com> Date: Sun, 8 Jul 2012 20:35:25 +0200 Subject: Persian translation --- lib/plugins/acl/lang/fa/lang.php | 1 + lib/plugins/config/lang/fa/lang.php | 108 +++++++++++++++++-------------- lib/plugins/plugin/lang/fa/lang.php | 1 + lib/plugins/popularity/lang/fa/lang.php | 1 + lib/plugins/revert/lang/fa/lang.php | 1 + lib/plugins/usermanager/lang/fa/lang.php | 1 + 6 files changed, 66 insertions(+), 47 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/fa/lang.php b/lib/plugins/acl/lang/fa/lang.php index ed576c271..8b7d72f51 100644 --- a/lib/plugins/acl/lang/fa/lang.php +++ b/lib/plugins/acl/lang/fa/lang.php @@ -7,6 +7,7 @@ * @author omidmr@gmail.com * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> + * @author Milad DZand <M.DastanZand@gmail.com> */ $lang['admin_acl'] = 'مدیریت کنترل دسترسی‌ها'; $lang['acl_group'] = 'گروه'; diff --git a/lib/plugins/config/lang/fa/lang.php b/lib/plugins/config/lang/fa/lang.php index c1a112365..ba00d5a2d 100644 --- a/lib/plugins/config/lang/fa/lang.php +++ b/lib/plugins/config/lang/fa/lang.php @@ -7,6 +7,7 @@ * @author omidmr@gmail.com * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> + * @author Milad DZand <M.DastanZand@gmail.com> */ $lang['menu'] = 'تنظیمات پیکر‌بندی'; $lang['error'] = 'به دلیل ایراد در مقادیر وارد شده، تنظیمات اعمال نشد، خواهشمندیم تغییرات را مجددن کنترل نمایید و دوباره ارسال کنید.<br/> مقادیر مشکل‌دار با کادر قرمز مشخص شده‌اند.'; @@ -28,6 +29,8 @@ $lang['_anti_spam'] = 'تنظیمات ضد-اسپم'; $lang['_editing'] = 'تنظیمات ویرایش'; $lang['_links'] = 'تنظیمات پیوند'; $lang['_media'] = 'تنظیمات رسانه‌ها (فایل‌ها)'; +$lang['_notifications'] = 'تنظیمات آگاه سازی'; +$lang['_syndication'] = 'تنظیمات پیوند'; $lang['_advanced'] = 'تنظیمات پیشرفته'; $lang['_network'] = 'تنظیمات شبکه'; $lang['_plugin_sufix'] = 'تنظیمات افزونه'; @@ -35,25 +38,29 @@ $lang['_template_sufix'] = 'تنظیمات قالب'; $lang['_msg_setting_undefined'] = 'داده‌نمایی برای تنظیمات وجود ندارد'; $lang['_msg_setting_no_class'] = 'هیچ دسته‌ای برای تنظیمات وجود ندارد.'; $lang['_msg_setting_no_default'] = 'بدون مقدار پیش‌فرض'; -$lang['fmode'] = 'دسترسی پیش‌فرض فایل‌ها در زمان ایجاد'; -$lang['dmode'] = 'زبان'; -$lang['lang'] = 'زبان'; -$lang['basedir'] = 'شاخه‌ی اصلی'; -$lang['baseurl'] = 'آدرس اصلی'; -$lang['savedir'] = 'شاخه‌ی ذخیره‌سازی داده‌ها'; -$lang['start'] = 'نام صفحه‌ی آغازین'; $lang['title'] = 'عنوان ویکی'; +$lang['start'] = 'نام صفحه‌ی آغازین'; +$lang['lang'] = 'زبان'; $lang['template'] = 'قالب'; +$lang['tagline'] = 'خط تگ (اگر قالب از آن پشتیبانی می کند)'; +$lang['sidebar'] = 'نام نوار صفحه کناری (اگر قالب از آن پشتیبانی می کند) ، فیلد خالی نوار کناری غیر فعال خواهد کرد.'; $lang['license'] = 'لایسنس مطالب ویکی'; -$lang['fullpath'] = 'نمایش دادن مسیر کامل صفحات در پایین صفحه'; +$lang['savedir'] = 'شاخه‌ی ذخیره‌سازی داده‌ها'; +$lang['basedir'] = 'شاخه‌ی اصلی'; +$lang['baseurl'] = 'آدرس اصلی'; +$lang['cookiedir'] = 'مسیر کوکی ها. برای استفاده از آدرس پایه ، آن را خالی بگذارید.'; +$lang['dmode'] = 'زبان'; +$lang['fmode'] = 'دسترسی پیش‌فرض فایل‌ها در زمان ایجاد'; +$lang['allowdebug'] = 'امکان کرم‌زدایی (debug) <b>اگر نیازی ندارید، غیرفعال کنید</b>'; $lang['recent'] = 'تغییرات اخیر'; +$lang['recent_days'] = 'چند تغییر در خوراک نمایش داده شود به روز'; $lang['breadcrumbs'] = 'تعداد ردپاها'; $lang['youarehere'] = 'ردپای درختی'; +$lang['fullpath'] = 'نمایش دادن مسیر کامل صفحات در پایین صفحه'; $lang['typography'] = 'جای‌گزاری متن‌ها انجام شود'; -$lang['htmlok'] = 'امکان افزودن HTML باشد'; -$lang['phpok'] = 'امکان افزودن PHP باشد'; $lang['dformat'] = 'فرمت تاریخ (راهنمای تابع <a href="http://www.php.net/strftime">strftime</a> را مشاهده کنید)'; $lang['signature'] = 'امضا'; +$lang['showuseras'] = 'چگونه آخرین کاربر ویرایش کننده، یک صفحه نمایش داده شود'; $lang['toptoclevel'] = 'بیشترین عمق برای «فهرست مطالب»'; $lang['tocminheads'] = 'حداقل مقدار عنوان‌های یک صفحه، برای تشخیص این‌که «فهرست مطالب» (TOC) ایجاد شود'; $lang['maxtoclevel'] = 'حداکثر عمق «فهرست مطالب»'; @@ -61,15 +68,8 @@ $lang['maxseclevel'] = 'بیش‌ترین سطح ویرایش بخش $lang['camelcase'] = 'از «حالت شتری» (CamelCase) برای پیوندها استفاده شود'; $lang['deaccent'] = 'تمیز کردن نام صفحات'; $lang['useheading'] = 'استفاده از اولین عنوان برای نام صفحه'; -$lang['refcheck'] = 'بررسی کردن مرجع رسانه‌ها'; -$lang['refshow'] = 'تعداد مراجعی که برای یک رسانه نمایش داده شود'; -$lang['allowdebug'] = 'امکان کرم‌زدایی (debug) <b>اگر نیازی ندارید، غیرفعال کنید</b>'; -$lang['usewordblock'] = 'اسپم‌ها را براساس لیست کلمات مسدود کن'; -$lang['indexdelay'] = 'مقدار تاخیر پیش از فهرست‌بندی (ثانیه)'; -$lang['relnofollow'] = 'از «rel=nofollow» در پیوندهای خروجی استفاده شود'; -$lang['mailguard'] = 'مبهم کردن آدرس‌های ایمیل'; -$lang['iexssprotect'] = 'بررسی کردن فایل‌های ارسال شده را برای کدهای HTML یا JavaScript مخرب'; -$lang['showuseras'] = 'چگونه آخرین کاربر ویرایش کننده، یک صفحه نمایش داده شود'; +$lang['sneaky_index'] = 'به طور پیش‌فرض، DokuWiki در فهرست تمامی فضای‌نام‌ها را نمایش می‌دهد. فعال کردن این گزینه، مواردی را که کاربر حق خواندنشان را ندارد مخفی می‌کند. این گزینه ممکن است باعث دیده نشدن زیرفضای‌نام‌هایی شود که دسترسی خواندن به آن‌ها وجود دارد. و ممکن است باعث شود که فهرست در حالاتی از دسترسی‌ها، غیرقابل استفاده شود.'; +$lang['hidepages'] = 'مخفی کردن صفحات با فرمت زیر (از عبارات منظم استفاده شود)'; $lang['useacl'] = 'استفاده از مدیریت دسترسی‌ها'; $lang['autopasswd'] = 'ایجاد خودکار گذرواژه‌ها'; $lang['authtype'] = 'روش معتبرسازی'; @@ -78,57 +78,71 @@ $lang['defaultgroup'] = 'گروه پیش‌فرض'; $lang['superuser'] = 'کاربر اصلی - گروه، کاربر یا لیستی که توسط ویرگول جدا شده از کاربرها و گروه‌ها (مثل user1,@group1,user2) با دسترسی کامل به همه‌ی صفحات و امکانات سیستم، فارغ از دسترسی‌های آن کاربر.'; $lang['manager'] = 'مدیر - گروه، کاربر یا لیستی که توسط ویرگول جدا شده از کاربرها و گروه‌ها (مثل user1,@group1,user2) با دسترسی‌های خاص به بخش‌های متفاوت'; $lang['profileconfirm'] = 'تغییرات پروفایل با وارد کردن گذرواژه تایید شود'; +$lang['rememberme'] = 'امکان ورود دایم، توسط کوکی، وجود داشته باشد (مرا به خاطر بسپار)'; $lang['disableactions'] = 'غیرفعال کردن فعالیت‌های DokuWiki'; $lang['disableactions_check'] = 'بررسی'; $lang['disableactions_subscription'] = 'عضویت/عدم عضویت'; $lang['disableactions_wikicode'] = 'نمایش سورس/برون‌بری خام'; $lang['disableactions_other'] = 'فعالیت‌های دیگر (با ویرگول انگلیسی «,» از هم جدا کنید)'; -$lang['sneaky_index'] = 'به طور پیش‌فرض، DokuWiki در فهرست تمامی فضای‌نام‌ها را نمایش می‌دهد. فعال کردن این گزینه، مواردی را که کاربر حق خواندنشان را ندارد مخفی می‌کند. این گزینه ممکن است باعث دیده نشدن زیرفضای‌نام‌هایی شود که دسترسی خواندن به آن‌ها وجود دارد. و ممکن است باعث شود که فهرست در حالاتی از دسترسی‌ها، غیرقابل استفاده شود.'; $lang['auth_security_timeout'] = 'زمان انقضای معتبرسازی به ثانیه'; $lang['securecookie'] = 'آیا کوکی‌ها باید با قرارداد HTTPS ارسال شوند؟ این گزینه را زمانی که فقط صفحه‌ی ورود ویکی‌تان با SSL امن شده است، اما ویکی را ناامن مرور می‌کنید، غیرفعال نمایید.'; +$lang['remote'] = 'سیستم API راه دور را فعال کنید . این به سایر کاربردها اجازه می دهد که به ویکی از طریق XML-RPC یا سایر مکانیزم ها دسترسی داشته باشند.'; +$lang['remoteuser'] = 'محدود کردن دسترسی API راه دور به گروه های جدا شده با ویرگول یا کاربران داده شده در این جا. برای دادن دسترسی به همه این فیلد را خالی بگذارید.'; +$lang['usewordblock'] = 'اسپم‌ها را براساس لیست کلمات مسدود کن'; +$lang['relnofollow'] = 'از «rel=nofollow» در پیوندهای خروجی استفاده شود'; +$lang['indexdelay'] = 'مقدار تاخیر پیش از فهرست‌بندی (ثانیه)'; +$lang['mailguard'] = 'مبهم کردن آدرس‌های ایمیل'; +$lang['iexssprotect'] = 'بررسی کردن فایل‌های ارسال شده را برای کدهای HTML یا JavaScript مخرب'; +$lang['usedraft'] = 'ایجاد خودکار چرک‌نویس در زمان نگارش'; +$lang['htmlok'] = 'امکان افزودن HTML باشد'; +$lang['phpok'] = 'امکان افزودن PHP باشد'; +$lang['locktime'] = 'بیشینه‌ی زمان قفل شدن فایل‌ها به ثانیه'; +$lang['cachetime'] = 'بیشینه‌ی زمان حافظه‌ی موقت (cache) به ثانیه'; +$lang['target____wiki'] = 'پنجره‌ی هدف در پیوند‌های داخلی'; +$lang['target____interwiki'] = 'پنجره‌ی هدف در پیوند‌های داخل ویکی'; +$lang['target____extern'] = 'پنجره‌ی هدف در پیوند‌های خارجی'; +$lang['target____media'] = 'پنجره‌ی هدف در پیوند‌های رسانه‌ها'; +$lang['target____windows'] = 'پنجره‌ی هدف در پیوند‌های پنجره‌ای'; +$lang['mediarevisions'] = 'تجدید نظر رسانه ، فعال؟'; +$lang['refcheck'] = 'بررسی کردن مرجع رسانه‌ها'; +$lang['refshow'] = 'تعداد مراجعی که برای یک رسانه نمایش داده شود'; +$lang['gdlib'] = 'نگارش کتاب‌خانه‌ی GD'; +$lang['im_convert'] = 'مسیر ابزار convert از برنامه‌ی ImageMagick'; +$lang['jpg_quality'] = 'کیفیت فشرده سازی JPEG (از 0 تا 100)'; +$lang['fetchsize'] = 'بیشینه‌ی حجمی که فایل fetch.php می‌تواند دریافت کند (به بایت)'; +$lang['subscribers'] = 'توانایی عضویت در صفحات باشد'; +$lang['subscribe_time'] = 'زمان مورد نیاز برای ارسال خبر نامه ها (ثانیه); این مقدار می بایست کمتر زمانی باشد که در recent_days تعریف شده است.'; +$lang['notify'] = 'تغییرات به این ایمیل ارسال شود'; +$lang['registernotify'] = 'اطلاعات کاربران تازه وارد به این ایمیل ارسال شود'; +$lang['mailfrom'] = 'آدرس ایمیلی که برای ایمیل‌های خودکار استفاده می‌شود'; +$lang['mailprefix'] = 'پیشوند تیتر ایمیل (جهت ایمیل های خودکار)'; +$lang['htmlmail'] = 'فرستادن با ظاهر بهتر ، امّا با اندازه بیشتر در ایمیل های چند قسمتی HTML. +برای استفاده از ایمیل متنی ، غیر فعال کنید.'; +$lang['sitemap'] = 'تولید کردن نقشه‌ی سایت توسط گوگل (روز)'; +$lang['rss_type'] = 'نوع خوراک'; +$lang['rss_linkto'] = 'خوراک به کجا لینک شود'; +$lang['rss_content'] = 'چه چیزی در تکه‌های خوراک نمایش داده شود؟'; +$lang['rss_update'] = 'زمان به روز رسانی خوراک به ثانیه'; +$lang['rss_show_summary'] = 'خوراک مختصری از مطلب را در عنوان نمایش دهد'; +$lang['rss_media'] = 'چه نوع تغییراتی باید در خوراک XML لیست شود؟'; $lang['updatecheck'] = 'هشدارهای به روز رسانی و امنیتی بررسی شود؟ برای این‌کار DokuWiki با سرور update.dokuwiki.org تماس خواهد گرفت.'; $lang['userewrite'] = 'از زیباکننده‌ی آدرس‌ها استفاده شود'; $lang['useslash'] = 'از اسلش «/» برای جداکننده‌ی آدرس فضای‌نام‌ها استفاده شود'; -$lang['usedraft'] = 'ایجاد خودکار چرک‌نویس در زمان نگارش'; $lang['sepchar'] = 'کلمه‌ی جداکننده‌ی نام صفحات'; $lang['canonical'] = 'استفاده از آدرس‌های استاندارد'; $lang['fnencode'] = 'روش تغییر نام فایل‌هایی با فرمتی غیر از اسکی'; $lang['autoplural'] = 'بررسی جمع بودن در پیوندها'; $lang['compression'] = 'روش فشرده‌سازی برای فایل‌های خُرد'; -$lang['cachetime'] = 'بیشینه‌ی زمان حافظه‌ی موقت (cache) به ثانیه'; -$lang['locktime'] = 'بیشینه‌ی زمان قفل شدن فایل‌ها به ثانیه'; -$lang['fetchsize'] = 'بیشینه‌ی حجمی که فایل fetch.php می‌تواند دریافت کند (به بایت)'; -$lang['notify'] = 'تغییرات به این ایمیل ارسال شود'; -$lang['registernotify'] = 'اطلاعات کاربران تازه وارد به این ایمیل ارسال شود'; -$lang['mailfrom'] = 'آدرس ایمیلی که برای ایمیل‌های خودکار استفاده می‌شود'; -$lang['mailprefix'] = 'پیشوند تیتر ایمیل (جهت ایمیل های خودکار)'; $lang['gzip_output'] = 'استفاده از gzip برای xhtmlها'; -$lang['gdlib'] = 'نگارش کتاب‌خانه‌ی GD'; -$lang['im_convert'] = 'مسیر ابزار convert از برنامه‌ی ImageMagick'; -$lang['jpg_quality'] = 'کیفیت فشرده سازی JPEG (از 0 تا 100)'; -$lang['subscribers'] = 'توانایی عضویت در صفحات باشد'; -$lang['subscribe_time'] = 'زمان مورد نیاز برای ارسال خبر نامه ها (ثانیه); این مقدار می بایست کمتر زمانی باشد که در recent_days تعریف شده است.'; $lang['compress'] = 'فشرده‌سازی کد‌های CSS و JavaScript'; -$lang['hidepages'] = 'مخفی کردن صفحات با فرمت زیر (از عبارات منظم استفاده شود)'; +$lang['cssdatauri'] = 'اندازه بایت هایی که تصاویر ارجاع شده به فایل های CSS باید به درستی درون stylesheet جایگذاری شود تا سربار سرایند درخواست HTTP را کاهش دهد. این روش در IE 7 و پایین تر کار نمی کند! مقادیر <code>400</code> تا <code>600</code> بایت مقدار خوبی است. برای غیر فعال کردن <code>0</code> قرار دهید.'; $lang['send404'] = 'ارسال «HTTP 404/Page Not Found» برای صفحاتی که وجود ندارند'; -$lang['sitemap'] = 'تولید کردن نقشه‌ی سایت توسط گوگل (روز)'; $lang['broken_iua'] = 'آیا تابع ignore_user_about در ویکی شما کار نمی‌کند؟ ممکن است فهرست جستجوی شما کار نکند. IIS به همراه PHP/CGI باعث خراب شدن این گزینه می‌شود. برای اطلاعات بیشتر <a href="http://bugs.splitbrain.org/?do=details&task_id=852">باگ ۸۵۲</a> را مشاهده کنید.'; $lang['xsendfile'] = 'استفاده از هدر X-Sendfile، تا به وب‌سرور توانایی ارسال فایل‌های ثابت را بدهد. وب‌سرور شما باید این مورد را پشتیبانی کند.'; $lang['renderer_xhtml'] = 'مفسری که برای خروجی اصلی ویکی استفاده شود'; $lang['renderer__core'] = '%s (هسته‌ی dokuwiki)'; $lang['renderer__plugin'] = '%s (افزونه)'; -$lang['rememberme'] = 'امکان ورود دایم، توسط کوکی، وجود داشته باشد (مرا به خاطر بسپار)'; -$lang['rss_type'] = 'نوع خوراک'; -$lang['rss_linkto'] = 'خوراک به کجا لینک شود'; -$lang['rss_content'] = 'چه چیزی در تکه‌های خوراک نمایش داده شود؟'; -$lang['rss_update'] = 'زمان به روز رسانی خوراک به ثانیه'; -$lang['recent_days'] = 'چند تغییر در خوراک نمایش داده شود به روز'; -$lang['rss_show_summary'] = 'خوراک مختصری از مطلب را در عنوان نمایش دهد'; -$lang['target____wiki'] = 'پنجره‌ی هدف در پیوند‌های داخلی'; -$lang['target____interwiki'] = 'پنجره‌ی هدف در پیوند‌های داخل ویکی'; -$lang['target____extern'] = 'پنجره‌ی هدف در پیوند‌های خارجی'; -$lang['target____media'] = 'پنجره‌ی هدف در پیوند‌های رسانه‌ها'; -$lang['target____windows'] = 'پنجره‌ی هدف در پیوند‌های پنجره‌ای'; +$lang['dnslookups'] = 'DokuWiki نام هاست ها را برای آدرسهای IP یِ صفحات ویرایشی کاربران ، جستجو می کند. اگر یک سرور DNS کند یا نا کارامد دارید یا این ویژگی را نمی خواهید ، این گزینه را غیر فعال کنید.'; $lang['proxy____host'] = 'آدرس سرور پروکسی'; $lang['proxy____port'] = 'پورت پروکسی'; $lang['proxy____user'] = 'نام کاربری پروکسی'; diff --git a/lib/plugins/plugin/lang/fa/lang.php b/lib/plugins/plugin/lang/fa/lang.php index 8f3fb8a41..dbfe9ef9a 100644 --- a/lib/plugins/plugin/lang/fa/lang.php +++ b/lib/plugins/plugin/lang/fa/lang.php @@ -7,6 +7,7 @@ * @author omidmr@gmail.com * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> + * @author Milad DZand <M.DastanZand@gmail.com> */ $lang['menu'] = 'مدیریت افزونه‌ها'; $lang['download'] = 'دریافت و نصب افزونه'; diff --git a/lib/plugins/popularity/lang/fa/lang.php b/lib/plugins/popularity/lang/fa/lang.php index 70c65f1b3..600e68077 100644 --- a/lib/plugins/popularity/lang/fa/lang.php +++ b/lib/plugins/popularity/lang/fa/lang.php @@ -7,6 +7,7 @@ * @author omidmr@gmail.com * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> + * @author Milad DZand <M.DastanZand@gmail.com> */ $lang['name'] = 'بازخورد محبوبیت (ممکن است اندکی زمان ببرد)'; $lang['submit'] = 'ارسال اطلاعات'; diff --git a/lib/plugins/revert/lang/fa/lang.php b/lib/plugins/revert/lang/fa/lang.php index 02d2aabd2..34a5c430e 100644 --- a/lib/plugins/revert/lang/fa/lang.php +++ b/lib/plugins/revert/lang/fa/lang.php @@ -7,6 +7,7 @@ * @author omidmr@gmail.com * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> + * @author Milad DZand <M.DastanZand@gmail.com> */ $lang['menu'] = 'مدیریت برگشت‌ها'; $lang['filter'] = 'جستجوی صفحات اسپم شده'; diff --git a/lib/plugins/usermanager/lang/fa/lang.php b/lib/plugins/usermanager/lang/fa/lang.php index f9e973b9c..674013474 100644 --- a/lib/plugins/usermanager/lang/fa/lang.php +++ b/lib/plugins/usermanager/lang/fa/lang.php @@ -7,6 +7,7 @@ * @author omidmr@gmail.com * @author Omid Mottaghi <omidmr@gmail.com> * @author Mohammad Reza Shoaei <shoaei@gmail.com> + * @author Milad DZand <M.DastanZand@gmail.com> */ $lang['menu'] = 'مدیریت کاربر'; $lang['noauth'] = '(معتبرسازی کاربر ممکن نیست)'; -- cgit v1.2.3 From f4c788ee87e2a5de27fd70cd38490ef6d0cb7aa5 Mon Sep 17 00:00:00 2001 From: Mikael Lyngvig <mikael@lyngvig.org> Date: Sun, 8 Jul 2012 20:37:06 +0200 Subject: danish language update --- lib/plugins/acl/lang/da/lang.php | 1 + lib/plugins/config/lang/da/lang.php | 103 +++++++++++++++------------ lib/plugins/plugin/lang/da/lang.php | 2 + lib/plugins/popularity/lang/da/lang.php | 6 ++ lib/plugins/popularity/lang/da/submitted.txt | 3 + lib/plugins/revert/lang/da/lang.php | 1 + lib/plugins/usermanager/lang/da/lang.php | 1 + 7 files changed, 71 insertions(+), 46 deletions(-) create mode 100644 lib/plugins/popularity/lang/da/submitted.txt (limited to 'lib') diff --git a/lib/plugins/acl/lang/da/lang.php b/lib/plugins/acl/lang/da/lang.php index f82098dee..4a9d11448 100644 --- a/lib/plugins/acl/lang/da/lang.php +++ b/lib/plugins/acl/lang/da/lang.php @@ -13,6 +13,7 @@ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> * @author rasmus@kinnerup.com * @author Michael Pedersen subben@gmail.com + * @author Mikael Lyngvig <mikael@lyngvig.org> */ $lang['admin_acl'] = 'Rettighedsadministration'; $lang['acl_group'] = 'Gruppe'; diff --git a/lib/plugins/config/lang/da/lang.php b/lib/plugins/config/lang/da/lang.php index 7e8fe95af..239a4986f 100644 --- a/lib/plugins/config/lang/da/lang.php +++ b/lib/plugins/config/lang/da/lang.php @@ -11,6 +11,7 @@ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> * @author rasmus@kinnerup.com * @author Michael Pedersen subben@gmail.com + * @author Mikael Lyngvig <mikael@lyngvig.org> */ $lang['menu'] = 'Opsætningsindstillinger'; $lang['error'] = 'Indstillingerne blev ikke opdateret på grund af en ugyldig værdi, Gennemse venligst dine ændringer og gem dem igen. @@ -34,6 +35,7 @@ $lang['_anti_spam'] = 'Trafikkontrolsindstillinger'; $lang['_editing'] = 'Redigeringsindstillinger'; $lang['_links'] = 'Henvisningsindstillinger'; $lang['_media'] = 'Medieindstillinger'; +$lang['_notifications'] = 'Notificeringsindstillinger'; $lang['_advanced'] = 'Avancerede indstillinger'; $lang['_network'] = 'Netværksindstillinger'; $lang['_plugin_sufix'] = 'Udvidelsesindstillinger'; @@ -41,25 +43,29 @@ $lang['_template_sufix'] = 'Skabelonindstillinger'; $lang['_msg_setting_undefined'] = 'Ingen indstillingsmetadata.'; $lang['_msg_setting_no_class'] = 'Ingen indstillingsklasse.'; $lang['_msg_setting_no_default'] = 'Ingen standardværdi.'; -$lang['fmode'] = 'Filoprettelsestilstand'; -$lang['dmode'] = 'Katalogoprettelsestilstand'; -$lang['lang'] = 'Sprog'; -$lang['basedir'] = 'Grundkatalog'; -$lang['baseurl'] = 'Grundadresse'; -$lang['savedir'] = 'Katalog til opbevaring af data'; -$lang['start'] = 'Startsidens navn'; $lang['title'] = 'Wiki titel'; +$lang['start'] = 'Startsidens navn'; +$lang['lang'] = 'Sprog'; $lang['template'] = 'Skabelon'; +$lang['tagline'] = 'Tagline (hvis templaten understøtter det)'; +$lang['sidebar'] = 'Sidebar side navne (hvis templaten understøtter det).'; $lang['license'] = 'Under hvilken licens skal dit indhold frigives?'; -$lang['fullpath'] = 'Vis den fulde sti til siderne i bundlinjen'; +$lang['savedir'] = 'Katalog til opbevaring af data'; +$lang['basedir'] = 'Grundkatalog'; +$lang['baseurl'] = 'Grundadresse'; +$lang['cookiedir'] = 'Cookie sti. Hvis tom, bruges baseurl.'; +$lang['dmode'] = 'Katalogoprettelsestilstand'; +$lang['fmode'] = 'Filoprettelsestilstand'; +$lang['allowdebug'] = 'Tillad fejlretning <b>slå fra hvis unødvendig!</b>'; $lang['recent'] = 'Nylige ændringer'; +$lang['recent_days'] = 'Hvor mange nye ændringer der skal beholdes (dage)'; $lang['breadcrumbs'] = 'Stilængde'; $lang['youarehere'] = 'Hierarkisk sti'; +$lang['fullpath'] = 'Vis den fulde sti til siderne i bundlinjen'; $lang['typography'] = 'Typografiske erstatninger'; -$lang['htmlok'] = 'Tillad indlejret HTML'; -$lang['phpok'] = 'Tillad indlejret PHP'; $lang['dformat'] = 'Datoformat (se PHP\'s <a href="http://www.php.net/strftime">strftime</a>-funktion)'; $lang['signature'] = 'Underskrift'; +$lang['showuseras'] = 'Hvad skal vises når den sidste bruger, der har ændret siden, fremstilles'; $lang['toptoclevel'] = 'Øverste niveau for indholdsfortegnelse'; $lang['tocminheads'] = 'Mindste antal overskrifter for at danne Indholdsfortegnelsen'; $lang['maxtoclevel'] = 'Højeste niveau for indholdsfortegnelse'; @@ -67,15 +73,8 @@ $lang['maxseclevel'] = 'Højeste niveau for redigering af sektioner'; $lang['camelcase'] = 'Brug KamelKasse til henvisninger'; $lang['deaccent'] = 'Pæne sidenavne'; $lang['useheading'] = 'Brug første overskrift til sidenavne'; -$lang['refcheck'] = 'Mediehenvisningerkontrol'; -$lang['refshow'] = 'Antal viste mediehenvisninger'; -$lang['allowdebug'] = 'Tillad fejlretning <b>slå fra hvis unødvendig!</b>'; -$lang['usewordblock'] = 'Hindr uønsket brug med en ordliste'; -$lang['indexdelay'] = 'Tidsforsinkelse før katalogisering (sek.)'; -$lang['relnofollow'] = 'Brug rel="nofollow" til udadgående henvisninger'; -$lang['mailguard'] = 'Slør elektroniske adresser'; -$lang['iexssprotect'] = 'Gennemse oplagte filer for mulig skadelig JavaScript- eller HTML-kode.'; -$lang['showuseras'] = 'Hvad skal vises når den sidste bruger, der har ændret siden, fremstilles'; +$lang['sneaky_index'] = 'DokuWiki vil som standard vise alle navnerum i indholdsfortegnelsen. Ved at slå denne valgmulighed til vil skjule de navnerum, hvor brugeren ikke har læsetilladelse. Dette kan føre til, at tilgængelige undernavnerum bliver skjult. Ligeledes kan det også gøre indholdsfortegnelsen ubrugelig med visse ACL-opsætninger.'; +$lang['hidepages'] = 'Skjul lignende sider (almindelige udtryk)'; $lang['useacl'] = 'Benyt adgangskontrollister'; $lang['autopasswd'] = 'Generer adgangskoder automatisk'; $lang['authtype'] = 'Bekræftelsesgrundlag'; @@ -84,56 +83,68 @@ $lang['defaultgroup'] = 'Standardgruppe'; $lang['superuser'] = 'Superbruger'; $lang['manager'] = 'Bestyrer - en gruppe eller bruger med adgang til bestemte styrende funktioner'; $lang['profileconfirm'] = 'Bekræft profilændringer med kodeord'; +$lang['rememberme'] = 'Tillad varige datafiler for brugernavne (husk mig)'; $lang['disableactions'] = 'Slå DokuWiki-muligheder fra'; $lang['disableactions_check'] = 'Tjek'; $lang['disableactions_subscription'] = 'Tliføj/Fjern opskrivning'; $lang['disableactions_wikicode'] = 'Vis kilde/Eksporter grundkode'; $lang['disableactions_other'] = 'Andre muligheder (kommasepareret)'; -$lang['sneaky_index'] = 'DokuWiki vil som standard vise alle navnerum i indholdsfortegnelsen. Ved at slå denne valgmulighed til vil skjule de navnerum, hvor brugeren ikke har læsetilladelse. Dette kan føre til, at tilgængelige undernavnerum bliver skjult. Ligeledes kan det også gøre indholdsfortegnelsen ubrugelig med visse ACL-opsætninger.'; $lang['auth_security_timeout'] = 'Tidsudløb for bekræftelse (sekunder)'; $lang['securecookie'] = 'Skal datafiler skabt af HTTPS kun sendes af HTTPS gennem browseren? Slå denne valgmulighed fra hvis kun brugen af din wiki er SSL-beskyttet, mens den almindelige tilgang udefra ikke er sikret.'; +$lang['remote'] = 'Aktivér fjern APIet. Dette tillader andre programmer at tilgå wikien via XML-RPC eller andre mekanismer.'; +$lang['remoteuser'] = 'Begræns fjern API adgang til den kommaseparerede liste af grupper eller brugere angivet her. Efterlad tom for at give adgang til alle.'; +$lang['usewordblock'] = 'Hindr uønsket brug med en ordliste'; +$lang['relnofollow'] = 'Brug rel="nofollow" til udadgående henvisninger'; +$lang['indexdelay'] = 'Tidsforsinkelse før katalogisering (sek.)'; +$lang['mailguard'] = 'Slør elektroniske adresser'; +$lang['iexssprotect'] = 'Gennemse oplagte filer for mulig skadelig JavaScript- eller HTML-kode.'; +$lang['usedraft'] = 'Gem automatisk en kladde under redigering'; +$lang['htmlok'] = 'Tillad indlejret HTML'; +$lang['phpok'] = 'Tillad indlejret PHP'; +$lang['locktime'] = 'Længste levetid for låsefiler (sek)'; +$lang['cachetime'] = 'Længste levetid for "cache" (sek)'; +$lang['target____wiki'] = 'Målvindue for indre henvisninger'; +$lang['target____interwiki'] = 'Målvindue for egne wikihenvisninger '; +$lang['target____extern'] = 'Målvindue for udadgående henvisninger'; +$lang['target____media'] = 'Målvindue for mediehenvisninger'; +$lang['target____windows'] = 'Målvindue til Windows-henvisninger'; +$lang['mediarevisions'] = 'Akvtivér media udgaver?'; +$lang['refcheck'] = 'Mediehenvisningerkontrol'; +$lang['refshow'] = 'Antal viste mediehenvisninger'; +$lang['gdlib'] = 'Udgave af GD Lib'; +$lang['im_convert'] = 'Sti til ImageMagick\'s omdannerværktøj'; +$lang['jpg_quality'] = 'JPG komprimeringskvalitet (0-100)'; +$lang['fetchsize'] = 'Største antal (bytes) fetch.php må hente udefra'; +$lang['subscribers'] = 'Slå understøttelse af abonnement på sider til'; +$lang['subscribe_time'] = 'Tid der går før abonnementlister og nyhedsbreve er sendt (i sekunder). Denne værdi skal være mindre end den tid specificeret under recent_days.'; +$lang['notify'] = 'Send ændringsmeddelelser til denne e-adresse'; +$lang['registernotify'] = 'Send info om nyoprettede brugere til denne e-adresse'; +$lang['mailfrom'] = 'E-adresse til brug for automatiske meddelelser'; +$lang['mailprefix'] = 'Præfiks på email subject for automastiske mails. Efterlad blank for at bruge wiki titlen.'; +$lang['htmlmail'] = 'Send pænere, men større HTML multipart mails. Deaktivér for at sende rene tekst mails.'; +$lang['sitemap'] = 'Generer Google-"sitemap" (dage)'; +$lang['rss_type'] = 'Type af XML-liste'; +$lang['rss_linkto'] = 'XML-liste henviser til'; +$lang['rss_content'] = 'Hvad skal der vises i XML-listepunkteren?'; +$lang['rss_update'] = 'XML-listens opdateringsinterval (sek)'; +$lang['rss_show_summary'] = 'XML-liste vis referat i overskriften'; +$lang['rss_media'] = 'Hvilke ændringer skal vises i XML listen?'; $lang['updatecheck'] = 'Kig efter opdateringer og sikkerhedsadvarsler? DokuWiki er nødt til at kontakte update.dokuwiki.org for at tilgå denne funktion.'; $lang['userewrite'] = 'Brug pæne netadresser'; $lang['useslash'] = 'Brug skråstreg som navnerumsdeler i netadresser'; -$lang['usedraft'] = 'Gem automatisk en kladde under redigering'; $lang['sepchar'] = 'Orddelingstegn til sidenavne'; $lang['canonical'] = 'Benyt fuldt kanoniske netadresser'; $lang['fnencode'] = 'Metode for indkodning af ikke ASCII filnavne'; $lang['autoplural'] = 'Tjek for flertalsendelser i henvisninger'; $lang['compression'] = 'Pakningsmetode for attic-filer'; -$lang['cachetime'] = 'Længste levetid for "cache" (sek)'; -$lang['locktime'] = 'Længste levetid for låsefiler (sek)'; -$lang['fetchsize'] = 'Største antal (bytes) fetch.php må hente udefra'; -$lang['notify'] = 'Send ændringsmeddelelser til denne e-adresse'; -$lang['registernotify'] = 'Send info om nyoprettede brugere til denne e-adresse'; -$lang['mailfrom'] = 'E-adresse til brug for automatiske meddelelser'; $lang['gzip_output'] = 'Benyt gzip-Content-Encoding (indholdskryptering) til XHTML'; -$lang['gdlib'] = 'Udgave af GD Lib'; -$lang['im_convert'] = 'Sti til ImageMagick\'s omdannerværktøj'; -$lang['jpg_quality'] = 'JPG komprimeringskvalitet (0-100)'; -$lang['subscribers'] = 'Slå understøttelse af abonnement på sider til'; -$lang['subscribe_time'] = 'Tid der går før abonnementlister og nyhedsbreve er sendt (i sekunder). Denne værdi skal være mindre end den tid specificeret under recent_days.'; $lang['compress'] = 'Komprimer CSS- og JavaScript-filer'; -$lang['hidepages'] = 'Skjul lignende sider (almindelige udtryk)'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for ikke-eksisterende sider'; -$lang['sitemap'] = 'Generer Google-"sitemap" (dage)'; $lang['broken_iua'] = 'Er funktionen "ignore_user_abort" uvirksom på dit system? Dette kunne forårsage en ikke virkende søgeoversigt. IIS+PHP/CGI er kendt for ikke at virke. Se <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Fejl 852</a> for flere oplysninger.'; $lang['xsendfile'] = 'Brug hovedfilen til X-Sendfile for at få netserveren til at sende statiske filer? Din netserver skal understøtte dette for at bruge det.'; $lang['renderer_xhtml'] = 'Udskriver der skal bruges til størstedelen af wiki-udskriften (XHTML)'; $lang['renderer__core'] = '%s (dokuwiki-kerne)'; $lang['renderer__plugin'] = '%s (udvidelse)'; -$lang['rememberme'] = 'Tillad varige datafiler for brugernavne (husk mig)'; -$lang['rss_type'] = 'Type af XML-liste'; -$lang['rss_linkto'] = 'XML-liste henviser til'; -$lang['rss_content'] = 'Hvad skal der vises i XML-listepunkteren?'; -$lang['rss_update'] = 'XML-listens opdateringsinterval (sek)'; -$lang['recent_days'] = 'Hvor mange nye ændringer der skal beholdes (dage)'; -$lang['rss_show_summary'] = 'XML-liste vis referat i overskriften'; -$lang['target____wiki'] = 'Målvindue for indre henvisninger'; -$lang['target____interwiki'] = 'Målvindue for egne wikihenvisninger '; -$lang['target____extern'] = 'Målvindue for udadgående henvisninger'; -$lang['target____media'] = 'Målvindue for mediehenvisninger'; -$lang['target____windows'] = 'Målvindue til Windows-henvisninger'; $lang['proxy____host'] = 'Proxy-servernavn'; $lang['proxy____port'] = 'Proxy-port'; $lang['proxy____user'] = 'Proxy-brugernavn'; diff --git a/lib/plugins/plugin/lang/da/lang.php b/lib/plugins/plugin/lang/da/lang.php index 841d246df..d1deb6310 100644 --- a/lib/plugins/plugin/lang/da/lang.php +++ b/lib/plugins/plugin/lang/da/lang.php @@ -11,6 +11,7 @@ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> * @author rasmus@kinnerup.com * @author Michael Pedersen subben@gmail.com + * @author Mikael Lyngvig <mikael@lyngvig.org> */ $lang['menu'] = 'Håndter udvidelser'; $lang['download'] = 'Hent og tilføj ny udvidelse'; @@ -56,3 +57,4 @@ $lang['enabled'] = 'Udvidelsen %s blev aktiveret.'; $lang['notenabled'] = 'Udvidelsen %s kunne ikke aktiveres. Kontroller filtilladelser.'; $lang['disabled'] = 'Udvidelsen %s blev ikke aktiveret.'; $lang['notdisabled'] = 'Udvidelsen %s kunne ikke aktiveres. Kontroller filtilladelser.'; +$lang['packageinstalled'] = 'Plugin pakke (%d plugin(s): %s) installeret korrekt.'; diff --git a/lib/plugins/popularity/lang/da/lang.php b/lib/plugins/popularity/lang/da/lang.php index 325fd6568..bbf2a1ab4 100644 --- a/lib/plugins/popularity/lang/da/lang.php +++ b/lib/plugins/popularity/lang/da/lang.php @@ -9,6 +9,12 @@ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> * @author rasmus@kinnerup.com * @author Michael Pedersen subben@gmail.com + * @author Mikael Lyngvig <mikael@lyngvig.org> */ $lang['name'] = 'Tilbagemelding om popularitet (vil måske tage en del tid at indlæse)'; $lang['submit'] = 'Send data'; +$lang['autosubmit'] = 'Automatisk sende data en gang om måneden'; +$lang['submissionFailed'] = 'Dataene kunne ikke sendes pga. følgende fejl:'; +$lang['submitDirectly'] = 'Du kan sende dataene manuelt ved at sende følgende formular.'; +$lang['autosubmitError'] = 'Den sidste automatiske fremsendelse fejlede pga. følgende fejl:'; +$lang['lastSent'] = 'Dataene er blevet sendt.'; diff --git a/lib/plugins/popularity/lang/da/submitted.txt b/lib/plugins/popularity/lang/da/submitted.txt new file mode 100644 index 000000000..7d7d5429c --- /dev/null +++ b/lib/plugins/popularity/lang/da/submitted.txt @@ -0,0 +1,3 @@ +====== Popularitetsfeeback ====== + +Dataene er blevet sendt. \ No newline at end of file diff --git a/lib/plugins/revert/lang/da/lang.php b/lib/plugins/revert/lang/da/lang.php index c94366638..a76541a78 100644 --- a/lib/plugins/revert/lang/da/lang.php +++ b/lib/plugins/revert/lang/da/lang.php @@ -9,6 +9,7 @@ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> * @author rasmus@kinnerup.com * @author Michael Pedersen subben@gmail.com + * @author Mikael Lyngvig <mikael@lyngvig.org> */ $lang['menu'] = 'Gendannelsesstyring'; $lang['filter'] = 'Søg efter uønskede sider'; diff --git a/lib/plugins/usermanager/lang/da/lang.php b/lib/plugins/usermanager/lang/da/lang.php index ea3109374..845457f7e 100644 --- a/lib/plugins/usermanager/lang/da/lang.php +++ b/lib/plugins/usermanager/lang/da/lang.php @@ -10,6 +10,7 @@ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> * @author rasmus@kinnerup.com * @author Michael Pedersen subben@gmail.com + * @author Mikael Lyngvig <mikael@lyngvig.org> */ $lang['menu'] = 'Brugerstyring'; $lang['noauth'] = '(Brugervalidering er ikke tilgængelig)'; -- cgit v1.2.3 From 499add6b1673fdc5539e698517dbae3728b1e394 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sun, 8 Jul 2012 20:57:22 +0200 Subject: no longer allow include statements in local.conf.php as discussed at https://github.com/splitbrain/dokuwiki/pull/115 --- lib/plugins/config/settings/config.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index a1430016e..29d21f8a3 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -156,7 +156,7 @@ if (!class_exists('configuration')) { }else{ $contents = ''; } - $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$'.$this->_name.'|@include|$))/s'; + $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$'.$this->_name.'|$))/s'; $matches=array(); preg_match_all($pattern,$contents,$matches,PREG_SET_ORDER); -- cgit v1.2.3 From a655c8784a73a3fcef7f41f59f871e7a78d3101b Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 8 Jul 2012 23:28:07 +0100 Subject: added lang string for 'Sidebar' --- lib/tpl/dokuwiki/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index fdc28b975..2406a206b 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -38,7 +38,7 @@ $showSidebar = $hasSidebar && ($ACT=='show'); <?php if($showSidebar): ?> <!-- ********** ASIDE ********** --> <div id="dokuwiki__aside"><div class="pad include group"> - <h3 class="toggle"><?php echo hsc(ucfirst($conf['sidebar'])) ?></h3> + <h3 class="toggle"><?php echo $lang['sidebar'] ?></h3> <div class="content"> <?php tpl_flush() ?> <?php tpl_includeFile('sidebarheader.html') ?> -- cgit v1.2.3 From c98f205e8a6265654072c7d3fea952552837b819 Mon Sep 17 00:00:00 2001 From: Adrian Lang <mail@adrianlang.de> Date: Fri, 13 Jul 2012 12:07:51 +0200 Subject: Fix HTML injection in mediaFileList (Secunia advisory SA49196) --- lib/exe/ajax.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 3d1584244..945091f34 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -13,7 +13,6 @@ session_write_close(); header('Content-Type: text/html; charset=utf-8'); - //call the requested function if(isset($_POST['call'])){ $call = $_POST['call']; @@ -204,7 +203,7 @@ function ajax_medialist(){ global $conf; global $NS; - $NS = $_POST['ns']; + $NS = cleanID($_POST['ns']); if ($_POST['do'] == 'media') { tpl_mediaFileList(); } else { -- cgit v1.2.3 From c8839c220c49633ea45ce5d0e4be1f411f66ad6c Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sat, 14 Jul 2012 12:10:08 +0100 Subject: changed all doctypes to html5 doctype --- lib/exe/index.html | 5 ++--- lib/images/fileicons/index.php | 6 ++---- lib/images/index.html | 5 ++--- lib/index.html | 5 ++--- lib/plugins/index.html | 5 ++--- lib/scripts/index.html | 5 ++--- lib/styles/index.html | 5 ++--- lib/tpl/index.php | 5 ++--- 8 files changed, 16 insertions(+), 25 deletions(-) (limited to 'lib') diff --git a/lib/exe/index.html b/lib/exe/index.html index d614603ac..977f90e10 100644 --- a/lib/exe/index.html +++ b/lib/exe/index.html @@ -1,6 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<!DOCTYPE html> +<html> <head> <meta http-equiv="refresh" content="0; URL=../../" /> <meta name="robots" content="noindex" /> diff --git a/lib/images/fileicons/index.php b/lib/images/fileicons/index.php index c1e64fe2a..f90e7e6f0 100644 --- a/lib/images/fileicons/index.php +++ b/lib/images/fileicons/index.php @@ -1,7 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" - lang="en" dir="ltr"> +<!DOCTYPE html> +<html lang="en" dir="ltr"> <head> <title>filetype icons diff --git a/lib/images/index.html b/lib/images/index.html index d614603ac..977f90e10 100644 --- a/lib/images/index.html +++ b/lib/images/index.html @@ -1,6 +1,5 @@ - - + + diff --git a/lib/index.html b/lib/index.html index 8cb33512e..885c954a4 100644 --- a/lib/index.html +++ b/lib/index.html @@ -1,6 +1,5 @@ - - + + diff --git a/lib/plugins/index.html b/lib/plugins/index.html index d614603ac..977f90e10 100644 --- a/lib/plugins/index.html +++ b/lib/plugins/index.html @@ -1,6 +1,5 @@ - - + + diff --git a/lib/scripts/index.html b/lib/scripts/index.html index d614603ac..977f90e10 100644 --- a/lib/scripts/index.html +++ b/lib/scripts/index.html @@ -1,6 +1,5 @@ - - + + diff --git a/lib/styles/index.html b/lib/styles/index.html index d614603ac..977f90e10 100644 --- a/lib/styles/index.html +++ b/lib/styles/index.html @@ -1,6 +1,5 @@ - - + + diff --git a/lib/tpl/index.php b/lib/tpl/index.php index 4570f70f5..357cc1f0d 100644 --- a/lib/tpl/index.php +++ b/lib/tpl/index.php @@ -12,9 +12,8 @@ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); if(!defined('NOSESSION')) define('NOSESSION',1); require_once(DOKU_INC.'inc/init.php'); ?> - - + + Template Replacements -- cgit v1.2.3 From 3009a773c06e6e5d731c42b12ad82272f9706f03 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 28 Jul 2012 10:40:48 +0200 Subject: replaced use of basename() with utf8_basename() FS#2015 --- lib/exe/fetch.php | 4 ++-- lib/exe/js.php | 2 +- lib/plugins/plugin/classes/ap_download.class.php | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php index 60843460e..150812b55 100644 --- a/lib/exe/fetch.php +++ b/lib/exe/fetch.php @@ -122,9 +122,9 @@ function sendFile($file,$mime,$dl,$cache){ //download or display? if($dl){ - header('Content-Disposition: attachment; filename="'.basename($file).'";'); + header('Content-Disposition: attachment; filename="'.utf8_basename($file).'";'); }else{ - header('Content-Disposition: inline; filename="'.basename($file).'";'); + header('Content-Disposition: inline; filename="'.utf8_basename($file).'";'); } //use x-sendfile header to pass the delivery to compatible webservers diff --git a/lib/exe/js.php b/lib/exe/js.php index 7c54f3e2e..f84c07709 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -143,7 +143,7 @@ function js_load($file){ // is it a include_once? if($match[1]){ - $base = basename($ifile); + $base = utf8_basename($ifile); if($loaded[$base]) continue; $loaded[$base] = true; } diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php index b2571f632..2d5ead400 100644 --- a/lib/plugins/plugin/classes/ap_download.class.php +++ b/lib/plugins/plugin/classes/ap_download.class.php @@ -155,16 +155,16 @@ class ap_download extends ap_manage { $info['type'] = 'plugin'; $info['tmp'] = "$base/$dir"; $conf = confToHash("$base/$dir/$f"); - $info['base'] = basename($conf['base']); - if(!$info['base']) $info['base'] = basename("$base/$dir"); + $info['base'] = utf8_basename($conf['base']); + if(!$info['base']) $info['base'] = utf8_basename("$base/$dir"); $result['new'][] = $info; }elseif($f == 'template.info.txt'){ $info = array(); $info['type'] = 'template'; $info['tmp'] = "$base/$dir"; $conf = confToHash("$base/$dir/$f"); - $info['base'] = basename($conf['base']); - if(!$info['base']) $info['base'] = basename("$base/$dir"); + $info['base'] = utf8_basename($conf['base']); + if(!$info['base']) $info['base'] = utf8_basename("$base/$dir"); $result['new'][] = $info; } }else{ -- cgit v1.2.3 From 91626c7f91db0e2bcd183db41a224b53b1ed3cd2 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 28 Jul 2012 10:22:01 +0100 Subject: made sure all template files are run from within DokuWiki (FS#2567) --- lib/tpl/default/mediamanager.php | 4 ++++ lib/tpl/dokuwiki/tpl_footer.php | 5 +++++ lib/tpl/dokuwiki/tpl_header.php | 5 +++++ 3 files changed, 14 insertions(+) (limited to 'lib') diff --git a/lib/tpl/default/mediamanager.php b/lib/tpl/default/mediamanager.php index 7b7fe8675..2b3e6e7db 100644 --- a/lib/tpl/default/mediamanager.php +++ b/lib/tpl/default/mediamanager.php @@ -12,6 +12,10 @@ * @link http://dokuwiki.org/templates * @author Andreas Gohr */ + +// must be run from within DokuWiki +if (!defined('DOKU_INC')) die(); + ?> diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php index 41ddabda2..1b31e3323 100644 --- a/lib/tpl/dokuwiki/tpl_footer.php +++ b/lib/tpl/dokuwiki/tpl_footer.php @@ -1,3 +1,8 @@ + +
    diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index f2e720308..5b2f806a8 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -1,3 +1,8 @@ + +
    -- cgit v1.2.3 From e3ab6fc5cbab1aaf365e73abaa3d91c03eebdd47 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 28 Jul 2012 11:06:10 +0200 Subject: Fixed and extended PHPDoc comments and added additional @var comments --- lib/plugins/syntax.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php index 12451f636..d4394eb6f 100644 --- a/lib/plugins/syntax.php +++ b/lib/plugins/syntax.php @@ -86,7 +86,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { * @param $match string The text matched by the patterns * @param $state int The lexer state for the match * @param $pos int The character position of the matched text - * @param $handler ref Reference to the Doku_Handler object + * @param $handler Doku_Handler Reference to the Doku_Handler object * @return array Return an array with all data you want to use in render */ function handle($match, $state, $pos, &$handler){ @@ -111,10 +111,10 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { * The contents of the $data array depends on what the handler() function above * created * - * @param $format string output format being rendered - * @param $renderer ref reference to the current renderer object - * @param $data array data created by handler() - * @return boolean rendered correctly? + * @param $format string output format being rendered + * @param $renderer Doku_Renderer reference to the current renderer object + * @param $data array data created by handler() + * @return boolean rendered correctly? */ function render($format, &$renderer, $data) { trigger_error('render() not implemented in '.get_class($this), E_USER_WARNING); @@ -148,6 +148,12 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { // extract from class name, format = _plugin_[_] function getPluginType() { list($t) = explode('_', get_class($this), 2); return $t; } function getPluginName() { list($t, $p, $n) = explode('_', get_class($this), 4); return $n; } + + /** + * Get the name of the component of the current class + * + * @return string component name + */ function getPluginComponent() { list($t, $p, $n, $c) = explode('_', get_class($this), 4); return (isset($c)?$c:''); } // localisation methods @@ -158,7 +164,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { * to try to minimise unnecessary loading of the strings when the plugin doesn't require them * e.g. when info plugin is querying plugins for information about themselves. * - * @param $id id of the string to be retrieved + * @param string $id id of the string to be retrieved * @return string string in appropriate language or english if not available */ function getLang($id) { @@ -173,7 +179,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { * retrieve a language dependent wiki page and pass to xhtml renderer for display * plugin equivalent of p_locale_xhtml() * - * @param $id id of language dependent wiki page + * @param string $id id of language dependent wiki page * @return string parsed contents of the wiki page in xhtml format */ function locale_xhtml($id) { -- cgit v1.2.3 From 3e8e3ae62e43569a3dbe679e04d07744e045e472 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 28 Jul 2012 11:09:27 +0200 Subject: Fix inconsistent return values in the indexer and in getInfo() --- lib/plugins/syntax.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php index d4394eb6f..a68946a99 100644 --- a/lib/plugins/syntax.php +++ b/lib/plugins/syntax.php @@ -37,6 +37,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { $info = DOKU_PLUGIN.'/'.$parts[2].'/plugin.info.txt'; if(@file_exists($info)) return confToHash($info); trigger_error('getInfo() not implemented in '.get_class($this).' and '.$info.' not found', E_USER_WARNING); + return array(); } /** -- cgit v1.2.3 From 0a6ae52f7430e50a9680c9a927d460c63395087c Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 28 Jul 2012 11:14:09 +0200 Subject: Initialize more variables and test if others are set (no functional changes) --- lib/plugins/syntax.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php index a68946a99..8b94493e4 100644 --- a/lib/plugins/syntax.php +++ b/lib/plugins/syntax.php @@ -217,6 +217,7 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { global $conf; // definitely don't invoke "global $lang" $path = DOKU_PLUGIN.$this->getPluginName().'/lang/'; + $lang = array(); // don't include once, in case several plugin components require the same language file @include($path.'en/lang.php'); if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php'); -- cgit v1.2.3 From d6d77e2920902e235f46e14d2adc41dd3d62dd85 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 28 Jul 2012 10:26:03 +0100 Subject: removed contradicting comment in template files and made when the doctype is inserted consitent --- lib/tpl/default/detail.php | 3 --- lib/tpl/default/main.php | 3 --- lib/tpl/default/mediamanager.php | 7 ++----- 3 files changed, 2 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php index 503c0ef71..1c8042e15 100644 --- a/lib/tpl/default/detail.php +++ b/lib/tpl/default/detail.php @@ -4,9 +4,6 @@ * * This is the template for displaying image details * - * You should leave the doctype at the very top - It should - * always be the very first line of a document. - * * @link http://dokuwiki.org/templates * @author Andreas Gohr */ diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index 9a14f29a2..851afde6c 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -5,9 +5,6 @@ * This is the template you need to change for the overall look * of DokuWiki. * - * You should leave the doctype at the very top - It should - * always be the very first line of a document. - * * @link http://dokuwiki.org/templates * @author Andreas Gohr */ diff --git a/lib/tpl/default/mediamanager.php b/lib/tpl/default/mediamanager.php index 2b3e6e7db..35b526a32 100644 --- a/lib/tpl/default/mediamanager.php +++ b/lib/tpl/default/mediamanager.php @@ -1,14 +1,9 @@ - */ @@ -17,6 +12,8 @@ if (!defined('DOKU_INC')) die(); ?> + -- cgit v1.2.3 From ae45007edaa7e6d72f10a30a02548edb34ab3bfa Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 28 Jul 2012 10:35:25 +0100 Subject: added missing phpdoc header to included template files --- lib/tpl/dokuwiki/tpl_footer.php | 4 ++++ lib/tpl/dokuwiki/tpl_header.php | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php index 1b31e3323..3a2e3d121 100644 --- a/lib/tpl/dokuwiki/tpl_footer.php +++ b/lib/tpl/dokuwiki/tpl_footer.php @@ -1,4 +1,8 @@ diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 5b2f806a8..0704aa271 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -1,4 +1,8 @@ -- cgit v1.2.3 From ae22dee70061990f256be2671c0f585a572ce712 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 28 Jul 2012 12:29:24 +0200 Subject: remove min-height after toggling FS#2555 --- lib/scripts/page.js | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/scripts/page.js b/lib/scripts/page.js index 74aca9c06..5ac81f33b 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -150,6 +150,7 @@ dw_page = { // Start animation and assure that $toc is hidden/visible $child.dw_toggle(hidden, function () { $content.toggle(hidden); + $content.css('min-height',''); // remove min-height again }); }; -- cgit v1.2.3 From ebe6179c634de8874fe940ae1c5fe9792018d616 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 28 Jul 2012 13:03:27 +0100 Subject: fixed some RTL issues in mediamanager (FS#2433 and others) --- lib/tpl/dokuwiki/css/_media_fullscreen.css | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index 9054ab26f..2811f2935 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -53,6 +53,9 @@ margin: 0 10px 10px 0; position: relative; } +[dir=rtl] #mediamanager__page .panelContent { + text-align: right; +} #mediamanager__page .file .panelHeader, #mediamanager__page .file .panelContent { @@ -107,9 +110,17 @@ padding: 0; list-style: none; } +[dir=rtl] #mediamanager__page .namespaces ul { + margin-left: 0; + margin-right: .2em; +} #mediamanager__page .namespaces ul ul { margin-left: 1em; } +[dir=rtl] #mediamanager__page .namespaces ul ul { + margin-left: 0; + margin-right: 1em; +} #mediamanager__page .namespaces ul ul li { margin: 0; } @@ -398,6 +409,10 @@ text-align: left; border-color: __background__; } +[dir=rtl] #mediamanager__diff td, +[dir=rtl] #mediamanager__diff th { + text-align: right; +} #mediamanager__diff th { font-weight: normal; @@ -432,10 +447,6 @@ #mediamanager__diff .imageDiff { position: relative; } -#mediamanager__diff .imageDiff .image1, -#mediamanager__diff .imageDiff .image2 { - width: 97%; -} #mediamanager__diff .imageDiff .image2 { position: absolute; top: 0; @@ -451,6 +462,10 @@ overflow: hidden; } +#mediamanager__diff .imageDiff.portions img { + float: left; +} + #mediamanager__diff .imageDiff img { width: 100%; max-width: none; -- cgit v1.2.3 From 87f69c198897d8015cfb24120265d076a9b47f70 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 28 Jul 2012 13:31:36 +0100 Subject: fixed icons in buttons not showing in IE8 and below (FS#2568) --- lib/tpl/dokuwiki/css/basic.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index d683603ae..f33b21fbe 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -194,6 +194,10 @@ object { max-width: 100%; height: auto; } +/* IE8 and below won't display the images otherwise */ +button img { + max-width: none; +} hr { border-top: solid __border__; -- cgit v1.2.3 From ff10b2405470c8c9c90a18830dafb641cdee70fe Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 28 Jul 2012 13:32:23 +0100 Subject: improved toolbar appearing to load slowly --- lib/scripts/edit.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index 33a8f61b5..5a5e829bd 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -40,6 +40,8 @@ function createToolButton(icon,label,key,id,classname){ icon = DOKU_BASE + 'lib/images/toolbar/' + icon; } $ico.attr('src', icon); + $ico.attr('width', 16); + $ico.attr('height', 16); $btn.append($ico); // we have to return a DOM object (for compatibility reasons) -- cgit v1.2.3 From c4a2059c6e88bf3055f0ba3f8e079f10c950e1b0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 28 Jul 2012 16:04:18 +0100 Subject: added link icons back into RTL styles for old default template (FS#2524) --- lib/tpl/default/rtl.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index 8b2837874..fbc22f304 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -54,15 +54,16 @@ div.dokuwiki li ol { div.dokuwiki a.urlextern, div.dokuwiki a.interwiki, +div.dokuwiki a.mediafile, div.dokuwiki a.windows, div.dokuwiki a.mail { - /* should work but doesn't - so we just disable icons here*/ - /* background-position: right 1px; padding-right: 16px; - */ - background-image: none !important; - padding: 0px 0px 0px 0px; + padding-left: 0; +} + +div.dokuwiki a.mediafile { + padding-right: 18px; } div.dokuwiki div.secedit input.button { -- cgit v1.2.3 From 00c2d4a9d8fcb38b6a2294749b395d528952fde5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 28 Jul 2012 20:51:59 +0100 Subject: fixed some RTL+IE7 bugs, mainly background icons and search form (FS#2569) --- lib/plugins/acl/style.css | 4 ++++ lib/tpl/default/rtl.css | 1 + lib/tpl/dokuwiki/css/_links.css | 1 + lib/tpl/dokuwiki/css/design.css | 7 +++++++ 4 files changed, 13 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css index 2eee4f41c..7044254a5 100644 --- a/lib/plugins/acl/style.css +++ b/lib/plugins/acl/style.css @@ -74,6 +74,7 @@ div#acl_manager .aclgroup { [dir=rtl] div#acl_manager .aclgroup { background: transparent url(pix/group.png) right 1px no-repeat; padding: 1px 18px 1px 0px; + display: inline-block; /* needed for IE7 */ } div#acl_manager .acluser { @@ -83,6 +84,7 @@ div#acl_manager .acluser { [dir=rtl] div#acl_manager .acluser { background: transparent url(pix/user.png) right 1px no-repeat; padding: 1px 18px 1px 0px; + display: inline-block; /* needed for IE7 */ } div#acl_manager .aclpage { @@ -92,6 +94,7 @@ div#acl_manager .aclpage { [dir=rtl] div#acl_manager .aclpage { background: transparent url(pix/page.png) right 1px no-repeat; padding: 1px 18px 1px 0px; + display: inline-block; /* needed for IE7 */ } div#acl_manager .aclns { @@ -101,6 +104,7 @@ div#acl_manager .aclns { [dir=rtl] div#acl_manager .aclns { background: transparent url(pix/ns.png) right 1px no-repeat; padding: 1px 18px 1px 0px; + display: inline-block; /* needed for IE7 */ } div#acl_manager label.disabled { diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index fbc22f304..f16ba101b 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -60,6 +60,7 @@ div.dokuwiki a.mail { background-position: right 1px; padding-right: 16px; padding-left: 0; + display: inline-block; /* needed for IE7 */ } div.dokuwiki a.mediafile { diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css index 22502f6a9..e53ba45e5 100644 --- a/lib/tpl/dokuwiki/css/_links.css +++ b/lib/tpl/dokuwiki/css/_links.css @@ -70,4 +70,5 @@ [dir=rtl] .dokuwiki a.mediafile { background-position: right center; padding: 0 18px 0 0; + display: inline-block; /* needed for IE7 */ } diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index d1a00ce0a..8a3f20729 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -103,6 +103,10 @@ padding-left: 0; padding-right: 20px; } +[dir=rtl] #IE7 #dokuwiki__usertools a.action { + display: inline-block; +} + #dokuwiki__header .mobileTools { display: none; /* hide mobile tools dropdown to only show in mobile view */ @@ -176,6 +180,9 @@ font-size: 0.875em; position: relative; } +[dir=rtl] #IE7 #dokuwiki__sitetools form.search { + min-height: 1px; +} #dokuwiki__sitetools form.search input.edit { width: 18em; padding: .35em 22px .35em .1em; -- cgit v1.2.3 From faa7bcaae749311237124cce9f20e92fe7e25291 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 31 Jul 2012 23:18:35 +0100 Subject: fixed objects not showing properly (FS#2572) --- lib/tpl/dokuwiki/css/basic.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index f33b21fbe..4942de001 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -188,11 +188,11 @@ img { color: #666; background-color: transparent; font-style: italic; + height: auto; } img, object { max-width: 100%; - height: auto; } /* IE8 and below won't display the images otherwise */ button img { -- cgit v1.2.3 From 24d494984899eca69df2a5e50d941007500ba545 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 5 Aug 2012 12:52:25 +0100 Subject: added some missing spaces (to popularity and revert plugins) --- lib/plugins/popularity/admin.php | 2 +- lib/plugins/revert/admin.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php index a04e98a66..364075903 100644 --- a/lib/plugins/popularity/admin.php +++ b/lib/plugins/popularity/admin.php @@ -135,7 +135,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin { $form .= '' .'' .''; diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php index ff5fa69ba..958cf5acf 100644 --- a/lib/plugins/revert/admin.php +++ b/lib/plugins/revert/admin.php @@ -64,7 +64,7 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin { echo '
    '; echo ''; echo ''; - echo ''; + echo ' '; echo ' '.$this->getLang('note1').''; echo '


    '; } @@ -134,7 +134,7 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin { echo ($recent['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) ? '
  • ' : '
  • '; echo '
    '; echo ''; - echo ' '; + echo ' '; echo ''; $p = array(); -- cgit v1.2.3 From 63e967bdfd6d3bd52960647f8490dfd9678353f9 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 5 Aug 2012 13:04:35 +0100 Subject: html validity fixes (removed name and align in some plugins) --- lib/plugins/acl/admin.php | 10 +++++----- lib/plugins/acl/style.css | 8 ++++++++ lib/plugins/config/admin.php | 2 +- lib/scripts/media.js | 4 ++-- 4 files changed, 16 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index a0d2e430e..64d6ff3ca 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -191,7 +191,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo '
    '.NL; echo '
    '.NL; - echo '1)'.NL; + echo '1)'.NL; echo $this->getLang('p_include'); echo '
    '; @@ -602,7 +602,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo '
    • '; echo ''; echo ''; - echo ''; + echo ''; echo ''; echo ''; foreach($this->acl as $where => $set){ @@ -630,7 +630,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo $this->_html_checkboxes($perm,$ispage,'acl['.$where.']['.$who.']'); echo ''; - echo ''; echo ''; @@ -638,7 +638,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { } echo ''; - echo ''; echo ''; @@ -746,7 +746,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { } //build code - $ret .= '
     ".$this->lang["user_id"]."".$this->lang["user_name"]."".$this->lang["user_mail"]."".$this->lang["user_groups"]." ".$this->lang["user_id"]."".$this->lang["user_name"]."".$this->lang["user_mail"]."".$this->lang["user_groups"]."
    '.htmlspecialchars($val).''; if(preg_match('/^#[0-f]{3,6}$/i',$val)){ - echo '
     
    '; + echo '
     
    '; } echo '
    '.$this->getLang('where').''.$this->getLang('who').''.$this->getLang('perm').'1)'.$this->getLang('perm').'1)'.$lang['btn_delete'].'
    '; + echo ''; echo ''; echo '
    '; + echo ''; echo ''; echo '