From 27a8150a43aa6c4c88f168078fa0a684630b2d1b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 13 Sep 2012 17:06:45 +0100 Subject: deleted empty css files (How the hell did they get back in?) --- lib/tpl/dokuwiki/css/plugins.css | 0 lib/tpl/dokuwiki/css/rtl.css | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 lib/tpl/dokuwiki/css/plugins.css delete mode 100644 lib/tpl/dokuwiki/css/rtl.css (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/plugins.css b/lib/tpl/dokuwiki/css/plugins.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css deleted file mode 100644 index e69de29bb..000000000 -- cgit v1.2.3 From 1d93d6bdde1067a8ea641bdb2ce594d2fb3b78cf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 13 Sep 2012 17:07:35 +0100 Subject: corrected comment in style.ini --- lib/tpl/dokuwiki/style.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index 45e68e3ed..242b43080 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -3,8 +3,7 @@ ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently -; print, screen and rtl are supported. rtl styles are loaded additionally -; to screen styles if a right-to-left language is selected (eg. Hebrew). +; print, screen and all are supported. [stylesheets] -- cgit v1.2.3 From ee8400d60f3958a974fce9d8a176a563d14ac734 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 15 Sep 2012 21:00:15 +0100 Subject: let tables adjust to default width (FS#2598) --- lib/tpl/dokuwiki/css/content.css | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index ebeb4e17e..9f3eab0f0 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -70,7 +70,6 @@ /*____________ tables ____________*/ .dokuwiki div.table { - width: 100%; overflow-x: auto; margin-bottom: 1.4em; } -- cgit v1.2.3 From d33f2760e5d9ba44d858fef247c03fff3ca877f8 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 16 Sep 2012 13:03:28 +0100 Subject: moved media manager resize image to core image folder --- lib/images/resizecol.png | Bin 0 -> 158 bytes lib/tpl/dokuwiki/css/_media_fullscreen.css | 2 +- lib/tpl/dokuwiki/images/resizecol.png | Bin 158 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 lib/images/resizecol.png delete mode 100644 lib/tpl/dokuwiki/images/resizecol.png (limited to 'lib') diff --git a/lib/images/resizecol.png b/lib/images/resizecol.png new file mode 100644 index 000000000..b5aeec004 Binary files /dev/null and b/lib/images/resizecol.png differ diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index f795c6d65..c67e16051 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -65,7 +65,7 @@ #mediamanager__page .ui-resizable-e { width: 6px; right: 2px; - background: transparent url(images/resizecol.png) center center no-repeat; + background: transparent url(../../images/resizecol.png) center center no-repeat; } #mediamanager__page .ui-resizable-e:hover { background-color: __background_alt__; diff --git a/lib/tpl/dokuwiki/images/resizecol.png b/lib/tpl/dokuwiki/images/resizecol.png deleted file mode 100644 index b5aeec004..000000000 Binary files a/lib/tpl/dokuwiki/images/resizecol.png and /dev/null differ -- cgit v1.2.3 From e71b260a0446cb34eacbd16234691eca41feb9b1 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Tue, 18 Sep 2012 00:10:23 +0200 Subject: Simplify js_compress() for regular expressions FS#2593 This simplifies a while loop in the js_compress() code. The functionality of the new code is completely identical to the old code but it uses less comparisons and according to FS#2593 it is thus a lot faster. --- lib/exe/js.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index 634e21207..42979eeed 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -301,10 +301,8 @@ function js_compress($s){ // now move forward and find the end of it $j = 1; while($s{$i+$j} != '/'){ - while( ($s{$i+$j} != '\\') && ($s{$i+$j} != '/')){ - $j = $j + 1; - } if($s{$i+$j} == '\\') $j = $j + 2; + else $j++; } $result .= substr($s,$i,$j+1); $i = $i + $j + 1; -- cgit v1.2.3 From 19e77bae285ac9b74c39b7bfe457bb2d8331984a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 17 Sep 2012 23:16:47 +0100 Subject: fixed checkboxes missing border in Opera (FS#2603) --- lib/tpl/dokuwiki/css/basic.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 4942de001..55c1d2dfe 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -320,7 +320,7 @@ select:focus { input[type=radio], input[type=checkbox] { padding: 0; - border-width: 0; + border-style: none; box-shadow: none; } -- cgit v1.2.3 From 14977bd2edded61cecdc10116826eef384777e82 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Tue, 18 Sep 2012 21:57:56 +0200 Subject: Fix CSS cache handling and CSS output This fixes several problems: - the CSS cache was only updated when either the CSS files for all media types or one of the global files was modified - when only the screen CSS was changed, the screen CSS was regenerated but then the cache was printed which either caused duplicated screen CSS output when gzip output was disabled or invalid output with gzip enabled as first the plain text screen CSS and then the gzip-compressed cache file was printed Now first all CSS files are collected, then the cache is checked once and only after this the CSS content is collected. --- lib/exe/css.php | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index 8de3db11b..0ad9dee06 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -64,21 +64,27 @@ function css_out(){ // start output buffering ob_start(); + // Array of needed files and their web locations, the latter ones + // are needed to fix relative paths in the stylesheets + $files = array(); + + $cache_files = getConfigFiles('main'); + $cache_files[] = $tplinc.'style.ini'; + $cache_files[] = __FILE__; + foreach($mediatypes as $mediatype) { - // Array of needed files and their web locations, the latter ones - // are needed to fix relative paths in the stylesheets - $files = array(); + $files[$mediatype] = array(); // load core styles - $files[DOKU_INC.'lib/styles/'.$mediatype.'.css'] = DOKU_BASE.'lib/styles/'; + $files[$mediatype][DOKU_INC.'lib/styles/'.$mediatype.'.css'] = DOKU_BASE.'lib/styles/'; // load jQuery-UI theme if ($mediatype == 'screen') { - $files[DOKU_INC.'lib/scripts/jquery/jquery-ui-theme/smoothness.css'] = DOKU_BASE.'lib/scripts/jquery/jquery-ui-theme/'; + $files[$mediatype][DOKU_INC.'lib/scripts/jquery/jquery-ui-theme/smoothness.css'] = DOKU_BASE.'lib/scripts/jquery/jquery-ui-theme/'; } // load plugin styles - $files = array_merge($files, css_pluginstyles($mediatype)); + $files[$mediatype] = array_merge($files[$mediatype], css_pluginstyles($mediatype)); // load template styles if (isset($tplstyles[$mediatype])) { - $files = array_merge($files, $tplstyles[$mediatype]); + $files[$mediatype] = array_merge($files[$mediatype], $tplstyles[$mediatype]); } // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility if (isset($config_cascade['userstyle']['default'])) { @@ -86,7 +92,7 @@ function css_out(){ } // load user styles if(isset($config_cascade['userstyle'][$mediatype])){ - $files[$config_cascade['userstyle'][$mediatype]] = DOKU_BASE; + $files[$mediatype][$config_cascade['userstyle'][$mediatype]] = DOKU_BASE; } // load rtl styles // note: this adds the rtl styles only to the 'screen' media type @@ -94,20 +100,20 @@ function css_out(){ // please use "[dir=rtl]" in any css file in all, screen or print mode instead if ($mediatype=='screen') { if($lang['direction'] == 'rtl'){ - if (isset($tplstyles['rtl'])) $files = array_merge($files, $tplstyles['rtl']); + if (isset($tplstyles['rtl'])) $files[$mediatype] = array_merge($files[$mediatype], $tplstyles['rtl']); } } - $cache_files = array_merge(array_keys($files), getConfigFiles('main')); - $cache_files[] = $tplinc.'style.ini'; - $cache_files[] = __FILE__; + $cache_files = array_merge($cache_files, array_keys($files[$mediatype])); + } - // check cache age & handle conditional request - // This may exit if a cache can be used - http_cached($cache->cache, - $cache->useCache(array('files' => $cache_files))); + // check cache age & handle conditional request + // This may exit if a cache can be used + http_cached($cache->cache, + $cache->useCache(array('files' => $cache_files))); - // build the stylesheet + // build the stylesheet + foreach ($mediatypes as $mediatype) { // print the default classes for interwiki links and file downloads if ($mediatype == 'screen') { @@ -117,7 +123,7 @@ function css_out(){ // load files $css_content = ''; - foreach($files as $file => $location){ + foreach($files[$mediatype] as $file => $location){ $css_content .= css_loadfile($file, $location); } switch ($mediatype) { -- cgit v1.2.3 From dbf794bf86316c93b56454ab5d2c658598cce617 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Tue, 18 Sep 2012 22:46:47 +0200 Subject: Set default userstyle only once as screen userstyle --- lib/exe/css.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index 0ad9dee06..cee806ef4 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -61,6 +61,11 @@ function css_out(){ } } + // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility + if (isset($config_cascade['userstyle']['default'])) { + $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default']; + } + // start output buffering ob_start(); @@ -86,10 +91,6 @@ function css_out(){ if (isset($tplstyles[$mediatype])) { $files[$mediatype] = array_merge($files[$mediatype], $tplstyles[$mediatype]); } - // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility - if (isset($config_cascade['userstyle']['default'])) { - $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default']; - } // load user styles if(isset($config_cascade['userstyle'][$mediatype])){ $files[$mediatype][$config_cascade['userstyle'][$mediatype]] = DOKU_BASE; -- cgit v1.2.3 From c5c68de9adc23077defdd39f9264286a62fb2e0e Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Tue, 18 Sep 2012 22:47:22 +0200 Subject: Load rtl userstyle as it is still supported (did it ever work?) --- lib/exe/css.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index cee806ef4..fb639fc7e 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -102,6 +102,7 @@ function css_out(){ if ($mediatype=='screen') { if($lang['direction'] == 'rtl'){ if (isset($tplstyles['rtl'])) $files[$mediatype] = array_merge($files[$mediatype], $tplstyles['rtl']); + if (isset($config_cascade['userstyle']['rtl'])) $files[$mediatype][$config_cascade['userstyle']['rtl']] = DOKU_BASE; } } -- cgit v1.2.3 From 3899c2ecc4140de70c555215188bab73b4870e10 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Tue, 18 Sep 2012 22:53:59 +0200 Subject: Start output buffering in lib/exe/css.php only when the CSS is generated This prevents buffering of the cache file output. --- lib/exe/css.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index fb639fc7e..8899ff193 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -66,9 +66,6 @@ function css_out(){ $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default']; } - // start output buffering - ob_start(); - // Array of needed files and their web locations, the latter ones // are needed to fix relative paths in the stylesheets $files = array(); @@ -114,6 +111,9 @@ function css_out(){ http_cached($cache->cache, $cache->useCache(array('files' => $cache_files))); + // start output buffering + ob_start(); + // build the stylesheet foreach ($mediatypes as $mediatype) { -- cgit v1.2.3 From b9eadad04203ceb9b25fba98db5b56780b75b44e Mon Sep 17 00:00:00 2001 From: Edmondo Di Tucci Date: Fri, 21 Sep 2012 12:48:08 +0200 Subject: Italian language update --- lib/plugins/acl/lang/it/lang.php | 1 + lib/plugins/config/lang/it/lang.php | 3 +++ lib/plugins/plugin/lang/it/lang.php | 1 + lib/plugins/popularity/lang/it/lang.php | 1 + lib/plugins/revert/lang/it/lang.php | 1 + lib/plugins/usermanager/lang/it/lang.php | 1 + 6 files changed, 8 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php index a55a2c0f3..07e86697d 100644 --- a/lib/plugins/acl/lang/it/lang.php +++ b/lib/plugins/acl/lang/it/lang.php @@ -14,6 +14,7 @@ * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta * @author Matteo Pasotti + * @author snarchio@gmail.com */ $lang['admin_acl'] = 'Gestione Lista Controllo Accessi (ACL)'; $lang['acl_group'] = 'Gruppo'; diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php index 91c92bd85..751e5ee95 100644 --- a/lib/plugins/config/lang/it/lang.php +++ b/lib/plugins/config/lang/it/lang.php @@ -14,6 +14,7 @@ * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta * @author Matteo Pasotti + * @author snarchio@gmail.com */ $lang['menu'] = 'Configurazione Wiki'; $lang['error'] = 'Impostazioni non aggiornate a causa di un valore non corretto, controlla le modifiche apportate e salva di nuovo. @@ -49,6 +50,7 @@ $lang['title'] = 'Titolo del wiki'; $lang['start'] = 'Nome della pagina iniziale'; $lang['lang'] = 'Lingua'; $lang['template'] = 'Modello'; +$lang['tagline'] = 'Tagline (se il template lo supporta)'; $lang['sidebar'] = 'Nome pagina in barra laterale (se il template lo supporta), il campo vuoto disabilita la barra laterale'; $lang['license'] = 'Sotto quale licenza vorresti rilasciare il tuo contenuto?'; $lang['savedir'] = 'Directory per il salvataggio dei dati'; @@ -140,6 +142,7 @@ $lang['autoplural'] = 'Controlla il plurale nei collegamenti'; $lang['compression'] = 'Usa la compressione per i file dell\'archivio'; $lang['gzip_output'] = 'Usa il Content-Encoding gzip per xhtml'; $lang['compress'] = 'Comprimi i file CSS e javascript'; +$lang['cssdatauri'] = 'Dimensione massima in byte di un\'immagine che può essere integrata nel CSS per ridurre l\'overhead delle richieste HTTP. Questa tecnica non funziona con IE7 e precedenti! Da 400 a 600 bytes è un buon valore. Impostare a 0 per disabilitare.'; $lang['send404'] = 'Invia "HTTP 404/Pagina non trovata" per le pagine inesistenti'; $lang['broken_iua'] = 'La funzione ignore_user_abort non funziona sul tuo sistema? Questo potrebbe far sì che l\'indice di ricerca sia inutilizzabile. È noto che nella configurazione IIS+PHP/CGI non funziona. Vedi ilBug 852 per maggiori informazioni.'; $lang['xsendfile'] = 'Usare l\'header X-Sendfile per permettere al webserver di fornire file statici? Questa funzione deve essere supportata dal tuo webserver.'; diff --git a/lib/plugins/plugin/lang/it/lang.php b/lib/plugins/plugin/lang/it/lang.php index 3994948a0..9ae55c5de 100644 --- a/lib/plugins/plugin/lang/it/lang.php +++ b/lib/plugins/plugin/lang/it/lang.php @@ -14,6 +14,7 @@ * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta * @author Matteo Pasotti + * @author snarchio@gmail.com */ $lang['menu'] = 'Gestione Plugin'; $lang['download'] = 'Scarica e installa un nuovo plugin'; diff --git a/lib/plugins/popularity/lang/it/lang.php b/lib/plugins/popularity/lang/it/lang.php index 9bf4ca8c6..a0cf274aa 100644 --- a/lib/plugins/popularity/lang/it/lang.php +++ b/lib/plugins/popularity/lang/it/lang.php @@ -10,6 +10,7 @@ * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta * @author Matteo Pasotti + * @author snarchio@gmail.com */ $lang['name'] = 'Raccolta dati sul wiki (può impiegare del tempo per caricarsi)'; $lang['submit'] = 'Invia dati'; diff --git a/lib/plugins/revert/lang/it/lang.php b/lib/plugins/revert/lang/it/lang.php index a0b676d77..9c092de99 100644 --- a/lib/plugins/revert/lang/it/lang.php +++ b/lib/plugins/revert/lang/it/lang.php @@ -11,6 +11,7 @@ * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta * @author Matteo Pasotti + * @author snarchio@gmail.com */ $lang['menu'] = 'Gestore di ripristini'; $lang['filter'] = 'Cerca pagine con spam'; diff --git a/lib/plugins/usermanager/lang/it/lang.php b/lib/plugins/usermanager/lang/it/lang.php index 1e948baab..0222ff1e4 100644 --- a/lib/plugins/usermanager/lang/it/lang.php +++ b/lib/plugins/usermanager/lang/it/lang.php @@ -13,6 +13,7 @@ * @author Osman Tekin osman.tekin93@hotmail.it * @author Jacopo Corbetta * @author Matteo Pasotti + * @author snarchio@gmail.com */ $lang['menu'] = 'Gestione Utenti'; $lang['noauth'] = '(autenticazione non disponibile)'; -- cgit v1.2.3 From a27f1c2b89bb6f7764902caae0918b81a3074181 Mon Sep 17 00:00:00 2001 From: lainme Date: Fri, 21 Sep 2012 12:50:31 +0200 Subject: Simplified Chinese language update --- lib/plugins/plugin/lang/zh/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php index 58f05fbd9..473d31ead 100644 --- a/lib/plugins/plugin/lang/zh/lang.php +++ b/lib/plugins/plugin/lang/zh/lang.php @@ -60,4 +60,4 @@ $lang['enabled'] = '%s 插件启用'; $lang['notenabled'] = '%s插件启用失败，请检查文件权限。'; $lang['disabled'] = '%s 插件禁用'; $lang['notdisabled'] = '%s插件禁用失败，请检查文件权限。'; -$lang['packageinstalled'] = '插件 (%d plugin%s: %s) 已成功安装。'; +$lang['packageinstalled'] = '插件 (%d 插件: %s) 已成功安装。'; -- cgit v1.2.3 From 93877985689bddcc8d7315123025fada2d861586 Mon Sep 17 00:00:00 2001 From: Martin Michalek Date: Fri, 21 Sep 2012 13:08:35 +0200 Subject: Slovak language update --- lib/plugins/config/lang/sk/lang.php | 105 +++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 48 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index cbd69eb9e..9e18b3ed9 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -27,6 +27,8 @@ $lang['_anti_spam'] = 'Nastavenia anti-spamu'; $lang['_editing'] = 'Nastavenia úprav'; $lang['_links'] = 'Nastavenia odkazov'; $lang['_media'] = 'Nastavenia médií'; +$lang['_notifications'] = 'Nastavenie upozornení'; +$lang['_syndication'] = 'Nastavenie poskytovania obsahu'; $lang['_advanced'] = 'Rozšírené nastavenia'; $lang['_network'] = 'Nastavenia siete'; $lang['_plugin_sufix'] = 'Nastavenia plug-inu'; @@ -34,26 +36,29 @@ $lang['_template_sufix'] = 'Nastavenia šablóny'; $lang['_msg_setting_undefined'] = 'Nenastavené metadata.'; $lang['_msg_setting_no_class'] = 'Nenastavená trieda.'; $lang['_msg_setting_no_default'] = 'Žiadna predvolená hodnota.'; -$lang['fmode'] = 'Spôsob vytvárania súborov'; -$lang['dmode'] = 'Spôsob vytvárania adresárov'; +$lang['title'] = 'Názov wiki'; +$lang['start'] = 'Názov štartovacej stránky'; $lang['lang'] = 'Jazyk'; +$lang['template'] = 'Šablóna'; +$lang['tagline'] = 'Slogan (ak ho šablóna podporuje)'; +$lang['sidebar'] = 'Meno bočného panela (ak ho šablóna podporuje), prázdne pole deaktivuje bočný panel'; +$lang['license'] = 'Pod ktorou licenciou bude publikovaný obsah stránky?'; +$lang['savedir'] = 'Adresár pre ukladanie dát'; $lang['basedir'] = 'Hlavný adresár (napr. /dokuwiki/). Prázdna hodnota znamená použitie autodetekcie.'; $lang['baseurl'] = 'Adresa servera (napr. http://www.yourserver.com). Prázdna hodnota znamená použitie autodetekcie.'; -$lang['savedir'] = 'Adresár pre ukladanie dát'; $lang['cookiedir'] = 'Cesta k cookies. Prázdna hodnota znamená použitie adresy servera.'; -$lang['start'] = 'Názov štartovacej stránky'; -$lang['title'] = 'Názov wiki'; -$lang['template'] = 'Šablóna'; -$lang['license'] = 'Pod ktorou licenciou bude publikovaný obsah stránky?'; -$lang['fullpath'] = 'Zobrazovať plnú cestu k stránkam v pätičke'; +$lang['dmode'] = 'Spôsob vytvárania adresárov'; +$lang['fmode'] = 'Spôsob vytvárania súborov'; +$lang['allowdebug'] = 'Povoliť ladenie chýb deaktivujte, ak nie je potrebné!'; $lang['recent'] = 'Posledné zmeny'; +$lang['recent_days'] = 'Koľko posledných zmien uchovávať (dni)'; $lang['breadcrumbs'] = 'Počet záznamov histórie'; $lang['youarehere'] = 'Nachádzate sa'; +$lang['fullpath'] = 'Zobrazovať plnú cestu k stránkam v pätičke'; $lang['typography'] = 'Vykonať typografické zmeny'; -$lang['htmlok'] = 'Umožniť vkladanie HTML'; -$lang['phpok'] = 'Umožniť vkladanie PHP'; $lang['dformat'] = 'Formát dátumu (pozri funkciu PHP strftime)'; $lang['signature'] = 'Podpis'; +$lang['showuseras'] = 'Čo použiť pri zobrazení používateľa, ktorý posledný upravoval stránku'; $lang['toptoclevel'] = 'Najvyššia úroveň pre generovanie obsahu.'; $lang['tocminheads'] = 'Minimálny počet nadpisov pre generovanie obsahu'; $lang['maxtoclevel'] = 'Maximálna úroveň pre generovanie obsahu.'; @@ -61,16 +66,8 @@ $lang['maxseclevel'] = 'Maximálna úroveň sekcie pre editáciu'; $lang['camelcase'] = 'Použiť CamelCase pre odkazy'; $lang['deaccent'] = 'Upraviť názvy stránok'; $lang['useheading'] = 'Použiť nadpis pre názov stránky'; -$lang['refcheck'] = 'Kontrolovať odkazy na médiá (pred vymazaním)'; -$lang['refshow'] = 'Počet zobrazených odkazov na médiá'; -$lang['allowdebug'] = 'Povoliť ladenie chýb deaktivujte, ak nie je potrebné!'; -$lang['mediarevisions'] = 'Povoliť verzie súborov?'; -$lang['usewordblock'] = 'Blokovať spam na základe zoznamu známych slov'; -$lang['indexdelay'] = 'Časové oneskorenie pred indexovaním (sek)'; -$lang['relnofollow'] = 'Používať rel="nofollow" pre externé odkazy'; -$lang['mailguard'] = 'Zamaskovať e-mailovú adresu'; -$lang['iexssprotect'] = 'Kontrolovať nahraté súbory na prítomnosť nebezpečného JavaScript alebo HTML kódu'; -$lang['showuseras'] = 'Čo použiť pri zobrazení používateľa, ktorý posledný upravoval stránku'; +$lang['sneaky_index'] = 'DokuWiki implicitne ukazuje v indexe všetky menné priestory. Povolením tejto voľby sa nezobrazia menné priestory, ku ktorým nemá používateľ právo na čítanie. Dôsledkom môže byť nezobrazenie vnorených prístupných menných priestorov. Táto voľba môže mať za následok nepoužiteľnosť indexu s určitými ACL nastaveniami.'; +$lang['hidepages'] = 'Skryť zodpovedajúce stránky (regulárne výrazy)'; $lang['useacl'] = 'Použiť kontrolu prístupu (ACL)'; $lang['autopasswd'] = 'Autogenerovanie hesla'; $lang['authtype'] = 'Systém autentifikácie (back-end)'; @@ -79,58 +76,70 @@ $lang['defaultgroup'] = 'Predvolená skupina'; $lang['superuser'] = 'Správca - skupina, používateľ alebo čiarkou oddelený zoznam "pouzivatel1,@skupina1,pouzivatel2" s plným prístupom ku všetkým stránkam a funkciám nezávisle od ACL nastavení'; $lang['manager'] = 'Manažér - skupina, používateľ alebo čiarkou oddelený zoznam "pouzivatel1,@skupina1,pouzivatel2" s prístupom k vybraným správcovským funkciám'; $lang['profileconfirm'] = 'Potvrdzovať zmeny profilu heslom'; +$lang['rememberme'] = 'Povoliť trvalé prihlasovacie cookies (zapamätaj si ma)'; $lang['disableactions'] = 'Zakázať DokuWiki akcie'; $lang['disableactions_check'] = 'Skontrolovať'; $lang['disableactions_subscription'] = 'Povoliť/Zrušiť informovanie o zmenách stránky'; $lang['disableactions_wikicode'] = 'Pozrieť zdroj/Exportovať zdroj'; $lang['disableactions_other'] = 'Iné akcie (oddelené čiarkou)'; -$lang['sneaky_index'] = 'DokuWiki implicitne ukazuje v indexe všetky menné priestory. Povolením tejto voľby sa nezobrazia menné priestory, ku ktorým nemá používateľ právo na čítanie. Dôsledkom môže byť nezobrazenie vnorených prístupných menných priestorov. Táto voľba môže mať za následok nepoužiteľnosť indexu s určitými ACL nastaveniami.'; $lang['auth_security_timeout'] = 'Časový limit pri prihlasovaní (v sekundách)'; $lang['securecookie'] = 'Mal by prehliadač posielať cookies nastavené cez HTTPS posielať iba cez HTTPS (bezpečné) pripojenie? Vypnite túto voľbu iba v prípade, ak je prihlasovanie do Vašej wiki zabezpečené SSL, ale prezeranie wiki je nezabezpečené.'; +$lang['remote'] = 'Povolenie vzdialeného API. Umožnuje iným aplikáciám pristupovať k wiki cez XML-RPC alebo iným spôsobom.'; +$lang['remoteuser'] = 'Obmedzenie použitia vzdialeného API skupinám alebo používateľom oddelených čiarkami. Prázdne pole poskytuje prístup pre každého používateľa.'; +$lang['usewordblock'] = 'Blokovať spam na základe zoznamu známych slov'; +$lang['relnofollow'] = 'Používať rel="nofollow" pre externé odkazy'; +$lang['indexdelay'] = 'Časové oneskorenie pred indexovaním (sek)'; +$lang['mailguard'] = 'Zamaskovať e-mailovú adresu'; +$lang['iexssprotect'] = 'Kontrolovať nahraté súbory na prítomnosť nebezpečného JavaScript alebo HTML kódu'; +$lang['usedraft'] = 'Automaticky ukladať koncept počas úpravy stránky'; +$lang['htmlok'] = 'Umožniť vkladanie HTML'; +$lang['phpok'] = 'Umožniť vkladanie PHP'; +$lang['locktime'] = 'Maximálne trvanie blokovacích súborov (sek)'; +$lang['cachetime'] = 'Maximálne trvanie cache (sek)'; +$lang['target____wiki'] = 'Cieľové okno (target) pre interné odkazy'; +$lang['target____interwiki'] = 'Cieľové okno (target) pre interwiki odkazy'; +$lang['target____extern'] = 'Cieľové okno (target) pre externé odkazy'; +$lang['target____media'] = 'Cieľové okno (target) pre media odkazy'; +$lang['target____windows'] = 'Cieľové okno (target) pre windows odkazy'; +$lang['mediarevisions'] = 'Povoliť verzie súborov?'; +$lang['refcheck'] = 'Kontrolovať odkazy na médiá (pred vymazaním)'; +$lang['refshow'] = 'Počet zobrazených odkazov na médiá'; +$lang['gdlib'] = 'Verzia GD Lib'; +$lang['im_convert'] = 'Cesta k ImageMagick convert tool'; +$lang['jpg_quality'] = 'Kvalita JPG kompresie (0-100)'; +$lang['fetchsize'] = 'Maximálna veľkosť (v bajtoch) pri sťahovaní z externých zdrojov'; +$lang['subscribers'] = 'Povoliť podporu informovania o zmenách stránky'; +$lang['subscribe_time'] = 'Časový inteval, po uplynutí ktorého sú zasielané informácie o zmenách stránky alebo menného priestoru (sek); hodnota by mala byť menšia ako čas zadaný pri položke recent_days.'; +$lang['notify'] = 'Posielať upozornenia na zmeny na túto e-mailovú adresu'; +$lang['registernotify'] = 'Posielať informáciu o nových užívateľoch na túto e-mailovú adresu'; +$lang['mailfrom'] = 'E-mailová adresa na automatické e-maily'; +$lang['mailprefix'] = 'Prefix predmetu emailovej spravy zasielanej automaticky'; +$lang['htmlmail'] = 'Posielanie lepšie vyzerajúceho ale objemnejšieho HTML mailu. Deaktivovaním sa budú posielať iba textové maily.'; +$lang['sitemap'] = 'Generovať Google sitemap (dni)'; +$lang['rss_type'] = 'Typ XML feedu'; +$lang['rss_linkto'] = 'XML zdroj odkazuje na'; +$lang['rss_content'] = 'Čo zobrazovať v XML feede?'; +$lang['rss_update'] = 'Časový interval obnovy XML feedu (sek.)'; +$lang['rss_show_summary'] = 'XML zdroj ukáže prehľad v názve'; +$lang['rss_media'] = 'Aký typ zmien by mal byť zobrazený v XML feede?'; $lang['updatecheck'] = 'Kontrolovať aktualizácie a bezpečnostné upozornenia? DokuWiki potrebuje pre túto funkciu prístup k update.dokuwiki.org.'; $lang['userewrite'] = 'Používať nice URLs'; $lang['useslash'] = 'Používať lomku (/) ako oddeľovač v URL'; -$lang['usedraft'] = 'Automaticky ukladať koncept počas úpravy stránky'; $lang['sepchar'] = 'Oddeľovač slov v názvoch stránok'; $lang['canonical'] = 'Používať plne kanonické URL názvy'; $lang['fnencode'] = 'Spôsob kódovania non-ASCII mien súborov.'; $lang['autoplural'] = 'Kontrolovať množné číslo v odkazoch'; $lang['compression'] = 'Metóda kompresie pre staré verzie stránok'; -$lang['cachetime'] = 'Maximálne trvanie cache (sek)'; -$lang['locktime'] = 'Maximálne trvanie blokovacích súborov (sek)'; -$lang['fetchsize'] = 'Maximálna veľkosť (v bajtoch) pri sťahovaní z externých zdrojov'; -$lang['notify'] = 'Posielať upozornenia na zmeny na túto e-mailovú adresu'; -$lang['registernotify'] = 'Posielať informáciu o nových užívateľoch na túto e-mailovú adresu'; -$lang['mailfrom'] = 'E-mailová adresa na automatické e-maily'; -$lang['mailprefix'] = 'Prefix predmetu emailovej spravy zasielanej automaticky'; $lang['gzip_output'] = 'Používať gzip Content-Encoding pre xhtml'; -$lang['gdlib'] = 'Verzia GD Lib'; -$lang['im_convert'] = 'Cesta k ImageMagick convert tool'; -$lang['jpg_quality'] = 'Kvalita JPG kompresie (0-100)'; -$lang['subscribers'] = 'Povoliť podporu informovania o zmenách stránky'; -$lang['subscribe_time'] = 'Časový inteval, po uplynutí ktorého sú zasielané informácie o zmenách stránky alebo menného priestoru (sek); hodnota by mala byť menšia ako čas zadaný pri položke recent_days.'; $lang['compress'] = 'Komprimovať CSS a javascript výstup'; $lang['cssdatauri'] = 'Veľkosť v bytoch, do ktorej by mali byť obrázky s odkazom v CSS vložené priamo do štýlu z dôvodu obmedzenia HTTP požiadaviek. Tento postup nefunguje v IE verzie 7 a nižšie! Vhodná hodnota je od 400 do 600 bytov. Hodnota 0 deaktivuje túto metódu.'; -$lang['hidepages'] = 'Skryť zodpovedajúce stránky (regulárne výrazy)'; $lang['send404'] = 'Poslať "HTTP 404/Page Not Found" pre neexistujúce stránky'; -$lang['sitemap'] = 'Generovať Google sitemap (dni)'; $lang['broken_iua'] = 'Je vo Vašom systéme funkcia ignore_user_abort poškodená? Môže to mať za následok nefunkčnosť vyhľadávania v indexe. IIS+PHP/CGI je známy tým, že nefunguje správne. Pozrite Bug 852 pre dalšie informácie.'; $lang['xsendfile'] = 'Používať X-Sendfile hlavičku pre doručenie statických súborov webserverom? Webserver musí túto funkcionalitu podporovať.'; $lang['renderer_xhtml'] = 'Používané vykresľovacie jadro pre hlavný (xhtml) wiki výstup'; $lang['renderer__core'] = '%s (dokuwiki jadro)'; $lang['renderer__plugin'] = '%s (plugin)'; -$lang['rememberme'] = 'Povoliť trvalé prihlasovacie cookies (zapamätaj si ma)'; -$lang['rss_type'] = 'Typ XML feedu'; -$lang['rss_linkto'] = 'XML zdroj odkazuje na'; -$lang['rss_content'] = 'Čo zobrazovať v XML feede?'; -$lang['rss_update'] = 'Časový interval obnovy XML feedu (sek.)'; -$lang['recent_days'] = 'Koľko posledných zmien uchovávať (dni)'; -$lang['rss_show_summary'] = 'XML zdroj ukáže prehľad v názve'; -$lang['target____wiki'] = 'Cieľové okno (target) pre interné odkazy'; -$lang['target____interwiki'] = 'Cieľové okno (target) pre interwiki odkazy'; -$lang['target____extern'] = 'Cieľové okno (target) pre externé odkazy'; -$lang['target____media'] = 'Cieľové okno (target) pre media odkazy'; -$lang['target____windows'] = 'Cieľové okno (target) pre windows odkazy'; +$lang['dnslookups'] = 'DokuWiki hľadá mená vzdialených IP adries používateľov editujúcich stránky. Ak máte pomalý alebo nefunkčný DNS server alebo nechcete túto možnosť, deaktivujte túto voľbu'; $lang['proxy____host'] = 'Proxy server - názov'; $lang['proxy____port'] = 'Proxy server - port'; $lang['proxy____user'] = 'Proxy server - užívateľské meno'; -- cgit v1.2.3 From 89fd993fad76fc527d1f0e1546043908b728547e Mon Sep 17 00:00:00 2001 From: Robert Bogenschneider Date: Fri, 21 Sep 2012 13:09:38 +0200 Subject: Esperanto language update --- lib/plugins/config/lang/eo/lang.php | 107 +++++++++++++++++++----------------- lib/plugins/plugin/lang/eo/lang.php | 1 + 2 files changed, 57 insertions(+), 51 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php index de3c95bb5..36f865c28 100644 --- a/lib/plugins/config/lang/eo/lang.php +++ b/lib/plugins/config/lang/eo/lang.php @@ -32,6 +32,8 @@ $lang['_anti_spam'] = 'Kontraŭ-spamaj difinoj'; $lang['_editing'] = 'Difinoj por redakto'; $lang['_links'] = 'Difinoj por ligiloj'; $lang['_media'] = 'Difinoj por aŭdvidaĵoj'; +$lang['_notifications'] = 'Sciigaj agordoj'; +$lang['_syndication'] = 'Kunhavigaj agordoj'; $lang['_advanced'] = 'Fakaj difinoj'; $lang['_network'] = 'Difinoj por reto'; $lang['_plugin_sufix'] = 'Difinoj por kromaĵoj'; @@ -39,28 +41,29 @@ $lang['_template_sufix'] = 'Difinoj por ŝablonoj'; $lang['_msg_setting_undefined'] = 'Neniu difinanta metadatumaro.'; $lang['_msg_setting_no_class'] = 'Neniu difinanta klaso.'; $lang['_msg_setting_no_default'] = 'Neniu apriora valoro.'; -$lang['fmode'] = 'Reĝimo de dosiero-kreado'; -$lang['dmode'] = 'Reĝimo de dosierujo-kreado'; -$lang['lang'] = 'Lingvo'; -$lang['basedir'] = 'Baza dosierujo'; -$lang['baseurl'] = 'Baza URL'; -$lang['savedir'] = 'Dosierujo por konservi datumaron'; -$lang['cookiedir'] = 'Kuketopado. Lasu malplena por uzi baseurl.'; -$lang['start'] = 'Nomo de la hejmpaĝo'; $lang['title'] = 'Titolo de la vikio'; +$lang['start'] = 'Nomo de la hejmpaĝo'; +$lang['lang'] = 'Lingvo'; $lang['template'] = 'Ŝablono'; $lang['tagline'] = 'Moto (se la ŝablono antaûvidas tion)'; $lang['sidebar'] = 'Nomo de la flanka paĝo (se la ŝablono antaûvidas tion), malplena kampo malebligas la flankan paĝon'; $lang['license'] = 'Laŭ kiu permesilo via enhavo devus esti publikigita?'; -$lang['fullpath'] = 'Montri la kompletan padon de la paĝoj en la piedlinio'; +$lang['savedir'] = 'Dosierujo por konservi datumaron'; +$lang['basedir'] = 'Baza dosierujo'; +$lang['baseurl'] = 'Baza URL'; +$lang['cookiedir'] = 'Kuketopado. Lasu malplena por uzi baseurl.'; +$lang['dmode'] = 'Reĝimo de dosierujo-kreado'; +$lang['fmode'] = 'Reĝimo de dosiero-kreado'; +$lang['allowdebug'] = 'Ebligi kodumpurigadon malebligu se ne necese!<;/b>'; $lang['recent'] = 'Freŝaj ŝanĝoj'; +$lang['recent_days'] = 'Kiom da freŝaj ŝanĝoj por teni (tagoj)'; $lang['breadcrumbs'] = 'Nombro da paderoj'; $lang['youarehere'] = 'Hierarkiaj paderoj'; +$lang['fullpath'] = 'Montri la kompletan padon de la paĝoj en la piedlinio'; $lang['typography'] = 'Fari tipografiajn anstataŭigojn'; -$lang['htmlok'] = 'Ebligi enmeton de HTML-aĵoj'; -$lang['phpok'] = 'Ebligi enmeton de PHP-aĵoj'; $lang['dformat'] = 'Formato de datoj (vidu la PHP-an funkcion strftime)'; $lang['signature'] = 'Subskribo'; +$lang['showuseras'] = 'Kiel indiki la lastan redaktinton'; $lang['toptoclevel'] = 'Supera nivelo por la enhavtabelo'; $lang['tocminheads'] = 'Minimuma kvanto da ĉeftitoloj, kiu difinas ĉu la TOC estas kreata.'; $lang['maxtoclevel'] = 'Maksimuma nivelo por la enhavtabelo'; @@ -68,16 +71,8 @@ $lang['maxseclevel'] = 'Maksimuma nivelo por redakti sekciojn'; $lang['camelcase'] = 'Uzi KamelUsklecon por ligiloj'; $lang['deaccent'] = 'Netaj paĝnomoj'; $lang['useheading'] = 'Uzi unuan titolon por paĝnomoj'; -$lang['refcheck'] = 'Kontrolo por referencoj al aŭdvidaĵoj'; -$lang['refshow'] = 'Nombro da referencoj al aŭdvidaĵoj por montri'; -$lang['allowdebug'] = 'Ebligi kodumpurigadon malebligu se ne necese!<;/b>'; -$lang['mediarevisions'] = 'Ĉu ebligi reviziadon de aŭdvidaĵoj?'; -$lang['usewordblock'] = 'Bloki spamon surbaze de vortlisto'; -$lang['indexdelay'] = 'Prokrasto antaŭ ol indeksi (en sekundoj)'; -$lang['relnofollow'] = 'Uzi rel="nofollow" kun eksteraj ligiloj'; -$lang['mailguard'] = 'Nebuligi retadresojn'; -$lang['iexssprotect'] = 'Ekzameni elŝutaĵojn kontraŭ eblaj malicaj ĴavaSkripto aŭ HTML-a kodumaĵo'; -$lang['showuseras'] = 'Kiel indiki la lastan redaktinton'; +$lang['sneaky_index'] = 'Apriore, DokuWiki montras ĉiujn nomspacojn en la indeksa modo. Ebligi tiun ĉi elekteblon kaŝus tion, kion la uzanto ne rajtas legi laŭ ACL. Tio povus rezulti ankaŭan kaŝon de alireblaj subnomspacoj. Tiel la indekso estus neuzebla por kelkaj agordoj de ACL.'; +$lang['hidepages'] = 'Kaŝi kongruantajn paĝojn (laŭ regulaj esprimoj)'; $lang['useacl'] = 'Uzi alirkontrolajn listojn'; $lang['autopasswd'] = 'Aŭtomate krei pasvortojn'; $lang['authtype'] = 'Tipo de identiĝo'; @@ -86,61 +81,71 @@ $lang['defaultgroup'] = 'Antaŭdifinita grupo'; $lang['superuser'] = 'Superanto - grupo, uzanto aŭ listo (disigita per komoj), kiu plene alireblas al ĉiuj paĝoj kaj funkcioj, sendepende de la reguloj ACL'; $lang['manager'] = 'Administranto - grupo, uzanto aŭ listo (apartite per komoj), kiu havas alirpermeson al kelkaj administraj funkcioj'; $lang['profileconfirm'] = 'Konfirmi ŝanĝojn en la trajtaro per pasvorto'; +$lang['rememberme'] = 'Permesi longdaŭran ensalutajn kuketojn (rememoru min)'; $lang['disableactions'] = 'Malebligi DokuWiki-ajn agojn'; $lang['disableactions_check'] = 'Kontroli'; $lang['disableactions_subscription'] = 'Aliĝi/Malaliĝi'; $lang['disableactions_wikicode'] = 'Rigardi vikitekston/Eksporti fontotekston'; $lang['disableactions_other'] = 'Aliaj agoj (disigita per komoj)'; -$lang['sneaky_index'] = 'Apriore, DokuWiki montras ĉiujn nomspacojn en la indeksa modo. Ebligi tiun ĉi elekteblon kaŝus tion, kion la uzanto ne rajtas legi laŭ ACL. Tio povus rezulti ankaŭan kaŝon de alireblaj subnomspacoj. Tiel la indekso estus neuzebla por kelkaj agordoj de ACL.'; $lang['auth_security_timeout'] = 'Sekureca tempolimo por aŭtentigo (sekundoj)'; $lang['securecookie'] = 'Ĉu kuketoj difinitaj per HTTPS sendiĝu de la foliumilo nur per HTTPS? Malebligu tiun ĉi opcion kiam nur la ensaluto al via vikio estas sekurigita per SSL, sed foliumado de la vikio estas farita malsekure.'; -$lang['xmlrpc'] = 'Ebligi/malebligi la interfacon XML-RPC.'; -$lang['xmlrpcuser'] = 'Permesi XML-RPC-an aliron al certaj grupoj aŭ uzantoj, bonvolu meti iliajn komodisigitajn nomojn tien ĉi. Lasu ĝin malplena, se ĉiu povu aliri.'; +$lang['remote'] = 'Ebligu la traretan API-sistemon. Tio ebligas al aliaj aplikaĵoj aliri la vikion pere de XML-RPC aũ aliaj mekanismoj.'; +$lang['remoteuser'] = 'Limigi traretan API-aliron al la komodisigitaj grupoj aũ uzantoj indikitaj jene. Lasu malplena por ebligi aliron al ĉiu ajn.'; +$lang['usewordblock'] = 'Bloki spamon surbaze de vortlisto'; +$lang['relnofollow'] = 'Uzi rel="nofollow" kun eksteraj ligiloj'; +$lang['indexdelay'] = 'Prokrasto antaŭ ol indeksi (en sekundoj)'; +$lang['mailguard'] = 'Nebuligi retadresojn'; +$lang['iexssprotect'] = 'Ekzameni elŝutaĵojn kontraŭ eblaj malicaj ĴavaSkripto aŭ HTML-a kodumaĵo'; +$lang['usedraft'] = 'Aŭtomate konservi skizon dum redaktado'; +$lang['htmlok'] = 'Ebligi enmeton de HTML-aĵoj'; +$lang['phpok'] = 'Ebligi enmeton de PHP-aĵoj'; +$lang['locktime'] = 'Maksimuma aĝo por serurdosieroj (sek.)'; +$lang['cachetime'] = 'Maksimuma aĝo por provizmemoro (sek.)'; +$lang['target____wiki'] = 'Parametro "target" (celo) por internaj ligiloj'; +$lang['target____interwiki'] = 'Parametro "target" (celo) por intervikiaj ligiloj'; +$lang['target____extern'] = 'Parametro "target" (celo) por eksteraj ligiloj'; +$lang['target____media'] = 'Parametro "target" (celo) por aŭdvidaĵaj ligiloj'; +$lang['target____windows'] = 'Parametro "target" (celo) por Vindozaj ligiloj'; +$lang['mediarevisions'] = 'Ĉu ebligi reviziadon de aŭdvidaĵoj?'; +$lang['refcheck'] = 'Kontrolo por referencoj al aŭdvidaĵoj'; +$lang['refshow'] = 'Nombro da referencoj al aŭdvidaĵoj por montri'; +$lang['gdlib'] = 'Versio de GD-Lib'; +$lang['im_convert'] = 'Pado al la konvertilo de ImageMagick'; +$lang['jpg_quality'] = 'Kompaktiga kvalito de JPG (0-100)'; +$lang['fetchsize'] = 'Maksimuma grandeco (bitokoj), kiun fetch.php rajtas elŝuti el ekstere'; +$lang['subscribers'] = 'Ebligi subtenon de avizoj pri ŝanĝoj sur paĝoj'; +$lang['subscribe_time'] = 'Tempo, post kiu abonlistoj kaj kolektaĵoj sendiĝas (sek); Tio estu pli malgranda ol la tempo indikita en recent_days.'; +$lang['notify'] = 'Sendi avizojn pri ŝanĝoj al tiu ĉi retadreso'; +$lang['registernotify'] = 'Sendi informon pri ĵusaj aliĝintoj al tiu ĉi retadreso'; +$lang['mailfrom'] = 'Retadreso uzota por aŭtomataj retmesaĝoj '; +$lang['mailprefix'] = 'Retpoŝta temo-prefikso por uzi en aŭtomataj mesaĝoj'; +$lang['htmlmail'] = 'Sendi pli bele aspektajn, sed pli grandajn plurpartajn HTML-retpoŝtaĵojn. Malebligu por ricevi pure tekstajn mesaĝojn.'; +$lang['sitemap'] = 'Krei Guglan paĝarmapon "sitemap" (po kiom tagoj)'; +$lang['rss_type'] = 'XML-a tipo de novaĵ-fluo'; +$lang['rss_linkto'] = 'La novaĵ-fluo de XML ligiĝas al'; +$lang['rss_content'] = 'Kion montri en la XML-aj novaĵ-flueroj?'; +$lang['rss_update'] = 'Intertempo por ĝisdatigi XML-an novaĵ-fluon (sek.)'; +$lang['rss_show_summary'] = 'XML-a novaĵ-fluo montras resumon en la titolo'; +$lang['rss_media'] = 'Kiaj ŝangoj estu montrataj en la XML-fluo?'; $lang['updatecheck'] = 'Ĉu kontroli aktualigojn kaj sekurecajn avizojn? DokuWiki bezonas kontakti update.dokuwiki.org por tiu ĉi trajto.'; $lang['userewrite'] = 'Uzi netajn URL-ojn'; $lang['useslash'] = 'Uzi frakcistrekon kiel disigsignaĵon por nomspacoj en URL-oj'; -$lang['usedraft'] = 'Aŭtomate konservi skizon dum redaktado'; $lang['sepchar'] = 'Disigsignaĵo de vortoj en paĝnomoj'; $lang['canonical'] = 'Uzi tute evidentajn URL-ojn'; $lang['fnencode'] = 'Kodiga metodo por ne-ASCII-aj dosiernomoj.'; $lang['autoplural'] = 'Kontroli pluralajn formojn en ligiloj'; $lang['compression'] = 'Kompaktigmetodo por arkivaj dosieroj'; -$lang['cachetime'] = 'Maksimuma aĝo por provizmemoro (sek.)'; -$lang['locktime'] = 'Maksimuma aĝo por serurdosieroj (sek.)'; -$lang['fetchsize'] = 'Maksimuma grandeco (bitokoj), kiun fetch.php rajtas elŝuti el ekstere'; -$lang['notify'] = 'Sendi avizojn pri ŝanĝoj al tiu ĉi retadreso'; -$lang['registernotify'] = 'Sendi informon pri ĵusaj aliĝintoj al tiu ĉi retadreso'; -$lang['mailfrom'] = 'Retadreso uzota por aŭtomataj retmesaĝoj '; -$lang['mailprefix'] = 'Retpoŝta temo-prefikso por uzi en aŭtomataj mesaĝoj'; $lang['gzip_output'] = 'Uzi gzip-an enhav-enkodigon por XHTML'; -$lang['gdlib'] = 'Versio de GD-Lib'; -$lang['im_convert'] = 'Pado al la konvertilo de ImageMagick'; -$lang['jpg_quality'] = 'Kompaktiga kvalito de JPG (0-100)'; -$lang['subscribers'] = 'Ebligi subtenon de avizoj pri ŝanĝoj sur paĝoj'; -$lang['subscribe_time'] = 'Tempo, post kiu abonlistoj kaj kolektaĵoj sendiĝas (sek); Tio estu pli malgranda ol la tempo indikita en recent_days.'; $lang['compress'] = 'Kompaktigi CSS-ajn kaj ĵavaskriptajn elmetojn'; $lang['cssdatauri'] = 'Grandeco en bitokoj, ĝis kiom en CSS-dosieroj referencitaj bildoj enmetiĝu rekte en la stilfolion por malgrandigi vanan HTTP-kapan trafikon. Tiu tekniko ne funkcias en IE 7 aŭ pli frua! 400 ĝis 600 bitokoj estas bona grandeco. Indiku 0 por malebligi enmeton.'; -$lang['hidepages'] = 'Kaŝi kongruantajn paĝojn (laŭ regulaj esprimoj)'; $lang['send404'] = 'Sendi la mesaĝon "HTTP 404/Paĝo ne trovita" por ne ekzistantaj paĝoj'; -$lang['sitemap'] = 'Krei Guglan paĝarmapon "sitemap" (po kiom tagoj)'; $lang['broken_iua'] = 'Ĉu la funkcio "ignore_user_abort" difektas en via sistemo? Tio povus misfunkciigi la serĉindekson. IIS+PHP/CGI estas konata kiel fuŝaĵo. Vidu Cimon 852 por pli da informoj.'; $lang['xsendfile'] = 'Ĉu uzi la kaplinion X-Sendfile por ebligi al la retservilo liveri fiksajn dosierojn? Via retservilo subtenu tion.'; $lang['renderer_xhtml'] = 'Prezentilo por la ĉefa vikia rezulto (xhtml)'; $lang['renderer__core'] = '%s (DokuWiki-a kerno)'; $lang['renderer__plugin'] = '%s (kromaĵo)'; -$lang['rememberme'] = 'Permesi longdaŭran ensalutajn kuketojn (rememoru min)'; -$lang['rss_type'] = 'XML-a tipo de novaĵ-fluo'; -$lang['rss_linkto'] = 'La novaĵ-fluo de XML ligiĝas al'; -$lang['rss_content'] = 'Kion montri en la XML-aj novaĵ-flueroj?'; -$lang['rss_update'] = 'Intertempo por ĝisdatigi XML-an novaĵ-fluon (sek.)'; -$lang['recent_days'] = 'Kiom da freŝaj ŝanĝoj por teni (tagoj)'; -$lang['rss_show_summary'] = 'XML-a novaĵ-fluo montras resumon en la titolo'; -$lang['target____wiki'] = 'Parametro "target" (celo) por internaj ligiloj'; -$lang['target____interwiki'] = 'Parametro "target" (celo) por intervikiaj ligiloj'; -$lang['target____extern'] = 'Parametro "target" (celo) por eksteraj ligiloj'; -$lang['target____media'] = 'Parametro "target" (celo) por aŭdvidaĵaj ligiloj'; -$lang['target____windows'] = 'Parametro "target" (celo) por Vindozaj ligiloj'; +$lang['dnslookups'] = 'DokuWiki rigardos servilajn nomojn por paĝmodifoj tra fremdaj IP-adresoj. Se vi havas malrapidan aũ nefunkciantan DNS-servilon aũ malŝatas tiun trajton, malebligu tiun opcion'; $lang['proxy____host'] = 'Retservilnomo de la "Proxy"'; $lang['proxy____port'] = 'Pordo ĉe la "Proxy"'; $lang['proxy____user'] = 'Uzantonomo ĉe la "Proxy"'; diff --git a/lib/plugins/plugin/lang/eo/lang.php b/lib/plugins/plugin/lang/eo/lang.php index 36e7eadff..67553454c 100644 --- a/lib/plugins/plugin/lang/eo/lang.php +++ b/lib/plugins/plugin/lang/eo/lang.php @@ -10,6 +10,7 @@ * @author Erik Pedersen * @author Robert BOGENSCHNEIDER * @author Robert Bogenschneider + * @author Robert Bogenschneider */ $lang['menu'] = 'Administri Kromaĵojn'; $lang['download'] = 'Elŝuti kaj instali novan kromaĵon'; -- cgit v1.2.3 From 07834a7c661d05ab5c707e1c428421c87af565bf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 25 Sep 2012 19:47:10 +0100 Subject: de-couple mobile JS from widths to actual media query equivalent (fixes FS#2623) --- lib/tpl/dokuwiki/css/mobile.css | 14 ++++++++++++++ lib/tpl/dokuwiki/main.php | 1 + lib/tpl/dokuwiki/script.js | 25 +++++++++++++++---------- 3 files changed, 30 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 6e07f23ec..cc61ab06c 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -5,10 +5,20 @@ * @author Anika Henke */ +/* for detecting media queries in JavaScript (see script.js): */ +#screen__mode { + position: relative; + z-index: 0; +} + /* up to 979px screen widths ********************************************************************/ @media only screen and (max-width: 979px) { +#screen__mode { + z-index: 1; /* for detecting media queries in JavaScript (see script.js) */ +} + /* structure */ #dokuwiki__aside { width: 100%; @@ -107,6 +117,10 @@ ********************************************************************/ @media only screen and (max-width: 480px) { +#screen__mode { + z-index: 2; /* for detecting media queries in JavaScript (see script.js) */ +} + body { font-size: 100%; } diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 2406a206b..6b1e95d62 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -91,6 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
+
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index d858bda89..3ed8dbabe 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -12,18 +12,23 @@ var device_classes = 'desktop mobile tablet phone'; function tpl_dokuwiki_mobile(){ + // the z-index in mobile.css is (mis-)used purely for detecting the screen mode here + var screen_mode = jQuery('#screen__mode').css('z-index'); + // determine our device pattern // TODO: consider moving into dokuwiki core - var w = document.body.clientWidth; - if (w > 979) { - if (device_class == 'desktop') return; - device_class = 'desktop'; - } else if (w > 480) { - if (device_class.match(/tablet/)) return; - device_class = 'mobile tablet'; - } else { - if (device_class.match(/phone/)) return; - device_class = 'mobile phone'; + switch (screen_mode) { + case '1': + if (device_class.match(/tablet/)) return; + device_class = 'mobile tablet'; + break; + case '2': + if (device_class.match(/phone/)) return; + device_class = 'mobile phone'; + break; + default: + if (device_class == 'desktop') return; + device_class = 'desktop'; } jQuery('html').removeClass(device_classes).addClass(device_class); -- cgit v1.2.3 From 20391a36885910a616110df30f3ce30f8d23639d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 25 Sep 2012 20:25:54 +0100 Subject: removed html dependency from media query detection JS in new template --- lib/tpl/dokuwiki/css/mobile.css | 15 +++++---------- lib/tpl/dokuwiki/main.php | 1 - lib/tpl/dokuwiki/script.js | 6 +++--- 3 files changed, 8 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index cc61ab06c..ea32fb11d 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -5,18 +5,16 @@ * @author Anika Henke */ -/* for detecting media queries in JavaScript (see script.js): */ -#screen__mode { - position: relative; - z-index: 0; +body { + min-height: 0; /* for detecting media queries in JavaScript (see script.js): */ } /* up to 979px screen widths ********************************************************************/ @media only screen and (max-width: 979px) { -#screen__mode { - z-index: 1; /* for detecting media queries in JavaScript (see script.js) */ +body { + min-height: 1px; /* for detecting media queries in JavaScript (see script.js) */ } /* structure */ @@ -117,12 +115,9 @@ ********************************************************************/ @media only screen and (max-width: 480px) { -#screen__mode { - z-index: 2; /* for detecting media queries in JavaScript (see script.js) */ -} - body { font-size: 100%; + min-height: 2px; /* for detecting media queries in JavaScript (see script.js) */ } /*____________ structure ____________*/ diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 6b1e95d62..2406a206b 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -91,7 +91,6 @@ $showSidebar = $hasSidebar && ($ACT=='show');
-
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index 3ed8dbabe..ec6e5285e 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -13,16 +13,16 @@ var device_classes = 'desktop mobile tablet phone'; function tpl_dokuwiki_mobile(){ // the z-index in mobile.css is (mis-)used purely for detecting the screen mode here - var screen_mode = jQuery('#screen__mode').css('z-index'); + var screen_mode = jQuery('body').css('min-height'); // determine our device pattern // TODO: consider moving into dokuwiki core switch (screen_mode) { - case '1': + case '1px': if (device_class.match(/tablet/)) return; device_class = 'mobile tablet'; break; - case '2': + case '2px': if (device_class.match(/phone/)) return; device_class = 'mobile phone'; break; -- cgit v1.2.3 From 86ca15261461b6c74f66407e7ac6992baa097d0d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 26 Sep 2012 09:22:02 +0100 Subject: Revert "removed html dependency from media query detection JS in new template" ... because it made the solution less transparent, more error prone and even more like a hack than it already was This reverts commit 20391a36885910a616110df30f3ce30f8d23639d. --- lib/tpl/dokuwiki/css/mobile.css | 15 ++++++++++----- lib/tpl/dokuwiki/main.php | 1 + lib/tpl/dokuwiki/script.js | 6 +++--- 3 files changed, 14 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index ea32fb11d..cc61ab06c 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -5,16 +5,18 @@ * @author Anika Henke */ -body { - min-height: 0; /* for detecting media queries in JavaScript (see script.js): */ +/* for detecting media queries in JavaScript (see script.js): */ +#screen__mode { + position: relative; + z-index: 0; } /* up to 979px screen widths ********************************************************************/ @media only screen and (max-width: 979px) { -body { - min-height: 1px; /* for detecting media queries in JavaScript (see script.js) */ +#screen__mode { + z-index: 1; /* for detecting media queries in JavaScript (see script.js) */ } /* structure */ @@ -115,9 +117,12 @@ body { ********************************************************************/ @media only screen and (max-width: 480px) { +#screen__mode { + z-index: 2; /* for detecting media queries in JavaScript (see script.js) */ +} + body { font-size: 100%; - min-height: 2px; /* for detecting media queries in JavaScript (see script.js) */ } /*____________ structure ____________*/ diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 2406a206b..6b1e95d62 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -91,6 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
+
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index ec6e5285e..3ed8dbabe 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -13,16 +13,16 @@ var device_classes = 'desktop mobile tablet phone'; function tpl_dokuwiki_mobile(){ // the z-index in mobile.css is (mis-)used purely for detecting the screen mode here - var screen_mode = jQuery('body').css('min-height'); + var screen_mode = jQuery('#screen__mode').css('z-index'); // determine our device pattern // TODO: consider moving into dokuwiki core switch (screen_mode) { - case '1px': + case '1': if (device_class.match(/tablet/)) return; device_class = 'mobile tablet'; break; - case '2px': + case '2': if (device_class.match(/phone/)) return; device_class = 'mobile phone'; break; -- cgit v1.2.3 From 89a539f258c3cc00e6ed028bf3e0534f072b35bd Mon Sep 17 00:00:00 2001 From: Nick Reilingh Date: Sun, 30 Sep 2012 18:23:45 -0400 Subject: Changed XHTML validator icon to HTML5 (FS#2619) --- lib/tpl/dokuwiki/images/button-html5.png | Bin 0 -> 354 bytes lib/tpl/dokuwiki/images/button-xhtml.png | Bin 321 -> 0 bytes lib/tpl/dokuwiki/tpl_footer.php | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 lib/tpl/dokuwiki/images/button-html5.png delete mode 100644 lib/tpl/dokuwiki/images/button-xhtml.png (limited to 'lib') diff --git a/lib/tpl/dokuwiki/images/button-html5.png b/lib/tpl/dokuwiki/images/button-html5.png new file mode 100644 index 000000000..5885a331b Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-html5.png differ diff --git a/lib/tpl/dokuwiki/images/button-xhtml.png b/lib/tpl/dokuwiki/images/button-xhtml.png deleted file mode 100644 index ec686442c..000000000 Binary files a/lib/tpl/dokuwiki/images/button-xhtml.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php index 3a2e3d121..b7dc9c631 100644 --- a/lib/tpl/dokuwiki/tpl_footer.php +++ b/lib/tpl/dokuwiki/tpl_footer.php @@ -20,8 +20,8 @@ if (!defined('DOKU_INC')) die(); src="images/button-donate.gif" width="80" height="15" alt="Donate" /> >Powered by PHP - >Valid XHTML 1.0 + >Valid HTML5 >Valid CSS > Date: Sat, 6 Oct 2012 12:53:39 +0100 Subject: Revert "deleted very old (and unused) images", will deprecate them instead (FS#2612) This reverts commit ea62d5316150a9477d962aff311f9c6f64f68db7. --- lib/images/arrow_down.gif | Bin 0 -> 273 bytes lib/images/arrow_up.gif | Bin 0 -> 274 bytes lib/images/at.gif | Bin 0 -> 57 bytes lib/images/close.png | Bin 0 -> 137 bytes lib/images/del.png | Bin 0 -> 355 bytes lib/images/edit.gif | Bin 0 -> 142 bytes lib/images/icon-file.png | Bin 0 -> 3363 bytes lib/images/icon-thumb.png | Bin 0 -> 969 bytes lib/images/list-minus.gif | Bin 0 -> 64 bytes lib/images/list-plus.gif | Bin 0 -> 67 bytes lib/images/pencil.png | Bin 0 -> 391 bytes 11 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/images/arrow_down.gif create mode 100644 lib/images/arrow_up.gif create mode 100644 lib/images/at.gif create mode 100644 lib/images/close.png create mode 100644 lib/images/del.png create mode 100644 lib/images/edit.gif create mode 100644 lib/images/icon-file.png create mode 100644 lib/images/icon-thumb.png create mode 100644 lib/images/list-minus.gif create mode 100644 lib/images/list-plus.gif create mode 100644 lib/images/pencil.png (limited to 'lib') diff --git a/lib/images/arrow_down.gif b/lib/images/arrow_down.gif new file mode 100644 index 000000000..ff13b9585 Binary files /dev/null and b/lib/images/arrow_down.gif differ diff --git a/lib/images/arrow_up.gif b/lib/images/arrow_up.gif new file mode 100644 index 000000000..d491c18db Binary files /dev/null and b/lib/images/arrow_up.gif differ diff --git a/lib/images/at.gif b/lib/images/at.gif new file mode 100644 index 000000000..8bdf40d54 Binary files /dev/null and b/lib/images/at.gif differ diff --git a/lib/images/close.png b/lib/images/close.png new file mode 100644 index 000000000..4ccef0603 Binary files /dev/null and b/lib/images/close.png differ diff --git a/lib/images/del.png b/lib/images/del.png new file mode 100644 index 000000000..e59ded55f Binary files /dev/null and b/lib/images/del.png differ diff --git a/lib/images/edit.gif b/lib/images/edit.gif new file mode 100644 index 000000000..a2a23de7b Binary files /dev/null and b/lib/images/edit.gif differ diff --git a/lib/images/icon-file.png b/lib/images/icon-file.png new file mode 100644 index 000000000..d350c8c31 Binary files /dev/null and b/lib/images/icon-file.png differ diff --git a/lib/images/icon-thumb.png b/lib/images/icon-thumb.png new file mode 100644 index 000000000..ccc7a101d Binary files /dev/null and b/lib/images/icon-thumb.png differ diff --git a/lib/images/list-minus.gif b/lib/images/list-minus.gif new file mode 100644 index 000000000..36902f159 Binary files /dev/null and b/lib/images/list-minus.gif differ diff --git a/lib/images/list-plus.gif b/lib/images/list-plus.gif new file mode 100644 index 000000000..adc3fac8a Binary files /dev/null and b/lib/images/list-plus.gif differ diff --git a/lib/images/pencil.png b/lib/images/pencil.png new file mode 100644 index 000000000..78142b61e Binary files /dev/null and b/lib/images/pencil.png differ -- cgit v1.2.3 From c973a9c8b8f30a6c0c2122b87fd9c44af16ffec3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 6 Oct 2012 13:06:26 +0100 Subject: deprecated very old (and unused) images, deleted two which were never used (FS#2612) --- lib/images/_deprecated.txt | 12 ++++++++++++ lib/images/icon-file.png | Bin 3363 -> 0 bytes lib/images/icon-thumb.png | Bin 969 -> 0 bytes 3 files changed, 12 insertions(+) create mode 100644 lib/images/_deprecated.txt delete mode 100644 lib/images/icon-file.png delete mode 100644 lib/images/icon-thumb.png (limited to 'lib') diff --git a/lib/images/_deprecated.txt b/lib/images/_deprecated.txt new file mode 100644 index 000000000..bccea2049 --- /dev/null +++ b/lib/images/_deprecated.txt @@ -0,0 +1,12 @@ + +== @deprecated 2012-10-06 == + +arrow_down.gif +arrow_up.gif +at.gif +close.png +del.png +edit.gif +list-minus.gif +list-plus.gif +pencil.png diff --git a/lib/images/icon-file.png b/lib/images/icon-file.png deleted file mode 100644 index d350c8c31..000000000 Binary files a/lib/images/icon-file.png and /dev/null differ diff --git a/lib/images/icon-thumb.png b/lib/images/icon-thumb.png deleted file mode 100644 index ccc7a101d..000000000 Binary files a/lib/images/icon-thumb.png and /dev/null differ -- cgit v1.2.3 From 835dfcaefaa402c6f7c46b222b94da30a33571bf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 6 Oct 2012 13:42:03 +0100 Subject: Removed tpl_sidebar() to avoid fatal errors in other templates Replaced it by the old tpl_include_page() and made it more flexible by adding a boolean $propagate parameter. (It's false by default for backwards compatibility reasons. Should it rather be true? That would probably be what most users want.) --- lib/tpl/dokuwiki/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 6b1e95d62..820dd47df 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -42,7 +42,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
- +
-- cgit v1.2.3 From 85159e75b55f6a10010af360b6ebf9f952994511 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Oct 2012 02:55:37 +0100 Subject: removed stray closing div (FS#2633) --- lib/tpl/dokuwiki/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 820dd47df..963750a1c 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -91,7 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
-
+
-- cgit v1.2.3 From 3046a46462b44f28b1e5b1b25240a8ac4a859020 Mon Sep 17 00:00:00 2001 From: Zigor Astarbe Date: Sun, 7 Oct 2012 09:46:58 +0200 Subject: Basque language update --- lib/plugins/acl/lang/eu/lang.php | 1 + lib/plugins/config/lang/eu/lang.php | 98 +++++++++++++++++--------------- lib/plugins/plugin/lang/eu/lang.php | 1 + lib/plugins/popularity/lang/eu/lang.php | 1 + lib/plugins/revert/lang/eu/lang.php | 1 + lib/plugins/usermanager/lang/eu/lang.php | 1 + 6 files changed, 56 insertions(+), 47 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/eu/lang.php b/lib/plugins/acl/lang/eu/lang.php index 99e70ad00..b9285ff36 100644 --- a/lib/plugins/acl/lang/eu/lang.php +++ b/lib/plugins/acl/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi + * @author Zigor Astarbe */ $lang['admin_acl'] = 'Atzipen Kontrol Listaren Kudeaketa'; $lang['acl_group'] = 'Taldea'; diff --git a/lib/plugins/config/lang/eu/lang.php b/lib/plugins/config/lang/eu/lang.php index 97addbb50..4dd3ff351 100644 --- a/lib/plugins/config/lang/eu/lang.php +++ b/lib/plugins/config/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi + * @author Zigor Astarbe */ $lang['menu'] = 'Konfigurazio Ezarpenak'; $lang['error'] = 'Ezarpenak ez dira eguneratu balio oker bat dela eta, mesedez errepasatu aldaketak eta berriz bidali.
Balio okerra(k) ertz gorriz inguratuak erakutsiko dira. '; @@ -25,6 +26,8 @@ $lang['_anti_spam'] = 'Anti-Spam Ezarpenak'; $lang['_editing'] = 'Edizio Ezarpenak'; $lang['_links'] = 'Esteken Ezarpenak'; $lang['_media'] = 'Multimedia Ezarpenak'; +$lang['_notifications'] = 'Abisuen ezarpenak'; +$lang['_syndication'] = 'Sindikazio ezarpenak'; $lang['_advanced'] = 'Ezarpen Aurreratuak'; $lang['_network'] = 'Sare Ezarpenak'; $lang['_plugin_sufix'] = 'Plugin Ezarpenak'; @@ -32,25 +35,26 @@ $lang['_template_sufix'] = 'Txantiloi Ezarpenak'; $lang['_msg_setting_undefined'] = 'Ezarpen metadaturik ez.'; $lang['_msg_setting_no_class'] = 'Ezarpen klaserik ez.'; $lang['_msg_setting_no_default'] = 'Balio lehenetsirik ez.'; -$lang['fmode'] = 'Fitxategi sortze modua'; -$lang['dmode'] = 'Direktorio sortze modua'; -$lang['lang'] = 'Hizkuntza'; -$lang['basedir'] = 'Oinarri direktorioa'; -$lang['baseurl'] = 'Oinarri URLa'; -$lang['savedir'] = 'Datuak gordetzeko direktorioa'; -$lang['start'] = 'Hasiera orriaren izena'; $lang['title'] = 'Wiki-aren izenburua'; +$lang['start'] = 'Hasiera orriaren izena'; +$lang['lang'] = 'Hizkuntza'; $lang['template'] = 'Txantiloia'; $lang['license'] = 'Zein lizentziapean argitaratu beharko lirateke edukiak?'; -$lang['fullpath'] = 'Orri oinean orrien bide osoa erakutsi'; +$lang['savedir'] = 'Datuak gordetzeko direktorioa'; +$lang['basedir'] = 'Oinarri direktorioa'; +$lang['baseurl'] = 'Oinarri URLa'; +$lang['dmode'] = 'Direktorio sortze modua'; +$lang['fmode'] = 'Fitxategi sortze modua'; +$lang['allowdebug'] = 'Baimendu debug-a ezgaitu behar ez bada!'; $lang['recent'] = 'Azken aldaketak'; +$lang['recent_days'] = 'Zenbat azken aldaketa gordeko dira (egunak)'; $lang['breadcrumbs'] = 'Arrasto pauso kopurua'; $lang['youarehere'] = 'Arrasto pauso hierarkikoak'; +$lang['fullpath'] = 'Orri oinean orrien bide osoa erakutsi'; $lang['typography'] = 'Ordezkapen tipografikoak egin'; -$lang['htmlok'] = 'Enbotatutako HTMLa baimendu'; -$lang['phpok'] = 'Enbotatutako PHPa baimendu'; $lang['dformat'] = 'Data formatua (ikusi PHPren strftime funtzioa)'; $lang['signature'] = 'Sinadura'; +$lang['showuseras'] = 'Zer azaldu orri bat editatu duen azken erabiltzailea erakusterakoan'; $lang['toptoclevel'] = 'Eduki taularen goiko maila'; $lang['tocminheads'] = 'Gutxiengo izenburu kopuru minimoa Edukien Taula-ren sortu dadin.'; $lang['maxtoclevel'] = 'Eduki taularen maila maximoa'; @@ -58,15 +62,8 @@ $lang['maxseclevel'] = 'Sekzio edizio mailaren maximoa'; $lang['camelcase'] = 'Estekentzat CamelCase erabili'; $lang['deaccent'] = 'Orri izen garbiak'; $lang['useheading'] = 'Erabili lehen izenburua orri izen moduan'; -$lang['refcheck'] = 'Multimedia erreferentzia kontrolatu'; -$lang['refshow'] = 'Erakusteko multimedia erreferentzia kopurua'; -$lang['allowdebug'] = 'Baimendu debug-a ezgaitu behar ez bada!'; -$lang['usewordblock'] = 'Blokeatu spam-a hitz zerrenda batean oinarrituta'; -$lang['indexdelay'] = 'Denbora atzerapena indexatu baino lehen (seg)'; -$lang['relnofollow'] = 'Erabili rel="nofollow" kanpo esteketan'; -$lang['mailguard'] = 'Ezkutatu posta-e helbidea'; -$lang['iexssprotect'] = 'Egiaztatu igotako fitxategiak JavaScript edo HTML kode maltzurra detektatzeko'; -$lang['showuseras'] = 'Zer azaldu orri bat editatu duen azken erabiltzailea erakusterakoan'; +$lang['sneaky_index'] = 'Lehenespenez, DokuWiki-k izen-espazio guztiak indize bistan erakutsiko ditu. Aukera hau gaituta, erabiltzaieak irakurtzeko baimenik ez dituen izen-espazioak ezkutatuko dira. Honek atzigarriak diren azpi izen-espazioak ezkutatzen ditu. Agian honek indizea erabili ezin ahal izatea eragingo du AKL ezarpen batzuetan.'; +$lang['hidepages'] = 'Ezkutatu kointzidentziak dituzten orriak (espresio erregularrak)'; $lang['useacl'] = 'Erabili atzipen kontrol listak'; $lang['autopasswd'] = 'Pasahitzak automatikoki sortu'; $lang['authtype'] = 'Kautotze backend-a'; @@ -75,57 +72,64 @@ $lang['defaultgroup'] = 'Talde lehenetsia'; $lang['superuser'] = 'Supererabiltzailea - taldea, erabiltzailea edo komaz bereiztutako zerrenda user1,@group1,user2 orri eta funtzio guztietara atzipen osoarekin, AKL-ren ezarpenetan zehaztutakoa kontutan hartu gabe'; $lang['manager'] = 'Kudeatzailea - talde, erabiltzaile edo komaz bereiztutako zerrenda user1,@group1,user2 kudeatze funtzio zehatz batzuetara atzipenarekin'; $lang['profileconfirm'] = 'Profil aldaketak pasahitzaz berretsi'; +$lang['rememberme'] = 'Baimendu saio hasiera cookie iraunkorrak (gogoratu iezaidazu)'; $lang['disableactions'] = 'DokuWiki ekintzak ezgaitu'; $lang['disableactions_check'] = 'Egiaztatu'; $lang['disableactions_subscription'] = 'Harpidetu/Harpidetza utzi'; $lang['disableactions_wikicode'] = 'Ikusi iturburua/Esportatu Raw'; $lang['disableactions_other'] = 'Beste ekintzak (komaz bereiztuak)'; -$lang['sneaky_index'] = 'Lehenespenez, DokuWiki-k izen-espazio guztiak indize bistan erakutsiko ditu. Aukera hau gaituta, erabiltzaieak irakurtzeko baimenik ez dituen izen-espazioak ezkutatuko dira. Honek atzigarriak diren azpi izen-espazioak ezkutatzen ditu. Agian honek indizea erabili ezin ahal izatea eragingo du AKL ezarpen batzuetan.'; $lang['auth_security_timeout'] = 'Kautotze Segurtasun Denbora-Muga (segunduak)'; $lang['securecookie'] = 'HTTPS bidez ezarritako cookie-ak HTTPS bidez bakarrik bidali beharko lituzke nabigatzaileak? Ezgaitu aukera hau bakarrik saio hasierak SSL bidezko segurtasuna badu baina wiki-areb nabigazioa modu ez seguruan egiten bada. '; +$lang['usewordblock'] = 'Blokeatu spam-a hitz zerrenda batean oinarrituta'; +$lang['relnofollow'] = 'Erabili rel="nofollow" kanpo esteketan'; +$lang['indexdelay'] = 'Denbora atzerapena indexatu baino lehen (seg)'; +$lang['mailguard'] = 'Ezkutatu posta-e helbidea'; +$lang['iexssprotect'] = 'Egiaztatu igotako fitxategiak JavaScript edo HTML kode maltzurra detektatzeko'; +$lang['usedraft'] = 'Automatikoki zirriborroa gorde editatze garaian'; +$lang['htmlok'] = 'Enbotatutako HTMLa baimendu'; +$lang['phpok'] = 'Enbotatutako PHPa baimendu'; +$lang['locktime'] = 'Adin maximoa lock fitxategientzat (seg)'; +$lang['cachetime'] = 'Adin maximoa cachearentzat (seg)'; +$lang['target____wiki'] = 'Barne estekentzat helburu leihoa'; +$lang['target____interwiki'] = 'Interwiki estekentzat helburu leihoa'; +$lang['target____extern'] = 'Kanpo estekentzat helburu leihoa'; +$lang['target____media'] = 'Multimedia estekentzat helburu leihoa'; +$lang['target____windows'] = 'Leihoen estekentzat helburu leihoa'; +$lang['mediarevisions'] = 'Media rebisioak gaitu?'; +$lang['refcheck'] = 'Multimedia erreferentzia kontrolatu'; +$lang['refshow'] = 'Erakusteko multimedia erreferentzia kopurua'; +$lang['gdlib'] = 'GD Lib bertsioa'; +$lang['im_convert'] = 'ImageMagick-en aldaketa tresnara bidea'; +$lang['jpg_quality'] = 'JPG konprimitze kalitatea (0-100)'; +$lang['fetchsize'] = 'Kanpo esteketatik fetch.php-k deskargatu dezakeen tamaina maximoa (byteak)'; +$lang['subscribers'] = 'Gaitu orri harpidetza euskarria'; +$lang['subscribe_time'] = 'Harpidetza zerrendak eta laburpenak bidali aurretik pasa beharreko denbora (seg); Denbora honek, recent_days-en ezarritakoa baino txikiagoa behar luke.'; +$lang['notify'] = 'Aldaketen jakinarazpenak posta-e helbide honetara bidali'; +$lang['registernotify'] = 'Erregistratu berri diren erabiltzaileei buruzko informazioa post-e helbide honetara bidali'; +$lang['mailfrom'] = 'Posta automatikoentzat erabiliko den posta-e helbidea'; +$lang['mailprefix'] = 'Posta automatikoen gaientzat erabili beharreko aurrizkia'; +$lang['sitemap'] = 'Sortu Google gune-mapa (egunak)'; +$lang['rss_type'] = 'XML jario mota'; +$lang['rss_linkto'] = 'XML jarioak hona estekatzen du'; +$lang['rss_content'] = 'Zer erakutsi XML jarioetan?'; +$lang['rss_update'] = 'XML jarioaren eguneratze tartea (seg)'; +$lang['rss_show_summary'] = 'XML jarioak laburpena erakusten du izenburuan'; $lang['updatecheck'] = 'Konprobatu eguneratze eta segurtasun oharrak? DokuWiki-k honetarako update.dokuwiki.org kontaktatu behar du.'; $lang['userewrite'] = 'Erabili URL politak'; $lang['useslash'] = 'Erabili barra (/) izen-espazio banatzaile moduan URLetan'; -$lang['usedraft'] = 'Automatikoki zirriborroa gorde editatze garaian'; $lang['sepchar'] = 'Orri izenaren hitz banatzailea'; $lang['canonical'] = 'Erabili URL erabat kanonikoak'; $lang['fnencode'] = 'Non-ASCII fitxategi izenak kodetzeko metodoa.'; $lang['autoplural'] = 'Kontrolatu forma pluralak esteketan'; $lang['compression'] = 'Trinkotze metodoa attic fitxategientzat'; -$lang['cachetime'] = 'Adin maximoa cachearentzat (seg)'; -$lang['locktime'] = 'Adin maximoa lock fitxategientzat (seg)'; -$lang['fetchsize'] = 'Kanpo esteketatik fetch.php-k deskargatu dezakeen tamaina maximoa (byteak)'; -$lang['notify'] = 'Aldaketen jakinarazpenak posta-e helbide honetara bidali'; -$lang['registernotify'] = 'Erregistratu berri diren erabiltzaileei buruzko informazioa post-e helbide honetara bidali'; -$lang['mailfrom'] = 'Posta automatikoentzat erabiliko den posta-e helbidea'; -$lang['mailprefix'] = 'Posta automatikoen gaientzat erabili beharreko aurrizkia'; $lang['gzip_output'] = 'Gzip Eduki-Kodeketa erabili xhtml-rentzat'; -$lang['gdlib'] = 'GD Lib bertsioa'; -$lang['im_convert'] = 'ImageMagick-en aldaketa tresnara bidea'; -$lang['jpg_quality'] = 'JPG konprimitze kalitatea (0-100)'; -$lang['subscribers'] = 'Gaitu orri harpidetza euskarria'; -$lang['subscribe_time'] = 'Harpidetza zerrendak eta laburpenak bidali aurretik pasa beharreko denbora (seg); Denbora honek, recent_days-en ezarritakoa baino txikiagoa behar luke.'; $lang['compress'] = 'Trinkotu CSS eta javascript irteera'; -$lang['hidepages'] = 'Ezkutatu kointzidentziak dituzten orriak (espresio erregularrak)'; $lang['send404'] = 'Bidali "HTTP 404/Ez Da Orria Aurkitu" existitzen ez diren orrientzat'; -$lang['sitemap'] = 'Sortu Google gune-mapa (egunak)'; $lang['broken_iua'] = 'Zure sisteman ignore_user_abort (erabiltzailearen bertan behera uztea kontuan ez hartu) funtzioa hautsia al dago? Honek funtzionatzen ez duen bilaketa indize bat eragin dezake. ISS+PHP/CGI hautsiak daude. Ikusi Bug 852 informazio gehiago jasotzeko.'; $lang['xsendfile'] = 'X-Sendfile goiburua erabili web zerbitzariari fitxategi estatikoak bidaltzen uzteko? Zure web zerbitzariak hau ahalbidetuta eduki beharko du.'; $lang['renderer_xhtml'] = 'Erabiliko den errenderizatzailea wiki irteera (xhtml) nagusiarentzat'; $lang['renderer__core'] = '%s (dokuwiki-ren nukleoa)'; $lang['renderer__plugin'] = '%s (plugina)'; -$lang['rememberme'] = 'Baimendu saio hasiera cookie iraunkorrak (gogoratu iezaidazu)'; -$lang['rss_type'] = 'XML jario mota'; -$lang['rss_linkto'] = 'XML jarioak hona estekatzen du'; -$lang['rss_content'] = 'Zer erakutsi XML jarioetan?'; -$lang['rss_update'] = 'XML jarioaren eguneratze tartea (seg)'; -$lang['recent_days'] = 'Zenbat azken aldaketa gordeko dira (egunak)'; -$lang['rss_show_summary'] = 'XML jarioak laburpena erakusten du izenburuan'; -$lang['target____wiki'] = 'Barne estekentzat helburu leihoa'; -$lang['target____interwiki'] = 'Interwiki estekentzat helburu leihoa'; -$lang['target____extern'] = 'Kanpo estekentzat helburu leihoa'; -$lang['target____media'] = 'Multimedia estekentzat helburu leihoa'; -$lang['target____windows'] = 'Leihoen estekentzat helburu leihoa'; $lang['proxy____host'] = 'Proxy zerbitzari izena'; $lang['proxy____port'] = 'Proxy portua'; $lang['proxy____user'] = 'Proxyaren erabiltzaile izena'; diff --git a/lib/plugins/plugin/lang/eu/lang.php b/lib/plugins/plugin/lang/eu/lang.php index 56c03325f..2fc07fef9 100644 --- a/lib/plugins/plugin/lang/eu/lang.php +++ b/lib/plugins/plugin/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi + * @author Zigor Astarbe */ $lang['menu'] = 'Plugin-ak Kudeatu'; $lang['download'] = 'Plugin berri bat deskargatu eta instalatu'; diff --git a/lib/plugins/popularity/lang/eu/lang.php b/lib/plugins/popularity/lang/eu/lang.php index 05e4262de..b52ccaee1 100644 --- a/lib/plugins/popularity/lang/eu/lang.php +++ b/lib/plugins/popularity/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi + * @author Zigor Astarbe */ $lang['name'] = 'Popularitate Feedback-a (denbora dezente iraun dezake kargatzen)'; $lang['submit'] = 'Datuak Bidali'; diff --git a/lib/plugins/revert/lang/eu/lang.php b/lib/plugins/revert/lang/eu/lang.php index e94f07b2a..d3532c070 100644 --- a/lib/plugins/revert/lang/eu/lang.php +++ b/lib/plugins/revert/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi + * @author Zigor Astarbe */ $lang['menu'] = 'Berrezartze Kudeatzailea'; $lang['filter'] = 'Bilatu spam duten orriak'; diff --git a/lib/plugins/usermanager/lang/eu/lang.php b/lib/plugins/usermanager/lang/eu/lang.php index b6e04f7c4..5d3a01fc7 100644 --- a/lib/plugins/usermanager/lang/eu/lang.php +++ b/lib/plugins/usermanager/lang/eu/lang.php @@ -3,6 +3,7 @@ * Basque language file * * @author Inko Illarramendi + * @author Zigor Astarbe */ $lang['menu'] = 'Erabiltzaile Kudeatzailea'; $lang['noauth'] = '(erabiltzaile kautotzea ez dago erabilgarri)'; -- cgit v1.2.3 From 0e6f9f08b1c948f45d1867346a4502021afa55bc Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Oct 2012 15:30:38 +0100 Subject: added support for local style.ini files --- lib/exe/css.php | 29 +++++++++++++++++++++++------ lib/tpl/default/style.ini | 3 +++ lib/tpl/dokuwiki/style.ini | 3 +++ lib/tpl/index.php | 10 ++++++++-- 4 files changed, 37 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index 8899ff193..dd69c94cf 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -49,14 +49,17 @@ function css_out(){ $tpldir = tpl_basedir(); } + // used style.ini file + $styleini = css_styleini($tplinc); + // The generated script depends on some dynamic options $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tplinc.$type,'.css'); // load template styles $tplstyles = array(); - if(@file_exists($tplinc.'style.ini')){ - $ini = parse_ini_file($tplinc.'style.ini',true); - foreach($ini['stylesheets'] as $file => $mode){ + if ($styleini) { + $ini = parse_ini_file($styleini, true); + foreach($ini['stylesheets'] as $file => $mode) { $tplstyles[$mode][$tplinc.$file] = $tpldir; } } @@ -71,7 +74,8 @@ function css_out(){ $files = array(); $cache_files = getConfigFiles('main'); - $cache_files[] = $tplinc.'style.ini'; + if ($styleini) + $cache_files[] = $styleini; $cache_files[] = __FILE__; foreach($mediatypes as $mediatype) { @@ -173,13 +177,26 @@ function css_out(){ * @author Andreas Gohr */ function css_applystyle($css,$tplinc){ - if(@file_exists($tplinc.'style.ini')){ - $ini = parse_ini_file($tplinc.'style.ini',true); + $styleini = css_styleini($tplinc); + + if($styleini){ + $ini = parse_ini_file($styleini,true); $css = strtr($css,$ini['replacements']); } return $css; } +/** + * If either exist, get the template's style.local.ini or style.ini file. + */ +function css_styleini($tplinc) { + if(@file_exists($tplinc.'style.local.ini')) + return $tplinc.'style.local.ini'; + if(@file_exists($tplinc.'style.ini')) + return $tplinc.'style.ini'; + return ''; +} + /** * Prints classes for interwikilinks * diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index 7d27381c9..b9e1e9424 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -1,6 +1,9 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here +; Please only make changes in style.local.ini. If it doesn't exist, +; just create it by copying style.ini. + ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently ; print, screen and rtl are supported. rtl styles are loaded additionally diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index 242b43080..bcb5a1a2e 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -1,6 +1,9 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here +; Please only make changes in style.local.ini. If it doesn't exist, +; just create it by copying style.ini. + ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently ; print, screen and all are supported. diff --git a/lib/tpl/index.php b/lib/tpl/index.php index 357cc1f0d..7cdec9774 100644 --- a/lib/tpl/index.php +++ b/lib/tpl/index.php @@ -43,7 +43,13 @@ require_once(DOKU_INC.'inc/init.php'); '; echo "".htmlspecialchars($conf['template'])."'s style.ini"; @@ -60,7 +66,7 @@ if ($ini) { } echo ''; } else { - echo "

Non-existent template: ".htmlspecialchars($conf['template'])."

"; + echo "

Non-existent or invalid template or style.ini: ".htmlspecialchars($conf['template'])."

"; } ?> -- cgit v1.2.3 From 506c1de7b3fee44073b5ec5d944de4cbb03960a5 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 7 Oct 2012 20:34:34 +0200 Subject: fixed warning in popularity plugin FS#2628 --- lib/plugins/popularity/helper.php | 2 +- lib/plugins/popularity/plugin.info.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php index af1e8a706..34521021d 100644 --- a/lib/plugins/popularity/helper.php +++ b/lib/plugins/popularity/helper.php @@ -143,7 +143,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin { // number and size of pages $list = array(); - search($list,$conf['datadir'],array($this,'_search_count'),'',''); + search($list,$conf['datadir'],array($this,'_search_count'),array('all'=>false),''); $data['page_count'] = $list['file_count']; $data['page_size'] = $list['file_size']; $data['page_biggest'] = $list['file_max']; diff --git a/lib/plugins/popularity/plugin.info.txt b/lib/plugins/popularity/plugin.info.txt index 871259ee9..2f1451c4a 100644 --- a/lib/plugins/popularity/plugin.info.txt +++ b/lib/plugins/popularity/plugin.info.txt @@ -1,7 +1,7 @@ base popularity author Andreas Gohr email andi@splitbrain.org -date 2012-09-08 +date 2012-10-07 name Popularity Feedback Plugin desc Send anonymous data about your wiki to the developers. url http://www.dokuwiki.org/plugin:popularity -- cgit v1.2.3 From 9f6bf6d3f6b79437d248bbed29bad0f69afe8660 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 7 Oct 2012 20:47:18 +0200 Subject: adjusted h1 size in sidebar note: we recommend to NOT use H1 elements in the sidebar for semantic reasons --- lib/tpl/dokuwiki/css/design.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 12ec80687..67fe7ac13 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -264,6 +264,7 @@ /* make sidebar more condensed */ #dokuwiki__aside h1 { + font-size: 1.7em; margin-bottom: .222em; } #dokuwiki__aside h2 { -- cgit v1.2.3 From f3f24c6857f888109f23be1ab8dcf45df25b2ca5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Oct 2012 23:03:03 +0100 Subject: improvements to h1 in sidebar (follow font size scale + vertical grid) --- lib/tpl/dokuwiki/css/design.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 67fe7ac13..5cf7fad42 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -264,8 +264,8 @@ /* make sidebar more condensed */ #dokuwiki__aside h1 { - font-size: 1.7em; - margin-bottom: .222em; + font-size: 1.714em; + margin-bottom: .292em; } #dokuwiki__aside h2 { margin-bottom: .333em; -- cgit v1.2.3 From 650d96f6b66b6c10cb0f2e51a75def685e8fb2d3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 7 Oct 2012 23:58:42 +0100 Subject: fixed 2-digit ordered list items in sidebar (FS#2624) --- lib/tpl/dokuwiki/css/design.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 5cf7fad42..501e0a613 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -295,15 +295,16 @@ #dokuwiki__aside ul, #dokuwiki__aside ol { - padding-left: 0; + padding-left: .5em; } [dir=rtl] #dokuwiki__aside ul, [dir=rtl] #dokuwiki__aside ol { - padding-right: 0; + padding-right: .5em; } #dokuwiki__aside li ul, #dokuwiki__aside li ol { margin-bottom: 0; + padding: 0; } #dokuwiki__aside a:link, -- cgit v1.2.3 From 5db35f6f9b815f87ace9af277ca6e07a6edf9ae7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 10 Oct 2012 11:12:21 +0100 Subject: removed template dependencies from underscored CSS files in new default template --- lib/images/README | 6 ++++++ lib/images/bullet.png | Bin 0 -> 112 bytes lib/images/closed-rtl.png | Bin 0 -> 118 bytes lib/images/closed.png | Bin 0 -> 119 bytes lib/images/email.png | Bin 0 -> 659 bytes lib/images/external-link.png | Bin 0 -> 816 bytes lib/images/open.png | Bin 0 -> 118 bytes lib/images/unc.png | Bin 0 -> 553 bytes lib/tpl/dokuwiki/css/_links.css | 10 +++------- lib/tpl/dokuwiki/css/_toc.css | 8 ++++---- lib/tpl/dokuwiki/css/content.css | 15 ++++++++++++++- lib/tpl/dokuwiki/images/bullet.png | Bin 112 -> 0 bytes lib/tpl/dokuwiki/images/closed-rtl.png | Bin 118 -> 0 bytes lib/tpl/dokuwiki/images/closed.png | Bin 119 -> 0 bytes lib/tpl/dokuwiki/images/email.png | Bin 659 -> 0 bytes lib/tpl/dokuwiki/images/external-link.png | Bin 816 -> 0 bytes lib/tpl/dokuwiki/images/icons-license.txt | 5 ----- lib/tpl/dokuwiki/images/license.txt | 5 +++++ lib/tpl/dokuwiki/images/open.png | Bin 118 -> 0 bytes lib/tpl/dokuwiki/images/unc.png | Bin 553 -> 0 bytes lib/tpl/dokuwiki/style.ini | 6 +++--- 21 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 lib/images/README create mode 100644 lib/images/bullet.png create mode 100644 lib/images/closed-rtl.png create mode 100644 lib/images/closed.png create mode 100644 lib/images/email.png create mode 100644 lib/images/external-link.png create mode 100644 lib/images/open.png create mode 100644 lib/images/unc.png delete mode 100644 lib/tpl/dokuwiki/images/bullet.png delete mode 100644 lib/tpl/dokuwiki/images/closed-rtl.png delete mode 100644 lib/tpl/dokuwiki/images/closed.png delete mode 100644 lib/tpl/dokuwiki/images/email.png delete mode 100644 lib/tpl/dokuwiki/images/external-link.png delete mode 100644 lib/tpl/dokuwiki/images/icons-license.txt create mode 100644 lib/tpl/dokuwiki/images/license.txt delete mode 100644 lib/tpl/dokuwiki/images/open.png delete mode 100644 lib/tpl/dokuwiki/images/unc.png (limited to 'lib') diff --git a/lib/images/README b/lib/images/README new file mode 100644 index 000000000..e2788b400 --- /dev/null +++ b/lib/images/README @@ -0,0 +1,6 @@ + +Icons: email.png, external-link.png, unc.png +Icon set: Dusseldorf +Designer: pc.de +License: Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/] +URL: http://pc.de/icons/#Dusseldorf diff --git a/lib/images/bullet.png b/lib/images/bullet.png new file mode 100644 index 000000000..5e557b334 Binary files /dev/null and b/lib/images/bullet.png differ diff --git a/lib/images/closed-rtl.png b/lib/images/closed-rtl.png new file mode 100644 index 000000000..caa027e34 Binary files /dev/null and b/lib/images/closed-rtl.png differ diff --git a/lib/images/closed.png b/lib/images/closed.png new file mode 100644 index 000000000..e3bd0f9e9 Binary files /dev/null and b/lib/images/closed.png differ diff --git a/lib/images/email.png b/lib/images/email.png new file mode 100644 index 000000000..d1d4a5fd5 Binary files /dev/null and b/lib/images/email.png differ diff --git a/lib/images/external-link.png b/lib/images/external-link.png new file mode 100644 index 000000000..a4d5de17c Binary files /dev/null and b/lib/images/external-link.png differ diff --git a/lib/images/open.png b/lib/images/open.png new file mode 100644 index 000000000..5f2d408c5 Binary files /dev/null and b/lib/images/open.png differ diff --git a/lib/images/unc.png b/lib/images/unc.png new file mode 100644 index 000000000..a552d6e6f Binary files /dev/null and b/lib/images/unc.png differ diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css index e53ba45e5..7e5fb02cd 100644 --- a/lib/tpl/dokuwiki/css/_links.css +++ b/lib/tpl/dokuwiki/css/_links.css @@ -6,13 +6,9 @@ /* existing wikipage */ .dokuwiki a.wikilink1 { - color: __existing__; - background-color: inherit; } /* not existing wikipage */ .dokuwiki a.wikilink2 { - color: __missing__; - background-color: inherit; text-decoration: none; } .dokuwiki a.wikilink2:link, @@ -43,15 +39,15 @@ } /* external link */ .dokuwiki a.urlextern { - background-image: url(images/external-link.png); + background-image: url(../../images/external-link.png); } /* windows share */ .dokuwiki a.windows { - background-image: url(images/unc.png); + background-image: url(../../images/unc.png); } /* email link */ .dokuwiki a.mail { - background-image: url(images/email.png); + background-image: url(../../images/email.png); } /* icons of the following are set by dokuwiki in lib/exe/css.php */ diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css index 0d1b976d1..1226b5b5b 100644 --- a/lib/tpl/dokuwiki/css/_toc.css +++ b/lib/tpl/dokuwiki/css/_toc.css @@ -80,14 +80,14 @@ padding-right: 0; } .dokuwiki ul.idx li { - list-style-image: url(images/bullet.png); + list-style-image: url(../../images/bullet.png); } .dokuwiki ul.idx li.open { - list-style-image: url(images/open.png); + list-style-image: url(../../images/open.png); } .dokuwiki ul.idx li.closed { - list-style-image: url(images/closed.png); + list-style-image: url(../../images/closed.png); } [dir=rtl] .dokuwiki ul.idx li.closed { - list-style-image: url(images/closed-rtl.png); + list-style-image: url(../../images/closed-rtl.png); } diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index 9f3eab0f0..1d3ae8c01 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -6,7 +6,6 @@ * @author Clarence Lee */ - /*____________ section indenting ____________ .dokuwiki.page h1 {margin-left: 0;} @@ -34,6 +33,20 @@ /* hx margin-left = (1 / font-size) * .levelx-margin */ +/*____________ links to wiki pages (addition to _links) ____________*/ + +/* existing wikipage */ +.dokuwiki a.wikilink1 { + color: __existing__; + background-color: inherit; +} +/* not existing wikipage */ +.dokuwiki a.wikilink2 { + color: __missing__; + background-color: inherit; +} + + /*____________ images ____________*/ /* embedded images (styles are already partly set in lib/styles/all.css) */ diff --git a/lib/tpl/dokuwiki/images/bullet.png b/lib/tpl/dokuwiki/images/bullet.png deleted file mode 100644 index 5e557b334..000000000 Binary files a/lib/tpl/dokuwiki/images/bullet.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/closed-rtl.png b/lib/tpl/dokuwiki/images/closed-rtl.png deleted file mode 100644 index caa027e34..000000000 Binary files a/lib/tpl/dokuwiki/images/closed-rtl.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/closed.png b/lib/tpl/dokuwiki/images/closed.png deleted file mode 100644 index e3bd0f9e9..000000000 Binary files a/lib/tpl/dokuwiki/images/closed.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/email.png b/lib/tpl/dokuwiki/images/email.png deleted file mode 100644 index d1d4a5fd5..000000000 Binary files a/lib/tpl/dokuwiki/images/email.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/external-link.png b/lib/tpl/dokuwiki/images/external-link.png deleted file mode 100644 index a4d5de17c..000000000 Binary files a/lib/tpl/dokuwiki/images/external-link.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/icons-license.txt b/lib/tpl/dokuwiki/images/icons-license.txt deleted file mode 100644 index 7e12bbbd4..000000000 --- a/lib/tpl/dokuwiki/images/icons-license.txt +++ /dev/null @@ -1,5 +0,0 @@ -Icons for: sitetools.png, email.png, external-link.png and unc.png -Icon set: Dusseldorf -Designer: pc.de -License: Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/] -URL: http://pc.de/icons/#Dusseldorf diff --git a/lib/tpl/dokuwiki/images/license.txt b/lib/tpl/dokuwiki/images/license.txt new file mode 100644 index 000000000..7d12604b6 --- /dev/null +++ b/lib/tpl/dokuwiki/images/license.txt @@ -0,0 +1,5 @@ +Icons for: sitetools.png +Icon set: Dusseldorf +Designer: pc.de +License: Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/] +URL: http://pc.de/icons/#Dusseldorf diff --git a/lib/tpl/dokuwiki/images/open.png b/lib/tpl/dokuwiki/images/open.png deleted file mode 100644 index 5f2d408c5..000000000 Binary files a/lib/tpl/dokuwiki/images/open.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/images/unc.png b/lib/tpl/dokuwiki/images/unc.png deleted file mode 100644 index a552d6e6f..000000000 Binary files a/lib/tpl/dokuwiki/images/unc.png and /dev/null differ diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index 242b43080..d0292e9b1 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -54,6 +54,9 @@ __background_neu__ = "#ddd" ; border color __border__ = "#ccc" +; highlighted text (e.g. search snippets) +__highlight__ = "#ff9" + ;-------------------------------------------------------------------------- __background_site__ = "#fbfaf9" @@ -63,9 +66,6 @@ __link__ = "#2b73b7" __existing__ = "#080" __missing__ = "#d30" -; highlighting search snippets -__highlight__ = "#ff9" - ; site and sidebar widths __site_width__ = "75em" __sidebar_width__ = "16em" -- cgit v1.2.3 From 0ac69508958a06e566a51fb6a74802401ebe5eb5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 11 Oct 2012 13:26:47 +0100 Subject: changed local style.ini to be merged with standard one --- lib/exe/css.php | 33 +++++++++++++++++++++------------ lib/tpl/default/style.ini | 6 ++++-- lib/tpl/dokuwiki/style.ini | 6 ++++-- 3 files changed, 29 insertions(+), 16 deletions(-) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index dd69c94cf..ae160558a 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -58,8 +58,7 @@ function css_out(){ // load template styles $tplstyles = array(); if ($styleini) { - $ini = parse_ini_file($styleini, true); - foreach($ini['stylesheets'] as $file => $mode) { + foreach($styleini['stylesheets'] as $file => $mode) { $tplstyles[$mode][$tplinc.$file] = $tpldir; } } @@ -74,8 +73,8 @@ function css_out(){ $files = array(); $cache_files = getConfigFiles('main'); - if ($styleini) - $cache_files[] = $styleini; + $cache_files[] = $tplinc.'style.ini'; + $cache_files[] = $tplinc.'style.local.ini'; $cache_files[] = __FILE__; foreach($mediatypes as $mediatype) { @@ -180,21 +179,31 @@ function css_applystyle($css,$tplinc){ $styleini = css_styleini($tplinc); if($styleini){ - $ini = parse_ini_file($styleini,true); - $css = strtr($css,$ini['replacements']); + $css = strtr($css,$styleini['replacements']); } return $css; } /** - * If either exist, get the template's style.local.ini or style.ini file. + * Get contents of merged style.ini and style.local.ini as an array. + * + * @author Anika Henke */ function css_styleini($tplinc) { - if(@file_exists($tplinc.'style.local.ini')) - return $tplinc.'style.local.ini'; - if(@file_exists($tplinc.'style.ini')) - return $tplinc.'style.ini'; - return ''; + $styleini = array(); + + foreach (array($tplinc.'style.ini', $tplinc.'style.local.ini') as $ini) { + $tmp = (@file_exists($ini)) ? parse_ini_file($ini, true) : array(); + + foreach($tmp as $key => $value) { + if(array_key_exists($key, $styleini) && is_array($value)) { + $styleini[$key] = array_merge($styleini[$key], $tmp[$key]); + } else { + $styleini[$key] = $value; + } + } + } + return $styleini; } /** diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index b9e1e9424..726c2025d 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -1,8 +1,10 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here -; Please only make changes in style.local.ini. If it doesn't exist, -; just create it by copying style.ini. +; To extend this file or make changes to it, it is recommended to create +; a style.local.ini file to prevent losing any changes after an upgrade. +; Please don't forgot to copy the section your changes should be under +; (i.e. [stylesheets] or [replacements]) into that file as well. ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index bcb5a1a2e..86066fa3b 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -1,8 +1,10 @@ ; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; for limitations of the ini format used here -; Please only make changes in style.local.ini. If it doesn't exist, -; just create it by copying style.ini. +; To extend this file or make changes to it, it is recommended to create +; a style.local.ini file to prevent losing any changes after an upgrade. +; Please don't forgot to copy the section your changes should be under +; (i.e. [stylesheets] or [replacements]) into that file as well. ; Define the stylesheets your template uses here. The second value ; defines for which output media the style should be loaded. Currently -- cgit v1.2.3 From f809ae7b68654e512abb3c980f458bda533d1327 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 11 Oct 2012 13:48:09 +0100 Subject: fixed lib/tpl/index.php to reflect recent changes --- lib/tpl/index.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/tpl/index.php b/lib/tpl/index.php index 7cdec9774..3c00ab8e8 100644 --- a/lib/tpl/index.php +++ b/lib/tpl/index.php @@ -43,12 +43,10 @@ require_once(DOKU_INC.'inc/init.php'); '; -- cgit v1.2.3 From 870c8a4b77dd7c2cfdc14045f8604b5bbf34c01e Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 12 Oct 2012 00:41:37 +0100 Subject: #2541, alter section highlighting to insert a container into the DOM to hold the elements being highlighted & later remove it --- lib/scripts/page.js | 33 ++++++++++++++++++--------------- lib/tpl/dokuwiki/css/_edit.css | 6 ++++-- lib/tpl/dokuwiki/css/design.css | 6 ++++-- lib/tpl/dokuwiki/css/mobile.css | 6 ++++-- 4 files changed, 30 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/lib/scripts/page.js b/lib/scripts/page.js index b8e83cb0c..4ab0bf9b5 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -22,24 +22,27 @@ dw_page = { jQuery('form.btn_secedit') .mouseover(function(){ var $tgt = jQuery(this).parent(), - nr = $tgt.attr('class').match(/(\s+|^)editbutton_(\d+)(\s+|$)/)[2]; - - // Walk the DOM tree up (first previous siblings, then parents) - // until boundary element - while($tgt.length > 0 && !$tgt.hasClass('sectionedit' + nr)) { - // go down when the sectionedit begin marker is below $tgt - if ($tgt.find('.sectionedit' + nr).length > 0) { - $tgt = $tgt.children().last(); - } else { - // $.last gives the DOM-ordered last element: - // prev if present, else parent. - $tgt = $tgt.prev().add($tgt.parent()).last(); - } - $tgt.addClass('section_highlight'); + nr = $tgt.attr('class').match(/(\s+|^)editbutton_(\d+)(\s+|$)/)[2], + $highlight = jQuery(), // holder for elements in the section to be highlighted + $highlightWrap = jQuery('
'); // section highlight wrapper + + // Walk the dom tree in reverse to find the sibling which is or contains the section edit marker + while($tgt.length > 0 && !($tgt.hasClass('sectionedit' + nr) || $tgt.find('.sectionedit' + nr).length)) { + $tgt = $tgt.prev(); + $highlight = $highlight.add($tgt); } + // insert the section highlight wrapper before the last element added to $highlight + $highlight.filter(':last').before($highlightWrap); + // and move the elements to be highlighted inside the section highlight wrapper + $highlight.detach().appendTo($highlightWrap); }) .mouseout(function(){ - jQuery('.section_highlight').removeClass('section_highlight'); + // find the section highlight wrapper... + var $highlightWrap = jQuery('.section_highlight'); + // ...move its children in front of it (as siblings)... + $highlightWrap.before($highlightWrap.children().detach()); + // ...and remove the section highlight wrapper + $highlightWrap.detach(); }); }, diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css index e4182774e..bae69ad96 100644 --- a/lib/tpl/dokuwiki/css/_edit.css +++ b/lib/tpl/dokuwiki/css/_edit.css @@ -140,8 +140,10 @@ div.picker button.toolbutton { } /* style for section highlighting (only sections below headings) */ .dokuwiki div.section_highlight { - margin: -3em -1em -.01em -1em; /* negative side margin = side padding + side border */ - padding: 3em .5em .01em .5em; + margin-left: -1em; /* negative side margin = side padding + side border */ + margin-right: -1em; /* negative side margin = side padding + side border */ + padding-left: .5em; + padding-right: .5em; border: solid __background_alt__; border-width: 0 .5em; } diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 501e0a613..87610663d 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -421,8 +421,10 @@ } .dokuwiki div.section_highlight { - margin: -3em -2em -.01em -2em; - padding: 3em 1em .01em 1em; + margin-left: -2em; + margin-right: -2em; + padding-left: 1em; + padding-right: 1em; border-width: 0 1em; } [dir=rtl] .dokuwiki div.section_highlight { diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index cc61ab06c..7f106b046 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -92,8 +92,10 @@ /* _edit */ .dokuwiki div.section_highlight { - margin: -3em -1em -.01em -1em; - padding: 3em .5em .01em .5em; + margin-left: -1em; + margin-right: -1em; + padding-left: .5em; + padding-right: .5em; border-width: 0 .5em; } .dokuwiki div.preview { -- cgit v1.2.3 From 9f88c3ada06d83e6bed7fc70d1eb22a806ae40fe Mon Sep 17 00:00:00 2001 From: Frederico Goncalves Guimaraes Date: Fri, 12 Oct 2012 10:12:40 +0200 Subject: Brazilia Portuguese language update --- lib/plugins/config/lang/pt-br/lang.php | 106 +++++++++++++++------------- lib/plugins/popularity/lang/pt-br/intro.txt | 4 +- 2 files changed, 60 insertions(+), 50 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php index 8c0ef713a..7151713d8 100644 --- a/lib/plugins/config/lang/pt-br/lang.php +++ b/lib/plugins/config/lang/pt-br/lang.php @@ -39,33 +39,38 @@ $lang['_anti_spam'] = 'Configurações do anti-spam'; $lang['_editing'] = 'Configurações de edição'; $lang['_links'] = 'Configurações de link'; $lang['_media'] = 'Configurações de mídia'; +$lang['_notifications'] = 'Configurações de notificação'; +$lang['_syndication'] = 'Configurações de sindicância'; $lang['_advanced'] = 'Configurações avançadas'; $lang['_network'] = 'Configurações de rede'; $lang['_plugin_sufix'] = 'Configurações de plug-ins'; -$lang['_template_sufix'] = 'Configurações de modelos'; +$lang['_template_sufix'] = 'Configurações do modelo'; $lang['_msg_setting_undefined'] = 'Nenhum metadado configurado.'; $lang['_msg_setting_no_class'] = 'Nenhuma classe definida.'; $lang['_msg_setting_no_default'] = 'Nenhum valor padrão.'; -$lang['fmode'] = 'Modo de criação do arquivo'; -$lang['dmode'] = 'Modo de criação do diretório'; +$lang['title'] = 'Título do wiki'; +$lang['start'] = 'Nome da página inicial'; $lang['lang'] = 'Idioma'; +$lang['template'] = 'Modelo, ou a aparência do wiki.'; +$lang['tagline'] = 'Slogan (caso o modelo suporte isso)'; +$lang['sidebar'] = 'Nome da página da barra lateral (caso o modelo suporte isso). Deixe em branco para desabilitar a barra lateral.'; +$lang['license'] = 'Sob qual licença o seu conteúdo deve ser disponibilizado?'; +$lang['savedir'] = 'Diretório para salvar os dados'; $lang['basedir'] = 'Diretório base'; $lang['baseurl'] = 'URL base'; -$lang['savedir'] = 'Diretório para salvar os dados'; $lang['cookiedir'] = 'Caminhos dos cookies. Deixe em branco para usar a url base.'; -$lang['start'] = 'Nome da página inicial'; -$lang['title'] = 'Título do wiki'; -$lang['template'] = 'Modelo'; -$lang['license'] = 'Sob qual licença o seu conteúdo deve ser disponibilizado?'; -$lang['fullpath'] = 'Indica o caminho completo das páginas no rodapé'; +$lang['dmode'] = 'Modo de criação do diretório'; +$lang['fmode'] = 'Modo de criação do arquivo'; +$lang['allowdebug'] = 'Habilitar a depuração (desabilite se não for necessário!)'; $lang['recent'] = 'Modificações recentes'; +$lang['recent_days'] = 'Quantas mudanças recentes devem ser mantidas (dias)?'; $lang['breadcrumbs'] = 'Número de elementos na trilha de páginas visitadas'; $lang['youarehere'] = 'Trilha hierárquica'; +$lang['fullpath'] = 'Indica o caminho completo das páginas no rodapé'; $lang['typography'] = 'Efetuar modificações tipográficas'; -$lang['htmlok'] = 'Permitir incorporação de HTML'; -$lang['phpok'] = 'Permitir incorporação de PHP'; $lang['dformat'] = 'Formato da data (veja a função strftime do PHP)'; $lang['signature'] = 'Assinatura'; +$lang['showuseras'] = 'O que exibir quando mostrar o usuário que editou a página pela última vez'; $lang['toptoclevel'] = 'Nível mais alto para a tabela de conteúdos'; $lang['tocminheads'] = 'Quantidade mínima de cabeçalhos para a construção da tabela de conteúdos.'; $lang['maxtoclevel'] = 'Nível máximo para entrar na tabela de conteúdos'; @@ -73,15 +78,8 @@ $lang['maxseclevel'] = 'Nível máximo para gerar uma seção de ediç $lang['camelcase'] = 'Usar CamelCase para links'; $lang['deaccent'] = '"Limpar" os nomes das páginas'; $lang['useheading'] = 'Usar o primeiro cabeçalho como nome da página'; -$lang['refcheck'] = 'Verificação de referência da mídia'; -$lang['refshow'] = 'Número de referências de mídia a exibir'; -$lang['allowdebug'] = 'Habilitar a depuração (desabilite se não for necessário!)'; -$lang['usewordblock'] = 'Bloquear spam baseado em lista de palavras'; -$lang['indexdelay'] = 'Tempo de espera antes da indexação (seg)'; -$lang['relnofollow'] = 'Usar rel="nofollow" em links externos'; -$lang['mailguard'] = 'Obscurecer endereços de e-mail'; -$lang['iexssprotect'] = 'Verificar a existência de possíveis códigos maliciosos em HTML ou JavaScript nos arquivos enviados'; -$lang['showuseras'] = 'O que exibir quando mostrar o usuário que editou a página pela última vez'; +$lang['sneaky_index'] = 'Por padrão, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles que o usuário não tiver permissão de leitura. Isso pode resultar na omissão de subespaços de nomes, tornando o índice inútil para certas configurações de ACL.'; +$lang['hidepages'] = 'Esconder páginas correspondentes (expressão regular)'; $lang['useacl'] = 'Usar listas de controle de acesso'; $lang['autopasswd'] = 'Gerar senhas automaticamente'; $lang['authtype'] = 'Método de autenticação'; @@ -90,58 +88,70 @@ $lang['defaultgroup'] = 'Grupo padrão'; $lang['superuser'] = 'Superusuário - um grupo, usuário ou uma lista separada por vírgulas (usuário1,@grupo1,usuário2) que tenha acesso completo a todas as páginas e funções, independente das definições da ACL'; $lang['manager'] = 'Gerente - um grupo, usuário ou uma lista separada por vírgulas (usuário1,@grupo1,usuário2) que tenha acesso a certas funções de gerenciamento'; $lang['profileconfirm'] = 'Confirmar mudanças no perfil com a senha'; +$lang['rememberme'] = 'Permitir cookies de autenticação permanentes ("Lembre-se de mim")'; $lang['disableactions'] = 'Desabilitar as ações do DokuWiki'; $lang['disableactions_check'] = 'Verificação'; $lang['disableactions_subscription'] = 'Monitoramento'; $lang['disableactions_wikicode'] = 'Ver a fonte/Exportar sem processamento'; $lang['disableactions_other'] = 'Outras ações (separadas por vírgula)'; -$lang['sneaky_index'] = 'Por padrão, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles que o usuário não tiver permissão de leitura. Isso pode resultar na omissão de subespaços de nomes, tornando o índice inútil para certas configurações de ACL.'; $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)'; $lang['securecookie'] = 'Os cookies definidos via HTTPS devem ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação, de maneira insegura.'; +$lang['remote'] = 'Habilitar o sistema de API remota. Isso permite que outras aplicações acessem o wiki via XML-RPC ou outros mecanismos.'; +$lang['remoteuser'] = 'Restringir o acesso à API remota aos grupos ou usuários definidos aqui (separados por vírgulas). Deixe em branco para permitir o acesso a qualquer um.'; +$lang['usewordblock'] = 'Bloquear spam baseado em lista de palavras'; +$lang['relnofollow'] = 'Usar rel="nofollow" em links externos'; +$lang['indexdelay'] = 'Tempo de espera antes da indexação (seg)'; +$lang['mailguard'] = 'Obscurecer endereços de e-mail'; +$lang['iexssprotect'] = 'Verificar a existência de possíveis códigos maliciosos em HTML ou JavaScript nos arquivos enviados'; +$lang['usedraft'] = 'Salvar o rascunho automaticamente durante a edição'; +$lang['htmlok'] = 'Permitir incorporação de HTML'; +$lang['phpok'] = 'Permitir incorporação de PHP'; +$lang['locktime'] = 'Tempo máximo para o bloqueio de arquivos (seg)'; +$lang['cachetime'] = 'Tempo máximo para o cache (seg)'; +$lang['target____wiki'] = 'Parâmetro "target" para links internos'; +$lang['target____interwiki'] = 'Parâmetro "target" para links interwiki'; +$lang['target____extern'] = 'Parâmetro "target" para links externos'; +$lang['target____media'] = 'Parâmetro "target" para links de mídia'; +$lang['target____windows'] = 'Parâmetro "target" para links do Windows'; +$lang['mediarevisions'] = 'Habilitar revisões de mídias?'; +$lang['refcheck'] = 'Verificação de referência da mídia'; +$lang['refshow'] = 'Número de referências de mídia a exibir'; +$lang['gdlib'] = 'Versão da biblioteca "GD Lib"'; +$lang['im_convert'] = 'Caminho para a ferramenta de conversão ImageMagick'; +$lang['jpg_quality'] = 'Qualidade de compressão do JPG (0-100)'; +$lang['fetchsize'] = 'Tamanho máximo (em bytes) que o "fetch.php" pode transferir do exterior'; +$lang['subscribers'] = 'Habilitar o suporte ao monitoramento de páginas'; +$lang['subscribe_time'] = 'Tempo de espera antes do envio das listas e mensagens de monitoramento (segundos); este tempo deve ser menor que o especificado no parâmetro recent_days'; +$lang['notify'] = 'Enviar notificações de mudança para esse endereço de e-mail'; +$lang['registernotify'] = 'Enviar informações de usuários registrados para esse endereço de e-mail'; +$lang['mailfrom'] = 'Endereço de e-mail a ser utilizado para mensagens automáticas'; +$lang['mailprefix'] = 'Prefixo do assunto dos e-mails de envio automático'; +$lang['htmlmail'] = 'Enviar e-mail HTML multipartes, que têm uma aparência melhor, mas um tamanho maior. Desabilite para enviar e-mails em texto puro.'; +$lang['sitemap'] = 'Gerar Google Sitemap (dias)'; +$lang['rss_type'] = 'Tipo de fonte XML'; +$lang['rss_linkto'] = 'Os links da fonte XML apontam para'; +$lang['rss_content'] = 'O que deve ser exibido nos itens da fonte XML?'; +$lang['rss_update'] = 'Intervalo de atualização da fonte XML (seg)'; +$lang['rss_show_summary'] = 'Resumo de exibição da fonte XML no título'; +$lang['rss_media'] = 'Que tipo de alterações devem ser listadas na fonte XML?'; $lang['updatecheck'] = 'Verificar atualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efetuar esse recurso.'; $lang['userewrite'] = 'Usar URLs "limpas"'; $lang['useslash'] = 'Usar a barra como separador de espaços de nomes nas URLs'; -$lang['usedraft'] = 'Salvar o rascunho automaticamente durante a edição'; $lang['sepchar'] = 'Separador de palavras no nome da página'; $lang['canonical'] = 'Usar URLs absolutas (http://servidor/caminho)'; $lang['fnencode'] = 'Método de codificação não-ASCII de nome de arquivos.'; $lang['autoplural'] = 'Verificar formas plurais nos links'; $lang['compression'] = 'Método de compressão para arquivos antigos'; -$lang['cachetime'] = 'Tempo máximo para o cache (seg)'; -$lang['locktime'] = 'Tempo máximo para o bloqueio de arquivos (seg)'; -$lang['fetchsize'] = 'Tamanho máximo (em bytes) que o "fetch.php" pode transferir do exterior'; -$lang['notify'] = 'Enviar notificações de mudança para esse endereço de e-mail'; -$lang['registernotify'] = 'Enviar informações de usuários registrados para esse endereço de e-mail'; -$lang['mailfrom'] = 'Endereço de e-mail a ser utilizado para mensagens automáticas'; -$lang['mailprefix'] = 'Prefixo do assunto dos e-mails de envio automático'; $lang['gzip_output'] = 'Usar "Content-Encoding" do gzip para o código xhtml'; -$lang['gdlib'] = 'Versão da biblioteca "GD Lib"'; -$lang['im_convert'] = 'Caminho para a ferramenta de conversão ImageMagick'; -$lang['jpg_quality'] = 'Qualidade de compressão do JPG (0-100)'; -$lang['subscribers'] = 'Habilitar o suporte ao monitoramento de páginas'; -$lang['subscribe_time'] = 'Tempo de espera antes do envio das listas e mensagens de monitoramento (segundos); este tempo deve ser menor que o especificado no parâmetro recent_days'; $lang['compress'] = 'Compactar as saídas de CSS e JavaScript'; $lang['cssdatauri'] = 'Tamanho máximo em bytes para o qual as imagens referenciadas em arquivos CSS devam ser incorporadas na folha de estilos (o arquivo CSS) para reduzir o custo dos pedidos HTTP. Essa técnica não funcionará na versões do IE < 8! Valores de 400 a 600 são bons. Defina o valor 0 para desativar.'; -$lang['hidepages'] = 'Esconder páginas correspondentes (expressão regular)'; $lang['send404'] = 'Enviar "HTTP 404/Página não encontrada" para páginas não existentes'; -$lang['sitemap'] = 'Gerar Google Sitemap (dias)'; $lang['broken_iua'] = 'A função "ignore_user_abort" está com defeito no seu sistema? Isso pode causar um índice de busca defeituoso. IIS+PHP/CGI reconhecidamente possui esse erro. Veja o bug 852 para mais informações.'; $lang['xsendfile'] = 'Usar o cabeçalho "X-Sendfile" para permitir que o servidor web encaminhe arquivos estáticos? Seu servidor web precisa ter suporte a isso.'; $lang['renderer_xhtml'] = 'Renderizador a ser utilizado para a saída principal (xhtml) do wiki'; $lang['renderer__core'] = '%s (núcleo do DokuWiki)'; $lang['renderer__plugin'] = '%s ("plug-in")'; -$lang['rememberme'] = 'Permitir cookies de autenticação permanentes ("Lembre-se de mim")'; -$lang['rss_type'] = 'Tipo de fonte XML'; -$lang['rss_linkto'] = 'Os links da fonte XML apontam para'; -$lang['rss_content'] = 'O que deve ser exibido nos itens da fonte XML?'; -$lang['rss_update'] = 'Intervalo de atualização da fonte XML (seg)'; -$lang['recent_days'] = 'Quantas mudanças recentes devem ser mantidas (dias)?'; -$lang['rss_show_summary'] = 'Resumo de exibição da fonte XML no título'; -$lang['target____wiki'] = 'Parâmetro "target" para links internos'; -$lang['target____interwiki'] = 'Parâmetro "target" para links interwiki'; -$lang['target____extern'] = 'Parâmetro "target" para links externos'; -$lang['target____media'] = 'Parâmetro "target" para links de mídia'; -$lang['target____windows'] = 'Parâmetro "target" para links do Windows'; +$lang['dnslookups'] = 'O DokuWiki procurará pelo nome de host dos endereços IP remotos dos usuários que estão editando as páginas. Caso você tenha um DNS lento, ele não esteja funcionando ou, ainda, você não queira esse recurso, desabilite essa opção.'; $lang['proxy____host'] = 'Nome do servidor proxy'; $lang['proxy____port'] = 'Porta do proxy'; $lang['proxy____user'] = 'Nome de usuário do proxy'; diff --git a/lib/plugins/popularity/lang/pt-br/intro.txt b/lib/plugins/popularity/lang/pt-br/intro.txt index 306cb2820..e07aa0ac3 100644 --- a/lib/plugins/popularity/lang/pt-br/intro.txt +++ b/lib/plugins/popularity/lang/pt-br/intro.txt @@ -1,9 +1,9 @@ ====== Retorno de Popularidade ====== -Essa ferramenta coleta dados anônimos sobre o seu wiki e permite que você os envie para os desenvolvedores do DokuWiki. Isso ajuda-os a compreender como o DokuWiki é utilizado pelos seus usuários e garante que decisões para futuros desenvolvimentos sejam respaldadas por estatísticas de uso real. +Essa [[doku>popularity|ferramenta]] coleta dados anônimos sobre o seu wiki e permite que você os envie para os desenvolvedores do DokuWiki. Isso ajuda-os a compreender como o DokuWiki é utilizado pelos seus usuários e garante que decisões para futuros desenvolvimentos sejam respaldadas por estatísticas de uso real. Você é encorajado a repetir esse procedimento de tempos em tempos, para manter os desenvolvedores informados quando o seu wiki for alterado. Seus pacotes de dados repetidos serão categorizados por uma identificação anônima. Os dados coletados contém informações do tipo: a versão do seu DokuWiki, o número e tamanho das suas páginas e arquivos, plug-ins instalados e informações sobre a sua instalação do PHP. -Os dados brutos que serão enviados é mostrado abaixo. Por favor, utilize o botão "Enviar dados" para transferir a informação. +Os dados brutos que serão enviados serão exibidos abaixo. Por favor, utilize o botão "Enviar dados" para transferir a informação. -- cgit v1.2.3 From db770f698b9d190dce389ce0a29b84eaa333dff8 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 12 Oct 2012 15:41:25 +0100 Subject: fixed typo in style.ini --- lib/tpl/default/style.ini | 2 +- lib/tpl/dokuwiki/style.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index 726c2025d..0706303d0 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -3,7 +3,7 @@ ; To extend this file or make changes to it, it is recommended to create ; a style.local.ini file to prevent losing any changes after an upgrade. -; Please don't forgot to copy the section your changes should be under +; Please don't forget to copy the section your changes should be under ; (i.e. [stylesheets] or [replacements]) into that file as well. ; Define the stylesheets your template uses here. The second value diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index 1402f751a..d5cc68852 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -3,7 +3,7 @@ ; To extend this file or make changes to it, it is recommended to create ; a style.local.ini file to prevent losing any changes after an upgrade. -; Please don't forgot to copy the section your changes should be under +; Please don't forget to copy the section your changes should be under ; (i.e. [stylesheets] or [replacements]) into that file as well. ; Define the stylesheets your template uses here. The second value -- cgit v1.2.3 From 1586bc3488e4f51d3ce69662f9be7fce5c4f7673 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 12 Oct 2012 20:08:52 +0100 Subject: improved tab styles * added more selectors to allow different markup * added border to make tabs more distinctive, especially in other templates --- lib/tpl/dokuwiki/css/_media_fullscreen.css | 25 ++++++++++++---- lib/tpl/dokuwiki/css/_tabs.css | 47 ++++++++++++++++++++++++------ 2 files changed, 57 insertions(+), 15 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index c67e16051..8d5e1e8ca 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -91,24 +91,35 @@ text-align: right; } +/* make it look like a tab (as in _tabs.css) */ #mediamanager__page .namespaces h2 { font-size: 1em; display: inline-block; - border-width: 0; padding: .3em .8em; - margin: 0 .3em 0 0; + margin: 0 0 0 .3em; border-radius: .5em .5em 0 0; font-weight: normal; background-color: __background_alt__; color: __text__; + border: 1px solid __border__; + border-bottom-color: __background_alt__; line-height: 1.4em; + position: relative; + bottom: -1px; + z-index: 2; } * html #mediamanager__page .namespaces h2, *+html #mediamanager__page .namespaces h2 { display: inline; } [dir=rtl] #mediamanager__page .namespaces h2 { - margin-right: 10px; + margin: 0 .3em 0 0; + position: relative; + right: 10px; +} +#mediamanager__page .namespaces .panelHeader { + border-top: 1px solid __border__; + z-index: 1; } #mediamanager__page .namespaces ul { @@ -165,10 +176,12 @@ #mediamanager__page .panelHeader ul li.listType { padding-left: 30px; + margin: 0 0 0 5px; background: url('../../images/icon-list.png') 3px 1px no-repeat; } #mediamanager__page .panelHeader ul li.sortBy { padding-left: 30px; + margin: 0 0 0 5px; background: url('../../images/icon-sort.png') 3px 1px no-repeat; } @@ -185,10 +198,10 @@ #mediamanager__page .filelist ul { padding: 0; - margin: 0; + margin: 0 10px 0 0; } -[dir=rtl] #mediamanager__page .filelist ul.tabs { - margin-right: 10px; +[dir=rtl] #mediamanager__page .filelist ul { + margin: 0 10px 0 0; } #mediamanager__page .filelist .panelContent ul li:hover { diff --git a/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css index 1dffa8f7b..845ec9a57 100644 --- a/lib/tpl/dokuwiki/css/_tabs.css +++ b/lib/tpl/dokuwiki/css/_tabs.css @@ -2,40 +2,56 @@ * This file provides the styles for general tabs. */ +.dokuwiki .tabs > ul, .dokuwiki ul.tabs { padding: 0; margin: 0; overflow: hidden; + position: relative; } +/* border underneath */ +.dokuwiki .tabs > ul:after, +.dokuwiki ul.tabs:after { + position: absolute; + content: ""; + width: 100%; + bottom: 0; + left: 0; + border-bottom: 1px solid __border__; + z-index: 1; +} + +.dokuwiki .tabs > ul li, .dokuwiki ul.tabs li { float: left; padding: 0; margin: 0; list-style: none; } +[dir=rtl] .dokuwiki .tabs > ul li, [dir=rtl] .dokuwiki ul.tabs li { float: right; } +.dokuwiki .tabs > ul li a, .dokuwiki ul.tabs li strong, .dokuwiki ul.tabs li a { - float: left; + display: inline-block; padding: .3em .8em; - margin: 0 .3em 0 0; + margin: 0 0 0 .3em; background-color: __background_neu__; color: __text__; + border: 1px solid __border__; border-radius: .5em .5em 0 0; + position: relative; + z-index: 0; } +[dir=rtl] .dokuwiki .tabs > ul li a, [dir=rtl] .dokuwiki ul.tabs li strong, [dir=rtl] .dokuwiki ul.tabs li a { - float: right; - margin: 0 0 0 .3em; -} -*+html[dir=rtl] .dokuwiki ul.tabs li strong, -*+html[dir=rtl] .dokuwiki ul.tabs li a { - float: none; - display: inline-block; + margin: 0 .3em 0 0; } + .dokuwiki ul.tabs li strong { font-weight: normal; } @@ -43,6 +59,11 @@ .dokuwiki ul.tabs li a:link, .dokuwiki ul.tabs li a:visited { } +.dokuwiki .tabs > ul li a:hover, +.dokuwiki .tabs > ul li a:active, +.dokuwiki .tabs > ul li a:focus, +.dokuwiki .tabs > ul li .curid a, +.dokuwiki .tabs > ul .active a, .dokuwiki ul.tabs li a:hover, .dokuwiki ul.tabs li a:active, .dokuwiki ul.tabs li a:focus, @@ -50,4 +71,12 @@ background-color: __background_alt__; color: __text__; text-decoration: none; + font-weight: normal; +} + +.dokuwiki .tabs > ul li .curid a, +.dokuwiki .tabs > ul li .active a, +.dokuwiki ul.tabs li strong { + z-index: 2; + border-bottom-color: __background_alt__; } -- cgit v1.2.3 From 0c49c5d6c2b38fdcf269e570dd7948632d3b23ff Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 12 Oct 2012 22:52:07 +0100 Subject: moved some styles around --- lib/styles/screen.css | 6 +- lib/tpl/dokuwiki/css/basic.css | 73 ++++++------ lib/tpl/dokuwiki/css/content.css | 227 +++++++++++++++++++++++++++++++++---- lib/tpl/dokuwiki/css/design.css | 206 --------------------------------- lib/tpl/dokuwiki/template.info.txt | 4 +- 5 files changed, 248 insertions(+), 268 deletions(-) (limited to 'lib') diff --git a/lib/styles/screen.css b/lib/styles/screen.css index 8ada48932..119878f9b 100644 --- a/lib/styles/screen.css +++ b/lib/styles/screen.css @@ -73,12 +73,16 @@ div.notify { (e.g. for screen readers or to keep access keys working) */ .a11y { position: absolute !important; - left: -10000px !important; + left: -99999em !important; top: auto !important; width: 1px !important; height: 1px !important; overflow: hidden !important; } +[dir=rtl] .a11y { + left: auto !important; + right: -99999em !important; +} /* syntax highlighting code */ .code .br0 { color: #66cc66; } diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 55c1d2dfe..539ccd715 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -43,6 +43,16 @@ legend { line-height: 1.2; clear: left; /* ideally 'both', but problems with toc */ } +[dir=rtl] h1, +[dir=rtl] h2, +[dir=rtl] h3, +[dir=rtl] h4, +[dir=rtl] h5, +[dir=rtl] h6, +[dir=rtl] caption, +[dir=rtl] legend { + clear: right; +} h1 { font-size: 2em; @@ -99,11 +109,20 @@ ul, ol { padding: 0 0 0 1.5em; } +[dir=rtl] ul, +[dir=rtl] ol { + padding: 0 1.5em 0 0; +} + li, dd { padding: 0; margin: 0 0 0 1.5em; } +[dir=rtl] li, +[dir=rtl] dd { + margin: 0 1.5em 0 0; +} dt { font-weight: bold; margin: 0; @@ -145,6 +164,9 @@ caption { text-align: left; margin: 0 0 .3em; } +[dir=rtl] caption { + text-align: right; +} th, td { @@ -158,6 +180,10 @@ th { font-weight: bold; background-color: __background_alt__; } +[dir=rtl] td, +[dir=rtl] th { + text-align: right; +} /*____________ links ____________*/ @@ -225,10 +251,14 @@ kbd { font-size: 1em; direction: ltr; text-align: left; + background-color: __background_alt__; + color: __text__; } pre { overflow: auto; word-wrap: normal; + border: 1px solid __border__; + padding: .7em 1em; } blockquote { @@ -236,6 +266,9 @@ blockquote { border: solid __border__; border-width: 0 0 0 .25em; } +[dir=rtl] blockquote { + border-width: 0 .25em 0 0; +} q:before, q:after { content: ''; @@ -343,6 +376,10 @@ button, padding: .1em .5em; cursor: pointer; } +#IE7 input.button, +#IE7 button { + line-height: 1.4; +} input[type=submit]:hover, input[type=submit]:active, @@ -379,39 +416,3 @@ input[readonly], button[readonly] { cursor: auto; } - -/*____________ rtl corrections ____________*/ - -[dir=rtl] caption, -[dir=rtl] td, -[dir=rtl] th { - text-align: right; -} - -[dir=rtl] ul, -[dir=rtl] ol { - padding: 0 1.5em 0 0; -} -[dir=rtl] li, -[dir=rtl] dd { - margin: 0 1.5em 0 0; -} -[dir=rtl] blockquote { - border-width: 0 .25em 0 0; -} - -[dir=rtl] h1, -[dir=rtl] h2, -[dir=rtl] h3, -[dir=rtl] h4, -[dir=rtl] h5, -[dir=rtl] h6, -[dir=rtl] caption, -[dir=rtl] legend { - clear: right; -} - -[dir=rtl] .a11y { - left: auto; - right: -9000px; -} diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index 1d3ae8c01..aae83570d 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -82,6 +82,7 @@ /*____________ tables ____________*/ +/* div around each table */ .dokuwiki div.table { overflow-x: auto; margin-bottom: 1.4em; @@ -92,17 +93,6 @@ .dokuwiki table.inline { min-width: 50%; - border-width: 0; -} -.dokuwiki table.inline th, -.dokuwiki table.inline td { - border: 1px solid __border__; -} -.dokuwiki table.inline th { - color: inherit; - background-color: __background_alt__; -} -.dokuwiki table.inline td { } .dokuwiki table.inline tr:hover td { background-color: __background_alt__; @@ -114,22 +104,11 @@ /*____________ code ____________*/ -.dokuwiki pre, -.dokuwiki tt, -.dokuwiki code, -.dokuwiki samp, -.dokuwiki kbd { - background-color: __background_alt__; - color: __text__; -} /* fix if background-color hides underlining */ .dokuwiki em.u code { text-decoration: underline; } -.dokuwiki pre { - border: 1px solid __border__; - padding: .75em 1em; -} + /* for code in */ .dokuwiki pre.file { } @@ -175,3 +154,205 @@ clear: left; } + +/*____________ JS popup ____________*/ + +.JSpopup { + background-color: __background__; + color: __text__; + border: 1px solid __border__; + box-shadow: .1em .1em .1em __border__; + border-radius: 2px; + padding: .3em .5em; + font-size: .9em; +} +.dokuwiki form.search div.ajax_qsearch { + top: -.35em; + font-size: 1em; + text-overflow: ellipsis; +} + +.JSpopup ul, +.JSpopup ol { + padding-left: 0; +} +[dir=rtl] .JSpopup ul, +[dir=rtl] .JSpopup ol { + padding-right: 0; +} + + +/* changes to underscored CSS files +********************************************************************/ + +#acl__tree li { + margin: 0; +} + +#dokuwiki__content span.curid a { + font-weight: normal; +} +#dokuwiki__content strong span.curid a { + font-weight: bold; +} + + +/*____________ changes to _edit ____________*/ + +.dokuwiki div.toolbar button.toolbutton { + border-radius: 0; + border-left-width: 0; + padding: .1em .35em; +} +.dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-left-width: 1px; +} +[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-left-width: 0; + border-right-width: 1px; +} +.dokuwiki div.toolbar button.toolbutton:last-child { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} +[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-left-width: 1px; +} + +.dokuwiki div.section_highlight { + margin-left: -2em; + margin-right: -2em; + padding-left: 1em; + padding-right: 1em; + border-width: 0 1em; +} +[dir=rtl] .dokuwiki div.section_highlight { + margin-right: -2em; + border-right-width: 1em; +} + +.dokuwiki textarea.edit { + font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; +} + +.dokuwiki div.preview { + margin: 0 -2em; + padding: 0 2em; +} +.dokuwiki.hasSidebar div.preview { + border-right: __sidebar_width__ solid __background_alt__; +} +[dir=rtl] .dokuwiki.hasSidebar div.preview { + border-right-width: 0; + border-left: __sidebar_width__ solid __background_alt__; +} +.dokuwiki div.preview div.pad { + padding: 1.556em 0 2em; +} + + +/*____________ changes to _toc ____________*/ + +#dw__toc { + margin: -1.556em -2em .5em 1.4em; + width: __sidebar_width__; + border-left: 1px solid __border__; + background: __background__; + color: inherit; +} +[dir=rtl] #dw__toc { + margin: -1.556em 1.4em .5em -2em; + border-left-width: 0; + border-right: 1px solid __border__; +} + +.dokuwiki h3.toggle { + padding: .5em 1em; + margin-bottom: 0; + font-size: .875em; + letter-spacing: .1em; +} +#dokuwiki__aside h3.toggle { + display: none; +} + +.dokuwiki .toggle strong { + background: transparent url(images/toc-arrows.png) 0 0; + width: 8px; + height: 5px; + margin: .4em 0 0; +} +.dokuwiki .toggle.closed strong { + background-position: 0 -5px; +} + +.dokuwiki .toggle strong span { + display: none; +} + + +#dw__toc > div { + font-size: 0.875em; + padding: .5em 1em 1em; +} +#dw__toc ul { + padding: 0 0 0 1.2em; +} +[dir=rtl] #dw__toc ul { + padding: 0 1.5em 0 0; +} +#dw__toc ul li { + list-style-image: url(images/toc-bullet.png); +} +#dw__toc ul li.clear { + list-style: none; +} +#dw__toc ul li div.li { + padding: .2em 0; +} + + +/*____________ changes to _imgdetail ____________*/ + +#dokuwiki__detail { + padding: 0; +} +#dokuwiki__detail img { + float: none; + margin-bottom: 1.4em; +} +#dokuwiki__detail div.img_detail { + float: none; +} + +#dokuwiki__detail div.img_detail dl { + overflow: hidden; +} +#dokuwiki__detail div.img_detail dl dt { + float: left; + width: 9em; + text-align: right; + clear: left; +} +[dir=rtl] #dokuwiki__detail div.img_detail dl dt { + float: right; + text-align: left; + clear: right; +} +#dokuwiki__detail div.img_detail dl dd { + margin-left: 9.5em; +} +[dir=rtl] #dokuwiki__detail div.img_detail dl dd { + margin-left: 0; + margin-right: 9.5em; +} diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index 87610663d..2c2109228 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -364,217 +364,11 @@ text-align: left; } -/*____________ misc ____________*/ - /* license note under edit window */ .dokuwiki div.license { font-size: 93.75%; } -#IE7 .dokuwiki input.button, -#IE7 .dokuwiki button { - line-height: 1.4; -} - -#acl__tree li { - margin: 0; -} - -#dokuwiki__content span.curid a { - font-weight: normal; -} -#dokuwiki__content strong span.curid a { - font-weight: bold; -} - - -/*____________ changes to _edit ____________*/ - -.dokuwiki div.toolbar button.toolbutton { - border-radius: 0; - border-left-width: 0; - padding: .1em .35em; -} -.dokuwiki div.toolbar button.toolbutton:first-child { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - border-left-width: 1px; -} -[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - border-left-width: 0; - border-right-width: 1px; -} -.dokuwiki div.toolbar button.toolbutton:last-child { - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; -} -[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-left-width: 1px; -} - -.dokuwiki div.section_highlight { - margin-left: -2em; - margin-right: -2em; - padding-left: 1em; - padding-right: 1em; - border-width: 0 1em; -} -[dir=rtl] .dokuwiki div.section_highlight { - margin-right: -2em; - border-right-width: 1em; -} - -.dokuwiki textarea.edit { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace; -} - -.dokuwiki div.preview { - margin: 0 -2em; - padding: 0 2em; -} -.dokuwiki.hasSidebar div.preview { - border-right: __sidebar_width__ solid __background_alt__; -} -[dir=rtl] .dokuwiki.hasSidebar div.preview { - border-right-width: 0; - border-left: __sidebar_width__ solid __background_alt__; -} -.dokuwiki div.preview div.pad { - padding: 1.556em 0 2em; -} - - -/*____________ changes to _toc ____________*/ - -#dw__toc { - margin: -1.556em -2em .5em 1.4em; - width: __sidebar_width__; - border-left: 1px solid __border__; - background: __background__; - color: inherit; -} -[dir=rtl] #dw__toc { - margin: -1.556em 1.4em .5em -2em; - border-left-width: 0; - border-right: 1px solid __border__; -} - -.dokuwiki h3.toggle { - padding: .5em 1em; - margin-bottom: 0; - font-size: .875em; - letter-spacing: .1em; -} -#dokuwiki__aside h3.toggle { - display: none; -} - -.dokuwiki .toggle strong { - background: transparent url(images/toc-arrows.png) 0 0; - width: 8px; - height: 5px; - margin: .4em 0 0; -} -.dokuwiki .toggle.closed strong { - background-position: 0 -5px; -} - -.dokuwiki .toggle strong span { - display: none; -} - - -#dw__toc > div { - font-size: 0.875em; - padding: .5em 1em 1em; -} -#dw__toc ul { - padding: 0 0 0 1.2em; -} -[dir=rtl] #dw__toc ul { - padding: 0 1.5em 0 0; -} -#dw__toc ul li { - list-style-image: url(images/toc-bullet.png); -} -#dw__toc ul li.clear { - list-style: none; -} -#dw__toc ul li div.li { - padding: .2em 0; -} - - -/*____________ changes to _imgdetail ____________*/ - -#dokuwiki__detail { - padding: 0; -} -#dokuwiki__detail img { - float: none; - margin-bottom: 1.4em; -} -#dokuwiki__detail div.img_detail { - float: none; -} - -#dokuwiki__detail div.img_detail dl { - overflow: hidden; -} -#dokuwiki__detail div.img_detail dl dt { - float: left; - width: 9em; - text-align: right; - clear: left; -} -[dir=rtl] #dokuwiki__detail div.img_detail dl dt { - float: right; - text-align: left; - clear: right; -} -#dokuwiki__detail div.img_detail dl dd { - margin-left: 9.5em; -} -[dir=rtl] #dokuwiki__detail div.img_detail dl dd { - margin-left: 0; - margin-right: 9.5em; -} - - -/*____________ JS popup ____________*/ - -.JSpopup { - background-color: __background__; - color: __text__; - border: 1px solid __border__; - box-shadow: .1em .1em .1em __border__; - border-radius: 2px; - padding: .3em .5em; - font-size: .9em; -} -.dokuwiki form.search div.ajax_qsearch { - top: -.35em; - font-size: 1em; - text-overflow: ellipsis; -} - -.JSpopup ul, -.JSpopup ol { - padding-left: 0; -} -[dir=rtl] .JSpopup ul, -[dir=rtl] .JSpopup ol { - padding-right: 0; -} - /* footer ********************************************************************/ diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt index dfac2ef4e..a9a55865e 100644 --- a/lib/tpl/dokuwiki/template.info.txt +++ b/lib/tpl/dokuwiki/template.info.txt @@ -1,7 +1,7 @@ -base dokuwiki +base dokuwiki author Anika Henke email anika@selfthinker.org -date 2012-09-08 +date 2012-10-12 name DokuWiki Template desc DokuWiki's default template since 2012 url http://www.dokuwiki.org/template:dokuwiki -- cgit v1.2.3 From cacfb6067895a011e255d9f940a8dac2fa2c1110 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 12 Oct 2012 23:15:53 +0100 Subject: fixed interwiki and filetype styles being included in all css modes --- lib/exe/css.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index ae160558a..1e662c64a 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -122,8 +122,10 @@ function css_out(){ // print the default classes for interwiki links and file downloads if ($mediatype == 'screen') { + print '@media screen {'; css_interwiki(); css_filetypes(); + print '}'; } // load files -- cgit v1.2.3 From 63c25974f5bb7ca4472bc68a2342ac05d42883b5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Fri, 12 Oct 2012 23:31:01 +0100 Subject: removed unnecessary print styles --- lib/styles/all.css | 2 +- lib/styles/print.css | 20 ++++++-------------- lib/styles/screen.css | 2 +- lib/tpl/dokuwiki/css/print.css | 38 -------------------------------------- 4 files changed, 8 insertions(+), 54 deletions(-) (limited to 'lib') diff --git a/lib/styles/all.css b/lib/styles/all.css index 5d7eb7d14..ff4bd2457 100644 --- a/lib/styles/all.css +++ b/lib/styles/all.css @@ -1,5 +1,5 @@ /** - * Basic styles. These styles are needed for basic DokuWiki functions + * Basic screen and print styles. These styles are needed for basic DokuWiki functions * regardless of the used template. Templates can override them of course */ diff --git a/lib/styles/print.css b/lib/styles/print.css index 76bc6d3bc..a5c39e889 100644 --- a/lib/styles/print.css +++ b/lib/styles/print.css @@ -1,23 +1,15 @@ /** - * Basic styles. These styles are needed for basic DokuWiki functions + * Basic print styles. These styles are needed for basic DokuWiki functions * regardless of the used template. Templates can override them of course */ -/* messages with msg() */ -div.error, +div.error, /* messages with msg() */ div.info, div.success, -div.notify { - display: none; -} - -/* section edit button */ -.secedit { - display: none; -} - -/* modal windows */ -.JSpopup, +div.notify, +.secedit, /* section edit button */ +.a11y, /* accessibly hidden text */ +.JSpopup, /* modal windows */ #link__wiz { display: none; } diff --git a/lib/styles/screen.css b/lib/styles/screen.css index 119878f9b..241904d7c 100644 --- a/lib/styles/screen.css +++ b/lib/styles/screen.css @@ -1,5 +1,5 @@ /** - * Basic styles. These styles are needed for basic DokuWiki functions + * Basic screen styles. These styles are needed for basic DokuWiki functions * regardless of the used template. Templates can override them of course */ diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index 191d50c28..d30bc6c91 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -14,16 +14,11 @@ body { /* hide certain sections */ .a11y, -div.notify, -div.info, -div.success, -div.error, #dokuwiki__header .tools, #dokuwiki__aside, .dokuwiki .breadcrumbs, #dw__toc, h3.toggle, -.dokuwiki .secedit, #dokuwiki__pagetools, #dokuwiki__footer { display: none; @@ -57,14 +52,11 @@ h3.toggle, list-style-type: lower-roman; } -/* undo icons */ .dokuwiki a:link, .dokuwiki a:visited { text-decoration: underline; color: #333; background-color: inherit; - background-image: none; - padding: 0; } /* display href after link */ @@ -94,42 +86,12 @@ a.mail:after { } .dokuwiki img.medialeft { margin: .2em 1em .2em 0; - float: left; } .dokuwiki img.mediaright { margin: .2em 0 .2em 1em; - float: right; } .dokuwiki img.mediacenter { margin: .2em auto; - display: block; -} - -/* align table cells */ -.dokuwiki .leftalign { - text-align: left; -} -.dokuwiki .centeralign { - text-align: center; -} -.dokuwiki .rightalign { - text-align: right; -} - -/* underline */ -.dokuwiki em.u { - font-style: normal; - text-decoration: underline; -} -.dokuwiki em em.u { - font-style: italic; -} - -div.clearer { - clear: both; - line-height: 0; - height: 0; - overflow: hidden; } .dokuwiki blockquote { -- cgit v1.2.3 From 7ecda050991d21031d59eb064890acdb2ee954ae Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 13 Oct 2012 00:06:25 +0100 Subject: improved section highlighting styles --- lib/tpl/dokuwiki/css/_edit.css | 11 +++-------- lib/tpl/dokuwiki/css/content.css | 10 ++-------- lib/tpl/dokuwiki/css/mobile.css | 6 ++---- 3 files changed, 7 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css index bae69ad96..0c66c75b7 100644 --- a/lib/tpl/dokuwiki/css/_edit.css +++ b/lib/tpl/dokuwiki/css/_edit.css @@ -135,15 +135,10 @@ div.picker button.toolbutton { font-size: 75%; } -/* generic style for section highlighting (including headings) */ -.dokuwiki .section_highlight { -} -/* style for section highlighting (only sections below headings) */ +/* style for section highlighting */ .dokuwiki div.section_highlight { - margin-left: -1em; /* negative side margin = side padding + side border */ - margin-right: -1em; /* negative side margin = side padding + side border */ - padding-left: .5em; - padding-right: .5em; + margin: 0 -1em; /* negative side margin = side padding + side border */ + padding: 0 .5em; border: solid __background_alt__; border-width: 0 .5em; } diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index aae83570d..a714869db 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -230,16 +230,10 @@ } .dokuwiki div.section_highlight { - margin-left: -2em; - margin-right: -2em; - padding-left: 1em; - padding-right: 1em; + margin: 0 -2em; + padding: 0 1em; border-width: 0 1em; } -[dir=rtl] .dokuwiki div.section_highlight { - margin-right: -2em; - border-right-width: 1em; -} .dokuwiki textarea.edit { font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css index 7f106b046..501e53a54 100644 --- a/lib/tpl/dokuwiki/css/mobile.css +++ b/lib/tpl/dokuwiki/css/mobile.css @@ -92,10 +92,8 @@ /* _edit */ .dokuwiki div.section_highlight { - margin-left: -1em; - margin-right: -1em; - padding-left: .5em; - padding-right: .5em; + margin: 0 -1em; + padding: 0 .5em; border-width: 0 .5em; } .dokuwiki div.preview { -- cgit v1.2.3 From 90104b138051e1fbecfc8a13f512a3794fec93c8 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 13 Oct 2012 11:33:56 +0100 Subject: beautified code blocks, also using lighter background colour (FS#2444) --- lib/tpl/dokuwiki/css/basic.css | 6 +++++- lib/tpl/dokuwiki/css/content.css | 17 +++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 539ccd715..27ca84cdf 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -251,13 +251,17 @@ kbd { font-size: 1em; direction: ltr; text-align: left; - background-color: __background_alt__; + background-color: __background_site__; color: __text__; + box-shadow: inset 0 0 .3em __border__; + border-radius: 2px; } pre { overflow: auto; word-wrap: normal; border: 1px solid __border__; + border-radius: 2px; + box-shadow: inset 0 0 .5em __border__; padding: .7em 1em; } diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index a714869db..437ad7b05 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -120,15 +120,15 @@ .dokuwiki dl.code dt, .dokuwiki dl.file dt { - background-color: __background_alt__; + background-color: __background_site__; /*background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); see FS#2447 */ - background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%); - background: -o-linear-gradient( top, __background__ 0%, __background_alt__ 100%); - background: -ms-linear-gradient( top, __background__ 0%, __background_alt__ 100%); - background: linear-gradient( top, __background__ 0%, __background_alt__ 100%); + background: -webkit-linear-gradient(top, __background_alt__ 0%, __background_site__ 100%); + background: -o-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); + background: -ms-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); + background: linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); color: inherit; border: 1px solid __border__; - border-bottom-color: __background_alt__; + border-bottom-color: __background_site__; border-top-left-radius: .3em; border-top-right-radius: .3em; padding: .3em .6em .1em; @@ -154,6 +154,11 @@ clear: left; } +.dokuwiki dl.code pre, +.dokuwiki dl.file pre { + box-shadow: inset -4px -4px .5em -.3em __border__; +} + /*____________ JS popup ____________*/ -- cgit v1.2.3 From f98e484a45d533262ff2e9f4359dc02da66a257b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 13 Oct 2012 12:09:40 +0100 Subject: RTL and IE7 fixes for code blocks --- lib/tpl/dokuwiki/css/basic.css | 1 - lib/tpl/dokuwiki/css/content.css | 11 ++++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index 27ca84cdf..8b7447239 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -38,7 +38,6 @@ caption, legend { font-family: Arial, sans-serif; font-weight: bold; - background-color: inherit; padding: 0; line-height: 1.2; clear: left; /* ideally 'both', but problems with toc */ diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index 437ad7b05..c23612643 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -121,7 +121,7 @@ .dokuwiki dl.code dt, .dokuwiki dl.file dt { background-color: __background_site__; - /*background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); see FS#2447 */ + /* background: -moz-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); see FS#2447 */ background: -webkit-linear-gradient(top, __background_alt__ 0%, __background_site__ 100%); background: -o-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); background: -ms-linear-gradient( top, __background_alt__ 0%, __background_site__ 100%); @@ -137,8 +137,7 @@ } [dir=rtl] .dokuwiki dl.code dt, [dir=rtl] .dokuwiki dl.file dt { - margin-left: 0; - margin-right: 1em; + float: right; } .dokuwiki dl.code dt a, .dokuwiki dl.file dt a { @@ -148,10 +147,16 @@ display: block; min-height: 16px; } + .dokuwiki dl.code dd, .dokuwiki dl.file dd { margin: 0; clear: left; + min-height: 1px; /* for IE7 */ +} +[dir=rtl] .dokuwiki dl.code dd, +[dir=rtl] .dokuwiki dl.file dd { + clear: right; } .dokuwiki dl.code pre, -- cgit v1.2.3