From 28f4004c937cfc11f16e6cc7c0eb7da1a61dfcbe Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 18 Jun 2011 10:16:47 +0200 Subject: Made the maximum embed size for datauris configurable The feature is now disabled by default. Metadata for config manager was added. --- lib/plugins/config/lang/en/lang.php | 1 + lib/plugins/config/settings/config.metadata.php | 1 + 2 files changed, 2 insertions(+) (limited to 'lib/plugins') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 9b7c643bf..e5dd4707a 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -133,6 +133,7 @@ $lang['jpg_quality'] = 'JPG compression quality (0-100)'; $lang['subscribers'] = 'Enable page subscription support'; $lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.'; $lang['compress'] = 'Compact CSS and javascript output'; +$lang['cssdatauri'] = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE < 8! 400 to 600 bytes is a good value. Set 0 to disable.'; $lang['hidepages'] = 'Hide matching pages (regular expressions)'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages'; $lang['sitemap'] = 'Generate Google sitemap (days)'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index af7e63a61..abea1be1c 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -179,6 +179,7 @@ $meta['autoplural'] = array('onoff'); $meta['mailfrom'] = array('richemail'); $meta['mailprefix'] = array('string'); $meta['compress'] = array('onoff'); +$meta['cssdatauri'] = array('numeric','_pattern' => '/^\d+$/'); $meta['gzip_output'] = array('onoff'); $meta['hidepages'] = array('string'); $meta['send404'] = array('onoff'); -- cgit v1.2.3 From 29dc4f32ec672f86f16846b70a777990822d184c Mon Sep 17 00:00:00 2001 From: Mikael Mallander Date: Sat, 2 Jul 2011 13:19:32 +0200 Subject: Swedish language update --- lib/plugins/acl/lang/sv/lang.php | 1 + lib/plugins/config/lang/sv/lang.php | 1 + lib/plugins/plugin/lang/sv/lang.php | 1 + lib/plugins/popularity/lang/sv/lang.php | 1 + lib/plugins/revert/lang/sv/lang.php | 1 + lib/plugins/usermanager/lang/sv/lang.php | 1 + 6 files changed, 6 insertions(+) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/lang/sv/lang.php b/lib/plugins/acl/lang/sv/lang.php index b5fd3b866..7f963d5e1 100644 --- a/lib/plugins/acl/lang/sv/lang.php +++ b/lib/plugins/acl/lang/sv/lang.php @@ -15,6 +15,7 @@ * @author Bogge Bogge * @author Peter Åström * @author Håkan Sandell + * @author mikael@mallander.net */ $lang['admin_acl'] = 'Hantera behörighetslistan (ACL)'; $lang['acl_group'] = 'Grupp'; diff --git a/lib/plugins/config/lang/sv/lang.php b/lib/plugins/config/lang/sv/lang.php index 25392057b..dfd93d37d 100644 --- a/lib/plugins/config/lang/sv/lang.php +++ b/lib/plugins/config/lang/sv/lang.php @@ -15,6 +15,7 @@ * @author Bogge Bogge * @author Peter Åström * @author Håkan Sandell + * @author mikael@mallander.net */ $lang['menu'] = 'Hantera inställningar'; $lang['error'] = 'Inställningarna uppdaterades inte på grund av ett felaktigt värde. Titta igenom dina ändringar och försök sedan spara igen. diff --git a/lib/plugins/plugin/lang/sv/lang.php b/lib/plugins/plugin/lang/sv/lang.php index 0fe03387b..5892e42b5 100644 --- a/lib/plugins/plugin/lang/sv/lang.php +++ b/lib/plugins/plugin/lang/sv/lang.php @@ -15,6 +15,7 @@ * @author Bogge Bogge * @author Peter Åström * @author Håkan Sandell + * @author mikael@mallander.net */ $lang['menu'] = 'Hantera insticksmoduler'; $lang['download'] = 'Ladda ned och installera en ny insticksmodul'; diff --git a/lib/plugins/popularity/lang/sv/lang.php b/lib/plugins/popularity/lang/sv/lang.php index b461a95cf..8be542e7f 100644 --- a/lib/plugins/popularity/lang/sv/lang.php +++ b/lib/plugins/popularity/lang/sv/lang.php @@ -12,6 +12,7 @@ * @author Bogge Bogge * @author Peter Åström * @author Håkan Sandell + * @author mikael@mallander.net */ $lang['name'] = 'Popularitets-feedback (det kan ta en stund att ladda sidan)'; $lang['submit'] = 'Sänd data'; diff --git a/lib/plugins/revert/lang/sv/lang.php b/lib/plugins/revert/lang/sv/lang.php index 1b6ca3374..29c6702eb 100644 --- a/lib/plugins/revert/lang/sv/lang.php +++ b/lib/plugins/revert/lang/sv/lang.php @@ -14,6 +14,7 @@ * @author Bogge Bogge * @author Peter Åström * @author Håkan Sandell + * @author mikael@mallander.net */ $lang['menu'] = 'Hantera återställningar'; $lang['filter'] = 'Sök efter spamsidor'; diff --git a/lib/plugins/usermanager/lang/sv/lang.php b/lib/plugins/usermanager/lang/sv/lang.php index cedd30d1f..bd747927e 100644 --- a/lib/plugins/usermanager/lang/sv/lang.php +++ b/lib/plugins/usermanager/lang/sv/lang.php @@ -14,6 +14,7 @@ * @author Bogge Bogge * @author Peter Åström * @author Håkan Sandell + * @author mikael@mallander.net */ $lang['menu'] = 'Hantera användare'; $lang['noauth'] = '(användarautentisering ej tillgänlig)'; -- cgit v1.2.3 From ba9056cfeae3c6451e5e8e4ae3eff6060cbd3d8a Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Sun, 10 Jul 2011 21:46:13 +0200 Subject: Skipping plural form in plugin installed message --- lib/plugins/plugin/lang/en/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/plugin/lang/en/lang.php b/lib/plugins/plugin/lang/en/lang.php index 437c168bd..87570a708 100644 --- a/lib/plugins/plugin/lang/en/lang.php +++ b/lib/plugins/plugin/lang/en/lang.php @@ -73,6 +73,6 @@ $lang['enabled'] = 'Plugin %s enabled.'; $lang['notenabled'] = 'Plugin %s could not be enabled, check file permissions.'; $lang['disabled'] = 'Plugin %s disabled.'; $lang['notdisabled'] = 'Plugin %s could not be disabled, check file permissions.'; -$lang['packageinstalled'] = 'Plugin package (%d plugin%s: %s) successfully installed.'; +$lang['packageinstalled'] = 'Plugin package (%d plugin(s): %s) successfully installed.'; //Setup VIM: ex: et ts=4 : -- cgit v1.2.3 From 11d9d6503055d85d0901c5c30fa68e7610cff2d5 Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Sun, 10 Jul 2011 21:47:49 +0200 Subject: Update french string (plugins installation) --- lib/plugins/plugin/lang/fr/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php index 618e7a75b..2989d4913 100644 --- a/lib/plugins/plugin/lang/fr/lang.php +++ b/lib/plugins/plugin/lang/fr/lang.php @@ -61,4 +61,4 @@ $lang['enabled'] = 'Module %s activé.'; $lang['notenabled'] = 'Le module %s n\'a pas pu être activé, vérifiez le fichier des permissions.'; $lang['disabled'] = 'Module %s désactivé.'; $lang['notdisabled'] = 'Le module %s n\'a pas pu être désactivé, vérifiez le fichier des permissions.'; -$lang['packageinstalled'] = 'Ensemble de modules (%d module%s: %s) installé avec succès.'; +$lang['packageinstalled'] = 'Ensemble de modules (%d module(s): %s) installé avec succès.'; -- cgit v1.2.3 From a1dee2b998bc3dc8436bb076435d405ec412e054 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 11 Jul 2011 22:17:27 +0200 Subject: Fix some bugs and glitches in (mediamanager) tree * Fix selector in subtree loading callback * Remove HTML inconsistencies between AJAX and plain PHP lists * Unify icon and CSS class switching in dw_tree and dw_mediamanager --- lib/plugins/acl/admin.php | 11 ++--------- lib/plugins/acl/ajax.php | 11 ++++------- 2 files changed, 6 insertions(+), 16 deletions(-) (limited to 'lib/plugins') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index ea4184ca3..7c12b3374 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -253,19 +253,12 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { $data = $this->_get_tree($ns); // wrap a list with the root level around the other namespaces - $item = array( 'level' => 0, 'id' => '*', 'type' => 'd', - 'open' =>'true', 'label' => '['.$lang['mediaroot'].']'); + array_unshift($data, array( 'level' => 0, 'id' => '*', 'type' => 'd', + 'open' =>'true', 'label' => '['.$lang['mediaroot'].']')); - echo '
    '; - echo $this->_html_li_acl($item); - echo '
    '; - echo $this->_html_list_acl($item); - echo '
    '; echo html_buildlist($data,'acl', array($this,'_html_list_acl'), array($this,'_html_li_acl')); - echo ''; - echo '
'; } diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php index d91586a5d..d704fa8c9 100644 --- a/lib/plugins/acl/ajax.php +++ b/lib/plugins/acl/ajax.php @@ -44,13 +44,10 @@ if($ajax == 'info'){ $data = $acl->_get_tree($ns,$ns); - foreach($data as $item){ - $item['level'] = $lvl+1; - echo $acl->_html_li_acl($item); - echo '
'; - echo $acl->_html_list_acl($item); - echo '
'; - echo ''; + foreach(array_keys($data) as $item){ + $data[$item]['level'] = $lvl+1; } + echo html_buildlist($data, 'acl', array($acl, '_html_list_acl'), + array($acl, '_html_li_acl')); } -- cgit v1.2.3 From b704da0446180981f7b286604f732155a76306f7 Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Tue, 12 Jul 2011 19:43:37 +0200 Subject: Skipping plural form in plugin installed message (commit forgotten file) --- lib/plugins/plugin/classes/ap_download.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/plugins') diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php index e3afd142a..6aab4ba3c 100644 --- a/lib/plugins/plugin/classes/ap_download.class.php +++ b/lib/plugins/plugin/classes/ap_download.class.php @@ -114,7 +114,7 @@ class ap_download extends ap_manage { if ($tmp) $this->dir_delete($tmp); if (!$this->manager->error) { - msg(sprintf($this->lang['packageinstalled'], count($this->downloaded), (count($this->downloaded) != 1?'s':''), join(',',$this->downloaded)),1); + msg(sprintf($this->lang['packageinstalled'], count($this->downloaded), join(',',$this->downloaded)),1); $this->refresh(); return true; } -- cgit v1.2.3