From 741b8a48682890ee68e3f650510fec9a4d47d5b0 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 14 Feb 2014 13:57:50 +0100 Subject: Show a domain dropdown when multiple AD domains are configured This integrates the functionality of the now outdated addomain plugin directly into the authad plugin and makes multi-domain setups usable without SSO. See also https://github.com/cosmocode/dokuwiki-plugin-addomain --- lib/plugins/authad/action.php | 91 ++++++++++++++++++++++++++++++++++++++ lib/plugins/authad/auth.php | 25 +++++++++++ lib/plugins/authad/plugin.info.txt | 2 +- 3 files changed, 117 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/authad/action.php b/lib/plugins/authad/action.php index e69de29bb..97be9897e 100644 --- a/lib/plugins/authad/action.php +++ b/lib/plugins/authad/action.php @@ -0,0 +1,91 @@ + + */ + +// must be run within Dokuwiki +if(!defined('DOKU_INC')) die(); + +/** + * Class action_plugin_addomain + */ +class action_plugin_authad extends DokuWiki_Action_Plugin { + + /** + * Registers a callback function for a given event + */ + public function register(Doku_Event_Handler &$controller) { + + $controller->register_hook('AUTH_LOGIN_CHECK', 'BEFORE', $this, 'handle_auth_login_check'); + $controller->register_hook('HTML_LOGINFORM_OUTPUT', 'BEFORE', $this, 'handle_html_loginform_output'); + + } + + /** + * Adds the selected domain as user postfix when attempting a login + * + * @param Doku_Event $event + * @param array $param + */ + public function handle_auth_login_check(Doku_Event &$event, $param) { + global $INPUT; + + /** @var auth_plugin_authad $auth */ + global $auth; + if(!is_a($auth, 'auth_plugin_authad')) return; // AD not even used + + if($INPUT->str('dom')) { + $usr = $auth->cleanUser($event->data['user']); + $dom = $auth->_userDomain($usr); + if(!$dom) { + $usr = "$usr@".$INPUT->str('dom'); + } + $INPUT->post->set('u', $usr); + $event->data['user'] = $usr; + } + } + + /** + * Shows a domain selection in the login form when more than one domain is configured + * + * @param Doku_Event $event + * @param array $param + */ + public function handle_html_loginform_output(Doku_Event &$event, $param) { + global $INPUT; + /** @var auth_plugin_authad $auth */ + global $auth; + if(!is_a($auth, 'auth_plugin_authad')) return; // AD not even used + $domains = $auth->_getConfiguredDomains(); + if(count($domains) <= 1) return; // no choice at all + + /** @var Doku_Form $form */ + $form =& $event->data; + + // any default? + $dom = ''; + if($INPUT->has('u')) { + $usr = $auth->cleanUser($INPUT->str('u')); + $dom = $auth->_userDomain($usr); + + // update user field value + if($dom) { + $usr = $auth->_userName($usr); + $pos = $form->findElementByAttribute('name', 'u'); + $ele =& $form->getElementAt($pos); + $ele['value'] = $usr; + } + } + + // add select box + $element = form_makeListboxField('dom', $domains, $dom, $this->getLang('domain'), '', 'block'); + $pos = $form->findElementByAttribute('name', 'p'); + $form->insertElement($pos + 1, $element); + } + +} + +// vim:ts=4:sw=4:et: \ No newline at end of file diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php index e1d758fb8..db9b179a6 100644 --- a/lib/plugins/authad/auth.php +++ b/lib/plugins/authad/auth.php @@ -511,6 +511,31 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { return $opts; } + /** + * Returns a list of configured domains + * + * The default domain has an empty string as key + * + * @return array associative array(key => domain) + */ + public function _getConfiguredDomains() { + $domains = array(); + if(empty($this->conf['account_suffix'])) return $domains; // not configured yet + + // add default domain, using the name from account suffix + $domains[''] = ltrim($this->conf['account_suffix'], '@'); + + // find additional domains + foreach($this->conf as $key => $val) { + if(is_array($val) && isset($val['account_suffix'])) { + $domains[$key] = ltrim($val['account_suffix'], '@'); + } + } + ksort($domains); + + return $domains; + } + /** * Check provided user and userinfo for matching patterns * diff --git a/lib/plugins/authad/plugin.info.txt b/lib/plugins/authad/plugin.info.txt index 3af1ddfbe..8774fcf3c 100644 --- a/lib/plugins/authad/plugin.info.txt +++ b/lib/plugins/authad/plugin.info.txt @@ -1,7 +1,7 @@ base authad author Andreas Gohr email andi@splitbrain.org -date 2013-04-25 +date 2014-02-14 name Active Directory Auth Plugin desc Provides user authentication against a Microsoft Active Directory url http://www.dokuwiki.org/plugin:authad -- cgit v1.2.3 From 7f081821c51e704c2720b993ca5364fa5e7e3663 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 15 Feb 2014 00:42:05 +0100 Subject: Extend showuseras config with username_link uses the user interwiki link as profile link --- lib/plugins/config/lang/en/lang.php | 9 +++++---- lib/plugins/config/settings/config.metadata.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index cdef85a85..66d4dc356 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -245,10 +245,11 @@ $lang['xsendfile_o_2'] = 'Standard X-Sendfile header'; $lang['xsendfile_o_3'] = 'Proprietary Nginx X-Accel-Redirect header'; /* Display user info */ -$lang['showuseras_o_loginname'] = 'Login name'; -$lang['showuseras_o_username'] = "User's full name"; -$lang['showuseras_o_email'] = "User's e-mail addresss (obfuscated according to mailguard setting)"; -$lang['showuseras_o_email_link'] = "User's e-mail addresss as a mailto: link"; +$lang['showuseras_o_loginname'] = 'Login name'; +$lang['showuseras_o_username'] = "User's full name"; +$lang['showuseras_o_username_link'] = "User's full name as interwiki user link"; +$lang['showuseras_o_email'] = "User's e-mail addresss (obfuscated according to mailguard setting)"; +$lang['showuseras_o_email_link'] = "User's e-mail addresss as a mailto: link"; /* useheading options */ $lang['useheading_o_0'] = 'Never'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index f9dabfeb0..69cc0df01 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -116,7 +116,7 @@ $meta['fullpath'] = array('onoff','_caution' => 'security'); $meta['typography'] = array('multichoice','_choices' => array(0,1,2)); $meta['dformat'] = array('string'); $meta['signature'] = array('string'); -$meta['showuseras'] = array('multichoice','_choices' => array('loginname','username','email','email_link')); +$meta['showuseras'] = array('multichoice','_choices' => array('loginname','username','username_link','email','email_link')); $meta['toptoclevel'] = array('multichoice','_choices' => array(1,2,3,4,5)); // 5 toc levels $meta['tocminheads'] = array('multichoice','_choices' => array(0,1,2,3,4,5,10,15,20)); $meta['maxtoclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); -- cgit v1.2.3 From 221cb66533e11a3e20e642d760af06bb19f7e14b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 15 Feb 2014 16:02:59 +0000 Subject: fixed pagetools being inaccessible on screens lacking necessary height, and aligned them to content when on smaller screens --- lib/tpl/dokuwiki/css/mobile.less | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less index 0fbd0e8fe..75ae5dbe4 100644 --- a/lib/tpl/dokuwiki/css/mobile.less +++ b/lib/tpl/dokuwiki/css/mobile.less @@ -105,6 +105,15 @@ overflow: auto; } +/* push pagetools closer to content */ +#dokuwiki__pagetools { + top: 0; +} +.showSidebar #dokuwiki__pagetools { + top: 3.5em; +} + + /* _edit */ .dokuwiki div.section_highlight { margin: 0 -1em; @@ -299,5 +308,17 @@ body { } +} /* /@media */ + + +/* for screen heights smaller than the pagetools permit +********************************************************************/ +@media only screen and (max-height: 400px) { +// 400px is only roughly the required value, this may be wrong under non-standard circumstances + +#dokuwiki__pagetools div.tools { + position: static; +} + } /* /@media */ -- cgit v1.2.3 From 6ed3476b11fe6e9c4625fb28e8953ac26e8160fb Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 15 Feb 2014 20:59:06 +0000 Subject: fixes possibility of a user password change being sent out when a password couldn't be/wasn't changed --- lib/plugins/usermanager/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 156037f09..b9199e586 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -643,9 +643,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { if ($ok = $this->_auth->triggerUserMod('modify', array($olduser, $changes))) { msg($this->lang['update_ok'],1); - if ($INPUT->has('usernotify') && $newpass) { + if ($INPUT->has('usernotify') && !empty($changes['pass'])) { $notify = empty($changes['user']) ? $olduser : $newuser; - $this->_notifyUser($notify,$newpass); + $this->_notifyUser($notify,$changes['pass']); } // invalidate all sessions -- cgit v1.2.3 From 40d72af6467f899f09d3b282922f861482e8228f Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 15 Feb 2014 21:00:08 +0000 Subject: add braces and indentation per coding standards --- lib/plugins/usermanager/admin.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index b9199e586..4b94440b0 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -631,14 +631,15 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $newpass = auth_pwgen($olduser); } - if (!empty($newpass) && $this->_auth->canDo('modPass')) - $changes['pass'] = $newpass; - if (!empty($newname) && $this->_auth->canDo('modName') && $newname != $oldinfo['name']) - $changes['name'] = $newname; - if (!empty($newmail) && $this->_auth->canDo('modMail') && $newmail != $oldinfo['mail']) - $changes['mail'] = $newmail; - if (!empty($newgrps) && $this->_auth->canDo('modGroups') && $newgrps != $oldinfo['grps']) - $changes['grps'] = $newgrps; + if (!empty($newname) && $this->_auth->canDo('modName') && $newname != $oldinfo['name']) { + $changes['name'] = $newname; + } + if (!empty($newmail) && $this->_auth->canDo('modMail') && $newmail != $oldinfo['mail']) { + $changes['mail'] = $newmail; + } + if (!empty($newgrps) && $this->_auth->canDo('modGroups') && $newgrps != $oldinfo['grps']) { + $changes['grps'] = $newgrps; + } if ($ok = $this->_auth->triggerUserMod('modify', array($olduser, $changes))) { msg($this->lang['update_ok'],1); -- cgit v1.2.3 From 359e941731104cd989739d789f476590011eb518 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 15 Feb 2014 21:00:50 +0000 Subject: add password confirmation field when setting password in the usermanager --- lib/plugins/usermanager/admin.php | 54 +++++++++++++++++++++++++++----- lib/plugins/usermanager/lang/en/lang.php | 3 ++ 2 files changed, 50 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index 4b94440b0..faa4b8d31 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -299,6 +299,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $this->_htmlInputField($cmd."_userid", "userid", $this->lang["user_id"], $user, $this->_auth->canDo("modLogin"), $indent+6); $this->_htmlInputField($cmd."_userpass", "userpass", $this->lang["user_pass"], "", $this->_auth->canDo("modPass"), $indent+6); + $this->_htmlInputField($cmd."_userpass2", "userpass2", $this->lang["user_passconfirm"], "", $this->_auth->canDo("modPass"), $indent+6); $this->_htmlInputField($cmd."_username", "username", $this->lang["user_name"], $name, $this->_auth->canDo("modName"), $indent+6); $this->_htmlInputField($cmd."_usermail", "usermail", $this->lang["user_mail"], $mail, $this->_auth->canDo("modMail"), $indent+6); $this->_htmlInputField($cmd."_usergroups","usergroups",$this->lang["user_groups"],$groups,$this->_auth->canDo("modGroups"),$indent+6); @@ -358,7 +359,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $class = $cando ? '' : ' class="disabled"'; echo str_pad('',$indent); - if($name == 'userpass'){ + if($name == 'userpass' || $name == 'userpass2'){ $fieldtype = 'password'; $autocomp = 'autocomplete="off"'; }elseif($name == 'usermail'){ @@ -475,7 +476,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { if (!checkSecurityToken()) return false; if (!$this->_auth->canDo('addUser')) return false; - list($user,$pass,$name,$mail,$grps) = $this->_retrieveUser(); + list($user,$pass,$name,$mail,$grps,$passconfirm) = $this->_retrieveUser(); if (empty($user)) return false; if ($this->_auth->canDo('modPass')){ @@ -486,6 +487,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { msg($this->lang['add_fail'], -1); return false; } + } else { + if (!$this->_verifyPassword($pass,$passconfirm)) { + return false; + } } } else { if (!empty($pass)){ @@ -606,7 +611,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $oldinfo = $this->_auth->getUserData($olduser); // get new user data subject to change - list($newuser,$newpass,$newname,$newmail,$newgrps) = $this->_retrieveUser(); + list($newuser,$newpass,$newname,$newmail,$newgrps,$passconfirm) = $this->_retrieveUser(); if (empty($newuser)) return false; $changes = array(); @@ -625,10 +630,19 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $changes['user'] = $newuser; } } - - // generate password if left empty and notification is on - if($INPUT->has('usernotify') && empty($newpass)){ - $newpass = auth_pwgen($olduser); + if ($this->_auth->canDo('modPass')) { + if ($newpass || $confirm) { + if ($this->_verifyPassword($newpass,$passconfirm)) { + $changes['pass'] = $newpass; + } else { + return false; + } + } else { + // no new password supplied, check if we need to generate one (or it stays unchanged) + if ($INPUT->has('usernotify')) { + $changes['pass'] = auth_pwgen($olduser); + } + } } if (!empty($newname) && $this->_auth->canDo('modName') && $newname != $oldinfo['name']) { @@ -686,6 +700,31 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { return $sent; } + /** + * Verify password meets minimum requirements + * :TODO: extend to support password strength + * + * @param string $password candidate string for new password + * @param string $confirm repeated password for confirmation + * @return bool true if meets requirements, false otherwise + */ + protected function _verifyPassword($password, $confirm) { + + if (empty($password)) { + return false; + } + + if ($password !== $confirm) { + msg($this->lang['pass_confirm_fail'], -1); + return false; + } + + // :TODO: test password for required strength + + // if we make it this far the password is good + return true; + } + /** * Retrieve & clean user data from the form * @@ -702,6 +741,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $user[2] = $INPUT->str('username'); $user[3] = $INPUT->str('usermail'); $user[4] = explode(',',$INPUT->str('usergroups')); + $user[5] = $INPUT->str('userpass2'); // repeated password for confirmation $user[4] = array_map('trim',$user[4]); if($clean) $user[4] = array_map(array($auth,'cleanGroup'),$user[4]); diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php index f87c77afb..c18b5d684 100644 --- a/lib/plugins/usermanager/lang/en/lang.php +++ b/lib/plugins/usermanager/lang/en/lang.php @@ -76,4 +76,7 @@ $lang['import_error_create'] = 'Unable to create the user'; $lang['import_notify_fail'] = 'Notification message could not be sent for imported user, %s with email %s.'; $lang['import_downloadfailures'] = 'Download Failures as CSV for correction'; +// added 2014-02 +$lang['user_passconfirm'] = 'Confirm Password'; +$lang['pass_confirm_fail'] = 'Passwords do not match'; -- cgit v1.2.3 From be9008d3e4137a2456222098dfe45589e23ee3cf Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sun, 16 Feb 2014 17:54:48 +0000 Subject: user global strings for password confirmation prompt & error --- lib/plugins/usermanager/admin.php | 6 ++++-- lib/plugins/usermanager/lang/en/lang.php | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index faa4b8d31..aac2da605 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -277,6 +277,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { protected function _htmlUserForm($cmd,$user='',$userdata=array(),$indent=0) { global $conf; global $ID; + global $lang; $name = $mail = $groups = ''; $notes = array(); @@ -299,7 +300,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $this->_htmlInputField($cmd."_userid", "userid", $this->lang["user_id"], $user, $this->_auth->canDo("modLogin"), $indent+6); $this->_htmlInputField($cmd."_userpass", "userpass", $this->lang["user_pass"], "", $this->_auth->canDo("modPass"), $indent+6); - $this->_htmlInputField($cmd."_userpass2", "userpass2", $this->lang["user_passconfirm"], "", $this->_auth->canDo("modPass"), $indent+6); + $this->_htmlInputField($cmd."_userpass2", "userpass2", $lang["passchk"], "", $this->_auth->canDo("modPass"), $indent+6); $this->_htmlInputField($cmd."_username", "username", $this->lang["user_name"], $name, $this->_auth->canDo("modName"), $indent+6); $this->_htmlInputField($cmd."_usermail", "usermail", $this->lang["user_mail"], $mail, $this->_auth->canDo("modMail"), $indent+6); $this->_htmlInputField($cmd."_usergroups","usergroups",$this->lang["user_groups"],$groups,$this->_auth->canDo("modGroups"),$indent+6); @@ -709,13 +710,14 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { * @return bool true if meets requirements, false otherwise */ protected function _verifyPassword($password, $confirm) { + global $lang; if (empty($password)) { return false; } if ($password !== $confirm) { - msg($this->lang['pass_confirm_fail'], -1); + msg($lang['regbadpass'], -1); return false; } diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php index c18b5d684..b55ecc998 100644 --- a/lib/plugins/usermanager/lang/en/lang.php +++ b/lib/plugins/usermanager/lang/en/lang.php @@ -76,7 +76,3 @@ $lang['import_error_create'] = 'Unable to create the user'; $lang['import_notify_fail'] = 'Notification message could not be sent for imported user, %s with email %s.'; $lang['import_downloadfailures'] = 'Download Failures as CSV for correction'; -// added 2014-02 -$lang['user_passconfirm'] = 'Confirm Password'; -$lang['pass_confirm_fail'] = 'Passwords do not match'; - -- cgit v1.2.3 From dfe934f96f476bdcf60d82feceb4d2a78df28ca0 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 16 Feb 2014 20:52:10 +0100 Subject: Switched file icons against generated ones, added 32x32 versions --- lib/exe/css.php | 6 +++--- lib/images/fileicons/16x16/7z.png | Bin 0 -> 415 bytes lib/images/fileicons/16x16/bz2.png | Bin 0 -> 419 bytes lib/images/fileicons/16x16/conf.png | Bin 0 -> 402 bytes lib/images/fileicons/16x16/csv.png | Bin 0 -> 409 bytes lib/images/fileicons/16x16/deb.png | Bin 0 -> 421 bytes lib/images/fileicons/16x16/doc.png | Bin 0 -> 410 bytes lib/images/fileicons/16x16/docx.png | Bin 0 -> 415 bytes lib/images/fileicons/16x16/file.png | Bin 0 -> 319 bytes lib/images/fileicons/16x16/gif.png | Bin 0 -> 414 bytes lib/images/fileicons/16x16/gz.png | Bin 0 -> 417 bytes lib/images/fileicons/16x16/htm.png | Bin 0 -> 402 bytes lib/images/fileicons/16x16/html.png | Bin 0 -> 391 bytes lib/images/fileicons/16x16/ico.png | Bin 0 -> 413 bytes lib/images/fileicons/16x16/jpeg.png | Bin 0 -> 424 bytes lib/images/fileicons/16x16/jpg.png | Bin 0 -> 418 bytes lib/images/fileicons/16x16/mp3.png | Bin 0 -> 415 bytes lib/images/fileicons/16x16/mp4.png | Bin 0 -> 419 bytes lib/images/fileicons/16x16/odc.png | Bin 0 -> 407 bytes lib/images/fileicons/16x16/odf.png | Bin 0 -> 411 bytes lib/images/fileicons/16x16/odg.png | Bin 0 -> 411 bytes lib/images/fileicons/16x16/odi.png | Bin 0 -> 398 bytes lib/images/fileicons/16x16/odp.png | Bin 0 -> 404 bytes lib/images/fileicons/16x16/ods.png | Bin 0 -> 416 bytes lib/images/fileicons/16x16/odt.png | Bin 0 -> 403 bytes lib/images/fileicons/16x16/ogg.png | Bin 0 -> 408 bytes lib/images/fileicons/16x16/ogv.png | Bin 0 -> 412 bytes lib/images/fileicons/16x16/pdf.png | Bin 0 -> 419 bytes lib/images/fileicons/16x16/png.png | Bin 0 -> 412 bytes lib/images/fileicons/16x16/ppt.png | Bin 0 -> 412 bytes lib/images/fileicons/16x16/pptx.png | Bin 0 -> 414 bytes lib/images/fileicons/16x16/ps.png | Bin 0 -> 416 bytes lib/images/fileicons/16x16/rar.png | Bin 0 -> 418 bytes lib/images/fileicons/16x16/rpm.png | Bin 0 -> 415 bytes lib/images/fileicons/16x16/rtf.png | Bin 0 -> 418 bytes lib/images/fileicons/16x16/swf.png | Bin 0 -> 416 bytes lib/images/fileicons/16x16/sxc.png | Bin 0 -> 420 bytes lib/images/fileicons/16x16/sxd.png | Bin 0 -> 424 bytes lib/images/fileicons/16x16/sxi.png | Bin 0 -> 414 bytes lib/images/fileicons/16x16/sxw.png | Bin 0 -> 417 bytes lib/images/fileicons/16x16/tar.png | Bin 0 -> 417 bytes lib/images/fileicons/16x16/tgz.png | Bin 0 -> 417 bytes lib/images/fileicons/16x16/txt.png | Bin 0 -> 407 bytes lib/images/fileicons/16x16/wav.png | Bin 0 -> 415 bytes lib/images/fileicons/16x16/webm.png | Bin 0 -> 412 bytes lib/images/fileicons/16x16/xls.png | Bin 0 -> 415 bytes lib/images/fileicons/16x16/xlsx.png | Bin 0 -> 425 bytes lib/images/fileicons/16x16/xml.png | Bin 0 -> 400 bytes lib/images/fileicons/16x16/zip.png | Bin 0 -> 418 bytes lib/images/fileicons/32x32/7z.png | Bin 0 -> 992 bytes lib/images/fileicons/32x32/bz2.png | Bin 0 -> 1001 bytes lib/images/fileicons/32x32/conf.png | Bin 0 -> 832 bytes lib/images/fileicons/32x32/csv.png | Bin 0 -> 819 bytes lib/images/fileicons/32x32/deb.png | Bin 0 -> 991 bytes lib/images/fileicons/32x32/doc.png | Bin 0 -> 1034 bytes lib/images/fileicons/32x32/docx.png | Bin 0 -> 1078 bytes lib/images/fileicons/32x32/file.png | Bin 0 -> 605 bytes lib/images/fileicons/32x32/gif.png | Bin 0 -> 944 bytes lib/images/fileicons/32x32/gz.png | Bin 0 -> 994 bytes lib/images/fileicons/32x32/htm.png | Bin 0 -> 819 bytes lib/images/fileicons/32x32/html.png | Bin 0 -> 827 bytes lib/images/fileicons/32x32/ico.png | Bin 0 -> 941 bytes lib/images/fileicons/32x32/jpeg.png | Bin 0 -> 966 bytes lib/images/fileicons/32x32/jpg.png | Bin 0 -> 949 bytes lib/images/fileicons/32x32/mp3.png | Bin 0 -> 947 bytes lib/images/fileicons/32x32/mp4.png | Bin 0 -> 1197 bytes lib/images/fileicons/32x32/odc.png | Bin 0 -> 1061 bytes lib/images/fileicons/32x32/odf.png | Bin 0 -> 1059 bytes lib/images/fileicons/32x32/odg.png | Bin 0 -> 1066 bytes lib/images/fileicons/32x32/odi.png | Bin 0 -> 1058 bytes lib/images/fileicons/32x32/odp.png | Bin 0 -> 1060 bytes lib/images/fileicons/32x32/ods.png | Bin 0 -> 1063 bytes lib/images/fileicons/32x32/odt.png | Bin 0 -> 1060 bytes lib/images/fileicons/32x32/ogg.png | Bin 0 -> 950 bytes lib/images/fileicons/32x32/ogv.png | Bin 0 -> 1187 bytes lib/images/fileicons/32x32/pdf.png | Bin 0 -> 1072 bytes lib/images/fileicons/32x32/png.png | Bin 0 -> 957 bytes lib/images/fileicons/32x32/ppt.png | Bin 0 -> 871 bytes lib/images/fileicons/32x32/pptx.png | Bin 0 -> 924 bytes lib/images/fileicons/32x32/ps.png | Bin 0 -> 595 bytes lib/images/fileicons/32x32/rar.png | Bin 0 -> 1000 bytes lib/images/fileicons/32x32/rpm.png | Bin 0 -> 1001 bytes lib/images/fileicons/32x32/rtf.png | Bin 0 -> 1035 bytes lib/images/fileicons/32x32/swf.png | Bin 0 -> 1268 bytes lib/images/fileicons/32x32/sxc.png | Bin 0 -> 1078 bytes lib/images/fileicons/32x32/sxd.png | Bin 0 -> 1079 bytes lib/images/fileicons/32x32/sxi.png | Bin 0 -> 1067 bytes lib/images/fileicons/32x32/sxw.png | Bin 0 -> 1086 bytes lib/images/fileicons/32x32/tar.png | Bin 0 -> 987 bytes lib/images/fileicons/32x32/tgz.png | Bin 0 -> 999 bytes lib/images/fileicons/32x32/txt.png | Bin 0 -> 836 bytes lib/images/fileicons/32x32/wav.png | Bin 0 -> 944 bytes lib/images/fileicons/32x32/webm.png | Bin 0 -> 1232 bytes lib/images/fileicons/32x32/xls.png | Bin 0 -> 1137 bytes lib/images/fileicons/32x32/xlsx.png | Bin 0 -> 1182 bytes lib/images/fileicons/32x32/xml.png | Bin 0 -> 818 bytes lib/images/fileicons/32x32/zip.png | Bin 0 -> 987 bytes lib/images/fileicons/7z.png | Bin 651 -> 0 bytes lib/images/fileicons/audio.png | Bin 727 -> 0 bytes lib/images/fileicons/bz2.png | Bin 641 -> 0 bytes lib/images/fileicons/c.png | Bin 759 -> 0 bytes lib/images/fileicons/conf.png | Bin 664 -> 0 bytes lib/images/fileicons/cpp.png | Bin 822 -> 0 bytes lib/images/fileicons/cs.png | Bin 771 -> 0 bytes lib/images/fileicons/css.png | Bin 843 -> 0 bytes lib/images/fileicons/csv.png | Bin 400 -> 0 bytes lib/images/fileicons/deb.png | Bin 646 -> 0 bytes lib/images/fileicons/doc.png | Bin 583 -> 0 bytes lib/images/fileicons/docx.png | Bin 583 -> 0 bytes lib/images/fileicons/file.png | Bin 581 -> 0 bytes lib/images/fileicons/generate.php | 35 +++++++++++++++++++++++++++++++++++ lib/images/fileicons/gif.png | Bin 907 -> 0 bytes lib/images/fileicons/gz.png | Bin 643 -> 0 bytes lib/images/fileicons/htm.png | Bin 695 -> 0 bytes lib/images/fileicons/html.png | Bin 695 -> 0 bytes lib/images/fileicons/ico.png | Bin 907 -> 0 bytes lib/images/fileicons/index.php | 23 +++++++++++++++++++++-- lib/images/fileicons/java.png | Bin 739 -> 0 bytes lib/images/fileicons/jpeg.png | Bin 907 -> 0 bytes lib/images/fileicons/jpg.png | Bin 907 -> 0 bytes lib/images/fileicons/js.png | Bin 809 -> 0 bytes lib/images/fileicons/lua.png | Bin 440 -> 0 bytes lib/images/fileicons/mp3.png | Bin 831 -> 0 bytes lib/images/fileicons/mp4.png | Bin 740 -> 0 bytes lib/images/fileicons/odc.png | Bin 682 -> 0 bytes lib/images/fileicons/odf.png | Bin 746 -> 0 bytes lib/images/fileicons/odg.png | Bin 735 -> 0 bytes lib/images/fileicons/odi.png | Bin 735 -> 0 bytes lib/images/fileicons/odp.png | Bin 687 -> 0 bytes lib/images/fileicons/ods.png | Bin 682 -> 0 bytes lib/images/fileicons/odt.png | Bin 522 -> 0 bytes lib/images/fileicons/ogg.png | Bin 807 -> 0 bytes lib/images/fileicons/ogv.png | Bin 740 -> 0 bytes lib/images/fileicons/pdf.png | Bin 592 -> 0 bytes lib/images/fileicons/php.png | Bin 749 -> 0 bytes lib/images/fileicons/pl.png | Bin 685 -> 0 bytes lib/images/fileicons/png.png | Bin 907 -> 0 bytes lib/images/fileicons/ppt.png | Bin 697 -> 0 bytes lib/images/fileicons/pptx.png | Bin 697 -> 0 bytes lib/images/fileicons/ps.png | Bin 470 -> 0 bytes lib/images/fileicons/py.png | Bin 683 -> 0 bytes lib/images/fileicons/rar.png | Bin 557 -> 0 bytes lib/images/fileicons/rb.png | Bin 802 -> 0 bytes lib/images/fileicons/rpm.png | Bin 555 -> 0 bytes lib/images/fileicons/rtf.png | Bin 402 -> 0 bytes lib/images/fileicons/sql.png | Bin 813 -> 0 bytes lib/images/fileicons/swf.png | Bin 732 -> 0 bytes lib/images/fileicons/sxc.png | Bin 682 -> 0 bytes lib/images/fileicons/sxd.png | Bin 735 -> 0 bytes lib/images/fileicons/sxi.png | Bin 687 -> 0 bytes lib/images/fileicons/sxw.png | Bin 522 -> 0 bytes lib/images/fileicons/tar.png | Bin 663 -> 0 bytes lib/images/fileicons/tgz.png | Bin 643 -> 0 bytes lib/images/fileicons/txt.png | Bin 466 -> 0 bytes lib/images/fileicons/wav.png | Bin 820 -> 0 bytes lib/images/fileicons/webm.png | Bin 740 -> 0 bytes lib/images/fileicons/xls.png | Bin 670 -> 0 bytes lib/images/fileicons/xlsx.png | Bin 670 -> 0 bytes lib/images/fileicons/xml.png | Bin 409 -> 0 bytes lib/images/fileicons/zip.png | Bin 800 -> 0 bytes 160 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 lib/images/fileicons/16x16/7z.png create mode 100644 lib/images/fileicons/16x16/bz2.png create mode 100644 lib/images/fileicons/16x16/conf.png create mode 100644 lib/images/fileicons/16x16/csv.png create mode 100644 lib/images/fileicons/16x16/deb.png create mode 100644 lib/images/fileicons/16x16/doc.png create mode 100644 lib/images/fileicons/16x16/docx.png create mode 100644 lib/images/fileicons/16x16/file.png create mode 100644 lib/images/fileicons/16x16/gif.png create mode 100644 lib/images/fileicons/16x16/gz.png create mode 100644 lib/images/fileicons/16x16/htm.png create mode 100644 lib/images/fileicons/16x16/html.png create mode 100644 lib/images/fileicons/16x16/ico.png create mode 100644 lib/images/fileicons/16x16/jpeg.png create mode 100644 lib/images/fileicons/16x16/jpg.png create mode 100644 lib/images/fileicons/16x16/mp3.png create mode 100644 lib/images/fileicons/16x16/mp4.png create mode 100644 lib/images/fileicons/16x16/odc.png create mode 100644 lib/images/fileicons/16x16/odf.png create mode 100644 lib/images/fileicons/16x16/odg.png create mode 100644 lib/images/fileicons/16x16/odi.png create mode 100644 lib/images/fileicons/16x16/odp.png create mode 100644 lib/images/fileicons/16x16/ods.png create mode 100644 lib/images/fileicons/16x16/odt.png create mode 100644 lib/images/fileicons/16x16/ogg.png create mode 100644 lib/images/fileicons/16x16/ogv.png create mode 100644 lib/images/fileicons/16x16/pdf.png create mode 100644 lib/images/fileicons/16x16/png.png create mode 100644 lib/images/fileicons/16x16/ppt.png create mode 100644 lib/images/fileicons/16x16/pptx.png create mode 100644 lib/images/fileicons/16x16/ps.png create mode 100644 lib/images/fileicons/16x16/rar.png create mode 100644 lib/images/fileicons/16x16/rpm.png create mode 100644 lib/images/fileicons/16x16/rtf.png create mode 100644 lib/images/fileicons/16x16/swf.png create mode 100644 lib/images/fileicons/16x16/sxc.png create mode 100644 lib/images/fileicons/16x16/sxd.png create mode 100644 lib/images/fileicons/16x16/sxi.png create mode 100644 lib/images/fileicons/16x16/sxw.png create mode 100644 lib/images/fileicons/16x16/tar.png create mode 100644 lib/images/fileicons/16x16/tgz.png create mode 100644 lib/images/fileicons/16x16/txt.png create mode 100644 lib/images/fileicons/16x16/wav.png create mode 100644 lib/images/fileicons/16x16/webm.png create mode 100644 lib/images/fileicons/16x16/xls.png create mode 100644 lib/images/fileicons/16x16/xlsx.png create mode 100644 lib/images/fileicons/16x16/xml.png create mode 100644 lib/images/fileicons/16x16/zip.png create mode 100644 lib/images/fileicons/32x32/7z.png create mode 100644 lib/images/fileicons/32x32/bz2.png create mode 100644 lib/images/fileicons/32x32/conf.png create mode 100644 lib/images/fileicons/32x32/csv.png create mode 100644 lib/images/fileicons/32x32/deb.png create mode 100644 lib/images/fileicons/32x32/doc.png create mode 100644 lib/images/fileicons/32x32/docx.png create mode 100644 lib/images/fileicons/32x32/file.png create mode 100644 lib/images/fileicons/32x32/gif.png create mode 100644 lib/images/fileicons/32x32/gz.png create mode 100644 lib/images/fileicons/32x32/htm.png create mode 100644 lib/images/fileicons/32x32/html.png create mode 100644 lib/images/fileicons/32x32/ico.png create mode 100644 lib/images/fileicons/32x32/jpeg.png create mode 100644 lib/images/fileicons/32x32/jpg.png create mode 100644 lib/images/fileicons/32x32/mp3.png create mode 100644 lib/images/fileicons/32x32/mp4.png create mode 100644 lib/images/fileicons/32x32/odc.png create mode 100644 lib/images/fileicons/32x32/odf.png create mode 100644 lib/images/fileicons/32x32/odg.png create mode 100644 lib/images/fileicons/32x32/odi.png create mode 100644 lib/images/fileicons/32x32/odp.png create mode 100644 lib/images/fileicons/32x32/ods.png create mode 100644 lib/images/fileicons/32x32/odt.png create mode 100644 lib/images/fileicons/32x32/ogg.png create mode 100644 lib/images/fileicons/32x32/ogv.png create mode 100644 lib/images/fileicons/32x32/pdf.png create mode 100644 lib/images/fileicons/32x32/png.png create mode 100644 lib/images/fileicons/32x32/ppt.png create mode 100644 lib/images/fileicons/32x32/pptx.png create mode 100644 lib/images/fileicons/32x32/ps.png create mode 100644 lib/images/fileicons/32x32/rar.png create mode 100644 lib/images/fileicons/32x32/rpm.png create mode 100644 lib/images/fileicons/32x32/rtf.png create mode 100644 lib/images/fileicons/32x32/swf.png create mode 100644 lib/images/fileicons/32x32/sxc.png create mode 100644 lib/images/fileicons/32x32/sxd.png create mode 100644 lib/images/fileicons/32x32/sxi.png create mode 100644 lib/images/fileicons/32x32/sxw.png create mode 100644 lib/images/fileicons/32x32/tar.png create mode 100644 lib/images/fileicons/32x32/tgz.png create mode 100644 lib/images/fileicons/32x32/txt.png create mode 100644 lib/images/fileicons/32x32/wav.png create mode 100644 lib/images/fileicons/32x32/webm.png create mode 100644 lib/images/fileicons/32x32/xls.png create mode 100644 lib/images/fileicons/32x32/xlsx.png create mode 100644 lib/images/fileicons/32x32/xml.png create mode 100644 lib/images/fileicons/32x32/zip.png delete mode 100644 lib/images/fileicons/7z.png delete mode 100644 lib/images/fileicons/audio.png delete mode 100644 lib/images/fileicons/bz2.png delete mode 100644 lib/images/fileicons/c.png delete mode 100644 lib/images/fileicons/conf.png delete mode 100644 lib/images/fileicons/cpp.png delete mode 100644 lib/images/fileicons/cs.png delete mode 100644 lib/images/fileicons/css.png delete mode 100644 lib/images/fileicons/csv.png delete mode 100644 lib/images/fileicons/deb.png delete mode 100644 lib/images/fileicons/doc.png delete mode 100644 lib/images/fileicons/docx.png delete mode 100644 lib/images/fileicons/file.png create mode 100644 lib/images/fileicons/generate.php delete mode 100644 lib/images/fileicons/gif.png delete mode 100644 lib/images/fileicons/gz.png delete mode 100644 lib/images/fileicons/htm.png delete mode 100644 lib/images/fileicons/html.png delete mode 100644 lib/images/fileicons/ico.png delete mode 100644 lib/images/fileicons/java.png delete mode 100644 lib/images/fileicons/jpeg.png delete mode 100644 lib/images/fileicons/jpg.png delete mode 100644 lib/images/fileicons/js.png delete mode 100644 lib/images/fileicons/lua.png delete mode 100644 lib/images/fileicons/mp3.png delete mode 100644 lib/images/fileicons/mp4.png delete mode 100644 lib/images/fileicons/odc.png delete mode 100644 lib/images/fileicons/odf.png delete mode 100644 lib/images/fileicons/odg.png delete mode 100644 lib/images/fileicons/odi.png delete mode 100644 lib/images/fileicons/odp.png delete mode 100644 lib/images/fileicons/ods.png delete mode 100644 lib/images/fileicons/odt.png delete mode 100644 lib/images/fileicons/ogg.png delete mode 100644 lib/images/fileicons/ogv.png delete mode 100644 lib/images/fileicons/pdf.png delete mode 100644 lib/images/fileicons/php.png delete mode 100644 lib/images/fileicons/pl.png delete mode 100644 lib/images/fileicons/png.png delete mode 100644 lib/images/fileicons/ppt.png delete mode 100644 lib/images/fileicons/pptx.png delete mode 100644 lib/images/fileicons/ps.png delete mode 100644 lib/images/fileicons/py.png delete mode 100644 lib/images/fileicons/rar.png delete mode 100644 lib/images/fileicons/rb.png delete mode 100644 lib/images/fileicons/rpm.png delete mode 100644 lib/images/fileicons/rtf.png delete mode 100644 lib/images/fileicons/sql.png delete mode 100644 lib/images/fileicons/swf.png delete mode 100644 lib/images/fileicons/sxc.png delete mode 100644 lib/images/fileicons/sxd.png delete mode 100644 lib/images/fileicons/sxi.png delete mode 100644 lib/images/fileicons/sxw.png delete mode 100644 lib/images/fileicons/tar.png delete mode 100644 lib/images/fileicons/tgz.png delete mode 100644 lib/images/fileicons/txt.png delete mode 100644 lib/images/fileicons/wav.png delete mode 100644 lib/images/fileicons/webm.png delete mode 100644 lib/images/fileicons/xls.png delete mode 100644 lib/images/fileicons/xlsx.png delete mode 100644 lib/images/fileicons/xml.png delete mode 100644 lib/images/fileicons/zip.png (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index cab7384b2..128fd5389 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -369,7 +369,7 @@ function css_filetypes(){ // default style echo '.mediafile {'; - echo ' background: transparent url('.DOKU_BASE.'lib/images/fileicons/file.png) 0px 1px no-repeat;'; + echo ' background: transparent url('.DOKU_BASE.'lib/images/fileicons/16x16/file.png) 0px 1px no-repeat;'; echo ' padding-left: 18px;'; echo ' padding-bottom: 1px;'; echo '}'; @@ -377,7 +377,7 @@ function css_filetypes(){ // additional styles when icon available // scan directory for all icons $exts = array(); - if($dh = opendir(DOKU_INC.'lib/images/fileicons')){ + if($dh = opendir(DOKU_INC.'lib/images/fileicons/16x16')){ while(false !== ($file = readdir($dh))){ if(preg_match('/([_\-a-z0-9]+(?:\.[_\-a-z0-9]+)*?)\.(png|gif)/i',$file,$match)){ $ext = strtolower($match[1]); @@ -392,7 +392,7 @@ function css_filetypes(){ foreach($exts as $ext=>$type){ $class = preg_replace('/[^_\-a-z0-9]+/','_',$ext); echo ".mf_$class {"; - echo ' background-image: url('.DOKU_BASE.'lib/images/fileicons/'.$ext.$type.')'; + echo ' background-image: url('.DOKU_BASE.'lib/images/fileicons/16x16/'.$ext.$type.')'; echo '}'; } } diff --git a/lib/images/fileicons/16x16/7z.png b/lib/images/fileicons/16x16/7z.png new file mode 100644 index 000000000..037cd73a0 Binary files /dev/null and b/lib/images/fileicons/16x16/7z.png differ diff --git a/lib/images/fileicons/16x16/bz2.png b/lib/images/fileicons/16x16/bz2.png new file mode 100644 index 000000000..a4bcc70a1 Binary files /dev/null and b/lib/images/fileicons/16x16/bz2.png differ diff --git a/lib/images/fileicons/16x16/conf.png b/lib/images/fileicons/16x16/conf.png new file mode 100644 index 000000000..94ace02cf Binary files /dev/null and b/lib/images/fileicons/16x16/conf.png differ diff --git a/lib/images/fileicons/16x16/csv.png b/lib/images/fileicons/16x16/csv.png new file mode 100644 index 000000000..af37ba577 Binary files /dev/null and b/lib/images/fileicons/16x16/csv.png differ diff --git a/lib/images/fileicons/16x16/deb.png b/lib/images/fileicons/16x16/deb.png new file mode 100644 index 000000000..9eb29019b Binary files /dev/null and b/lib/images/fileicons/16x16/deb.png differ diff --git a/lib/images/fileicons/16x16/doc.png b/lib/images/fileicons/16x16/doc.png new file mode 100644 index 000000000..925494576 Binary files /dev/null and b/lib/images/fileicons/16x16/doc.png differ diff --git a/lib/images/fileicons/16x16/docx.png b/lib/images/fileicons/16x16/docx.png new file mode 100644 index 000000000..5bae13f9e Binary files /dev/null and b/lib/images/fileicons/16x16/docx.png differ diff --git a/lib/images/fileicons/16x16/file.png b/lib/images/fileicons/16x16/file.png new file mode 100644 index 000000000..8f31d38ac Binary files /dev/null and b/lib/images/fileicons/16x16/file.png differ diff --git a/lib/images/fileicons/16x16/gif.png b/lib/images/fileicons/16x16/gif.png new file mode 100644 index 000000000..d8eb57e54 Binary files /dev/null and b/lib/images/fileicons/16x16/gif.png differ diff --git a/lib/images/fileicons/16x16/gz.png b/lib/images/fileicons/16x16/gz.png new file mode 100644 index 000000000..0a0a4b94f Binary files /dev/null and b/lib/images/fileicons/16x16/gz.png differ diff --git a/lib/images/fileicons/16x16/htm.png b/lib/images/fileicons/16x16/htm.png new file mode 100644 index 000000000..8312c33a8 Binary files /dev/null and b/lib/images/fileicons/16x16/htm.png differ diff --git a/lib/images/fileicons/16x16/html.png b/lib/images/fileicons/16x16/html.png new file mode 100644 index 000000000..7a7fcc0fa Binary files /dev/null and b/lib/images/fileicons/16x16/html.png differ diff --git a/lib/images/fileicons/16x16/ico.png b/lib/images/fileicons/16x16/ico.png new file mode 100644 index 000000000..9d4259c1b Binary files /dev/null and b/lib/images/fileicons/16x16/ico.png differ diff --git a/lib/images/fileicons/16x16/jpeg.png b/lib/images/fileicons/16x16/jpeg.png new file mode 100644 index 000000000..3a7d8a7f9 Binary files /dev/null and b/lib/images/fileicons/16x16/jpeg.png differ diff --git a/lib/images/fileicons/16x16/jpg.png b/lib/images/fileicons/16x16/jpg.png new file mode 100644 index 000000000..7152ebdb6 Binary files /dev/null and b/lib/images/fileicons/16x16/jpg.png differ diff --git a/lib/images/fileicons/16x16/mp3.png b/lib/images/fileicons/16x16/mp3.png new file mode 100644 index 000000000..7c6d37184 Binary files /dev/null and b/lib/images/fileicons/16x16/mp3.png differ diff --git a/lib/images/fileicons/16x16/mp4.png b/lib/images/fileicons/16x16/mp4.png new file mode 100644 index 000000000..ee5b91150 Binary files /dev/null and b/lib/images/fileicons/16x16/mp4.png differ diff --git a/lib/images/fileicons/16x16/odc.png b/lib/images/fileicons/16x16/odc.png new file mode 100644 index 000000000..331140552 Binary files /dev/null and b/lib/images/fileicons/16x16/odc.png differ diff --git a/lib/images/fileicons/16x16/odf.png b/lib/images/fileicons/16x16/odf.png new file mode 100644 index 000000000..eccae9e20 Binary files /dev/null and b/lib/images/fileicons/16x16/odf.png differ diff --git a/lib/images/fileicons/16x16/odg.png b/lib/images/fileicons/16x16/odg.png new file mode 100644 index 000000000..5224425e6 Binary files /dev/null and b/lib/images/fileicons/16x16/odg.png differ diff --git a/lib/images/fileicons/16x16/odi.png b/lib/images/fileicons/16x16/odi.png new file mode 100644 index 000000000..b57fd974d Binary files /dev/null and b/lib/images/fileicons/16x16/odi.png differ diff --git a/lib/images/fileicons/16x16/odp.png b/lib/images/fileicons/16x16/odp.png new file mode 100644 index 000000000..81d1023c0 Binary files /dev/null and b/lib/images/fileicons/16x16/odp.png differ diff --git a/lib/images/fileicons/16x16/ods.png b/lib/images/fileicons/16x16/ods.png new file mode 100644 index 000000000..77e6d5366 Binary files /dev/null and b/lib/images/fileicons/16x16/ods.png differ diff --git a/lib/images/fileicons/16x16/odt.png b/lib/images/fileicons/16x16/odt.png new file mode 100644 index 000000000..8490eec74 Binary files /dev/null and b/lib/images/fileicons/16x16/odt.png differ diff --git a/lib/images/fileicons/16x16/ogg.png b/lib/images/fileicons/16x16/ogg.png new file mode 100644 index 000000000..38f615c99 Binary files /dev/null and b/lib/images/fileicons/16x16/ogg.png differ diff --git a/lib/images/fileicons/16x16/ogv.png b/lib/images/fileicons/16x16/ogv.png new file mode 100644 index 000000000..a937dfc4c Binary files /dev/null and b/lib/images/fileicons/16x16/ogv.png differ diff --git a/lib/images/fileicons/16x16/pdf.png b/lib/images/fileicons/16x16/pdf.png new file mode 100644 index 000000000..a3a30e475 Binary files /dev/null and b/lib/images/fileicons/16x16/pdf.png differ diff --git a/lib/images/fileicons/16x16/png.png b/lib/images/fileicons/16x16/png.png new file mode 100644 index 000000000..00ce3e400 Binary files /dev/null and b/lib/images/fileicons/16x16/png.png differ diff --git a/lib/images/fileicons/16x16/ppt.png b/lib/images/fileicons/16x16/ppt.png new file mode 100644 index 000000000..3355c2712 Binary files /dev/null and b/lib/images/fileicons/16x16/ppt.png differ diff --git a/lib/images/fileicons/16x16/pptx.png b/lib/images/fileicons/16x16/pptx.png new file mode 100644 index 000000000..269cdb8fc Binary files /dev/null and b/lib/images/fileicons/16x16/pptx.png differ diff --git a/lib/images/fileicons/16x16/ps.png b/lib/images/fileicons/16x16/ps.png new file mode 100644 index 000000000..089caeb7a Binary files /dev/null and b/lib/images/fileicons/16x16/ps.png differ diff --git a/lib/images/fileicons/16x16/rar.png b/lib/images/fileicons/16x16/rar.png new file mode 100644 index 000000000..f15d4ce5b Binary files /dev/null and b/lib/images/fileicons/16x16/rar.png differ diff --git a/lib/images/fileicons/16x16/rpm.png b/lib/images/fileicons/16x16/rpm.png new file mode 100644 index 000000000..831424ff5 Binary files /dev/null and b/lib/images/fileicons/16x16/rpm.png differ diff --git a/lib/images/fileicons/16x16/rtf.png b/lib/images/fileicons/16x16/rtf.png new file mode 100644 index 000000000..bbc425ca3 Binary files /dev/null and b/lib/images/fileicons/16x16/rtf.png differ diff --git a/lib/images/fileicons/16x16/swf.png b/lib/images/fileicons/16x16/swf.png new file mode 100644 index 000000000..b45a72cc9 Binary files /dev/null and b/lib/images/fileicons/16x16/swf.png differ diff --git a/lib/images/fileicons/16x16/sxc.png b/lib/images/fileicons/16x16/sxc.png new file mode 100644 index 000000000..c96cf303f Binary files /dev/null and b/lib/images/fileicons/16x16/sxc.png differ diff --git a/lib/images/fileicons/16x16/sxd.png b/lib/images/fileicons/16x16/sxd.png new file mode 100644 index 000000000..124b928e1 Binary files /dev/null and b/lib/images/fileicons/16x16/sxd.png differ diff --git a/lib/images/fileicons/16x16/sxi.png b/lib/images/fileicons/16x16/sxi.png new file mode 100644 index 000000000..8a5e23033 Binary files /dev/null and b/lib/images/fileicons/16x16/sxi.png differ diff --git a/lib/images/fileicons/16x16/sxw.png b/lib/images/fileicons/16x16/sxw.png new file mode 100644 index 000000000..9a903791c Binary files /dev/null and b/lib/images/fileicons/16x16/sxw.png differ diff --git a/lib/images/fileicons/16x16/tar.png b/lib/images/fileicons/16x16/tar.png new file mode 100644 index 000000000..e57029adc Binary files /dev/null and b/lib/images/fileicons/16x16/tar.png differ diff --git a/lib/images/fileicons/16x16/tgz.png b/lib/images/fileicons/16x16/tgz.png new file mode 100644 index 000000000..25ef9e15a Binary files /dev/null and b/lib/images/fileicons/16x16/tgz.png differ diff --git a/lib/images/fileicons/16x16/txt.png b/lib/images/fileicons/16x16/txt.png new file mode 100644 index 000000000..4fd921655 Binary files /dev/null and b/lib/images/fileicons/16x16/txt.png differ diff --git a/lib/images/fileicons/16x16/wav.png b/lib/images/fileicons/16x16/wav.png new file mode 100644 index 000000000..c8880c62e Binary files /dev/null and b/lib/images/fileicons/16x16/wav.png differ diff --git a/lib/images/fileicons/16x16/webm.png b/lib/images/fileicons/16x16/webm.png new file mode 100644 index 000000000..55db61914 Binary files /dev/null and b/lib/images/fileicons/16x16/webm.png differ diff --git a/lib/images/fileicons/16x16/xls.png b/lib/images/fileicons/16x16/xls.png new file mode 100644 index 000000000..5ac56f20d Binary files /dev/null and b/lib/images/fileicons/16x16/xls.png differ diff --git a/lib/images/fileicons/16x16/xlsx.png b/lib/images/fileicons/16x16/xlsx.png new file mode 100644 index 000000000..89c84c522 Binary files /dev/null and b/lib/images/fileicons/16x16/xlsx.png differ diff --git a/lib/images/fileicons/16x16/xml.png b/lib/images/fileicons/16x16/xml.png new file mode 100644 index 000000000..fb960477e Binary files /dev/null and b/lib/images/fileicons/16x16/xml.png differ diff --git a/lib/images/fileicons/16x16/zip.png b/lib/images/fileicons/16x16/zip.png new file mode 100644 index 000000000..4a36a35ff Binary files /dev/null and b/lib/images/fileicons/16x16/zip.png differ diff --git a/lib/images/fileicons/32x32/7z.png b/lib/images/fileicons/32x32/7z.png new file mode 100644 index 000000000..9ba7da94a Binary files /dev/null and b/lib/images/fileicons/32x32/7z.png differ diff --git a/lib/images/fileicons/32x32/bz2.png b/lib/images/fileicons/32x32/bz2.png new file mode 100644 index 000000000..7be9b7c06 Binary files /dev/null and b/lib/images/fileicons/32x32/bz2.png differ diff --git a/lib/images/fileicons/32x32/conf.png b/lib/images/fileicons/32x32/conf.png new file mode 100644 index 000000000..91a8a10de Binary files /dev/null and b/lib/images/fileicons/32x32/conf.png differ diff --git a/lib/images/fileicons/32x32/csv.png b/lib/images/fileicons/32x32/csv.png new file mode 100644 index 000000000..3ee42f047 Binary files /dev/null and b/lib/images/fileicons/32x32/csv.png differ diff --git a/lib/images/fileicons/32x32/deb.png b/lib/images/fileicons/32x32/deb.png new file mode 100644 index 000000000..8d625ccf2 Binary files /dev/null and b/lib/images/fileicons/32x32/deb.png differ diff --git a/lib/images/fileicons/32x32/doc.png b/lib/images/fileicons/32x32/doc.png new file mode 100644 index 000000000..8369c1f73 Binary files /dev/null and b/lib/images/fileicons/32x32/doc.png differ diff --git a/lib/images/fileicons/32x32/docx.png b/lib/images/fileicons/32x32/docx.png new file mode 100644 index 000000000..ce5dfb3d3 Binary files /dev/null and b/lib/images/fileicons/32x32/docx.png differ diff --git a/lib/images/fileicons/32x32/file.png b/lib/images/fileicons/32x32/file.png new file mode 100644 index 000000000..52318f6e2 Binary files /dev/null and b/lib/images/fileicons/32x32/file.png differ diff --git a/lib/images/fileicons/32x32/gif.png b/lib/images/fileicons/32x32/gif.png new file mode 100644 index 000000000..7e5608b75 Binary files /dev/null and b/lib/images/fileicons/32x32/gif.png differ diff --git a/lib/images/fileicons/32x32/gz.png b/lib/images/fileicons/32x32/gz.png new file mode 100644 index 000000000..573ce7afd Binary files /dev/null and b/lib/images/fileicons/32x32/gz.png differ diff --git a/lib/images/fileicons/32x32/htm.png b/lib/images/fileicons/32x32/htm.png new file mode 100644 index 000000000..132963be5 Binary files /dev/null and b/lib/images/fileicons/32x32/htm.png differ diff --git a/lib/images/fileicons/32x32/html.png b/lib/images/fileicons/32x32/html.png new file mode 100644 index 000000000..fb15689c0 Binary files /dev/null and b/lib/images/fileicons/32x32/html.png differ diff --git a/lib/images/fileicons/32x32/ico.png b/lib/images/fileicons/32x32/ico.png new file mode 100644 index 000000000..0fe7053b0 Binary files /dev/null and b/lib/images/fileicons/32x32/ico.png differ diff --git a/lib/images/fileicons/32x32/jpeg.png b/lib/images/fileicons/32x32/jpeg.png new file mode 100644 index 000000000..b6707a603 Binary files /dev/null and b/lib/images/fileicons/32x32/jpeg.png differ diff --git a/lib/images/fileicons/32x32/jpg.png b/lib/images/fileicons/32x32/jpg.png new file mode 100644 index 000000000..1c8b706e8 Binary files /dev/null and b/lib/images/fileicons/32x32/jpg.png differ diff --git a/lib/images/fileicons/32x32/mp3.png b/lib/images/fileicons/32x32/mp3.png new file mode 100644 index 000000000..1acd83276 Binary files /dev/null and b/lib/images/fileicons/32x32/mp3.png differ diff --git a/lib/images/fileicons/32x32/mp4.png b/lib/images/fileicons/32x32/mp4.png new file mode 100644 index 000000000..03db6f450 Binary files /dev/null and b/lib/images/fileicons/32x32/mp4.png differ diff --git a/lib/images/fileicons/32x32/odc.png b/lib/images/fileicons/32x32/odc.png new file mode 100644 index 000000000..9a34f2129 Binary files /dev/null and b/lib/images/fileicons/32x32/odc.png differ diff --git a/lib/images/fileicons/32x32/odf.png b/lib/images/fileicons/32x32/odf.png new file mode 100644 index 000000000..e3b4333ad Binary files /dev/null and b/lib/images/fileicons/32x32/odf.png differ diff --git a/lib/images/fileicons/32x32/odg.png b/lib/images/fileicons/32x32/odg.png new file mode 100644 index 000000000..c3b192b2d Binary files /dev/null and b/lib/images/fileicons/32x32/odg.png differ diff --git a/lib/images/fileicons/32x32/odi.png b/lib/images/fileicons/32x32/odi.png new file mode 100644 index 000000000..6baa69407 Binary files /dev/null and b/lib/images/fileicons/32x32/odi.png differ diff --git a/lib/images/fileicons/32x32/odp.png b/lib/images/fileicons/32x32/odp.png new file mode 100644 index 000000000..8e09dd6e4 Binary files /dev/null and b/lib/images/fileicons/32x32/odp.png differ diff --git a/lib/images/fileicons/32x32/ods.png b/lib/images/fileicons/32x32/ods.png new file mode 100644 index 000000000..90892f3d4 Binary files /dev/null and b/lib/images/fileicons/32x32/ods.png differ diff --git a/lib/images/fileicons/32x32/odt.png b/lib/images/fileicons/32x32/odt.png new file mode 100644 index 000000000..22ec1fffb Binary files /dev/null and b/lib/images/fileicons/32x32/odt.png differ diff --git a/lib/images/fileicons/32x32/ogg.png b/lib/images/fileicons/32x32/ogg.png new file mode 100644 index 000000000..f988fabc3 Binary files /dev/null and b/lib/images/fileicons/32x32/ogg.png differ diff --git a/lib/images/fileicons/32x32/ogv.png b/lib/images/fileicons/32x32/ogv.png new file mode 100644 index 000000000..1083455fb Binary files /dev/null and b/lib/images/fileicons/32x32/ogv.png differ diff --git a/lib/images/fileicons/32x32/pdf.png b/lib/images/fileicons/32x32/pdf.png new file mode 100644 index 000000000..8e8b45472 Binary files /dev/null and b/lib/images/fileicons/32x32/pdf.png differ diff --git a/lib/images/fileicons/32x32/png.png b/lib/images/fileicons/32x32/png.png new file mode 100644 index 000000000..deb47e44e Binary files /dev/null and b/lib/images/fileicons/32x32/png.png differ diff --git a/lib/images/fileicons/32x32/ppt.png b/lib/images/fileicons/32x32/ppt.png new file mode 100644 index 000000000..84b523a23 Binary files /dev/null and b/lib/images/fileicons/32x32/ppt.png differ diff --git a/lib/images/fileicons/32x32/pptx.png b/lib/images/fileicons/32x32/pptx.png new file mode 100644 index 000000000..1446cf4de Binary files /dev/null and b/lib/images/fileicons/32x32/pptx.png differ diff --git a/lib/images/fileicons/32x32/ps.png b/lib/images/fileicons/32x32/ps.png new file mode 100644 index 000000000..d540743f9 Binary files /dev/null and b/lib/images/fileicons/32x32/ps.png differ diff --git a/lib/images/fileicons/32x32/rar.png b/lib/images/fileicons/32x32/rar.png new file mode 100644 index 000000000..4af2a4d46 Binary files /dev/null and b/lib/images/fileicons/32x32/rar.png differ diff --git a/lib/images/fileicons/32x32/rpm.png b/lib/images/fileicons/32x32/rpm.png new file mode 100644 index 000000000..2ec5f4e1b Binary files /dev/null and b/lib/images/fileicons/32x32/rpm.png differ diff --git a/lib/images/fileicons/32x32/rtf.png b/lib/images/fileicons/32x32/rtf.png new file mode 100644 index 000000000..fcbcd001a Binary files /dev/null and b/lib/images/fileicons/32x32/rtf.png differ diff --git a/lib/images/fileicons/32x32/swf.png b/lib/images/fileicons/32x32/swf.png new file mode 100644 index 000000000..b43642905 Binary files /dev/null and b/lib/images/fileicons/32x32/swf.png differ diff --git a/lib/images/fileicons/32x32/sxc.png b/lib/images/fileicons/32x32/sxc.png new file mode 100644 index 000000000..50676be6a Binary files /dev/null and b/lib/images/fileicons/32x32/sxc.png differ diff --git a/lib/images/fileicons/32x32/sxd.png b/lib/images/fileicons/32x32/sxd.png new file mode 100644 index 000000000..f715a8ff0 Binary files /dev/null and b/lib/images/fileicons/32x32/sxd.png differ diff --git a/lib/images/fileicons/32x32/sxi.png b/lib/images/fileicons/32x32/sxi.png new file mode 100644 index 000000000..3d9f31d3b Binary files /dev/null and b/lib/images/fileicons/32x32/sxi.png differ diff --git a/lib/images/fileicons/32x32/sxw.png b/lib/images/fileicons/32x32/sxw.png new file mode 100644 index 000000000..bd8ab1436 Binary files /dev/null and b/lib/images/fileicons/32x32/sxw.png differ diff --git a/lib/images/fileicons/32x32/tar.png b/lib/images/fileicons/32x32/tar.png new file mode 100644 index 000000000..4a420a22a Binary files /dev/null and b/lib/images/fileicons/32x32/tar.png differ diff --git a/lib/images/fileicons/32x32/tgz.png b/lib/images/fileicons/32x32/tgz.png new file mode 100644 index 000000000..8cf6af41a Binary files /dev/null and b/lib/images/fileicons/32x32/tgz.png differ diff --git a/lib/images/fileicons/32x32/txt.png b/lib/images/fileicons/32x32/txt.png new file mode 100644 index 000000000..d9ff7d595 Binary files /dev/null and b/lib/images/fileicons/32x32/txt.png differ diff --git a/lib/images/fileicons/32x32/wav.png b/lib/images/fileicons/32x32/wav.png new file mode 100644 index 000000000..c39a8445f Binary files /dev/null and b/lib/images/fileicons/32x32/wav.png differ diff --git a/lib/images/fileicons/32x32/webm.png b/lib/images/fileicons/32x32/webm.png new file mode 100644 index 000000000..99b9c87b2 Binary files /dev/null and b/lib/images/fileicons/32x32/webm.png differ diff --git a/lib/images/fileicons/32x32/xls.png b/lib/images/fileicons/32x32/xls.png new file mode 100644 index 000000000..7447d9cdf Binary files /dev/null and b/lib/images/fileicons/32x32/xls.png differ diff --git a/lib/images/fileicons/32x32/xlsx.png b/lib/images/fileicons/32x32/xlsx.png new file mode 100644 index 000000000..920217267 Binary files /dev/null and b/lib/images/fileicons/32x32/xlsx.png differ diff --git a/lib/images/fileicons/32x32/xml.png b/lib/images/fileicons/32x32/xml.png new file mode 100644 index 000000000..bae059156 Binary files /dev/null and b/lib/images/fileicons/32x32/xml.png differ diff --git a/lib/images/fileicons/32x32/zip.png b/lib/images/fileicons/32x32/zip.png new file mode 100644 index 000000000..f07d18e2c Binary files /dev/null and b/lib/images/fileicons/32x32/zip.png differ diff --git a/lib/images/fileicons/7z.png b/lib/images/fileicons/7z.png deleted file mode 100644 index 52f7d5d72..000000000 Binary files a/lib/images/fileicons/7z.png and /dev/null differ diff --git a/lib/images/fileicons/audio.png b/lib/images/fileicons/audio.png deleted file mode 100644 index 98883256d..000000000 Binary files a/lib/images/fileicons/audio.png and /dev/null differ diff --git a/lib/images/fileicons/bz2.png b/lib/images/fileicons/bz2.png deleted file mode 100644 index 6ec2f98ef..000000000 Binary files a/lib/images/fileicons/bz2.png and /dev/null differ diff --git a/lib/images/fileicons/c.png b/lib/images/fileicons/c.png deleted file mode 100644 index 6f57337c7..000000000 Binary files a/lib/images/fileicons/c.png and /dev/null differ diff --git a/lib/images/fileicons/conf.png b/lib/images/fileicons/conf.png deleted file mode 100644 index 20c20fa3d..000000000 Binary files a/lib/images/fileicons/conf.png and /dev/null differ diff --git a/lib/images/fileicons/cpp.png b/lib/images/fileicons/cpp.png deleted file mode 100644 index 6f2797da5..000000000 Binary files a/lib/images/fileicons/cpp.png and /dev/null differ diff --git a/lib/images/fileicons/cs.png b/lib/images/fileicons/cs.png deleted file mode 100644 index d3afa112c..000000000 Binary files a/lib/images/fileicons/cs.png and /dev/null differ diff --git a/lib/images/fileicons/css.png b/lib/images/fileicons/css.png deleted file mode 100644 index 89c1537fd..000000000 Binary files a/lib/images/fileicons/css.png and /dev/null differ diff --git a/lib/images/fileicons/csv.png b/lib/images/fileicons/csv.png deleted file mode 100644 index b604453c4..000000000 Binary files a/lib/images/fileicons/csv.png and /dev/null differ diff --git a/lib/images/fileicons/deb.png b/lib/images/fileicons/deb.png deleted file mode 100644 index 8fe57327a..000000000 Binary files a/lib/images/fileicons/deb.png and /dev/null differ diff --git a/lib/images/fileicons/doc.png b/lib/images/fileicons/doc.png deleted file mode 100644 index 79d8ff1cd..000000000 Binary files a/lib/images/fileicons/doc.png and /dev/null differ diff --git a/lib/images/fileicons/docx.png b/lib/images/fileicons/docx.png deleted file mode 100644 index 79d8ff1cd..000000000 Binary files a/lib/images/fileicons/docx.png and /dev/null differ diff --git a/lib/images/fileicons/file.png b/lib/images/fileicons/file.png deleted file mode 100644 index 8158a8a21..000000000 Binary files a/lib/images/fileicons/file.png and /dev/null differ diff --git a/lib/images/fileicons/generate.php b/lib/images/fileicons/generate.php new file mode 100644 index 000000000..2dd25eb33 --- /dev/null +++ b/lib/images/fileicons/generate.php @@ -0,0 +1,35 @@ +mimetypes = getMimeTypes(); + foreach(array_keys($this->mimetypes) as $ext) { + $this->mimetypes[$ext] = ltrim($this->mimetypes[$ext], '!'); + } + } +} + + +echo "Important: you should enable the commented file types in mime.conf to make sure the icon are generated!\n"; + +// generate all the icons +$DFIB = new DokuFileIconBuilder(); +$DFIB->createAll(__DIR__); + +echo "generation done\n"; diff --git a/lib/images/fileicons/gif.png b/lib/images/fileicons/gif.png deleted file mode 100644 index 1d9dd562a..000000000 Binary files a/lib/images/fileicons/gif.png and /dev/null differ diff --git a/lib/images/fileicons/gz.png b/lib/images/fileicons/gz.png deleted file mode 100644 index 48f19596c..000000000 Binary files a/lib/images/fileicons/gz.png and /dev/null differ diff --git a/lib/images/fileicons/htm.png b/lib/images/fileicons/htm.png deleted file mode 100644 index d45e4c19a..000000000 Binary files a/lib/images/fileicons/htm.png and /dev/null differ diff --git a/lib/images/fileicons/html.png b/lib/images/fileicons/html.png deleted file mode 100644 index d45e4c19a..000000000 Binary files a/lib/images/fileicons/html.png and /dev/null differ diff --git a/lib/images/fileicons/ico.png b/lib/images/fileicons/ico.png deleted file mode 100644 index 1d9dd562a..000000000 Binary files a/lib/images/fileicons/ico.png and /dev/null differ diff --git a/lib/images/fileicons/index.php b/lib/images/fileicons/index.php index f90e7e6f0..28de26062 100644 --- a/lib/images/fileicons/index.php +++ b/lib/images/fileicons/index.php @@ -30,7 +30,7 @@
'; } ?> @@ -38,11 +38,30 @@ foreach (glob('*.png') as $img) {
'; } ?>
+
+ +
+ '; + } + ?> +
+ +
+ '; + } + ?> +
+ + diff --git a/lib/images/fileicons/java.png b/lib/images/fileicons/java.png deleted file mode 100644 index c5f2fd09f..000000000 Binary files a/lib/images/fileicons/java.png and /dev/null differ diff --git a/lib/images/fileicons/jpeg.png b/lib/images/fileicons/jpeg.png deleted file mode 100644 index 1d9dd562a..000000000 Binary files a/lib/images/fileicons/jpeg.png and /dev/null differ diff --git a/lib/images/fileicons/jpg.png b/lib/images/fileicons/jpg.png deleted file mode 100644 index 1d9dd562a..000000000 Binary files a/lib/images/fileicons/jpg.png and /dev/null differ diff --git a/lib/images/fileicons/js.png b/lib/images/fileicons/js.png deleted file mode 100644 index 0c314eb56..000000000 Binary files a/lib/images/fileicons/js.png and /dev/null differ diff --git a/lib/images/fileicons/lua.png b/lib/images/fileicons/lua.png deleted file mode 100644 index 994c6e8f0..000000000 Binary files a/lib/images/fileicons/lua.png and /dev/null differ diff --git a/lib/images/fileicons/mp3.png b/lib/images/fileicons/mp3.png deleted file mode 100644 index 411dad080..000000000 Binary files a/lib/images/fileicons/mp3.png and /dev/null differ diff --git a/lib/images/fileicons/mp4.png b/lib/images/fileicons/mp4.png deleted file mode 100644 index b89fc5299..000000000 Binary files a/lib/images/fileicons/mp4.png and /dev/null differ diff --git a/lib/images/fileicons/odc.png b/lib/images/fileicons/odc.png deleted file mode 100644 index 4d6676c3a..000000000 Binary files a/lib/images/fileicons/odc.png and /dev/null differ diff --git a/lib/images/fileicons/odf.png b/lib/images/fileicons/odf.png deleted file mode 100644 index cb88d68e6..000000000 Binary files a/lib/images/fileicons/odf.png and /dev/null differ diff --git a/lib/images/fileicons/odg.png b/lib/images/fileicons/odg.png deleted file mode 100644 index a07216f4a..000000000 Binary files a/lib/images/fileicons/odg.png and /dev/null differ diff --git a/lib/images/fileicons/odi.png b/lib/images/fileicons/odi.png deleted file mode 100644 index a07216f4a..000000000 Binary files a/lib/images/fileicons/odi.png and /dev/null differ diff --git a/lib/images/fileicons/odp.png b/lib/images/fileicons/odp.png deleted file mode 100644 index 2f2574af6..000000000 Binary files a/lib/images/fileicons/odp.png and /dev/null differ diff --git a/lib/images/fileicons/ods.png b/lib/images/fileicons/ods.png deleted file mode 100644 index 4d6676c3a..000000000 Binary files a/lib/images/fileicons/ods.png and /dev/null differ diff --git a/lib/images/fileicons/odt.png b/lib/images/fileicons/odt.png deleted file mode 100644 index f9c126efd..000000000 Binary files a/lib/images/fileicons/odt.png and /dev/null differ diff --git a/lib/images/fileicons/ogg.png b/lib/images/fileicons/ogg.png deleted file mode 100644 index 0a21eae65..000000000 Binary files a/lib/images/fileicons/ogg.png and /dev/null differ diff --git a/lib/images/fileicons/ogv.png b/lib/images/fileicons/ogv.png deleted file mode 100644 index b89fc5299..000000000 Binary files a/lib/images/fileicons/ogv.png and /dev/null differ diff --git a/lib/images/fileicons/pdf.png b/lib/images/fileicons/pdf.png deleted file mode 100644 index 029dcffec..000000000 Binary files a/lib/images/fileicons/pdf.png and /dev/null differ diff --git a/lib/images/fileicons/php.png b/lib/images/fileicons/php.png deleted file mode 100644 index f81e405de..000000000 Binary files a/lib/images/fileicons/php.png and /dev/null differ diff --git a/lib/images/fileicons/pl.png b/lib/images/fileicons/pl.png deleted file mode 100644 index 92f3f9754..000000000 Binary files a/lib/images/fileicons/pl.png and /dev/null differ diff --git a/lib/images/fileicons/png.png b/lib/images/fileicons/png.png deleted file mode 100644 index 1d9dd562a..000000000 Binary files a/lib/images/fileicons/png.png and /dev/null differ diff --git a/lib/images/fileicons/ppt.png b/lib/images/fileicons/ppt.png deleted file mode 100644 index b7afb2266..000000000 Binary files a/lib/images/fileicons/ppt.png and /dev/null differ diff --git a/lib/images/fileicons/pptx.png b/lib/images/fileicons/pptx.png deleted file mode 100644 index b7afb2266..000000000 Binary files a/lib/images/fileicons/pptx.png and /dev/null differ diff --git a/lib/images/fileicons/ps.png b/lib/images/fileicons/ps.png deleted file mode 100644 index 40a80baad..000000000 Binary files a/lib/images/fileicons/ps.png and /dev/null differ diff --git a/lib/images/fileicons/py.png b/lib/images/fileicons/py.png deleted file mode 100644 index 15a727c54..000000000 Binary files a/lib/images/fileicons/py.png and /dev/null differ diff --git a/lib/images/fileicons/rar.png b/lib/images/fileicons/rar.png deleted file mode 100644 index c761a4f7f..000000000 Binary files a/lib/images/fileicons/rar.png and /dev/null differ diff --git a/lib/images/fileicons/rb.png b/lib/images/fileicons/rb.png deleted file mode 100644 index 408f708a1..000000000 Binary files a/lib/images/fileicons/rb.png and /dev/null differ diff --git a/lib/images/fileicons/rpm.png b/lib/images/fileicons/rpm.png deleted file mode 100644 index 5cf727de0..000000000 Binary files a/lib/images/fileicons/rpm.png and /dev/null differ diff --git a/lib/images/fileicons/rtf.png b/lib/images/fileicons/rtf.png deleted file mode 100644 index 99fe3d8fd..000000000 Binary files a/lib/images/fileicons/rtf.png and /dev/null differ diff --git a/lib/images/fileicons/sql.png b/lib/images/fileicons/sql.png deleted file mode 100644 index a7b0684c7..000000000 Binary files a/lib/images/fileicons/sql.png and /dev/null differ diff --git a/lib/images/fileicons/swf.png b/lib/images/fileicons/swf.png deleted file mode 100644 index ecc7309ad..000000000 Binary files a/lib/images/fileicons/swf.png and /dev/null differ diff --git a/lib/images/fileicons/sxc.png b/lib/images/fileicons/sxc.png deleted file mode 100644 index 4d6676c3a..000000000 Binary files a/lib/images/fileicons/sxc.png and /dev/null differ diff --git a/lib/images/fileicons/sxd.png b/lib/images/fileicons/sxd.png deleted file mode 100644 index a07216f4a..000000000 Binary files a/lib/images/fileicons/sxd.png and /dev/null differ diff --git a/lib/images/fileicons/sxi.png b/lib/images/fileicons/sxi.png deleted file mode 100644 index 2f2574af6..000000000 Binary files a/lib/images/fileicons/sxi.png and /dev/null differ diff --git a/lib/images/fileicons/sxw.png b/lib/images/fileicons/sxw.png deleted file mode 100644 index f9c126efd..000000000 Binary files a/lib/images/fileicons/sxw.png and /dev/null differ diff --git a/lib/images/fileicons/tar.png b/lib/images/fileicons/tar.png deleted file mode 100644 index a28c86f2d..000000000 Binary files a/lib/images/fileicons/tar.png and /dev/null differ diff --git a/lib/images/fileicons/tgz.png b/lib/images/fileicons/tgz.png deleted file mode 100644 index 48f19596c..000000000 Binary files a/lib/images/fileicons/tgz.png and /dev/null differ diff --git a/lib/images/fileicons/txt.png b/lib/images/fileicons/txt.png deleted file mode 100644 index bb94949f6..000000000 Binary files a/lib/images/fileicons/txt.png and /dev/null differ diff --git a/lib/images/fileicons/wav.png b/lib/images/fileicons/wav.png deleted file mode 100644 index c167f4fdb..000000000 Binary files a/lib/images/fileicons/wav.png and /dev/null differ diff --git a/lib/images/fileicons/webm.png b/lib/images/fileicons/webm.png deleted file mode 100644 index b89fc5299..000000000 Binary files a/lib/images/fileicons/webm.png and /dev/null differ diff --git a/lib/images/fileicons/xls.png b/lib/images/fileicons/xls.png deleted file mode 100644 index 24911b802..000000000 Binary files a/lib/images/fileicons/xls.png and /dev/null differ diff --git a/lib/images/fileicons/xlsx.png b/lib/images/fileicons/xlsx.png deleted file mode 100644 index 24911b802..000000000 Binary files a/lib/images/fileicons/xlsx.png and /dev/null differ diff --git a/lib/images/fileicons/xml.png b/lib/images/fileicons/xml.png deleted file mode 100644 index ae9831b34..000000000 Binary files a/lib/images/fileicons/xml.png and /dev/null differ diff --git a/lib/images/fileicons/zip.png b/lib/images/fileicons/zip.png deleted file mode 100644 index fb8850c9a..000000000 Binary files a/lib/images/fileicons/zip.png and /dev/null differ -- cgit v1.2.3 From 6198904b0be1a338f774922e09c4b0d5050d853e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 16 Feb 2014 19:55:14 +0000 Subject: generalised link colour in header, making interwiki links blue as well (to fit design) --- lib/tpl/dokuwiki/css/design.less | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index 42292de49..235f6d6bc 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -48,6 +48,12 @@ margin-bottom: 0; font-size: 0.875em; } + + /* make all links in header (including breadcrumb and interwiki) same colour as the rest */ + a { + color: @ini_link; + background-color: inherit; + } } [dir=rtl] #dokuwiki__header h1 img { @@ -260,11 +266,6 @@ border-bottom: 1px solid @ini_border; } - a { - color: @ini_link; - background-color: inherit; - } - .bcsep { font-size: 0.75em; } -- cgit v1.2.3 From 56b0b744e40b19048e14cee4ff6caf69858d9fd6 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 18 Feb 2014 13:50:12 +0100 Subject: PHPDocs js.php --- lib/exe/js.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index 04413b409..8f16f4a96 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -220,6 +220,12 @@ function js_pluginstrings() { return $pluginstrings; } +/** + * Return an two-dimensional array with strings from the language file of current active template. + * + * - $lang['js'] must be an array. + * - Nothing is returned for template without an entry for $lang['js'] + */ function js_templatestrings() { global $conf; $templatestrings = array(); -- cgit v1.2.3 From fd3ec3c5b9b8af10dd89982ddbdf29ba7a13d700 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 18 Feb 2014 23:02:26 +0100 Subject: file icon updates now we no longer limit generation to the extensions in mime types, because file icons are used in downloadable code blocks, too. All icons were regenerated with the latest update of the generator. --- lib/images/fileicons/16x16/asm.png | Bin 0 -> 424 bytes lib/images/fileicons/16x16/bash.png | Bin 0 -> 435 bytes lib/images/fileicons/16x16/c.png | Bin 0 -> 413 bytes lib/images/fileicons/16x16/cc.png | Bin 0 -> 410 bytes lib/images/fileicons/16x16/cpp.png | Bin 0 -> 429 bytes lib/images/fileicons/16x16/csh.png | Bin 0 -> 430 bytes lib/images/fileicons/16x16/css.png | Bin 0 -> 430 bytes lib/images/fileicons/16x16/diff.png | Bin 0 -> 428 bytes lib/images/fileicons/16x16/doc.png | Bin 410 -> 405 bytes lib/images/fileicons/16x16/docx.png | Bin 415 -> 402 bytes lib/images/fileicons/16x16/gif.png | Bin 414 -> 407 bytes lib/images/fileicons/16x16/h.png | Bin 0 -> 411 bytes lib/images/fileicons/16x16/hpp.png | Bin 0 -> 417 bytes lib/images/fileicons/16x16/htm.png | Bin 402 -> 422 bytes lib/images/fileicons/16x16/html.png | Bin 391 -> 422 bytes lib/images/fileicons/16x16/ico.png | Bin 413 -> 405 bytes lib/images/fileicons/16x16/java.png | Bin 0 -> 420 bytes lib/images/fileicons/16x16/jpeg.png | Bin 424 -> 412 bytes lib/images/fileicons/16x16/jpg.png | Bin 418 -> 412 bytes lib/images/fileicons/16x16/js.png | Bin 0 -> 420 bytes lib/images/fileicons/16x16/json.png | Bin 0 -> 434 bytes lib/images/fileicons/16x16/odc.png | Bin 407 -> 403 bytes lib/images/fileicons/16x16/odf.png | Bin 411 -> 408 bytes lib/images/fileicons/16x16/odg.png | Bin 411 -> 405 bytes lib/images/fileicons/16x16/odi.png | Bin 398 -> 398 bytes lib/images/fileicons/16x16/odp.png | Bin 404 -> 406 bytes lib/images/fileicons/16x16/ods.png | Bin 416 -> 409 bytes lib/images/fileicons/16x16/odt.png | Bin 403 -> 406 bytes lib/images/fileicons/16x16/pas.png | Bin 0 -> 435 bytes lib/images/fileicons/16x16/pdf.png | Bin 419 -> 425 bytes lib/images/fileicons/16x16/pl.png | Bin 0 -> 417 bytes lib/images/fileicons/16x16/png.png | Bin 412 -> 417 bytes lib/images/fileicons/16x16/ppt.png | Bin 412 -> 415 bytes lib/images/fileicons/16x16/pptx.png | Bin 414 -> 407 bytes lib/images/fileicons/16x16/ps.png | Bin 416 -> 424 bytes lib/images/fileicons/16x16/py.png | Bin 0 -> 426 bytes lib/images/fileicons/16x16/rtf.png | Bin 418 -> 422 bytes lib/images/fileicons/16x16/sh.png | Bin 0 -> 422 bytes lib/images/fileicons/16x16/sxc.png | Bin 420 -> 416 bytes lib/images/fileicons/16x16/sxd.png | Bin 424 -> 420 bytes lib/images/fileicons/16x16/sxi.png | Bin 414 -> 408 bytes lib/images/fileicons/16x16/sxw.png | Bin 417 -> 410 bytes lib/images/fileicons/16x16/xls.png | Bin 415 -> 408 bytes lib/images/fileicons/16x16/xlsx.png | Bin 425 -> 419 bytes lib/images/fileicons/16x16/xml.png | Bin 400 -> 400 bytes lib/images/fileicons/32x32/asm.png | Bin 0 -> 988 bytes lib/images/fileicons/32x32/bash.png | Bin 0 -> 993 bytes lib/images/fileicons/32x32/c.png | Bin 0 -> 945 bytes lib/images/fileicons/32x32/cc.png | Bin 0 -> 953 bytes lib/images/fileicons/32x32/cpp.png | Bin 0 -> 958 bytes lib/images/fileicons/32x32/csh.png | Bin 0 -> 981 bytes lib/images/fileicons/32x32/css.png | Bin 0 -> 967 bytes lib/images/fileicons/32x32/diff.png | Bin 0 -> 975 bytes lib/images/fileicons/32x32/doc.png | Bin 1034 -> 1032 bytes lib/images/fileicons/32x32/docx.png | Bin 1078 -> 1062 bytes lib/images/fileicons/32x32/gif.png | Bin 944 -> 944 bytes lib/images/fileicons/32x32/h.png | Bin 0 -> 939 bytes lib/images/fileicons/32x32/hpp.png | Bin 0 -> 975 bytes lib/images/fileicons/32x32/htm.png | Bin 819 -> 982 bytes lib/images/fileicons/32x32/html.png | Bin 827 -> 982 bytes lib/images/fileicons/32x32/ico.png | Bin 941 -> 941 bytes lib/images/fileicons/32x32/java.png | Bin 0 -> 992 bytes lib/images/fileicons/32x32/jpeg.png | Bin 966 -> 948 bytes lib/images/fileicons/32x32/jpg.png | Bin 949 -> 948 bytes lib/images/fileicons/32x32/js.png | Bin 0 -> 959 bytes lib/images/fileicons/32x32/json.png | Bin 0 -> 1001 bytes lib/images/fileicons/32x32/odc.png | Bin 1061 -> 1058 bytes lib/images/fileicons/32x32/odf.png | Bin 1059 -> 1056 bytes lib/images/fileicons/32x32/odg.png | Bin 1066 -> 1065 bytes lib/images/fileicons/32x32/odi.png | Bin 1058 -> 1056 bytes lib/images/fileicons/32x32/odp.png | Bin 1060 -> 1060 bytes lib/images/fileicons/32x32/ods.png | Bin 1063 -> 1063 bytes lib/images/fileicons/32x32/odt.png | Bin 1060 -> 1060 bytes lib/images/fileicons/32x32/pas.png | Bin 0 -> 975 bytes lib/images/fileicons/32x32/pdf.png | Bin 1072 -> 1076 bytes lib/images/fileicons/32x32/pl.png | Bin 0 -> 950 bytes lib/images/fileicons/32x32/png.png | Bin 957 -> 957 bytes lib/images/fileicons/32x32/ppt.png | Bin 871 -> 872 bytes lib/images/fileicons/32x32/pptx.png | Bin 924 -> 917 bytes lib/images/fileicons/32x32/ps.png | Bin 595 -> 1086 bytes lib/images/fileicons/32x32/py.png | Bin 0 -> 965 bytes lib/images/fileicons/32x32/rtf.png | Bin 1035 -> 861 bytes lib/images/fileicons/32x32/sh.png | Bin 0 -> 961 bytes lib/images/fileicons/32x32/sxc.png | Bin 1078 -> 1074 bytes lib/images/fileicons/32x32/sxd.png | Bin 1079 -> 1078 bytes lib/images/fileicons/32x32/sxi.png | Bin 1067 -> 1066 bytes lib/images/fileicons/32x32/sxw.png | Bin 1086 -> 1076 bytes lib/images/fileicons/32x32/xls.png | Bin 1137 -> 1137 bytes lib/images/fileicons/32x32/xlsx.png | Bin 1182 -> 1174 bytes lib/images/fileicons/32x32/xml.png | Bin 818 -> 615 bytes lib/images/fileicons/generate.php | 47 +++++++++++++++++++++--------------- 91 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 lib/images/fileicons/16x16/asm.png create mode 100644 lib/images/fileicons/16x16/bash.png create mode 100644 lib/images/fileicons/16x16/c.png create mode 100644 lib/images/fileicons/16x16/cc.png create mode 100644 lib/images/fileicons/16x16/cpp.png create mode 100644 lib/images/fileicons/16x16/csh.png create mode 100644 lib/images/fileicons/16x16/css.png create mode 100644 lib/images/fileicons/16x16/diff.png create mode 100644 lib/images/fileicons/16x16/h.png create mode 100644 lib/images/fileicons/16x16/hpp.png create mode 100644 lib/images/fileicons/16x16/java.png create mode 100644 lib/images/fileicons/16x16/js.png create mode 100644 lib/images/fileicons/16x16/json.png create mode 100644 lib/images/fileicons/16x16/pas.png create mode 100644 lib/images/fileicons/16x16/pl.png create mode 100644 lib/images/fileicons/16x16/py.png create mode 100644 lib/images/fileicons/16x16/sh.png create mode 100644 lib/images/fileicons/32x32/asm.png create mode 100644 lib/images/fileicons/32x32/bash.png create mode 100644 lib/images/fileicons/32x32/c.png create mode 100644 lib/images/fileicons/32x32/cc.png create mode 100644 lib/images/fileicons/32x32/cpp.png create mode 100644 lib/images/fileicons/32x32/csh.png create mode 100644 lib/images/fileicons/32x32/css.png create mode 100644 lib/images/fileicons/32x32/diff.png create mode 100644 lib/images/fileicons/32x32/h.png create mode 100644 lib/images/fileicons/32x32/hpp.png create mode 100644 lib/images/fileicons/32x32/java.png create mode 100644 lib/images/fileicons/32x32/js.png create mode 100644 lib/images/fileicons/32x32/json.png create mode 100644 lib/images/fileicons/32x32/pas.png create mode 100644 lib/images/fileicons/32x32/pl.png create mode 100644 lib/images/fileicons/32x32/py.png create mode 100644 lib/images/fileicons/32x32/sh.png (limited to 'lib') diff --git a/lib/images/fileicons/16x16/asm.png b/lib/images/fileicons/16x16/asm.png new file mode 100644 index 000000000..a88d01665 Binary files /dev/null and b/lib/images/fileicons/16x16/asm.png differ diff --git a/lib/images/fileicons/16x16/bash.png b/lib/images/fileicons/16x16/bash.png new file mode 100644 index 000000000..047be8c6a Binary files /dev/null and b/lib/images/fileicons/16x16/bash.png differ diff --git a/lib/images/fileicons/16x16/c.png b/lib/images/fileicons/16x16/c.png new file mode 100644 index 000000000..5e91b8473 Binary files /dev/null and b/lib/images/fileicons/16x16/c.png differ diff --git a/lib/images/fileicons/16x16/cc.png b/lib/images/fileicons/16x16/cc.png new file mode 100644 index 000000000..432c95901 Binary files /dev/null and b/lib/images/fileicons/16x16/cc.png differ diff --git a/lib/images/fileicons/16x16/cpp.png b/lib/images/fileicons/16x16/cpp.png new file mode 100644 index 000000000..6c6be4263 Binary files /dev/null and b/lib/images/fileicons/16x16/cpp.png differ diff --git a/lib/images/fileicons/16x16/csh.png b/lib/images/fileicons/16x16/csh.png new file mode 100644 index 000000000..14e01b2a7 Binary files /dev/null and b/lib/images/fileicons/16x16/csh.png differ diff --git a/lib/images/fileicons/16x16/css.png b/lib/images/fileicons/16x16/css.png new file mode 100644 index 000000000..5638f1879 Binary files /dev/null and b/lib/images/fileicons/16x16/css.png differ diff --git a/lib/images/fileicons/16x16/diff.png b/lib/images/fileicons/16x16/diff.png new file mode 100644 index 000000000..c81c4ff2c Binary files /dev/null and b/lib/images/fileicons/16x16/diff.png differ diff --git a/lib/images/fileicons/16x16/doc.png b/lib/images/fileicons/16x16/doc.png index 925494576..9324f20b3 100644 Binary files a/lib/images/fileicons/16x16/doc.png and b/lib/images/fileicons/16x16/doc.png differ diff --git a/lib/images/fileicons/16x16/docx.png b/lib/images/fileicons/16x16/docx.png index 5bae13f9e..e3986295d 100644 Binary files a/lib/images/fileicons/16x16/docx.png and b/lib/images/fileicons/16x16/docx.png differ diff --git a/lib/images/fileicons/16x16/gif.png b/lib/images/fileicons/16x16/gif.png index d8eb57e54..bcbb8366b 100644 Binary files a/lib/images/fileicons/16x16/gif.png and b/lib/images/fileicons/16x16/gif.png differ diff --git a/lib/images/fileicons/16x16/h.png b/lib/images/fileicons/16x16/h.png new file mode 100644 index 000000000..a208d3159 Binary files /dev/null and b/lib/images/fileicons/16x16/h.png differ diff --git a/lib/images/fileicons/16x16/hpp.png b/lib/images/fileicons/16x16/hpp.png new file mode 100644 index 000000000..decd78b7e Binary files /dev/null and b/lib/images/fileicons/16x16/hpp.png differ diff --git a/lib/images/fileicons/16x16/htm.png b/lib/images/fileicons/16x16/htm.png index 8312c33a8..e0ead2bff 100644 Binary files a/lib/images/fileicons/16x16/htm.png and b/lib/images/fileicons/16x16/htm.png differ diff --git a/lib/images/fileicons/16x16/html.png b/lib/images/fileicons/16x16/html.png index 7a7fcc0fa..e0ead2bff 100644 Binary files a/lib/images/fileicons/16x16/html.png and b/lib/images/fileicons/16x16/html.png differ diff --git a/lib/images/fileicons/16x16/ico.png b/lib/images/fileicons/16x16/ico.png index 9d4259c1b..93343717c 100644 Binary files a/lib/images/fileicons/16x16/ico.png and b/lib/images/fileicons/16x16/ico.png differ diff --git a/lib/images/fileicons/16x16/java.png b/lib/images/fileicons/16x16/java.png new file mode 100644 index 000000000..6adebc02b Binary files /dev/null and b/lib/images/fileicons/16x16/java.png differ diff --git a/lib/images/fileicons/16x16/jpeg.png b/lib/images/fileicons/16x16/jpeg.png index 3a7d8a7f9..29dea5761 100644 Binary files a/lib/images/fileicons/16x16/jpeg.png and b/lib/images/fileicons/16x16/jpeg.png differ diff --git a/lib/images/fileicons/16x16/jpg.png b/lib/images/fileicons/16x16/jpg.png index 7152ebdb6..29dea5761 100644 Binary files a/lib/images/fileicons/16x16/jpg.png and b/lib/images/fileicons/16x16/jpg.png differ diff --git a/lib/images/fileicons/16x16/js.png b/lib/images/fileicons/16x16/js.png new file mode 100644 index 000000000..37d3a7958 Binary files /dev/null and b/lib/images/fileicons/16x16/js.png differ diff --git a/lib/images/fileicons/16x16/json.png b/lib/images/fileicons/16x16/json.png new file mode 100644 index 000000000..0f32375e6 Binary files /dev/null and b/lib/images/fileicons/16x16/json.png differ diff --git a/lib/images/fileicons/16x16/odc.png b/lib/images/fileicons/16x16/odc.png index 331140552..b2a879a84 100644 Binary files a/lib/images/fileicons/16x16/odc.png and b/lib/images/fileicons/16x16/odc.png differ diff --git a/lib/images/fileicons/16x16/odf.png b/lib/images/fileicons/16x16/odf.png index eccae9e20..65db17827 100644 Binary files a/lib/images/fileicons/16x16/odf.png and b/lib/images/fileicons/16x16/odf.png differ diff --git a/lib/images/fileicons/16x16/odg.png b/lib/images/fileicons/16x16/odg.png index 5224425e6..bab8fe1a7 100644 Binary files a/lib/images/fileicons/16x16/odg.png and b/lib/images/fileicons/16x16/odg.png differ diff --git a/lib/images/fileicons/16x16/odi.png b/lib/images/fileicons/16x16/odi.png index b57fd974d..f0df8e582 100644 Binary files a/lib/images/fileicons/16x16/odi.png and b/lib/images/fileicons/16x16/odi.png differ diff --git a/lib/images/fileicons/16x16/odp.png b/lib/images/fileicons/16x16/odp.png index 81d1023c0..4008c4e54 100644 Binary files a/lib/images/fileicons/16x16/odp.png and b/lib/images/fileicons/16x16/odp.png differ diff --git a/lib/images/fileicons/16x16/ods.png b/lib/images/fileicons/16x16/ods.png index 77e6d5366..c7d5e263c 100644 Binary files a/lib/images/fileicons/16x16/ods.png and b/lib/images/fileicons/16x16/ods.png differ diff --git a/lib/images/fileicons/16x16/odt.png b/lib/images/fileicons/16x16/odt.png index 8490eec74..8fd5fd35c 100644 Binary files a/lib/images/fileicons/16x16/odt.png and b/lib/images/fileicons/16x16/odt.png differ diff --git a/lib/images/fileicons/16x16/pas.png b/lib/images/fileicons/16x16/pas.png new file mode 100644 index 000000000..0a91eff4a Binary files /dev/null and b/lib/images/fileicons/16x16/pas.png differ diff --git a/lib/images/fileicons/16x16/pdf.png b/lib/images/fileicons/16x16/pdf.png index a3a30e475..1bc154641 100644 Binary files a/lib/images/fileicons/16x16/pdf.png and b/lib/images/fileicons/16x16/pdf.png differ diff --git a/lib/images/fileicons/16x16/pl.png b/lib/images/fileicons/16x16/pl.png new file mode 100644 index 000000000..7f43f6399 Binary files /dev/null and b/lib/images/fileicons/16x16/pl.png differ diff --git a/lib/images/fileicons/16x16/png.png b/lib/images/fileicons/16x16/png.png index 00ce3e400..007270532 100644 Binary files a/lib/images/fileicons/16x16/png.png and b/lib/images/fileicons/16x16/png.png differ diff --git a/lib/images/fileicons/16x16/ppt.png b/lib/images/fileicons/16x16/ppt.png index 3355c2712..e097ceb90 100644 Binary files a/lib/images/fileicons/16x16/ppt.png and b/lib/images/fileicons/16x16/ppt.png differ diff --git a/lib/images/fileicons/16x16/pptx.png b/lib/images/fileicons/16x16/pptx.png index 269cdb8fc..9dda61a12 100644 Binary files a/lib/images/fileicons/16x16/pptx.png and b/lib/images/fileicons/16x16/pptx.png differ diff --git a/lib/images/fileicons/16x16/ps.png b/lib/images/fileicons/16x16/ps.png index 089caeb7a..e61d1aa7e 100644 Binary files a/lib/images/fileicons/16x16/ps.png and b/lib/images/fileicons/16x16/ps.png differ diff --git a/lib/images/fileicons/16x16/py.png b/lib/images/fileicons/16x16/py.png new file mode 100644 index 000000000..4745cb972 Binary files /dev/null and b/lib/images/fileicons/16x16/py.png differ diff --git a/lib/images/fileicons/16x16/rtf.png b/lib/images/fileicons/16x16/rtf.png index bbc425ca3..4486932ed 100644 Binary files a/lib/images/fileicons/16x16/rtf.png and b/lib/images/fileicons/16x16/rtf.png differ diff --git a/lib/images/fileicons/16x16/sh.png b/lib/images/fileicons/16x16/sh.png new file mode 100644 index 000000000..60266bf3c Binary files /dev/null and b/lib/images/fileicons/16x16/sh.png differ diff --git a/lib/images/fileicons/16x16/sxc.png b/lib/images/fileicons/16x16/sxc.png index c96cf303f..6084d49b7 100644 Binary files a/lib/images/fileicons/16x16/sxc.png and b/lib/images/fileicons/16x16/sxc.png differ diff --git a/lib/images/fileicons/16x16/sxd.png b/lib/images/fileicons/16x16/sxd.png index 124b928e1..aecd863a0 100644 Binary files a/lib/images/fileicons/16x16/sxd.png and b/lib/images/fileicons/16x16/sxd.png differ diff --git a/lib/images/fileicons/16x16/sxi.png b/lib/images/fileicons/16x16/sxi.png index 8a5e23033..b34b33ca3 100644 Binary files a/lib/images/fileicons/16x16/sxi.png and b/lib/images/fileicons/16x16/sxi.png differ diff --git a/lib/images/fileicons/16x16/sxw.png b/lib/images/fileicons/16x16/sxw.png index 9a903791c..a30869d9d 100644 Binary files a/lib/images/fileicons/16x16/sxw.png and b/lib/images/fileicons/16x16/sxw.png differ diff --git a/lib/images/fileicons/16x16/xls.png b/lib/images/fileicons/16x16/xls.png index 5ac56f20d..12a32a295 100644 Binary files a/lib/images/fileicons/16x16/xls.png and b/lib/images/fileicons/16x16/xls.png differ diff --git a/lib/images/fileicons/16x16/xlsx.png b/lib/images/fileicons/16x16/xlsx.png index 89c84c522..b2e85489d 100644 Binary files a/lib/images/fileicons/16x16/xlsx.png and b/lib/images/fileicons/16x16/xlsx.png differ diff --git a/lib/images/fileicons/16x16/xml.png b/lib/images/fileicons/16x16/xml.png index fb960477e..4480a6385 100644 Binary files a/lib/images/fileicons/16x16/xml.png and b/lib/images/fileicons/16x16/xml.png differ diff --git a/lib/images/fileicons/32x32/asm.png b/lib/images/fileicons/32x32/asm.png new file mode 100644 index 000000000..d9e336cdb Binary files /dev/null and b/lib/images/fileicons/32x32/asm.png differ diff --git a/lib/images/fileicons/32x32/bash.png b/lib/images/fileicons/32x32/bash.png new file mode 100644 index 000000000..7a49f285a Binary files /dev/null and b/lib/images/fileicons/32x32/bash.png differ diff --git a/lib/images/fileicons/32x32/c.png b/lib/images/fileicons/32x32/c.png new file mode 100644 index 000000000..4e0dc92b7 Binary files /dev/null and b/lib/images/fileicons/32x32/c.png differ diff --git a/lib/images/fileicons/32x32/cc.png b/lib/images/fileicons/32x32/cc.png new file mode 100644 index 000000000..5e21e28ba Binary files /dev/null and b/lib/images/fileicons/32x32/cc.png differ diff --git a/lib/images/fileicons/32x32/cpp.png b/lib/images/fileicons/32x32/cpp.png new file mode 100644 index 000000000..18a0d0a92 Binary files /dev/null and b/lib/images/fileicons/32x32/cpp.png differ diff --git a/lib/images/fileicons/32x32/csh.png b/lib/images/fileicons/32x32/csh.png new file mode 100644 index 000000000..3f060c885 Binary files /dev/null and b/lib/images/fileicons/32x32/csh.png differ diff --git a/lib/images/fileicons/32x32/css.png b/lib/images/fileicons/32x32/css.png new file mode 100644 index 000000000..7ae0937c7 Binary files /dev/null and b/lib/images/fileicons/32x32/css.png differ diff --git a/lib/images/fileicons/32x32/diff.png b/lib/images/fileicons/32x32/diff.png new file mode 100644 index 000000000..0cda679c7 Binary files /dev/null and b/lib/images/fileicons/32x32/diff.png differ diff --git a/lib/images/fileicons/32x32/doc.png b/lib/images/fileicons/32x32/doc.png index 8369c1f73..c1e543a57 100644 Binary files a/lib/images/fileicons/32x32/doc.png and b/lib/images/fileicons/32x32/doc.png differ diff --git a/lib/images/fileicons/32x32/docx.png b/lib/images/fileicons/32x32/docx.png index ce5dfb3d3..36b6ea5fd 100644 Binary files a/lib/images/fileicons/32x32/docx.png and b/lib/images/fileicons/32x32/docx.png differ diff --git a/lib/images/fileicons/32x32/gif.png b/lib/images/fileicons/32x32/gif.png index 7e5608b75..e39af08cc 100644 Binary files a/lib/images/fileicons/32x32/gif.png and b/lib/images/fileicons/32x32/gif.png differ diff --git a/lib/images/fileicons/32x32/h.png b/lib/images/fileicons/32x32/h.png new file mode 100644 index 000000000..5bca1ab4c Binary files /dev/null and b/lib/images/fileicons/32x32/h.png differ diff --git a/lib/images/fileicons/32x32/hpp.png b/lib/images/fileicons/32x32/hpp.png new file mode 100644 index 000000000..0ccd65af0 Binary files /dev/null and b/lib/images/fileicons/32x32/hpp.png differ diff --git a/lib/images/fileicons/32x32/htm.png b/lib/images/fileicons/32x32/htm.png index 132963be5..f52a826f4 100644 Binary files a/lib/images/fileicons/32x32/htm.png and b/lib/images/fileicons/32x32/htm.png differ diff --git a/lib/images/fileicons/32x32/html.png b/lib/images/fileicons/32x32/html.png index fb15689c0..f52a826f4 100644 Binary files a/lib/images/fileicons/32x32/html.png and b/lib/images/fileicons/32x32/html.png differ diff --git a/lib/images/fileicons/32x32/ico.png b/lib/images/fileicons/32x32/ico.png index 0fe7053b0..0a219e6f2 100644 Binary files a/lib/images/fileicons/32x32/ico.png and b/lib/images/fileicons/32x32/ico.png differ diff --git a/lib/images/fileicons/32x32/java.png b/lib/images/fileicons/32x32/java.png new file mode 100644 index 000000000..d3a66c4dd Binary files /dev/null and b/lib/images/fileicons/32x32/java.png differ diff --git a/lib/images/fileicons/32x32/jpeg.png b/lib/images/fileicons/32x32/jpeg.png index b6707a603..5fb71dd73 100644 Binary files a/lib/images/fileicons/32x32/jpeg.png and b/lib/images/fileicons/32x32/jpeg.png differ diff --git a/lib/images/fileicons/32x32/jpg.png b/lib/images/fileicons/32x32/jpg.png index 1c8b706e8..5fb71dd73 100644 Binary files a/lib/images/fileicons/32x32/jpg.png and b/lib/images/fileicons/32x32/jpg.png differ diff --git a/lib/images/fileicons/32x32/js.png b/lib/images/fileicons/32x32/js.png new file mode 100644 index 000000000..741b175d3 Binary files /dev/null and b/lib/images/fileicons/32x32/js.png differ diff --git a/lib/images/fileicons/32x32/json.png b/lib/images/fileicons/32x32/json.png new file mode 100644 index 000000000..2a2a381ec Binary files /dev/null and b/lib/images/fileicons/32x32/json.png differ diff --git a/lib/images/fileicons/32x32/odc.png b/lib/images/fileicons/32x32/odc.png index 9a34f2129..ebb15681e 100644 Binary files a/lib/images/fileicons/32x32/odc.png and b/lib/images/fileicons/32x32/odc.png differ diff --git a/lib/images/fileicons/32x32/odf.png b/lib/images/fileicons/32x32/odf.png index e3b4333ad..97e4c45b3 100644 Binary files a/lib/images/fileicons/32x32/odf.png and b/lib/images/fileicons/32x32/odf.png differ diff --git a/lib/images/fileicons/32x32/odg.png b/lib/images/fileicons/32x32/odg.png index c3b192b2d..b2aae1e03 100644 Binary files a/lib/images/fileicons/32x32/odg.png and b/lib/images/fileicons/32x32/odg.png differ diff --git a/lib/images/fileicons/32x32/odi.png b/lib/images/fileicons/32x32/odi.png index 6baa69407..8176d2daa 100644 Binary files a/lib/images/fileicons/32x32/odi.png and b/lib/images/fileicons/32x32/odi.png differ diff --git a/lib/images/fileicons/32x32/odp.png b/lib/images/fileicons/32x32/odp.png index 8e09dd6e4..8e27fd62e 100644 Binary files a/lib/images/fileicons/32x32/odp.png and b/lib/images/fileicons/32x32/odp.png differ diff --git a/lib/images/fileicons/32x32/ods.png b/lib/images/fileicons/32x32/ods.png index 90892f3d4..9319b6acc 100644 Binary files a/lib/images/fileicons/32x32/ods.png and b/lib/images/fileicons/32x32/ods.png differ diff --git a/lib/images/fileicons/32x32/odt.png b/lib/images/fileicons/32x32/odt.png index 22ec1fffb..13eb496d3 100644 Binary files a/lib/images/fileicons/32x32/odt.png and b/lib/images/fileicons/32x32/odt.png differ diff --git a/lib/images/fileicons/32x32/pas.png b/lib/images/fileicons/32x32/pas.png new file mode 100644 index 000000000..e71796d8a Binary files /dev/null and b/lib/images/fileicons/32x32/pas.png differ diff --git a/lib/images/fileicons/32x32/pdf.png b/lib/images/fileicons/32x32/pdf.png index 8e8b45472..0efa0dc31 100644 Binary files a/lib/images/fileicons/32x32/pdf.png and b/lib/images/fileicons/32x32/pdf.png differ diff --git a/lib/images/fileicons/32x32/pl.png b/lib/images/fileicons/32x32/pl.png new file mode 100644 index 000000000..a7bbfedf1 Binary files /dev/null and b/lib/images/fileicons/32x32/pl.png differ diff --git a/lib/images/fileicons/32x32/png.png b/lib/images/fileicons/32x32/png.png index deb47e44e..0ecd29691 100644 Binary files a/lib/images/fileicons/32x32/png.png and b/lib/images/fileicons/32x32/png.png differ diff --git a/lib/images/fileicons/32x32/ppt.png b/lib/images/fileicons/32x32/ppt.png index 84b523a23..17dc7fda3 100644 Binary files a/lib/images/fileicons/32x32/ppt.png and b/lib/images/fileicons/32x32/ppt.png differ diff --git a/lib/images/fileicons/32x32/pptx.png b/lib/images/fileicons/32x32/pptx.png index 1446cf4de..cc42cf0e1 100644 Binary files a/lib/images/fileicons/32x32/pptx.png and b/lib/images/fileicons/32x32/pptx.png differ diff --git a/lib/images/fileicons/32x32/ps.png b/lib/images/fileicons/32x32/ps.png index d540743f9..e1a74988d 100644 Binary files a/lib/images/fileicons/32x32/ps.png and b/lib/images/fileicons/32x32/ps.png differ diff --git a/lib/images/fileicons/32x32/py.png b/lib/images/fileicons/32x32/py.png new file mode 100644 index 000000000..2ce622aeb Binary files /dev/null and b/lib/images/fileicons/32x32/py.png differ diff --git a/lib/images/fileicons/32x32/rtf.png b/lib/images/fileicons/32x32/rtf.png index fcbcd001a..0ad836e0c 100644 Binary files a/lib/images/fileicons/32x32/rtf.png and b/lib/images/fileicons/32x32/rtf.png differ diff --git a/lib/images/fileicons/32x32/sh.png b/lib/images/fileicons/32x32/sh.png new file mode 100644 index 000000000..1c2dbb29d Binary files /dev/null and b/lib/images/fileicons/32x32/sh.png differ diff --git a/lib/images/fileicons/32x32/sxc.png b/lib/images/fileicons/32x32/sxc.png index 50676be6a..fbd28e3de 100644 Binary files a/lib/images/fileicons/32x32/sxc.png and b/lib/images/fileicons/32x32/sxc.png differ diff --git a/lib/images/fileicons/32x32/sxd.png b/lib/images/fileicons/32x32/sxd.png index f715a8ff0..243c18861 100644 Binary files a/lib/images/fileicons/32x32/sxd.png and b/lib/images/fileicons/32x32/sxd.png differ diff --git a/lib/images/fileicons/32x32/sxi.png b/lib/images/fileicons/32x32/sxi.png index 3d9f31d3b..5c699f6eb 100644 Binary files a/lib/images/fileicons/32x32/sxi.png and b/lib/images/fileicons/32x32/sxi.png differ diff --git a/lib/images/fileicons/32x32/sxw.png b/lib/images/fileicons/32x32/sxw.png index bd8ab1436..944989e87 100644 Binary files a/lib/images/fileicons/32x32/sxw.png and b/lib/images/fileicons/32x32/sxw.png differ diff --git a/lib/images/fileicons/32x32/xls.png b/lib/images/fileicons/32x32/xls.png index 7447d9cdf..38e2b235b 100644 Binary files a/lib/images/fileicons/32x32/xls.png and b/lib/images/fileicons/32x32/xls.png differ diff --git a/lib/images/fileicons/32x32/xlsx.png b/lib/images/fileicons/32x32/xlsx.png index 920217267..773e49f77 100644 Binary files a/lib/images/fileicons/32x32/xlsx.png and b/lib/images/fileicons/32x32/xlsx.png differ diff --git a/lib/images/fileicons/32x32/xml.png b/lib/images/fileicons/32x32/xml.png index bae059156..4ea3b1f6c 100644 Binary files a/lib/images/fileicons/32x32/xml.png and b/lib/images/fileicons/32x32/xml.png differ diff --git a/lib/images/fileicons/generate.php b/lib/images/fileicons/generate.php index 2dd25eb33..b08749f49 100644 --- a/lib/images/fileicons/generate.php +++ b/lib/images/fileicons/generate.php @@ -9,27 +9,36 @@ if(!defined('DOKU_INC')) define('DOKU_INC', realpath(dirname(__FILE__).'/../../. define('NOSESSION', 1); require_once(DOKU_INC.'inc/init.php'); +$extensions = array( + 'jpg', 'gif', 'png', 'ico', + 'swf', 'mp3', 'ogg', 'wav', 'webm', 'ogv', 'mp4', + 'tgz', 'tar', 'gz', 'bz2', 'zip', 'rar', '7z', + 'pdf', 'ps', + 'rpm', 'deb', + 'doc', 'xls', 'ppt', 'rtf', + 'docx', 'xlsx', 'pptx', + 'sxw', 'sxc', 'sxi', 'sxd', + 'odc', 'odf', 'odg', 'odi', 'odp', 'ods', 'odt', + 'html', 'htm', 'txt', 'conf', 'xml', 'csv', + // these might be used in downloadable code blocks: + 'c', 'cc', 'cpp', 'h', 'hpp', 'csh', 'diff', 'java', 'pas', + 'pl', 'py', 'sh', 'bash', 'asm', 'htm', 'css', 'js', 'json' +); -/** - * Class DokuFileIconBuilder - * - * overwrite mime type loading with loading DokuWiki's mime type config instead - */ -class DokuFileIconBuilder extends FileIconBuilder { - - protected function loadmimetypes(){ - $this->mimetypes = getMimeTypes(); - foreach(array_keys($this->mimetypes) as $ext) { - $this->mimetypes[$ext] = ltrim($this->mimetypes[$ext], '!'); - } - } +// generate all the icons +@mkdir('16x16'); +@mkdir('32x32'); + +$DFIB = new FileIconBuilder(); +foreach($extensions as $ext) { + echo "$ext\n"; + $DFIB->create16x16($ext,"16x16/$ext.png"); + $DFIB->create32x32($ext,"32x32/$ext.png"); } +copy("16x16/jpg.png", "16x16/jpeg.png"); +copy("32x32/jpg.png", "32x32/jpeg.png"); -echo "Important: you should enable the commented file types in mime.conf to make sure the icon are generated!\n"; - -// generate all the icons -$DFIB = new DokuFileIconBuilder(); -$DFIB->createAll(__DIR__); +copy("16x16/htm.png", "16x16/html.png"); +copy("32x32/htm.png", "32x32/html.png"); -echo "generation done\n"; -- cgit v1.2.3 From 8f3927df350b53ee1287d66b36e9b29452c864f4 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 19 Feb 2014 01:21:07 +0000 Subject: improved styling of diff nav row --- lib/tpl/dokuwiki/css/_diff.css | 18 +++++++++-- lib/tpl/dokuwiki/css/basic.less | 1 + lib/tpl/dokuwiki/css/mobile.less | 6 ++-- lib/tpl/dokuwiki/css/sites/abcwiki.css | 39 +++++++++++++++++++++++ lib/tpl/dokuwiki/css/sites/paralis.css | 58 ++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 lib/tpl/dokuwiki/css/sites/abcwiki.css create mode 100644 lib/tpl/dokuwiki/css/sites/paralis.css (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css index 28cde7786..13c3012d9 100644 --- a/lib/tpl/dokuwiki/css/_diff.css +++ b/lib/tpl/dokuwiki/css/_diff.css @@ -76,6 +76,9 @@ /* diff nav */ +.dokuwiki table.diff_sidebyside td.diffnav { + padding-bottom: .7em; +} .dokuwiki .diffnav a { display: inline-block; vertical-align: middle; @@ -84,11 +87,17 @@ display: none; } +.dokuwiki .diffnav a:hover, +.dokuwiki .diffnav a:active, +.dokuwiki .diffnav a:focus { + background-color: @ini_background_alt; + text-decoration: none; +} + .dokuwiki .diffnav a:before { - font-size: 1.2em; display: inline-block; line-height: 1; - padding: .1em .2em; + padding: .2em .4em; border: 1px solid @ini_border; border-radius: 2px; color: @ini_text; @@ -110,4 +119,9 @@ .dokuwiki .diffnav select { width: 15em; + height: 1.5em; /* height is necessary for longer options in Webkit */ +} + +.dokuwiki .diffnav select option[selected] { + font-weight: bold; } diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less index c296185e9..ac9f6803a 100644 --- a/lib/tpl/dokuwiki/css/basic.less +++ b/lib/tpl/dokuwiki/css/basic.less @@ -455,6 +455,7 @@ input[disabled], button[disabled], select[disabled], textarea[disabled], +option[disabled], input[readonly], button[readonly], select[readonly], diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less index 0fbd0e8fe..6d552876d 100644 --- a/lib/tpl/dokuwiki/css/mobile.less +++ b/lib/tpl/dokuwiki/css/mobile.less @@ -266,11 +266,13 @@ body { #config__manager td .input, .dokuwiki fieldset, .dokuwiki input.edit, -.dokuwiki textarea, -.dokuwiki select { +.dokuwiki textarea { width: auto !important; max-width: 100% !important; } +.dokuwiki select { + max-width: 100% !important; +} #config__manager fieldset { margin-left: 0; margin-right: 0; diff --git a/lib/tpl/dokuwiki/css/sites/abcwiki.css b/lib/tpl/dokuwiki/css/sites/abcwiki.css new file mode 100644 index 000000000..9f436516b --- /dev/null +++ b/lib/tpl/dokuwiki/css/sites/abcwiki.css @@ -0,0 +1,39 @@ + +html, +body { + background-color: #369; +} + +#dokuwiki__header, +#dokuwiki__aside, +.docInfo, +#dokuwiki__footer { + color: #fff; +} + +#dokuwiki__header a, +#dokuwiki__aside a, +.docInfo a, +#dokuwiki__footer a { + color: #ff9 !important; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + color: #036; +} + +.dokuwiki div.breadcrumbs { + border-top-color: #999; + border-bottom-color: #666; +} +.dokuwiki div.breadcrumbs div:first-child { + border-bottom-color: #999; +} +.dokuwiki div.breadcrumbs div:last-child { + border-top-color: #666; +} diff --git a/lib/tpl/dokuwiki/css/sites/paralis.css b/lib/tpl/dokuwiki/css/sites/paralis.css new file mode 100644 index 000000000..201bca936 --- /dev/null +++ b/lib/tpl/dokuwiki/css/sites/paralis.css @@ -0,0 +1,58 @@ + +@media screen { + +body { + font: normal 100%/1.4 Frutiger, Calibri, "Myriad Pro", Myriad, "Nimbus Sans L", Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: Constantia, Utopia, Lucidabright, Lucida, Georgia, "Nimbus Roman No9 L", serif; + color: @ini_text_neu; +} + +q { + font-style: italic; +} + +#dokuwiki__header h1 a { + color: @ini_link; + font-weight: bold; +} + +div.dokuwiki p.plugin__pagenav { + margin: 0 0 1.4em; +} + + +} /* /@media */ + + +#dokuwiki__header h1 { + position: relative; +} +#dokuwiki__header h1 img { + position: absolute; + top: -27px; + left: -33px; + max-width: none; +} +#dokuwiki__header h1 { + padding-left: 110px; +} +#dokuwiki__header p.claim { + padding-left: 110px; +} + + +@media print { + +.dokuwiki p.plugin__pagenav { + display: none; +} + +} /* /@media */ -- cgit v1.2.3 From c130b0f8ec18ec66ac40422cf354a23268108866 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 19 Feb 2014 01:34:14 +0000 Subject: improved positioning of diff options --- lib/tpl/dokuwiki/css/_diff.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css index 13c3012d9..09e95d9f6 100644 --- a/lib/tpl/dokuwiki/css/_diff.css +++ b/lib/tpl/dokuwiki/css/_diff.css @@ -74,6 +74,15 @@ font-weight: bold; } +/* diff options */ + +.dokuwiki .diffoptions form { + float: left; +} +.dokuwiki .diffoptions p { + float: right; +} + /* diff nav */ .dokuwiki table.diff_sidebyside td.diffnav { -- cgit v1.2.3 From 900a9e9e56d360fa7d347304e9b0d4b691d4becc Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 20 Feb 2014 19:25:13 +0100 Subject: replace dir_delete by io_rmdir --- lib/exe/ajax.php | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 6e2011cd9..203af9c5b 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -298,26 +298,6 @@ function ajax_mediaupload(){ echo htmlspecialchars($json->encode($result), ENT_NOQUOTES); } -function dir_delete($path) { - if (!is_string($path) || $path == "") return false; - - if (is_dir($path) && !is_link($path)) { - if (!$dh = @opendir($path)) return false; - - while ($f = readdir($dh)) { - if ($f == '..' || $f == '.') continue; - dir_delete("$path/$f"); - } - - closedir($dh); - return @rmdir($path); - } else { - return @unlink($path); - } - - return false; -} - /** * Return sub index for index view * -- cgit v1.2.3 From 2472a8f6cbd2abffe712ddd42fe2ad296d03d8f2 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 20 Feb 2014 21:42:31 +0100 Subject: Removed unused vars, define undefined ones --- lib/exe/ajax.php | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 6e2011cd9..2cbcece5e 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -41,7 +41,6 @@ if(function_exists($callfn)){ * @author Andreas Gohr */ function ajax_qsearch(){ - global $conf; global $lang; global $INPUT; @@ -89,15 +88,12 @@ function ajax_qsearch(){ * @author Mike Frysinger */ function ajax_suggestions() { - global $conf; - global $lang; global $INPUT; $query = cleanID($INPUT->post->str('q')); if(empty($query)) $query = cleanID($INPUT->get->str('q')); if(empty($query)) return; - $data = array(); $data = ft_pageLookup($query); if(!count($data)) return; $data = array_keys($data); @@ -214,7 +210,6 @@ function ajax_medians(){ * @author Andreas Gohr */ function ajax_medialist(){ - global $conf; global $NS; global $INPUT; @@ -234,13 +229,15 @@ function ajax_medialist(){ * @author Kate Arzamastseva */ function ajax_mediadetails(){ - global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen, $conf, $INPUT; + global $IMG, $JUMPTO, $REV, $fullscreen, $INPUT; $fullscreen = true; require_once(DOKU_INC.'lib/exe/mediamanager.php'); + $image = ''; if ($INPUT->has('image')) $image = cleanID($INPUT->str('image')); if (isset($IMG)) $image = $IMG; if (isset($JUMPTO)) $image = $JUMPTO; + $rev = false; if (isset($REV) && !$JUMPTO) $rev = $REV; html_msgarea(); @@ -255,6 +252,7 @@ function ajax_mediadiff(){ global $NS; global $INPUT; + $image = ''; if ($INPUT->has('image')) $image = cleanID($INPUT->str('image')); $NS = $INPUT->post->str('ns'); $auth = auth_quickaclcheck("$NS:*"); @@ -264,6 +262,7 @@ function ajax_mediadiff(){ function ajax_mediaupload(){ global $NS, $MSG, $INPUT; + $id = ''; if ($_FILES['qqfile']['tmp_name']) { $id = $INPUT->post->str('mediaid', $_FILES['qqfile']['name']); } elseif ($INPUT->get->has('qqfile')) { @@ -280,19 +279,28 @@ function ajax_mediaupload(){ if ($_FILES['qqfile']['error']) unset($_FILES['qqfile']); + $res = false; if ($_FILES['qqfile']['tmp_name']) $res = media_upload($NS, $AUTH, $_FILES['qqfile']); if ($INPUT->get->has('qqfile')) $res = media_upload_xhr($NS, $AUTH); - if ($res) $result = array('success' => true, - 'link' => media_managerURL(array('ns' => $ns, 'image' => $NS.':'.$id), '&'), - 'id' => $NS.':'.$id, 'ns' => $NS); - - if (!$result) { + if($res) { + $result = array( + 'success' => true, + 'link' => media_managerURL(array('ns' => $ns, 'image' => $NS . ':' . $id), '&'), + 'id' => $NS . ':' . $id, + 'ns' => $NS + ); + } else { $error = ''; - if (isset($MSG)) { - foreach($MSG as $msg) $error .= $msg['msg']; + if(isset($MSG)) { + foreach($MSG as $msg) { + $error .= $msg['msg']; + } } - $result = array('error' => $msg['msg'], 'ns' => $NS); + $result = array( + 'error' => $error, + 'ns' => $NS + ); } $json = new JSON; echo htmlspecialchars($json->encode($result), ENT_NOQUOTES); @@ -359,13 +367,11 @@ function ajax_linkwiz(){ $id = cleanID($id); $nsd = utf8_encodeFN(str_replace(':','/',$ns)); - $idd = utf8_encodeFN(str_replace(':','/',$id)); $data = array(); if($q && !$ns){ // use index to lookup matching pages - $pages = array(); $pages = ft_pageLookup($id,true); // result contains matches in pages and namespaces -- cgit v1.2.3 From 948d482d02c7bfd8a6b00e1339e7e2300acde137 Mon Sep 17 00:00:00 2001 From: Marina Vladi Date: Sat, 22 Feb 2014 12:51:41 +0100 Subject: translation update --- lib/plugins/authad/lang/hu/settings.php | 6 +-- lib/plugins/authldap/lang/hu/settings.php | 7 ++-- lib/plugins/authmysql/lang/hu/settings.php | 4 +- lib/plugins/plugin/lang/hu/admin_plugin.txt | 4 ++ lib/plugins/plugin/lang/hu/lang.php | 59 +++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+), 8 deletions(-) create mode 100644 lib/plugins/plugin/lang/hu/admin_plugin.txt create mode 100644 lib/plugins/plugin/lang/hu/lang.php (limited to 'lib') diff --git a/lib/plugins/authad/lang/hu/settings.php b/lib/plugins/authad/lang/hu/settings.php index 05acbdc2d..be0592d68 100644 --- a/lib/plugins/authad/lang/hu/settings.php +++ b/lib/plugins/authad/lang/hu/settings.php @@ -11,11 +11,11 @@ $lang['base_dn'] = 'Bázis DN, pl. DC=my,DC=domain,DC=org + * @author Marina Vladi */ -$lang['server'] = 'LDAP-szerver. Hosztnév (localhost) vagy abszolút URL portszámmal (ldap://server.tld:389)'; -$lang['port'] = 'LDAP-szerver port, ha nem URL lett megadva'; +$lang['server'] = 'LDAP-szerver. Kiszolgálónév (localhost) vagy teljes URL-cím (ldap://server.tld:389)'; +$lang['port'] = 'LDAP-kiszolgáló portja, ha URL-cím nem lett megadva'; $lang['usertree'] = 'Hol találom a felhasználókat? Pl. ou=People, dc=server, dc=tld'; $lang['grouptree'] = 'Hol találom a csoportokat? Pl. ou=Group, dc=server, dc=tld'; $lang['userfilter'] = 'LDAP szűrő a felhasználók kereséséhez, pl. (&(uid=%{user})(objectClass=posixAccount))'; @@ -20,7 +21,7 @@ $lang['bindpw'] = 'Ehhez tartozó jelszó.'; $lang['userscope'] = 'A keresési tartomány korlátozása erre a felhasználókra való keresésnél'; $lang['groupscope'] = 'A keresési tartomány korlátozása erre a csoportokra való keresésnél'; $lang['groupkey'] = 'Csoport meghatározása a következő attribútumból (az alapértelmezett AD csoporttagság helyett), pl. a szervezeti egység vagy a telefonszám'; -$lang['debug'] = 'Debug-üzenetek megjelenítése?'; +$lang['debug'] = 'Továbi hibakeresési információk megjelenítése hiba esetén'; $lang['deref_o_0'] = 'LDAP_DEREF_NEVER'; $lang['deref_o_1'] = 'LDAP_DEREF_SEARCHING'; $lang['deref_o_2'] = 'LDAP_DEREF_FINDING'; diff --git a/lib/plugins/authmysql/lang/hu/settings.php b/lib/plugins/authmysql/lang/hu/settings.php index 5936203fa..cf7b26bb9 100644 --- a/lib/plugins/authmysql/lang/hu/settings.php +++ b/lib/plugins/authmysql/lang/hu/settings.php @@ -6,8 +6,8 @@ * @author Marton Sebok * @author Marina Vladi */ -$lang['server'] = 'MySQL-szerver'; -$lang['user'] = 'MySQL felhasználónév'; +$lang['server'] = 'MySQL-kiszolgáló'; +$lang['user'] = 'MySQL-felhasználónév'; $lang['password'] = 'Fenti felhasználó jelszava'; $lang['database'] = 'Adatbázis'; $lang['charset'] = 'Az adatbázisban használt karakterkészlet'; diff --git a/lib/plugins/plugin/lang/hu/admin_plugin.txt b/lib/plugins/plugin/lang/hu/admin_plugin.txt new file mode 100644 index 000000000..cf4a3b316 --- /dev/null +++ b/lib/plugins/plugin/lang/hu/admin_plugin.txt @@ -0,0 +1,4 @@ +====== Bővítménykezelő ====== + +Ezen az oldalon a Dokuwiki [[doku>plugins|bővítményeivel]] kapcsolatos teendőket láthatod el. A webkiszolgálónak tudnia kell írni a //plugin// könyvtárba az új bővítmények letöltéséhez és telepítéséhez. + diff --git a/lib/plugins/plugin/lang/hu/lang.php b/lib/plugins/plugin/lang/hu/lang.php new file mode 100644 index 000000000..7fb237a32 --- /dev/null +++ b/lib/plugins/plugin/lang/hu/lang.php @@ -0,0 +1,59 @@ + + * @author Siaynoq Mage + * @author schilling.janos@gmail.com + * @author Szabó Dávid + * @author Sándor TIHANYI + * @author David Szabo + * @author Marton Sebok + * @author Marina Vladi + */ +$lang['menu'] = 'Bővítménykezelő'; +$lang['download'] = 'Új bővítmény letöltése és telepítése'; +$lang['manage'] = 'Telepített bővítmények'; +$lang['btn_info'] = 'infó'; +$lang['btn_update'] = 'frissítés'; +$lang['btn_delete'] = 'törlés'; +$lang['btn_settings'] = 'beállítások'; +$lang['btn_download'] = 'Letöltés'; +$lang['btn_enable'] = 'Mentés'; +$lang['url'] = 'URL-cím'; +$lang['installed'] = 'Telepítve:'; +$lang['lastupdate'] = 'Utolsó frissítés:'; +$lang['source'] = 'Forrás:'; +$lang['unknown'] = 'ismeretlen'; +$lang['updating'] = 'Frissítés...'; +$lang['updated'] = 'A(z) %s bővítmény frissítése sikeres.'; +$lang['updates'] = 'A következő bővítmények frissítése sikeres:'; +$lang['update_none'] = 'Nem találtam újabb verziót.'; +$lang['deleting'] = 'Törlés...'; +$lang['deleted'] = 'A(z) %s bővítményt eltávolítva.'; +$lang['downloading'] = 'Letöltés...'; +$lang['downloaded'] = 'A(z) %s bővítmény telepítése sikeres.'; +$lang['downloads'] = 'A következő bővítmények telepítése sikeres.'; +$lang['download_none'] = 'Nem találtam bővítményt vagy ismeretlen hiba történt a letöltés/telepítés közben.'; +$lang['plugin'] = 'Bővítmény:'; +$lang['components'] = 'Részek'; +$lang['noinfo'] = 'Ez a bővítmény nem tartalmaz információt, lehet, hogy hibás.'; +$lang['name'] = 'Név:'; +$lang['date'] = 'Dátum:'; +$lang['type'] = 'Típus:'; +$lang['desc'] = 'Leírás:'; +$lang['author'] = 'Szerző:'; +$lang['www'] = 'Web:'; +$lang['error'] = 'Ismeretlen hiba lépett fel.'; +$lang['error_download'] = 'Nem tudom letölteni a fájlt a bővítményhez: %s'; +$lang['error_badurl'] = 'Feltehetően rossz URL - nem tudom meghatározni a fájlnevet az URL-ből.'; +$lang['error_dircreate'] = 'Nem tudom létrehozni az átmeneti könyvtárat a letöltéshez.'; +$lang['error_decompress'] = 'A Bővítménykezelő nem tudta a letöltött állományt kicsomagolni. Ennek oka lehet hibás letöltés, ebben az esetben újra letöltéssel próbálkozhatsz, esetleg a tömörítés módja ismeretlen, ebben az esetben kézzel kell letölteni és telepíteni a bővítményt.'; +$lang['error_copy'] = 'Fájl másolási hiba történt a(z) %s bővítmény telepítése közben: vagy a lemezterület fogyott el, vagy az állomány hozzáférési jogosultságai nem megfelelőek. Emiatt előfordulhat, hogy a bővítményt csak részben sikerült telepíteni és a wiki összeomolhat.'; +$lang['error_delete'] = 'Hiba történt a(z) %s bővítmény eltávolítása közben. A legvalószínűbb ok, hogy a könyvtár vagy állomány hozzáférési jogosultságai nem megfelelőek.'; +$lang['enabled'] = 'A(z) %s bővítmény bekapcsolva.'; +$lang['notenabled'] = 'A(z) %s bővítmény engedélyezése nem sikerült. Ellenőrizze a fájlhozzáférési jogosultságokat.'; +$lang['disabled'] = 'A(z) %s bővítmény kikapcsolva.'; +$lang['notdisabled'] = 'A(z) %s bővítmény kikapcsolása nem sikerült. Ellenőrizze a fájlhozzáférési jogosultságokat.'; +$lang['packageinstalled'] = 'A bővítménycsomag(ok) feltelepült(ek): %d plugin(s): %s'; -- cgit v1.2.3 From 0ebbba20d4c1f73eda768945dad1697d44d1a354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schplurtz=20le=20D=C3=A9boulonn=C3=A9?= Date: Sat, 22 Feb 2014 12:53:39 +0100 Subject: translation update --- lib/plugins/extension/lang/fr/intro_install.txt | 1 + lib/plugins/extension/lang/fr/intro_plugins.txt | 1 + lib/plugins/extension/lang/fr/intro_search.txt | 1 + lib/plugins/extension/lang/fr/intro_templates.txt | 1 + lib/plugins/extension/lang/fr/lang.php | 87 +++++++++++++++++++++++ 5 files changed, 91 insertions(+) create mode 100644 lib/plugins/extension/lang/fr/intro_install.txt create mode 100644 lib/plugins/extension/lang/fr/intro_plugins.txt create mode 100644 lib/plugins/extension/lang/fr/intro_search.txt create mode 100644 lib/plugins/extension/lang/fr/intro_templates.txt create mode 100644 lib/plugins/extension/lang/fr/lang.php (limited to 'lib') diff --git a/lib/plugins/extension/lang/fr/intro_install.txt b/lib/plugins/extension/lang/fr/intro_install.txt new file mode 100644 index 000000000..6f68a2606 --- /dev/null +++ b/lib/plugins/extension/lang/fr/intro_install.txt @@ -0,0 +1 @@ +Ici, vous pouvez installer des extensions, greffons et modèles. Soit en les téléversant, soit en indiquant un URL de téléchargement. \ No newline at end of file diff --git a/lib/plugins/extension/lang/fr/intro_plugins.txt b/lib/plugins/extension/lang/fr/intro_plugins.txt new file mode 100644 index 000000000..a40b863d2 --- /dev/null +++ b/lib/plugins/extension/lang/fr/intro_plugins.txt @@ -0,0 +1 @@ +Voilà la liste des extensions actuellement installées. À partir d'ici, vous pouvez les activer, les désactiver ou même les désinstaller complètement. Cette page affiche également les mises à jour. Assurez vous de lire la documentation avant de faire la mise à jour. \ No newline at end of file diff --git a/lib/plugins/extension/lang/fr/intro_search.txt b/lib/plugins/extension/lang/fr/intro_search.txt new file mode 100644 index 000000000..418e35972 --- /dev/null +++ b/lib/plugins/extension/lang/fr/intro_search.txt @@ -0,0 +1 @@ +Cet onglet vous donne accès à toutes les extensions de tierces parties. Restez conscients qu'installer du code de tierce partie peut poser un problème de **sécurité**. Vous voudrez peut-être au préalable lire l'article sur la [[doku>fr:security##securite_des_plugins|sécurité des plugins]]. \ No newline at end of file diff --git a/lib/plugins/extension/lang/fr/intro_templates.txt b/lib/plugins/extension/lang/fr/intro_templates.txt new file mode 100644 index 000000000..fefdb5538 --- /dev/null +++ b/lib/plugins/extension/lang/fr/intro_templates.txt @@ -0,0 +1 @@ +Voici la liste des modèles actuellement installés. Le [[?do=admin&page=config|gestionnaire de configuration]] vous permet de choisir le modèle à utiliser. \ No newline at end of file diff --git a/lib/plugins/extension/lang/fr/lang.php b/lib/plugins/extension/lang/fr/lang.php new file mode 100644 index 000000000..c2dae0fc9 --- /dev/null +++ b/lib/plugins/extension/lang/fr/lang.php @@ -0,0 +1,87 @@ + + */ +$lang['menu'] = 'Gestionnaire d\'extension'; +$lang['tab_plugins'] = 'Greffons installés'; +$lang['tab_templates'] = 'Modèles installés'; +$lang['tab_search'] = 'Rechercher et installer'; +$lang['tab_install'] = 'Installation manuelle'; +$lang['notimplemented'] = 'Cette fonctionnalité n\'est pas encore installée'; +$lang['notinstalled'] = 'Cette extension n\'est pas installée'; +$lang['alreadyenabled'] = 'Cette extension a déjà été installée'; +$lang['alreadydisabled'] = 'Cette extension a déjà été désactivée'; +$lang['pluginlistsaveerror'] = 'Une erreur s\'est produite lors de l\'enregistrement de la liste des greffons.'; +$lang['unknownauthor'] = 'Auteur inconnu'; +$lang['unknownversion'] = 'Version inconnue'; +$lang['btn_info'] = 'Montrer plus d\'informations'; +$lang['btn_update'] = 'Mettre à jour'; +$lang['btn_uninstall'] = 'Désinstaller'; +$lang['btn_enable'] = 'Activer'; +$lang['btn_disable'] = 'Désactiver'; +$lang['btn_install'] = 'Installer'; +$lang['btn_reinstall'] = 'Réinstaller'; +$lang['js']['reallydel'] = 'Vraiment désinstaller cette extension'; +$lang['search_for'] = 'Rechercher l\'extension :'; +$lang['search'] = 'Chercher'; +$lang['extensionby'] = '%s de %s'; +$lang['screenshot'] = 'Aperçu de %s'; +$lang['popularity'] = 'Popularité : %s%%'; +$lang['homepage_link'] = 'Documents'; +$lang['bugs_features'] = 'Bugs'; +$lang['tags'] = 'Étiquettes :'; +$lang['author_hint'] = 'Chercher les extensions de cet auteur'; +$lang['installed'] = 'Installés :'; +$lang['downloadurl'] = 'URL de téléchargement :'; +$lang['repository'] = 'Entrepôt : '; +$lang['unknown'] = 'inconnu'; +$lang['installed_version'] = 'Version installée :'; +$lang['install_date'] = 'Votre dernière mise à jour :'; +$lang['available_version'] = 'Version disponible :'; +$lang['compatible'] = 'Compatible avec :'; +$lang['depends'] = 'Dépend de :'; +$lang['similar'] = 'Similaire à :'; +$lang['conflicts'] = 'En conflit avec :'; +$lang['donate'] = 'Vous aimez ?'; +$lang['donate_action'] = 'Payer un café à l\'auteur !'; +$lang['repo_retry'] = 'Réessayer'; +$lang['provides'] = 'Fournit :'; +$lang['status'] = 'État :'; +$lang['status_installed'] = 'installé'; +$lang['status_not_installed'] = 'non installé'; +$lang['status_protected'] = 'protégé'; +$lang['status_enabled'] = 'activé'; +$lang['status_disabled'] = 'désactivé'; +$lang['status_unmodifiable'] = 'non modifiable'; +$lang['status_plugin'] = 'greffon'; +$lang['status_template'] = 'modèle'; +$lang['status_bundled'] = 'fourni'; +$lang['msg_enabled'] = 'Greffon %s activé'; +$lang['msg_disabled'] = 'Greffon %s désactivé'; +$lang['msg_delete_success'] = 'Extension désinstallée'; +$lang['msg_template_install_success'] = 'Modèle %s installée avec succès'; +$lang['msg_template_update_success'] = 'Modèle %s mis à jour avec succès'; +$lang['msg_plugin_install_success'] = 'Greffon %s installé avec succès'; +$lang['msg_plugin_update_success'] = 'Greffon %s mis à jour avec succès'; +$lang['msg_upload_failed'] = 'Téléversement échoué'; +$lang['missing_dependency'] = 'Dépendance absente ou désactivée : %s'; +$lang['security_issue'] = 'Problème de sécurité : %s'; +$lang['security_warning'] = 'Avertissement deSécurité : %s'; +$lang['update_available'] = 'Mise à jour : La version %s est disponible.'; +$lang['wrong_folder'] = 'Greffon installé incorrectement : Renomer le dossier du greffon "%s" en "%s".'; +$lang['url_change'] = 'URL modifié : L\'URL de téléchargement a changé depuis le dernier téléchargement. Vérifiez si l\'URL est valide avant de mettre à jour l\'extension.
Nouvel URL : %s
Ancien : %s'; +$lang['error_badurl'] = 'Les URL doivent commencer par http ou https'; +$lang['error_dircreate'] = 'Impossible de créer le dossier temporaire pour le téléchargement.'; +$lang['error_download'] = 'Impossible de télécharger le fichier : %s'; +$lang['error_decompress'] = 'Impossible de décompresser le fichier téléchargé. C\'est peut être le résultat d\'une erreur de téléchargement, auquel cas vous devriez réessayer. Le format de compression est peut-être inconnu. Dans ce cas il vous faudra procéder à une installation manuelle.'; +$lang['error_findfolder'] = 'Impossible d\'idnetifier le dossier de l\'extension. vous devez procéder à une installation manuelle.'; +$lang['error_copy'] = 'Une erreur de copie de fichier s\'est produite lors de l\'installation des fichiers dans le dossier %s. Il se peut que le disque soit plein, ou que les permissions d\'accès aux fichiers soient incorrectes. Il est possible que le greffon soit partiellement installé et que cela laisse votre installation de DoluWiki instable.'; +$lang['noperms'] = 'Impossible d\'écrire dans le dossier des extensions.'; +$lang['notplperms'] = 'Impossible d\'écrire dans le dossier des modèles.'; +$lang['nopluginperms'] = 'Impossible d\'écrire dans le dossier des greffons.'; +$lang['git'] = 'Cette extension a été installé via git, vous voudrez peut-être ne pas la mettre à jour ici.'; +$lang['install_url'] = 'Installez depuis l\'URL :'; +$lang['install_upload'] = 'Téléversez l\'extension :'; -- cgit v1.2.3 From 46b189b552d813ab47a67d597ee4ef621f34b8a5 Mon Sep 17 00:00:00 2001 From: Robert Bogenschneider Date: Sun, 23 Feb 2014 08:21:01 +0100 Subject: translation update --- lib/plugins/extension/lang/eo/intro_install.txt | 1 + lib/plugins/extension/lang/eo/intro_plugins.txt | 1 + lib/plugins/extension/lang/eo/intro_search.txt | 1 + lib/plugins/extension/lang/eo/intro_templates.txt | 1 + lib/plugins/extension/lang/eo/lang.php | 87 +++++++++++++++++++++++ 5 files changed, 91 insertions(+) create mode 100644 lib/plugins/extension/lang/eo/intro_install.txt create mode 100644 lib/plugins/extension/lang/eo/intro_plugins.txt create mode 100644 lib/plugins/extension/lang/eo/intro_search.txt create mode 100644 lib/plugins/extension/lang/eo/intro_templates.txt create mode 100644 lib/plugins/extension/lang/eo/lang.php (limited to 'lib') diff --git a/lib/plugins/extension/lang/eo/intro_install.txt b/lib/plugins/extension/lang/eo/intro_install.txt new file mode 100644 index 000000000..d9c63da1d --- /dev/null +++ b/lib/plugins/extension/lang/eo/intro_install.txt @@ -0,0 +1 @@ +Tie vi povas permane instali kromaĵojn kaj ŝablonojn tra alŝuto aŭ indiko de URL por rekta elŝuto. \ No newline at end of file diff --git a/lib/plugins/extension/lang/eo/intro_plugins.txt b/lib/plugins/extension/lang/eo/intro_plugins.txt new file mode 100644 index 000000000..cc7ae6628 --- /dev/null +++ b/lib/plugins/extension/lang/eo/intro_plugins.txt @@ -0,0 +1 @@ +Jenaj kromaĵoj momente estas instalitaj en via DokuWiki. Vi povas ebligi, malebligi aŭ eĉ tute malinstali ilin tie. Ankaŭ montriĝos aktualigoj de kromaĵoj -- certiĝu, ke vi legis la dokumentadon de la kromaĵo antaŭ aktualigo. \ No newline at end of file diff --git a/lib/plugins/extension/lang/eo/intro_search.txt b/lib/plugins/extension/lang/eo/intro_search.txt new file mode 100644 index 000000000..5d194948c --- /dev/null +++ b/lib/plugins/extension/lang/eo/intro_search.txt @@ -0,0 +1 @@ +Tiu tabelo donas aliron al ĉiuj haveblaj eksteraj kromaĵoj kaj ŝablonoj por DokuWiki. Bonvolu konscii, ke instali eksteran kodaĵon povas enkonduki **sekurecriskon**, prefere legu antaŭe pri [[doku>security#plugin_security|sekureco de kromaĵo]]. \ No newline at end of file diff --git a/lib/plugins/extension/lang/eo/intro_templates.txt b/lib/plugins/extension/lang/eo/intro_templates.txt new file mode 100644 index 000000000..6dc0ef671 --- /dev/null +++ b/lib/plugins/extension/lang/eo/intro_templates.txt @@ -0,0 +1 @@ +Jenaj ŝablonoj momente instaliĝis en via DokuWiki. Elektu la ŝablonon por uzi en la [[?do=admin&page=config|Opcia administrilo]]. \ No newline at end of file diff --git a/lib/plugins/extension/lang/eo/lang.php b/lib/plugins/extension/lang/eo/lang.php new file mode 100644 index 000000000..6ce840be8 --- /dev/null +++ b/lib/plugins/extension/lang/eo/lang.php @@ -0,0 +1,87 @@ + + */ +$lang['menu'] = 'Aldonaĵa administrado'; +$lang['tab_plugins'] = 'Instalitaj kromaĵoj'; +$lang['tab_templates'] = 'Instalitaj ŝablonoj'; +$lang['tab_search'] = 'Serĉi kaj instali'; +$lang['tab_install'] = 'Permana instalado'; +$lang['notimplemented'] = 'Tiu funkcio ankoraŭ ne realiĝis'; +$lang['notinstalled'] = 'Tiu aldonaĵo ne estas instalita'; +$lang['alreadyenabled'] = 'Tiu aldonaĵo jam ebliĝis'; +$lang['alreadydisabled'] = 'Tiu aldonaĵo jam malebliĝis'; +$lang['pluginlistsaveerror'] = 'Okazis eraro dum la kromaĵlisto konserviĝis'; +$lang['unknownauthor'] = 'Nekonata aŭtoro'; +$lang['unknownversion'] = 'Nekonata versio'; +$lang['btn_info'] = 'Montri pliajn informojn'; +$lang['btn_update'] = 'Aktualigi'; +$lang['btn_uninstall'] = 'Malinstali'; +$lang['btn_enable'] = 'Ebligi'; +$lang['btn_disable'] = 'Malebligi'; +$lang['btn_install'] = 'Instali'; +$lang['btn_reinstall'] = 'Re-instali'; +$lang['js']['reallydel'] = 'Ĉu vere malinstali la aldonaĵon?'; +$lang['search_for'] = 'Serĉi la aldonaĵon:'; +$lang['search'] = 'Serĉi'; +$lang['extensionby'] = '%s fare de %s'; +$lang['screenshot'] = 'Ekrankopio de %s'; +$lang['popularity'] = 'Populareco: %s%%'; +$lang['homepage_link'] = 'Dokumentoj'; +$lang['bugs_features'] = 'Cimoj'; +$lang['tags'] = 'Etikedoj:'; +$lang['author_hint'] = 'Serĉi aldonaĵojn laŭ tiu aŭtoro:'; +$lang['installed'] = 'Instalitaj:'; +$lang['downloadurl'] = 'URL por elŝuti:'; +$lang['repository'] = 'Kodbranĉo:'; +$lang['unknown'] = 'nekonata'; +$lang['installed_version'] = 'Instalita versio:'; +$lang['install_date'] = 'Via lasta aktualigo:'; +$lang['available_version'] = 'Havebla versio:'; +$lang['compatible'] = 'Kompatibla kun:'; +$lang['depends'] = 'Dependas de:'; +$lang['similar'] = 'Simila al:'; +$lang['conflicts'] = 'Konfliktas kun:'; +$lang['donate'] = 'Ĉu vi ŝatas tion?'; +$lang['donate_action'] = 'Aĉetu kafon al la aŭtoro!'; +$lang['repo_retry'] = 'Reprovi'; +$lang['provides'] = 'Provizas per:'; +$lang['status'] = 'Statuso:'; +$lang['status_installed'] = 'instalita'; +$lang['status_not_installed'] = 'ne instalita'; +$lang['status_protected'] = 'protektita'; +$lang['status_enabled'] = 'ebligita'; +$lang['status_disabled'] = 'malebligita'; +$lang['status_unmodifiable'] = 'neŝanĝebla'; +$lang['status_plugin'] = 'kromaĵo'; +$lang['status_template'] = 'ŝablono'; +$lang['status_bundled'] = 'kunliverita'; +$lang['msg_enabled'] = 'Kromaĵo %s ebligita'; +$lang['msg_disabled'] = 'Kromaĵo %s malebligita'; +$lang['msg_delete_success'] = 'Aldonaĵo malinstaliĝis'; +$lang['msg_template_install_success'] = 'Ŝablono %s sukcese instaliĝis'; +$lang['msg_template_update_success'] = 'Ŝablono %s sukcese aktualiĝis'; +$lang['msg_plugin_install_success'] = 'Kromaĵo %s sukcese instaliĝis'; +$lang['msg_plugin_update_success'] = 'Kromaĵo %s sukcese aktualiĝis'; +$lang['msg_upload_failed'] = 'Ne eblis alŝuti la dosieron'; +$lang['missing_dependency'] = 'Mankanta aŭ malebligita dependeco: %s'; +$lang['security_issue'] = 'Sekureca problemo: %s'; +$lang['security_warning'] = 'Sekureca averto: %s'; +$lang['update_available'] = 'Aktualigo: Nova versio %s haveblas.'; +$lang['wrong_folder'] = 'Kromaĵo instalita malĝuste: Renomu la kromaĵdosierujon "%s" al "%s".'; +$lang['url_change'] = 'URL ŝanĝita: La elŝuta URL ŝanĝiĝis ekde la lasta elŝuto. Kontrolu, ĉu la nova URL validas antaŭ aktualigi aldonaĵon.
Nova: %s
Malnova: %s'; +$lang['error_badurl'] = 'URLoj komenciĝu per http aŭ https'; +$lang['error_dircreate'] = 'Ne eblis krei portempan dosierujon por akcepti la elŝuton'; +$lang['error_download'] = 'Ne eblis elŝuti la dosieron: %s'; +$lang['error_decompress'] = 'Ne eblis malpaki la elŝutitan dosieron. Kialo povus esti fuŝa elŝuto, kaj vi reprovu; aŭ la pakiga formato estas nekonata, kaj vi devas elŝuti kaj instali permane.'; +$lang['error_findfolder'] = 'Ne eblis rekoni la aldonaĵ-dosierujon, vi devas elŝuti kaj instali permane'; +$lang['error_copy'] = 'Okazis kopiad-eraro dum la provo instali dosierojn por la dosierujo %s: la disko povus esti plena aŭ la alirpermesoj por dosieroj malĝustaj. Rezulto eble estas nur parte instalita kromaĵo, kiu malstabiligas vian vikion'; +$lang['noperms'] = 'La aldonaĵ-dosierujo ne estas skribebla'; +$lang['notplperms'] = 'La ŝablon-dosierujo ne estas skribebla'; +$lang['nopluginperms'] = 'La kromaĵ-dosierujo ne estas skribebla'; +$lang['git'] = 'Tiu aldonaĵo estis instalita pere de git, eble vi ne aktualigu ĝin ĉi tie.'; +$lang['install_url'] = 'Instali de URL:'; +$lang['install_upload'] = 'Alŝuti aldonaĵon:'; -- cgit v1.2.3 From 0b1e5003aae587074526c6b2ef19cb84670195e8 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 23 Feb 2014 21:20:39 +0000 Subject: made search form styles independent from sitetools ID --- lib/tpl/dokuwiki/css/design.less | 64 ++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index 42292de49..b18daaad7 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -186,50 +186,50 @@ text-align: right; form.search { - display: block; font-size: 0.875em; - position: relative; + } +} - input.edit { - width: 18em; - padding: .35em 22px .35em .1em; - } +[dir=rtl] #dokuwiki__sitetools { + text-align: left; +} - 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; - } +form.search { + display: block; + position: relative; + margin-bottom: 0.5em; + + input.edit { + width: 18em; + padding: .35em 22px .35em .1em; } - ul { - margin-top: 0.5em; + 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; } } -[dir=rtl] #dokuwiki__sitetools { - text-align: left; - - form.search { - input.edit { - padding: .35em .1em .35em 22px; - } +[dir=rtl] form.search { + input.edit { + padding: .35em .1em .35em 22px; + } - input.button { - background-position: 5px 0; - margin-left: 0; - margin-right: -20px; - position: relative; - } + input.button { + background-position: 5px 0; + margin-left: 0; + margin-right: -20px; + position: relative; } } -#IE7 #dokuwiki__sitetools form.search { +#IE7 form.search { min-height: 1px; z-index: 21; } -- cgit v1.2.3 From 1e94c175409c39f190b7da3a1941230f3758513c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 23 Feb 2014 21:38:28 +0000 Subject: made sidebar content styles re-usable outside of ID (added class: aside) --- lib/tpl/dokuwiki/css/content.less | 22 +++++++++++----------- lib/tpl/dokuwiki/css/design.less | 15 ++++++--------- lib/tpl/dokuwiki/main.php | 2 +- 3 files changed, 18 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less index a5ffbf2be..a2e343a33 100644 --- a/lib/tpl/dokuwiki/css/content.less +++ b/lib/tpl/dokuwiki/css/content.less @@ -67,19 +67,19 @@ /*____________ lists ____________*/ -#dokuwiki__content ul li, -#dokuwiki__aside ul li { - color: @ini_text_alt; -} +.dokuwiki .page, +.dokuwiki .aside { + ul li { + color: @ini_text_alt; + } -#dokuwiki__content ol li, -#dokuwiki__aside ol li { - color: @ini_text_neu; -} + ol li { + color: @ini_text_neu; + } -#dokuwiki__content li .li, -#dokuwiki__aside li .li { - color: @ini_text; + li .li { + color: @ini_text; + } } /*____________ tables ____________*/ diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index b18daaad7..46b4a045b 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -278,13 +278,10 @@ form.search { /* sidebar ********************************************************************/ -#dokuwiki__aside { - - > .pad { - font-size: 0.875em; - overflow: hidden; - word-wrap: break-word; - } +.dokuwiki .aside { + font-size: 0.875em; + overflow: hidden; + word-wrap: break-word; /* make sidebar more condensed */ @@ -340,8 +337,8 @@ form.search { } } -[dir=rtl] #dokuwiki__aside ul, -[dir=rtl] #dokuwiki__aside ol { +[dir=rtl] .dokuwiki .aside ul, +[dir=rtl] .dokuwiki .aside ol { padding-right: .5em; } diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 3bc46406a..44fef81eb 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -36,7 +36,7 @@ $showSidebar = $hasSidebar && ($ACT=='show'); -
+

-- cgit v1.2.3 From 4d51938bb0516f7cc033d8c93131f56af7525da0 Mon Sep 17 00:00:00 2001 From: Rene Date: Sun, 23 Feb 2014 22:56:02 +0100 Subject: translation update --- lib/plugins/extension/lang/nl/intro_install.txt | 1 + lib/plugins/extension/lang/nl/intro_plugins.txt | 1 + lib/plugins/extension/lang/nl/intro_search.txt | 1 + lib/plugins/extension/lang/nl/intro_templates.txt | 1 + lib/plugins/extension/lang/nl/lang.php | 33 +++++++++++++++++++++++ 5 files changed, 37 insertions(+) create mode 100644 lib/plugins/extension/lang/nl/intro_install.txt create mode 100644 lib/plugins/extension/lang/nl/intro_plugins.txt create mode 100644 lib/plugins/extension/lang/nl/intro_search.txt create mode 100644 lib/plugins/extension/lang/nl/intro_templates.txt create mode 100644 lib/plugins/extension/lang/nl/lang.php (limited to 'lib') diff --git a/lib/plugins/extension/lang/nl/intro_install.txt b/lib/plugins/extension/lang/nl/intro_install.txt new file mode 100644 index 000000000..6a0b41055 --- /dev/null +++ b/lib/plugins/extension/lang/nl/intro_install.txt @@ -0,0 +1 @@ +Hier kunt u handmatig plugins en templates installeren door deze te uploaden of door een directe download URL op te geven. \ No newline at end of file diff --git a/lib/plugins/extension/lang/nl/intro_plugins.txt b/lib/plugins/extension/lang/nl/intro_plugins.txt new file mode 100644 index 000000000..0077aca30 --- /dev/null +++ b/lib/plugins/extension/lang/nl/intro_plugins.txt @@ -0,0 +1 @@ +Dit zijn de momenteel in uw Dokuwiki geïnstalleerde plugins. U kunt deze hier aan of uitschakelen danwel geheel deïnstalleren. Plugin updates zijn hier ook opgenomen, lees de pluin documentatie voordat u update. \ No newline at end of file diff --git a/lib/plugins/extension/lang/nl/intro_search.txt b/lib/plugins/extension/lang/nl/intro_search.txt new file mode 100644 index 000000000..8fc3900ad --- /dev/null +++ b/lib/plugins/extension/lang/nl/intro_search.txt @@ -0,0 +1 @@ +Deze tab verschaft u toegang tot alle plugins en templates vervaardigd door derden en bestemd voor Dokuwiki. Houdt er rekening meel dat indien u Plugins van derden installeerd deze een **veiligheids risico ** kunnen bevatten, geadviseerd wordt om eerst te lezen [[doku>security#plugin_security|plugin security]]. \ No newline at end of file diff --git a/lib/plugins/extension/lang/nl/intro_templates.txt b/lib/plugins/extension/lang/nl/intro_templates.txt new file mode 100644 index 000000000..5ef23dadf --- /dev/null +++ b/lib/plugins/extension/lang/nl/intro_templates.txt @@ -0,0 +1 @@ +Deze templates zijn thans in DokuWiki geïnstalleerd. U kent een template selecteren middels [[?do=admin&page=config|Configuration Manager]] . \ No newline at end of file diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php new file mode 100644 index 000000000..1aad6a531 --- /dev/null +++ b/lib/plugins/extension/lang/nl/lang.php @@ -0,0 +1,33 @@ + + */ +$lang['menu'] = 'Extension Manager (Uitbreidings Beheerder)'; +$lang['tab_plugins'] = 'Geïnstalleerde Plugins'; +$lang['tab_templates'] = 'Geïnstalleerde Templates'; +$lang['tab_search'] = 'Zoek en installeer'; +$lang['tab_install'] = 'Handmatige installatie'; +$lang['notimplemented'] = 'Deze toepassing is nog niet geïnstalleerd'; +$lang['notinstalled'] = 'Deze uitbreiding is nog niet geïnstalleerd'; +$lang['alreadyenabled'] = 'Deze uitbreiding is reeds ingeschakeld'; +$lang['alreadydisabled'] = 'Deze uitbreiding is reeds uitgeschakeld'; +$lang['pluginlistsaveerror'] = 'Fout bij het opslaan van de plugin lijst'; +$lang['unknownauthor'] = 'Onbekende auteur'; +$lang['unknownversion'] = 'Onbekende versie'; +$lang['btn_info'] = 'Toon meer informatie'; +$lang['btn_update'] = 'Update'; +$lang['btn_uninstall'] = 'Deinstalleer'; +$lang['btn_enable'] = 'Schakel aan'; +$lang['btn_disable'] = 'Schakel uit'; +$lang['btn_install'] = 'Installeer'; +$lang['btn_reinstall'] = 'Her-installeer'; +$lang['js']['reallydel'] = 'Wilt u deze uitbreiding deinstalleren ?'; +$lang['search_for'] = 'Zoek Uitbreiding:'; +$lang['search'] = 'Zoek'; +$lang['extensionby'] = '%s by %s'; +$lang['screenshot'] = 'Schermafdruk bij %s'; +$lang['popularity'] = 'Populariteit:%s%%'; +$lang['homepage_link'] = 'Dokumenten'; -- cgit v1.2.3 From 370fac6347ec430cd72e724f45431a294b4f6662 Mon Sep 17 00:00:00 2001 From: Rene Date: Sun, 23 Feb 2014 23:15:57 +0100 Subject: translation update --- lib/plugins/extension/lang/nl/lang.php | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 lib/plugins/extension/lang/nl/lang.php (limited to 'lib') diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php new file mode 100644 index 000000000..67b99c54d --- /dev/null +++ b/lib/plugins/extension/lang/nl/lang.php @@ -0,0 +1,37 @@ + + */ +$lang['bugs_features'] = 'Bugs'; +$lang['tags'] = 'Tags:'; +$lang['author_hint'] = 'Zoek uitbreidingen van deze auteur:'; +$lang['installed'] = 'Geinstalleerd:'; +$lang['downloadurl'] = 'Download URL:'; +$lang['repository'] = 'Repository ( centrale opslag)'; +$lang['unknown'] = 'onbekend'; +$lang['installed_version'] = 'Geïnstalleerde versie'; +$lang['install_date'] = 'Uw laatste update :'; +$lang['available_version'] = 'Beschikbare versie:'; +$lang['compatible'] = 'Compatible met :'; +$lang['depends'] = 'Afhankelijk van :'; +$lang['similar'] = 'Soortgelijk :'; +$lang['conflicts'] = 'Conflicteerd met :'; +$lang['donate'] = 'Vindt u dit leuk ?'; +$lang['donate_action'] = 'Koop een kop koffie voor de auteur!'; +$lang['repo_retry'] = 'Herhaal'; +$lang['provides'] = 'Zorgt voor:'; +$lang['status'] = 'Status:'; +$lang['status_installed'] = 'Geïnstalleerd'; +$lang['status_not_installed'] = 'niet geïnstalleerd '; +$lang['status_protected'] = 'beschermd'; +$lang['status_enabled'] = 'ingeschakeld'; +$lang['status_disabled'] = 'uitgeschakeld'; +$lang['status_unmodifiable'] = 'Niet wijzigbaar'; +$lang['status_plugin'] = 'plugin'; +$lang['status_template'] = 'template'; +$lang['status_bundled'] = 'Gebundeld'; +$lang['msg_enabled'] = 'Plugin %s ingeschakeld'; +$lang['msg_disabled'] = 'Plugin %s uitgeschakeld'; -- cgit v1.2.3 From 4292840ce374036541a92449670ed9ae83a3c64d Mon Sep 17 00:00:00 2001 From: Rene Date: Mon, 24 Feb 2014 07:30:58 +0100 Subject: translation update --- lib/plugins/extension/lang/nl/lang.php | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 lib/plugins/extension/lang/nl/lang.php (limited to 'lib') diff --git a/lib/plugins/extension/lang/nl/lang.php b/lib/plugins/extension/lang/nl/lang.php new file mode 100644 index 000000000..2d2b3d25b --- /dev/null +++ b/lib/plugins/extension/lang/nl/lang.php @@ -0,0 +1,31 @@ + + */ +$lang['msg_delete_success'] = 'Uitbreiding gedeinstalleerd'; +$lang['msg_template_install_success'] = 'Template %s werd succesvol geïnstalleerd'; +$lang['msg_template_update_success'] = 'Template %s werd succesvol ge-update'; +$lang['msg_plugin_install_success'] = 'Plugin %s werd succesvol geïnstalleerd'; +$lang['msg_plugin_update_success'] = 'Plugin %s werd succesvol ge-update'; +$lang['msg_upload_failed'] = 'Uploaden van het bestand is mislukt'; +$lang['missing_dependency'] = 'niet aanwezige of uitgeschakelde afhankelijkheid %s'; +$lang['security_issue'] = 'Veiligheids kwestie: %s'; +$lang['security_warning'] = 'Veiligheids Waarschuwing %s'; +$lang['update_available'] = 'Update: Nieuwe versie %s is beschikbaar.'; +$lang['wrong_folder'] = 'Plugin onjuist geïnstalleerd: Hernoem de plugin directory van "%s" naar"%s"'; +$lang['url_change'] = 'URL gewijzigd: Download URL is gewijzigd sinds de laatste download. Controleer of de nieuwe URL juist is voordat u de uitbreiding update.
Nieuw:%s
Vorig: %s'; +$lang['error_badurl'] = 'URLs moeten beginnen met http of https'; +$lang['error_dircreate'] = 'De tijdelijke map kon niet worden gemaakt om de download te ontvangen'; +$lang['error_download'] = 'Het is niet mogelijk het bestand te downloaden: %s'; +$lang['error_decompress'] = 'Onmogelijk om het gedownloade bestand uit te pakken. Dit is wellicht het gevolg van een onvolledige/onjuiste download, in welk geval u het nog eens moet proberen; of het compressie formaat is onbekend in welk geval u het bestand handmatig moet downloaden en installeren.'; +$lang['error_findfolder'] = 'Onmogelijk om de uitbreidings directory te vinden, u moet het zelf downloaden en installeren'; +$lang['error_copy'] = 'Er was een bestand kopieer fout tijdens het installeren van bestanden in directory %s: de schijf kan vol zijn of de bestand toegangs rechten kunnen onjuist zijn. Dit kan tot gevolg hebben dat de plugin slechts gedeeltelijk werd geïnstalleerd waardoor uw wiki installatie onstabiel is '; +$lang['noperms'] = 'Uitbreidings directory is niet schrijfbaar'; +$lang['notplperms'] = 'Template directory is niet schrijfbaar'; +$lang['nopluginperms'] = 'Plugin directory is niet schrijfbaar'; +$lang['git'] = 'De uitbreiding werd geïnstalleerd via git, u wilt deze hier wellicht niet aanpassen.'; +$lang['install_url'] = 'Installeer vanaf URL:'; +$lang['install_upload'] = 'Upload Uitbreiding:'; -- cgit v1.2.3 From 9ea5b41c02991d1562aeed7142b3080f6970f417 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 25 Feb 2014 00:51:23 +0000 Subject: removed language files for removed plugin plugin --- lib/plugins/plugin/lang/cs/admin_plugin.txt | 3 -- lib/plugins/plugin/lang/cs/lang.php | 66 --------------------------- lib/plugins/plugin/lang/el/admin_plugin.txt | 5 --- lib/plugins/plugin/lang/el/lang.php | 58 ------------------------ lib/plugins/plugin/lang/fr/admin_plugin.txt | 4 -- lib/plugins/plugin/lang/fr/lang.php | 69 ----------------------------- lib/plugins/plugin/lang/hu/admin_plugin.txt | 4 -- lib/plugins/plugin/lang/hu/lang.php | 59 ------------------------ lib/plugins/plugin/lang/id/lang.php | 32 ------------- lib/plugins/plugin/lang/pl/admin_plugin.txt | 5 --- lib/plugins/plugin/lang/pl/lang.php | 63 -------------------------- lib/plugins/plugin/lang/sk/admin_plugin.txt | 4 -- lib/plugins/plugin/lang/sk/lang.php | 55 ----------------------- lib/plugins/plugin/lang/sl/admin_plugin.txt | 3 -- lib/plugins/plugin/lang/sl/lang.php | 55 ----------------------- lib/plugins/plugin/lang/tr/admin_plugin.txt | 3 -- lib/plugins/plugin/lang/tr/lang.php | 55 ----------------------- 17 files changed, 543 deletions(-) delete mode 100644 lib/plugins/plugin/lang/cs/admin_plugin.txt delete mode 100644 lib/plugins/plugin/lang/cs/lang.php delete mode 100644 lib/plugins/plugin/lang/el/admin_plugin.txt delete mode 100644 lib/plugins/plugin/lang/el/lang.php delete mode 100644 lib/plugins/plugin/lang/fr/admin_plugin.txt delete mode 100644 lib/plugins/plugin/lang/fr/lang.php delete mode 100644 lib/plugins/plugin/lang/hu/admin_plugin.txt delete mode 100644 lib/plugins/plugin/lang/hu/lang.php delete mode 100644 lib/plugins/plugin/lang/id/lang.php delete mode 100644 lib/plugins/plugin/lang/pl/admin_plugin.txt delete mode 100644 lib/plugins/plugin/lang/pl/lang.php delete mode 100644 lib/plugins/plugin/lang/sk/admin_plugin.txt delete mode 100644 lib/plugins/plugin/lang/sk/lang.php delete mode 100644 lib/plugins/plugin/lang/sl/admin_plugin.txt delete mode 100644 lib/plugins/plugin/lang/sl/lang.php delete mode 100644 lib/plugins/plugin/lang/tr/admin_plugin.txt delete mode 100644 lib/plugins/plugin/lang/tr/lang.php (limited to 'lib') diff --git a/lib/plugins/plugin/lang/cs/admin_plugin.txt b/lib/plugins/plugin/lang/cs/admin_plugin.txt deleted file mode 100644 index 6ebf1e78f..000000000 --- a/lib/plugins/plugin/lang/cs/admin_plugin.txt +++ /dev/null @@ -1,3 +0,0 @@ -====== Správa pluginů ====== - -Na této stránce lze spravovat pluginy DokuWiki [[doku>plugins|plugins]]. Aby bylo možné stahovat a instalovat pluginy, musí mít webový server přístup pro zápis do adresáře //plugin//. diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php deleted file mode 100644 index 8917f8ef6..000000000 --- a/lib/plugins/plugin/lang/cs/lang.php +++ /dev/null @@ -1,66 +0,0 @@ - - * @author Zbynek Krivka - * @author Bohumir Zamecnik - * @author tomas@valenta.cz - * @author Marek Sacha - * @author Lefty - * @author Vojta Beran - * @author zbynek.krivka@seznam.cz - * @author Bohumir Zamecnik - * @author Jakub A. Těšínský (j@kub.cz) - * @author mkucera66@seznam.cz - * @author Zbyněk Křivka - * @author Gerrit Uitslag - * @author Petr Klíma - */ -$lang['menu'] = 'Správa pluginů'; -$lang['download'] = 'Stáhnout a instalovat plugin'; -$lang['manage'] = 'Seznam instalovaných pluginů'; -$lang['btn_info'] = 'info'; -$lang['btn_update'] = 'aktualizovat'; -$lang['btn_delete'] = 'smazat'; -$lang['btn_settings'] = 'nastavení'; -$lang['btn_download'] = 'Stáhnout'; -$lang['btn_enable'] = 'Uložit'; -$lang['url'] = 'URL'; -$lang['installed'] = 'Instalován:'; -$lang['lastupdate'] = 'Poslední aktualizace:'; -$lang['source'] = 'Zdroj:'; -$lang['unknown'] = 'neznámý'; -$lang['updating'] = 'Aktualizuji ...'; -$lang['updated'] = 'Modul %s úspěšně aktualizován'; -$lang['updates'] = 'Následující pluginy byly úspěšně aktualizovány'; -$lang['update_none'] = 'Žádné aktualizace nenalezeny.'; -$lang['deleting'] = 'Probíhá mazání ...'; -$lang['deleted'] = 'Plugin %s smazán.'; -$lang['downloading'] = 'Stahuji ...'; -$lang['downloaded'] = 'Plugin %s nainstalován'; -$lang['downloads'] = 'Následující pluginy byly úspěšně instalovány:'; -$lang['download_none'] = 'Žádné pluginy nebyly nenalezeny, nebo se vyskytla nějaká chyba při -stahování a instalaci.'; -$lang['plugin'] = 'Plugin:'; -$lang['components'] = 'Součásti'; -$lang['noinfo'] = 'Plugin nevrátil žádné informace. Může být poškozen nebo špatný.'; -$lang['name'] = 'Jméno:'; -$lang['date'] = 'Datum:'; -$lang['type'] = 'Typ:'; -$lang['desc'] = 'Popis:'; -$lang['author'] = 'Autor:'; -$lang['www'] = 'Web:'; -$lang['error'] = 'Nastala neznámá chyba.'; -$lang['error_download'] = 'Nelze stáhnout soubor s pluginem: %s'; -$lang['error_badurl'] = 'URL je zřejmě chybná - nelze z ní určit název souboru'; -$lang['error_dircreate'] = 'Nelze vytvořit dočasný adresář ke stažení dat'; -$lang['error_decompress'] = 'Správce pluginů nemůže rozbalit stažený soubor. Toto může být způsobeno chybou při stahování. Můžete se pokusit stahování opakovat. Chyba může být také v kompresním formátu souboru. V tom případě bude nutné stáhnout a nainstalovat plugin ručně.'; -$lang['error_copy'] = 'Došlo k chybě při instalaci pluginu %s. Je možné, že na disku není volné místo, nebo mohou být špatně nastavena přístupová práva. Pozor, mohlo dojít k částečné a tudíž chybné instalaci pluginu a tím může být ohrožena stabilita wiki.'; -$lang['error_delete'] = 'Došlo k chybě při pokusu o smazání pluginu %s. Nejspíše je chyba v nastavení přístupových práv k některým souborům či adresářům.'; -$lang['enabled'] = 'Plugin %s aktivován.'; -$lang['notenabled'] = 'Plugin %s nelze aktivovat, zkontrolujte práva k souborům.'; -$lang['disabled'] = 'Plugin %s deaktivován.'; -$lang['notdisabled'] = 'Plugin %s nelze deaktivovat, zkontrolujte práva k souborům.'; -$lang['packageinstalled'] = 'Balíček pluginů (%d plugin(ů): %s) úspěšně nainstalován.'; diff --git a/lib/plugins/plugin/lang/el/admin_plugin.txt b/lib/plugins/plugin/lang/el/admin_plugin.txt deleted file mode 100644 index 8b292935d..000000000 --- a/lib/plugins/plugin/lang/el/admin_plugin.txt +++ /dev/null @@ -1,5 +0,0 @@ -====== Διαχείριση Επεκτάσεων ====== - -Σε αυτή την σελίδα μπορείτε να διαχειριστείτε τις [[doku>plugins|επεκτάσεις]] του Dokuwiki σας. Για να μπορέσετε να εγκαταστήσετε νέες επεκτάσεις, ο αντίστοιχος φάκελος συστήματος θα πρέπει να είναι εγγράψιμος από τον χρήστη κάτω από τον οποίο εκτελείται η εφαρμογή του εξυπηρετητή σας. - - diff --git a/lib/plugins/plugin/lang/el/lang.php b/lib/plugins/plugin/lang/el/lang.php deleted file mode 100644 index f50e26c46..000000000 --- a/lib/plugins/plugin/lang/el/lang.php +++ /dev/null @@ -1,58 +0,0 @@ - - * @author Thanos Massias - * @author Αθανάσιος Νταής - * @author Konstantinos Koryllos - * @author George Petsagourakis - * @author Petros Vidalis - * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com - */ -$lang['menu'] = 'Διαχείριση Επεκτάσεων'; -$lang['download'] = 'Κατεβάστε και εγκαταστήστε μια νέα επέκταση (plugin)'; -$lang['manage'] = 'Εγκατεστημένες επεκτάσεις'; -$lang['btn_info'] = 'πληροφορίες'; -$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['deleting'] = 'Σε διαδικασία διαγραφής ...'; -$lang['deleted'] = 'Η επέκταση %s διαγράφηκε.'; -$lang['downloading'] = 'Σε διαδικασία μεταφόρτωσης ...'; -$lang['downloaded'] = 'Η επέκταση %s εγκαταστάθηκε με επιτυχία'; -$lang['downloads'] = 'Οι παρακάτω επεκτάσεις εγκαταστάθηκαν με επιτυχία:'; -$lang['download_none'] = 'Δεν βρέθηκαν επεκτάσεις ή εμφανίστηκε κάποιο πρόβλημα κατά την σχετική διαδικασία.'; -$lang['plugin'] = 'Επέκταση:'; -$lang['components'] = 'Συστατικά'; -$lang['noinfo'] = 'Αυτή η επέκταση δεν επέστρεψε κάποια πληροφορία - η επέκταση μπορεί να μην λειτουργεί κανονικά.'; -$lang['name'] = 'Όνομα:'; -$lang['date'] = 'Ημερομηνία:'; -$lang['type'] = 'Τύπος:'; -$lang['desc'] = 'Περιγραφή:'; -$lang['author'] = 'Συγγραφέας:'; -$lang['www'] = 'Διεύθυνση στο διαδίκτυο:'; -$lang['error'] = 'Εμφανίστηκε άγνωστο σφάλμα.'; -$lang['error_download'] = 'Δεν είναι δυνατή η μεταφόρτωση του αρχείου: %s'; -$lang['error_badurl'] = 'Το URL είναι μάλλον λανθασμένο - είναι αδύνατον να εξαχθεί το όνομα αρχείου από αυτό το URL'; -$lang['error_dircreate'] = 'Δεν είναι δυνατή η δημιουργία ενός προσωρινού φακέλου αποθήκευσης των μεταφορτώσεων'; -$lang['error_decompress'] = 'Δεν είναι δυνατή η αποσυμπίεση των μεταφορτώσεων. Αυτό μπορεί να οφείλεται σε μερική λήψη των μεταφορτώσεων, οπότε θα πρέπει να επαναλάβετε την διαδικασία ή το σύστημά σας δεν μπορεί να διαχειριστεί το συγκεκριμένο είδος συμπίεσης, οπότε θα πρέπει να εγκαταστήσετε την επέκταση χειροκίνητα.'; -$lang['error_copy'] = 'Εμφανίστηκε ένα σφάλμα αντιγραφής αρχείων κατά την διάρκεια εγκατάστασης της επέκτασης %s: ο δίσκος μπορεί να είναι γεμάτος ή να μην είναι σωστά ρυθμισμένα τα δικαιώματα πρόσβασης. Αυτό το γεγονός μπορεί να οδήγησε σε μερική εγκατάσταση της επέκτασης και άρα η DokuWiki εγκατάστασή σας να εμφανίσει προβλήματα σταθερότητας.'; -$lang['error_delete'] = 'Εμφανίστηκε ένα σφάλμα κατά την διαδικασία διαγραφής της επέκτασης %s. Η πιθανότερη αιτία είναι να μην είναι σωστά ρυθμισμένα τα δικαιώματα πρόσβασης.'; -$lang['enabled'] = 'Η επέκταση %s ενεργοποιήθηκε.'; -$lang['notenabled'] = 'Η επέκταση %s δεν μπορεί να ενεργοποιηθεί. Ελέγξτε τα δικαιώματα πρόσβασης.'; -$lang['disabled'] = 'Η επέκταση %s απενεργοποιήθηκε.'; -$lang['notdisabled'] = 'Η επέκταση %s δεν μπορεί να απενεργοποιηθεί. Ελέγξτε τα δικαιώματα πρόσβασης.'; -$lang['packageinstalled'] = 'Το πακέτο της επέκτασης (%d επέκταση(εις): %s) εγκαστήθηκε επιτυχημένα.'; diff --git a/lib/plugins/plugin/lang/fr/admin_plugin.txt b/lib/plugins/plugin/lang/fr/admin_plugin.txt deleted file mode 100644 index b7beba25a..000000000 --- a/lib/plugins/plugin/lang/fr/admin_plugin.txt +++ /dev/null @@ -1,4 +0,0 @@ -====== Gestion des extensions ====== - -Cette page vous permet de gérer tout ce qui a trait aux [[doku>fr:plugins|extensions]] de DokuWiki. Pour pouvoir télécharger et installer un module, le répertoire « ''plugin'' » doit être accessible en écriture pour le serveur web. - diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php deleted file mode 100644 index 0592f3c7d..000000000 --- a/lib/plugins/plugin/lang/fr/lang.php +++ /dev/null @@ -1,69 +0,0 @@ - - * @author Delassaux Julien - * @author Maurice A. LeBlanc - * @author stephane.gully@gmail.com - * @author Guillaume Turri - * @author Erik Pedersen - * @author olivier duperray - * @author Vincent Feltz - * @author Philippe Bajoit - * @author Florian Gaub - * @author Samuel Dorsaz samuel.dorsaz@novelion.net - * @author Johan Guilbaud - * @author schplurtz@laposte.net - * @author skimpax@gmail.com - * @author Yannick Aure - * @author Olivier DUVAL - * @author Anael Mobilia - * @author Bruno Veilleux - */ -$lang['menu'] = 'Gestion des extensions'; -$lang['download'] = 'Télécharger et installer une nouvelle extension'; -$lang['manage'] = 'Extensions installées'; -$lang['btn_info'] = 'Info'; -$lang['btn_update'] = 'Mettre à jour'; -$lang['btn_delete'] = 'Supprimer'; -$lang['btn_settings'] = 'Paramètres'; -$lang['btn_download'] = 'Télécharger'; -$lang['btn_enable'] = 'Enregistrer'; -$lang['url'] = 'URL'; -$lang['installed'] = 'Installé :'; -$lang['lastupdate'] = 'Dernière mise à jour :'; -$lang['source'] = 'Source :'; -$lang['unknown'] = 'inconnu'; -$lang['updating'] = 'Mise à jour…'; -$lang['updated'] = 'Extension %s mise à jour avec succès'; -$lang['updates'] = 'Les extensions suivantes ont été mises à jour avec succès'; -$lang['update_none'] = 'Aucune mise à jour n\'a été trouvée.'; -$lang['deleting'] = 'Suppression…'; -$lang['deleted'] = 'Extension %s supprimée.'; -$lang['downloading'] = 'Téléchargement…'; -$lang['downloaded'] = 'Extension %s installée avec succès'; -$lang['downloads'] = 'Les extensions suivantes ont été installées avec succès :'; -$lang['download_none'] = 'Aucune extension n\'a été trouvée, ou un problème inconnu est survenu durant le téléchargement et l\'installation.'; -$lang['plugin'] = 'Extension :'; -$lang['components'] = 'Composants'; -$lang['noinfo'] = 'Cette extension n\'a transmis aucune information, elle pourrait être invalide.'; -$lang['name'] = 'Nom :'; -$lang['date'] = 'Date :'; -$lang['type'] = 'Type :'; -$lang['desc'] = 'Description :'; -$lang['author'] = 'Auteur :'; -$lang['www'] = 'Site web :'; -$lang['error'] = 'Une erreur inconnue est survenue.'; -$lang['error_download'] = 'Impossible de télécharger le fichier de l\'extension : %s'; -$lang['error_badurl'] = 'URL suspecte : impossible de déterminer le nom du fichier à partir de l\'URL'; -$lang['error_dircreate'] = 'Impossible de créer le répertoire temporaire pour effectuer le téléchargement'; -$lang['error_decompress'] = 'Le gestionnaire d\'extensions a été incapable de décompresser le fichier téléchargé. Ceci peut être le résultat d\'un mauvais téléchargement, auquel cas vous devriez réessayer ; ou bien le format de compression est inconnu, auquel cas vous devez télécharger et installer l\'extension manuellement.'; -$lang['error_copy'] = 'Une erreur de copie est survenue lors de l\'installation des fichiers de l\'extension %s : le disque est peut-être plein ou les autorisations d\'accès sont incorrects. Il a pu en résulter une installation partielle de l\'extension et laisser votre installation du wiki instable.'; -$lang['error_delete'] = 'Une erreur est survenue lors de la suppression de l\'extension %s. La raison la plus probable est l\'insuffisance des autorisations sur les fichiers ou les répertoires.'; -$lang['enabled'] = 'Extension %s activée.'; -$lang['notenabled'] = 'L\'extension %s n\'a pas pu être activée, vérifiez les autorisations des fichiers.'; -$lang['disabled'] = 'Extension %s désactivée.'; -$lang['notdisabled'] = 'L\'extension %s n\'a pas pu être désactivée, vérifiez les autorisations des fichiers.'; -$lang['packageinstalled'] = 'Ensemble d\'extensions (%d extension(s): %s) installé avec succès.'; diff --git a/lib/plugins/plugin/lang/hu/admin_plugin.txt b/lib/plugins/plugin/lang/hu/admin_plugin.txt deleted file mode 100644 index cf4a3b316..000000000 --- a/lib/plugins/plugin/lang/hu/admin_plugin.txt +++ /dev/null @@ -1,4 +0,0 @@ -====== Bővítménykezelő ====== - -Ezen az oldalon a Dokuwiki [[doku>plugins|bővítményeivel]] kapcsolatos teendőket láthatod el. A webkiszolgálónak tudnia kell írni a //plugin// könyvtárba az új bővítmények letöltéséhez és telepítéséhez. - diff --git a/lib/plugins/plugin/lang/hu/lang.php b/lib/plugins/plugin/lang/hu/lang.php deleted file mode 100644 index 7fb237a32..000000000 --- a/lib/plugins/plugin/lang/hu/lang.php +++ /dev/null @@ -1,59 +0,0 @@ - - * @author Siaynoq Mage - * @author schilling.janos@gmail.com - * @author Szabó Dávid - * @author Sándor TIHANYI - * @author David Szabo - * @author Marton Sebok - * @author Marina Vladi - */ -$lang['menu'] = 'Bővítménykezelő'; -$lang['download'] = 'Új bővítmény letöltése és telepítése'; -$lang['manage'] = 'Telepített bővítmények'; -$lang['btn_info'] = 'infó'; -$lang['btn_update'] = 'frissítés'; -$lang['btn_delete'] = 'törlés'; -$lang['btn_settings'] = 'beállítások'; -$lang['btn_download'] = 'Letöltés'; -$lang['btn_enable'] = 'Mentés'; -$lang['url'] = 'URL-cím'; -$lang['installed'] = 'Telepítve:'; -$lang['lastupdate'] = 'Utolsó frissítés:'; -$lang['source'] = 'Forrás:'; -$lang['unknown'] = 'ismeretlen'; -$lang['updating'] = 'Frissítés...'; -$lang['updated'] = 'A(z) %s bővítmény frissítése sikeres.'; -$lang['updates'] = 'A következő bővítmények frissítése sikeres:'; -$lang['update_none'] = 'Nem találtam újabb verziót.'; -$lang['deleting'] = 'Törlés...'; -$lang['deleted'] = 'A(z) %s bővítményt eltávolítva.'; -$lang['downloading'] = 'Letöltés...'; -$lang['downloaded'] = 'A(z) %s bővítmény telepítése sikeres.'; -$lang['downloads'] = 'A következő bővítmények telepítése sikeres.'; -$lang['download_none'] = 'Nem találtam bővítményt vagy ismeretlen hiba történt a letöltés/telepítés közben.'; -$lang['plugin'] = 'Bővítmény:'; -$lang['components'] = 'Részek'; -$lang['noinfo'] = 'Ez a bővítmény nem tartalmaz információt, lehet, hogy hibás.'; -$lang['name'] = 'Név:'; -$lang['date'] = 'Dátum:'; -$lang['type'] = 'Típus:'; -$lang['desc'] = 'Leírás:'; -$lang['author'] = 'Szerző:'; -$lang['www'] = 'Web:'; -$lang['error'] = 'Ismeretlen hiba lépett fel.'; -$lang['error_download'] = 'Nem tudom letölteni a fájlt a bővítményhez: %s'; -$lang['error_badurl'] = 'Feltehetően rossz URL - nem tudom meghatározni a fájlnevet az URL-ből.'; -$lang['error_dircreate'] = 'Nem tudom létrehozni az átmeneti könyvtárat a letöltéshez.'; -$lang['error_decompress'] = 'A Bővítménykezelő nem tudta a letöltött állományt kicsomagolni. Ennek oka lehet hibás letöltés, ebben az esetben újra letöltéssel próbálkozhatsz, esetleg a tömörítés módja ismeretlen, ebben az esetben kézzel kell letölteni és telepíteni a bővítményt.'; -$lang['error_copy'] = 'Fájl másolási hiba történt a(z) %s bővítmény telepítése közben: vagy a lemezterület fogyott el, vagy az állomány hozzáférési jogosultságai nem megfelelőek. Emiatt előfordulhat, hogy a bővítményt csak részben sikerült telepíteni és a wiki összeomolhat.'; -$lang['error_delete'] = 'Hiba történt a(z) %s bővítmény eltávolítása közben. A legvalószínűbb ok, hogy a könyvtár vagy állomány hozzáférési jogosultságai nem megfelelőek.'; -$lang['enabled'] = 'A(z) %s bővítmény bekapcsolva.'; -$lang['notenabled'] = 'A(z) %s bővítmény engedélyezése nem sikerült. Ellenőrizze a fájlhozzáférési jogosultságokat.'; -$lang['disabled'] = 'A(z) %s bővítmény kikapcsolva.'; -$lang['notdisabled'] = 'A(z) %s bővítmény kikapcsolása nem sikerült. Ellenőrizze a fájlhozzáférési jogosultságokat.'; -$lang['packageinstalled'] = 'A bővítménycsomag(ok) feltelepült(ek): %d plugin(s): %s'; diff --git a/lib/plugins/plugin/lang/id/lang.php b/lib/plugins/plugin/lang/id/lang.php deleted file mode 100644 index 2653b075e..000000000 --- a/lib/plugins/plugin/lang/id/lang.php +++ /dev/null @@ -1,32 +0,0 @@ - - * @author Yustinus Waruwu - */ -$lang['btn_info'] = 'Info'; -$lang['btn_update'] = 'Baharui'; -$lang['btn_delete'] = 'Hapus'; -$lang['btn_settings'] = 'Pengaturan'; -$lang['btn_download'] = 'Unduh'; -$lang['btn_enable'] = 'Simpan'; -$lang['url'] = 'URL'; -$lang['installed'] = 'Instal'; -$lang['lastupdate'] = 'Pembaharuan terakhir:'; -$lang['source'] = 'Sumber:'; -$lang['unknown'] = 'Tidak kenal'; -$lang['updating'] = 'Terbaharui ...'; -$lang['update_none'] = 'Tidak ditemukan pembaharuan'; -$lang['deleting'] = 'Terhapus ...'; -$lang['deleted'] = 'Hapus Plugin %s.'; -$lang['downloading'] = 'Unduh ...'; -$lang['plugin'] = 'Plugin:'; -$lang['components'] = 'Komponen'; -$lang['name'] = 'Nama:'; -$lang['date'] = 'Tanggal:'; -$lang['type'] = 'Tipe:'; -$lang['desc'] = 'Penjelasan:'; -$lang['author'] = 'Autor:'; -$lang['www'] = 'Web:'; diff --git a/lib/plugins/plugin/lang/pl/admin_plugin.txt b/lib/plugins/plugin/lang/pl/admin_plugin.txt deleted file mode 100644 index f01048198..000000000 --- a/lib/plugins/plugin/lang/pl/admin_plugin.txt +++ /dev/null @@ -1,5 +0,0 @@ -====== Menadżer wtyczek ====== - -Na tej stronie możesz zarządzać wszystkim co jest związane z [[doku>plugins|wtyczkami]] Dokuwiki. Aby móc ściągnąć i zainstalować wtyczkę, serwer WWW musi mieć prawo do zapisu w katalogu ''plugins''. - - diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php deleted file mode 100644 index eae91f33e..000000000 --- a/lib/plugins/plugin/lang/pl/lang.php +++ /dev/null @@ -1,63 +0,0 @@ - - * @author Grzegorz Żur - * @author Mariusz Kujawski - * @author Maciej Kurczewski - * @author Sławomir Boczek - * @author sleshek@wp.pl - * @author Leszek Stachowski - * @author maros - * @author Grzegorz Widła - * @author Łukasz Chmaj - * @author Begina Felicysym - * @author Aoi Karasu - */ -$lang['menu'] = 'Menadżer wtyczek'; -$lang['download'] = 'Ściągnij i zainstaluj nową wtyczkę'; -$lang['manage'] = 'Zainstalowane Wtyczki'; -$lang['btn_info'] = 'Informacje'; -$lang['btn_update'] = 'Aktualizuj'; -$lang['btn_delete'] = 'Usuń'; -$lang['btn_settings'] = 'Ustawienia'; -$lang['btn_download'] = 'Pobierz'; -$lang['btn_enable'] = 'Zapisz'; -$lang['url'] = 'Adres URL'; -$lang['installed'] = 'Instalacja:'; -$lang['lastupdate'] = 'Ostatnio zaktualizowana:'; -$lang['source'] = 'Źródło:'; -$lang['unknown'] = 'nieznane'; -$lang['updating'] = 'Aktualizuję...'; -$lang['updated'] = 'Aktualizacja wtyczki %s pomyślnie ściągnięta'; -$lang['updates'] = 'Aktualizacje następujących wtyczek zostały pomyślnie ściągnięte'; -$lang['update_none'] = 'Nie znaleziono aktualizacji.'; -$lang['deleting'] = 'Usuwam...'; -$lang['deleted'] = 'Wtyczka %s usunięta.'; -$lang['downloading'] = 'Pobieram...'; -$lang['downloaded'] = 'Wtyczka %s pomyślnie zainstalowana'; -$lang['downloads'] = 'Następujące wtyczki zostały pomyślnie zainstalowane:'; -$lang['download_none'] = 'Nie znaleziono wtyczek lub wystąpił nieznany problem podczas ściągania i instalacji.'; -$lang['plugin'] = 'Wtyczka:'; -$lang['components'] = 'Składniki'; -$lang['noinfo'] = 'Ta wtyczka nie zwróciła żadnych informacji, może być niepoprawna.'; -$lang['name'] = 'Nazwa:'; -$lang['date'] = 'Data:'; -$lang['type'] = 'Typ:'; -$lang['desc'] = 'Opis:'; -$lang['author'] = 'Autor:'; -$lang['www'] = 'WWW:'; -$lang['error'] = 'Wystąpił nieznany błąd.'; -$lang['error_download'] = 'Nie powiodło się ściągnięcie pliku wtyczki: %s'; -$lang['error_badurl'] = 'Prawdopodobnie zły url - nie da się ustalić nazwy pliku na podstawie urla'; -$lang['error_dircreate'] = 'Nie powiodło się stworzenie tymczasowego katalogu na pobrane pliki'; -$lang['error_decompress'] = 'Menadżer wtyczek nie był w stanie rozpakować ściągniętego pliku. Może to być spowodowane przez nieudany transfer (w takim przypadku powinieneś spróbować ponownie) lub nieznany format kompresji (w takim przypadku będziesz musiał ściągnąć i zainstalować wtyczkę ręcznie).'; -$lang['error_copy'] = 'Wystąpił błąd podczas kopiowania pliku w trakcie instalacji wtyczki %s: być może dysk jest pełny lub prawa dostępu są niepoprawne. Efektem może być częściowo zainstalowana wtyczka co może spowodować niestabilność Twojej instalacji wiki.'; -$lang['error_delete'] = 'Wystąpił błąd przy próbie usunięcia wtyczki %s. Prawdopodobną przyczyną są niewystarczające uprawnienia do katalogu.'; -$lang['enabled'] = 'Wtyczka %s włączona.'; -$lang['notenabled'] = 'Nie udało się uruchomić wtyczki %s, sprawdź uprawnienia dostępu do plików.'; -$lang['disabled'] = 'Wtyczka %s wyłączona.'; -$lang['notdisabled'] = 'Nie udało się wyłączyć wtyczki %s, sprawdź uprawnienia dostępu do plików.'; -$lang['packageinstalled'] = 'Pakiet wtyczek (%d wtyczki: %s) zainstalowany pomyślnie.'; diff --git a/lib/plugins/plugin/lang/sk/admin_plugin.txt b/lib/plugins/plugin/lang/sk/admin_plugin.txt deleted file mode 100644 index ad3ae7f58..000000000 --- a/lib/plugins/plugin/lang/sk/admin_plugin.txt +++ /dev/null @@ -1,4 +0,0 @@ -====== Správa pluginov ====== - -Na tejto stránke je možné spravovať [[doku>plugins|pluginy]] Dokuwiki. Aby bolo možné sťahovať a inštalovať pluginy, musí mať webový server prístup pre zápis do adresára //plugin//. - diff --git a/lib/plugins/plugin/lang/sk/lang.php b/lib/plugins/plugin/lang/sk/lang.php deleted file mode 100644 index 35c07cf80..000000000 --- a/lib/plugins/plugin/lang/sk/lang.php +++ /dev/null @@ -1,55 +0,0 @@ - - * @author Michal Mesko - * @author exusik@gmail.com - * @author Martin Michalek - */ -$lang['menu'] = 'Správa pluginov'; -$lang['download'] = 'Stiahnuť a nainštalovať plugin'; -$lang['manage'] = 'Nainštalované pluginy'; -$lang['btn_info'] = 'info'; -$lang['btn_update'] = 'aktualizovať'; -$lang['btn_delete'] = 'zmazať'; -$lang['btn_settings'] = 'nastavenia'; -$lang['btn_download'] = 'Stiahnuť'; -$lang['btn_enable'] = 'Uložiť'; -$lang['url'] = 'URL'; -$lang['installed'] = 'Nainštalovaný:'; -$lang['lastupdate'] = 'Aktualizovaný:'; -$lang['source'] = 'Zdroj:'; -$lang['unknown'] = 'neznámy'; -$lang['updating'] = 'Aktualizuje sa ...'; -$lang['updated'] = 'Plugin %s bol úspešne aktualizovaný'; -$lang['updates'] = 'Nasledujúce pluginy bol úspešne aktualizované:'; -$lang['update_none'] = 'Neboli nájdené žiadne aktualizácie.'; -$lang['deleting'] = 'Vymazáva sa ...'; -$lang['deleted'] = 'Plugin %s bol zmazaný.'; -$lang['downloading'] = 'Sťahuje sa ...'; -$lang['downloaded'] = 'Plugin %s bol úspešne stiahnutý'; -$lang['downloads'] = 'Nasledujúce pluginy bol úspešne stiahnuté:'; -$lang['download_none'] = 'Neboli nájdené žiadne pluginy alebo nastal neznámy problém počas sťahovania a inštalácie pluginov.'; -$lang['plugin'] = 'Plugin:'; -$lang['components'] = 'Súčasti'; -$lang['noinfo'] = 'Tento plugin neobsahuje žiadne informácie, je možné, že je chybný.'; -$lang['name'] = 'názov:'; -$lang['date'] = 'Dátum:'; -$lang['type'] = 'Typ:'; -$lang['desc'] = 'Popis:'; -$lang['author'] = 'Autor:'; -$lang['www'] = 'Web:'; -$lang['error'] = 'Nastala neznáma chyba.'; -$lang['error_download'] = 'Nie je možné stiahnuť súbor pluginu: %s'; -$lang['error_badurl'] = 'Pravdepodobne zlá url adresa - nie je možné z nej určiť meno súboru'; -$lang['error_dircreate'] = 'Nie je možné vytvoriť dočasný adresár pre uloženie sťahovaného súboru'; -$lang['error_decompress'] = 'Správca pluginov nedokáže dekomprimovať stiahnutý súbor. Môže to byť dôsledok zlého stiahnutia, v tom prípade to skúste znovu, alebo môže ísť o neznámy formát súboru, v tom prípade musíte stiahnuť a nainštalovať plugin manuálne.'; -$lang['error_copy'] = 'Nastala chyba kopírovania súboru počas pokusu inštalovať súbory pluginu%s: disk môže byť plný alebo prístupové práva k súboru môžu byť nesprávne. Toto môže mať za následok čiastočne nainštalovanie pluginu a nestabilitu vašej DokuWiki.'; -$lang['error_delete'] = 'Nastala chyba počas pokusu o zmazanie pluginu %s. Najpravdepodobnejším dôvodom môžu byť nedostatočné prístupové práva pre súbor alebo adresár'; -$lang['enabled'] = 'Plugin %s aktivovaný.'; -$lang['notenabled'] = 'Plugin %s nemôže byť aktivovaný, skontrolujte prístupové práva.'; -$lang['disabled'] = 'Plugin %s deaktivovaný.'; -$lang['notdisabled'] = 'Plugin %s nemôže byť deaktivovaný, skontrolujte prístupové práva.'; -$lang['packageinstalled'] = 'Plugin package (%d plugin(s): %s) úspešne inštalovaný.'; diff --git a/lib/plugins/plugin/lang/sl/admin_plugin.txt b/lib/plugins/plugin/lang/sl/admin_plugin.txt deleted file mode 100644 index 5fd02e1ba..000000000 --- a/lib/plugins/plugin/lang/sl/admin_plugin.txt +++ /dev/null @@ -1,3 +0,0 @@ -====== Upravljanje vstavkov ====== - -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 deleted file mode 100644 index e205c57f5..000000000 --- a/lib/plugins/plugin/lang/sl/lang.php +++ /dev/null @@ -1,55 +0,0 @@ - - * @author Boštjan Seničar - * @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'; -$lang['btn_info'] = 'Podrobnosti'; -$lang['btn_update'] = 'Posodobi'; -$lang['btn_delete'] = 'Izbriši'; -$lang['btn_settings'] = 'Nastavitve'; -$lang['btn_download'] = 'Prejmi'; -$lang['btn_enable'] = 'Shrani'; -$lang['url'] = 'URL'; -$lang['installed'] = 'Nameščeno:'; -$lang['lastupdate'] = 'Nazadnje posodobljeno:'; -$lang['source'] = 'Vir:'; -$lang['unknown'] = 'neznano'; -$lang['updating'] = 'Posodabljanje ...'; -$lang['updated'] = 'Vstavek %s je uspešno posodobljen'; -$lang['updates'] = 'Navedeni vstavki so uspešno posodobljeni'; -$lang['update_none'] = 'Posodobitev ni mogoče najti.'; -$lang['deleting'] = 'Brisanje ...'; -$lang['deleted'] = 'Vstavek %s je izbrisan.'; -$lang['downloading'] = 'Prejemanje ...'; -$lang['downloaded'] = 'Vstavek %s je uspešno nameščen'; -$lang['downloads'] = 'Navedeni vstavki so uspešno nameščeni:'; -$lang['download_none'] = 'Vstavkov ni mogoče najti ali pa je prišlo do napake med prejemanjem in nameščanjem.'; -$lang['plugin'] = 'Vstavek:'; -$lang['components'] = 'Sestavni deli'; -$lang['noinfo'] = 'Vstavek nima vpisanih podrobnih podatkov, kar pomeni, da je morda neveljaven.'; -$lang['name'] = 'Ime:'; -$lang['date'] = 'Datum:'; -$lang['type'] = 'Vrsta:'; -$lang['desc'] = 'Opis:'; -$lang['author'] = 'Avtor:'; -$lang['www'] = 'Spletna stran:'; -$lang['error'] = 'Prišlo je do neznane napake.'; -$lang['error_download'] = 'Ni mogoče prejeti datoteke vstavka: %s'; -$lang['error_badurl'] = 'Napaka naslova URL - ni mogoče določiti imena datoteke iz naslova URL'; -$lang['error_dircreate'] = 'Ni mogoče ustvariti začasne mape za prejemanje'; -$lang['error_decompress'] = 'Z upravljalnikom vstavkov ni mogoče razširiti prejetega arhiva vstavka. Najverjetneje je prišlo do napake med prejemanjem datoteke ali pa zapis arhiva ni znan. Poskusite znova ali pa napako odpravite z ročnim nameščanjem vstavka.'; -$lang['error_copy'] = 'Prišlo je do napake med nameščanjem datotek vstavka %s: najverjetneje so težave s prostorom za namestitev ali pa ni ustreznih dovoljenj za nameščanje. Zaradi nepopolne namestitve lahko nastopijo težave v delovanju sistema Wiki.'; -$lang['error_delete'] = 'Prišlo je do napake med brisanjem vstavka %s: najverjetneje ni ustreznih dovoljenj za dostop do datoteke ali mape'; -$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/plugin/lang/tr/admin_plugin.txt b/lib/plugins/plugin/lang/tr/admin_plugin.txt deleted file mode 100644 index 956d701f6..000000000 --- a/lib/plugins/plugin/lang/tr/admin_plugin.txt +++ /dev/null @@ -1,3 +0,0 @@ -====== Eklenti Yönetimi ====== - -Bu sayfada DokuWiki [[doku>plugins|eklentileri]] ile ilgili herşeyi düzenleyebilirsiniz. Eklenti kurup indirmek için, eklenti dizininin yazılabilir olması gerekmektedir. diff --git a/lib/plugins/plugin/lang/tr/lang.php b/lib/plugins/plugin/lang/tr/lang.php deleted file mode 100644 index a4feea8cd..000000000 --- a/lib/plugins/plugin/lang/tr/lang.php +++ /dev/null @@ -1,55 +0,0 @@ - - * @author Cihan Kahveci - * @author Yavuz Selim - * @author Caleb Maclennan - * @author farukerdemoncel@gmail.com - */ -$lang['menu'] = 'Eklenti Yönetimi'; -$lang['download'] = 'Yeni bir eklenti indirip kur'; -$lang['manage'] = 'Kurulmuş Eklentiler'; -$lang['btn_info'] = 'bilgi'; -$lang['btn_update'] = 'güncelle'; -$lang['btn_delete'] = 'sil'; -$lang['btn_settings'] = 'Ayarlar'; -$lang['btn_download'] = 'İndir'; -$lang['btn_enable'] = 'Kaydet'; -$lang['url'] = 'Web Adresi'; -$lang['installed'] = 'Kuruldu:'; -$lang['lastupdate'] = 'Son güncelleştirme:'; -$lang['source'] = 'Kaynak:'; -$lang['unknown'] = 'bilinmiyor'; -$lang['updating'] = 'Güncelleştiriyor ...'; -$lang['updated'] = '%s eklentisi başarıyla güncellendi'; -$lang['updates'] = 'Şu eklentiler başarıyla güncellendi'; -$lang['update_none'] = 'Yeni bir güncelleme bulunamadı.'; -$lang['deleting'] = 'Siliniyor ...'; -$lang['deleted'] = '%s eklentisi silindi.'; -$lang['downloading'] = 'İndiriyor ...'; -$lang['downloaded'] = '%s eklentisi başarıyla kuruldu'; -$lang['downloads'] = 'Şu eklentiler başarıyla kuruldu:'; -$lang['download_none'] = 'Eklenti bulunamadı veya indirirken/kurarken bilinmeyen bir hata oluştu.'; -$lang['plugin'] = 'Eklenti:'; -$lang['components'] = 'Parçalar'; -$lang['noinfo'] = 'Bu eklentinin bilgileri alınamadı, geçerli bir eklenti olmayabilir.'; -$lang['name'] = 'Ad:'; -$lang['date'] = 'Tarih:'; -$lang['type'] = 'Tür:'; -$lang['desc'] = 'Açıklama:'; -$lang['author'] = 'Yazar:'; -$lang['www'] = 'Web Adresi:'; -$lang['error'] = 'Bilinmeyen bir hata oluştu.'; -$lang['error_download'] = 'Şu eklenti indirilemedi: %s'; -$lang['error_badurl'] = 'Yanlış adres olabilir - verilen adresten dosya adı alınamadı'; -$lang['error_dircreate'] = 'İndirmek için geçici klasör oluşturulamadı'; -$lang['error_decompress'] = 'Eklenti yöneticisi indirilen sıkıştırılmış dosyayı açamadı. Bu yanlış indirmeden kaynaklanabilir (bu durumda tekrar denemelisiniz). Ya da indirilen dosyanın sıkıştırma biçimi bilinmemektedir (bu durumda eklentiyi indirerek kendiniz kurmalısınız).'; -$lang['error_copy'] = '%s eklentisi dosyalarını kurmaya çalışırken kopyalama hatası ortaya çıktı. Sürücü dolu olabilir veya yazma yetkisi bulunmuyor olabilir. Bunun sebebi tam kurulmamış bir eklentinin wiki kurulumunu bozması olabilir.'; -$lang['error_delete'] = '%s eklentisini silerken bir hata oluştu. Bu hata yetersiz dosya/klasör erişim yetkisinden kaynaklanabilir.'; -$lang['enabled'] = '%s eklentisi etkinleştirildi.'; -$lang['notenabled'] = '%s eklentisi etkinleştirilemedi, dosya yetkilerini kontrol edin.'; -$lang['disabled'] = '%s eklentisi devre dışı bırakıldı.'; -$lang['notdisabled'] = '%s eklentisi devre dışı bırakılamadı, dosya yetkilerini kontrol edin.'; -- cgit v1.2.3 From fd51467adc437f0a764f96cd4b94ff58a2ad8160 Mon Sep 17 00:00:00 2001 From: Martin Michalek Date: Tue, 25 Feb 2014 10:40:57 +0100 Subject: translation update --- lib/plugins/extension/lang/sk/lang.php | 58 ++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 lib/plugins/extension/lang/sk/lang.php (limited to 'lib') diff --git a/lib/plugins/extension/lang/sk/lang.php b/lib/plugins/extension/lang/sk/lang.php new file mode 100644 index 000000000..d00c2e32b --- /dev/null +++ b/lib/plugins/extension/lang/sk/lang.php @@ -0,0 +1,58 @@ + + */ +$lang['tab_plugins'] = 'Inštalované pluginy'; +$lang['tab_templates'] = 'Inštalované šablóny'; +$lang['tab_search'] = 'Hľadanie e inštalácia'; +$lang['tab_install'] = 'Manuálna inštalácia'; +$lang['notimplemented'] = 'Táto vlastnosť ešte nebola implementovaná'; +$lang['unknownauthor'] = 'Neznámy autor'; +$lang['unknownversion'] = 'Neznáma verzia'; +$lang['btn_info'] = 'Viac informácií'; +$lang['btn_update'] = 'Aktualizácia'; +$lang['btn_uninstall'] = 'Odinštalovanie'; +$lang['btn_enable'] = 'Povolenie'; +$lang['btn_disable'] = 'Zablokovanie'; +$lang['btn_install'] = 'Inštalácia'; +$lang['btn_reinstall'] = 'Re-Inštalácia'; +$lang['search'] = 'Vyhľadávanie'; +$lang['extensionby'] = '%s od %s'; +$lang['screenshot'] = 'Obrázok od %s'; +$lang['popularity'] = 'Popularita: %s%%'; +$lang['homepage_link'] = 'Dokumentácia'; +$lang['bugs_features'] = 'Chyby:'; +$lang['tags'] = 'Kľúčové slová:'; +$lang['unknown'] = 'neznámy'; +$lang['installed_version'] = 'Inštalovaná verzia:'; +$lang['install_date'] = 'Posledná aktualizácia:'; +$lang['available_version'] = 'Dostupné verzie:'; +$lang['compatible'] = 'Kompaktibilita:'; +$lang['similar'] = 'Podobné:'; +$lang['conflicts'] = 'V konflikte:'; +$lang['status_installed'] = 'inštalovaný'; +$lang['status_not_installed'] = 'neinštalovaný'; +$lang['status_protected'] = 'chránený'; +$lang['status_enabled'] = 'povolený'; +$lang['status_disabled'] = 'nepovolený'; +$lang['status_plugin'] = 'plugin'; +$lang['status_template'] = 'šablóna'; +$lang['msg_enabled'] = 'Plugin %s povolený'; +$lang['msg_disabled'] = 'Plugin %s nepovolený'; +$lang['msg_template_install_success'] = 'Šablóna %s úspešne nainštalovaná'; +$lang['msg_template_update_success'] = 'Šablóna %s úspešne aktualizovaná'; +$lang['msg_plugin_install_success'] = 'Plugin %s úspešne nainštalovaný'; +$lang['msg_plugin_update_success'] = 'Plugin %s úspešne aktualizovaný'; +$lang['msg_upload_failed'] = 'Nahrávanie súboru zlyhalo'; +$lang['update_available'] = 'Aktualizácia: Nová verzia %s.'; +$lang['wrong_folder'] = 'Plugin nesprávne nainštalovaný: Premenujte adresár s pluginom "%s" na "%s".'; +$lang['error_badurl'] = 'URL by mali mať na začiatku http alebo https'; +$lang['error_dircreate'] = 'Nie je možné vytvoriť dočasný adresár pre uloženie sťahovaného súboru'; +$lang['error_download'] = 'Nie je možné stiahnuť súbor: %s'; +$lang['error_decompress'] = 'Nie je možné dekomprimovať stiahnutý súbor. Môže to byť dôvodom chyby sťahovania (v tom prípade to skúste znova) alebo neznámym kompresným formátom (v tom prípade musíte stiahnuť a inštalovať manuálne).'; +$lang['error_copy'] = 'Chyba kopírovania pri inštalácii do adresára %s: disk môže byť plný alebo nemáte potrebné prístupové oprávnenie. Dôsledkom može byť čiastočne inštalovaný plugin a nestabilná wiki inštalácia.'; +$lang['nopluginperms'] = 'Adresár s pluginom nie je zapisovateľný.'; +$lang['install_url'] = 'Inštalácia z URL:'; -- cgit v1.2.3 From becfa414b5b024ded4e094b1c113a72f39d8b763 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Tue, 25 Feb 2014 15:45:00 +0100 Subject: refactor detail.php to template.php - refactor detail en mediamanager link creation - refactor metadata listing --- lib/tpl/dokuwiki/css/pagetools.less | 1 + lib/tpl/dokuwiki/detail.php | 54 +++++++------------------------------ 2 files changed, 10 insertions(+), 45 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less index ecb3038c3..77d2670a6 100644 --- a/lib/tpl/dokuwiki/css/pagetools.less +++ b/lib/tpl/dokuwiki/css/pagetools.less @@ -231,3 +231,4 @@ .pagetools-item(subscribe, 9, subscribe); .pagetools-item(mediaManager, 11); .pagetools-item(back, 12); +.pagetools-item(img_backto, 12); diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index ec846f6fd..8fe2c88a2 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -55,37 +55,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
-
- $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 '
'; - } - } - ?> -
+
@@ -109,23 +79,17 @@ header('X-UA-Compatible: IE=edge,chrome=1');
" + + ((numMonths[0] > 0 && col === numMonths[1]-1) ? "
" : "") : ""); + group += calender; + } + html += group; } - - //Create the placeholder - that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem)); - - //Append it after the actual current item - that.currentItem.after(that.placeholder); - - //Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317) - o.placeholder.update(that, that.placeholder); - + html += buttonPanel; + inst._keyEvent = false; + return html; }, - _contactContainers: function(event) { - var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, base, cur, nearBottom, floating, - innermostContainer = null, - innermostIndex = null; - - // get innermost container that intersects with item - for (i = this.containers.length - 1; i >= 0; i--) { - - // never consider a container that's located within the item itself - if($.contains(this.currentItem[0], this.containers[i].element[0])) { - continue; - } - - if(this._intersectsWith(this.containers[i].containerCache)) { - - // if we've already found a container and it's more "inner" than this, then continue - if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0])) { - continue; - } + /* Generate the month and year header. */ + _generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate, + secondary, monthNames, monthNamesShort) { - innermostContainer = this.containers[i]; - innermostIndex = i; + var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear, + changeMonth = this._get(inst, "changeMonth"), + changeYear = this._get(inst, "changeYear"), + showMonthAfterYear = this._get(inst, "showMonthAfterYear"), + html = "
", + monthHtml = ""; - } else { - // container doesn't intersect. trigger "out" event if necessary - if(this.containers[i].containerCache.over) { - this.containers[i]._trigger("out", event, this._uiHash(this)); - this.containers[i].containerCache.over = 0; + // month selection + if (secondary || !changeMonth) { + monthHtml += "" + monthNames[drawMonth] + ""; + } else { + inMinYear = (minDate && minDate.getFullYear() === drawYear); + inMaxYear = (maxDate && maxDate.getFullYear() === drawYear); + monthHtml += ""; } - // if no intersecting containers found, return - if(!innermostContainer) { - return; + if (!showMonthAfterYear) { + html += monthHtml + (secondary || !(changeMonth && changeYear) ? " " : ""); } - // move the item into the container if it's not there already - if(this.containers.length === 1) { - if (!this.containers[innermostIndex].containerCache.over) { - this.containers[innermostIndex]._trigger("over", event, this._uiHash(this)); - this.containers[innermostIndex].containerCache.over = 1; - } - } else { - - //When entering a new container, we will find the item with the least distance and append our item near it - dist = 10000; - itemWithLeastDistance = null; - floating = innermostContainer.floating || isFloating(this.currentItem); - posProperty = floating ? "left" : "top"; - sizeProperty = floating ? "width" : "height"; - base = this.positionAbs[posProperty] + this.offset.click[posProperty]; - for (j = this.items.length - 1; j >= 0; j--) { - if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) { - continue; - } - if(this.items[j].item[0] === this.currentItem[0]) { - continue; - } - if (floating && !isOverAxis(this.positionAbs.top + this.offset.click.top, this.items[j].top, this.items[j].height)) { - continue; - } - cur = this.items[j].item.offset()[posProperty]; - nearBottom = false; - if(Math.abs(cur - base) > Math.abs(cur + this.items[j][sizeProperty] - base)){ - nearBottom = true; - cur += this.items[j][sizeProperty]; + // year selection + if ( !inst.yearshtml ) { + inst.yearshtml = ""; + if (secondary || !changeYear) { + html += "" + drawYear + ""; + } else { + // determine range of years to display + years = this._get(inst, "yearRange").split(":"); + thisYear = new Date().getFullYear(); + determineYear = function(value) { + var year = (value.match(/c[+\-].*/) ? drawYear + parseInt(value.substring(1), 10) : + (value.match(/[+\-].*/) ? thisYear + parseInt(value, 10) : + parseInt(value, 10))); + return (isNaN(year) ? thisYear : year); + }; + year = determineYear(years[0]); + endYear = Math.max(year, determineYear(years[1] || "")); + year = (minDate ? Math.max(year, minDate.getFullYear()) : year); + endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear); + inst.yearshtml += ""; - if(Math.abs(cur - base) < dist) { - dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j]; - this.direction = nearBottom ? "up": "down"; - } + html += inst.yearshtml; + inst.yearshtml = null; } + } - //Check if dropOnEmpty is enabled - if(!itemWithLeastDistance && !this.options.dropOnEmpty) { - return; - } + html += this._get(inst, "yearSuffix"); + if (showMonthAfterYear) { + html += (secondary || !(changeMonth && changeYear) ? " " : "") + monthHtml; + } + html += "
"; // Close datepicker_header + return html; + }, - if(this.currentContainer === this.containers[innermostIndex]) { - return; - } + /* Adjust one of the date sub-fields. */ + _adjustInstDate: function(inst, offset, period) { + var year = inst.drawYear + (period === "Y" ? offset : 0), + month = inst.drawMonth + (period === "M" ? offset : 0), + day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0), + date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day))); - itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true); - this._trigger("change", event, this._uiHash()); - this.containers[innermostIndex]._trigger("change", event, this._uiHash(this)); - this.currentContainer = this.containers[innermostIndex]; + inst.selectedDay = date.getDate(); + inst.drawMonth = inst.selectedMonth = date.getMonth(); + inst.drawYear = inst.selectedYear = date.getFullYear(); + if (period === "M" || period === "Y") { + this._notifyChange(inst); + } + }, - //Update the placeholder - this.options.placeholder.update(this.currentContainer, this.placeholder); + /* Ensure a date is within any min/max bounds. */ + _restrictMinMax: function(inst, date) { + var minDate = this._getMinMaxDate(inst, "min"), + maxDate = this._getMinMaxDate(inst, "max"), + newDate = (minDate && date < minDate ? minDate : date); + return (maxDate && newDate > maxDate ? maxDate : newDate); + }, - this.containers[innermostIndex]._trigger("over", event, this._uiHash(this)); - this.containers[innermostIndex].containerCache.over = 1; + /* Notify change of month/year. */ + _notifyChange: function(inst) { + var onChange = this._get(inst, "onChangeMonthYear"); + if (onChange) { + onChange.apply((inst.input ? inst.input[0] : null), + [inst.selectedYear, inst.selectedMonth + 1, inst]); } + }, + /* Determine the number of months to show. */ + _getNumberOfMonths: function(inst) { + var numMonths = this._get(inst, "numberOfMonths"); + return (numMonths == null ? [1, 1] : (typeof numMonths === "number" ? [1, numMonths] : numMonths)); + }, + /* Determine the current maximum date - ensure no time components are set. */ + _getMinMaxDate: function(inst, minMax) { + return this._determineDate(inst, this._get(inst, minMax + "Date"), null); }, - _createHelper: function(event) { + /* Find the number of days in a given month. */ + _getDaysInMonth: function(year, month) { + return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate(); + }, - var o = this.options, - helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper === "clone" ? this.currentItem.clone() : this.currentItem); + /* Find the day of the week of the first of a month. */ + _getFirstDayOfMonth: function(year, month) { + return new Date(year, month, 1).getDay(); + }, - //Add the helper to the DOM if that didn't happen already - if(!helper.parents("body").length) { - $(o.appendTo !== "parent" ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]); - } + /* Determines if we should allow a "next/prev" month display change. */ + _canAdjustMonth: function(inst, offset, curYear, curMonth) { + var numMonths = this._getNumberOfMonths(inst), + date = this._daylightSavingAdjust(new Date(curYear, + curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1)); - if(helper[0] === this.currentItem[0]) { - this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") }; + if (offset < 0) { + date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth())); } + return this._isInRange(inst, date); + }, - if(!helper[0].style.width || o.forceHelperSize) { - helper.width(this.currentItem.width()); - } - if(!helper[0].style.height || o.forceHelperSize) { - helper.height(this.currentItem.height()); - } + /* Is the given date in the accepted range? */ + _isInRange: function(inst, date) { + var yearSplit, currentYear, + minDate = this._getMinMaxDate(inst, "min"), + maxDate = this._getMinMaxDate(inst, "max"), + minYear = null, + maxYear = null, + years = this._get(inst, "yearRange"); + if (years){ + yearSplit = years.split(":"); + currentYear = new Date().getFullYear(); + minYear = parseInt(yearSplit[0], 10); + maxYear = parseInt(yearSplit[1], 10); + if ( yearSplit[0].match(/[+\-].*/) ) { + minYear += currentYear; + } + if ( yearSplit[1].match(/[+\-].*/) ) { + maxYear += currentYear; + } + } - return helper; + return ((!minDate || date.getTime() >= minDate.getTime()) && + (!maxDate || date.getTime() <= maxDate.getTime()) && + (!minYear || date.getFullYear() >= minYear) && + (!maxYear || date.getFullYear() <= maxYear)); + }, + /* Provide the configuration settings for formatting/parsing. */ + _getFormatConfig: function(inst) { + var shortYearCutoff = this._get(inst, "shortYearCutoff"); + shortYearCutoff = (typeof shortYearCutoff !== "string" ? shortYearCutoff : + new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10)); + return {shortYearCutoff: shortYearCutoff, + dayNamesShort: this._get(inst, "dayNamesShort"), dayNames: this._get(inst, "dayNames"), + monthNamesShort: this._get(inst, "monthNamesShort"), monthNames: this._get(inst, "monthNames")}; }, - _adjustOffsetFromHelper: function(obj) { - if (typeof obj === "string") { - obj = obj.split(" "); - } - if ($.isArray(obj)) { - obj = {left: +obj[0], top: +obj[1] || 0}; - } - if ("left" in obj) { - this.offset.click.left = obj.left + this.margins.left; - } - if ("right" in obj) { - this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left; - } - if ("top" in obj) { - this.offset.click.top = obj.top + this.margins.top; + /* Format the given date for display. */ + _formatDate: function(inst, day, month, year) { + if (!day) { + inst.currentDay = inst.selectedDay; + inst.currentMonth = inst.selectedMonth; + inst.currentYear = inst.selectedYear; } - if ("bottom" in obj) { - this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top; + var date = (day ? (typeof day === "object" ? day : + this._daylightSavingAdjust(new Date(year, month, day))) : + this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay))); + return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst)); + } +}); + +/* + * Bind hover events for datepicker elements. + * Done via delegate so the binding only occurs once in the lifetime of the parent div. + * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker. + */ +function bindHover(dpDiv) { + var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a"; + return dpDiv.delegate(selector, "mouseout", function() { + $(this).removeClass("ui-state-hover"); + if (this.className.indexOf("ui-datepicker-prev") !== -1) { + $(this).removeClass("ui-datepicker-prev-hover"); + } + if (this.className.indexOf("ui-datepicker-next") !== -1) { + $(this).removeClass("ui-datepicker-next-hover"); + } + }) + .delegate(selector, "mouseover", function(){ + if (!$.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0])) { + $(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"); + $(this).addClass("ui-state-hover"); + if (this.className.indexOf("ui-datepicker-prev") !== -1) { + $(this).addClass("ui-datepicker-prev-hover"); + } + if (this.className.indexOf("ui-datepicker-next") !== -1) { + $(this).addClass("ui-datepicker-next-hover"); + } + } + }); +} + +/* jQuery extend now ignores nulls! */ +function extendRemove(target, props) { + $.extend(target, props); + for (var name in props) { + if (props[name] == null) { + target[name] = props[name]; } - }, + } + return target; +} - _getParentOffset: function() { +/* Invoke the datepicker functionality. + @param options string - a command, optionally followed by additional parameters or + Object - settings for attaching new datepicker functionality + @return jQuery object */ +$.fn.datepicker = function(options){ + /* Verify an empty collection wasn't passed - Fixes #6976 */ + if ( !this.length ) { + return this; + } - //Get the offsetParent and cache its position - this.offsetParent = this.helper.offsetParent(); - var po = this.offsetParent.offset(); + /* Initialise the date picker. */ + if (!$.datepicker.initialized) { + $(document).mousedown($.datepicker._checkExternalClick); + $.datepicker.initialized = true; + } - // This is a special case where we need to modify a offset calculated on start, since the following happened: - // 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent - // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that - // the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag - if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) { - po.left += this.scrollParent.scrollLeft(); - po.top += this.scrollParent.scrollTop(); - } + /* Append datepicker main container to body if not exist. */ + if ($("#"+$.datepicker._mainDivId).length === 0) { + $("body").append($.datepicker.dpDiv); + } - // This needs to be actually done for all browsers, since pageX/pageY includes this information - // with an ugly IE fix - if( this.offsetParent[0] === document.body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) { - po = { top: 0, left: 0 }; - } + var otherArgs = Array.prototype.slice.call(arguments, 1); + if (typeof options === "string" && (options === "isDisabled" || options === "getDate" || options === "widget")) { + return $.datepicker["_" + options + "Datepicker"]. + apply($.datepicker, [this[0]].concat(otherArgs)); + } + if (options === "option" && arguments.length === 2 && typeof arguments[1] === "string") { + return $.datepicker["_" + options + "Datepicker"]. + apply($.datepicker, [this[0]].concat(otherArgs)); + } + return this.each(function() { + typeof options === "string" ? + $.datepicker["_" + options + "Datepicker"]. + apply($.datepicker, [this].concat(otherArgs)) : + $.datepicker._attachDatepicker(this, options); + }); +}; - return { - top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0), - left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0) - }; +$.datepicker = new Datepicker(); // singleton instance +$.datepicker.initialized = false; +$.datepicker.uuid = new Date().getTime(); +$.datepicker.version = "1.10.4"; - }, +})(jQuery); +(function( $, undefined ) { - _getRelativeOffset: function() { +var sizeRelatedOptions = { + buttons: true, + height: true, + maxHeight: true, + maxWidth: true, + minHeight: true, + minWidth: true, + width: true + }, + resizableRelatedOptions = { + maxHeight: true, + maxWidth: true, + minHeight: true, + minWidth: true + }; - if(this.cssPosition === "relative") { - var p = this.currentItem.position(); - return { - top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(), - left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft() - }; - } else { - return { top: 0, left: 0 }; - } +$.widget( "ui.dialog", { + version: "1.10.4", + options: { + appendTo: "body", + autoOpen: true, + buttons: [], + closeOnEscape: true, + closeText: "close", + dialogClass: "", + draggable: true, + hide: null, + height: "auto", + maxHeight: null, + maxWidth: null, + minHeight: 150, + minWidth: 150, + modal: false, + position: { + my: "center", + at: "center", + of: window, + collision: "fit", + // Ensure the titlebar is always visible + using: function( pos ) { + var topOffset = $( this ).css( pos ).offset().top; + if ( topOffset < 0 ) { + $( this ).css( "top", pos.top - topOffset ); + } + } + }, + resizable: true, + show: null, + title: null, + width: 300, + // callbacks + beforeClose: null, + close: null, + drag: null, + dragStart: null, + dragStop: null, + focus: null, + open: null, + resize: null, + resizeStart: null, + resizeStop: null }, - _cacheMargins: function() { - this.margins = { - left: (parseInt(this.currentItem.css("marginLeft"),10) || 0), - top: (parseInt(this.currentItem.css("marginTop"),10) || 0) + _create: function() { + this.originalCss = { + display: this.element[0].style.display, + width: this.element[0].style.width, + minHeight: this.element[0].style.minHeight, + maxHeight: this.element[0].style.maxHeight, + height: this.element[0].style.height }; - }, - - _cacheHelperProportions: function() { - this.helperProportions = { - width: this.helper.outerWidth(), - height: this.helper.outerHeight() + this.originalPosition = { + parent: this.element.parent(), + index: this.element.parent().children().index( this.element ) }; - }, + this.originalTitle = this.element.attr("title"); + this.options.title = this.options.title || this.originalTitle; - _setContainment: function() { + this._createWrapper(); - var ce, co, over, - o = this.options; - if(o.containment === "parent") { - o.containment = this.helper[0].parentNode; + this.element + .show() + .removeAttr("title") + .addClass("ui-dialog-content ui-widget-content") + .appendTo( this.uiDialog ); + + this._createTitlebar(); + this._createButtonPane(); + + if ( this.options.draggable && $.fn.draggable ) { + this._makeDraggable(); } - if(o.containment === "document" || o.containment === "window") { - this.containment = [ - 0 - this.offset.relative.left - this.offset.parent.left, - 0 - this.offset.relative.top - this.offset.parent.top, - $(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left, - ($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top - ]; + if ( this.options.resizable && $.fn.resizable ) { + this._makeResizable(); } - if(!(/^(document|window|parent)$/).test(o.containment)) { - ce = $(o.containment)[0]; - co = $(o.containment).offset(); - over = ($(ce).css("overflow") !== "hidden"); + this._isOpen = false; + }, - this.containment = [ - co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left, - co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top, - co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left, - co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top - ]; + _init: function() { + if ( this.options.autoOpen ) { + this.open(); } + }, + _appendTo: function() { + var element = this.options.appendTo; + if ( element && (element.jquery || element.nodeType) ) { + return $( element ); + } + return this.document.find( element || "body" ).eq( 0 ); }, - _convertPositionTo: function(d, pos) { + _destroy: function() { + var next, + originalPosition = this.originalPosition; - if(!pos) { - pos = this.position; + this._destroyOverlay(); + + this.element + .removeUniqueId() + .removeClass("ui-dialog-content ui-widget-content") + .css( this.originalCss ) + // Without detaching first, the following becomes really slow + .detach(); + + this.uiDialog.stop( true, true ).remove(); + + if ( this.originalTitle ) { + this.element.attr( "title", this.originalTitle ); } - var mod = d === "absolute" ? 1 : -1, - scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, - scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName); - return { - top: ( - pos.top + // The absolute mouse position - this.offset.relative.top * mod + // Only for relative positioned nodes: Relative offset from element to offset parent - this.offset.parent.top * mod - // The offsetParent's offset without borders (offset + border) - ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod) - ), - left: ( - pos.left + // The absolute mouse position - this.offset.relative.left * mod + // Only for relative positioned nodes: Relative offset from element to offset parent - this.offset.parent.left * mod - // The offsetParent's offset without borders (offset + border) - ( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod) - ) - }; + next = originalPosition.parent.children().eq( originalPosition.index ); + // Don't try to place the dialog next to itself (#8613) + if ( next.length && next[0] !== this.element[0] ) { + next.before( this.element ); + } else { + originalPosition.parent.append( this.element ); + } + }, + widget: function() { + return this.uiDialog; }, - _generatePosition: function(event) { + disable: $.noop, + enable: $.noop, - var top, left, - o = this.options, - pageX = event.pageX, - pageY = event.pageY, - scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName); + close: function( event ) { + var activeElement, + that = this; - // This is another very weird special case that only happens for relative elements: - // 1. If the css position is relative - // 2. and the scroll parent is the document or similar to the offset parent - // we have to refresh the relative offset during the scroll so there are no jumps - if(this.cssPosition === "relative" && !(this.scrollParent[0] !== document && this.scrollParent[0] !== this.offsetParent[0])) { - this.offset.relative = this._getRelativeOffset(); + if ( !this._isOpen || this._trigger( "beforeClose", event ) === false ) { + return; } - /* - * - Position constraining - - * Constrain the position to a mix of grid, containment. - */ - - if(this.originalPosition) { //If we are not dragging yet, we won't check for options + this._isOpen = false; + this._destroyOverlay(); - if(this.containment) { - if(event.pageX - this.offset.click.left < this.containment[0]) { - pageX = this.containment[0] + this.offset.click.left; - } - if(event.pageY - this.offset.click.top < this.containment[1]) { - pageY = this.containment[1] + this.offset.click.top; - } - if(event.pageX - this.offset.click.left > this.containment[2]) { - pageX = this.containment[2] + this.offset.click.left; - } - if(event.pageY - this.offset.click.top > this.containment[3]) { - pageY = this.containment[3] + this.offset.click.top; - } - } + if ( !this.opener.filter(":focusable").focus().length ) { - if(o.grid) { - top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1]; - pageY = this.containment ? ( (top - this.offset.click.top >= this.containment[1] && top - this.offset.click.top <= this.containment[3]) ? top : ((top - this.offset.click.top >= this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top; + // support: IE9 + // IE9 throws an "Unspecified error" accessing document.activeElement from an