From e0dd04a6493f1b7f7133f75c08f9ea55ee8bd50a Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 14 Oct 2011 16:39:36 +0200 Subject: Added bcrypt support for password hashes This method require PHP 5.3+ it will fail otherwise! --- lib/plugins/config/settings/config.metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5f2c32ea7..ba14eb85a 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -123,7 +123,7 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5','bcrypt')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); -- cgit v1.2.3 From ce7a6b36ab2da1d9134e92a8ccf420c698d54cb5 Mon Sep 17 00:00:00 2001 From: Otto Vainio Date: Sun, 13 Nov 2011 10:00:16 +0100 Subject: Finnish language fixes --- lib/plugins/plugin/lang/fi/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/plugin/lang/fi/lang.php b/lib/plugins/plugin/lang/fi/lang.php index c348a2331..923029a6f 100644 --- a/lib/plugins/plugin/lang/fi/lang.php +++ b/lib/plugins/plugin/lang/fi/lang.php @@ -51,4 +51,4 @@ $lang['enabled'] = 'Liitännäinen %s käytössä'; $lang['notenabled'] = 'Liitännäistä %s ei voitu ottaa käyttöön. Tarkista tiedostojen oikeudet.'; $lang['disabled'] = 'Liitännäinen %s pois käytössä'; $lang['notdisabled'] = 'Liitännäistä %s ei voitu ottaa pois käytöstä. Tarkista tiedostojen oikeudet.'; -$lang['packageinstalled'] = 'Pluginpaketti (%d plugin%s: %s:) asennettu onnistuneesti.'; +$lang['packageinstalled'] = 'Pluginpaketti (%d plugin: %s:) asennettu onnistuneesti.'; -- cgit v1.2.3 From 1420e73d5e21de82e3e1a7a88bdaac5cd6827c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbyn=C4=9Bk=20K=C5=99ivka?= Date: Sun, 13 Nov 2011 10:02:35 +0100 Subject: Czech language update --- lib/plugins/acl/lang/cs/lang.php | 1 + lib/plugins/config/lang/cs/lang.php | 9 ++++++--- lib/plugins/plugin/lang/cs/lang.php | 3 ++- lib/plugins/popularity/lang/cs/lang.php | 1 + lib/plugins/revert/lang/cs/lang.php | 3 ++- lib/plugins/usermanager/lang/cs/lang.php | 1 + 6 files changed, 13 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php index 7c1efbd4c..cc1d97023 100644 --- a/lib/plugins/acl/lang/cs/lang.php +++ b/lib/plugins/acl/lang/cs/lang.php @@ -9,6 +9,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['admin_acl'] = 'Správa přístupových práv'; $lang['acl_group'] = 'Skupina'; diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php index 9126a041a..bf87e99d5 100644 --- a/lib/plugins/config/lang/cs/lang.php +++ b/lib/plugins/config/lang/cs/lang.php @@ -9,6 +9,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['menu'] = 'Správa nastavení'; $lang['error'] = 'Nastavení nebyla změněna kvůli alespoň jedné neplatné položce, @@ -44,10 +45,11 @@ $lang['_msg_setting_no_default'] = 'Chybí výchozí hodnota položky.'; $lang['fmode'] = 'Přístupová práva pro vytváření souborů'; $lang['dmode'] = 'Přístupová práva pro vytváření adresářů'; $lang['lang'] = 'Jazyk'; -$lang['basedir'] = 'Kořenový adresář'; -$lang['baseurl'] = 'Kořenové URL'; +$lang['basedir'] = 'Kořenový adresář (např. /dokuwiki/). Pro autodetekci nechte prázdné.'; +$lang['baseurl'] = 'Kořenové URL (např. http://www.yourserver.com). Pro autodetekci nechte prázdné.'; $lang['savedir'] = 'Adresář pro ukládání dat'; -$lang['start'] = 'Název úvodních stránek'; +$lang['cookiedir'] = 'Cesta pro cookie. Není-li vyplněno, použije se kořenové URL.'; +$lang['start'] = 'Název úvodní stránky'; $lang['title'] = 'Název celé wiki'; $lang['template'] = 'Šablona'; $lang['license'] = 'Pod jakou licencí má být tento obsah publikován?'; @@ -122,6 +124,7 @@ $lang['jpg_quality'] = 'Kvalita komprese JPEG (0-100)'; $lang['subscribers'] = 'Možnost přihlásit se k odběru novinek stránky'; $lang['subscribe_time'] = 'Časový interval v sekundách, ve kterém jsou posílány změny a souhrny změn. Interval by neměl být kratší než čas uvedený v recent_days.'; $lang['compress'] = 'Zahustit CSS a JavaScript výstup'; +$lang['cssdatauri'] = 'Velikost [v bajtech] obrázků odkazovaných v CSS souborech, které budou pro ušetření HTTP požadavku vestavěny do stylu. Tato technika nefunguje v IE 7 a starším. Doporučená hodnota je mezi 400 a 600 bajty. Pro vypnutí nastavte na 0.'; $lang['hidepages'] = 'Skrýt stránky odpovídající vzoru (regulární výrazy)'; $lang['send404'] = 'Posílat "HTTP 404/Page Not Found" pro neexistují stránky'; $lang['sitemap'] = 'Generovat Google sitemap (interval ve dnech)'; diff --git a/lib/plugins/plugin/lang/cs/lang.php b/lib/plugins/plugin/lang/cs/lang.php index 7c0fb3468..0ccabf344 100644 --- a/lib/plugins/plugin/lang/cs/lang.php +++ b/lib/plugins/plugin/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['menu'] = 'Správa pluginů'; $lang['download'] = 'Stáhnout a instalovat plugin'; @@ -56,4 +57,4 @@ $lang['enabled'] = 'Plugin %s aktivován.'; $lang['notenabled'] = 'Plugin %s nelze aktivovat, zkontrolujte práva k souborům.'; $lang['disabled'] = 'Plugin %s deaktivován.'; $lang['notdisabled'] = 'Plugin %s nelze deaktivovat, zkontrolujte práva k souborům.'; -$lang['packageinstalled'] = 'Plugin package (%d plugin%s: %s) úspěšně nainstalován.'; +$lang['packageinstalled'] = 'Balíček pluginů (%d plugin(ů): %s) úspěšně nainstalován.'; diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php index b0dc4d1a8..287bcf3b0 100644 --- a/lib/plugins/popularity/lang/cs/lang.php +++ b/lib/plugins/popularity/lang/cs/lang.php @@ -7,6 +7,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['name'] = 'Průzkum používání (může chviličku trvat, než se natáhne)'; $lang['submit'] = 'Odeslat data'; diff --git a/lib/plugins/revert/lang/cs/lang.php b/lib/plugins/revert/lang/cs/lang.php index 5c8899200..cf19381c8 100644 --- a/lib/plugins/revert/lang/cs/lang.php +++ b/lib/plugins/revert/lang/cs/lang.php @@ -10,6 +10,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['menu'] = 'Obnova zaspamovaných stránek'; $lang['filter'] = 'Hledat zaspamované stránky'; @@ -21,5 +22,5 @@ skriptu vyprší čas, budete muset obnovovat po menších blocích stránek.'; $lang['revstop'] = 'Proces obnovy stránek byl úspěšně dokončen.'; $lang['note1'] = 'Poznámka: toto vyhledávání je citlivé na velikost písmen'; -$lang['note2'] = 'Poznámka: tato stránka bude obnovena na poslední verze, která +$lang['note2'] = 'Poznámka: tato stránka bude obnovena na poslední verzi, která neobsahovala dané spamové slovo %s.'; diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php index c805011d7..fe54d4cce 100644 --- a/lib/plugins/usermanager/lang/cs/lang.php +++ b/lib/plugins/usermanager/lang/cs/lang.php @@ -9,6 +9,7 @@ * @author Marek Sacha * @author Lefty * @author Vojta Beran + * @author zbynek.krivka@seznam.cz */ $lang['menu'] = 'Správa uživatelů'; $lang['noauth'] = '(autentizace uživatelů není k dispozici)'; -- cgit v1.2.3 From d5cd65e49c16c2101422c28fee7714283d498ed2 Mon Sep 17 00:00:00 2001 From: Kiril Velikov Date: Sun, 13 Nov 2011 10:04:12 +0100 Subject: Bulgarian language update --- lib/plugins/plugin/lang/bg/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/plugin/lang/bg/lang.php b/lib/plugins/plugin/lang/bg/lang.php index 79f6e081f..09ac35229 100644 --- a/lib/plugins/plugin/lang/bg/lang.php +++ b/lib/plugins/plugin/lang/bg/lang.php @@ -51,4 +51,4 @@ $lang['enabled'] = 'Приставката %s е включена. $lang['notenabled'] = 'Приставката %s не може да бъде включена, моля проверете правата за файловете.'; $lang['disabled'] = 'Приставката %s е изключена.'; $lang['notdisabled'] = 'Приставката %s не е изключена, моля проверете правата за файловете.'; -$lang['packageinstalled'] = 'Пакетът е инсталиран успешно (%d приставка%s: %s).'; +$lang['packageinstalled'] = 'Пакетът е инсталиран успешно (%d приставка: %s).'; -- cgit v1.2.3 From 54db0171afdbc0c3204e9c016f3c7a37421e62aa Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 13 Nov 2011 10:38:03 +0100 Subject: fixed various errors in language files --- lib/plugins/config/lang/ca/lang.php | 4 ++-- lib/plugins/plugin/lang/es/lang.php | 2 +- lib/plugins/plugin/lang/eu/lang.php | 2 +- lib/plugins/plugin/lang/fa/lang.php | 2 +- lib/plugins/plugin/lang/hu/lang.php | 2 +- lib/plugins/plugin/lang/ja/lang.php | 2 +- lib/plugins/plugin/lang/ko/lang.php | 2 +- lib/plugins/plugin/lang/mk/lang.php | 4 ++-- lib/plugins/plugin/lang/nl/lang.php | 2 +- lib/plugins/plugin/lang/pl/lang.php | 2 +- lib/plugins/plugin/lang/pt-br/lang.php | 2 +- lib/plugins/plugin/lang/pt/lang.php | 2 +- lib/plugins/plugin/lang/sk/lang.php | 2 +- lib/plugins/plugin/lang/uk/lang.php | 2 +- lib/plugins/plugin/lang/zh-tw/lang.php | 2 +- lib/plugins/plugin/lang/zh/lang.php | 2 +- lib/plugins/revert/lang/lv/lang.php | 2 +- lib/plugins/revert/lang/pt-br/lang.php | 2 +- lib/plugins/usermanager/lang/es/lang.php | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/ca/lang.php b/lib/plugins/config/lang/ca/lang.php index d53cf1031..1a2a22881 100644 --- a/lib/plugins/config/lang/ca/lang.php +++ b/lib/plugins/config/lang/ca/lang.php @@ -114,8 +114,8 @@ $lang['sitemap'] = 'Genera mapa del lloc en format Google (dies)'; $lang['broken_iua'] = 'No funciona en el vostre sistema la funció ignore_user_abort? Això podria malmetre l\'índex de cerques. Amb IIS+PHP/CGI se sap que no funciona. Vg. Bug 852 per a més informació.'; $lang['xsendfile'] = 'Utilitza la capçalera X-Sendfile perquè el servidor web distribueixi fitxers estàtics. No funciona amb tots els servidors web.'; $lang['renderer_xhtml'] = 'Renderitzador que cal utilitzar per a la sortida principal (xhtml) del wiki'; -$lang['renderer__core'] = '% (ànima del dokuwiki)'; -$lang['renderer__plugin'] = '% (connector)'; +$lang['renderer__core'] = '%s (ànima del dokuwiki)'; +$lang['renderer__plugin'] = '%s (connector)'; $lang['rememberme'] = 'Permet galetes de sessió permanents ("recorda\'m")'; $lang['rss_type'] = 'Tipus de canal XML'; $lang['rss_linkto'] = 'Destinació dels enllaços en el canal XML'; diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php index 53d6d63fd..ac548245b 100644 --- a/lib/plugins/plugin/lang/es/lang.php +++ b/lib/plugins/plugin/lang/es/lang.php @@ -67,4 +67,4 @@ $lang['enabled'] = 'Plugin %s habilitado.'; $lang['notenabled'] = 'Plugin %s no puede ser habilitado, verifica los permisos del archivo.'; $lang['disabled'] = 'Plugin %s desabilitado.'; $lang['notdisabled'] = 'Plugin %s no puede ser desabilitado, verifica los permisos de archivo.'; -$lang['packageinstalled'] = 'Plugin (%d plugin%s: %s) instalado exitosamente.'; +$lang['packageinstalled'] = 'Plugin (%d plugin(s): %s) instalado exitosamente.'; diff --git a/lib/plugins/plugin/lang/eu/lang.php b/lib/plugins/plugin/lang/eu/lang.php index ebcda7e16..56c03325f 100644 --- a/lib/plugins/plugin/lang/eu/lang.php +++ b/lib/plugins/plugin/lang/eu/lang.php @@ -48,4 +48,4 @@ $lang['enabled'] = '%s Plugin-a gaitua.'; $lang['notenabled'] = '%s Plugin-a ezin izan da gaitu, egiaztatu fitxategi baimenak.'; $lang['disabled'] = '%s Plugin-a ezgaitua.'; $lang['notdisabled'] = '%s Plugin-a ezin izan da ezgaitu, egiaztatu fitxategi baimenak. '; -$lang['packageinstalled'] = 'Plugin paketea (%d plugin%s: %s) arrakastaz instalatua izan da.'; +$lang['packageinstalled'] = 'Plugin paketea (%d plugin(s): %s) arrakastaz instalatua izan da.'; diff --git a/lib/plugins/plugin/lang/fa/lang.php b/lib/plugins/plugin/lang/fa/lang.php index 19a839660..8f3fb8a41 100644 --- a/lib/plugins/plugin/lang/fa/lang.php +++ b/lib/plugins/plugin/lang/fa/lang.php @@ -52,4 +52,4 @@ $lang['enabled'] = 'افزونه‌ی %s فعال شد.'; $lang['notenabled'] = 'افزونه‌ی %s قابلیت فعال کردن ندارد، دسترسی‌ها را چک کنید.'; $lang['disabled'] = 'افزونه‌ی %s غیرفعال شد.'; $lang['notdisabled'] = 'افزونه‌ی %s قابلیت غیرفعال کردن ندارد، دسترسی‌ها را چک کنید.'; -$lang['packageinstalled'] = 'بسته افزونه (%d افزونه%s: %s) به درستی نصب شد.'; +$lang['packageinstalled'] = 'بسته افزونه (%d افزونه: %s) به درستی نصب شد.'; diff --git a/lib/plugins/plugin/lang/hu/lang.php b/lib/plugins/plugin/lang/hu/lang.php index 25c7b6322..34309a53f 100644 --- a/lib/plugins/plugin/lang/hu/lang.php +++ b/lib/plugins/plugin/lang/hu/lang.php @@ -53,4 +53,4 @@ $lang['enabled'] = 'A(z) %s bővítmény bekapcsolva.'; $lang['notenabled'] = 'A(z) %s bővítmény engedélyezése nem sikerült. Ellenőrizze a fájl-hozzáférési engedélyeket.'; $lang['disabled'] = 'A(z) %s bővítmény kikapcsolva.'; $lang['notdisabled'] = 'A(z) %s bővítmény kikapcsolása nem sikerült. Ellenőrizze a fájl-hozzáférési engedélyeket.'; -$lang['packageinstalled'] = 'A bővítmény csomag(ok) feltelepült(ek): %d plugin%s: %s'; +$lang['packageinstalled'] = 'A bővítmény csomag(ok) feltelepült(ek): %d plugin(s): %s'; diff --git a/lib/plugins/plugin/lang/ja/lang.php b/lib/plugins/plugin/lang/ja/lang.php index 56a827b7e..a96dcc9be 100644 --- a/lib/plugins/plugin/lang/ja/lang.php +++ b/lib/plugins/plugin/lang/ja/lang.php @@ -53,4 +53,4 @@ $lang['enabled'] = 'プラグイン %s が有効です。'; $lang['notenabled'] = 'プラグイン %s を有効にすることができません。権限を確認してください。'; $lang['disabled'] = 'プラグイン %s が無効です。'; $lang['notdisabled'] = 'プラグイン %s を無効にすることができません。権限を確認してください。'; -$lang['packageinstalled'] = 'プラグインパッケージ（%d plugin%s: %s）は正しくインストールされました。'; +$lang['packageinstalled'] = 'プラグインパッケージ（%d plugin(s): %s）は正しくインストールされました。'; diff --git a/lib/plugins/plugin/lang/ko/lang.php b/lib/plugins/plugin/lang/ko/lang.php index ab305dcd8..c77c3259d 100644 --- a/lib/plugins/plugin/lang/ko/lang.php +++ b/lib/plugins/plugin/lang/ko/lang.php @@ -53,4 +53,4 @@ $lang['enabled'] = '%s 플러그인을 켰습니다.'; $lang['notenabled'] = '%s 플러그인을 킬 수 없습니다. 파일 권한을 확인하십시오.'; $lang['disabled'] = '%s 플러그인을 껐습니다.'; $lang['notdisabled'] = '%s 플러그인을 끌 수 없습니다. 파일 권한을 확인하십시오.'; -$lang['packageinstalled'] = '플러그인 패키지(%d 개의 플러그인%s: %s)가 성공적으로 설치되었습니다.'; +$lang['packageinstalled'] = '플러그인 패키지(%d 개의 플러그인: %s)가 성공적으로 설치되었습니다.'; diff --git a/lib/plugins/plugin/lang/mk/lang.php b/lib/plugins/plugin/lang/mk/lang.php index 85f73a09f..747d61638 100644 --- a/lib/plugins/plugin/lang/mk/lang.php +++ b/lib/plugins/plugin/lang/mk/lang.php @@ -19,13 +19,13 @@ $lang['lastupdate'] = 'Последно ажурирани:'; $lang['source'] = 'Извор:'; $lang['unknown'] = 'непознат'; $lang['updating'] = 'Ажурирам...'; -$lang['updated'] = 'Приклучокот % е успешно ажуриран'; +$lang['updated'] = 'Приклучокот %s е успешно ажуриран'; $lang['updates'] = 'Следниве приклучоци се успешно ажурирани'; $lang['update_none'] = 'Нема потребни ажурирања.'; $lang['deleting'] = 'Бришам...'; $lang['deleted'] = 'Приклучокот %s е избришан.'; $lang['downloading'] = 'Симнувам...'; -$lang['downloaded'] = 'Приклучокот % е успешно инсталиран'; +$lang['downloaded'] = 'Приклучокот %s е успешно инсталиран'; $lang['downloads'] = 'Следниве приклучоци се успешно инсталирани'; $lang['download_none'] = 'Нема пронајдени приклучоци, или имаше непознат проблем при симнување и инсталирање.'; $lang['plugin'] = 'Приклучок:'; diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php index d13e46ff8..18662e15b 100644 --- a/lib/plugins/plugin/lang/nl/lang.php +++ b/lib/plugins/plugin/lang/nl/lang.php @@ -57,4 +57,4 @@ $lang['enabled'] = 'Plugin %s ingeschakeld.'; $lang['notenabled'] = 'Plugin %s kon niet worden ingeschakeld, controleer bestandsrechten.'; $lang['disabled'] = 'Plugin %s uitgeschakeld.'; $lang['notdisabled'] = 'Plugin %s kon niet worden uitgeschakeld, controleer bestandsrechten.'; -$lang['packageinstalled'] = 'Plugin package (%d plugin%s: %s) succesvol geïnstalleerd.'; +$lang['packageinstalled'] = 'Plugin package (%d plugin(s): %s) succesvol geïnstalleerd.'; diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php index f48426bf6..a84c55190 100644 --- a/lib/plugins/plugin/lang/pl/lang.php +++ b/lib/plugins/plugin/lang/pl/lang.php @@ -56,5 +56,5 @@ $lang['error_copy'] = 'Wystąpił błąd podczas kopiowania pliku w t $lang['error_delete'] = 'Wystąpił błąd przy próbie usunięcia wtyczki %s. Prawdopodobną przyczyną są niewystarczające uprawnienia do katalogu.'; $lang['enabled'] = 'Wtyczka %s włączona.'; $lang['notenabled'] = 'Nie udało się uruchomić wtyczki %s, sprawdź uprawnienia dostępu do plików.'; -$lang['disabled'] = 'Wtyczka % wyłączona.'; +$lang['disabled'] = 'Wtyczka %s wyłączona.'; $lang['notdisabled'] = 'Nie udało się wyłączyć wtyczki %s, sprawdź uprawnienia dostępu do plików.'; diff --git a/lib/plugins/plugin/lang/pt-br/lang.php b/lib/plugins/plugin/lang/pt-br/lang.php index e8b23dae9..26e73f4fc 100644 --- a/lib/plugins/plugin/lang/pt-br/lang.php +++ b/lib/plugins/plugin/lang/pt-br/lang.php @@ -61,4 +61,4 @@ $lang['enabled'] = 'O plug-in %s foi habilitado.'; $lang['notenabled'] = 'Não foi possível habilitar o plug-in %s. Verifique as permissões de acesso.'; $lang['disabled'] = 'O plug-in %s foi desabilitado.'; $lang['notdisabled'] = 'Não foi possível desabilitar o plug-in %s. Verifique as permissões de acesso.'; -$lang['packageinstalled'] = 'O pacote do plugin (%d plugin%s: %s) foi instalado com sucesso.'; +$lang['packageinstalled'] = 'O pacote do plugin (%d plugin(s): %s) foi instalado com sucesso.'; diff --git a/lib/plugins/plugin/lang/pt/lang.php b/lib/plugins/plugin/lang/pt/lang.php index 1567741f9..dccd4f738 100644 --- a/lib/plugins/plugin/lang/pt/lang.php +++ b/lib/plugins/plugin/lang/pt/lang.php @@ -52,4 +52,4 @@ $lang['enabled'] = 'Plugin %s habilitado.'; $lang['notenabled'] = 'Plugin %s não pôde ser habilitado, verifique as permissões.'; $lang['disabled'] = 'Plugin %s desabilitado.'; $lang['notdisabled'] = 'Plugin %s não pôde ser desabilitado, verifique as permissões.'; -$lang['packageinstalled'] = 'Pacote de Plugins (%d plugin%s: %s) instalado com sucesso.'; +$lang['packageinstalled'] = 'Pacote de Plugins (%d plugin(s): %s) instalado com sucesso.'; diff --git a/lib/plugins/plugin/lang/sk/lang.php b/lib/plugins/plugin/lang/sk/lang.php index 7a8f32a53..5024872f1 100644 --- a/lib/plugins/plugin/lang/sk/lang.php +++ b/lib/plugins/plugin/lang/sk/lang.php @@ -51,4 +51,4 @@ $lang['enabled'] = 'Plugin %s aktivovaný.'; $lang['notenabled'] = 'Plugin %s nemôže byť aktivovaný, skontrolujte prístupové práva.'; $lang['disabled'] = 'Plugin %s deaktivovaný.'; $lang['notdisabled'] = 'Plugin %s nemôže byť deaktivovaný, skontrolujte prístupové práva.'; -$lang['packageinstalled'] = 'Plugin package (%d plugin%s: %s) úspešne inštalovaný.'; +$lang['packageinstalled'] = 'Plugin package (%d plugin(s): %s) úspešne inštalovaný.'; diff --git a/lib/plugins/plugin/lang/uk/lang.php b/lib/plugins/plugin/lang/uk/lang.php index 69ee9ded1..036900f4e 100644 --- a/lib/plugins/plugin/lang/uk/lang.php +++ b/lib/plugins/plugin/lang/uk/lang.php @@ -55,4 +55,4 @@ $lang['enabled'] = 'Доданок %s увімкнено.'; $lang['notenabled'] = 'Не вдається увімкнути доданок %s. Перевірте права доступу до файлу.'; $lang['disabled'] = 'Доданок %s вимкнено.'; $lang['notdisabled'] = 'Не вдається вимкнути доданок %s. Перевірте права доступу до файлу.'; -$lang['packageinstalled'] = 'Пакет плагінів (%d plugin%s: %s) успішно встановлений.'; +$lang['packageinstalled'] = 'Пакет плагінів (%d plugin(s): %s) успішно встановлений.'; diff --git a/lib/plugins/plugin/lang/zh-tw/lang.php b/lib/plugins/plugin/lang/zh-tw/lang.php index 54234212d..3c4827000 100644 --- a/lib/plugins/plugin/lang/zh-tw/lang.php +++ b/lib/plugins/plugin/lang/zh-tw/lang.php @@ -54,4 +54,4 @@ $lang['enabled'] = '插件 %s 已啟用。'; $lang['notenabled'] = '插件 %s 無法啟用，請檢查檔案權限。'; $lang['disabled'] = '插件 %s 已停用。'; $lang['notdisabled'] = '插件 %s 無法停用，請檢查檔案權限。'; -$lang['packageinstalled'] = '插件 (%d 插件%s: %s) 已成功地安裝。'; +$lang['packageinstalled'] = '插件 (%d 插件: %s) 已成功地安裝。'; diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php index f8e0b5568..1263029e0 100644 --- a/lib/plugins/plugin/lang/zh/lang.php +++ b/lib/plugins/plugin/lang/zh/lang.php @@ -59,4 +59,4 @@ $lang['enabled'] = '%s 插件启用'; $lang['notenabled'] = '%s插件启用失败，请检查文件权限。'; $lang['disabled'] = '%s 插件禁用'; $lang['notdisabled'] = '%s插件禁用失败，请检查文件权限。'; -$lang['packageinstalled'] = '插件 (%d plugin%s: %s) 已成功安装。'; +$lang['packageinstalled'] = '插件 (%d plugin(s): %s) 已成功安装。'; diff --git a/lib/plugins/revert/lang/lv/lang.php b/lib/plugins/revert/lang/lv/lang.php index 0101f2698..012d6cc4c 100644 --- a/lib/plugins/revert/lang/lv/lang.php +++ b/lib/plugins/revert/lang/lv/lang.php @@ -8,7 +8,7 @@ $lang['menu'] = 'Piemēsloto lapu atjaunotājs'; $lang['filter'] = 'Meklēt piemēslotās lapas'; $lang['revert'] = 'Atjaunot norādītās lapas '; $lang['reverted'] = '%s atjaunots uz %s stāvokli'; -$lang['removed'] = '% dzēsts'; +$lang['removed'] = '%s dzēsts'; $lang['revstart'] = 'Atjaunošana uzsākta. Tas var aizņemt ilgāku laiku. Ja darbība pārtrūkst noilguma dēļ, atjaunošana jāveic pa mazākām porcijām.'; $lang['revstop'] = 'Atjaunošana veiksmīgi pabeigta. '; $lang['note1'] = 'Ievēro: Meklēšana atšķir lielos un mazos burtus.'; diff --git a/lib/plugins/revert/lang/pt-br/lang.php b/lib/plugins/revert/lang/pt-br/lang.php index 7bdde6675..c4a2f742b 100644 --- a/lib/plugins/revert/lang/pt-br/lang.php +++ b/lib/plugins/revert/lang/pt-br/lang.php @@ -21,7 +21,7 @@ $lang['menu'] = 'Gerenciador de reversões'; $lang['filter'] = 'Procura por páginas com spam'; $lang['revert'] = 'Reverte as páginas selecionadas'; $lang['reverted'] = '%s revertida para a revisão %s'; -$lang['removed'] = '% removida'; +$lang['removed'] = '%s removida'; $lang['revstart'] = 'O processo de reversão foi iniciado. Isso pode levar muito tempo. Se o tempo de execução do script expirar antes dele encerrar, você deverá tentar novamente usando blocos menores.'; $lang['revstop'] = 'O processo de reversão terminou com sucesso.'; $lang['note1'] = 'Nota: esta busca diferencia maiúsculas/minúsculas'; diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php index 804df2a4b..c12b77b3d 100644 --- a/lib/plugins/usermanager/lang/es/lang.php +++ b/lib/plugins/usermanager/lang/es/lang.php @@ -49,7 +49,7 @@ $lang['delete_ok'] = '%d usuarios eliminados'; $lang['delete_fail'] = '%d no se pudieron eliminar.'; $lang['update_ok'] = 'Los datos del usuario se actualizaron exitosamente '; $lang['update_fail'] = 'Los datos del usuario no se actualizaron'; -$lang['update_exists'] = 'El cambio de nombre de usuario falló, el nombre especificado ($s) ya está en uso (los otros cambios se aplicaron).'; +$lang['update_exists'] = 'El cambio de nombre de usuario falló, el nombre especificado (%s) ya está en uso (los otros cambios se aplicaron).'; $lang['start'] = 'primera'; $lang['prev'] = 'anterior'; $lang['next'] = 'siguiente'; -- cgit v1.2.3 From 2302fb8dc7877fdf7337d405372ff385bea491d0 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 13 Nov 2011 11:04:24 +0100 Subject: fixed german language strings --- lib/plugins/plugin/lang/de-informal/lang.php | 2 +- lib/plugins/plugin/lang/de/lang.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/plugin/lang/de-informal/lang.php b/lib/plugins/plugin/lang/de-informal/lang.php index 0c7fb5cdf..abcdf2c83 100644 --- a/lib/plugins/plugin/lang/de-informal/lang.php +++ b/lib/plugins/plugin/lang/de-informal/lang.php @@ -53,4 +53,4 @@ $lang['enabled'] = 'Erweiterung %s aktiviert.'; $lang['notenabled'] = 'Erweiterung %s konnte nicht aktiviert werden. Überprüfen sie die Zugriffsberechtigung der Datei.'; $lang['disabled'] = 'Erweiterung %s deaktiviert.'; $lang['notdisabled'] = 'Erweiterung %s konnte nicht deaktiviert werden - überprüfe Dateiberechtigungen'; -$lang['packageinstalled'] = 'Plugin-Paket (%d Plugin%s: %s) erfolgreich installiert.'; +$lang['packageinstalled'] = 'Plugin-Paket (%d Plugin(s): %s) erfolgreich installiert.'; diff --git a/lib/plugins/plugin/lang/de/lang.php b/lib/plugins/plugin/lang/de/lang.php index 75d3eaa93..8708d7836 100644 --- a/lib/plugins/plugin/lang/de/lang.php +++ b/lib/plugins/plugin/lang/de/lang.php @@ -63,4 +63,4 @@ $lang['enabled'] = 'Plugin %s wurde aktiviert.'; $lang['notenabled'] = 'Plugin %s konnte nicht aktiviert werden, überprüfen Sie die Dateirechte.'; $lang['disabled'] = 'Plugin %s wurde deaktiviert.'; $lang['notdisabled'] = 'Plugin %s konnte nicht deaktiviert werden, überprüfen Sie die Dateirechte.'; -$lang['packageinstalled'] = 'Plugin-Paket (%d Plugin%s: %s) erfolgreich installiert.'; +$lang['packageinstalled'] = 'Plugin-Paket (%d Plugin(s): %s) erfolgreich installiert.'; -- cgit v1.2.3 From fb286077fc5fb32f16fdd1b2f0cb7543e583cdda Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 20 Nov 2011 17:06:57 +0000 Subject: removed obsolete styles for link wizard --- lib/tpl/default/_linkwiz.css | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/_linkwiz.css b/lib/tpl/default/_linkwiz.css index fd40a0019..ca8812867 100644 --- a/lib/tpl/default/_linkwiz.css +++ b/lib/tpl/default/_linkwiz.css @@ -1,27 +1,4 @@ #link__wiz { - position: absolute; - display: block; - z-index: 99; - width: 300px; - height: 250px; - padding: 0; - margin: 0; - overflow: hidden; - border: 1px solid __border__; - background-color: __background_neu__; - text-align: center; -} - -#link__wiz_header { - background-color: __background_alt__; - height: 16px; - margin-bottom: 5px; - cursor: move; -} - -#link__wiz_close { - cursor: pointer; - margin: 0; } #link__wiz_result { @@ -61,9 +38,3 @@ display: block; color: __text_neu__; } - -/*FIXME maybe move to a more general style sheet*/ -.ondrag { - cursor: move; - opacity: 0.8; -} -- cgit v1.2.3 From 9ebae2ae295f745e1c3f257a52551b65e791f852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 24 Nov 2011 00:16:01 +0200 Subject: fix jQuery capitalization --- lib/scripts/compatibility.js | 2 +- lib/scripts/page.js | 2 +- lib/scripts/qsearch.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/scripts/compatibility.js b/lib/scripts/compatibility.js index ea52153c5..385e45854 100644 --- a/lib/scripts/compatibility.js +++ b/lib/scripts/compatibility.js @@ -49,7 +49,7 @@ function DEPRECATED_WRAP(func, context) { * @link http://prototype.conio.net/ */ function $() { - DEPRECATED('Please use the JQuery() function instead.'); + DEPRECATED('Please use the jQuery() function instead.'); var elements = new Array(); diff --git a/lib/scripts/page.js b/lib/scripts/page.js index e4033b76d..55a844f0b 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -43,7 +43,7 @@ dw_page = { * * @param target - the DOM element at which the popup should be aligned at * @param popup_id - the ID of the (new) DOM popup - * @return the Popup JQuery object + * @return the Popup jQuery object */ insituPopup: function(target, popup_id) { // get or create the popup div diff --git a/lib/scripts/qsearch.js b/lib/scripts/qsearch.js index c7128b9e3..a309f9e29 100644 --- a/lib/scripts/qsearch.js +++ b/lib/scripts/qsearch.js @@ -18,8 +18,8 @@ var dw_qsearch = { * * Attaches the event handlers * - * @param input element (JQuery selector/DOM obj) - * @param output element (JQuery selector/DOM obj) + * @param input element (jQuery selector/DOM obj) + * @param output element (jQuery selector/DOM obj) */ init: function (input, output) { var do_qsearch; -- cgit v1.2.3 From dacedfc0b083d926504ef07024b17d8d036564cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 24 Nov 2011 22:16:51 +0200 Subject: add label to each plugin in plugin management page i needed to disable all plugins to figure out which plugin was causing template error, so it was quite annoying to click on the tiny checkbox added html label so i could at least click on the plugin name to toggle checkbox state --- lib/plugins/plugin/classes/ap_manage.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php index fb148f263..12480e922 100644 --- a/lib/plugins/plugin/classes/ap_manage.class.php +++ b/lib/plugins/plugin/classes/ap_manage.class.php @@ -90,8 +90,8 @@ class ap_manage { ptln(' '); ptln(' '.$plugin.''); - ptln(' '); - ptln('

'.$plugin.'

'); + ptln(' '); + ptln('

'); $this->html_button($plugin, 'info', false, 6); if (in_array('settings', $this->manager->functions)) { -- cgit v1.2.3 From 5505dd9afd380c1676d9d0cef3e10d5be06ffee2 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Sun, 27 Nov 2011 01:22:40 +0100 Subject: Fixed XML-RPC getAttachment method. Without creating an IXR_Base64 object, the file will be encoded as base64, but send as string. The client XML-RPC parser cannot detect that it is meant to be a base64 encoded file. --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index e5e3298ae..3a05c886d 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -311,7 +311,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return new IXR_Error(1, 'The requested file does not exist'); $data = io_readFile($file, false); - $base64 = base64_encode($data); + $base64 = new IXR_Base64($data); return $base64; } -- cgit v1.2.3 From 502a92e072be7b42750b4c9032e7269d1fd7c7b4 Mon Sep 17 00:00:00 2001 From: Patrick Michel Date: Sun, 27 Nov 2011 10:55:27 +0100 Subject: MD5 password hash format of the LDAP RFC FS#2378 This implements the salted MD5 password hash format of the LDAP RFC. The format is quite simple the password, followed by the 8 byte hash in base64 encoding, which results in 32 characters, prepended with the string "{smd5}". --- lib/plugins/config/settings/config.metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5f2c32ea7..c943a2fad 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -123,7 +123,7 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','smd6','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); -- cgit v1.2.3 From 491a2c68bc685e7e0cd4f9622ef4051e4a580d62 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 11:08:07 +0100 Subject: renamed passhash method smd6 to lsmd5 --- lib/plugins/config/settings/config.metadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index c943a2fad..0315ecae6 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -123,7 +123,7 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','smd6','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5','pmd5','hmd5')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); -- cgit v1.2.3 From 612db7146659fb98db1eff83d71e668e6f2da9fc Mon Sep 17 00:00:00 2001 From: Shuo Ting Jian Date: Sun, 27 Nov 2011 11:19:12 +0100 Subject: Chinese language update --- lib/plugins/acl/lang/zh/lang.php | 1 + lib/plugins/config/lang/zh/lang.php | 1 + lib/plugins/plugin/lang/zh/lang.php | 3 ++- lib/plugins/popularity/lang/zh/lang.php | 1 + lib/plugins/revert/lang/zh/lang.php | 1 + lib/plugins/usermanager/lang/zh/lang.php | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php index 986fa769a..983882eaf 100644 --- a/lib/plugins/acl/lang/zh/lang.php +++ b/lib/plugins/acl/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['admin_acl'] = '访问控制列表（ACL）管理器'; $lang['acl_group'] = '组'; diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index 7a7f0f504..2f6444ffa 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['menu'] = '配置设置'; $lang['error'] = '由于非法参数，设置没有更新。请检查您做的改动并重新提交。 diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php index 1263029e0..58f05fbd9 100644 --- a/lib/plugins/plugin/lang/zh/lang.php +++ b/lib/plugins/plugin/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['menu'] = '插件管理器'; $lang['download'] = '下载并安装新的插件'; @@ -59,4 +60,4 @@ $lang['enabled'] = '%s 插件启用'; $lang['notenabled'] = '%s插件启用失败，请检查文件权限。'; $lang['disabled'] = '%s 插件禁用'; $lang['notdisabled'] = '%s插件禁用失败，请检查文件权限。'; -$lang['packageinstalled'] = '插件 (%d plugin(s): %s) 已成功安装。'; +$lang['packageinstalled'] = '插件 (%d plugin%s: %s) 已成功安装。'; diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php index f45aaf4ff..9c916c2a5 100644 --- a/lib/plugins/popularity/lang/zh/lang.php +++ b/lib/plugins/popularity/lang/zh/lang.php @@ -13,6 +13,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['name'] = '人气反馈（载入可能需要一些时间）'; $lang['submit'] = '发送数据'; diff --git a/lib/plugins/revert/lang/zh/lang.php b/lib/plugins/revert/lang/zh/lang.php index c3d1639ff..d4d010f29 100644 --- a/lib/plugins/revert/lang/zh/lang.php +++ b/lib/plugins/revert/lang/zh/lang.php @@ -14,6 +14,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['menu'] = '还原管理器'; $lang['filter'] = '搜索包含垃圾信息的页面'; diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php index c1cb0c91a..e7a228229 100644 --- a/lib/plugins/usermanager/lang/zh/lang.php +++ b/lib/plugins/usermanager/lang/zh/lang.php @@ -13,6 +13,7 @@ * @author Hiphen Lee * @author caii, patent agent in China * @author lainme993@gmail.com + * @author Shuo-Ting Jian */ $lang['menu'] = '用户管理器'; $lang['noauth'] = '（用户认证不可用）'; -- cgit v1.2.3 From 1b9261dbc48f77eaf32a87372f39f9db1ba4636a Mon Sep 17 00:00:00 2001 From: Shuo Ting Jian Date: Sun, 27 Nov 2011 11:19:58 +0100 Subject: Traditional Chinese language update --- lib/plugins/config/lang/zh-tw/lang.php | 2 ++ lib/plugins/plugin/lang/zh-tw/lang.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php index 29aeaec3b..4f44eb60d 100644 --- a/lib/plugins/config/lang/zh-tw/lang.php +++ b/lib/plugins/config/lang/zh-tw/lang.php @@ -44,6 +44,7 @@ $lang['lang'] = '語系'; $lang['basedir'] = '根目錄'; $lang['baseurl'] = '根路徑 (URL)'; $lang['savedir'] = '儲存資料的目錄'; +$lang['cookiedir'] = 'Cookie 路徑。設定空白則使用 baseurl。'; $lang['start'] = '開始頁面的名稱'; $lang['title'] = '維基標題'; $lang['template'] = '樣板'; @@ -114,6 +115,7 @@ $lang['jpg_quality'] = 'JPG 壓縮品質(0-100)'; $lang['subscribers'] = '啟用頁面訂閱'; $lang['subscribe_time'] = '訂閱列表和摘要發送的時間間隔 (秒)；這個值應該小於指定的最近更改保留時間 (recent_days)。'; $lang['compress'] = '壓縮 CSS 與 JavaScript 的輸出'; +$lang['cssdatauri'] = 'CSS 中所引用的圖片假如小於該數字大小(bytes)，將會被直接嵌入 CSS 中來減少 HTTP Request 的發送。此功能在 IE 7 及之下版本不支援。推薦使用 400 到 600 之間。設定為0 則停用。'; $lang['hidepages'] = '隱藏匹配的界面 (正規式)'; $lang['send404'] = '存取不存在的頁面時送出 "HTTP 404/Page Not Found"'; $lang['sitemap'] = '產生 Google 站台地圖 (天)'; diff --git a/lib/plugins/plugin/lang/zh-tw/lang.php b/lib/plugins/plugin/lang/zh-tw/lang.php index 3c4827000..54234212d 100644 --- a/lib/plugins/plugin/lang/zh-tw/lang.php +++ b/lib/plugins/plugin/lang/zh-tw/lang.php @@ -54,4 +54,4 @@ $lang['enabled'] = '插件 %s 已啟用。'; $lang['notenabled'] = '插件 %s 無法啟用，請檢查檔案權限。'; $lang['disabled'] = '插件 %s 已停用。'; $lang['notdisabled'] = '插件 %s 無法停用，請檢查檔案權限。'; -$lang['packageinstalled'] = '插件 (%d 插件: %s) 已成功地安裝。'; +$lang['packageinstalled'] = '插件 (%d 插件%s: %s) 已成功地安裝。'; -- cgit v1.2.3 From ad9bfc2d35566e0815820de21a664c6fb1c3c60a Mon Sep 17 00:00:00 2001 From: Christophe Martin Date: Sun, 27 Nov 2011 11:21:47 +0100 Subject: French language update --- lib/plugins/acl/lang/fr/help.txt | 4 ++-- lib/plugins/config/lang/fr/intro.txt | 2 +- lib/plugins/config/lang/fr/lang.php | 2 +- lib/plugins/plugin/lang/fr/admin_plugin.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/fr/help.txt b/lib/plugins/acl/lang/fr/help.txt index f748f6b23..158ec92ed 100644 --- a/lib/plugins/acl/lang/fr/help.txt +++ b/lib/plugins/acl/lang/fr/help.txt @@ -2,8 +2,8 @@ Cette page vous permet d'ajouter ou de supprimer des permissions pour les catégories et les pages de votre wiki. Le panneau de gauche liste toutes les catégories et les pages disponibles. -Le formulaire au-dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné. +Le formulaire ci-dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné. Dans le tableau ci-dessous, toutes les listes de contrôle d'accès actuelles sont affichées. Vous pouvez l'utiliser pour supprimer ou modifier rapidement plusieurs ACL. -La lecture de [[doku>acl|la documentation officielle des ACL]] pourra vous permettre de bien comprendre le fonctionnement du contrôle d'accès dans DokuWiki. +La lecture de [[doku>fr:acl|la documentation officielle des ACL]] pourra vous permettre de bien comprendre le fonctionnement du contrôle d'accès dans DokuWiki. diff --git a/lib/plugins/config/lang/fr/intro.txt b/lib/plugins/config/lang/fr/intro.txt index de8a965d8..2a59b34d1 100644 --- a/lib/plugins/config/lang/fr/intro.txt +++ b/lib/plugins/config/lang/fr/intro.txt @@ -1,6 +1,6 @@ ====== Gestionnaire de configuration ====== -Utilisez cette page pour contrôler les paramètres de votre installation de DokuWiki. Pour de l'aide sur chaque paramètre, reportez vous à [[doku>config]]. Pour d'autres détails concernant ce module, reportez vous à [[doku>plugin:config]]. +Utilisez cette page pour contrôler les paramètres de votre installation de DokuWiki. Pour de l'aide sur chaque paramètre, reportez vous à [[doku>fr:config]]. Pour d'autres détails concernant ce module, reportez vous à [[doku>fr:plugin:config]]. Les paramètres affichés sur un fond rouge sont protégés et ne peuvent être modifiés avec ce module. Les paramètres affichés sur un fond bleu sont les valeurs par défaut et les valeurs affectées à votre installation sont affichées sur un fond blanc. Les paramètres bleus et blancs peuvent être modifiés. diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 8f669a629..9b4ecf286 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -62,7 +62,7 @@ $lang['youarehere'] = 'Traces hiérarchiques'; $lang['typography'] = 'Effectuer des améliorations typographiques'; $lang['htmlok'] = 'Permettre HTML dans les pages'; $lang['phpok'] = 'Permettre PHP dans les pages'; -$lang['dformat'] = 'Format de date (cf. fonction strftime de PHP)'; +$lang['dformat'] = 'Format de date (cf. fonction strftime de PHP)'; $lang['signature'] = 'Signature'; $lang['toptoclevel'] = 'Niveau le plus haut à afficher dans la table des matières'; $lang['tocminheads'] = 'Nombre minimum de titres pour qu\'une table des matières soit construite'; diff --git a/lib/plugins/plugin/lang/fr/admin_plugin.txt b/lib/plugins/plugin/lang/fr/admin_plugin.txt index c43e44684..f90b627f3 100644 --- a/lib/plugins/plugin/lang/fr/admin_plugin.txt +++ b/lib/plugins/plugin/lang/fr/admin_plugin.txt @@ -1,4 +1,4 @@ ====== Gestion des modules externes ====== -Cette page vous permet de gérer tout ce qui a trait aux [[doku>plugins|modules externes]] de DokuWiki. Pour télécharger et installer un module, le répertoire « ''plugin'' » doit être accessible en écriture pour le serveur Web. +Cette page vous permet de gérer tout ce qui a trait aux [[doku>fr:plugins|modules externes]] de DokuWiki. Pour télécharger et installer un module, le répertoire « ''plugin'' » doit être accessible en écriture pour le serveur Web. -- cgit v1.2.3 From 37c23632c35f0c77ba6e0f3ba98bfd53efa7ba0d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 11:37:26 +0100 Subject: added missing config metadata FS#2383 Translators need to add another string. --- lib/plugins/config/lang/en/lang.php | 1 + lib/plugins/config/settings/config.metadata.php | 1 + 2 files changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 380f2fd1d..a075d7cc2 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -82,6 +82,7 @@ $lang['useheading'] = 'Use first heading for pagenames'; $lang['refcheck'] = 'Media reference check'; $lang['refshow'] = 'Number of media references to show'; $lang['allowdebug'] = 'Allow debug disable if not needed!'; +$lang['mediarevisions'] = 'Enable Mediarevisions?'; $lang['usewordblock']= 'Block spam based on wordlist'; $lang['indexdelay'] = 'Time delay before indexing (sec)'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5f2c32ea7..d8ad06134 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -164,6 +164,7 @@ $meta['target____media'] = array('string'); $meta['target____windows'] = array('string'); $meta['_media'] = array('fieldset'); +$meta['mediarevisions'] = array('onoff'); $meta['gdlib'] = array('multichoice','_choices' => array(0,1,2)); $meta['im_convert'] = array('im_convert'); $meta['jpg_quality'] = array('numeric','_pattern' => '/^100$|^[1-9]?[0-9]$/'); //(0-100) -- cgit v1.2.3 From a09383eaa9211bb592151c29e7b85f027c05aaec Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 11:43:37 +0100 Subject: avoid PHP notice in ACL ajax backend FS#2384 --- lib/plugins/acl/ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php index d704fa8c9..71a2eb03a 100644 --- a/lib/plugins/acl/ajax.php +++ b/lib/plugins/acl/ajax.php @@ -7,7 +7,7 @@ */ //fix for Opera XMLHttpRequests -if(!count($_POST) && $HTTP_RAW_POST_DATA){ +if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){ parse_str($HTTP_RAW_POST_DATA, $_POST); } -- cgit v1.2.3 From 9015e3112dbe9466391f385413840112b6d4da1c Mon Sep 17 00:00:00 2001 From: Marijn Hofstra Date: Sun, 27 Nov 2011 12:27:07 +0100 Subject: Dutch language update --- lib/plugins/config/lang/nl/lang.php | 1 + lib/plugins/plugin/lang/nl/lang.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index f6574ee2c..65385cc43 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -119,6 +119,7 @@ $lang['jpg_quality'] = 'JPG compressiekwaliteit (0-100)'; $lang['subscribers'] = 'Ondersteuning pagina-inschrijving aanzetten'; $lang['subscribe_time'] = 'Inschrijvingsmeldingen en samenvattingen worden na deze tijdsduur (in seconden) verzonden. Deze waarde dient kleiner te zijn dan de tijd ingevuld bij "Hoeveel recente wijzigingen bewaren (dagen)"'; $lang['compress'] = 'Compacte CSS en javascript output'; +$lang['cssdatauri'] = 'Maximale omvang in bytes van in CSS gelinkte afbeeldingen die bij de stylesheet moeten worden ingesloten ter reductie van de HTTP request header overhead. Deze techniek werkt niet in IE7 en ouder! 400 tot 600 is een geschikte omvang. Stel de omvang in op 0 om deze functionaliteit uit te schakelen.'; $lang['hidepages'] = 'Verberg deze pagina\'s (regular expressions)'; $lang['send404'] = 'Stuur "HTTP 404/Page Not Found" voor niet-bestaande pagina\'s'; $lang['sitemap'] = 'Genereer Google sitemap (dagen)'; diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php index 18662e15b..d13e46ff8 100644 --- a/lib/plugins/plugin/lang/nl/lang.php +++ b/lib/plugins/plugin/lang/nl/lang.php @@ -57,4 +57,4 @@ $lang['enabled'] = 'Plugin %s ingeschakeld.'; $lang['notenabled'] = 'Plugin %s kon niet worden ingeschakeld, controleer bestandsrechten.'; $lang['disabled'] = 'Plugin %s uitgeschakeld.'; $lang['notdisabled'] = 'Plugin %s kon niet worden uitgeschakeld, controleer bestandsrechten.'; -$lang['packageinstalled'] = 'Plugin package (%d plugin(s): %s) succesvol geïnstalleerd.'; +$lang['packageinstalled'] = 'Plugin package (%d plugin%s: %s) succesvol geïnstalleerd.'; -- cgit v1.2.3 From 9df43a68bac022beef078c9d02df6364edea8596 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 14:46:05 +0100 Subject: use throbber in ACL ajax interface To avoid problems when an AJAX request takes a bit longer in the ACL manager, a throbber is shown while loading the info. --- lib/plugins/acl/script.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index d912a2407..0ba91cdc9 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -60,10 +60,12 @@ var dw_acl = { * Load the current permission info and edit form */ loadinfo: function () { - jQuery('#acl__info').load( - DOKU_BASE + 'lib/plugins/acl/ajax.php', - jQuery('#acl__detail form').serialize() + '&ajax=info' - ); + jQuery('#acl__info') + .html('...') + .load( + DOKU_BASE + 'lib/plugins/acl/ajax.php', + jQuery('#acl__detail form').serialize() + '&ajax=info' + ); return false; }, -- cgit v1.2.3 From 8d739053e2e2092fa7136a1709c730407f770143 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 16:32:35 +0100 Subject: fix IE8 error FS#2381 A trailing comma created an empty array item causing IE8 to choke. --- lib/scripts/editor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js index 2009ce6af..f36d446d5 100644 --- a/lib/scripts/editor.js +++ b/lib/scripts/editor.js @@ -61,9 +61,9 @@ var dw_editor = { jQuery.each([ ['larger', function(){dw_editor.sizeCtl(editor,100);}], ['smaller', function(){dw_editor.sizeCtl(editor,-100);}], - ['wrap', function(){dw_editor.toggleWrap(editor);}], + ['wrap', function(){dw_editor.toggleWrap(editor);}] ], function (_, img) { - jQuery(document.createElement('img')) + jQuery(document.createElement('IMG')) .attr('src', DOKU_BASE+'lib/images/' + img[0] + '.gif') .click(img[1]) .appendTo($ctl); -- cgit v1.2.3 From 29a277ba918a65400b1beb961d142772efc26897 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 16:42:29 +0100 Subject: IE doesn't know indexOf for arrays FS#2381 this fixes another IE javascript problem in edit mode --- lib/scripts/editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js index f36d446d5..042e34608 100644 --- a/lib/scripts/editor.js +++ b/lib/scripts/editor.js @@ -130,7 +130,7 @@ var dw_editor = { * @param event e - the key press event object */ keyHandler: function(e){ - if([8, 13, 32].indexOf(e.keyCode) === -1) { + if(jQuery.inArray(e.keyCode,[8, 13, 32]) === -1) { return; } var selection = getSelection(this); -- cgit v1.2.3 From 2e9c51889d8855cf56cb3f21a9c4926bd94ef21f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 16:52:41 +0100 Subject: IE8: fix namespace selection in link wizard FS#2391 IE8 can't substr() with negative offsets. --- lib/scripts/linkwiz.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index cc4c19e0d..ce072d4b2 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -186,7 +186,7 @@ var dw_linkwiz = { */ resultClick: function(a){ dw_linkwiz.$entry.val(a.title); - if(a.title == '' || a.title.substr(-1) == ':'){ + if(a.title == '' || a.title.substr(a.title.length-1) == ':'){ dw_linkwiz.autocomplete_exec(); }else{ if (jQuery(a.nextSibling).is('span')) { -- cgit v1.2.3 From c798b23bcedefa974e4af474904e4e24cdad67d5 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 17:33:52 +0100 Subject: rely on jQuery UI's dialog methods for toggling the linkwizard FS#2394 --- lib/scripts/linkwiz.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index ce072d4b2..dcfafd75e 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -35,13 +35,12 @@ var dw_linkwiz = { ) .parent() .attr('id','link__wiz') - .addClass('a11y') .css({ 'position': 'absolute', 'top': (pos.top+20)+'px', 'left': (pos.left+80)+'px' }) - .show() + .hide() .appendTo('div.dokuwiki'); dw_linkwiz.textArea = $editor[0]; @@ -283,7 +282,7 @@ var dw_linkwiz = { */ show: function(){ dw_linkwiz.selection = getSelection(dw_linkwiz.textArea); - dw_linkwiz.$wiz.removeClass('a11y'); + dw_linkwiz.$wiz.show(); dw_linkwiz.$entry.focus(); dw_linkwiz.autocomplete(); }, @@ -292,7 +291,7 @@ var dw_linkwiz = { * Hide the link wizard */ hide: function(){ - dw_linkwiz.$wiz.addClass('a11y'); + dw_linkwiz.$wiz.hide(); dw_linkwiz.textArea.focus(); }, @@ -300,7 +299,7 @@ var dw_linkwiz = { * Toggle the link wizard */ toggle: function(){ - if(dw_linkwiz.$wiz.hasClass('a11y')){ + if(dw_linkwiz.$wiz.css('display') == 'none'){ dw_linkwiz.show(); }else{ dw_linkwiz.hide(); -- cgit v1.2.3 From 4feb08e1dd7fd1c0a09310ca29a7cbac2559edb9 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 28 Nov 2011 19:53:35 +0100 Subject: only strip special chars when suggesting an upload name FS#2377 The uploader now just strips a bunch of common special chars. This is not a complete cleanID() implementation. A full clean is done server-side on uploading. --- lib/scripts/fileuploaderextended.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js index f92bdbc49..4abd63bef 100644 --- a/lib/scripts/fileuploaderextended.js +++ b/lib/scripts/fileuploaderextended.js @@ -55,9 +55,11 @@ qq.extend(qq.FileUploader.prototype, { qq.setText(fileElement, fileName); this._find(item, 'size').style.display = 'none'; + // name suggestion (simplified cleanID) var nameElement = this._find(item, 'nameInput'); fileName = fileName.toLowerCase(); - fileName = fileName.replace(/([^a-z0-9_\.\-]+)/g, '_'); + fileName = fileName.replace(/([ !"#$%&\'()+,\/;<=>?@[\]^`{|}~:]+)/g, '_'); + fileName = fileName.replace(/^_+/,''); nameElement.value = fileName; nameElement.id = 'mediamanager__upload_item'+id; -- cgit v1.2.3 From 3543c6de939c52517f590300b6d4289dc3a785ff Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 28 Nov 2011 20:29:39 +0100 Subject: deprecated 3rd parameter of cleanID() FS#2377 For some reason trailing/leading underscores were allowed when uploading files. But the rest of the code (eg. listing or downloading files) never supported this. This patch removes this special case for uploading files to streamline ID cleaning of pages and media files. --- lib/exe/ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index f8d62cb57..8edd559d6 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -257,7 +257,7 @@ function ajax_mediaupload(){ $id = $_GET['qqfile']; } - $id = cleanID($id, false, true); + $id = cleanID($id); $NS = $_REQUEST['ns']; $ns = $NS.':'.getNS($id); -- cgit v1.2.3 From 3f3bb97fcdd30282632d96a5bb19d2ea61c01504 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Mon, 28 Nov 2011 20:59:49 +0100 Subject: removed dublicated content --- lib/exe/xmlrpc.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index e5e3298ae..cb8dbf42d 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -21,6 +21,7 @@ if(!$conf['xmlrpc']) die('XML-RPC server not enabled.'); class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { var $methods = array(); var $public_methods = array(); + var $remote; /** * Checks if the current user is allowed to execute non anonymous methods @@ -67,6 +68,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * Constructor. Register methods and run Server */ function dokuwiki_xmlrpc_server(){ + $this->remote = new RemoteAPI(); $this->IXR_IntrospectionServer(); /* DokuWiki's own methods */ @@ -284,16 +286,11 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * Return a raw wiki page */ function rawPage($id,$rev=''){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ + try { + return $this->remote->rawPage($id, $rev); + } catch(RemoteAccessDenied $e) { return new IXR_Error(1, 'You are not allowed to read this page'); } - $text = rawWiki($id,$rev); - if(!$text) { - return pageTemplate($id); - } else { - return $text; - } } /** -- cgit v1.2.3 From 04dd9c85e28535b43c7821841cd97b52682adae3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 28 Nov 2011 22:14:20 +0000 Subject: fixed link wizard being appended to every div.dokuwiki (FS#2395) and changed div.dokuwiki to just .dokuwiki (some templates have the class in the body) --- lib/scripts/linkwiz.js | 2 +- lib/scripts/page.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index dcfafd75e..5075a0ab8 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -41,7 +41,7 @@ var dw_linkwiz = { 'left': (pos.left+80)+'px' }) .hide() - .appendTo('div.dokuwiki'); + .appendTo('.dokuwiki:first'); dw_linkwiz.textArea = $editor[0]; dw_linkwiz.result = jQuery('#link__wiz_result')[0]; diff --git a/lib/scripts/page.js b/lib/scripts/page.js index 55a844f0b..5da4a9cc0 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -55,7 +55,7 @@ dw_page = { .attr('id', popup_id) .addClass('insitu-footnote JSpopup') .mouseleave(function () {jQuery(this).hide();}); - jQuery('div.dokuwiki:first').append($fndiv); + jQuery('.dokuwiki:first').append($fndiv); } // position() does not support hidden elements -- cgit v1.2.3 From 1c122589394bb9150f09facdcd6e75d054eb69a4 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Tue, 29 Nov 2011 19:17:59 +0100 Subject: Using sensefull error codes. Since there are currently a lot of error coded returning 1, that mean completly different thing, i guess it would be very nice to change this. A client should not be forced to parse the error message, the error code should be enough to explain the error. This change suggests some error codes, that have a hierarchical structure. In the following list the categories begin with = and the error codes actually used with -. = 100 Page errors == 110 Page access errors --- 111 User is not allowed to read the requested page --- 112 User is not allowed to edit the page == 120 Page existance errors --- 121 The requested page does not exist == 130 Page edit errors --- 131 Empty page id --- 132 Empty page content --- 133 Page is locked --- 134 Positive wordblock check = 200 Media errors == 210 Media access errors --- 211 User is not allowed to read media --- 215 User is not allowed to list media == 220 Media existance errors --- 221 The requested media does not exist = 300 Search errors == 310 Argument errors --- 311 The provided value is not a valid timestamp == 320 Search result errors --- 321 No chances in specified timeframe --- lib/exe/xmlrpc.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 3a05c886d..5d19725a3 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -286,7 +286,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function rawPage($id,$rev=''){ $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } $text = rawWiki($id,$rev); if(!$text) { @@ -304,11 +304,11 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function getAttachment($id){ $id = cleanID($id); if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ) - return new IXR_Error(1, 'You are not allowed to read this file'); + return new IXR_Error(211, 'You are not allowed to read this file'); $file = mediaFN($id); if (!@ file_exists($file)) - return new IXR_Error(1, 'The requested file does not exist'); + return new IXR_Error(221, 'The requested file does not exist'); $data = io_readFile($file, false); $base64 = new IXR_Base64($data); @@ -342,7 +342,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function htmlPage($id,$rev=''){ $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } return p_wiki_xhtml($id,$rev,false); } @@ -462,7 +462,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { } return $data; } else { - return new IXR_Error(1, 'You are not allowed to list media files.'); + return new IXR_Error(215, 'You are not allowed to list media files.'); } } @@ -479,12 +479,12 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function pageInfo($id,$rev=''){ $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } $file = wikiFN($id,$rev); $time = @filemtime($file); if(!$time){ - return new IXR_Error(10, 'The requested page does not exist'); + return new IXR_Error(121, 'The requested page does not exist'); } $info = getRevisionInfo($id, $time, 1024); @@ -515,22 +515,22 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $minor = $params['minor']; if(empty($id)) - return new IXR_Error(1, 'Empty page ID'); + return new IXR_Error(131, 'Empty page ID'); if(!page_exists($id) && trim($TEXT) == '' ) { - return new IXR_ERROR(1, 'Refusing to write an empty new wiki page'); + return new IXR_ERROR(132, 'Refusing to write an empty new wiki page'); } if(auth_quickaclcheck($id) < AUTH_EDIT) - return new IXR_Error(1, 'You are not allowed to edit this page'); + return new IXR_Error(112, 'You are not allowed to edit this page'); // Check, if page is locked if(checklock($id)) - return new IXR_Error(1, 'The page is currently locked'); + return new IXR_Error(133, 'The page is currently locked'); // SPAM check if(checkwordblock()) - return new IXR_Error(1, 'Positive wordblock check'); + return new IXR_Error(134, 'Positive wordblock check'); // autoset summary on new pages if(!page_exists($id) && empty($sum)) { @@ -635,7 +635,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function listLinks($id) { $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } $links = array(); @@ -684,7 +684,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { */ function getRecentChanges($timestamp) { if(strlen($timestamp) != 10) - return new IXR_Error(20, 'The provided value is not a valid timestamp'); + return new IXR_Error(311, 'The provided value is not a valid timestamp'); $recents = getRecentsSince($timestamp); @@ -705,7 +705,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return $changes; } else { // in case we still have nothing at this point - return new IXR_Error(30, 'There are no changes in the specified timeframe'); + return new IXR_Error(321, 'There are no changes in the specified timeframe'); } } @@ -717,7 +717,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { */ function getRecentMediaChanges($timestamp) { if(strlen($timestamp) != 10) - return new IXR_Error(20, 'The provided value is not a valid timestamp'); + return new IXR_Error(311, 'The provided value is not a valid timestamp'); $recents = getRecentsSince($timestamp, null, '', RECENTS_MEDIA_CHANGES); @@ -738,7 +738,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { return $changes; } else { // in case we still have nothing at this point - return new IXR_Error(30, 'There are no changes in the specified timeframe'); + return new IXR_Error(321, 'There are no changes in the specified timeframe'); } } @@ -750,14 +750,14 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { function pageVersions($id, $first) { $id = cleanID($id); if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); + return new IXR_Error(111, 'You are not allowed to read this page'); } global $conf; $versions = array(); if(empty($id)) - return new IXR_Error(1, 'Empty page ID'); + return new IXR_Error(131, 'Empty page ID'); $revisions = getRevisions($id, $first, $conf['recent']+1); -- cgit v1.2.3 From f3046d2bbd96dc9a501975392e76d6ae539cdf05 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Tue, 29 Nov 2011 20:42:35 +0100 Subject: Second part of the error codes. Forgot some :( Added the new error codes and categories: --- 212 Not allowed to delete media == 230 Media edit error --- 231 Filename not given --- 232 File is still referenced --- 233 Could not delete file --- lib/exe/xmlrpc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 5d19725a3..910271461 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -575,7 +575,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $auth = auth_quickaclcheck(getNS($id).':*'); if(!isset($id)) { - return new IXR_ERROR(1, 'Filename not given.'); + return new IXR_ERROR(231, 'Filename not given.'); } global $conf; @@ -611,11 +611,11 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { if ($res & DOKU_MEDIA_DELETED) { return 0; } elseif ($res & DOKU_MEDIA_NOT_AUTH) { - return new IXR_ERROR(1, "You don't have permissions to delete files."); + return new IXR_ERROR(212, "You don't have permissions to delete files."); } elseif ($res & DOKU_MEDIA_INUSE) { - return new IXR_ERROR(1, 'File is still referenced'); + return new IXR_ERROR(232, 'File is still referenced'); } else { - return new IXR_ERROR(1, 'Could not delete file'); + return new IXR_ERROR(233, 'Could not delete file'); } } -- cgit v1.2.3 From 4b7f30c244499fdfe9457b8d7a76566bee7d3abf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 30 Nov 2011 00:37:52 +0000 Subject: bind JS for revision diff also when called through AJAX (fixes checkbox selection in history of new media manager, FS#2398) --- lib/scripts/behaviour.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js index 20b408322..cffdde042 100644 --- a/lib/scripts/behaviour.js +++ b/lib/scripts/behaviour.js @@ -16,7 +16,7 @@ var dw_behaviour = { dw_behaviour.subscription(); dw_behaviour.revisionBoxHandler(); - jQuery('#page__revisions input[type=checkbox]').click( + jQuery('#page__revisions input[type=checkbox]').live('click', dw_behaviour.revisionBoxHandler ); }, -- cgit v1.2.3 From aafb4e36f7fdc95d371cffcf351c3611efd69945 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Thu, 1 Dec 2011 22:33:16 +0100 Subject: Fixed bug in XML-RPC search. The score was randomly transfered as string or as integer. This way it will always be transfered as an integer. --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 910271461..61e6f1e95 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -411,7 +411,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $pages[] = array( 'id' => $id, - 'score' => $score, + 'score' => intval($score), 'rev' => filemtime($file), 'mtime' => filemtime($file), 'size' => filesize($file), -- cgit v1.2.3 From 449428695c0293a45517a610cf97193094f7a8b1 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 4 Dec 2011 16:48:21 +0000 Subject: fixed mediamanager diffs having no specific height (FS#2387) --- lib/tpl/default/_mediamanager.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 383a1597c..198c7f440 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -405,11 +405,13 @@ position: relative; } #mediamanager__diff .imageDiff .image1, +#mediamanager__diff .imageDiff .image2 { + width: 97%; +} #mediamanager__diff .imageDiff .image2 { position: absolute; top: 0; left: 0; - width: 97%; } #mediamanager__diff .imageDiff.opacity .image2 { -- cgit v1.2.3 From b1ab5da7c783154a7ce22f4b34beb10b79f8768d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 4 Dec 2011 17:32:25 +0000 Subject: fixed list type being sometimes undefined --- lib/scripts/media.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 7f5514f56..267e64a76 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -371,6 +371,10 @@ var dw_mediamanager = { if (typeof new_val === 'undefined') { new_val = jQuery('form.options li.' + opt[1] + ' input') .filter(':checked').val(); + // if new_val is still undefined (because form.options is not in active tab), set to most spacious option + if (typeof new_val === 'undefined') { + new_val = 'thumbs'; + } } if (new_val !== dw_mediamanager.view_opts[opt[0]]) { -- cgit v1.2.3 From 6d3ed70719f3f29ddcb490e55026c44c88a57dc3 Mon Sep 17 00:00:00 2001 From: dploeger Date: Tue, 29 Nov 2011 08:13:47 +0100 Subject: Added urldecoding of query for qsearch --- lib/exe/ajax.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 8edd559d6..b7b92cceb 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -53,6 +53,8 @@ function ajax_qsearch(){ $query = $_POST['q']; if(empty($query)) $query = $_GET['q']; if(empty($query)) return; + + $query = urldecode($query); $data = ft_pageLookup($query, true, useHeading('navigation')); -- cgit v1.2.3 From 2e646d615cc45b435080af6f34c1af04e92be3c9 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 4 Dec 2011 18:48:07 +0000 Subject: fixed whitespace error introduced with 475aa19 --- lib/exe/ajax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index b7b92cceb..46d835187 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -53,7 +53,7 @@ function ajax_qsearch(){ $query = $_POST['q']; if(empty($query)) $query = $_GET['q']; if(empty($query)) return; - + $query = urldecode($query); $data = ft_pageLookup($query, true, useHeading('navigation')); -- cgit v1.2.3 From 50cefcedd51b8d7e9ab3ca4ae5ef14cea35b7484 Mon Sep 17 00:00:00 2001 From: Andreas Haerter Date: Tue, 6 Dec 2011 00:39:18 +0100 Subject: Add missing German language values (config plugin) --- lib/plugins/config/lang/de-informal/lang.php | 1 + lib/plugins/config/lang/de/lang.php | 1 + 2 files changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index e63735edf..1a66c4a8e 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -66,6 +66,7 @@ $lang['useheading'] = 'Erste Überschrift als Seitennamen verwenden'; $lang['refcheck'] = 'Auf Verwendung beim Löschen von Media-Dateien testen'; $lang['refshow'] = 'Wie viele Verwendungsorte der Media-Datei zeigen'; $lang['allowdebug'] = 'Debug-Ausgaben erlauben Abschalten wenn nicht benötigt!'; +$lang['mediarevisions'] = 'Media-Revisionen (ältere Versionen) aktivieren?'; $lang['usewordblock'] = 'Blockiere Spam basierend auf der Wortliste'; $lang['indexdelay'] = 'Zeit bevor Suchmaschinenindexierung erlaubt ist'; $lang['relnofollow'] = 'rel="nofollow" verwenden'; diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index 1fb549597..a9a275349 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -77,6 +77,7 @@ $lang['useheading'] = 'Erste Überschrift als Seitennamen verwenden'; $lang['refcheck'] = 'Auf Verwendung beim Löschen von Media-Dateien testen'; $lang['refshow'] = 'Wiev iele Verwendungsorte der Media-Datei zeigen'; $lang['allowdebug'] = 'Debug-Ausgaben erlauben Abschalten wenn nicht benötigt!'; +$lang['mediarevisions'] = 'Media-Revisionen (ältere Versionen) aktivieren?'; $lang['usewordblock'] = 'Spam-Blocking benutzen'; $lang['indexdelay'] = 'Zeit bevor Suchmaschinenindexierung erlaubt ist'; $lang['relnofollow'] = 'rel="nofollow" verwenden'; -- cgit v1.2.3 From f18f20c04b2a0a93e9744a0b1ce4d39d26332360 Mon Sep 17 00:00:00 2001 From: Egil Hansen Date: Tue, 6 Dec 2011 09:46:39 +0100 Subject: Norwegian language update --- lib/plugins/acl/lang/no/help.txt | 2 +- lib/plugins/acl/lang/no/lang.php | 7 ++++--- lib/plugins/config/lang/no/lang.php | 14 ++++++++------ lib/plugins/plugin/lang/no/admin_plugin.txt | 2 +- lib/plugins/plugin/lang/no/lang.php | 9 +++++---- lib/plugins/popularity/lang/no/intro.txt | 4 ++-- lib/plugins/popularity/lang/no/lang.php | 3 ++- lib/plugins/popularity/lang/no/submitted.txt | 2 +- lib/plugins/revert/lang/no/lang.php | 1 + lib/plugins/usermanager/lang/no/lang.php | 3 ++- 10 files changed, 27 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/no/help.txt b/lib/plugins/acl/lang/no/help.txt index f02b6bdbd..c3d3688a9 100644 --- a/lib/plugins/acl/lang/no/help.txt +++ b/lib/plugins/acl/lang/no/help.txt @@ -1,4 +1,4 @@ -===Lynhjelp=== +=== Hurtighjelp: === På denne siden kan du legge til og fjerne tillatelser for navnerom og sider i din wiki. diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php index 587f9c2fc..09d71937a 100644 --- a/lib/plugins/acl/lang/no/lang.php +++ b/lib/plugins/acl/lang/no/lang.php @@ -17,6 +17,7 @@ * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe + * @author Egil Hansen */ $lang['admin_acl'] = 'Administrasjon av lister for adgangskontroll (ACL)'; $lang['acl_group'] = 'Gruppe'; @@ -34,10 +35,10 @@ $lang['p_choose_ns'] = 'Før inn en bruker eller gruppe i skjem $lang['p_inherited'] = 'Merk: Disse tillatelser ble ikke eksplisitt satt, men ble arvet fra andre grupper eller høyere navnerom.'; $lang['p_isadmin'] = 'Merk: Den valgte gruppen eller bruker har altid fulle tillatelser fordi vedkommende er konfigurert som superbruker.'; $lang['p_include'] = 'Høyere tillgangsrettigheter inkluderer lavere. Rettigheter for å opprette, laste opp og slette gjelder bare for navnerom, ikke enkeltsider.'; -$lang['current'] = 'Någjeldende ACL-regler'; +$lang['current'] = 'Gjeldende ACL-regler'; $lang['where'] = 'Side/Navnerom'; $lang['who'] = 'Bruker/Gruppe'; -$lang['perm'] = 'Tillatelser'; +$lang['perm'] = 'Rettigheter'; $lang['acl_perm0'] = 'Ingen'; $lang['acl_perm1'] = 'Lese'; $lang['acl_perm2'] = 'Redigere'; @@ -45,4 +46,4 @@ $lang['acl_perm4'] = 'Opprette'; $lang['acl_perm8'] = 'Laste opp'; $lang['acl_perm16'] = 'Slette'; $lang['acl_new'] = 'Legg til ny oppføring'; -$lang['acl_mod'] = 'Modifiser oppføring'; +$lang['acl_mod'] = 'Endre oppføring'; diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php index 3c4890149..c41b5e566 100644 --- a/lib/plugins/config/lang/no/lang.php +++ b/lib/plugins/config/lang/no/lang.php @@ -14,6 +14,7 @@ * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe + * @author Egil Hansen */ $lang['menu'] = 'Konfigurasjonsinnstillinger'; $lang['error'] = 'Innstillingene ble ikke oppdatert på grunn av en eller flere ugyldig verdier. Vennligst se gjennom endringene og prøv på nytt. @@ -24,10 +25,10 @@ $lang['locked'] = 'Innstillingene kan ikke oppdateres. Hvis dette forsikre deg om at fila med de lokale innstillingene har korrekt filnavn
og tillatelser.'; $lang['danger'] = 'Advarsel: Endrig av dette valget kan føre til at wiki og konfigurasjon menyen ikke blir tilgjengelig.'; -$lang['warning'] = 'Advarsel: Endring av dette valget kan føre til utilsiktede atferd. +$lang['warning'] = 'Advarsel: Endring av dette valget kan føre til utilsiktet atferd. '; -$lang['security'] = 'Sikkerhets Advarsel: Endring av dette valget kan føre til sikkerhetsrisiko.'; +$lang['security'] = 'Sikkerhetsadvarsel: Endring av dette valget kan innebære en sikkerhetsrisiko.'; $lang['_configuration_manager'] = 'Konfigurasjonsinnstillinger'; $lang['_header_dokuwiki'] = 'Innstillinger for DokuWiki'; $lang['_header_plugin'] = 'Innstillinger for tillegg'; @@ -36,10 +37,10 @@ $lang['_header_undefined'] = 'Udefinerte innstillinger'; $lang['_basic'] = 'Grunnleggende innstillinger'; $lang['_display'] = 'Innstillinger for visning av sider'; $lang['_authentication'] = 'Innstillinger for autentisering'; -$lang['_anti_spam'] = 'Motsøppel-innstillinger'; +$lang['_anti_spam'] = 'Anti-Spam innstillinger'; $lang['_editing'] = 'Innstillinger for redigering'; $lang['_links'] = 'Innstillinger for lenker'; -$lang['_media'] = 'Innstillinger for media-filer'; +$lang['_media'] = 'Innstillinger for mediafiler'; $lang['_advanced'] = 'Avanserte innstillinger'; $lang['_network'] = 'Nettverksinnstillinger'; $lang['_plugin_sufix'] = '– innstillinger for tillegg'; @@ -77,6 +78,7 @@ $lang['useheading'] = 'Bruk første overskrift som tittel'; $lang['refcheck'] = 'Sjekk referanser før mediafiler slettes'; $lang['refshow'] = 'Antall viste referanser til mediafiler'; $lang['allowdebug'] = 'Tillat feilsøking skru av om det ikke behøves!'; +$lang['mediarevisions'] = 'Slå på mediaversjonering?'; $lang['usewordblock'] = 'Blokker søppel basert på ordliste'; $lang['indexdelay'] = 'Forsinkelse før indeksering (sekunder)'; $lang['relnofollow'] = 'Bruk rel="nofollow" på eksterne lenker'; @@ -193,10 +195,10 @@ $lang['xsendfile_o_2'] = 'Standard X-Sendfile header'; $lang['xsendfile_o_3'] = 'Priprietær Nginx X-Accel-Redirect header'; $lang['showuseras_o_loginname'] = 'Brukernavn'; $lang['showuseras_o_username'] = 'Brukerens fulle navn'; -$lang['showuseras_o_email'] = 'Brukerens epostadresse (tilpasset i henhold til mailguar-instilling)'; +$lang['showuseras_o_email'] = 'Brukerens e-postadresse (tilpasset i henhold til mailguar-instilling)'; $lang['showuseras_o_email_link'] = 'Brukerens epost-addresse som "mailto:"-lenke'; $lang['useheading_o_0'] = 'Aldri'; $lang['useheading_o_navigation'] = 'Kun navigering'; $lang['useheading_o_content'] = 'Kun wiki-innhold'; $lang['useheading_o_1'] = 'Alltid'; -$lang['readdircache'] = 'Maksimal alder for mellomlagring av mappa med søkeindekser (sekunder)'; +$lang['readdircache'] = 'Maksimal alder for mellomlagring av mappen med søkeindekser (sekunder)'; diff --git a/lib/plugins/plugin/lang/no/admin_plugin.txt b/lib/plugins/plugin/lang/no/admin_plugin.txt index f1b63b992..1765b671d 100644 --- a/lib/plugins/plugin/lang/no/admin_plugin.txt +++ b/lib/plugins/plugin/lang/no/admin_plugin.txt @@ -1,3 +1,3 @@ -====== Behandle tillegg ====== +====== Behandle programtillegg ====== På denne siden kan du behandle alt som har å gjøre med DokuWikis [[doku>plugins|tillegg]]. For å kunne laste ned og installere et tillegg må webserveren ha skrivetilgang til mappen for tillegg. diff --git a/lib/plugins/plugin/lang/no/lang.php b/lib/plugins/plugin/lang/no/lang.php index 41f6d1153..829d29387 100644 --- a/lib/plugins/plugin/lang/no/lang.php +++ b/lib/plugins/plugin/lang/no/lang.php @@ -14,10 +14,11 @@ * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe + * @author Egil Hansen */ -$lang['menu'] = 'Behandle tillegg'; -$lang['download'] = 'Last ned og installer et tillegg'; -$lang['manage'] = 'Installerte tillegg'; +$lang['menu'] = 'Behandle programtillegg'; +$lang['download'] = 'Last ned og installer et programtillegg'; +$lang['manage'] = 'Installerte programtillegg'; $lang['btn_info'] = 'informasjon'; $lang['btn_update'] = 'oppdater'; $lang['btn_delete'] = 'slett'; @@ -31,7 +32,7 @@ $lang['source'] = 'Kilde:'; $lang['unknown'] = 'ukjent'; $lang['updating'] = 'Oppdaterer ...'; $lang['updated'] = 'Tillegget %s er oppdatert'; -$lang['updates'] = 'De følgende tilleggene har blitt oppdatert'; +$lang['updates'] = 'Følgende programtillegg har blitt oppdatert'; $lang['update_none'] = 'Ingen oppdateringer funnet.'; $lang['deleting'] = 'Sletter ...'; $lang['deleted'] = 'Tillegget %s ble slettet.'; diff --git a/lib/plugins/popularity/lang/no/intro.txt b/lib/plugins/popularity/lang/no/intro.txt index 3e67d793c..a0f360157 100644 --- a/lib/plugins/popularity/lang/no/intro.txt +++ b/lib/plugins/popularity/lang/no/intro.txt @@ -1,9 +1,9 @@ ====== Popularitetsfeedback ====== -Dette verktøyet samler anonyme data om din wiki og lar deg sende det tilbake til DokuWikis utviklere. Dette hjelper utviklerne å forstå hvordan DokuWiki blir brukt av dets brukere, og gjør at fremtidig beslutninger om videre utvikling kan tuftes på statistikk fra virkelig bruk. +Dette verktøyet samler anonyme data om din wiki og lar deg sende det tilbake til DokuWikis utviklere. Dette hjelper utviklerne å forstå hvordan DokuWiki blir brukt av brukerne, og gjør at fremtidig beslutninger om videre utvikling kan baseres på statistikk fra virkelig bruk. Du oppfordres herved til å gjenta dette skrittet fra tid til annen for å holde utviklerne informert når din wiki vokser. Ditt gjentatte datasett blir identifisert vha en anonym ID. De data som samles inn inneholder informasjon som din DokuWiki-versjon, antallet og størrelsen på sider og filer, installerte plugins og informasjon om din installerte PHP. -Rådata som blir sendt vises nedenfor. Vennligst bruk knappen "Send data" for å overføre informasjonen. \ No newline at end of file +Rådata som blir sendt vises nedenfor. Bruk knappen "Send data" for å overføre informasjonen. \ No newline at end of file diff --git a/lib/plugins/popularity/lang/no/lang.php b/lib/plugins/popularity/lang/no/lang.php index e283fc371..df38f6e0e 100644 --- a/lib/plugins/popularity/lang/no/lang.php +++ b/lib/plugins/popularity/lang/no/lang.php @@ -12,11 +12,12 @@ * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Thomas Nygreen * @author Jon Bøe + * @author Egil Hansen */ $lang['name'] = 'Popularitetsfeedback (kan ta litt tid å laste)'; $lang['submit'] = 'Send data'; $lang['autosubmit'] = 'Send data automatisk en gang i måneden'; $lang['submissionFailed'] = 'Kunne ikke sende dataene på grunn av følgende feil:'; $lang['submitDirectly'] = 'Du kan sende dataene manuelt ved å sende inn dette skjemaet.'; -$lang['autosubmitError'] = 'Den siste automatiske innsendinga feilet på grunn av følgende feil:'; +$lang['autosubmitError'] = 'Den siste automatiske innsendingen feilet på grunn av følgende feil:'; $lang['lastSent'] = 'Dataene er sendt'; diff --git a/lib/plugins/popularity/lang/no/submitted.txt b/lib/plugins/popularity/lang/no/submitted.txt index 239676a9d..ccec7674e 100644 --- a/lib/plugins/popularity/lang/no/submitted.txt +++ b/lib/plugins/popularity/lang/no/submitted.txt @@ -1,3 +1,3 @@ ====== Tilbakemelding om popularitet ====== -Innsending av dataene var vellykka. \ No newline at end of file +Innsending av dataene var vellykket. \ No newline at end of file diff --git a/lib/plugins/revert/lang/no/lang.php b/lib/plugins/revert/lang/no/lang.php index 2a6a2abd3..299b12ea7 100644 --- a/lib/plugins/revert/lang/no/lang.php +++ b/lib/plugins/revert/lang/no/lang.php @@ -14,6 +14,7 @@ * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe + * @author Egil Hansen */ $lang['menu'] = 'Tilbakestillingsbehandler'; $lang['filter'] = 'Søk etter søppelmeldinger'; diff --git a/lib/plugins/usermanager/lang/no/lang.php b/lib/plugins/usermanager/lang/no/lang.php index 668863ec2..7124e4811 100644 --- a/lib/plugins/usermanager/lang/no/lang.php +++ b/lib/plugins/usermanager/lang/no/lang.php @@ -14,6 +14,7 @@ * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe + * @author Egil Hansen */ $lang['menu'] = 'Behandle brukere'; $lang['noauth'] = '(autentisering av brukere ikke tilgjengelig)'; @@ -28,7 +29,7 @@ $lang['field'] = 'Felt'; $lang['value'] = 'Verdi'; $lang['add'] = 'Legg til'; $lang['delete'] = 'Slett'; -$lang['delete_selected'] = 'Slett utvalgte'; +$lang['delete_selected'] = 'Slett valgte'; $lang['edit'] = 'Rediger'; $lang['edit_prompt'] = 'Rediger denne brukeren'; $lang['modify'] = 'Lagre endringer'; -- cgit v1.2.3 From 77b9cb8455942e8998e88f6977e3486959ed1b1a Mon Sep 17 00:00:00 2001 From: Ricardo Guijt Date: Thu, 8 Dec 2011 12:23:53 +0100 Subject: Dutch language update --- lib/plugins/acl/lang/nl/lang.php | 1 + lib/plugins/config/lang/nl/lang.php | 2 ++ lib/plugins/plugin/lang/nl/lang.php | 1 + lib/plugins/popularity/lang/nl/lang.php | 1 + lib/plugins/revert/lang/nl/lang.php | 1 + lib/plugins/usermanager/lang/nl/lang.php | 1 + 6 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php index 686909644..cb0765505 100644 --- a/lib/plugins/acl/lang/nl/lang.php +++ b/lib/plugins/acl/lang/nl/lang.php @@ -17,6 +17,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['admin_acl'] = 'Toegangsrechten'; $lang['acl_group'] = 'Groep'; diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index 65385cc43..c98d05adb 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -14,6 +14,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['menu'] = 'Configuratie-instellingen'; $lang['error'] = 'De instellingen zijn niet gewijzigd wegens een incorrecte waarde, kijk je wijzigingen na en sla dan opnieuw op.
Je kunt de incorrecte waarde(s) herkennen aan de rode rand.'; @@ -72,6 +73,7 @@ $lang['useheading'] = 'Eerste kopje voor paginanaam gebruiken'; $lang['refcheck'] = 'Controleer verwijzingen naar media'; $lang['refshow'] = 'Aantal te tonen mediaverwijzingen'; $lang['allowdebug'] = 'Debug toestaan uitzetten indien niet noodzakelijk!'; +$lang['mediarevisions'] = 'Media revisies activeren?'; $lang['usewordblock'] = 'Blokkeer spam op basis van woordenlijst'; $lang['indexdelay'] = 'Uitstel voor indexeren (sec)'; $lang['relnofollow'] = 'Gebruik rel="nofollow" voor externe links'; diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php index d13e46ff8..0599c3184 100644 --- a/lib/plugins/plugin/lang/nl/lang.php +++ b/lib/plugins/plugin/lang/nl/lang.php @@ -12,6 +12,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['menu'] = 'Plugins beheren'; $lang['download'] = 'Download en installeer een nieuwe plugin'; diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php index 75c13013b..e5e94aab4 100644 --- a/lib/plugins/popularity/lang/nl/lang.php +++ b/lib/plugins/popularity/lang/nl/lang.php @@ -11,6 +11,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['name'] = 'Populariteitsfeedback (kan even duren om in te laden)'; $lang['submit'] = 'Verstuur'; diff --git a/lib/plugins/revert/lang/nl/lang.php b/lib/plugins/revert/lang/nl/lang.php index 954bf1068..32e14c2c4 100644 --- a/lib/plugins/revert/lang/nl/lang.php +++ b/lib/plugins/revert/lang/nl/lang.php @@ -12,6 +12,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['menu'] = 'Herstelmanager'; $lang['filter'] = 'Zoek naar bekladde pagina\'s'; diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php index cac793386..b00ab22e0 100644 --- a/lib/plugins/usermanager/lang/nl/lang.php +++ b/lib/plugins/usermanager/lang/nl/lang.php @@ -12,6 +12,7 @@ * @author Marijn Hofstra * @author Timon Van Overveldt * @author Jeroen + * @author Ricardo Guijt */ $lang['menu'] = 'Gebruikersmanager'; $lang['noauth'] = '(gebruikersauthenticatie niet beschikbaar)'; -- cgit v1.2.3 From 97a000f0551735b35606d94d59abc4ff440783a5 Mon Sep 17 00:00:00 2001 From: Tim Roes Date: Thu, 1 Dec 2011 22:33:16 +0100 Subject: Fixed bug in XML-RPC search. The score was randomly transfered as string or as integer. This way it will always be transfered as an integer. --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index e5e3298ae..95775188f 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -411,7 +411,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { $pages[] = array( 'id' => $id, - 'score' => $score, + 'score' => intval($score), 'rev' => filemtime($file), 'mtime' => filemtime($file), 'size' => filesize($file), -- cgit v1.2.3 From 965d96926bd3b834e7814174763a94560f8bc2f0 Mon Sep 17 00:00:00 2001 From: Begina Felicysym Date: Wed, 14 Dec 2011 21:47:28 +0100 Subject: Polish language update --- lib/plugins/acl/lang/pl/lang.php | 1 + lib/plugins/config/lang/pl/lang.php | 7 ++++++- lib/plugins/plugin/lang/pl/lang.php | 2 ++ lib/plugins/popularity/lang/pl/lang.php | 1 + lib/plugins/revert/lang/pl/lang.php | 1 + lib/plugins/usermanager/lang/pl/lang.php | 1 + 6 files changed, 12 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php index a72b6af11..1b10b5232 100644 --- a/lib/plugins/acl/lang/pl/lang.php +++ b/lib/plugins/acl/lang/pl/lang.php @@ -12,6 +12,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['admin_acl'] = 'Zarządzanie uprawnieniami'; $lang['acl_group'] = 'Grupa'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 6e94a2e3d..62c55d328 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -13,6 +13,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['menu'] = 'Ustawienia'; $lang['error'] = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu.
Niepoprawne wartości są wyróżnione kolorem czerwonym.'; @@ -47,6 +48,7 @@ $lang['lang'] = 'Język'; $lang['basedir'] = 'Katalog główny'; $lang['baseurl'] = 'Główny URL'; $lang['savedir'] = 'Katalog z danymi'; +$lang['cookiedir'] = 'Ścieżka plików ciasteczek. Zostaw puste by użyć baseurl.'; $lang['start'] = 'Tytuł strony początkowej'; $lang['title'] = 'Tytuł wiki'; $lang['template'] = 'Motyw'; @@ -70,6 +72,7 @@ $lang['useheading'] = 'Pierwszy nagłówek jako tytuł'; $lang['refcheck'] = 'Sprawdzanie odwołań przed usunięciem pliku'; $lang['refshow'] = 'Ilość pokazywanych odwołań do pliku'; $lang['allowdebug'] = 'Debugowanie (niebezpieczne!)'; +$lang['mediarevisions'] = 'Włączyć wersjonowanie multimediów?'; $lang['usewordblock'] = 'Blokowanie spamu na podstawie słów'; $lang['indexdelay'] = 'Okres indeksowania w sekundach'; $lang['relnofollow'] = 'Nagłówek rel="nofollow" dla odnośników zewnętrznych'; @@ -109,13 +112,15 @@ $lang['fetchsize'] = 'Maksymalny rozmiar pliku (w bajtach) jaki moż $lang['notify'] = 'Wysyłanie powiadomień na adres e-mail'; $lang['registernotify'] = 'Prześlij informacje o nowych użytkownikach na adres e-mail'; $lang['mailfrom'] = 'Adres e-mail tego wiki'; -$lang['gzip_output'] = 'Używaj GZIP dla XHTML'; +$lang['mailprefix'] = 'Prefiks tematu e-mail do automatycznych wiadomości'; +$lang['gzip_output'] = 'Używaj kodowania GZIP dla zawartości XHTML'; $lang['gdlib'] = 'Wersja biblioteki GDLib'; $lang['im_convert'] = 'Ścieżka do programu imagemagick'; $lang['jpg_quality'] = 'Jakość kompresji JPG (0-100)'; $lang['subscribers'] = 'Subskrypcja'; $lang['subscribe_time'] = 'Czas po którym są wysyłane listy subskrypcji i streszczenia (sek.); Powinna być to wartość większa niż podana w zmiennej recent_days.'; $lang['compress'] = 'Kompresja arkuszy CSS i plików JavaScript'; +$lang['cssdatauri'] = 'Rozmiar w bajtach, poniżej którego odwołania do obrazów w plikach CSS powinny być osadzone bezpośrednio w arkuszu stylów by zmniejszyć ogólne żądania nagłówków HTTP. Technika ta nie działa w IE 7 i poniżej! 400 do 600 bajtów jest dobrą wartością. Ustaw 0 aby wyłączyć.'; $lang['hidepages'] = 'Ukrywanie stron pasujących do wzorca (wyrażenie regularne)'; $lang['send404'] = 'Nagłówek "HTTP 404/Page Not Found" dla nieistniejących stron'; $lang['sitemap'] = 'Okres generowania Google Sitemap (w dniach)'; diff --git a/lib/plugins/plugin/lang/pl/lang.php b/lib/plugins/plugin/lang/pl/lang.php index a84c55190..02459f1de 100644 --- a/lib/plugins/plugin/lang/pl/lang.php +++ b/lib/plugins/plugin/lang/pl/lang.php @@ -13,6 +13,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['menu'] = 'Menadżer wtyczek'; $lang['download'] = 'Ściągnij i zainstaluj nową wtyczkę'; @@ -58,3 +59,4 @@ $lang['enabled'] = 'Wtyczka %s włączona.'; $lang['notenabled'] = 'Nie udało się uruchomić wtyczki %s, sprawdź uprawnienia dostępu do plików.'; $lang['disabled'] = 'Wtyczka %s wyłączona.'; $lang['notdisabled'] = 'Nie udało się wyłączyć wtyczki %s, sprawdź uprawnienia dostępu do plików.'; +$lang['packageinstalled'] = 'Pakiet wtyczek (%d wtyczki:% s) zainstalowany pomyślnie.'; diff --git a/lib/plugins/popularity/lang/pl/lang.php b/lib/plugins/popularity/lang/pl/lang.php index d96254fd8..64d772d54 100644 --- a/lib/plugins/popularity/lang/pl/lang.php +++ b/lib/plugins/popularity/lang/pl/lang.php @@ -11,6 +11,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['name'] = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)'; $lang['submit'] = 'Wyślij dane'; diff --git a/lib/plugins/revert/lang/pl/lang.php b/lib/plugins/revert/lang/pl/lang.php index f36dc591a..30ab60fda 100644 --- a/lib/plugins/revert/lang/pl/lang.php +++ b/lib/plugins/revert/lang/pl/lang.php @@ -10,6 +10,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['menu'] = 'Menadżer przywracania'; $lang['filter'] = 'Wyszukaj uszkodzone strony'; diff --git a/lib/plugins/usermanager/lang/pl/lang.php b/lib/plugins/usermanager/lang/pl/lang.php index 7c79c5d1f..5bbf84370 100644 --- a/lib/plugins/usermanager/lang/pl/lang.php +++ b/lib/plugins/usermanager/lang/pl/lang.php @@ -11,6 +11,7 @@ * @author maros * @author Grzegorz Widła * @author Łukasz Chmaj + * @author Begina Felicysym */ $lang['menu'] = 'Menadżer użytkowników'; $lang['noauth'] = '(uwierzytelnienie użytkownika niemożliwe)'; -- cgit v1.2.3 From d0674b61febbf2449c8a5fdddff35d4ed55147af Mon Sep 17 00:00:00 2001 From: Jian Wei Tay Date: Thu, 15 Dec 2011 22:09:28 +0100 Subject: Malay language update --- lib/plugins/acl/lang/ms/lang.php | 6 ++++++ lib/plugins/config/lang/ms/lang.php | 6 ++++++ lib/plugins/plugin/lang/ms/lang.php | 6 ++++++ lib/plugins/popularity/lang/ms/lang.php | 6 ++++++ lib/plugins/revert/lang/ms/lang.php | 6 ++++++ lib/plugins/usermanager/lang/ms/lang.php | 6 ++++++ 6 files changed, 36 insertions(+) create mode 100644 lib/plugins/acl/lang/ms/lang.php create mode 100644 lib/plugins/config/lang/ms/lang.php create mode 100644 lib/plugins/plugin/lang/ms/lang.php create mode 100644 lib/plugins/popularity/lang/ms/lang.php create mode 100644 lib/plugins/revert/lang/ms/lang.php create mode 100644 lib/plugins/usermanager/lang/ms/lang.php (limited to 'lib') diff --git a/lib/plugins/acl/lang/ms/lang.php b/lib/plugins/acl/lang/ms/lang.php new file mode 100644 index 000000000..77ad2a1c1 --- /dev/null +++ b/lib/plugins/acl/lang/ms/lang.php @@ -0,0 +1,6 @@ + Date: Sun, 11 Dec 2011 11:24:19 +0100 Subject: transfered bugfix from dokuwiki 97a000f0551735b35606d94d59abc4ff440783a5 --- lib/exe/xmlrpc.php | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index cb8dbf42d..bcbae0a43 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -299,17 +299,16 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * @author Gina Haeussge */ function getAttachment($id){ - $id = cleanID($id); - if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ) - return new IXR_Error(1, 'You are not allowed to read this file'); - - $file = mediaFN($id); - if (!@ file_exists($file)) - return new IXR_Error(1, 'The requested file does not exist'); - - $data = io_readFile($file, false); - $base64 = base64_encode($data); - return $base64; + try { + try { + return $this->remote->getAttachment($id); + } catch (RemoteAccessDenied $e) { + return new IXR_Error(1, 'You are not allowed to read this file'); + } + } + catch (RemoteException $e) { + return new IXR_Error(1, $e->getMessage()); + } } /** @@ -318,18 +317,8 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { * @author Gina Haeussge */ function getAttachmentInfo($id){ - $id = cleanID($id); - $info = array( - 'lastModified' => 0, - 'size' => 0, - ); - - $file = mediaFN($id); - if ((auth_quickaclcheck(getNS($id).':*') >= AUTH_READ) && file_exists($file)){ - $info['lastModified'] = new IXR_Date(filemtime($file)); - $info['size'] = filesize($file); - } - + $info = $this->remote->getAttachmentInfo($id); + $info['lastModified'] = new IXR_Date($info['lastModified']); return $info; } -- cgit v1.2.3 From d80d35e22221ff74c4374f34927a5097362e23d8 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Thu, 22 Dec 2011 19:11:31 +0100 Subject: added forgotten remote.php in lib/plugins --- lib/plugins/remote.php | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 lib/plugins/remote.php (limited to 'lib') diff --git a/lib/plugins/remote.php b/lib/plugins/remote.php new file mode 100644 index 000000000..42c2f53c8 --- /dev/null +++ b/lib/plugins/remote.php @@ -0,0 +1,11 @@ + Date: Thu, 22 Dec 2011 20:21:46 +0100 Subject: Japanese language update --- lib/plugins/config/lang/ja/lang.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php index 19f10af48..500d44539 100644 --- a/lib/plugins/config/lang/ja/lang.php +++ b/lib/plugins/config/lang/ja/lang.php @@ -41,9 +41,10 @@ $lang['_msg_setting_no_default'] = '初期値が設定されていません。'; $lang['fmode'] = 'ファイル作成マスク'; $lang['dmode'] = 'フォルダ作成マスク'; $lang['lang'] = '使用言語'; -$lang['basedir'] = 'ベースディレクトリ'; -$lang['baseurl'] = 'ベースURL'; +$lang['basedir'] = 'サーバのパス (例: /dokuwiki/)。空欄にすると自動的に検出します。'; +$lang['baseurl'] = 'サーバの URL (例: http://www.yourserver.com)。空欄にすると自動的に検出します。'; $lang['savedir'] = '保存ディレクトリ'; +$lang['cookiedir'] = 'Cookie のパス。空欄にすると baseurl を使用します。'; $lang['start'] = 'スタートページ名'; $lang['title'] = 'WIKIタイトル'; $lang['template'] = 'テンプレート'; @@ -67,6 +68,7 @@ $lang['useheading'] = '最初の見出しをページ名とする'; $lang['refcheck'] = 'メディア参照元チェック'; $lang['refshow'] = 'メディア参照元表示数'; $lang['allowdebug'] = 'デバッグモード（必要で無いときは無効にしてください）'; +$lang['mediarevisions'] = 'メディアファイルの履歴を有効にしますか?'; $lang['usewordblock'] = '単語リストに基づくスパムブロック'; $lang['indexdelay'] = 'インデックスを許可（何秒後）'; $lang['relnofollow'] = 'rel="nofollow"を付加'; @@ -114,6 +116,7 @@ $lang['jpg_quality'] = 'JPG圧縮品質（0-100）'; $lang['subscribers'] = '更新通知機能'; $lang['subscribe_time'] = '購読リストと概要を送信する期間（秒）。「最近の変更とする期間」で指定した期間より小さくしてください。'; $lang['compress'] = 'CSSとJavaScriptを圧縮'; +$lang['cssdatauri'] = 'HTTP リクエスト数によるオーバーヘッドを減らすため、CSS ファイルから参照される画像ファイルのサイズがここで指定するバイト数以内の場合は CSS ファイル内に Data URI として埋め込みます。このテクニックは IE7 以下では動作しません! 400 から 600 バイトがちょうどよい値です。0 を指定すると埋め込み処理は行われません。'; $lang['hidepages'] = '非公開ページ（Regex）'; $lang['send404'] = '文書が存在しないページに"HTTP404/Page Not Found"を使用'; $lang['sitemap'] = 'Googleサイトマップ作成頻度（日数）'; -- cgit v1.2.3 From c999630672a7a3ff116388f556e895a2cc6dbc01 Mon Sep 17 00:00:00 2001 From: skimpax Date: Thu, 22 Dec 2011 20:22:47 +0100 Subject: French language update --- lib/plugins/acl/lang/fr/lang.php | 1 + lib/plugins/config/lang/fr/lang.php | 2 ++ lib/plugins/plugin/lang/fr/lang.php | 1 + lib/plugins/popularity/lang/fr/lang.php | 1 + lib/plugins/revert/lang/fr/lang.php | 1 + lib/plugins/usermanager/lang/fr/lang.php | 1 + 6 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php index 86f493b52..a33a52bf0 100644 --- a/lib/plugins/acl/lang/fr/lang.php +++ b/lib/plugins/acl/lang/fr/lang.php @@ -21,6 +21,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['admin_acl'] = 'Gestion de la liste des contrôles d\'accès (ACL)'; $lang['acl_group'] = 'Groupe'; diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 9b4ecf286..8dcd21032 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -16,6 +16,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['menu'] = 'Paramètres de configuration'; $lang['error'] = 'Paramètres non modifiés en raison d\'une valeur non valide, vérifiez vos réglages et réessayez.
Les valeurs erronées sont entourées d\'une bordure rouge.'; @@ -74,6 +75,7 @@ $lang['useheading'] = 'Utiliser le titre de premier niveau'; $lang['refcheck'] = 'Vérifier les références de média'; $lang['refshow'] = 'Nombre de références de média à montrer'; $lang['allowdebug'] = 'Debug (Ne l\'activez que si vous en avez besoin !)'; +$lang['mediarevisions'] = 'Activer les révisions (gestion de versions) des médias'; $lang['usewordblock'] = 'Bloquer le spam selon les mots utilisés'; $lang['indexdelay'] = 'Délai avant l\'indexation (en secondes)'; $lang['relnofollow'] = 'Utiliser rel="nofollow" sur les liens extérieurs'; diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php index b86c57b53..bb0b49872 100644 --- a/lib/plugins/plugin/lang/fr/lang.php +++ b/lib/plugins/plugin/lang/fr/lang.php @@ -16,6 +16,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['menu'] = 'Gestion des modules externes'; $lang['download'] = 'Télécharger et installer un nouveau module'; diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php index ae12c6683..6b2a40204 100644 --- a/lib/plugins/popularity/lang/fr/lang.php +++ b/lib/plugins/popularity/lang/fr/lang.php @@ -13,6 +13,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['name'] = 'Enquête de popularité (peut nécessiter un certain temps pour être chargée)'; $lang['submit'] = 'Envoyer les données'; diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php index 15d4d39c3..9c5194b31 100644 --- a/lib/plugins/revert/lang/fr/lang.php +++ b/lib/plugins/revert/lang/fr/lang.php @@ -14,6 +14,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['menu'] = 'Gestionnaire de réversions'; $lang['filter'] = 'Trouver les pages spammées '; diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php index 875b6d1a6..948262a8f 100644 --- a/lib/plugins/usermanager/lang/fr/lang.php +++ b/lib/plugins/usermanager/lang/fr/lang.php @@ -15,6 +15,7 @@ * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud * @author schplurtz@laposte.net + * @author skimpax@gmail.com */ $lang['menu'] = 'Gestion des utilisateurs'; $lang['noauth'] = '(authentification utilisateur non disponible)'; -- cgit v1.2.3 From 1fef63e681b0dacd5ac7ad7748071681409be7b7 Mon Sep 17 00:00:00 2001 From: NEOhidra Date: Thu, 22 Dec 2011 23:34:48 +0200 Subject: BG: language update (added "mediarevisions") --- lib/plugins/config/lang/bg/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php index ff03fd9e2..ed29c079b 100644 --- a/lib/plugins/config/lang/bg/lang.php +++ b/lib/plugins/config/lang/bg/lang.php @@ -65,6 +65,7 @@ $lang['useheading'] = 'Ползване на първото загл $lang['refcheck'] = 'Проверка за препратка към медия, преди да бъде изтрита'; $lang['refshow'] = 'Брой на показваните медийни препратки'; $lang['allowdebug'] = 'Включване на режи debug - изключете, ако не е нужен!'; +$lang['mediarevisions'] = 'Да се пазят ли стари версии на качените файлове (Mediarevisions)?'; $lang['usewordblock'] = 'Блокиране на SPAM въз основа на на списък от думи'; $lang['indexdelay'] = 'Забавяне преди индексиране (сек)'; $lang['relnofollow'] = 'Ползване на rel="nofollow" за външни препратки'; -- cgit v1.2.3 From eb2f7e5e56a00f69a13722cc4297a6d6a61bd00f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 27 Dec 2011 11:26:02 +0000 Subject: fixed no align option in media settings modal window (FS#2411) --- lib/scripts/media.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 267e64a76..c74633523 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -253,8 +253,10 @@ var dw_mediamanager = { } } } - alignleft = dw_mediamanager.align === '2' ? '' : ' '; - alignright = dw_mediamanager.align === '4' ? '' : ' '; + if (dw_mediamanager.align !== '1') { + alignleft = dw_mediamanager.align === '2' ? '' : ' '; + alignright = dw_mediamanager.align === '4' ? '' : ' '; + } } } edid = String.prototype.match.call(document.location, /&edid=([^&]+)/); -- cgit v1.2.3 From ee6bf45dd5a159e38e0dac99cc6afc6cf3df59e4 Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Wed, 4 Jan 2012 10:53:57 +0100 Subject: Correct two spaces in the French translation of the popularity plugin Thanks to Anael in the DokuWiki IRC channel for spotting the errors. --- lib/plugins/popularity/lang/fr/lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php index 6b2a40204..9ff7a7e8b 100644 --- a/lib/plugins/popularity/lang/fr/lang.php +++ b/lib/plugins/popularity/lang/fr/lang.php @@ -19,6 +19,6 @@ $lang['name'] = 'Enquête de popularité (peut nécessiter un c $lang['submit'] = 'Envoyer les données'; $lang['autosubmit'] = 'Envoyer les données automatiquement chaque mois'; $lang['submissionFailed'] = 'Les données ne peuvent pas être envoyées à cause des erreurs suivantes :'; -$lang['submitDirectly'] = 'Vous pouvez envoyer le données manuellement en soumettant ce formulaire.'; +$lang['submitDirectly'] = 'Vous pouvez envoyer le données manuellement en soumettant ce formulaire.'; $lang['autosubmitError'] = 'La dernière soumission automatique a échoué pour les raisons suivantes :'; -$lang['lastSent'] = 'Les données ont été envoyées'; +$lang['lastSent'] = 'Les données ont été envoyées '; -- cgit v1.2.3 From c4ec01d679a5badc56ac8315eb279fb8f98698b6 Mon Sep 17 00:00:00 2001 From: "Oscar M. Lage" Date: Sun, 8 Jan 2012 12:57:37 +0100 Subject: Spanish language update --- lib/plugins/config/lang/es/lang.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php index 1189a6781..9146633cf 100644 --- a/lib/plugins/config/lang/es/lang.php +++ b/lib/plugins/config/lang/es/lang.php @@ -80,6 +80,7 @@ $lang['useheading'] = 'Usar el primer encabezado para nombres de pág $lang['refcheck'] = 'Control de referencia a medios'; $lang['refshow'] = 'Número de referencias a medios a mostrar'; $lang['allowdebug'] = 'Permitir debug deshabilítelo si no lo necesita!'; +$lang['mediarevisions'] = '¿Habilitar Mediarevisions?'; $lang['usewordblock'] = 'Bloquear spam usando una lista de palabras'; $lang['indexdelay'] = 'Intervalo de tiempo antes de indexar (segundos)'; $lang['relnofollow'] = 'Usar rel="nofollow" en enlaces externos'; @@ -132,14 +133,14 @@ $lang['hidepages'] = 'Ocultar páginas con coincidencias (expresione $lang['send404'] = 'Enviar "HTTP 404/Page Not Found" para páginas no existentes'; $lang['sitemap'] = 'Generar sitemap de Google (días)'; $lang['broken_iua'] = '¿Se ha roto (broken) la función ignore_user_abort en su sistema? Esto puede causar que no funcione el index de búsqueda. Se sabe que IIS+PHP/CGI está roto. Vea Bug 852para más información.'; -$lang['xsendfile'] = 'Utilice el X-Sendfile header para permitirle sl servidor web enviar archivos estáticos? Su servidor web necesita tener la capacidad para hacerlo.'; +$lang['xsendfile'] = '¿Utilizar la cabecera X-Sendfile para permitirle al servidor web enviar archivos estáticos? Su servidor web necesita tener la capacidad para hacerlo.'; $lang['renderer_xhtml'] = 'Visualizador a usar para salida (xhtml) principal del wiki'; $lang['renderer__core'] = '%s (núcleo dokuwiki)'; $lang['renderer__plugin'] = '%s (plugin)'; $lang['rememberme'] = 'Permitir cookies para acceso permanente (recordarme)'; $lang['rss_type'] = 'Tipo de resumen (feed) XML'; $lang['rss_linkto'] = 'Feed XML enlaza a'; -$lang['rss_content'] = 'Que mostrar en los itemes del archivo XML?'; +$lang['rss_content'] = '¿Qué mostrar en los items del archivo XML?'; $lang['rss_update'] = 'Intervalo de actualización de feed XML (segundos)'; $lang['recent_days'] = 'Cuántos cambios recientes mantener (días)'; $lang['rss_show_summary'] = 'Feed XML muestra el resumen en el título'; -- cgit v1.2.3 From eb20307ad68614b8834c804eeade389967db5ed4 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 14:38:52 +0100 Subject: removed xmlrpc and xmlrpcuser - added remote and remoteuser config option --- lib/plugins/config/lang/ar/lang.php | 2 -- lib/plugins/config/lang/bg/lang.php | 2 -- lib/plugins/config/lang/ca-valencia/lang.php | 2 -- lib/plugins/config/lang/ca/lang.php | 2 -- lib/plugins/config/lang/cs/lang.php | 2 -- lib/plugins/config/lang/da/lang.php | 2 -- lib/plugins/config/lang/de-informal/lang.php | 2 -- lib/plugins/config/lang/de/lang.php | 2 -- lib/plugins/config/lang/el/lang.php | 4 +--- lib/plugins/config/lang/en/lang.php | 4 ++-- lib/plugins/config/lang/eo/lang.php | 2 -- lib/plugins/config/lang/es/lang.php | 2 -- lib/plugins/config/lang/eu/lang.php | 2 -- lib/plugins/config/lang/fa/lang.php | 2 -- lib/plugins/config/lang/fi/lang.php | 2 -- lib/plugins/config/lang/fr/lang.php | 2 -- lib/plugins/config/lang/gl/lang.php | 2 -- lib/plugins/config/lang/he/lang.php | 1 - lib/plugins/config/lang/hu/lang.php | 2 -- lib/plugins/config/lang/ia/lang.php | 2 -- lib/plugins/config/lang/id-ni/lang.php | 1 - lib/plugins/config/lang/it/lang.php | 2 -- lib/plugins/config/lang/ja/lang.php | 2 -- lib/plugins/config/lang/ko/lang.php | 2 -- lib/plugins/config/lang/la/lang.php | 2 -- lib/plugins/config/lang/lv/lang.php | 2 -- lib/plugins/config/lang/mr/lang.php | 2 -- lib/plugins/config/lang/nl/lang.php | 2 -- lib/plugins/config/lang/no/lang.php | 3 --- lib/plugins/config/lang/pl/lang.php | 2 -- lib/plugins/config/lang/pt-br/lang.php | 2 -- lib/plugins/config/lang/pt/lang.php | 2 -- lib/plugins/config/lang/ro/lang.php | 2 -- lib/plugins/config/lang/ru/lang.php | 2 -- lib/plugins/config/lang/sk/lang.php | 2 -- lib/plugins/config/lang/sl/lang.php | 2 -- lib/plugins/config/lang/sq/lang.php | 2 -- lib/plugins/config/lang/sr/lang.php | 2 -- lib/plugins/config/lang/sv/lang.php | 2 -- lib/plugins/config/lang/th/lang.php | 1 - lib/plugins/config/lang/uk/lang.php | 2 -- lib/plugins/config/lang/zh-tw/lang.php | 2 -- lib/plugins/config/lang/zh/lang.php | 2 -- lib/plugins/config/settings/config.metadata.php | 4 ++-- 44 files changed, 5 insertions(+), 87 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php index 63d258485..3855f4ac1 100644 --- a/lib/plugins/config/lang/ar/lang.php +++ b/lib/plugins/config/lang/ar/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'اجراءات أخرى (مفصولة بالف $lang['sneaky_index'] = 'افتراضيا، ستعرض دوكو ويكي كل اسماء النطاقات في عرض الفهرس. تفعيل هذا الخيار سيخفي مالا يملك المستخدم صلاحية قراءته. قد يؤدي هذا إلى اخفاء نطاقات فرعية متاحة. وقد يؤدي لجعل صفحة الفهرس معطلة في بعض اعدادات ACL.'; $lang['auth_security_timeout'] = 'زمن انتهاء أمان المواثقة (ثوان)'; $lang['securecookie'] = 'هل يفرض على كعكات التصفح المعدة عبر HTTPS ان ترسل فقط عبر HTTPS من قبل المتصفح؟ عطل هذا إن كان الولوج للويكي مؤمنا فقط عبر SSL لكن تصفح الويكي غير مؤمن.'; -$lang['xmlrpc'] = 'مكّن/عطل واجهة XML-RPC.'; -$lang['xmlrpcuser'] = 'احصر الوصول لـ XML-RPC بمستخدمين أو مجموعات مفصولة بالفاصلة هنا. اتركها فارغة لتمكين الوصول للجميع.'; $lang['updatecheck'] = 'تحقق من التحديثات و تنبيهات الأمان؟ دوكو ويكي ستحتاج للاتصال ب update.dokuwiki.org لأجل ذلك'; $lang['userewrite'] = 'استعمل عناوين URLs جميلة'; $lang['useslash'] = 'استخدم الشرطة كفاصل النطاق في العناوين'; diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php index ff03fd9e2..8f61e96c0 100644 --- a/lib/plugins/config/lang/bg/lang.php +++ b/lib/plugins/config/lang/bg/lang.php @@ -88,8 +88,6 @@ $lang['sneaky_index'] = 'Стандартно DokuWiki ще показ $lang['auth_security_timeout'] = 'Автоматично проверяване на удостоверяването всеки (сек)'; $lang['securecookie'] = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL. '; -$lang['xmlrpc'] = 'Включване/Изключване на интерфейса XML-RPC.'; -$lang['xmlrpcuser'] = 'Ограничаване на XML-RPC достъпа до отделени със запетая групи или потребители. Оставете празно, за да даде достъп на всеки.'; $lang['updatecheck'] = 'Проверяване за за нови версии и предупреждения за сигурността? Необходимо е Dokiwiki да може да се свързва със update.dokuwiki.org за тази функционалност.'; $lang['userewrite'] = 'Ползване на nice URL адреси'; $lang['useslash'] = 'Ползване на наклонена черта за разделител на именните пространства в URL'; diff --git a/lib/plugins/config/lang/ca-valencia/lang.php b/lib/plugins/config/lang/ca-valencia/lang.php index 76f11a4a5..4a8c10895 100644 --- a/lib/plugins/config/lang/ca-valencia/lang.php +++ b/lib/plugins/config/lang/ca-valencia/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'Atres accions (separades per comes)'; $lang['sneaky_index'] = 'Normalment, DokuWiki mostra tots els espais de noms en la vista d\'índex. Activant esta opció s\'ocultaran aquells per als que l\'usuari no tinga permís de llectura. Açò pot ocultar subespais accessibles i inutilisar l\'índex per a certes configuracions del ACL.'; $lang['auth_security_timeout'] = 'Temps de seguritat màxim per a l\'autenticació (segons)'; $lang['securecookie'] = '¿El navegador deuria enviar per HTTPS només les galletes que s\'han generat per HTTPS? Desactive esta opció quan utilise SSL només en la pàgina d\'inici de sessió.'; -$lang['xmlrpc'] = 'Activar/desactivar interfaç XML-RPC.'; -$lang['xmlrpcuser'] = 'Restringir l\'accés XML-RPC a la llista d\'usuaris i grups separada per comes definida ací. Deixar buit per a donar accés a tots.'; $lang['updatecheck'] = '¿Buscar actualisacions i advertències de seguritat? DokuWiki necessita conectar a update.dokuwiki.org per ad açò.'; $lang['userewrite'] = 'Utilisar URL millorades'; $lang['useslash'] = 'Utilisar \'/\' per a separar espais de noms en les URL'; diff --git a/lib/plugins/config/lang/ca/lang.php b/lib/plugins/config/lang/ca/lang.php index 1a2a22881..84680450a 100644 --- a/lib/plugins/config/lang/ca/lang.php +++ b/lib/plugins/config/lang/ca/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'Altres accions (separades per comes)'; $lang['sneaky_index'] = 'Per defecte, DokuWiki mostrarà tots els espai en la visualització d\'índex. Si activeu aquest paràmetre, s\'ocultaran aquells espais en els quals l\'usuari no té accés de lectura. Això pot fer que s\'ocultin subespais que sí que són accessibles. En algunes configuracions ACL pot fer que l\'índex resulti inutilitzable.'; $lang['auth_security_timeout'] = 'Temps d\'espera de seguretat en l\'autenticació (segons)'; $lang['securecookie'] = 'Les galetes que s\'han creat via HTTPS, només s\'han d\'enviar des del navegador per HTTPS? Inhabiliteu aquesta opció si només l\'inici de sessió del wiki es fa amb SSL i la navegació del wiki es fa sense seguretat.'; -$lang['xmlrpc'] = 'Habilita/inhabilita la interfície XML-RPC'; -$lang['xmlrpcuser'] = 'Restringeix l\'accés per XML-RPC als usuaris o grups següents, separats per comes. Deixeu aquest camp en blanc per donar accés a tothom.'; $lang['updatecheck'] = 'Comprova actualitzacions i avisos de seguretat. DokuWiki necessitarà contactar amb update.dokuwiki.org per utilitzar aquesta característica.'; $lang['userewrite'] = 'Utilitza URL nets'; $lang['useslash'] = 'Utilitza la barra / com a separador d\'espais en els URL'; diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php index bf87e99d5..b9e6049a5 100644 --- a/lib/plugins/config/lang/cs/lang.php +++ b/lib/plugins/config/lang/cs/lang.php @@ -99,8 +99,6 @@ To může mít za následek, že index bude při některých nastaveních ACL nepoužitelný.'; $lang['auth_security_timeout'] = 'Časový limit pro autentikaci (v sekundách)'; $lang['securecookie'] = 'Má prohlížeč posílat cookies nastavené přes HTTPS opět jen přes HTTPS? Vypněte tuto volbu, pokud chcete, aby bylo pomocí SSL zabezpečeno pouze přihlašování do wiki, ale obsah budete prohlížet nezabezpečeně.'; -$lang['xmlrpc'] = 'Povolit/Zakázat rozhraní XML-RPC.'; -$lang['xmlrpcuser'] = 'Omezit přístup pomocí XML-RPC pouze na zde zadané skupiny či uživatele (oddělené čárkami). Necháte-li pole prázdné, dáte přístup komukoliv.'; $lang['updatecheck'] = 'Kontrolovat aktualizace a bezpečnostní varování? DokuWiki potřebuje pro tuto funkci přístup k update.dokuwiki.org'; $lang['userewrite'] = 'Používat "pěkná" URL'; $lang['useslash'] = 'Používat lomítko jako oddělovač jmenných prostorů v URL'; diff --git a/lib/plugins/config/lang/da/lang.php b/lib/plugins/config/lang/da/lang.php index a4c0bba75..7e8fe95af 100644 --- a/lib/plugins/config/lang/da/lang.php +++ b/lib/plugins/config/lang/da/lang.php @@ -92,8 +92,6 @@ $lang['disableactions_other'] = 'Andre muligheder (kommasepareret)'; $lang['sneaky_index'] = 'DokuWiki vil som standard vise alle navnerum i indholdsfortegnelsen. Ved at slå denne valgmulighed til vil skjule de navnerum, hvor brugeren ikke har læsetilladelse. Dette kan føre til, at tilgængelige undernavnerum bliver skjult. Ligeledes kan det også gøre indholdsfortegnelsen ubrugelig med visse ACL-opsætninger.'; $lang['auth_security_timeout'] = 'Tidsudløb for bekræftelse (sekunder)'; $lang['securecookie'] = 'Skal datafiler skabt af HTTPS kun sendes af HTTPS gennem browseren? Slå denne valgmulighed fra hvis kun brugen af din wiki er SSL-beskyttet, mens den almindelige tilgang udefra ikke er sikret.'; -$lang['xmlrpc'] = 'Slå XML-RPC-grænseflade til/fra.'; -$lang['xmlrpcuser'] = 'Begræns XML-RPC-adgang til de nævnte og med komma adskilte grupper eller brugere. Lad den stå tom for at give alle adgang.'; $lang['updatecheck'] = 'Kig efter opdateringer og sikkerhedsadvarsler? DokuWiki er nødt til at kontakte update.dokuwiki.org for at tilgå denne funktion.'; $lang['userewrite'] = 'Brug pæne netadresser'; $lang['useslash'] = 'Brug skråstreg som navnerumsdeler i netadresser'; diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index e63735edf..505d71a40 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -88,8 +88,6 @@ $lang['disableactions_other'] = 'Weitere Aktionen (durch Komma getrennt)'; $lang['sneaky_index'] = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Indexansicht an. Bei Aktivierung dieser Einstellung werden alle Namensräume versteckt, in welchen der Benutzer keine Leserechte hat. Dies könnte dazu führen, dass lesbare Unternamensräume versteckt werden. Dies kann die Indexansicht bei bestimmten Zugangskontrolleinstellungen unbenutzbar machen.'; $lang['auth_security_timeout'] = 'Zeitüberschreitung bei der Authentifizierung (Sekunden)'; $lang['securecookie'] = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktiviere diese Option, wenn nur der Login deines Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.'; -$lang['xmlrpc'] = 'Aktiviere/Deaktiviere die XML-RPC-Schnittstelle'; -$lang['xmlrpcuser'] = 'XML-RPC-Zugriff auf folgende Gruppen oder Benutzer (kommasepariert) beschränken. Wenn du dieses Feld leer lässt, wir der Zugriff jedem gewährt.'; $lang['updatecheck'] = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.'; $lang['userewrite'] = 'Benutze schöne URLs'; $lang['useslash'] = 'Benutze Schrägstrich als Namensraumtrenner in URLs'; diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index 1fb549597..79c6554e3 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -99,8 +99,6 @@ $lang['disableactions_other'] = 'Andere Aktionen (durch Komma getrennt)'; $lang['sneaky_index'] = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Übersicht. Wenn diese Option aktiviert wird, werden alle Namensräume, für die der Benutzer keine Lese-Rechte hat, nicht angezeigt. Dies kann unter Umständen dazu führen, das lesbare Unter-Namensräume nicht angezeigt werden und macht die Übersicht evtl. unbrauchbar in Kombination mit bestimmten ACL Einstellungen.'; $lang['auth_security_timeout'] = 'Authentifikations-Timeout (Sekunden)'; $lang['securecookie'] = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktivieren Sie diese Option, wenn nur der Login Ihres Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.'; -$lang['xmlrpc'] = 'XML-RPC-Zugriff erlauben.'; -$lang['xmlrpcuser'] = 'XML-RPC-Zugriff auf folgende Gruppen oder Benutzer (kommasepariert) beschränken. Wenn Sie dieses Feld leer lassen, wir der Zugriff jedem gewährt.'; $lang['updatecheck'] = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.'; $lang['userewrite'] = 'URL rewriting'; $lang['useslash'] = 'Schrägstrich (/) als Namensraumtrenner in URLs verwenden'; diff --git a/lib/plugins/config/lang/el/lang.php b/lib/plugins/config/lang/el/lang.php index 9f5d121de..093212664 100644 --- a/lib/plugins/config/lang/el/lang.php +++ b/lib/plugins/config/lang/el/lang.php @@ -93,8 +93,6 @@ $lang['disableactions_other'] = 'Άλλες λειτουργίες (διαχω $lang['sneaky_index'] = 'Εξ ορισμού, η εφαρμογή DokuWiki δείχνει όλους τους φακέλους στην προβολή Καταλόγου. Ενεργοποιώντας αυτή την επιλογή, δεν θα εμφανίζονται οι φάκελοι για τους οποίους ο χρήστης δεν έχει δικαιώματα ανάγνωσης αλλά και οι υπο-φάκελοί τους ανεξαρτήτως δικαιωμάτων πρόσβασης.'; $lang['auth_security_timeout'] = 'Διάρκεια χρόνου για ασφάλεια πιστοποίησης (δευτερόλεπτα)'; $lang['securecookie'] = 'Τα cookies που έχουν οριστεί μέσω HTTPS πρέπει επίσης να αποστέλλονται μόνο μέσω HTTPS από τον φυλλομετρητή? Απενεργοποιήστε αυτή την επιλογή όταν μόνο η είσοδος στο wiki σας διασφαλίζεται μέσω SSL αλλά η περιήγηση γίνεται και χωρίς αυτό.'; -$lang['xmlrpc'] = 'Ενεργοποίηση/Απενεργοποίηση της διασύνδεσης XML-RPC '; -$lang['xmlrpcuser'] = 'Περιορισμός XML-RPC πρόσβασης στις ομάδες η τους χρήστες (διαχωριζόμενοι με κόμμα). Αφήστε το κενό για πρόσβαση από όλους.'; $lang['updatecheck'] = 'Έλεγχος για ύπαρξη νέων εκδόσεων και ενημερώσεων ασφαλείας της εφαρμογής? Απαιτείται η σύνδεση με το update.dokuwiki.org για να λειτουργήσει σωστά αυτή η επιλογή.'; $lang['userewrite'] = 'Χρήση ωραίων URLs'; $lang['useslash'] = 'Χρήση slash σαν διαχωριστικό φακέλων στα URLs'; @@ -118,7 +116,7 @@ $lang['jpg_quality'] = 'Ποιότητα συμπίεσης JPG (0-100 $lang['subscribers'] = 'Να επιτρέπεται η εγγραφή στην ενημέρωση αλλαγών σελίδας'; $lang['subscribe_time'] = 'Χρόνος μετά τον οποίο οι λίστες ειδοποιήσεων και τα συνοπτικά θα αποστέλλονται (δευτερόλεπτα). Αυτό θα πρέπει να είναι μικρότερο από τον χρόνο που έχει η ρύθμιση recent_days.'; $lang['compress'] = 'Συμπίεση αρχείων CSS και javascript'; -$lang['cssdatauri'] = 'Το μέγεθος σε bytes στο οποίο οι εικόνες που αναφέρονται σε CSS αρχεία θα πρέπει να είναι ενσωματωμένες για τη μείωση των απαιτήσεων μιας κεφαλίδας αίτησης HTTP . Αυτή η τεχνική δεν θα λειτουργήσει σε IE <8! 400 με 600 bytes είναι μια καλή τιμή. Ορίστε την τιμή 0 για να το απενεργοποιήσετε.'; +$lang['cssdatauri'] = 'Το μέγεθος σε bytes στο οποίο οι εικόνες που αναφέρονται σε CSS αρχεία θα πρέπει να είναι ενσωματωμένες για τη μείωση των απαιτήσεων μιας κεφαλίδας αίτησης HTTP . Αυτή η τεχνική δεν θα λειτουργήσει σε IE <8! 400 με 600 bytes είναι μια καλή τιμή. Ορίστε την τιμή 0 για να το απενεργοποιήσετε.'; $lang['hidepages'] = 'Φίλτρο απόκρυψης σελίδων (regular expressions)'; $lang['send404'] = 'Αποστολή "HTTP 404/Page Not Found" για σελίδες που δεν υπάρχουν'; $lang['sitemap'] = 'Δημιουργία Google sitemap (ημέρες)'; diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 380f2fd1d..27f754c2c 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -107,8 +107,8 @@ $lang['disableactions_other'] = 'Other actions (comma separated)'; $lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; $lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)'; $lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.'; -$lang['xmlrpc'] = 'Enable/disable XML-RPC interface.'; -$lang['xmlrpcuser'] = 'Restrict XML-RPC access to the comma separated groups or users given here. Leave empty to give access to everyone.'; +$lang['remote'] = 'Enable/disable Remote interface.'; +$lang['remoteuser'] = 'Restrict Remote access to the comma separated groups or users given here. Leave empty to give access to everyone.'; /* Advanced Options */ $lang['updatecheck'] = 'Check for updates and security warnings? DokuWiki needs to contact update.dokuwiki.org for this feature.'; diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php index b0411ec14..3acb00545 100644 --- a/lib/plugins/config/lang/eo/lang.php +++ b/lib/plugins/config/lang/eo/lang.php @@ -93,8 +93,6 @@ $lang['disableactions_other'] = 'Aliaj agoj (apartite per komoj)'; $lang['sneaky_index'] = 'Apriore, DokuWiki montras ĉiujn nomspacojn en la indeksa modo. Ebligi tiun ĉi elekteblon kaŝus tion, kion la uzanto ne rajtas legi laŭ ACL. Tio povus rezulti ankaŭan kaŝon de alireblaj subnomspacoj. Kaj tiel la indekso estus neuzebla por kelkaj agordoj de ACL.'; $lang['auth_security_timeout'] = 'Sekureca Templimo por aŭtentigo (sekundoj)'; $lang['securecookie'] = 'Ĉu kuketoj difinitaj per HTTPS nur estu senditaj de la foliumilo per HTTPS? Malebligu tiun ĉi opcion kiam nur la ensaluto al via vikio estas sekurigita per SSL, sed foliumado de la vikio estas farita malsekure.'; -$lang['xmlrpc'] = 'Ebligi/malebligi la interfacon XML-RPC.'; -$lang['xmlrpcuser'] = 'Permesi XML-RPC-an aliron al certaj grupoj aŭ uzantoj, bonvolu meti iliajn komoseparitajn nomojn tie ĉi. Alirebli de ĉiu, ĝin lasu malplena.'; $lang['updatecheck'] = 'Ĉu kontroli aktualigojn kaj sekurecajn avizojn? DokuWiki bezonas kontakti update.dokuwiki.org por tiu ĉi trajto.'; $lang['userewrite'] = 'Uzi netajn URL-ojn'; $lang['useslash'] = 'Uzi frakcistrekon kiel apartigsignaĵo por nomspacoj en URL-oj'; diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php index 1189a6781..fd911433c 100644 --- a/lib/plugins/config/lang/es/lang.php +++ b/lib/plugins/config/lang/es/lang.php @@ -102,8 +102,6 @@ $lang['disableactions_other'] = 'Otras acciones (separadas por coma)'; $lang['sneaky_index'] = 'Por defecto, DokuWiki mostrará todos los namespaces en el index. Habilitando esta opción los ocultará si el usuario no tiene permisos de lectura. Los sub-namespaces pueden resultar inaccesibles. El index puede hacerse poco usable dependiendo de las configuraciones ACL.'; $lang['auth_security_timeout'] = 'Tiempo de Autenticación (en segundos), por motivos de seguridad'; $lang['securecookie'] = 'Las cookies establecidas por HTTPS, ¿el naveagdor solo puede enviarlas por HTTPS? Inhabilite esta opción cuando solo se asegure con SSL la entrada, pero no la navegación de su wiki.'; -$lang['xmlrpc'] = 'Habilitar/Deshabilitar interfaz XML-RPC'; -$lang['xmlrpcuser'] = 'Restringir el acceso XML-RPC a los grupos o usuarios separados por coma mencionados aquí. Dejar en blanco para dar acceso a todo el mundo. '; $lang['updatecheck'] = '¿Comprobar actualizaciones y advertencias de seguridad? Esta característica requiere que DokuWiki se conecte a update.dokuwiki.org.'; $lang['userewrite'] = 'Usar URLs bonitas'; $lang['useslash'] = 'Usar barra (/) como separador de espacios de nombres en las URLs'; diff --git a/lib/plugins/config/lang/eu/lang.php b/lib/plugins/config/lang/eu/lang.php index 9d001d494..97addbb50 100644 --- a/lib/plugins/config/lang/eu/lang.php +++ b/lib/plugins/config/lang/eu/lang.php @@ -83,8 +83,6 @@ $lang['disableactions_other'] = 'Beste ekintzak (komaz bereiztuak)'; $lang['sneaky_index'] = 'Lehenespenez, DokuWiki-k izen-espazio guztiak indize bistan erakutsiko ditu. Aukera hau gaituta, erabiltzaieak irakurtzeko baimenik ez dituen izen-espazioak ezkutatuko dira. Honek atzigarriak diren azpi izen-espazioak ezkutatzen ditu. Agian honek indizea erabili ezin ahal izatea eragingo du AKL ezarpen batzuetan.'; $lang['auth_security_timeout'] = 'Kautotze Segurtasun Denbora-Muga (segunduak)'; $lang['securecookie'] = 'HTTPS bidez ezarritako cookie-ak HTTPS bidez bakarrik bidali beharko lituzke nabigatzaileak? Ezgaitu aukera hau bakarrik saio hasierak SSL bidezko segurtasuna badu baina wiki-areb nabigazioa modu ez seguruan egiten bada. '; -$lang['xmlrpc'] = 'Gaitu/ezgaitu XML-RPC interfazea.'; -$lang['xmlrpcuser'] = 'XML-RPC atzipena mugatu hemen emandako komaz bereiztutako talde eta erabiltzaileei. Utzi hutsik atzipena guztiei emateko.'; $lang['updatecheck'] = 'Konprobatu eguneratze eta segurtasun oharrak? DokuWiki-k honetarako update.dokuwiki.org kontaktatu behar du.'; $lang['userewrite'] = 'Erabili URL politak'; $lang['useslash'] = 'Erabili barra (/) izen-espazio banatzaile moduan URLetan'; diff --git a/lib/plugins/config/lang/fa/lang.php b/lib/plugins/config/lang/fa/lang.php index 42cc3ed05..c1a112365 100644 --- a/lib/plugins/config/lang/fa/lang.php +++ b/lib/plugins/config/lang/fa/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'فعالیت‌های دیگر (با ویرگ $lang['sneaky_index'] = 'به طور پیش‌فرض، DokuWiki در فهرست تمامی فضای‌نام‌ها را نمایش می‌دهد. فعال کردن این گزینه، مواردی را که کاربر حق خواندنشان را ندارد مخفی می‌کند. این گزینه ممکن است باعث دیده نشدن زیرفضای‌نام‌هایی شود که دسترسی خواندن به آن‌ها وجود دارد. و ممکن است باعث شود که فهرست در حالاتی از دسترسی‌ها، غیرقابل استفاده شود.'; $lang['auth_security_timeout'] = 'زمان انقضای معتبرسازی به ثانیه'; $lang['securecookie'] = 'آیا کوکی‌ها باید با قرارداد HTTPS ارسال شوند؟ این گزینه را زمانی که فقط صفحه‌ی ورود ویکی‌تان با SSL امن شده است، اما ویکی را ناامن مرور می‌کنید، غیرفعال نمایید.'; -$lang['xmlrpc'] = 'فعال/غیرفعال کردن XML-RPC'; -$lang['xmlrpcuser'] = 'محمدود کردن دسترسی به XML-RPC توسط گروه های جدا شده توسط ویرگول ویا اعضای داده شده در اینجا. این مکان را خالی بگزارید تا به همه دسترسی داده شود.'; $lang['updatecheck'] = 'هشدارهای به روز رسانی و امنیتی بررسی شود؟ برای این‌کار DokuWiki با سرور update.dokuwiki.org تماس خواهد گرفت.'; $lang['userewrite'] = 'از زیباکننده‌ی آدرس‌ها استفاده شود'; $lang['useslash'] = 'از اسلش «/» برای جداکننده‌ی آدرس فضای‌نام‌ها استفاده شود'; diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php index 9598a0d93..f75a18ecd 100644 --- a/lib/plugins/config/lang/fi/lang.php +++ b/lib/plugins/config/lang/fi/lang.php @@ -88,8 +88,6 @@ $lang['disableactions_other'] = 'Muut toiminnot (pilkulla erotettuna)'; $lang['sneaky_index'] = 'Oletuksena DokuWiki näyttää kaikki nimiavaruudet index-näkymäsä. Tämä asetus piilottaa ne, joihin käyttäjällä ei ole lukuoikeuksia. Tämä voi piilottaa joitakin sallittuja alinimiavaruuksia. Tästä johtuen index-näkymä voi olla käyttökelvoton joillakin ACL-asetuksilla'; $lang['auth_security_timeout'] = 'Autentikoinnin aikakatkaisu (sekunteja)'; $lang['securecookie'] = 'Lähetetäänkö HTTPS:n kautta asetetut evästetiedot HTTPS-yhteydellä? Kytke pois, jos vain wikisi kirjautuminen on suojattu SSL:n avulla, mutta muuten wikiä käytetään ilman suojausta.'; -$lang['xmlrpc'] = 'Käytä/poista XML-RPC liityntää'; -$lang['xmlrpcuser'] = 'Estä XML-RPC:n käyttö pilkulla erotetun listan ryhmille tai käyttäjille. Jätä tyhjäksi salliaksesi käyttö kaikille.'; $lang['updatecheck'] = 'Tarkista päivityksiä ja turvavaroituksia? Tätä varten DokuWikin pitää ottaa yhteys update.dokuwiki.orgiin.'; $lang['userewrite'] = 'Käytä siivottuja URLeja'; $lang['useslash'] = 'Käytä kauttaviivaa nimiavaruuksien erottimena URL-osoitteissa'; diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 8f669a629..42a7f8d07 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -96,8 +96,6 @@ $lang['disableactions_other'] = 'Autres actions (séparées par des virgules)'; $lang['sneaky_index'] = 'Par défaut, DokuWiki affichera toutes les catégories dans la vue par index. Activer cette option permet de cacher celles pour lesquelles l\'utilisateur n\'a pas la permission de lecture. Il peut en résulter le masquage de sous-catégories accessibles. Ceci peut rendre l\'index inutilisable avec certaines ACL.'; $lang['auth_security_timeout'] = 'Délai d\'expiration de sécurité (secondes)'; $lang['securecookie'] = 'Les cookies mis via HTTPS doivent-ils n\'être envoyé par le navigateur que via HTTPS ? Ne désactivez cette option que si la connexion à votre wiki est sécurisée avec SSL mais que la navigation sur le wiki n\'est pas sécurisée.'; -$lang['xmlrpc'] = 'Activer l\'interface XML-RPC.'; -$lang['xmlrpcuser'] = 'Restreindre l\'accès à XML-RPC aux groupes et utilisateurs indiqués ici. Laisser vide afin que tout le monde y ait accès.'; $lang['updatecheck'] = 'Vérifier les mises à jour ? DokuWiki doit pouvoir contacter update.dokuwiki.org.'; $lang['userewrite'] = 'URL esthétiques'; $lang['useslash'] = 'Utiliser « / » comme séparateur de catégorie dans les URL'; diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php index 07d62b7af..861336371 100644 --- a/lib/plugins/config/lang/gl/lang.php +++ b/lib/plugins/config/lang/gl/lang.php @@ -84,8 +84,6 @@ $lang['disableactions_other'] = 'Outras accións (separadas por comas)'; $lang['sneaky_index'] = 'O DokuWiki amosará por defecto todos os nomes de espazo na vista de índice. Se activas isto agocharanse aqueles onde o usuario non teña permisos de lectura.'; $lang['auth_security_timeout'] = 'Tempo Límite de Seguridade de Autenticación (segundos)'; $lang['securecookie'] = 'Deben enviarse só vía HTTPS polo navegador as cookies configuradas vía HTTPS? Desactiva esta opción cando só o inicio de sesión do teu wiki estea asegurado con SSL pero a navegación do mesmo se faga de xeito inseguro.'; -$lang['xmlrpc'] = 'Activar/Desactivar interface XML-RPC'; -$lang['xmlrpcuser'] = 'Restrinxir o acceso mediante XML-RPC á lista separada por comas dos grupos e/ou usuarios proporcionados aquí. Déixao baleiro para darlle acceso a todas as persoas.'; $lang['updatecheck'] = 'Comprobar se hai actualizacións e avisos de seguridade? O DokuWiki precisa contactar con update.dokuwiki.org para executar esta característica.'; $lang['userewrite'] = 'Utilizar URLs amigábeis'; $lang['useslash'] = 'Utilizar a barra inclinada (/) como separador de nome de espazo nos URLs'; diff --git a/lib/plugins/config/lang/he/lang.php b/lib/plugins/config/lang/he/lang.php index e80a1bd7a..b200082c9 100644 --- a/lib/plugins/config/lang/he/lang.php +++ b/lib/plugins/config/lang/he/lang.php @@ -82,7 +82,6 @@ $lang['disableactions_wikicode'] = 'הצגת המקור/יצוא גולמי'; $lang['disableactions_other'] = 'פעולות אחרות (מופרדות בפסיק)'; $lang['sneaky_index'] = 'כברירת מחדל, דוקוויקי יציג את כל מרחבי השמות בתצוגת תוכן הענינים. בחירה באפשרות זאת תסתיר את אלו שבהם למשתמש אין הרשאות קריאה. התוצאה עלולה להיות הסתרת תת מרחבי שמות אליהם יש למשתמש גישה. באופן זה תוכן הענינים עלול להפוך לחסר תועלת עם הגדרות ACL מסוימות'; $lang['auth_security_timeout'] = 'מגבלת אבטח פסק הזמן להזדהות (שניות)'; -$lang['xmlrpc'] = 'לאפשר.לחסום את מנשק XML-RPC'; $lang['updatecheck'] = 'בדיקת עידכוני אבטחה והתראות? על DokuWiki להתקשר אל update.dokuwiki.org לצורך כך.'; $lang['userewrite'] = 'השתמש בכתובות URL יפות'; $lang['useslash'] = 'השתמש בלוכסן להגדרת מרחבי שמות בכתובות'; diff --git a/lib/plugins/config/lang/hu/lang.php b/lib/plugins/config/lang/hu/lang.php index f991b7c95..a1de94160 100644 --- a/lib/plugins/config/lang/hu/lang.php +++ b/lib/plugins/config/lang/hu/lang.php @@ -89,8 +89,6 @@ $lang['disableactions_other'] = 'Egyéb tevékenységek (vesszővel elválasztv $lang['sneaky_index'] = 'Alapértelmezetten minden névtér látszik a DokuWiki áttekintő (index) oldalán. Ezen opció bekapcsolása után azok nem jelennek meg, melyekhez a felhasználónak nincs olvasás joga. De ezzel eltakarhatunk egyébként elérhető al-névtereket is, így bizonyos ACL beállításoknál használhatatlan indexet eredményez ez a beállítás.'; $lang['auth_security_timeout'] = 'Authentikációs biztonsági időablak (másodperc)'; $lang['securecookie'] = 'A böngészők a HTTPS felett beállított sütijüket csak HTTPS felett küldhetik? Kapcsoljuk ki ezt az opciót, ha csak a bejelentkezést védjük SSL-lel, a wiki tartalmának böngészése nyílt forgalommal történik.'; -$lang['xmlrpc'] = 'XML-RPC interfész engedélyezése/tiltása'; -$lang['xmlrpcuser'] = 'Korlátozza XML-RPC hozzáférést az itt megadott vesszővel elválasztott csoportok vagy felhasználók számára. Hagyja üresen, ha mindenki számára biztosítja a hozzáférést.'; $lang['updatecheck'] = 'Frissítések és biztonsági figyelmeztetések figyelése. Ehhez a DokuWikinek kapcsolatba kell lépnie a update.dokuwiki.org-gal.'; $lang['userewrite'] = 'Szép URL-ek használata'; $lang['useslash'] = 'Per-jel használata névtér-elválasztóként az URL-ekben'; diff --git a/lib/plugins/config/lang/ia/lang.php b/lib/plugins/config/lang/ia/lang.php index 689869b89..fdb9d954e 100644 --- a/lib/plugins/config/lang/ia/lang.php +++ b/lib/plugins/config/lang/ia/lang.php @@ -83,8 +83,6 @@ $lang['disableactions_other'] = 'Altere actiones (separate per commas)'; $lang['sneaky_index'] = 'Normalmente, DokuWiki monstra tote le spatios de nomines in le vista del indice. Si iste option es active, illos ubi le usator non ha le permission de lectura essera celate. Isto pote resultar in le celamento de subspatios de nomines accessibile. Isto pote render le indice inusabile con certe configurationes de ACL.'; $lang['auth_security_timeout'] = 'Expiration pro securitate de authentication (secundas)'; $lang['securecookie'] = 'Debe le cookies definite via HTTPS solmente esser inviate via HTTPS per le navigator? Disactiva iste option si solmente le apertura de sessiones a tu wiki es protegite con SSL ma le navigation del wiki es facite sin securitate.'; -$lang['xmlrpc'] = 'Activar/disactivar interfacie XML-RPC.'; -$lang['xmlrpcuser'] = 'Limitar le accesso a XML-RPC al gruppos o usatores date hic, separate per commas. Lassa isto vacue pro dar accesso a omnes.'; $lang['updatecheck'] = 'Verificar si existe actualisationes e advertimentos de securitate? DokuWiki debe contactar update.dokuwiki.org pro exequer iste function.'; $lang['userewrite'] = 'Usar URLs nette'; $lang['useslash'] = 'Usar le barra oblique ("/") como separator de spatios de nomines in URLs'; diff --git a/lib/plugins/config/lang/id-ni/lang.php b/lib/plugins/config/lang/id-ni/lang.php index edde733fb..7b7e14ce5 100644 --- a/lib/plugins/config/lang/id-ni/lang.php +++ b/lib/plugins/config/lang/id-ni/lang.php @@ -5,7 +5,6 @@ * @author Harefa * @author Yustinus Waruwu */ -$lang['xmlrpc'] = 'Orifi/böi\'orifi XML-RPC interface.'; $lang['renderer_xhtml'] = 'Fake Renderer ba zito\'ölö (XHTML) Wiki-output.'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php index c4dd433ed..9c348dcee 100644 --- a/lib/plugins/config/lang/it/lang.php +++ b/lib/plugins/config/lang/it/lang.php @@ -94,8 +94,6 @@ $lang['disableactions_other'] = 'Altre azioni (separate da virgola)'; $lang['sneaky_index'] = 'Normalmente, DokuWiki mostra tutte le categorie nella vista indice. Abilitando questa opzione, saranno nascoste quelle per cui l\'utente non ha il permesso in lettura. Questo potrebbe far sì che alcune sottocategorie accessibili siano nascoste. La pagina indice potrebbe quindi diventare inutilizzabile con alcune configurazioni dell\'ACL.'; $lang['auth_security_timeout'] = 'Tempo di sicurezza per l\'autenticazione (secondi)'; $lang['securecookie'] = 'Devono i cookies impostati tramite HTTPS essere inviati al browser solo tramite HTTPS? Disattiva questa opzione solo quando l\'accesso al tuo wiki viene effettuato con il protocollo SSL ma la navigazione del wiki non risulta sicura.'; -$lang['xmlrpc'] = 'Abilita/disabilita interfaccia XML-RPC.'; -$lang['xmlrpcuser'] = 'Limita l\'accesso XML-RPC ai gruppi o utenti indicati qui (separati da virgola). Lascia il campo vuoto per dare accesso a tutti.'; $lang['updatecheck'] = 'Controllare aggiornamenti e avvisi di sicurezza? DokuWiki deve contattare update.dokuwiki.org per questa funzione.'; $lang['userewrite'] = 'Usa il rewrite delle URL'; $lang['useslash'] = 'Usa la barra rovescia (slash) come separatore nelle URL'; diff --git a/lib/plugins/config/lang/ja/lang.php b/lib/plugins/config/lang/ja/lang.php index 19f10af48..61161290d 100644 --- a/lib/plugins/config/lang/ja/lang.php +++ b/lib/plugins/config/lang/ja/lang.php @@ -89,8 +89,6 @@ $lang['disableactions_other'] = 'その他の動作（カンマ区切り）'; $lang['sneaky_index'] = 'デフォルトでは索引にすべての名前空間を表示しますが、この機能はユーザーに閲覧権限のない名前空間を非表示にします。ただし、閲覧が可能な副名前空間まで表示されなくなるため、ACLの設定が適正でない場合は索引機能が使えなくなる場合があります。'; $lang['auth_security_timeout'] = '認証タイムアウト設定（秒）'; $lang['securecookie'] = 'クッキーをHTTPSにてセットする場合は、ブラウザよりHTTPS経由で送信された場合にみに制限しますか？ログインのみをSSLで行う場合は、この機能を無効にしてください。'; -$lang['xmlrpc'] = 'XML-RPCインターフェースを有効/無効にする'; -$lang['xmlrpcuser'] = 'XML-RPCアクセスを指定グループとユーザーに制限します（半角コンマ区切り）。　すべての人にアクセスを許可する場合は空のままにしてください。'; $lang['updatecheck'] = 'DokuWikiの更新とセキュリティに関する情報をチェックしますか？ この機能は update.dokuwiki.org への接続が必要です。'; $lang['userewrite'] = 'URLの書き換え'; $lang['useslash'] = 'URL上の名前空間の区切りにスラッシュを使用'; diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 20cfcdcfe..1c929c25c 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -90,8 +90,6 @@ $lang['sneaky_index'] = '기본적으로, DokuWiki는 색인 목록에 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.'; $lang['auth_security_timeout'] = '인증 보안 초과 시간(초)'; $lang['securecookie'] = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화 하고 위키 페이지는 그렇지 않은경우 꺼야 합니다.'; -$lang['xmlrpc'] = 'XML-RPC 인터페이스 지원/무시'; -$lang['xmlrpcuser'] = '주어진 그룹이나 유저들에게만 XML-RPC접근을 허락하려면 컴마로 구분하여 적으세요. 비어두면 모두에게 허용됩니다.'; $lang['updatecheck'] = '업데이트와 보안 문제를 검사(DokuWiki를 update.dokuwiki.org에 연결해야 합니다.)'; $lang['userewrite'] = 'URL rewriting기능 사용'; $lang['useslash'] = 'URL에서 네임스페이스 구분자로 슬래쉬 문자 사용'; diff --git a/lib/plugins/config/lang/la/lang.php b/lib/plugins/config/lang/la/lang.php index 07d92ae36..057e69974 100644 --- a/lib/plugins/config/lang/la/lang.php +++ b/lib/plugins/config/lang/la/lang.php @@ -82,8 +82,6 @@ $lang['disableactions_other'] = 'Aliae actiones (uirgulis diuisae)'; $lang['sneaky_index'] = 'Hic uicis omnia genera in indice inserit. Si ineptam hanc optionem facias, solum ea, quae Sodales uidere possunt, in indice erunt. Hoc suggreges et suggenera abscondere potest.'; $lang['auth_security_timeout'] = 'Confirmationis Tempus (secundis)'; $lang['securecookie'] = 'Formulae HTTPS mittine solum per HTTPS possunt? Ineptam hanc optio facias, si accessus uicis tutus est, sed interretis non.'; -$lang['xmlrpc'] = 'Aptam\Ineptam XML-RPC administrationem facere'; -$lang['xmlrpcuser'] = 'Accessus XML-RPC gregibus uel Sodalibus in hoc indice astringere. Nihil scribere ut omnes accessum habeant'; $lang['updatecheck'] = 'Nouationes et fiducias inspicerene? Hic uicis connectere update.dokuwiki.org debes.'; $lang['userewrite'] = 'VRL formosis uti'; $lang['useslash'] = 'Repagula in URL, ut genera diuidas, uti'; diff --git a/lib/plugins/config/lang/lv/lang.php b/lib/plugins/config/lang/lv/lang.php index 2f5883269..f95697c46 100644 --- a/lib/plugins/config/lang/lv/lang.php +++ b/lib/plugins/config/lang/lv/lang.php @@ -84,8 +84,6 @@ $lang['disableactions_other'] = 'citas darbības (atdalīt ar komatiem)'; $lang['sneaky_index'] = 'Pēc noklusētā DokuWiki lapu sarakstā parāda visu nodaļu lapas. Ieslēdzot šo parametru, noslēps tās nodaļas, kuras apmeklētājam nav tiesības lasīt. Bet tad tiks arī paslēptas dziļākas, bet atļautas nodaļas. Atsevišķos pieejas tiesību konfigurācijas gadījumos lapu saraksts var nedarboties.'; $lang['auth_security_timeout'] = 'Autorizācijas drošības intervāls (sekundēs)'; $lang['securecookie'] = 'Vai pa HTTPS sūtāmās sīkdatnes sūtīt tikai pa HTTPS? Atslēdz šo iespēju, kad tikai pieteikšanās wiki sistēmā notiek pa SSL šifrētu savienojumu, bet skatīšana - pa nešifrētu.'; -$lang['xmlrpc'] = 'Ieslēgt/izslēgt XML-RPC interfeisu.'; -$lang['xmlrpcuser'] = 'Ierobežot XML-RPC piekļuvi norādītām lietotāju grupām vai lietotājiem (atdalīt ar komatiem!). Atstāt tukšu, lai piekļuve būtu visiem.'; $lang['updatecheck'] = 'Pārbaudīt, vai pieejami atjauninājumi un drošības brīdinājumi? Dokuwiki sazināsies ar update.dokuwiki.org'; $lang['userewrite'] = 'Ērti lasāmas adreses (URL)'; $lang['useslash'] = 'Lietot slīpiņu par URL atdalītāju'; diff --git a/lib/plugins/config/lang/mr/lang.php b/lib/plugins/config/lang/mr/lang.php index 321e05546..4f33bfa7c 100644 --- a/lib/plugins/config/lang/mr/lang.php +++ b/lib/plugins/config/lang/mr/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'इतर क्रिया ( स्वल् $lang['sneaky_index'] = 'सूची दृश्यामधे डिफॉल्ट स्वरूपात डॉक्युविकी सगळे नेमस्पेस दाखवते. हा पर्याय चालू केल्यास सदस्याला वाचण्याची परवानगी नसलेले नेमस्पेस दिसणार नाहीत. यामुळे परवानगी असलेले उप - नेमस्पेस न दिसण्याची शक्यता आहे. यामुळे काही विशिष्ठ ACL सेटिंगसाठी सूची वापरता येण्यासारखी राहणार नाही.'; $lang['auth_security_timeout'] = 'अधिकृत करण्याच्या प्रक्रियेची कालमर्यादा'; $lang['securecookie'] = 'HTTPS वापरून सेट केलेले कूकीज ब्राउजरने HTTPS द्वाराच पाठवले पाहिजेत का? जर तुमच्या विकीचं फ़क्त लॉगिन पानच SSL वापरून सुरक्षित केलं असेल व पानांचं ब्राउजिंग असुरक्षित असेल तर हा पर्याय चालू करू नका.'; -$lang['xmlrpc'] = 'XML-RPC इंटरफेस चालू/बंद करा'; -$lang['xmlrpcuser'] = 'XML-RPC सुविधा फ़क्त इथे स्वल्पविरामाने अलग करून दिलेल्या गट किंवा वापरकर्त्याला उपलब्ध आहेत. सर्वाना ही सुविधा देण्यासाठी ही जागा रिकामी सोडा.'; $lang['updatecheck'] = 'अपडेट आणि सुरक्षिततेविशयी सूचनान्वर पाळत ठेऊ का? या सुविधेसाठी डॉक्युविकीला update.dokuwiki.org शी संपर्क साधावा लागेल.'; $lang['userewrite'] = 'छान छान URL वापर'; $lang['useslash'] = 'URL मधे नेमस्पेस अलग करण्यासाठी \'/\' चिह्न वापरा'; diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index f6574ee2c..6bde9eb4e 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -94,8 +94,6 @@ $lang['disableactions_other'] = 'Andere akties (gescheiden door komma\'s)'; $lang['sneaky_index'] = 'Met de standaardinstellingen zal DokuWiki alle namespaces laten zien in de index. Het inschakelen van deze optie zorgt ervoor dat de namespaces waar de gebruiker geen leestoegang tot heeft, verborgen worden. Dit kan resulteren in het verbergen van subnamespaces waar de gebruiker wel toegang to heeft. Dit kan de index onbruikbaar maken met bepaalde ACL-instellingen.'; $lang['auth_security_timeout'] = 'Authenticatiebeveiligings-timeout (seconden)'; $lang['securecookie'] = 'Moeten cookies die via HTTPS gezet zijn alleen via HTTPS verzonden worden door de browser? Zet deze optie uit als alleen het inloggen op de wiki beveiligd is, maar het gebruik verder niet.'; -$lang['xmlrpc'] = 'Inschakelen/uitschakelen XML-RPC interface.'; -$lang['xmlrpcuser'] = 'Beperk XML-RPC toegang tot de lijst met kommagescheiden groepen of gebruikers die hier zijn opgegeven. Laat leeg om iedereen toegang te geven.'; $lang['updatecheck'] = 'Controleer op nieuwe versies en beveiligingswaarschuwingen? DokuWiki moet hiervoor contact opnemen met update.dokuwiki.org.'; $lang['userewrite'] = 'Gebruik nette URL\'s'; $lang['useslash'] = 'Gebruik slash (/) als scheiding tussen namepaces in URL\'s'; diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php index 3c4890149..2245a8813 100644 --- a/lib/plugins/config/lang/no/lang.php +++ b/lib/plugins/config/lang/no/lang.php @@ -99,9 +99,6 @@ $lang['disableactions_other'] = 'Andre kommandoer (kommaseparert)'; $lang['sneaky_index'] = 'DokuWiki vil som standard vise alle navnerom i innholdsfortegnelsen. Hvis du skrur på dette alternativet vil brukere bare se de navnerommene der de har lesetilgang. Dette kan føre til at tilgjengelige undernavnerom skjules. Det kan gjøre innholdsfortegnelsen ubrukelig med enkelte ACL-oppsett.'; $lang['auth_security_timeout'] = 'Autentisering utløper etter (sekunder)'; $lang['securecookie'] = 'Skal informasjonskapsler satt via HTTPS kun sendes via HTTPS av nettleseren? Skal ikke velges dersom bare innloggingen til din wiki er sikret med SSL, og annen navigering på wikien er usikret.'; -$lang['xmlrpc'] = 'Slå på/slå av XML-RPC-grensesnitt'; -$lang['xmlrpcuser'] = 'Å tillate XML-RPC-adgang til bestemte grupper eller brukere, sette deres navne (kommaseparert) her. Slik får du tilgang til alle, la feltet tomt. -'; $lang['updatecheck'] = 'Se etter oppdateringer og sikkerhetsadvarsler? Denne funksjonen er avhengig av å kontakte update.dokuwiki.org.'; $lang['userewrite'] = 'Bruk pene URLer'; $lang['useslash'] = 'Bruk / som skilletegn mellom navnerom i URLer'; diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 6e94a2e3d..0e69cc8f1 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -92,8 +92,6 @@ $lang['disableactions_other'] = 'Inne akcje (oddzielone przecinkiem)'; $lang['sneaky_index'] = 'Domyślnie, Dokuwiki pokazuje wszystkie katalogi w indeksie. Włączenie tej opcji ukryje katalogi, do których użytkownik nie ma praw. Może to spowodować ukrycie podkatalogów, do których użytkownik ma prawa. Ta opcja może spowodować błędne działanie indeksu w połączeniu z pewnymi konfiguracjami praw dostępu.'; $lang['auth_security_timeout'] = 'Czas wygaśnięcia uwierzytelnienia (w sekundach)'; $lang['securecookie'] = 'Czy ciasteczka wysłane do przeglądarki przez HTTPS powinny być przez nią odsyłane też tylko przez HTTPS? Odznacz tę opcję tylko wtedy, gdy logowanie użytkowników jest zabezpieczone SSL, ale przeglądanie stron odbywa się bez zabezpieczenia.'; -$lang['xmlrpc'] = 'Włącz/wyłącz interfejs XML-RPC'; -$lang['xmlrpcuser'] = 'Lista użytkowników i grup, którzy mogą korzystać z protokołu XML-RPC. Nazwy grup i użytkowników rozdziel przecinkami, puste pole oznacza dostęp dla wszystkich.'; $lang['updatecheck'] = 'Sprawdzanie aktualizacji i bezpieczeństwa. DokuWiki będzie kontaktować się z serwerem update.dokuwiki.org.'; $lang['userewrite'] = 'Proste adresy URL'; $lang['useslash'] = 'Używanie ukośnika jako separatora w adresie URL'; diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php index 093e60ff8..8c0ef713a 100644 --- a/lib/plugins/config/lang/pt-br/lang.php +++ b/lib/plugins/config/lang/pt-br/lang.php @@ -98,8 +98,6 @@ $lang['disableactions_other'] = 'Outras ações (separadas por vírgula)'; $lang['sneaky_index'] = 'Por padrão, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles que o usuário não tiver permissão de leitura. Isso pode resultar na omissão de subespaços de nomes, tornando o índice inútil para certas configurações de ACL.'; $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)'; $lang['securecookie'] = 'Os cookies definidos via HTTPS devem ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação, de maneira insegura.'; -$lang['xmlrpc'] = 'Habilitar/desabilitar interface XML-RPC.'; -$lang['xmlrpcuser'] = 'Acesso Restrito ao XML-RPC para grupos separados por virgula ou usuários aqui. Deixe em branco para conveder acesso a todos.'; $lang['updatecheck'] = 'Verificar atualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efetuar esse recurso.'; $lang['userewrite'] = 'Usar URLs "limpas"'; $lang['useslash'] = 'Usar a barra como separador de espaços de nomes nas URLs'; diff --git a/lib/plugins/config/lang/pt/lang.php b/lib/plugins/config/lang/pt/lang.php index fe05bd281..d0fe0ac0d 100644 --- a/lib/plugins/config/lang/pt/lang.php +++ b/lib/plugins/config/lang/pt/lang.php @@ -87,8 +87,6 @@ $lang['disableactions_other'] = 'Outras acções (separadas por vírgula)'; $lang['sneaky_index'] = 'Por norma, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles em que o utilizador não tenha permissão de leitura. Isto pode resultar na omissão de sub-ramos acessíveis, que poderá tornar o índice inútil para certas configurações de ACL.'; $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)'; $lang['securecookie'] = 'Os cookies definidos via HTTPS deverão ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação de maneira insegura.'; -$lang['xmlrpc'] = 'Habilitar/desabilitar interface XML-RPC.'; -$lang['xmlrpcuser'] = 'Restringir acesso XML-RPC para os grupos separados por vírgula ou utilizadores inseridos aqui. Deixar vazio para dar acesso a todos.'; $lang['updatecheck'] = 'Verificar por actualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efectuar esta verificação.'; $lang['userewrite'] = 'Usar URLs SEO'; $lang['useslash'] = 'Usar a barra como separador de espaços de nomes nas URLs'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index 6b0a0e91a..5b15ec3dc 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -89,8 +89,6 @@ $lang['disableactions_other'] = 'Alte acţiuni (separate prin virgulă)'; $lang['sneaky_index'] = 'Implicit, DokuWiki va arăta toate numele de spaţii la vizualizarea indexului. Activând această opţiune vor fi ascunse acelea la care utilizatorul nu are drepturi de citire. Aceasta poate determina ascunderea sub-numelor de spaţii accesibile. Aceasta poate face index-ul inutilizabil cu anumite setări ale ACL'; $lang['auth_security_timeout'] = 'Timpul de expirare al Autentificării Securizate (secunde)'; $lang['securecookie'] = 'Cookies-urile setate via HTTPS să fie trimise doar via HTTPS de către browser? Dezactivaţi această opţiune numai când login-ul wiki-ului este securizat cu SSL dar navigarea wiki-ului se realizează nesecurizat.'; -$lang['xmlrpc'] = 'Activează/dezactivează interfaţa XML-RPC'; -$lang['xmlrpcuser'] = 'Restricţionaţi accesul XML-RPC la grupurile sau utilizatorii separaţi prin virgulă daţi aici. Lasaţi gol pentru a da acces tuturor.'; $lang['updatecheck'] = 'Verificare actualizări şi avertismente privind securitatea? DokuWiki trebuie să contacteze update.dokuwiki.org pentru această facilitate.'; $lang['userewrite'] = 'Folosire URL-uri "nice"'; $lang['useslash'] = 'Foloseşte slash-ul ca separator de spaţii de nume în URL-uri'; diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php index f29257a28..cd93526e0 100644 --- a/lib/plugins/config/lang/ru/lang.php +++ b/lib/plugins/config/lang/ru/lang.php @@ -95,8 +95,6 @@ $lang['disableactions_other'] = 'Другие операции (через за $lang['sneaky_index'] = 'По умолчанию, «ДокуВики» показывает в индексе страниц все пространства имён. Включение этой опции скроет пространства имён, для которых пользователь не имеет прав чтения. Это может привести к скрытию доступных вложенных пространств имён и потере функциональности индекса страниц при некоторых конфигурациях прав доступа.'; $lang['auth_security_timeout'] = 'Интервал для безопасности авторизации (сек.)'; $lang['securecookie'] = 'Должны ли куки (cookies), выставленные через HTTPS, отправляться браузером только через HTTPS. Отключите эту опцию в случае, когда только логин вашей вики передаётся через SSL, а обычный просмотр осуществляется в небезопасном режиме.'; -$lang['xmlrpc'] = 'Включить/выключить XML-RPC интерфейс.'; -$lang['xmlrpcuser'] = 'Запретить XML-RPC-доступ для списка групп и пользователей, перечисленных через запятую. Оставьте пустым, если хотите оставить доступ всем.'; $lang['updatecheck'] = 'Проверять наличие обновлений и предупреждений о безопасности? Для этого «ДокуВики» потребуется связываться с сайтом splitbrain.org.'; $lang['userewrite'] = 'Удобочитаемые адреса (URL)'; $lang['useslash'] = 'Использовать слэш'; diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index 72ce10775..d583c5d15 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'Iné akcie (oddelené čiarkou)'; $lang['sneaky_index'] = 'DokuWiki implicitne ukazuje v indexe všetky menné priestory. Povolením tejto voľby sa nezobrazia menné priestory, ku ktorým nemá používateľ právo na čítanie. Dôsledkom môže byť nezobrazenie vnorených prístupných menných priestorov. Táto voľba môže mať za následok nepoužiteľnosť indexu s určitými ACL nastaveniami.'; $lang['auth_security_timeout'] = 'Časový limit pri prihlasovaní (v sekundách)'; $lang['securecookie'] = 'Mal by prehliadač posielať cookies nastavené cez HTTPS posielať iba cez HTTPS (bezpečné) pripojenie? Vypnite túto voľbu iba v prípade, ak je prihlasovanie do Vašej wiki zabezpečené SSL, ale prezeranie wiki je nezabezpečené.'; -$lang['xmlrpc'] = 'Povoliť/zakázať XML-RPC rozhranie.'; -$lang['xmlrpcuser'] = 'Obmedziť XML-RPC prístup iba pre uvedené skupiny alebo používateľov (oddelených čiarkami).'; $lang['updatecheck'] = 'Kontrolovať aktualizácie a bezpečnostné upozornenia? DokuWiki potrebuje pre túto funkciu prístup k update.dokuwiki.org.'; $lang['userewrite'] = 'Používať nice URLs'; $lang['useslash'] = 'Používať lomku (/) ako oddeľovač v URL'; diff --git a/lib/plugins/config/lang/sl/lang.php b/lib/plugins/config/lang/sl/lang.php index dadd01595..03bae8e37 100644 --- a/lib/plugins/config/lang/sl/lang.php +++ b/lib/plugins/config/lang/sl/lang.php @@ -86,8 +86,6 @@ $lang['disableactions_other'] = 'Druga dejanja (z vejico ločen seznam)'; $lang['sneaky_index'] = 'Privzeto pokaže sistem DokuWiki vse imenske prostore v pogledu kazala. Z omogočanjem te možnosti bodo skriti vsi imenski prostori, v katere prijavljen uporabnik nima dovoljenj dostopa. S tem je mogoče preprečiti dostop do podrejenih strani. Možnost lahko vpliva na uporabnost nastavitev nadzora dostopa ACL.'; $lang['auth_security_timeout'] = 'Varnostna časovna omejitev overitve (v sekundah)'; $lang['securecookie'] = 'Ali naj se piškotki poslani preko varne povezave HTTPS v brskalniku pošiljajo le preko HTTPS? Onemogočanje možnosti je priporočljivo le takrat, ko je prijava varovana s protokolom SSL, brskanje po strani pa ni posebej zavarovano.'; -$lang['xmlrpc'] = 'Omogoči/Onemogoči vmesnik XML-RPC.'; -$lang['xmlrpcuser'] = 'Omejitev dostopa do vmesnika XML-RPC z vejico ločenim seznamom skupin in uporabnikov. Prazno polje pomeni, prost dostop za vse uporabnike.'; $lang['updatecheck'] = 'Ali naj sistem preveri za posodobitve in varnostna opozorila.'; $lang['userewrite'] = 'Uporabi olepšan zapis naslovov URL'; $lang['useslash'] = 'Uporabi poševnico kot ločilnik imenskih prostorov v naslovih URL'; diff --git a/lib/plugins/config/lang/sq/lang.php b/lib/plugins/config/lang/sq/lang.php index adeb2a47d..69e283b11 100644 --- a/lib/plugins/config/lang/sq/lang.php +++ b/lib/plugins/config/lang/sq/lang.php @@ -83,8 +83,6 @@ $lang['disableactions_other'] = 'Veprime të tjera (të ndarë me presje)'; $lang['sneaky_index'] = 'Vetiu DokuWiki tregon të gjithë hapësirat e emrit në shikimin e index-it. Aktivizimi i kësaj alternative do të fshehë ato ku përdoruesi nuk ka të drejta leximi. Kjo mund të përfundojë në fshehje të nënhapësirave të emrit të aksesueshme. Kjo mund ta bëjë index-in të papërdorshëm me disa konfigurime të caktuara të ACL-së.'; $lang['auth_security_timeout'] = 'Koha e Përfundimit për Autentikim (sekonda)'; $lang['securecookie'] = 'A duhet që cookies të vendosura nëpërmjet HTTPS të dërgohen vetëm nëpërmjet HTTPS nga shfletuesit? Caktivizojeni këtë alternativë kur vetëm hyrja në wiki-n tuaj sigurohet me SSL por shfletimi i wiki-t bëhet në mënyrë të pasigurtë.'; -$lang['xmlrpc'] = 'Aktivizo/Caktivizo ndërfaqen XML-RPC'; -$lang['xmlrpcuser'] = 'Kufizo aksesin XML-RPC vetëm tek grupet ose përdoruesit e ndarë me presje të dhënë këtu. Lëre bosh për t\'i dhënë akses të gjithëve.'; $lang['updatecheck'] = 'Kontrollo për përditësime dhe paralajmërime sigurie? DokuWiki duhet të kontaktojë me update.dokuwiki.org për këtë veti.'; $lang['userewrite'] = 'Përdor URL të këndshme.'; $lang['useslash'] = 'Përdor / si ndarës të hapësirave të emrit në URL'; diff --git a/lib/plugins/config/lang/sr/lang.php b/lib/plugins/config/lang/sr/lang.php index 5906dcd7e..c675b84e6 100644 --- a/lib/plugins/config/lang/sr/lang.php +++ b/lib/plugins/config/lang/sr/lang.php @@ -84,8 +84,6 @@ $lang['disableactions_other'] = 'Остале наредбе (раздвоје $lang['sneaky_index'] = 'По инсталацији DokuWiki ће у индексу приказати све именске просторе. Укључивањем ове опције именски простори у којима корисник нема право читања ће бити сакривени. Консеквенца је да ће и доступни подпростори бити сакривени. Ово доводи до неупотребљивости Права приступа у неким поставкама.'; $lang['auth_security_timeout'] = 'Временска пауза у аутентификацији (секунде)'; $lang['securecookie'] = 'Да ли колачићи који су постављени преко ХТТПС треба слати веб читачу само преко ХТТПС? Искључите ову опцију само ако је пријављивање на вики заштићено ССЛом а остали део викија незаштићен.'; -$lang['xmlrpc'] = 'Укључи/искључи ИксМЛ-РПЦ интерфејс'; -$lang['xmlrpcuser'] = 'Ограничи ИксМЛ-РПЦ приступ на наведене групе корисника раздвојене зарезом. Остави празно да би свима дао приступ.'; $lang['updatecheck'] = 'Провера надоградњи и сигурносних упозорења? Dokuwiki мора да контактира update.dokuwiki.org ради добијања информација.'; $lang['userewrite'] = 'Направи леп УРЛ'; $lang['useslash'] = 'Користи косу црту у УРЛу за раздвајање именских простора '; diff --git a/lib/plugins/config/lang/sv/lang.php b/lib/plugins/config/lang/sv/lang.php index dfd93d37d..3d8392840 100644 --- a/lib/plugins/config/lang/sv/lang.php +++ b/lib/plugins/config/lang/sv/lang.php @@ -97,8 +97,6 @@ $lang['disableactions_other'] = 'Andra funktioner (kommaseparerade)'; $lang['sneaky_index'] = 'Som standard visar DokuWiki alla namnrymder på indexsidan. Genom att aktivera det här valet döljer man namnrymder som användaren inte har behörighet att läsa. Det kan leda till att man döljer åtkomliga undernamnrymder, och gör indexet oanvändbart med vissa ACL-inställningar.'; $lang['auth_security_timeout'] = 'Autentisieringssäkerhets timeout (sekunder)'; $lang['securecookie'] = 'Skall cookies som sätts via HTTPS endast skickas via HTTPS från webbläsaren? Avaktivera detta alternativ endast om inloggningen till din wiki är säkrad med SSL men läsning av wikin är osäkrad.'; -$lang['xmlrpc'] = 'Aktivera/avaktivera XML-RPC-gränssnitt'; -$lang['xmlrpcuser'] = 'Begränsa XML-RPC tillträde till komma separerade grupper eller användare som ges här. Lämna tomt för att ge tillgång till alla.'; $lang['updatecheck'] = 'Kontrollera uppdateringar och säkerhetsvarningar? DokuWiki behöver kontakta update.dokuwiki.org för den här funktionen.'; $lang['userewrite'] = 'Använd rena webbadresser'; $lang['useslash'] = 'Använd snedstreck för att separera namnrymder i webbadresser'; diff --git a/lib/plugins/config/lang/th/lang.php b/lib/plugins/config/lang/th/lang.php index ce7c55e91..140a287df 100644 --- a/lib/plugins/config/lang/th/lang.php +++ b/lib/plugins/config/lang/th/lang.php @@ -41,7 +41,6 @@ $lang['defaultgroup'] = 'กลุ่มมาตรฐาน'; $lang['profileconfirm'] = 'ใส่รหัสผ่านเพื่อยืนยันการเปลี่ยนแปลงข้อมูล'; $lang['disableactions_check'] = 'ตรวจสอบ'; $lang['auth_security_timeout'] = 'ระยะเวลาที่จะตัดการเชื่อมต่อแบบการใช้งานด้วยสิทธิ์ผู้ใช้ (วินาที)'; -$lang['xmlrpc'] = 'ใช้งาน/ยกเลิก การเชื่อมต่อแบบ XML-RPC'; $lang['userewrite'] = 'แสดงที่อยู่เว็บ (URL) แบบอ่านเข้าใจง่าย'; $lang['cachetime'] = 'ระยะเวลาสำหรับการเก็บแคช (วินาที)'; $lang['locktime'] = 'ระยะเวลานานสุด ที่จะล็อคไม่ให้แก้ไขไฟล์ (วินาที)'; diff --git a/lib/plugins/config/lang/uk/lang.php b/lib/plugins/config/lang/uk/lang.php index 72d7e12f5..375c5d3bf 100644 --- a/lib/plugins/config/lang/uk/lang.php +++ b/lib/plugins/config/lang/uk/lang.php @@ -91,8 +91,6 @@ $lang['disableactions_other'] = 'Інші дії (розділені комам $lang['sneaky_index'] = 'За замовчуванням, ДокуВікі показує всі простори імен в змісті. Активація цієї опції сховає ті простори, де користувач не має прав на читання. Результатом може бути неможливість доступу до певних відкритих просторів імен. Це зробить неможливим використання змісту при певних конфігураціях.'; $lang['auth_security_timeout'] = 'Таймаут аутентифікації (в секундах)'; $lang['securecookie'] = 'Чи повинен браузер надсилати файли cookies тільки через HTTPS? Вимкніть цей параметр, лише тоді, якщо вхід до Вікі захищено SSL, але перегляд сторінок відбувається у незахищеному режимі.'; -$lang['xmlrpc'] = 'Дозволити/заборонити XML-RPC інтерфейс'; -$lang['xmlrpcuser'] = 'Заборонити XML-RPC доступ до користувачів або груп поданих тут та розділених комою. Залишіть поле незаповненим, щоб дозволити доступ усім.'; $lang['updatecheck'] = 'Перевірити наявність оновлень чи попереджень безпеки? Для цього ДокуВікі необхідно зв\'язатися зі update.dokuwiki.org.'; $lang['userewrite'] = 'Красиві URL'; $lang['useslash'] = 'Слеш, як розділювач просторів імен в URL'; diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php index 29aeaec3b..2919ec113 100644 --- a/lib/plugins/config/lang/zh-tw/lang.php +++ b/lib/plugins/config/lang/zh-tw/lang.php @@ -89,8 +89,6 @@ $lang['disableactions_other'] = '其他功能 (逗號分隔)'; $lang['sneaky_index'] = '預設情況下，DokuWiki 會在索引頁會顯示所有命名空間。啟用此選項會隱藏用戶沒有閱讀權限的頁面，但也可能將能閱讀的子頁面一併隱藏。在特定 ACL 設定下，這可能導致索引無法使用。'; $lang['auth_security_timeout'] = '安全認證的計時 (秒)'; $lang['securecookie'] = 'HTTPS 頁面設定的 cookie 是否只能由瀏覽器經 HTTPS 傳送？取消此選項後，只有登入維基會被 SSL 保護而瀏覽時不會。'; -$lang['xmlrpc'] = '啟用/停用 XML-RPC 介面'; -$lang['xmlrpcuser'] = 'XML-RPC 存取權限將局限於在此提供的群組或使用者 (逗號分隔)。若要開放權限給所有人請留白。'; $lang['updatecheck'] = '檢查更新與安全性警告？DokuWiki 需要聯繫 update.dokuwiki.org 才能使用此功能。'; $lang['userewrite'] = '使用好看的 URL'; $lang['useslash'] = '在 URL 中使用斜線作為命名空間的分隔字元'; diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index 7a7f0f504..fa51cb1ef 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -96,8 +96,6 @@ $lang['disableactions_other'] = '其他功能（用英文逗号分隔）'; $lang['sneaky_index'] = '默认情况下，DokuWiki 在索引页会显示所有 namespace。启用该选项能隐藏那些用户没有权限阅读的页面。但也可能将用户能够阅读的子页面一并隐藏。这有可能导致在特定 ACL 设置下，索引功能不可用。'; $lang['auth_security_timeout'] = '认证安全超时（秒）'; $lang['securecookie'] = '要让浏览器须以HTTPS方式传送在HTTPS会话中设置的cookies吗？请只在登录过程为SSL加密而浏览维基为明文的情况下打开此选项。'; -$lang['xmlrpc'] = '启用/禁用 XML-RPC 交互界面。'; -$lang['xmlrpcuser'] = '将 XML-RPC 连接限制在用逗号分隔的组或用户中。留空对所有人开启连接权限。'; $lang['updatecheck'] = '自动检查更新并接收安全警告吗？开启该功能后 DokuWiki 将自动访问 splitbrain.org。'; $lang['userewrite'] = '使用更整洁的 URL'; $lang['useslash'] = '在 URL 中使用斜杠作为命名空间的分隔符'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 5f2c32ea7..b95c8d75c 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -136,8 +136,8 @@ $meta['disableactions'] = array('disableactions', $meta['sneaky_index'] = array('onoff'); $meta['auth_security_timeout'] = array('numeric'); $meta['securecookie'] = array('onoff'); -$meta['xmlrpc'] = array('onoff'); -$meta['xmlrpcuser'] = array('string'); +$meta['remote'] = array('onoff'); +$meta['remoteuser'] = array('string'); $meta['_anti_spam'] = array('fieldset'); $meta['usewordblock']= array('onoff'); -- cgit v1.2.3 From 3a13cfe7e12afabb47139702b7f118d63ccf42c2 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 18:10:38 +0100 Subject: set login as public method --- lib/exe/xmlrpc.php | 848 +---------------------------------------------------- 1 file changed, 14 insertions(+), 834 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index bcbae0a43..9888c9a61 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -10,6 +10,7 @@ if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA); define('DOKU_XMLRPC_API_VERSION', 6); require_once(DOKU_INC.'inc/init.php'); +require_once(DOKU_INC.'inc/remote.php'); session_write_close(); //close session if(!$conf['xmlrpc']) die('XML-RPC server not enabled.'); @@ -18,855 +19,34 @@ if(!$conf['xmlrpc']) die('XML-RPC server not enabled.'); * Contains needed wrapper functions and registers all available * XMLRPC functions. */ -class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { - var $methods = array(); - var $public_methods = array(); +class dokuwiki_xmlrpc_server extends IXR_Server { var $remote; /** - * Checks if the current user is allowed to execute non anonymous methods - */ - function checkAuth(){ - global $conf; - global $USERINFO; - - if(!$conf['useacl']) return true; //no ACL - then no checks - if(trim($conf['xmlrpcuser']) == '') return true; //no restrictions - - return auth_isMember($conf['xmlrpcuser'],$_SERVER['REMOTE_USER'],(array) $USERINFO['grps']); - } - - /** - * Adds a callback, extends parent method - * - * add another parameter to define if anonymous access to - * this method should be granted. + * Constructor. Register methods and run Server */ - function addCallback($method, $callback, $args, $help, $public=false){ - if($public) $this->public_methods[] = $method; - return parent::addCallback($method, $callback, $args, $help); + function dokuwiki_xmlrpc_server(){ + $this->remote = new RemoteAPI(); + $this->IXR_Server(); } - /** - * Execute a call, extends parent method - * - * Checks for authentication first - */ function call($methodname, $args){ - if(!in_array($methodname,$this->public_methods) && !$this->checkAuth()){ + try { + //print 'a'; + $result = $this->remote->call($methodname, $args); + return $result; + } catch (RemoteAccessDenied $e) { if (!isset($_SERVER['REMOTE_USER'])) { header('HTTP/1.1 401 Unauthorized'); } else { header('HTTP/1.1 403 Forbidden'); } - return new IXR_Error(-32603, 'server error. not authorized to call method "'.$methodname.'".'); + return new IXR_Error(-32603, 'server error. not authorized to call method'); + } catch (RemoteException $e) { + return new IXR_Error($e->getCode(), $e->getMessage()); } - return parent::call($methodname, $args); } - /** - * Constructor. Register methods and run Server - */ - function dokuwiki_xmlrpc_server(){ - $this->remote = new RemoteAPI(); - $this->IXR_IntrospectionServer(); - - /* DokuWiki's own methods */ - $this->addCallback( - 'dokuwiki.getXMLRPCAPIVersion', - 'this:getAPIVersion', - array('integer'), - 'Returns the XMLRPC API version.', - true - ); - - $this->addCallback( - 'dokuwiki.getVersion', - 'getVersion', - array('string'), - 'Returns the running DokuWiki version.', - true - ); - - $this->addCallback( - 'dokuwiki.login', - 'this:login', - array('integer','string','string'), - 'Tries to login with the given credentials and sets auth cookies.', - true - ); - - $this->addCallback( - 'dokuwiki.getPagelist', - 'this:readNamespace', - array('struct','string','struct'), - 'List all pages within the given namespace.' - ); - - $this->addCallback( - 'dokuwiki.search', - 'this:search', - array('struct','string'), - 'Perform a fulltext search and return a list of matching pages' - ); - - $this->addCallback( - 'dokuwiki.getTime', - 'time', - array('int'), - 'Return the current time at the wiki server.' - ); - - $this->addCallback( - 'dokuwiki.setLocks', - 'this:setLocks', - array('struct','struct'), - 'Lock or unlock pages.' - ); - - - $this->addCallback( - 'dokuwiki.getTitle', - 'this:getTitle', - array('string'), - 'Returns the wiki title.', - true - ); - - $this->addCallback( - 'dokuwiki.appendPage', - 'this:appendPage', - array('int', 'string', 'string', 'struct'), - 'Append text to a wiki page.' - ); - - /* Wiki API v2 http://www.jspwiki.org/wiki/WikiRPCInterface2 */ - $this->addCallback( - 'wiki.getRPCVersionSupported', - 'this:wiki_RPCVersion', - array('int'), - 'Returns 2 with the supported RPC API version.', - true - ); - $this->addCallback( - 'wiki.getPage', - 'this:rawPage', - array('string','string'), - 'Get the raw Wiki text of page, latest version.' - ); - $this->addCallback( - 'wiki.getPageVersion', - 'this:rawPage', - array('string','string','int'), - 'Get the raw Wiki text of page.' - ); - $this->addCallback( - 'wiki.getPageHTML', - 'this:htmlPage', - array('string','string'), - 'Return page in rendered HTML, latest version.' - ); - $this->addCallback( - 'wiki.getPageHTMLVersion', - 'this:htmlPage', - array('string','string','int'), - 'Return page in rendered HTML.' - ); - $this->addCallback( - 'wiki.getAllPages', - 'this:listPages', - array('struct'), - 'Returns a list of all pages. The result is an array of utf8 pagenames.' - ); - $this->addCallback( - 'wiki.getAttachments', - 'this:listAttachments', - array('struct', 'string', 'struct'), - 'Returns a list of all media files.' - ); - $this->addCallback( - 'wiki.getBackLinks', - 'this:listBackLinks', - array('struct','string'), - 'Returns the pages that link to this page.' - ); - $this->addCallback( - 'wiki.getPageInfo', - 'this:pageInfo', - array('struct','string'), - 'Returns a struct with infos about the page.' - ); - $this->addCallback( - 'wiki.getPageInfoVersion', - 'this:pageInfo', - array('struct','string','int'), - 'Returns a struct with infos about the page.' - ); - $this->addCallback( - 'wiki.getPageVersions', - 'this:pageVersions', - array('struct','string','int'), - 'Returns the available revisions of the page.' - ); - $this->addCallback( - 'wiki.putPage', - 'this:putPage', - array('int', 'string', 'string', 'struct'), - 'Saves a wiki page.' - ); - $this->addCallback( - 'wiki.listLinks', - 'this:listLinks', - array('struct','string'), - 'Lists all links contained in a wiki page.' - ); - $this->addCallback( - 'wiki.getRecentChanges', - 'this:getRecentChanges', - array('struct','int'), - 'Returns a struct about all recent changes since given timestamp.' - ); - $this->addCallback( - 'wiki.getRecentMediaChanges', - 'this:getRecentMediaChanges', - array('struct','int'), - 'Returns a struct about all recent media changes since given timestamp.' - ); - $this->addCallback( - 'wiki.aclCheck', - 'this:aclCheck', - array('int', 'string'), - 'Returns the permissions of a given wiki page.' - ); - $this->addCallback( - 'wiki.putAttachment', - 'this:putAttachment', - array('struct', 'string', 'base64', 'struct'), - 'Upload a file to the wiki.' - ); - $this->addCallback( - 'wiki.deleteAttachment', - 'this:deleteAttachment', - array('int', 'string'), - 'Delete a file from the wiki.' - ); - $this->addCallback( - 'wiki.getAttachment', - 'this:getAttachment', - array('base64', 'string'), - 'Download a file from the wiki.' - ); - $this->addCallback( - 'wiki.getAttachmentInfo', - 'this:getAttachmentInfo', - array('struct', 'string'), - 'Returns a struct with infos about the attachment.' - ); - - /** - * Trigger XMLRPC_CALLBACK_REGISTER, action plugins can use this event - * to extend the XMLRPC interface and register their own callbacks. - * - * Event data: - * The XMLRPC server object: - * - * $event->data->addCallback() - register a callback, the second - * paramter has to be of the form "plugin::" - * - * $event->data->callbacks - an array which holds all awaylable - * callbacks - */ - trigger_event('XMLRPC_CALLBACK_REGISTER', $this); - - $this->serve(); - } - - /** - * Return a raw wiki page - */ - function rawPage($id,$rev=''){ - try { - return $this->remote->rawPage($id, $rev); - } catch(RemoteAccessDenied $e) { - return new IXR_Error(1, 'You are not allowed to read this page'); - } - } - - /** - * Return a media file encoded in base64 - * - * @author Gina Haeussge - */ - function getAttachment($id){ - try { - try { - return $this->remote->getAttachment($id); - } catch (RemoteAccessDenied $e) { - return new IXR_Error(1, 'You are not allowed to read this file'); - } - } - catch (RemoteException $e) { - return new IXR_Error(1, $e->getMessage()); - } - } - - /** - * Return info about a media file - * - * @author Gina Haeussge - */ - function getAttachmentInfo($id){ - $info = $this->remote->getAttachmentInfo($id); - $info['lastModified'] = new IXR_Date($info['lastModified']); - return $info; - } - - /** - * Return a wiki page rendered to html - */ - function htmlPage($id,$rev=''){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); - } - return p_wiki_xhtml($id,$rev,false); - } - - /** - * List all pages - we use the indexer list here - */ - function listPages(){ - $list = array(); - $pages = idx_get_indexer()->getPages(); - $pages = array_filter(array_filter($pages,'isVisiblePage'),'page_exists'); - - foreach(array_keys($pages) as $idx) { - $perm = auth_quickaclcheck($pages[$idx]); - if($perm < AUTH_READ) { - continue; - } - $page = array(); - $page['id'] = trim($pages[$idx]); - $page['perms'] = $perm; - $page['size'] = @filesize(wikiFN($pages[$idx])); - $page['lastModified'] = new IXR_Date(@filemtime(wikiFN($pages[$idx]))); - $list[] = $page; - } - - return $list; - } - - /** - * List all pages in the given namespace (and below) - */ - function readNamespace($ns,$opts){ - global $conf; - - if(!is_array($opts)) $opts=array(); - - $ns = cleanID($ns); - $dir = utf8_encodeFN(str_replace(':', '/', $ns)); - $data = array(); - $opts['skipacl'] = 0; // no ACL skipping for XMLRPC - search($data, $conf['datadir'], 'search_allpages', $opts, $dir); - return $data; - } - - /** - * List all pages in the given namespace (and below) - */ - function search($query){ - require_once(DOKU_INC.'inc/fulltext.php'); - - $regex = ''; - $data = ft_pageSearch($query,$regex); - $pages = array(); - - // prepare additional data - $idx = 0; - foreach($data as $id => $score){ - $file = wikiFN($id); - - if($idx < FT_SNIPPET_NUMBER){ - $snippet = ft_snippet($id,$regex); - $idx++; - }else{ - $snippet = ''; - } - - $pages[] = array( - 'id' => $id, - 'score' => $score, - 'rev' => filemtime($file), - 'mtime' => filemtime($file), - 'size' => filesize($file), - 'snippet' => $snippet, - ); - } - return $pages; - } - - /** - * Returns the wiki title. - */ - function getTitle(){ - global $conf; - return $conf['title']; - } - - /** - * List all media files. - * - * Available options are 'recursive' for also including the subnamespaces - * in the listing, and 'pattern' for filtering the returned files against - * a regular expression matching their name. - * - * @author Gina Haeussge - */ - function listAttachments($ns, $options = array()) { - global $conf; - global $lang; - - $ns = cleanID($ns); - - if (!is_array($options)) $options = array(); - $options['skipacl'] = 0; // no ACL skipping for XMLRPC - - - if(auth_quickaclcheck($ns.':*') >= AUTH_READ) { - $dir = utf8_encodeFN(str_replace(':', '/', $ns)); - - $data = array(); - search($data, $conf['mediadir'], 'search_media', $options, $dir); - $len = count($data); - if(!$len) return array(); - - for($i=0; $i<$len; $i++) { - unset($data[$i]['meta']); - $data[$i]['lastModified'] = new IXR_Date($data[$i]['mtime']); - } - return $data; - } else { - return new IXR_Error(1, 'You are not allowed to list media files.'); - } - } - - /** - * Return a list of backlinks - */ - function listBackLinks($id){ - return ft_backlinks(cleanID($id)); - } - - /** - * Return some basic data about a page - */ - function pageInfo($id,$rev=''){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); - } - $file = wikiFN($id,$rev); - $time = @filemtime($file); - if(!$time){ - return new IXR_Error(10, 'The requested page does not exist'); - } - - $info = getRevisionInfo($id, $time, 1024); - - $data = array( - 'name' => $id, - 'lastModified' => new IXR_Date($time), - 'author' => (($info['user']) ? $info['user'] : $info['ip']), - 'version' => $time - ); - - return ($data); - } - - /** - * Save a wiki page - * - * @author Michael Klier - */ - function putPage($id, $text, $params) { - global $TEXT; - global $lang; - global $conf; - - $id = cleanID($id); - $TEXT = cleanText($text); - $sum = $params['sum']; - $minor = $params['minor']; - - if(empty($id)) - return new IXR_Error(1, 'Empty page ID'); - - if(!page_exists($id) && trim($TEXT) == '' ) { - return new IXR_ERROR(1, 'Refusing to write an empty new wiki page'); - } - - if(auth_quickaclcheck($id) < AUTH_EDIT) - return new IXR_Error(1, 'You are not allowed to edit this page'); - - // Check, if page is locked - if(checklock($id)) - return new IXR_Error(1, 'The page is currently locked'); - - // SPAM check - if(checkwordblock()) - return new IXR_Error(1, 'Positive wordblock check'); - - // autoset summary on new pages - if(!page_exists($id) && empty($sum)) { - $sum = $lang['created']; - } - - // autoset summary on deleted pages - if(page_exists($id) && empty($TEXT) && empty($sum)) { - $sum = $lang['deleted']; - } - - lock($id); - - saveWikiText($id,$TEXT,$sum,$minor); - - unlock($id); - - // run the indexer if page wasn't indexed yet - idx_addPage($id); - - return 0; - } - - /** - * Appends text to a wiki page. - */ - function appendPage($id, $text, $params) { - $currentpage = $this->rawPage($id); - if (!is_string($currentpage)) { - return $currentpage; - } - return $this->putPage($id, $currentpage.$text, $params); - } - - /** - * Uploads a file to the wiki. - * - * Michael Klier - */ - function putAttachment($id, $file, $params) { - $id = cleanID($id); - $auth = auth_quickaclcheck(getNS($id).':*'); - - if(!isset($id)) { - return new IXR_ERROR(1, 'Filename not given.'); - } - - global $conf; - - $ftmp = $conf['tmpdir'] . '/' . md5($id.clientIP()); - - // save temporary file - @unlink($ftmp); - if (preg_match('/^[A-Za-z0-9\+\/]*={0,2}$/', $file) === 1) { - // DEPRECATED: Double-decode file if it still looks like base64 - // after first decoding (which is done by the library) - $file = base64_decode($file); - } - io_saveFile($ftmp, $file); - - $res = media_save(array('name' => $ftmp), $id, $params['ow'], $auth, 'rename'); - if (is_array($res)) { - return new IXR_ERROR(-$res[1], $res[0]); - } else { - return $res; - } - } - - /** - * Deletes a file from the wiki. - * - * @author Gina Haeussge - */ - function deleteAttachment($id){ - $id = cleanID($id); - $auth = auth_quickaclcheck(getNS($id).':*'); - $res = media_delete($id, $auth); - if ($res & DOKU_MEDIA_DELETED) { - return 0; - } elseif ($res & DOKU_MEDIA_NOT_AUTH) { - return new IXR_ERROR(1, "You don't have permissions to delete files."); - } elseif ($res & DOKU_MEDIA_INUSE) { - return new IXR_ERROR(1, 'File is still referenced'); - } else { - return new IXR_ERROR(1, 'Could not delete file'); - } - } - - /** - * Returns the permissions of a given wiki page - */ - function aclCheck($id) { - $id = cleanID($id); - return auth_quickaclcheck($id); - } - - /** - * Lists all links contained in a wiki page - * - * @author Michael Klier - */ - function listLinks($id) { - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); - } - $links = array(); - - // resolve page instructions - $ins = p_cached_instructions(wikiFN($id)); - - // instantiate new Renderer - needed for interwiki links - include(DOKU_INC.'inc/parser/xhtml.php'); - $Renderer = new Doku_Renderer_xhtml(); - $Renderer->interwiki = getInterwiki(); - - // parse parse instructions - foreach($ins as $in) { - $link = array(); - switch($in[0]) { - case 'internallink': - $link['type'] = 'local'; - $link['page'] = $in[1][0]; - $link['href'] = wl($in[1][0]); - array_push($links,$link); - break; - case 'externallink': - $link['type'] = 'extern'; - $link['page'] = $in[1][0]; - $link['href'] = $in[1][0]; - array_push($links,$link); - break; - case 'interwikilink': - $url = $Renderer->_resolveInterWiki($in[1][2],$in[1][3]); - $link['type'] = 'extern'; - $link['page'] = $url; - $link['href'] = $url; - array_push($links,$link); - break; - } - } - - return ($links); - } - - /** - * Returns a list of recent changes since give timestamp - * - * @author Michael Hamann - * @author Michael Klier - */ - function getRecentChanges($timestamp) { - if(strlen($timestamp) != 10) - return new IXR_Error(20, 'The provided value is not a valid timestamp'); - - $recents = getRecentsSince($timestamp); - - $changes = array(); - - foreach ($recents as $recent) { - $change = array(); - $change['name'] = $recent['id']; - $change['lastModified'] = new IXR_Date($recent['date']); - $change['author'] = $recent['user']; - $change['version'] = $recent['date']; - $change['perms'] = $recent['perms']; - $change['size'] = @filesize(wikiFN($recent['id'])); - array_push($changes, $change); - } - - if (!empty($changes)) { - return $changes; - } else { - // in case we still have nothing at this point - return new IXR_Error(30, 'There are no changes in the specified timeframe'); - } - } - - /** - * Returns a list of recent media changes since give timestamp - * - * @author Michael Hamann - * @author Michael Klier - */ - function getRecentMediaChanges($timestamp) { - if(strlen($timestamp) != 10) - return new IXR_Error(20, 'The provided value is not a valid timestamp'); - - $recents = getRecentsSince($timestamp, null, '', RECENTS_MEDIA_CHANGES); - - $changes = array(); - - foreach ($recents as $recent) { - $change = array(); - $change['name'] = $recent['id']; - $change['lastModified'] = new IXR_Date($recent['date']); - $change['author'] = $recent['user']; - $change['version'] = $recent['date']; - $change['perms'] = $recent['perms']; - $change['size'] = @filesize(mediaFN($recent['id'])); - array_push($changes, $change); - } - - if (!empty($changes)) { - return $changes; - } else { - // in case we still have nothing at this point - return new IXR_Error(30, 'There are no changes in the specified timeframe'); - } - } - - /** - * Returns a list of available revisions of a given wiki page - * - * @author Michael Klier - */ - function pageVersions($id, $first) { - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_READ){ - return new IXR_Error(1, 'You are not allowed to read this page'); - } - global $conf; - - $versions = array(); - - if(empty($id)) - return new IXR_Error(1, 'Empty page ID'); - - $revisions = getRevisions($id, $first, $conf['recent']+1); - - if(count($revisions)==0 && $first!=0) { - $first=0; - $revisions = getRevisions($id, $first, $conf['recent']+1); - } - - if(count($revisions)>0 && $first==0) { - array_unshift($revisions, ''); // include current revision - array_pop($revisions); // remove extra log entry - } - - $hasNext = false; - if(count($revisions)>$conf['recent']) { - $hasNext = true; - array_pop($revisions); // remove extra log entry - } - - if(!empty($revisions)) { - foreach($revisions as $rev) { - $file = wikiFN($id,$rev); - $time = @filemtime($file); - // we check if the page actually exists, if this is not the - // case this can lead to less pages being returned than - // specified via $conf['recent'] - if($time){ - $info = getRevisionInfo($id, $time, 1024); - if(!empty($info)) { - $data['user'] = $info['user']; - $data['ip'] = $info['ip']; - $data['type'] = $info['type']; - $data['sum'] = $info['sum']; - $data['modified'] = new IXR_Date($info['date']); - $data['version'] = $info['date']; - array_push($versions, $data); - } - } - } - return $versions; - } else { - return array(); - } - } - - /** - * The version of Wiki RPC API supported - */ - function wiki_RPCVersion(){ - return 2; - } - - - /** - * Locks or unlocks a given batch of pages - * - * Give an associative array with two keys: lock and unlock. Both should contain a - * list of pages to lock or unlock - * - * Returns an associative array with the keys locked, lockfail, unlocked and - * unlockfail, each containing lists of pages. - */ - function setLocks($set){ - $locked = array(); - $lockfail = array(); - $unlocked = array(); - $unlockfail = array(); - - foreach((array) $set['lock'] as $id){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_EDIT || checklock($id)){ - $lockfail[] = $id; - }else{ - lock($id); - $locked[] = $id; - } - } - - foreach((array) $set['unlock'] as $id){ - $id = cleanID($id); - if(auth_quickaclcheck($id) < AUTH_EDIT || !unlock($id)){ - $unlockfail[] = $id; - }else{ - $unlocked[] = $id; - } - } - - return array( - 'locked' => $locked, - 'lockfail' => $lockfail, - 'unlocked' => $unlocked, - 'unlockfail' => $unlockfail, - ); - } - - function getAPIVersion(){ - return DOKU_XMLRPC_API_VERSION; - } - - function login($user,$pass){ - global $conf; - global $auth; - if(!$conf['useacl']) return 0; - if(!$auth) return 0; - - @session_start(); // reopen session for login - if($auth->canDo('external')){ - $ok = $auth->trustExternal($user,$pass,false); - }else{ - $evdata = array( - 'user' => $user, - 'password' => $pass, - 'sticky' => false, - 'silent' => true, - ); - $ok = trigger_event('AUTH_LOGIN_CHECK', $evdata, 'auth_login_wrapper'); - } - session_write_close(); // we're done with the session - - return $ok; - } - - } $server = new dokuwiki_xmlrpc_server(); -- cgit v1.2.3 From f95017850a515969190f54df3d57a00449245bb9 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 18:37:59 +0100 Subject: delegate file and date transformation to remote library --- lib/exe/xmlrpc.php | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 9888c9a61..44b4ba7a0 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -27,6 +27,8 @@ class dokuwiki_xmlrpc_server extends IXR_Server { */ function dokuwiki_xmlrpc_server(){ $this->remote = new RemoteAPI(); + $this->remote->setDateTransformation(array($this, 'toDate')); + $this->remote->setFileTransformation(array($this, 'toFile')); $this->IXR_Server(); } @@ -47,6 +49,14 @@ class dokuwiki_xmlrpc_server extends IXR_Server { } } + function toDate($data) { + return new IXR_Date($data); + } + + function toFile($data) { + return new IXR_Base64($data); + } + } $server = new dokuwiki_xmlrpc_server(); -- cgit v1.2.3 From e61127e4af913a252fbe5c8f427501268501895c Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 19:31:10 +0100 Subject: refactored RemoteAccessDenied to RemoteAccessDeniedException --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 44b4ba7a0..ce9ef1484 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -37,7 +37,7 @@ class dokuwiki_xmlrpc_server extends IXR_Server { //print 'a'; $result = $this->remote->call($methodname, $args); return $result; - } catch (RemoteAccessDenied $e) { + } catch (RemoteAccessDeniedException $e) { if (!isset($_SERVER['REMOTE_USER'])) { header('HTTP/1.1 401 Unauthorized'); } else { -- cgit v1.2.3 From d5d19f6f45af17260583d7f7a8e753343afbaaad Mon Sep 17 00:00:00 2001 From: "Oscar M. Lage" Date: Mon, 9 Jan 2012 19:02:36 +0100 Subject: Galician language update --- lib/plugins/acl/lang/gl/lang.php | 1 + lib/plugins/config/lang/gl/lang.php | 7 +++++++ lib/plugins/plugin/lang/gl/lang.php | 2 ++ lib/plugins/popularity/lang/gl/lang.php | 6 ++++++ lib/plugins/popularity/lang/gl/submitted.txt | 3 +++ lib/plugins/revert/lang/gl/lang.php | 1 + lib/plugins/usermanager/lang/gl/lang.php | 1 + 7 files changed, 21 insertions(+) create mode 100644 lib/plugins/popularity/lang/gl/submitted.txt (limited to 'lib') diff --git a/lib/plugins/acl/lang/gl/lang.php b/lib/plugins/acl/lang/gl/lang.php index 774bf207a..db57598e6 100644 --- a/lib/plugins/acl/lang/gl/lang.php +++ b/lib/plugins/acl/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio + * @author Oscar M. Lage */ $lang['admin_acl'] = 'Xestión da Lista de Control de Acceso (ACL)'; $lang['acl_group'] = 'Grupo'; diff --git a/lib/plugins/config/lang/gl/lang.php b/lib/plugins/config/lang/gl/lang.php index 07d62b7af..da40b44e6 100644 --- a/lib/plugins/config/lang/gl/lang.php +++ b/lib/plugins/config/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio + * @author Oscar M. Lage */ $lang['menu'] = 'Opcións de Configuración'; $lang['error'] = 'Configuración non actualizada debido a un valor inválido, por favor revisa os teus trocos e volta envialos de novo. @@ -39,6 +40,7 @@ $lang['lang'] = 'Idioma'; $lang['basedir'] = 'Directorio base'; $lang['baseurl'] = 'URL base'; $lang['savedir'] = 'Directorio no que se gardarán os datos'; +$lang['cookiedir'] = 'Ruta das cookies. Deixar en blanco para usar a url de base.'; $lang['start'] = 'Nome da páxina inicial'; $lang['title'] = 'Título do Wiki'; $lang['template'] = 'Sobreplanta'; @@ -62,6 +64,7 @@ $lang['useheading'] = 'Utilizar a primeira cabeceira para os nomes de $lang['refcheck'] = 'Comprobar a referencia media'; $lang['refshow'] = 'Número de referencias media a amosar'; $lang['allowdebug'] = 'Permitir o depurado desactívao se non o precisas!'; +$lang['mediarevisions'] = 'Habilitar revisións dos arquivos-media?'; $lang['usewordblock'] = 'Bloquear correo-lixo segundo unha lista de verbas'; $lang['indexdelay'] = 'Retardo denantes de indexar (seg)'; $lang['relnofollow'] = 'Utilizar rel="nofollow" nas ligazóns externas'; @@ -92,6 +95,7 @@ $lang['useslash'] = 'Utilizar a barra inclinada (/) como separador $lang['usedraft'] = 'Gardar un borrador automaticamente no tempo da edición'; $lang['sepchar'] = 'Verba separadora do nome de páxina'; $lang['canonical'] = 'Utilizar URLs completamente canónicos'; +$lang['fnencode'] = 'Método para codificar os nomes de arquivo non-ASCII.'; $lang['autoplural'] = 'Comprobar formas plurais nas ligazóns'; $lang['compression'] = 'Método de compresión para arquivos attic'; $lang['cachetime'] = 'Tempo máximo para a caché (seg.)'; @@ -100,6 +104,7 @@ $lang['fetchsize'] = 'Tamaño máximo (en bytes) que pode descargar $lang['notify'] = 'Enviar notificacións de trocos a este enderezo de correo-e'; $lang['registernotify'] = 'Enviar información de novos usuarios rexistrados a este enderezo de correo-e'; $lang['mailfrom'] = 'Enderezo de correo-e a usar para as mensaxes automáticas'; +$lang['mailprefix'] = 'Prefixo de asunto de correo-e para as mensaxes automáticas'; $lang['gzip_output'] = 'Utilizar Contido-Codificación gzip para o xhtml'; $lang['gdlib'] = 'Versión da Libraría GD'; $lang['im_convert'] = 'Ruta deica a ferramenta de conversión ImageMagick'; @@ -132,6 +137,7 @@ $lang['proxy____port'] = 'Porto do Proxy'; $lang['proxy____user'] = 'Nome de usuario do Proxy'; $lang['proxy____pass'] = 'Contrasinal do Proxy'; $lang['proxy____ssl'] = 'Utilizar ssl para conectar ao Proxy'; +$lang['proxy____except'] = 'Expresión regular para atopar URLs que deban ser omitidas polo Proxy.'; $lang['safemodehack'] = 'Activar hack de modo seguro (safemode)'; $lang['ftp____host'] = 'Servidor FTP para o hack de modo seguro (safemode)'; $lang['ftp____port'] = 'Porto FTP para o hack de modo seguro(safemode)'; @@ -179,3 +185,4 @@ $lang['useheading_o_0'] = 'Endexamais'; $lang['useheading_o_navigation'] = 'Só Navegación'; $lang['useheading_o_content'] = 'Só Contido do Wiki'; $lang['useheading_o_1'] = 'Sempre'; +$lang['readdircache'] = 'Edad máxima para o directorio de caché (seg)'; diff --git a/lib/plugins/plugin/lang/gl/lang.php b/lib/plugins/plugin/lang/gl/lang.php index 157911a62..a314b71b9 100644 --- a/lib/plugins/plugin/lang/gl/lang.php +++ b/lib/plugins/plugin/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio + * @author Oscar M. Lage */ $lang['menu'] = 'Xestionar Extensións'; $lang['download'] = 'Descargar e instalar unha nova extensión'; @@ -48,3 +49,4 @@ $lang['enabled'] = 'Extensión %s activado.'; $lang['notenabled'] = 'A extensión %s non puido ser activada, comproba os permisos de arquivo.'; $lang['disabled'] = 'Extensión %s desactivada.'; $lang['notdisabled'] = 'A extensión %s non puido ser desactivada, comproba os permisos de arquivo.'; +$lang['packageinstalled'] = 'Paquete de extensión (%d plugin(s): %s) instalado axeitadamente.'; diff --git a/lib/plugins/popularity/lang/gl/lang.php b/lib/plugins/popularity/lang/gl/lang.php index 3e7d9275b..34bd3935f 100644 --- a/lib/plugins/popularity/lang/gl/lang.php +++ b/lib/plugins/popularity/lang/gl/lang.php @@ -3,6 +3,12 @@ * Galician language file * * @author Medúlio + * @author Oscar M. Lage */ $lang['name'] = 'Resposta de Popularidade (pode demorar un tempo a cargar)'; $lang['submit'] = 'Enviar Datos'; +$lang['autosubmit'] = 'Enviar datos automáticamente unha vez por mes'; +$lang['submissionFailed'] = 'Os datos non se poden enviar debido ao seguinte erro:'; +$lang['submitDirectly'] = 'Podes enviar os datos de forma manual co seguinte formulario.'; +$lang['autosubmitError'] = 'O último envío automático fallou debido ao seguinte erro:'; +$lang['lastSent'] = 'Os datos foron enviados'; diff --git a/lib/plugins/popularity/lang/gl/submitted.txt b/lib/plugins/popularity/lang/gl/submitted.txt new file mode 100644 index 000000000..0dec55eef --- /dev/null +++ b/lib/plugins/popularity/lang/gl/submitted.txt @@ -0,0 +1,3 @@ +====== Resposta de Popularidade ====== + +Os datos foron enviados satisfactoriamente. \ No newline at end of file diff --git a/lib/plugins/revert/lang/gl/lang.php b/lib/plugins/revert/lang/gl/lang.php index 87bce32ba..a0c5a9785 100644 --- a/lib/plugins/revert/lang/gl/lang.php +++ b/lib/plugins/revert/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio + * @author Oscar M. Lage */ $lang['menu'] = 'Xestor de Reversión'; $lang['filter'] = 'Procurar páxinas con correo-lixo'; diff --git a/lib/plugins/usermanager/lang/gl/lang.php b/lib/plugins/usermanager/lang/gl/lang.php index 0a01ef750..c9c633b39 100644 --- a/lib/plugins/usermanager/lang/gl/lang.php +++ b/lib/plugins/usermanager/lang/gl/lang.php @@ -3,6 +3,7 @@ * Galicianlanguage file * * @author Medúlio + * @author Oscar M. Lage */ $lang['menu'] = 'Xestor de Usuarios'; $lang['noauth'] = '(autenticación de usuarios non dispoñible)'; -- cgit v1.2.3 From 2dba8df4d3a5c3e9d104bee5290766929f4cabee Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 13 Jan 2012 10:02:32 +0100 Subject: Fix sorting in media manager search (FS#2423) --- lib/scripts/media.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index c74633523..841baa93f 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -135,7 +135,7 @@ var dw_mediamanager = { }); $sortBy.children('input').change(function (event) { dw_mediamanager.set_fileview_sort(); - dw_mediamanager.list.call(this, event); + dw_mediamanager.list.call(jQuery('#dw__mediasearch')[0] || this, event); }); }, -- cgit v1.2.3 From b8a84c03383cce9c6b85f9d742ae06fac02dd6cd Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 12 Jan 2012 18:34:48 +0100 Subject: readded missing "view original" button to the new media manager Template authors need to update their _mediamanager.css --- lib/tpl/default/_mediamanager.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib') diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 198c7f440..9b1ece8d7 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -59,6 +59,7 @@ background-color: __background_alt__; } + /*____________ Namespaces tree ____________*/ #mediamanager__page .namespaces h2 { @@ -101,6 +102,15 @@ margin: 0 0 3px; } +#mediamanager__page .file .panelHeader h3 { + margin-right: 18px; +} + +#mediamanager__page .file .panelHeader img.btn { + float: right; + width: 16px; +} + #mediamanager__page .panelHeader form.options { float: right; margin-top: -3px; -- cgit v1.2.3 From e3b5f536dca655d5373e5ec24b258a359f22876d Mon Sep 17 00:00:00 2001 From: Martin Michalek Date: Fri, 13 Jan 2012 21:38:26 +0100 Subject: Slovak language update --- lib/plugins/config/lang/sk/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index 72ce10775..9f55248a3 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -64,6 +64,7 @@ $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'; -- cgit v1.2.3 From 489159e3bfa7c10f9f09df81f09a484736ce5c78 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 22 Dec 2011 16:19:24 +0100 Subject: don't limit download sizes in plugin manager --- lib/plugins/plugin/classes/ap_download.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php index 6aab4ba3c..b2571f632 100644 --- a/lib/plugins/plugin/classes/ap_download.class.php +++ b/lib/plugins/plugin/classes/ap_download.class.php @@ -59,7 +59,7 @@ class ap_download extends ap_manage { return false; } - if (!$file = io_download($url, "$tmp/", true, $file)) { + if (!$file = io_download($url, "$tmp/", true, $file, 0)) { $this->manager->error = sprintf($this->lang['error_download'],$url)."\n"; } -- cgit v1.2.3 From 29e4fe3d4e010b156d59d2ea20458f777203232a Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 18 Jan 2012 11:12:11 +0100 Subject: Removed obsolete Opera fix that now causes harm FS#2429 --- lib/exe/ajax.php | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 46d835187..3d1584244 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -6,11 +6,6 @@ * @author Andreas Gohr */ -//fix for Opera XMLHttpRequests -if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){ - parse_str($HTTP_RAW_POST_DATA, $_POST); -} - if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../'); require_once(DOKU_INC.'inc/init.php'); //close session -- cgit v1.2.3 From 59f3611b2f11fe1652befff8189787a1181a2f66 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 22 Jan 2012 16:39:01 +0000 Subject: removed 'view original' button from new media manager again (was added in b8a84c03) and made a link around the image instead, as that is a more minor change (as it should be during the RC phase) and is what was originally planned --- lib/tpl/default/_mediamanager.css | 9 --------- 1 file changed, 9 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 9b1ece8d7..68fa2e97f 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -102,15 +102,6 @@ margin: 0 0 3px; } -#mediamanager__page .file .panelHeader h3 { - margin-right: 18px; -} - -#mediamanager__page .file .panelHeader img.btn { - float: right; - width: 16px; -} - #mediamanager__page .panelHeader form.options { float: right; margin-top: -3px; -- cgit v1.2.3 From c51f90d7a072929e2b636e986b8ea2121bc5a630 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Tue, 24 Jan 2012 11:12:44 +0100 Subject: let js.php use multiple caches --- lib/exe/js.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index b7f2fd222..c929c9ba5 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -31,8 +31,14 @@ function js_out(){ global $lang; global $config_cascade; + if (isset($_GET['cacheKey'])) { + $cacheKey = strval($_GET['cacheKey']); + } else { + $cacheKey = ''; + } + // The generated script depends on some dynamic options - $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'], + $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].$cacheKey, '.js'); // load minified version for some files -- cgit v1.2.3 From c2790ba28b0df3773b54f78e37ac8ce0ada61cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel-Emeric=20Andra=C8=99i?= Date: Wed, 25 Jan 2012 20:03:56 +0100 Subject: Romanian language update --- lib/plugins/acl/lang/ro/lang.php | 1 + lib/plugins/config/lang/ro/lang.php | 2 ++ lib/plugins/plugin/lang/ro/lang.php | 1 + lib/plugins/popularity/lang/ro/lang.php | 1 + lib/plugins/revert/lang/ro/lang.php | 1 + lib/plugins/usermanager/lang/ro/lang.php | 1 + 6 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php index 0c13d7223..6d63ad024 100644 --- a/lib/plugins/acl/lang/ro/lang.php +++ b/lib/plugins/acl/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR + * @author Emanuel-Emeric Andrași */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index 6b0a0e91a..5845e3c35 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR + * @author Emanuel-Emeric Andrași */ $lang['menu'] = 'Setări de Configurare'; $lang['error'] = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou.
Valorile incorecte vor apărea într-un chenar roşu.'; @@ -67,6 +68,7 @@ $lang['useheading'] = 'Foloseşte primul titlu pentru numele paginii' $lang['refcheck'] = 'Verificare referinţă media'; $lang['refshow'] = 'Numărul de referinţe media de arătat'; $lang['allowdebug'] = 'Permite depanarea dezactivaţi dacă cu e necesar!'; +$lang['mediarevisions'] = 'Activează revizii media?'; $lang['usewordblock'] = 'Blochează spam-ul pe baza listei de cuvinte'; $lang['indexdelay'] = 'Timpul de întârziere înainte de indexare (sec)'; $lang['relnofollow'] = 'Folosiţi rel="nofollow" pentru legăturile externe'; diff --git a/lib/plugins/plugin/lang/ro/lang.php b/lib/plugins/plugin/lang/ro/lang.php index 9c90f77a3..798ada1c7 100644 --- a/lib/plugins/plugin/lang/ro/lang.php +++ b/lib/plugins/plugin/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR + * @author Emanuel-Emeric Andrași */ $lang['menu'] = 'Administrează plugin-uri'; $lang['download'] = 'Descarcă şi instalează un nou plugin'; diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php index 7f3508362..f3ca8d37e 100644 --- a/lib/plugins/popularity/lang/ro/lang.php +++ b/lib/plugins/popularity/lang/ro/lang.php @@ -7,6 +7,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR + * @author Emanuel-Emeric Andrași */ $lang['name'] = 'Feedback de popularitate (încărcarea poate dura mai mult)'; $lang['submit'] = 'Trimite datele'; diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php index 7397a1d74..094f4dc71 100644 --- a/lib/plugins/revert/lang/ro/lang.php +++ b/lib/plugins/revert/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR + * @author Emanuel-Emeric Andrași */ $lang['menu'] = 'Manager Reveniri'; $lang['filter'] = 'Caută pagini cu posibil spam'; diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php index 4c0afc896..b8c1f24fc 100644 --- a/lib/plugins/usermanager/lang/ro/lang.php +++ b/lib/plugins/usermanager/lang/ro/lang.php @@ -9,6 +9,7 @@ * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi * @author Marius OLAR + * @author Emanuel-Emeric Andrași */ $lang['menu'] = 'Manager Utilizatori'; $lang['noauth'] = '(autentificarea utilizatorilor nu este disponibilă)'; -- cgit v1.2.3 From 91e9045718073c3a4ad4ce581e9192f0a87baaf7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 29 Jan 2012 19:15:13 +0000 Subject: added two new config options: tagline and sidebar Templates authors should support these to make the transition between templates easier. Templates which already have a sidebar could first check for $conf['sidebar'] and use it if it's defined, otherwise use their old own sidebar functionality to stay backwards-compatible. --- lib/plugins/config/lang/en/lang.php | 2 ++ lib/plugins/config/settings/config.metadata.php | 2 ++ 2 files changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index a075d7cc2..74ec56345 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -62,6 +62,8 @@ $lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.'; $lang['start'] = 'Start page name'; $lang['title'] = 'Wiki title'; $lang['template'] = 'Template'; +$lang['tagline'] = 'Tagline (if template supports it)'; +$lang['sidebar'] = 'Sidebar page name (if template supports it), empty field disables the sidebar'; $lang['license'] = 'Under which license should your content be released?'; $lang['fullpath'] = 'Reveal full path of pages in the footer'; $lang['recent'] = 'Recent changes'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index d8ad06134..96451e857 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -91,6 +91,8 @@ $meta['title'] = array('string'); $meta['start'] = array('string','_pattern' => '!^[^:;/]+$!'); // don't accept namespaces $meta['lang'] = array('dirchoice','_dir' => DOKU_INC.'inc/lang/'); $meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/','_pattern' => '/^[\w-]+$/'); +$meta['tagline'] = array('string'); +$meta['sidebar'] = array('string'); $meta['license'] = array('license'); $meta['savedir'] = array('savedir'); $meta['basedir'] = array('string'); -- cgit v1.2.3 From 81aca18e6e88c08386c11592dbf4650114aba04f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 1 Feb 2012 20:07:04 +0100 Subject: removed some more occurances of DOKU_TPL* --- lib/exe/css.php | 4 ++-- lib/exe/js.php | 4 ++-- lib/exe/opensearch.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index d54e2e46c..69b512205 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -41,8 +41,8 @@ function css_out(){ $tplinc = DOKU_INC.'lib/tpl/'.$tpl.'/'; $tpldir = DOKU_BASE.'lib/tpl/'.$tpl.'/'; }else{ - $tplinc = DOKU_TPLINC; - $tpldir = DOKU_TPL; + $tplinc = tpl_incdir(); + $tpldir = tpl_basedir(); } // The generated script depends on some dynamic options diff --git a/lib/exe/js.php b/lib/exe/js.php index b7f2fd222..963eebd5f 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -65,7 +65,7 @@ function js_out(){ # disabled for FS#1958 DOKU_INC.'lib/scripts/hotkeys.js', DOKU_INC.'lib/scripts/behaviour.js', DOKU_INC.'lib/scripts/page.js', - DOKU_TPLINC.'script.js', + tpl_incdir().'script.js', ); // add possible plugin scripts and userscript @@ -87,7 +87,7 @@ function js_out(){ // add some global variables print "var DOKU_BASE = '".DOKU_BASE."';"; - print "var DOKU_TPL = '".DOKU_TPL."';"; + print "var DOKU_TPL = '".tpl_basedir()."';"; // FIXME: Move those to JSINFO print "var DOKU_UHN = ".((int) useHeading('navigation')).";"; print "var DOKU_UHC = ".((int) useHeading('content')).";"; diff --git a/lib/exe/opensearch.php b/lib/exe/opensearch.php index 03a1632c4..73939c347 100644 --- a/lib/exe/opensearch.php +++ b/lib/exe/opensearch.php @@ -16,9 +16,9 @@ require_once(DOKU_INC.'inc/init.php'); // try to be clever about the favicon location if(file_exists(DOKU_INC.'favicon.ico')){ $ico = DOKU_URL.'favicon.ico'; -}elseif(file_exists(DOKU_TPLINC.'images/favicon.ico')){ +}elseif(file_exists(tpl_incdir().'images/favicon.ico')){ $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/images/favicon.ico'; -}elseif(file_exists(DOKU_TPLINC.'favicon.ico')){ +}elseif(file_exists(tpl_incdir().'favicon.ico')){ $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/favicon.ico'; }else{ $ico = DOKU_URL.'lib/tpl/default/images/favicon.ico'; -- cgit v1.2.3 From bc9d46afa580ee1191b02e2fe3b03fd863045b8b Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 1 Feb 2012 20:24:11 +0100 Subject: some more DOKU_TPL removal --- lib/plugins/config/admin.php | 6 +++--- lib/plugins/config/settings/config.class.php | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 64906171d..c883e7b6a 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -270,10 +270,10 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { // the same for the active template $tpl = $conf['template']; - if (@file_exists(DOKU_TPLINC.$enlangfile)){ + if (@file_exists(tpl_incdir().$enlangfile)){ $lang = array(); - @include(DOKU_TPLINC.$enlangfile); - if ($conf['lang'] != 'en') @include(DOKU_TPLINC.$langfile); + @include(tpl_incdir().$enlangfile); + if ($conf['lang'] != 'en') @include(tpl_incdir().$langfile); foreach ($lang as $key => $value){ $this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value; } diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index adf7d217a..1cdab607f 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -279,10 +279,10 @@ if (!class_exists('configuration')) { } // the same for the active template - if (@file_exists(DOKU_TPLINC.$file)){ + if (@file_exists(tpl_incdir().$file)){ $meta = array(); - @include(DOKU_TPLINC.$file); - @include(DOKU_TPLINC.$class); + @include(tpl_incdir().$file); + @include(tpl_incdir().$class); if (!empty($meta)) { $metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] = array('fieldset'); } @@ -314,9 +314,9 @@ if (!class_exists('configuration')) { } // the same for the active template - if (@file_exists(DOKU_TPLINC.$file)){ + if (@file_exists(tpl_incdir().$file)){ $conf = array(); - @include(DOKU_TPLINC.$file); + @include(tpl_incdir().$file); foreach ($conf as $key => $value){ $default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value; } -- cgit v1.2.3 From 2203da5b13d5062626a6ecd6b599fb42dc415a06 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 1 Feb 2012 20:35:23 +0100 Subject: increased XMLRPC API version for 1d667b4 --- lib/exe/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 61e6f1e95..1264ff333 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -7,7 +7,7 @@ if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA); /** * Increased whenever the API is changed */ -define('DOKU_XMLRPC_API_VERSION', 6); +define('DOKU_XMLRPC_API_VERSION', 7); require_once(DOKU_INC.'inc/init.php'); session_write_close(); //close session -- cgit v1.2.3 From 40d429f51adcff41f289a7961b5d298d2190f3ef Mon Sep 17 00:00:00 2001 From: Begina Felicysym Date: Thu, 2 Feb 2012 20:48:01 +0100 Subject: Polish language update --- lib/plugins/config/lang/pl/lang.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/pl/lang.php b/lib/plugins/config/lang/pl/lang.php index 62c55d328..a04f45c87 100644 --- a/lib/plugins/config/lang/pl/lang.php +++ b/lib/plugins/config/lang/pl/lang.php @@ -52,6 +52,8 @@ $lang['cookiedir'] = 'Ścieżka plików ciasteczek. Zostaw puste by $lang['start'] = 'Tytuł strony początkowej'; $lang['title'] = 'Tytuł wiki'; $lang['template'] = 'Motyw'; +$lang['tagline'] = 'Motto (jeśli szablon daje taką możliwość)'; +$lang['sidebar'] = 'Nazwa strony paska bocznego (jeśli szablon je obsługuje), puste pole wyłącza pasek boczny'; $lang['license'] = 'Pod jaką licencją publikować treści wiki?'; $lang['fullpath'] = 'Wyświetlanie pełnych ścieżek'; $lang['recent'] = 'Ilość ostatnich zmian'; -- cgit v1.2.3 From ae6cce187876439c77b53ebd2ae61976274f4a11 Mon Sep 17 00:00:00 2001 From: Matej Urban Date: Thu, 2 Feb 2012 20:49:20 +0100 Subject: Slovak language update --- lib/plugins/acl/lang/sl/help.txt | 10 +++++----- lib/plugins/acl/lang/sl/lang.php | 2 +- lib/plugins/config/lang/sl/lang.php | 15 ++++++++++----- lib/plugins/plugin/lang/sl/admin_plugin.txt | 2 +- lib/plugins/plugin/lang/sl/lang.php | 2 +- lib/plugins/popularity/lang/sl/intro.txt | 10 +++++----- lib/plugins/popularity/lang/sl/submitted.txt | 4 ++-- lib/plugins/revert/lang/sl/intro.txt | 2 +- lib/plugins/usermanager/lang/sl/delete.txt | 2 +- 9 files changed, 27 insertions(+), 22 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/sl/help.txt b/lib/plugins/acl/lang/sl/help.txt index eada41c29..ff096ae0e 100644 --- a/lib/plugins/acl/lang/sl/help.txt +++ b/lib/plugins/acl/lang/sl/help.txt @@ -1,11 +1,11 @@ -=== Hitra pomo === +=== Hitra pomoč === -Na tej strani je mogoe dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori. +Na tej strani je mogoče dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori. Na veli strani so izpisani vsi imenski prostori in strani. -Na obrazcu zgoraj je mogoe pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino. +Na obrazcu zgoraj je mogoče pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino. -V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoe hitro spreminjati ali brisati. +V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoče hitro spreminjati ali brisati. -Ve podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoe najti v [[doku>acl|uradni dokumentaciji ACL]]. +Več podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoče najti v [[doku>acl|uradni dokumentaciji ACL]]. diff --git a/lib/plugins/acl/lang/sl/lang.php b/lib/plugins/acl/lang/sl/lang.php index 3fb391570..44e45e491 100644 --- a/lib/plugins/acl/lang/sl/lang.php +++ b/lib/plugins/acl/lang/sl/lang.php @@ -5,7 +5,7 @@ * @author Dejan Levec * @author Boštjan Seničar * @author Gregor Skumavc (grega.skumavc@gmail.com) - * @author Matej Urbančič (mateju@svn.gnome.org) + * @author Matej Urbančič (mateju@svn.gnome.org) */ $lang['admin_acl'] = 'Upravljanje dostopa'; $lang['acl_group'] = 'Skupina'; diff --git a/lib/plugins/config/lang/sl/lang.php b/lib/plugins/config/lang/sl/lang.php index dadd01595..ba4836823 100644 --- a/lib/plugins/config/lang/sl/lang.php +++ b/lib/plugins/config/lang/sl/lang.php @@ -7,7 +7,6 @@ * @author Gregor Skumavc (grega.skumavc@gmail.com) * @author Matej Urbančič (mateju@svn.gnome.org) */ - $lang['menu'] = 'Splošne nastavitve'; $lang['error'] = 'Nastavitve niso shranjene zaradi neveljavne vrednosti.
Neveljavna vrednost je označena z rdečim robom vnosnega polja.'; $lang['updated'] = 'Nastavitve so uspešno posodobljene.'; @@ -27,7 +26,7 @@ $lang['_authentication'] = 'Nastavitve overjanja'; $lang['_anti_spam'] = 'Nastavitve neželenih sporočil (Anti-Spam)'; $lang['_editing'] = 'Nastavitve urejanja'; $lang['_links'] = 'Nastavitve povezav'; -$lang['_media'] = 'Predstavnostne nastavitve'; +$lang['_media'] = 'Predstavne nastavitve'; $lang['_advanced'] = 'Napredne nastavitve'; $lang['_network'] = 'Omrežne nastavitve'; $lang['_plugin_sufix'] = 'nastavitve'; @@ -41,9 +40,12 @@ $lang['lang'] = 'Jezik vmesnika'; $lang['basedir'] = 'Pot do strežnika (npr. /dokuwiki/). Prazno polje določa samodejno zaznavanje'; $lang['baseurl'] = 'Naslov URL strežnika (npr. http://www.streznik.si). Prazno polje določa samodejno zaznavanje'; $lang['savedir'] = 'Mapa za shranjevanje podatkov'; +$lang['cookiedir'] = 'Pot do piškotka. Prazno polje določa uporabo osnovnega naslova (baseurl)'; $lang['start'] = 'Ime začetne strani wiki'; $lang['title'] = 'Naslov Wiki spletišča'; $lang['template'] = 'Predloga'; +$lang['tagline'] = 'Označna vrstica (ob podpori predloge)'; +$lang['sidebar'] = 'Ime strani stranske vrstice (ob podpori predloge); prazno polje onemogoči stransko vrstico.'; $lang['license'] = 'Pod pogoji katerega dovoljenja je objavljena vsebina?'; $lang['fullpath'] = 'Pokaži polno pot strani v nogi strani'; $lang['recent'] = 'Nedavne spremembe'; @@ -62,8 +64,9 @@ $lang['camelcase'] = 'Uporabi EnoBesedni zapisa za povezave'; $lang['deaccent'] = 'Počisti imena strani'; $lang['useheading'] = 'Uporabi prvi naslov za ime strani'; $lang['refcheck'] = 'Preverjanje sklica predstavnih datotek'; -$lang['refshow'] = 'Število predstavnostnih sklicev za prikaz'; +$lang['refshow'] = 'Število predstavih sklicev za prikaz'; $lang['allowdebug'] = 'Dovoli razhroščevanje (po potrebi!)'; +$lang['mediarevisions'] = 'Ali naj se omogočijo objave predstavnih vsebin?'; $lang['usewordblock'] = 'Zaustavi neželeno besedilo glede na seznam besed'; $lang['indexdelay'] = 'Časovni zamik pred ustvarjanjem kazala (v sekundah)'; $lang['relnofollow'] = 'Uporabni možnost rel="nofollow" pri zunanjih povezavah'; @@ -103,6 +106,7 @@ $lang['fetchsize'] = 'največja dovoljena velikost zunanjega prejema $lang['notify'] = 'Pošlji obvestila o spremembah na določen elektronski naslov'; $lang['registernotify'] = 'Pošlji obvestila o novih vpisanih uporabnikih na določen elektronski naslov'; $lang['mailfrom'] = 'Elektronski naslov za samodejno poslana sporočila'; +$lang['mailprefix'] = 'Predpona zadeve elektronskega sporočila za samodejna sporočila.'; $lang['gzip_output'] = 'Uporabi stiskanje gzip vsebine za xhtml'; $lang['gdlib'] = 'Različica GD Lib'; $lang['im_convert'] = 'Pot do orodja za pretvarjanje slik ImageMagick'; @@ -110,6 +114,7 @@ $lang['jpg_quality'] = 'Kakovost stiskanja datotek JPG (0-100)'; $lang['subscribers'] = 'Omogoči podporo naročanju na strani'; $lang['subscribe_time'] = 'Čas po katerem so poslani povzetki sprememb (v sekundah); Vrednost mora biti krajša od časa, ki je določen z nedavno_dni.'; $lang['compress'] = 'Združi odvod CSS in JavaScript v brskalniku'; +$lang['cssdatauri'] = 'Velikost sklicanih slik v bajtih, ki so navedene v datotekah CSS za zmanjšanje zahtev osveževanja strežnika HTTP. Ta možnost ni podprta v brskalniku MS IE 7 in nižjih različicah! Ustrezne vrednosti so 400 do 600 bajtov. Vrednost 0 onemogoči možnost.'; $lang['hidepages'] = 'Skrij skladne strani (logični izraz)'; $lang['send404'] = 'Pošlji "HTTP 404/Strani ni mogoče najti" pri dostopu do neobstoječih strani'; $lang['sitemap'] = 'Ustvari Google kazalo strani (v dnevih)'; @@ -172,9 +177,9 @@ $lang['compression_o_0'] = 'brez'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'ne uporabi'; -$lang['xsendfile_o_1'] = 'plačniška glava lighttpd (pred različico 1.5)'; +$lang['xsendfile_o_1'] = 'lastniška glava lighttpd (pred različico 1.5)'; $lang['xsendfile_o_2'] = 'običajna glava X-Sendfile'; -$lang['xsendfile_o_3'] = 'plačniška glava Nginx X-Accel-Redirect'; +$lang['xsendfile_o_3'] = 'lastniška glava Nginx X-Accel-Redirect'; $lang['showuseras_o_loginname'] = 'Prijavno ime'; $lang['showuseras_o_username'] = 'Polno ime uporabnika'; $lang['showuseras_o_email'] = 'Elektronski naslov uporabnika (šifriran po določilih varovanja)'; diff --git a/lib/plugins/plugin/lang/sl/admin_plugin.txt b/lib/plugins/plugin/lang/sl/admin_plugin.txt index 2e99c6297..5fd02e1ba 100644 --- a/lib/plugins/plugin/lang/sl/admin_plugin.txt +++ b/lib/plugins/plugin/lang/sl/admin_plugin.txt @@ -1,3 +1,3 @@ ====== Upravljanje vstavkov ====== -Na tej strani je mogoe spreminjati in prilagajati nastavitve Dokuwiki [[doku>plugins|vstavkov]]. Za prejemanje in nameanje vstavkov v ustrezne mape, morajo imeti te doloena ustrezna dovoljenja za pisanje spletnega strenika. +Na tej strani je mogoče spreminjati in prilagajati nastavitve DokuWiki [[doku>plugins|vstavkov]]. Za prejemanje in nameščanje vstavkov v ustrezne mape, morajo imeti te določena ustrezna dovoljenja za pisanje spletnega strežnika. diff --git a/lib/plugins/plugin/lang/sl/lang.php b/lib/plugins/plugin/lang/sl/lang.php index 39ba20139..3e5f8c8af 100644 --- a/lib/plugins/plugin/lang/sl/lang.php +++ b/lib/plugins/plugin/lang/sl/lang.php @@ -7,7 +7,6 @@ * @author Gregor Skumavc (grega.skumavc@gmail.com) * @author Matej Urbančič (mateju@svn.gnome.org) */ - $lang['menu'] = 'Upravljanje vstavkov'; $lang['download'] = 'Prejmi in namesti nov vstavek'; $lang['manage'] = 'Nameščeni vstavki'; @@ -52,3 +51,4 @@ $lang['enabled'] = 'Vstavek %s je omogočen.'; $lang['notenabled'] = 'Vstavka %s ni mogoče omogočiti zaradi neustreznih dovoljen.'; $lang['disabled'] = 'Vstavek %s je onemogočen.'; $lang['notdisabled'] = 'Vstavka %s ni mogoče onemogočiti zaradi neustreznih dovoljen.'; +$lang['packageinstalled'] = 'Paket vstavka (%d vstavkov: %s) je uspešno nameščen.'; diff --git a/lib/plugins/popularity/lang/sl/intro.txt b/lib/plugins/popularity/lang/sl/intro.txt index ceb0e61e6..2c029db63 100644 --- a/lib/plugins/popularity/lang/sl/intro.txt +++ b/lib/plugins/popularity/lang/sl/intro.txt @@ -1,9 +1,9 @@ -====== Poroilo o uporabi ====== +====== Poročilo o uporabi ====== -To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni Dokuwiki strani in omogoa poiljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo naine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statistinimi podatki vpliva tudi na nadaljnji razvoj sistema. +To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni DokuWiki strani in omogoča pošiljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo načine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statističnimi podatki vpliva tudi na nadaljnji razvoj sistema. -Priporoeno je, da poroilo o uporabi poljete vsake toliko asa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spletia in pogostosti uporabe. Vsi podatki so poslani oznaeni s posebno vpisno tevilko, ki omogoa brezimno sledenje. +Priporočeno je, da poročilo o uporabi pošljete vsake toliko časa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spletišča in pogostosti uporabe. Vsi podatki so poslani označeni s posebno vpisno številko, ki omogoča brezimno sledenje. -Zbrani podatki vsebujejo podrobnosti o razliici uporabljenega sistema DokuWiki, tevilo in velikost wiki strani, datotekah, ki so naloene na sistem in podatke o vstavkih ter PHP namestitvi in razliici. +Zbrani podatki vsebujejo podrobnosti o različici uporabljenega sistema DokuWiki, število in velikost wiki strani, datotekah, ki so naložene na sistem in podatke o vstavkih ter PHP namestitvi in različici. -Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Polji podatke", bodo ti poslani na strenik razvijalcev. +Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Pošlji podatke", bodo ti poslani na strežnik razvijalcev. diff --git a/lib/plugins/popularity/lang/sl/submitted.txt b/lib/plugins/popularity/lang/sl/submitted.txt index 988afd837..11ae052f7 100644 --- a/lib/plugins/popularity/lang/sl/submitted.txt +++ b/lib/plugins/popularity/lang/sl/submitted.txt @@ -1,3 +1,3 @@ -====== Poroilo o uporabi ====== +====== Poročilo o uporabi ====== -Podatki so bili uspeno poslani. +Podatki so bili uspešno poslani. diff --git a/lib/plugins/revert/lang/sl/intro.txt b/lib/plugins/revert/lang/sl/intro.txt index c63f281ed..4e2cabf96 100644 --- a/lib/plugins/revert/lang/sl/intro.txt +++ b/lib/plugins/revert/lang/sl/intro.txt @@ -1,3 +1,3 @@ ====== Povrnitev okvarjene vsebine ====== -Na tej strani je mogoe povrniti vsebino wiki strani na izvorne vrednosti po napadu na stran in vpisu neelenih vsebin. Za iskanje strani z neeleno vsebino, uporabite iskalnik z ustreznim nizom (npr. naslov URL), potem pa potrdite, da so najdene strani res z neeleno vsebino in nato povrnite stanje na zadnjo pravo razliico. +Na tej strani je mogoče povrniti vsebino wiki strani na izvorne vrednosti po napadu na stran in vpisu neželenih vsebin. Za iskanje strani z neželeno vsebino, uporabite iskalnik z ustreznim nizom (npr. naslov URL), potem pa potrdite, da so najdene strani res z neželeno vsebino in nato povrnite stanje na zadnjo pravo različico. diff --git a/lib/plugins/usermanager/lang/sl/delete.txt b/lib/plugins/usermanager/lang/sl/delete.txt index 7d9de54e6..1fd4fffe1 100644 --- a/lib/plugins/usermanager/lang/sl/delete.txt +++ b/lib/plugins/usermanager/lang/sl/delete.txt @@ -1 +1 @@ -===== Izbrisanje uporabnika ===== \ No newline at end of file +===== Izbris uporabnika ===== \ No newline at end of file -- cgit v1.2.3 From c7b28ffda48d3e6e225940a74b00ee5011f45b4b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 4 Feb 2012 13:26:50 +0000 Subject: added div.table around non-editable content as well (FS#1980) --- lib/plugins/acl/admin.php | 2 ++ lib/plugins/config/admin.php | 4 ++++ lib/plugins/info/syntax.php | 8 ++++---- lib/plugins/usermanager/admin.php | 4 ++++ 4 files changed, 14 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php index a6b0624bc..c3461b78b 100644 --- a/lib/plugins/acl/admin.php +++ b/lib/plugins/acl/admin.php @@ -597,6 +597,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ''.NL; echo ''.NL; echo ''.NL; + echo '
'; echo ''; echo ''; echo ''; @@ -642,6 +643,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ''; echo ''; echo '
'.$this->getLang('where').'
'; + echo '
'; echo ''.NL; } diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index c883e7b6a..9a9bb5329 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -131,6 +131,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { } ptln('
'); ptln(' '.$setting->prompt($this).''); + ptln('
'); ptln(' '); } else { // config settings @@ -151,6 +152,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { } ptln('
'); + ptln('
'); if ($in_fieldset) { ptln('
'); } @@ -161,6 +163,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { usort($undefined_settings, '_setting_natural_comparison'); $this->_print_h1('undefined_settings', $this->getLang('_header_undefined')); ptln('
'); + ptln('
'); ptln(''); $undefined_setting_match = array(); foreach($undefined_settings as $setting) { @@ -175,6 +178,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { ptln(' '); } ptln('
'); + ptln('
'); ptln('
'); } diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php index 026a438bb..9aedbf0aa 100644 --- a/lib/plugins/info/syntax.php +++ b/lib/plugins/info/syntax.php @@ -174,7 +174,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin { $hid = $this->_addToTOC($title, 3, $renderer); $doc .= '

'.hsc($title).'

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

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

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

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

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

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

+ +

+ +
+ +
+ + +
+

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

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

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

    -
    -- cgit v1.2.3 From 80cc5b3efdcbdce9ccef38b5936973387b37828a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 24 Mar 2012 00:03:08 +0000 Subject: removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950) --- lib/tpl/dokuwiki/css/basic.css | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index e1cd1d9a2..ae9be499e 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -104,7 +104,6 @@ div { ul, ol { padding: 0 0 0 1.5em; - overflow: hidden; } li, dd { -- cgit v1.2.3 From 3ce88cce949483f963c881c3c868bd49c4d989c0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 24 Mar 2012 00:24:47 +0000 Subject: added explanation to todo in _forms.css --- lib/tpl/dokuwiki/css/_forms.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index 39a1ec5d3..0c82f5f8c 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -1,5 +1,5 @@ -/* TODO */ +/* TODO: this file is not up to the best standards and will be fixed after an overhaul of the form code */ /** * This file provides styles for forms in general and specifically -- cgit v1.2.3 From e601443821436ad3b9cd9b8ec9a478a50d77d3e0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 24 Mar 2012 00:32:53 +0000 Subject: wrapped X-UA-Compatible meta tag with conditional comments --- lib/tpl/dokuwiki/detail.php | 2 +- lib/tpl/dokuwiki/main.php | 2 +- lib/tpl/dokuwiki/mediamanager.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 90ae492bd..baa454edc 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -18,7 +18,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show lang="" dir=""> - + <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> [<?php echo strip_tags($conf['title'])?>] diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 44a8d4a19..9bc221711 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -18,7 +18,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> + <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]--> <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>] diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php index d7d88f936..0651b448d 100644 --- a/lib/tpl/dokuwiki/mediamanager.php +++ b/lib/tpl/dokuwiki/mediamanager.php @@ -15,7 +15,7 @@ if (!defined('DOKU_INC')) die(); lang="" dir="" class="popup"> - + <?php echo hsc($lang['mediaselect'])?> [<?php echo strip_tags($conf['title'])?>] -- cgit v1.2.3 From 5e984c56d67aafecf27d7fddd922484a0318c9db Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sat, 24 Mar 2012 11:51:44 +0000 Subject: added accidentally removed '<?php' back in (was in 57fc5edd) --- lib/tpl/dokuwiki/tpl_header.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 9a391aedc..35b3cf636 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -32,6 +32,7 @@ <div id="dokuwiki__usertools"> <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3> <ul> + <?php if ($_SERVER['REMOTE_USER']) { echo '<li class="user">'; tpl_userinfo(); /* 'Logged in as ...' */ -- cgit v1.2.3 From ea62d5316150a9477d962aff311f9c6f64f68db7 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sat, 24 Mar 2012 17:44:25 +0000 Subject: deleted very old (and unused) images --- lib/images/arrow_down.gif | Bin 273 -> 0 bytes lib/images/arrow_up.gif | Bin 274 -> 0 bytes lib/images/at.gif | Bin 57 -> 0 bytes lib/images/close.png | Bin 137 -> 0 bytes lib/images/del.png | Bin 355 -> 0 bytes lib/images/edit.gif | Bin 142 -> 0 bytes lib/images/icon-file.png | Bin 3363 -> 0 bytes lib/images/icon-thumb.png | Bin 969 -> 0 bytes lib/images/list-minus.gif | Bin 64 -> 0 bytes lib/images/list-plus.gif | Bin 67 -> 0 bytes lib/images/pencil.png | Bin 391 -> 0 bytes 11 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 lib/images/arrow_down.gif delete mode 100644 lib/images/arrow_up.gif delete mode 100644 lib/images/at.gif delete mode 100644 lib/images/close.png delete mode 100644 lib/images/del.png delete mode 100644 lib/images/edit.gif delete mode 100644 lib/images/icon-file.png delete mode 100644 lib/images/icon-thumb.png delete mode 100644 lib/images/list-minus.gif delete mode 100644 lib/images/list-plus.gif delete mode 100644 lib/images/pencil.png (limited to 'lib') diff --git a/lib/images/arrow_down.gif b/lib/images/arrow_down.gif deleted file mode 100644 index ff13b9585..000000000 Binary files a/lib/images/arrow_down.gif and /dev/null differ diff --git a/lib/images/arrow_up.gif b/lib/images/arrow_up.gif deleted file mode 100644 index d491c18db..000000000 Binary files a/lib/images/arrow_up.gif and /dev/null differ diff --git a/lib/images/at.gif b/lib/images/at.gif deleted file mode 100644 index 8bdf40d54..000000000 Binary files a/lib/images/at.gif and /dev/null differ diff --git a/lib/images/close.png b/lib/images/close.png deleted file mode 100644 index 4ccef0603..000000000 Binary files a/lib/images/close.png and /dev/null differ diff --git a/lib/images/del.png b/lib/images/del.png deleted file mode 100644 index e59ded55f..000000000 Binary files a/lib/images/del.png and /dev/null differ diff --git a/lib/images/edit.gif b/lib/images/edit.gif deleted file mode 100644 index a2a23de7b..000000000 Binary files a/lib/images/edit.gif and /dev/null differ diff --git a/lib/images/icon-file.png b/lib/images/icon-file.png deleted file mode 100644 index d350c8c31..000000000 Binary files a/lib/images/icon-file.png and /dev/null differ diff --git a/lib/images/icon-thumb.png b/lib/images/icon-thumb.png deleted file mode 100644 index ccc7a101d..000000000 Binary files a/lib/images/icon-thumb.png and /dev/null differ diff --git a/lib/images/list-minus.gif b/lib/images/list-minus.gif deleted file mode 100644 index 36902f159..000000000 Binary files a/lib/images/list-minus.gif and /dev/null differ diff --git a/lib/images/list-plus.gif b/lib/images/list-plus.gif deleted file mode 100644 index adc3fac8a..000000000 Binary files a/lib/images/list-plus.gif and /dev/null differ diff --git a/lib/images/pencil.png b/lib/images/pencil.png deleted file mode 100644 index 78142b61e..000000000 Binary files a/lib/images/pencil.png and /dev/null differ -- cgit v1.2.3 From 42ff673048d169bcbec5e4bb17619d66e6f6f61d Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sun, 25 Mar 2012 14:41:39 +0100 Subject: fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447) * removed all occurrences of '-moz-linear-gradient' * added SVG as fallback for Firefox, IE9 and other browsers to page background and buttons --- lib/tpl/dokuwiki/css/basic.css | 13 ++++++++----- lib/tpl/dokuwiki/css/content.css | 2 +- lib/tpl/dokuwiki/images/page-background.svg | 8 ++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 lib/tpl/dokuwiki/images/page-background.svg (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index ae9be499e..dce632b9a 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -16,7 +16,8 @@ html, body { color: __text__; background-color: __background_site__; - background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: url(images/page-background.svg); + /*background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); see FS#2447*/ background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); background-image: -o-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); background-image: -ms-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); @@ -333,7 +334,8 @@ button, .qq-upload-button { color: #333; background-color: #eee; - background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+); + /*background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); see FS#2447*/ background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); @@ -359,10 +361,11 @@ button:focus, .qq-upload-button:hover { border-color: #999; background-color: #ddd; - background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+); + /*background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); see FS#2447*/ background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); - background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); - background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); + background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); + background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); } diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css index ca2294950..7cb7c6edf 100644 --- a/lib/tpl/dokuwiki/css/content.css +++ b/lib/tpl/dokuwiki/css/content.css @@ -119,7 +119,7 @@ .dokuwiki dl.code dt, .dokuwiki dl.file dt { background-color: __background_alt__; - background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); + /*background: -moz-linear-gradient( top, __background__ 0%, __background_alt__ 100%); see FS#2447 */ background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%); background: -o-linear-gradient( top, __background__ 0%, __background_alt__ 100%); background: -ms-linear-gradient( top, __background__ 0%, __background_alt__ 100%); diff --git a/lib/tpl/dokuwiki/images/page-background.svg b/lib/tpl/dokuwiki/images/page-background.svg new file mode 100644 index 000000000..086341ddf --- /dev/null +++ b/lib/tpl/dokuwiki/images/page-background.svg @@ -0,0 +1,8 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%"> + <linearGradient id="g" x1="0%" y1="0%" x2="0%" y2="100%"> + <stop offset="0" stop-color="#dddddd" /> + <stop offset="0.1" stop-color="#eeeeee" /> + <stop offset="0.4" stop-color="#fbfaf9" /> + </linearGradient> + <rect x="0" y="0" width="100%" height="100%" fill="url(#g)" /> +</svg> \ No newline at end of file -- cgit v1.2.3 From 9d421a3d3c1411a47d49f43cfc1f798f6a96ab8c Mon Sep 17 00:00:00 2001 From: Erial Krale <erial2@gmail.com> Date: Mon, 26 Mar 2012 20:44:07 +0200 Subject: Korean language update --- lib/plugins/config/lang/ko/lang.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php index 55207a37a..82863b684 100644 --- a/lib/plugins/config/lang/ko/lang.php +++ b/lib/plugins/config/lang/ko/lang.php @@ -95,6 +95,8 @@ $lang['sneaky_index'] = '기본적으로, DokuWiki는 색인 목록에 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.'; $lang['auth_security_timeout'] = '인증 보안 초과 시간(초)'; $lang['securecookie'] = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화 하고 위키 페이지는 그렇지 않은경우 꺼야 합니다.'; +$lang['xmlrpc'] = 'XML-RPC 인터페이스 지원/무시'; +$lang['xmlrpcuser'] = '주어진 그룹이나 유저들에게만 XML-RPC접근을 허락하려면 컴마로 구분하여 적으세요. 비어두면 모두에게 허용됩니다.'; $lang['updatecheck'] = '업데이트와 보안 문제를 검사(DokuWiki를 update.dokuwiki.org에 연결해야 합니다.)'; $lang['userewrite'] = 'URL rewriting기능 사용'; $lang['useslash'] = 'URL에서 네임스페이스 구분자로 슬래쉬 문자 사용'; @@ -135,6 +137,7 @@ $lang['rss_content'] = 'XML feed 항목들에 표시되는 내용은?' $lang['rss_update'] = 'XML feed 갱신 주기(초)'; $lang['recent_days'] = '최근 바뀐 페이지 기준 시간(날짜)'; $lang['rss_show_summary'] = 'XML feed 제목에서 요약정보 보여주기'; +$lang['rss_media'] = '어떤 규격으로 XML 피드를 받아보시겠습니까?'; $lang['target____wiki'] = '내부 링크들에 대한 타겟 윈도우 '; $lang['target____interwiki'] = 'InterWiki 링크들에 대한 타겟 윈도우'; $lang['target____extern'] = '외부 링크들에 대한 타겟 윈도우'; -- cgit v1.2.3 From 51b120f658e9d28fa503e2adf78771e1abfc4d35 Mon Sep 17 00:00:00 2001 From: Kiril LastName <neohidra@gmail.com> Date: Tue, 3 Apr 2012 22:58:41 +0300 Subject: BG: language update --- lib/plugins/config/lang/bg/lang.php | 74 +++++++++++++++++++++++++++++++++---- 1 file changed, 66 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/bg/lang.php b/lib/plugins/config/lang/bg/lang.php index 25f1da91a..0bc25a8e5 100644 --- a/lib/plugins/config/lang/bg/lang.php +++ b/lib/plugins/config/lang/bg/lang.php @@ -7,19 +7,28 @@ * @author Viktor Usunov <usun0v@mail.bg> * @author Kiril <neohidra@gmail.com> */ + +// for admin plugins, the menu prompt to be displayed in the admin menu +// if set here, the plugin doesn't need to override the getMenuText() method $lang['menu'] = 'Настройки'; + $lang['error'] = 'Обновяването на настройките не е възможно, поради невалидна стойност, моля, прегледайте промените си и пробвайте отново. -<br />Неверните стойности ще бъдат обградени с червена рамка.'; + <br />Неверните стойности ще бъдат обградени с червена рамка.'; $lang['updated'] = 'Обновяването на настройките е успешно.'; $lang['nochoice'] = '(няма друг възможен избор)'; -$lang['locked'] = 'Обновяването на файла с настройките не е възможно, ако това не е нарочно, проверете,<br /> дали името на локалния файл с настройки и правата са верни.'; -$lang['danger'] = 'Внимание: промяна на опцията може да направи wiki-то и менюто за настройване недостъпни.'; +$lang['locked'] = 'Обновяването на файла с настройките не е възможно, ако това не е нарочно, проверете,<br /> + дали името на локалния файл с настройки и правата са верни.'; +$lang['danger'] = 'Внимание: промяна на опцията може да направи Wiki-то и менюто за настройване недостъпни.'; $lang['warning'] = 'Предупреждение: промяна на опцията може предизвика нежелани последици.'; $lang['security'] = 'Предупреждение: промяна на опцията може да представлява риск за сигурността.'; -$lang['_configuration_manager'] = 'Диспечер на настройките'; + +/* --- Config Setting Headers --- */ +$lang['_configuration_manager'] = 'Диспечер на настройките'; //same as heading in intro.txt $lang['_header_dokuwiki'] = 'Настройки на DokuWiki'; $lang['_header_plugin'] = 'Настройки на приставки'; $lang['_header_template'] = 'Настройки на шаблони'; + +/* --- Config Setting Groups --- */ $lang['_header_undefined'] = 'Неопределени настройки'; $lang['_basic'] = 'Основни настройки'; $lang['_display'] = 'Настройки за изобразяване'; @@ -30,11 +39,20 @@ $lang['_links'] = 'Настройки на препратките $lang['_media'] = 'Настройки на медията'; $lang['_advanced'] = 'Допълнителни настройки'; $lang['_network'] = 'Мрежови настройки'; +// The settings group name for plugins and templates can be set with +// plugin_settings_name and template_settings_name respectively. If one +// of these lang properties is not set, the group name will be generated +// from the plugin or template name and the localized suffix. $lang['_plugin_sufix'] = ' - настройки на приставката'; $lang['_template_sufix'] = ' - настройки на шаблона'; + +/* --- Undefined Setting Messages --- */ $lang['_msg_setting_undefined'] = 'Няма метаданни за настройките.'; $lang['_msg_setting_no_class'] = 'Няма клас настройки.'; $lang['_msg_setting_no_default'] = 'Няма стандартна стойност.'; + +/* -------------------- Config Options --------------------------- */ + $lang['fmode'] = 'Режим (права) за създаване на файлове'; $lang['dmode'] = 'Режим (права) за създаване на директории'; $lang['lang'] = 'Език'; @@ -45,6 +63,8 @@ $lang['cookiedir'] = 'Път за бисквитките. Остав $lang['start'] = 'Име на началната страница'; $lang['title'] = 'Име на Wiki-то'; $lang['template'] = 'Шаблон'; +$lang['tagline'] = 'Подзаглавие - изобразява се под името на Wiki страницата (ако се поддържа от шаблона)'; +$lang['sidebar'] = 'Име на страницата за страничната лента (ако се поддържа от шаблона). Ако оставите полето празно лентата ще бъде изключена'; $lang['license'] = 'Под какъв лиценз да бъде публикувано съдържанието?'; $lang['fullpath'] = 'Показване на пълния път до страниците в долния колонтитул.'; $lang['recent'] = 'Скорошни промени'; @@ -66,12 +86,15 @@ $lang['refcheck'] = 'Проверка за препратка къ $lang['refshow'] = 'Брой на показваните медийни препратки'; $lang['allowdebug'] = 'Включване на режи debug - <b>изключете, ако не е нужен!</b>'; $lang['mediarevisions'] = 'Да се пазят ли стари версии на качените файлове (Mediarevisions)?'; + $lang['usewordblock'] = 'Блокиране на SPAM въз основа на на списък от думи'; $lang['indexdelay'] = 'Забавяне преди индексиране (сек)'; $lang['relnofollow'] = 'Ползване на rel="nofollow" за външни препратки'; $lang['mailguard'] = 'Промяна на адресите на ел. поща (във форма непозволяваща пращането на SPAM)'; $lang['iexssprotect'] = 'Проверяване на качените файлове за вероятен зловреден JavaScript и HTML код'; $lang['showuseras'] = 'Какво да се показва за потребителя, който последно е променил страницата'; + +/* Authentication Options */ $lang['useacl'] = 'Ползване на списъци за достъп'; $lang['autopasswd'] = 'Автоматично генериране на пароли, на нови потребители и пращане по пощата'; $lang['authtype'] = 'Метод за удостоверяване'; @@ -87,8 +110,11 @@ $lang['disableactions_wikicode'] = 'Преглед на кода/Експорт $lang['disableactions_other'] = 'Други действия (разделени със запетая)'; $lang['sneaky_index'] = 'Стандартно DokuWiki ще показва всички именни пространства в индекса. Опцията скрива тези, за които потребителят няма права за четене. Това може да доведе и до скриване на иначе достъпни подименни пространства. С определени настройки на списъците за контрол на достъпа (ACL) може да направи индекса неизползваем. '; $lang['auth_security_timeout'] = 'Автоматично проверяване на удостоверяването всеки (сек)'; -$lang['securecookie'] = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL. -'; +$lang['securecookie'] = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL.'; +$lang['remote'] = 'Включване на системата за отдалечен API достъп. Това ще позволи на приложения да се свързват с DokuWiki чрез XML-RPC или друг механизъм.'; +$lang['remoteuser'] = 'Ограничаване на отдалечения API достъп - активиране само за следните групи и потребители (отделени със запетая). Ако оставите полето празно всеки ще има достъп достъп.'; + +/* Advanced Options */ $lang['updatecheck'] = 'Проверяване за за нови версии и предупреждения за сигурността? Необходимо е Dokiwiki да може да се свързва със update.dokuwiki.org за тази функционалност.'; $lang['userewrite'] = 'Ползване на nice URL адреси'; $lang['useslash'] = 'Ползване на наклонена черта за разделител на именните пространства в URL'; @@ -118,72 +144,104 @@ $lang['send404'] = 'Пращане на "HTTP 404/Page Not Found" $lang['sitemap'] = 'Генериране на Google sitemap (дни)'; $lang['broken_iua'] = 'Отметнете, ако ignore_user_abort функцията не работи. Може да попречи на търсенето в страниците. Знае се, че комбинацията IIS+PHP/CGI е лоша. Вижте <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Грешка 852</a> за повече информация.'; $lang['xsendfile'] = 'Ползване на Х-Sendfile header, за да може уебсървъра да дава статични файлове? Вашият уебсървър трябва да го поддържа.'; -$lang['renderer_xhtml'] = 'Представяне на основните изходни данни (xhtml) от wiki-то с'; +$lang['renderer_xhtml'] = 'Представяне на основните изходни данни (xhtml) от Wiki-то с'; $lang['renderer__core'] = '%s (ядрото на DokuWiki)'; $lang['renderer__plugin'] = '%s (приставка)'; $lang['rememberme'] = 'Ползване на постоянни бисквитки за вписване (за функцията "Запомни ме")'; + $lang['rss_type'] = 'Тип на XML емисията'; $lang['rss_linkto'] = 'XML емисията препраща към'; $lang['rss_content'] = 'Какво да показват елементите на XML емисията?'; $lang['rss_update'] = 'Интервал на актуализиране на XML емисията (сек)'; $lang['recent_days'] = 'Колко от скорошните промени да се пазят (дни)'; $lang['rss_show_summary'] = 'Показване на обобщение в заглавието на XML емисията'; +$lang['rss_media'] = 'Кой тип промени да се включват в XML мисията?'; + +/* Target options */ $lang['target____wiki'] = 'Прозорец за вътрешни препратки'; -$lang['target____interwiki'] = 'Прозорец за препратки в wiki-то'; +$lang['target____interwiki'] = 'Прозорец за препратки към други Wiki сайтове'; $lang['target____extern'] = 'Прозорец за външни препратки'; $lang['target____media'] = 'Прозорец за медийни препратки'; $lang['target____windows'] = 'Прозорец за препратки към Windows'; + +/* Proxy Options */ $lang['proxy____host'] = 'Име на прокси сървър'; $lang['proxy____port'] = 'Порт за проксито'; $lang['proxy____user'] = 'Потребител за проксито'; $lang['proxy____pass'] = 'Парола за проксито'; $lang['proxy____ssl'] = 'Ползване на SSL при свързване с проксито'; $lang['proxy____except'] = 'Регулярен израз определящ за кои URL адреси да не се ползва прокси сървър.'; + +/* Safemode Hack */ $lang['safemodehack'] = 'Ползване на хака safemode'; $lang['ftp____host'] = 'FTP сървър за хака safemode'; $lang['ftp____port'] = 'FTP порт за хака safemode'; $lang['ftp____user'] = 'FTP потребител за хака safemode'; $lang['ftp____pass'] = 'FTP парола за хака safemode'; $lang['ftp____root'] = 'FTP главна директория за хака safemode'; + $lang['license_o_'] = 'Нищо не е избрано'; + +/* typography options */ $lang['typography_o_0'] = 'без'; $lang['typography_o_1'] = 'с изключение на единични кавички'; $lang['typography_o_2'] = 'включително единични кавички (не винаги работи)'; + +/* userewrite options */ $lang['userewrite_o_0'] = 'без'; $lang['userewrite_o_1'] = 'файлът .htaccess'; $lang['userewrite_o_2'] = 'вътрешно от DokuWiki '; + +/* deaccent options */ $lang['deaccent_o_0'] = 'изключено'; $lang['deaccent_o_1'] = 'премахване на акценти'; $lang['deaccent_o_2'] = 'транслитерация'; + +/* gdlib options */ $lang['gdlib_o_0'] = 'GD Lib не е достъпна'; $lang['gdlib_o_1'] = 'Версия 1.x'; $lang['gdlib_o_2'] = 'Автоматично разпознаване'; + +/* rss_type options */ $lang['rss_type_o_rss'] = 'RSS версия 0.91'; $lang['rss_type_o_rss1'] = 'RSS версия 1.0'; $lang['rss_type_o_rss2'] = 'RSS версия 2.0'; $lang['rss_type_o_atom'] = 'Atom версия 0.3'; $lang['rss_type_o_atom1'] = 'Atom версия 1.0'; + +/* rss_content options */ $lang['rss_content_o_abstract'] = 'Извлечение'; $lang['rss_content_o_diff'] = 'Обединени разлики'; $lang['rss_content_o_htmldiff'] = 'Таблица с разликите в HTML формат'; $lang['rss_content_o_html'] = 'Цялото съдържание на HTML страницата'; + +/* rss_linkto options */ $lang['rss_linkto_o_diff'] = 'изглед на разликите'; $lang['rss_linkto_o_page'] = 'променената страница'; $lang['rss_linkto_o_rev'] = 'списък на версиите'; $lang['rss_linkto_o_current'] = 'текущата страница'; + +/* compression options */ $lang['compression_o_0'] = 'без'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; + +/* xsendfile header */ $lang['xsendfile_o_0'] = 'не използвайте'; $lang['xsendfile_o_1'] = 'Специфичен lighttpd header (преди версия 1.5)'; $lang['xsendfile_o_2'] = 'Стандартен X-Sendfile header'; $lang['xsendfile_o_3'] = 'Специфичен Nginx X-Accel-Redirect header за пренасочване'; + +/* Display user info */ $lang['showuseras_o_loginname'] = 'Име за вписване'; $lang['showuseras_o_username'] = 'Пълно потребителско име'; $lang['showuseras_o_email'] = 'Ел, поща (променени според настройките на mailguard)'; $lang['showuseras_o_email_link'] = 'Ел. поща под формата на връзка тип mailto:'; + +/* useheading options */ $lang['useheading_o_0'] = 'Никога'; $lang['useheading_o_navigation'] = 'Само за навигация'; $lang['useheading_o_content'] = 'Само за съдържанието на Wiki-то'; $lang['useheading_o_1'] = 'Винаги'; + $lang['readdircache'] = 'Максимален период за съхраняване кеша на readdir (сек)'; -- cgit v1.2.3 From e5d4768d27336a3af2fc36af663d21a1a57d0ee1 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sat, 7 Apr 2012 20:20:22 +0200 Subject: added tpl_includeFile() to core --- lib/tpl/dokuwiki/detail.php | 7 +++---- lib/tpl/dokuwiki/main.php | 11 +++++------ lib/tpl/dokuwiki/mediamanager.php | 3 +-- lib/tpl/dokuwiki/tpl_footer.php | 2 +- lib/tpl/dokuwiki/tpl_header.php | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index baa454edc..a3516a7ed 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -9,7 +9,6 @@ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" @@ -26,7 +25,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php tpl_metaheaders()?> <meta name="viewport" content="width=device-width,initial-scale=1" /> <?php echo tpl_favicon(array('favicon', 'mobile')) ?> - <?php _tpl_include('meta.html') ?> + <?php tpl_includeFile('meta.html') ?> </head> <body> @@ -47,7 +46,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <div class="page group"> <?php tpl_flush() ?> - <?php _tpl_include('pageheader.html') ?> + <?php tpl_includeFile('pageheader.html') ?> <!-- detail start --> <?php if($ERROR): @@ -95,7 +94,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php endif; ?> </div> <!-- detail stop --> - <?php _tpl_include('pagefooter.html') ?> + <?php tpl_includeFile('pagefooter.html') ?> <?php tpl_flush() ?> <?php /* doesn't make sense like this; @todo: maybe add tpl_imginfo()? diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 9bc221711..57c94f174 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -9,7 +9,6 @@ */ if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" @@ -23,7 +22,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <?php tpl_metaheaders() ?> <meta name="viewport" content="width=device-width,initial-scale=1" /> <?php echo tpl_favicon(array('favicon', 'mobile')) ?> - <?php _tpl_include('meta.html') ?> + <?php tpl_includeFile('meta.html') ?> </head> <body> @@ -39,9 +38,9 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <!-- ********** ASIDE ********** --> <div id="dokuwiki__aside"><div class="pad include group"> <?php tpl_flush() ?> - <?php _tpl_include('sidebarheader.html') ?> + <?php tpl_includeFile('sidebarheader.html') ?> <?php tpl_include_page($conf['sidebar']) ?> - <?php _tpl_include('sidebarfooter.html') ?> + <?php tpl_includeFile('sidebarfooter.html') ?> </div></div><!-- /aside --> <?php endif; ?> @@ -52,11 +51,11 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show <div class="page group"> <?php tpl_flush() ?> - <?php _tpl_include('pageheader.html') ?> + <?php tpl_includeFile('pageheader.html') ?> <!-- wikipage start --> <?php tpl_content() ?> <!-- wikipage stop --> - <?php _tpl_include('pagefooter.html') ?> + <?php tpl_includeFile('pagefooter.html') ?> </div> <div class="docInfo"><?php tpl_pageinfo() ?></div> diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php index 0651b448d..1f3b9661b 100644 --- a/lib/tpl/dokuwiki/mediamanager.php +++ b/lib/tpl/dokuwiki/mediamanager.php @@ -7,7 +7,6 @@ */ // must be run from within DokuWiki if (!defined('DOKU_INC')) die(); -@require_once(dirname(__FILE__).'/tpl_functions.php'); /* include hook for template functions */ ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -23,7 +22,7 @@ if (!defined('DOKU_INC')) die(); <?php tpl_metaheaders()?> <meta name="viewport" content="width=device-width,initial-scale=1" /> <?php echo tpl_favicon(array('favicon', 'mobile')) ?> - <?php _tpl_include('meta.html') ?> + <?php tpl_includeFile('meta.html') ?> </head> <body> diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php index 6b46234d6..41ddabda2 100644 --- a/lib/tpl/dokuwiki/tpl_footer.php +++ b/lib/tpl/dokuwiki/tpl_footer.php @@ -20,4 +20,4 @@ </div> </div></div><!-- /footer --> -<?php _tpl_include('footer.html') ?> +<?php tpl_includeFile('footer.html') ?> diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 35b3cf636..1d2517ee1 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -2,7 +2,7 @@ <div id="dokuwiki__header"><div class="pad group"> <?php html_msgarea() ?> - <?php _tpl_include('header.html') ?> + <?php tpl_includeFile('header.html') ?> <div class="headings group"> <ul class="a11y skip"> -- cgit v1.2.3 From 0bf9967d124e9bd2b91b4f580ac99e1e981e36b9 Mon Sep 17 00:00:00 2001 From: Andreas Gohr <andi@splitbrain.org> Date: Sat, 7 Apr 2012 20:21:06 +0200 Subject: removed obsolete template file --- lib/tpl/dokuwiki/tpl_functions.php | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 lib/tpl/dokuwiki/tpl_functions.php (limited to 'lib') diff --git a/lib/tpl/dokuwiki/tpl_functions.php b/lib/tpl/dokuwiki/tpl_functions.php deleted file mode 100644 index c024f33e7..000000000 --- a/lib/tpl/dokuwiki/tpl_functions.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php -/** - * Template Functions - * - * This file provides template specific custom functions that are - * not provided by the DokuWiki core. - * It is common practice to start each function with an underscore - * to make sure it won't interfere with future core functions. - */ - -// must be run from within DokuWiki -if (!defined('DOKU_INC')) die(); - -/* @todo: add this function to the core and delete this file */ - -/** - * Include additional html file from conf directory if it exists, otherwise use - * file in the template's root directory. - * - * @author Anika Henke <anika@selfthinker.org> - */ -function _tpl_include($fn) { - $confFile = DOKU_CONF.$fn; - $tplFile = dirname(__FILE__).'/'.$fn; - - if (file_exists($confFile)) - include($confFile); - else if (file_exists($tplFile)) - include($tplFile); -} -- cgit v1.2.3 From dbd59867496d5e3c5d37e9c3852db29a6a2370c4 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sat, 7 Apr 2012 22:24:18 +0100 Subject: removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary --- lib/tpl/dokuwiki/css/basic.css | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index dce632b9a..c8e0c435e 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -17,11 +17,7 @@ body { color: __text__; background-color: __background_site__; background-image: url(images/page-background.svg); - /*background-image: -moz-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); see FS#2447*/ - background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: -o-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: -ms-linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); - background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); + background-image: linear-gradient( top, __background_neu__ 0%, __background_alt__ 1em, __background_site__ 4em); background-size: 1px 10em; background-repeat: repeat-x; margin: 0; @@ -335,11 +331,7 @@ button, color: #333; background-color: #eee; background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+); - /*background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); see FS#2447*/ - background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); + background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); border: 1px solid #ccc; border-radius: 2px; padding: .1em .5em; @@ -361,12 +353,8 @@ button:focus, .qq-upload-button:hover { border-color: #999; background-color: #ddd; - background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+); - /*background: -moz-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #cccccc 99%); see FS#2447*/ - background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); - background: -o-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); - background: -ms-linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); - background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+); + background: linear-gradient( top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%); } input::-moz-focus-inner, -- cgit v1.2.3 From 79504989f948613597d5516c9b31ba7e1529a303 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 19:49:03 +0100 Subject: moved plugins' rtl.css to their style.css counterpart (part of FS#2185) --- lib/plugins/acl/rtl.css | 40 ---------------------------------- lib/plugins/acl/style.css | 31 +++++++++++++++++++++++++++ lib/plugins/config/rtl.css | 45 -------------------------------------- lib/plugins/config/style.css | 36 +++++++++++++++++++++++++++++++ lib/plugins/plugin/rtl.css | 51 -------------------------------------------- lib/plugins/plugin/style.css | 39 +++++++++++++++++++++++++++++++++ 6 files changed, 106 insertions(+), 136 deletions(-) delete mode 100644 lib/plugins/acl/rtl.css delete mode 100644 lib/plugins/config/rtl.css delete mode 100644 lib/plugins/plugin/rtl.css (limited to 'lib') diff --git a/lib/plugins/acl/rtl.css b/lib/plugins/acl/rtl.css deleted file mode 100644 index e79abe596..000000000 --- a/lib/plugins/acl/rtl.css +++ /dev/null @@ -1,40 +0,0 @@ -div#acl_manager div#acl__tree { - float: right; - text-align: right; -} - -div#acl_manager div#acl__tree li { - padding-left: 0em; - padding-right: 1em; -} - -div#acl_manager div#acl__tree ul img { - margin-left: 0.25em; - margin-right: 0em; -} - - -div#acl_manager div#acl__detail { - float: left; -} - -div#acl_manager .aclgroup { - background: transparent url(pix/group.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .acluser { - background: transparent url(pix/user.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .aclpage { - background: transparent url(pix/page.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - -div#acl_manager .aclns { - background: transparent url(pix/ns.png) right 1px no-repeat; - padding: 1px 18px 1px 0px; -} - diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css index b7154aa78..2eee4f41c 100644 --- a/lib/plugins/acl/style.css +++ b/lib/plugins/acl/style.css @@ -8,6 +8,10 @@ div#acl_manager div#acl__tree { border: 1px solid __border__; text-align: left; } +[dir=rtl] div#acl_manager div#acl__tree { + float: right; + text-align: right; +} div#acl_manager div#acl__tree a.cur { background-color: __highlight__; @@ -24,11 +28,19 @@ div#acl_manager div#acl__tree li { padding-left: 1em; list-style-image: none; } +[dir=rtl] div#acl_manager div#acl__tree li { + padding-left: 0em; + padding-right: 1em; +} div#acl_manager div#acl__tree ul img { margin-right: 0.25em; cursor: pointer; } +[dir=rtl] div#acl_manager div#acl__tree ul img { + margin-left: 0.25em; + margin-right: 0em; +} div#acl_manager div#acl__detail { width: 73%; @@ -36,6 +48,9 @@ div#acl_manager div#acl__detail { float: right; overflow: auto; } +[dir=rtl] div#acl_manager div#acl__detail { + float: left; +} div#acl_manager div#acl__detail fieldset { width: 90%; @@ -56,21 +71,37 @@ div#acl_manager .aclgroup { background: transparent url(pix/group.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclgroup { + background: transparent url(pix/group.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .acluser { background: transparent url(pix/user.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .acluser { + background: transparent url(pix/user.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .aclpage { background: transparent url(pix/page.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclpage { + background: transparent url(pix/page.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager .aclns { background: transparent url(pix/ns.png) 0px 1px no-repeat; padding: 1px 0px 1px 18px; } +[dir=rtl] div#acl_manager .aclns { + background: transparent url(pix/ns.png) right 1px no-repeat; + padding: 1px 18px 1px 0px; +} div#acl_manager label.disabled { color: __text_neu__!important; diff --git a/lib/plugins/config/rtl.css b/lib/plugins/config/rtl.css deleted file mode 100644 index b8b9660e2..000000000 --- a/lib/plugins/config/rtl.css +++ /dev/null @@ -1,45 +0,0 @@ -#config__manager fieldset { - clear: both; -} - -#config__manager fieldset td { - text-align: right; -} - -#config__manager label { - text-align: right; -} - -#config__manager td.value input.checkbox { - float: right; - padding-left: 0; - padding-right: 0.7em; -} - -#config__manager td.value label { - float: left; -} - -#config__manager td.label { - padding: 0.8em 1em 0.6em 0; -} - -#config__manager td.label span.outkey { - float: right; - margin-right: 1em; -} - -#config__manager td.label label { - clear: right; -} - -#config__manager td.label img { - float: left; -} - -#config__manager .selection { - width: 14.8em; - float: right; - margin: 0 0 2px 0.3em; -} - diff --git a/lib/plugins/config/style.css b/lib/plugins/config/style.css index 65c44a758..1be94feb9 100644 --- a/lib/plugins/config/style.css +++ b/lib/plugins/config/style.css @@ -15,6 +15,9 @@ color: __text__; padding: 0 1em; } +[dir=rtl] #config__manager fieldset { + clear: both; +} #config__manager legend { font-size: 1.25em; } @@ -28,25 +31,49 @@ #config__manager fieldset td { text-align: left; } +[dir=rtl] #config__manager fieldset td { + text-align: right; +} #config__manager fieldset td.value { /* fixed data column width */ width: 31em; } +[dir=rtl] #config__manager label { + text-align: right; +} +[dir=rtl] #config__manager td.value input.checkbox { + float: right; + padding-left: 0; + padding-right: 0.7em; +} +[dir=rtl] #config__manager td.value label { + float: left; +} + #config__manager td.label { padding: 0.8em 0 0.6em 1em; vertical-align: top; } +[dir=rtl] #config__manager td.label { + padding: 0.8em 1em 0.6em 0; +} #config__manager td.label label { clear: left; display: block; } +[dir=rtl] #config__manager td.label label { + clear: right; +} #config__manager td.label img { padding: 0 10px; vertical-align: middle; float: right; } +[dir=rtl] #config__manager td.label img { + float: left; +} #config__manager td.label span.outkey { font-size: 70%; @@ -60,6 +87,10 @@ position: relative; z-index: 1; } +[dir=rtl] #config__manager td.label span.outkey { + float: right; + margin-right: 1em; +} #config__manager td input.edit { width: 30em; @@ -106,6 +137,11 @@ float: left; margin: 0 0.3em 2px 0; } +[dir=rtl] #config__manager .selection { + width: 14.8em; + float: right; + margin: 0 0 2px 0.3em; +} #config__manager .selection label { float: right; diff --git a/lib/plugins/plugin/rtl.css b/lib/plugins/plugin/rtl.css deleted file mode 100644 index 6ababd8e0..000000000 --- a/lib/plugins/plugin/rtl.css +++ /dev/null @@ -1,51 +0,0 @@ - -#plugin__manager .pm_menu, -#plugin__manager .pm_info, -#plugin__manager p, -#plugin__manager label { - text-align: right; -} - -#plugin__manager .pm_menu { - float: right; -} - -#plugin__manager .pm_info { - float: left; -} - -#plugin__manager .pm_info dt { - float: right; - clear: right; -} - -#plugin__manager .pm_info dd { - margin: 0 7em 0 0; -} - -#plugin__manager .common fieldset { - text-align: right; -} - - -#plugin__manager .plugins .legend { - text-align: right; - float: right; -} - -#plugin__manager .plugins .enable { - float: right; - margin-right: 0; - margin-left: 0.5em; -} - -#plugin__manager .plugins .button { - float: left; - margin-right: 0.5em; -} - - -#plugin__manager .plugins fieldset.buttons .button { - float: right; -} - diff --git a/lib/plugins/plugin/style.css b/lib/plugins/plugin/style.css index de6cca579..9433e6001 100644 --- a/lib/plugins/plugin/style.css +++ b/lib/plugins/plugin/style.css @@ -52,15 +52,28 @@ text-align: left; } +[dir=rtl] #plugin__manager .pm_menu, +[dir=rtl] #plugin__manager .pm_info, +[dir=rtl] #plugin__manager p, +[dir=rtl] #plugin__manager label { + text-align: right; +} + #plugin__manager .pm_menu { float: left; width: 48%; } +[dir=rtl] #plugin__manager .pm_menu { + float: right; +} #plugin__manager .pm_info { float: right; width: 50%; } +[dir=rtl] #plugin__manager .pm_info { + float: left; +} #plugin__manager .common fieldset { margin: 0; @@ -68,6 +81,9 @@ text-align: left; border: none; } +[dir=rtl] #plugin__manager .common fieldset { + text-align: right; +} #plugin__manager .common label { padding: 0 0 0.5em 0; @@ -111,6 +127,10 @@ padding: 0; clear: none; } +[dir=rtl] #plugin__manager .plugins .legend { + text-align: right; + float: right; +} #plugin__manager .plugins .button { font-size: 95%; @@ -123,6 +143,13 @@ #plugin__manager .plugins fieldset.buttons .button { float: left; } +[dir=rtl] #plugin__manager .plugins .button { + float: left; + margin-right: 0.5em; +} +[dir=rtl] #plugin__manager .plugins fieldset.buttons .button { + float: right; +} #plugin__manager .pm_info h3 { margin-left: 0; @@ -140,17 +167,29 @@ margin: 0; padding: 0; } +[dir=rtl] #plugin__manager .pm_info dt { + float: right; + clear: right; +} #plugin__manager .pm_info dd { margin: 0 0 0 7em; padding: 0; background: none; } +[dir=rtl] #plugin__manager .pm_info dd { + margin: 0 7em 0 0; +} #plugin__manager .plugins .enable { float: left; width: auto; margin-right: 0.5em; } +[dir=rtl] #plugin__manager .plugins .enable { + float: right; + margin-right: 0; + margin-left: 0.5em; +} /* end admin plugin styles */ -- cgit v1.2.3 From 47260a57d569ff440e40a675d0afde195befbfcd Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 19:52:06 +0100 Subject: added minimal RTL print styles (part of FS#2185) --- lib/tpl/dokuwiki/css/print.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index f4f81d741..58b8a5f0d 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -137,6 +137,9 @@ div.clearer { border: solid #ccc; border-width: 0 0 0 2pt; } +[dir=rtl] .dokuwiki blockquote { + border-width: 0 2pt 0 0; +} /* tables */ .dokuwiki table { @@ -153,6 +156,10 @@ div.clearer { border: 1pt solid #666; text-align: left; } +[dir=rtl] .dokuwiki th, +[dir=rtl] .dokuwiki td { + text-align: right; +} .dokuwiki th { font-weight: bold; } @@ -173,6 +180,11 @@ div.clearer { float: left; margin-right: .5em; } +[dir=rtl] #dokuwiki__header h1 img { + float: right; + margin-right: 0; + margin-left: .5em; +} .dokuwiki div.footnotes { clear: both; border-top: 1pt solid #000; -- cgit v1.2.3 From bd28ae8066c753421603f70737fa91fa9697ec58 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Mon, 9 Apr 2012 19:54:20 +0100 Subject: when there's not enough space for images, make sure they stay proportional (might be FS#2480) --- lib/tpl/dokuwiki/css/basic.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css index c8e0c435e..7ffe42ec4 100644 --- a/lib/tpl/dokuwiki/css/basic.css +++ b/lib/tpl/dokuwiki/css/basic.css @@ -195,6 +195,7 @@ img { img, object { max-width: 100%; + height: auto; } hr { -- cgit v1.2.3 From bed6e6e5baa092db263210240784e7e640729579 Mon Sep 17 00:00:00 2001 From: Usama Akkad <uahello@gmail.com> Date: Wed, 11 Apr 2012 23:02:09 +0200 Subject: Arabic Language Update --- lib/plugins/config/lang/ar/lang.php | 11 +++++++++++ lib/plugins/plugin/lang/ar/lang.php | 1 + 2 files changed, 12 insertions(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/ar/lang.php b/lib/plugins/config/lang/ar/lang.php index 3855f4ac1..2e55446ec 100644 --- a/lib/plugins/config/lang/ar/lang.php +++ b/lib/plugins/config/lang/ar/lang.php @@ -41,9 +41,13 @@ $lang['lang'] = 'لغة الواجهة'; $lang['basedir'] = 'مسار الخادوم (مثال. <code>/dokuwiki/</code>) اترك فارغا للاكتشاف التلقائي.'; $lang['baseurl'] = 'عنوان الخادوم (مثال. <code>http://www.yourserver.com</code>). اترك فارغا للاكتشاف التلقائي.'; $lang['savedir'] = 'دليل حفظ البيانات'; +$lang['cookiedir'] = 'مسار الكعكات. اترك فارغا لاستخدام baseurl.'; $lang['start'] = 'اسم صفحة البداية'; $lang['title'] = 'عنوان الويكي'; $lang['template'] = 'القالب'; +$lang['tagline'] = 'Tagline (في حال دعم القالب له) +'; +$lang['sidebar'] = 'اسم صفحة الشريط الجانبي (في حال دعم القالب له). تركه فارغا يعطل الشريط الجانبي.'; $lang['license'] = 'تحت أي رخصة تريد اصدار المحتوى؟'; $lang['fullpath'] = 'اظهر المحتوى الكامل للصفحات في '; $lang['recent'] = 'أحدث التغييرات'; @@ -64,6 +68,7 @@ $lang['useheading'] = 'استخدم اول ترويسة كأسم لل $lang['refcheck'] = 'التحقق من مرجع الوسائط'; $lang['refshow'] = 'عدد مراجع الوسائط لتعرض'; $lang['allowdebug'] = 'مكّن التنقيح <b>عطّلها إن لم تكن بحاجلة لها!</b>'; +$lang['mediarevisions'] = 'تفعيل إصدارات الوسائط؟'; $lang['usewordblock'] = 'احجز الغثاء بناء على قائمة كلمات'; $lang['indexdelay'] = 'التأخير قبل الفهرسة (ثوان)'; $lang['relnofollow'] = 'استخدم rel="nofollow" للروابط الخارجية'; @@ -86,6 +91,8 @@ $lang['disableactions_other'] = 'اجراءات أخرى (مفصولة بالف $lang['sneaky_index'] = 'افتراضيا، ستعرض دوكو ويكي كل اسماء النطاقات في عرض الفهرس. تفعيل هذا الخيار سيخفي مالا يملك المستخدم صلاحية قراءته. قد يؤدي هذا إلى اخفاء نطاقات فرعية متاحة. وقد يؤدي لجعل صفحة الفهرس معطلة في بعض اعدادات ACL.'; $lang['auth_security_timeout'] = 'زمن انتهاء أمان المواثقة (ثوان)'; $lang['securecookie'] = 'هل يفرض على كعكات التصفح المعدة عبر HTTPS ان ترسل فقط عبر HTTPS من قبل المتصفح؟ عطل هذا إن كان الولوج للويكي مؤمنا فقط عبر SSL لكن تصفح الويكي غير مؤمن.'; +$lang['remote'] = 'مكّن نظام API البعيد. يسمح هذا لبرامج أخرى بالوصول للويكي عبر XML-RPC أو آليات أخرى.'; +$lang['remoteuser'] = 'احصر الوصول البعيد ل API لمستخدمين ومجموعات يفصل بينها بالفاصلة هنا. اترك فارغا لتمكين الجميع.'; $lang['updatecheck'] = 'تحقق من التحديثات و تنبيهات الأمان؟ دوكو ويكي ستحتاج للاتصال ب update.dokuwiki.org لأجل ذلك'; $lang['userewrite'] = 'استعمل عناوين URLs جميلة'; $lang['useslash'] = 'استخدم الشرطة كفاصل النطاق في العناوين'; @@ -109,10 +116,13 @@ $lang['jpg_quality'] = 'دقة ضغط JPG (0-100)'; $lang['subscribers'] = 'مكن دعم اشتراك الصفحة'; $lang['subscribe_time'] = 'المهلة بعد ارسال قوائم الاشتراكات والملخصات (ثوان); هذا يجب أن يكون أقل من الوقت المخصص في أيام أحدث التغييرات.'; $lang['compress'] = 'رُص مخرجات CSS و جافا سكربت'; +$lang['cssdatauri'] = 'الحجم بالبايتات للصور المذكورة في CSS التي ستُضمن في صفحة-التنسيق لخفض طلبات HTTP. لن تعمل هذه التقنية في IE 7 أو أقل! <code>400</code> إلى <code>600</code> بايت تعد قيمة جيدة. اضبط إلى <code>0</code> لتعطلها.'; $lang['hidepages'] = 'أخف الصفحات المنطبق عليها (تعابير شرطية)'; $lang['send404'] = 'ارسل "HTTP 404/Page Not Found" للصفحات غير الموجودة'; $lang['sitemap'] = 'ولد خرائط موقع جوجل (أيام)'; +$lang['broken_iua'] = 'هل الوظيفة ignore_user_abort معطلة على جهازك؟ قد يؤدي ذلك لتعطيل فهرسة البحث. IIS+PHP/CGI تعرف بأنها لاتعمل. أنظر <a href="http://bugs.splitbrain.org/?do=details&task_id=852">العلة 852</a> لمزيد من المعلومات.'; $lang['xsendfile'] = 'استخدم ترويسة X-Sendfile لتمكين خادم الوب من تقديم ملفات ثابتة؟ يجب أن يكون خادم الوب داعما له.'; +$lang['renderer_xhtml'] = 'المحرك ليستخدم لمخرجات الويكي الأساسية وفق (xhtml).'; $lang['renderer__core'] = '%s (نواة دوكو ويكي)'; $lang['renderer__plugin'] = '%s (ملحق)'; $lang['rememberme'] = 'اسمح بكعكات الدخول الدائم (تذكرني)'; @@ -122,6 +132,7 @@ $lang['rss_content'] = 'مالذي يعرض في عناصر تلقيم $lang['rss_update'] = 'تحديث تلقيم XML (ثوان)'; $lang['recent_days'] = 'مدة إبقاء أحدث التغييرات (ايام)'; $lang['rss_show_summary'] = 'تلقيم XML يظهر ملخصا في العنوان'; +$lang['rss_media'] = 'مانوع التغييرات التي ستدرج في تغذية XML؟'; $lang['target____wiki'] = 'النافذة الهدف للروابط الداخلية'; $lang['target____interwiki'] = 'النافذة الهدف للروابط الممرة interwiki'; $lang['target____extern'] = 'النافذة الهدف للروابط الخارجية'; diff --git a/lib/plugins/plugin/lang/ar/lang.php b/lib/plugins/plugin/lang/ar/lang.php index fbc6d3c36..8327e5ce3 100644 --- a/lib/plugins/plugin/lang/ar/lang.php +++ b/lib/plugins/plugin/lang/ar/lang.php @@ -50,3 +50,4 @@ $lang['enabled'] = 'الاضافة %s فُعلت. '; $lang['notenabled'] = 'تعذر تفعيل الاضافة %s، تحقق من اذونات الملف.'; $lang['disabled'] = 'عُطلت الإضافة %s.'; $lang['notdisabled'] = 'تعذر تعطيل الإضافة %s، تحقق من اذونات الملف.'; +$lang['packageinstalled'] = 'حزمة الإضافة (%d plugin(s): %Xs) ثبتت بنجاج.'; -- cgit v1.2.3 From 026b314868ee80aca644bf4107f78d8e8052b43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel-Emeric=20Andra=C5=9Fi?= <em.andrasi@mandrivausers.ro> Date: Sun, 15 Apr 2012 12:47:43 +0200 Subject: Romanian language update --- lib/plugins/acl/lang/ro/lang.php | 1 + lib/plugins/config/lang/ro/lang.php | 6 ++++++ lib/plugins/plugin/lang/ro/lang.php | 1 + lib/plugins/popularity/lang/ro/lang.php | 1 + lib/plugins/revert/lang/ro/lang.php | 1 + lib/plugins/usermanager/lang/ro/lang.php | 1 + 6 files changed, 11 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php index c278c918e..4d093216b 100644 --- a/lib/plugins/acl/lang/ro/lang.php +++ b/lib/plugins/acl/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index d638e1eec..72b205b90 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Setări de Configurare'; $lang['error'] = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou. <br /> Valorile incorecte vor apărea într-un chenar roşu.'; @@ -48,6 +49,8 @@ $lang['cookiedir'] = 'Cale Cookie. Lăsați gol pentru a utiliza bas $lang['start'] = 'Numele paginii de start'; $lang['title'] = 'Titlul wiki'; $lang['template'] = 'Şablon'; +$lang['tagline'] = 'Slogan (dacă templateul suportă opțiunea)'; +$lang['sidebar'] = 'Numele paginii barei laterale (dacă templateul suportă opțiunea), câmpul lăsat gol dezactivează bara laterală'; $lang['license'] = 'Sub ce licenţă va fi publicat conţinutul?'; $lang['fullpath'] = 'Arată calea completă a paginii în subsol'; $lang['recent'] = 'Modificări recente'; @@ -91,6 +94,8 @@ $lang['disableactions_other'] = 'Alte acţiuni (separate prin virgulă)'; $lang['sneaky_index'] = 'Implicit, DokuWiki va arăta toate numele de spaţii la vizualizarea indexului. Activând această opţiune vor fi ascunse acelea la care utilizatorul nu are drepturi de citire. Aceasta poate determina ascunderea sub-numelor de spaţii accesibile. Aceasta poate face index-ul inutilizabil cu anumite setări ale ACL'; $lang['auth_security_timeout'] = 'Timpul de expirare al Autentificării Securizate (secunde)'; $lang['securecookie'] = 'Cookies-urile setate via HTTPS să fie trimise doar via HTTPS de către browser? Dezactivaţi această opţiune numai când login-ul wiki-ului este securizat cu SSL dar navigarea wiki-ului se realizează nesecurizat.'; +$lang['remote'] = 'Activează sistemul remote API. Acesta permite altor aplicații să acceseze wiki-ul via XML-RPC sau alte mecanisme.'; +$lang['remoteuser'] = 'Restricționează accesul sistemului remote API la grupurile sau utilizatorii următori (separați prin virgulă). Lăsați câmpul gol pentru a da acces către toți.'; $lang['updatecheck'] = 'Verificare actualizări şi avertismente privind securitatea? DokuWiki trebuie să contacteze update.dokuwiki.org pentru această facilitate.'; $lang['userewrite'] = 'Folosire URL-uri "nice"'; $lang['useslash'] = 'Foloseşte slash-ul ca separator de spaţii de nume în URL-uri'; @@ -130,6 +135,7 @@ $lang['rss_content'] = 'Ce să afişez în obiectele fluxurilor XML'; $lang['rss_update'] = 'Intervalul de actualizare a fluxului XML (sec)'; $lang['recent_days'] = 'Câte modificări recente să se păstreze?'; $lang['rss_show_summary'] = 'Fluxul XML arată rezumat în titlu'; +$lang['rss_media'] = 'Ce fel de modificări ar trebui afișate în fluxul XML?'; $lang['target____wiki'] = 'Fereastra ţintă pentru legăturile interne'; $lang['target____interwiki'] = 'Fereastra ţintă pentru legăturile interwiki'; $lang['target____extern'] = 'Fereastra ţintă pentru legăturile externe'; diff --git a/lib/plugins/plugin/lang/ro/lang.php b/lib/plugins/plugin/lang/ro/lang.php index 50f6ca6f6..c57647e0b 100644 --- a/lib/plugins/plugin/lang/ro/lang.php +++ b/lib/plugins/plugin/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Administrează plugin-uri'; $lang['download'] = 'Descarcă şi instalează un nou plugin'; diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php index 9e9086b0d..8ba119dcb 100644 --- a/lib/plugins/popularity/lang/ro/lang.php +++ b/lib/plugins/popularity/lang/ro/lang.php @@ -8,6 +8,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['name'] = 'Feedback de popularitate (încărcarea poate dura mai mult)'; $lang['submit'] = 'Trimite datele'; diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php index f1fcf727c..5ea802575 100644 --- a/lib/plugins/revert/lang/ro/lang.php +++ b/lib/plugins/revert/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Manager Reveniri'; $lang['filter'] = 'Caută pagini cu posibil spam'; diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php index 7aac6cfb0..1b33cc4f8 100644 --- a/lib/plugins/usermanager/lang/ro/lang.php +++ b/lib/plugins/usermanager/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro> * @author Marius OLAR <olarmariusalex@gmail.com> * @author Marius Olar <olarmariusalex@yahoo.com> + * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro> */ $lang['menu'] = 'Manager Utilizatori'; $lang['noauth'] = '(autentificarea utilizatorilor nu este disponibilă)'; -- cgit v1.2.3