Permalink
Browse files

Update contact information and dokuwiki.org links (SSL/TLS)

  • Loading branch information...
1 parent 051dbb8 commit e3217ae28930b42ce770d3ce345f3aa2aadbda98 @andreashaerter andreashaerter committed Feb 8, 2014
Showing with 383 additions and 434 deletions.
  1. +5 −5 CREDITS
  2. +19 −19 README
  3. +16 −14 README-de
  4. +4 −4 bug49642.php
  5. +9 −9 conf/boxes.php
  6. +7 −18 conf/buttons.php
  7. +10 −12 conf/default.php
  8. +5 −7 conf/metadata.php
  9. +3 −3 conf/tabs.php
  10. +3 −3 detail.php
  11. +3 −3 inc_cite.php
  12. +3 −3 inc_detail.php
  13. +7 −9 lang/ca/lang.php
  14. +10 −11 lang/ca/settings.php
  15. +7 −8 lang/cs/lang.php
  16. +7 −8 lang/cs/settings.php
  17. +8 −10 lang/de-informal/lang.php
  18. +11 −12 lang/de-informal/settings.php
  19. +8 −10 lang/de/lang.php
  20. +11 −12 lang/de/settings.php
  21. +8 −10 lang/en/lang.php
  22. +11 −12 lang/en/settings.php
  23. +7 −8 lang/es/lang.php
  24. +7 −8 lang/es/settings.php
  25. +7 −8 lang/eu/lang.php
  26. +7 −8 lang/eu/settings.php
  27. +7 −8 lang/fa/lang.php
  28. +8 −9 lang/fa/settings.php
  29. +7 −8 lang/fr/lang.php
  30. +7 −8 lang/fr/settings.php
  31. +7 −8 lang/it/lang.php
  32. +7 −8 lang/it/settings.php
  33. +7 −9 lang/ko/lang.php
  34. +10 −11 lang/ko/settings.php
  35. +7 −8 lang/nl/lang.php
  36. +7 −8 lang/nl/settings.php
  37. +7 −8 lang/pt-br/lang.php
  38. +7 −8 lang/pt-br/settings.php
  39. +7 −8 lang/ru/lang.php
  40. +7 −8 lang/ru/settings.php
  41. +7 −8 lang/sk/lang.php
  42. +8 −9 lang/sk/settings.php
  43. +7 −8 lang/zh/lang.php
  44. +7 −8 lang/zh/settings.php
  45. +20 −20 main.php
  46. +3 −3 mediamanager.php
  47. +1 −1 static/3rd/dokuwiki/00_starter-tmpl-notes.txt
  48. +1 −2 static/css/rtl.css
  49. BIN static/img/button-qrcode.png
  50. +3 −3 style.ini
  51. +3 −3 template.info.txt
  52. +5 −5 user/boxes.php
  53. +3 −3 user/buttons.php
  54. +7 −7 user/tabs.php
  55. +3 −3 user/tracker.php
View
@@ -1,12 +1,12 @@
- I. Andreas Haerter <development@andreas-haerter.com>
+ I. ARSAVA <dokuwiki@dev.arsava.com>
- This DokuWiki template is maintained by Andreas Haerter [1]. If you like my
- projects, you might buy me a coffee [2], or get some cool QR Code
+ This DokuWiki template is maintained by ARSAVA [1]. If you like our
+ projects, you might buy us a coffee [2], or get some cool QR Code
merchandise [3]. Thank you! :-)
- [1] <http://andreas-haerter.com/>
- [2] <http://donate.andreas-haerter.com/dokuwiki-template-vector/>
+ [1] <https://dev.arsava.com/>
+ [2] <https://donate.arsava.com/dokuwiki-template-vector/>
[3] <http://goqr.me/>
View
@@ -4,8 +4,8 @@
"vector" brings you the MediaWiki/Wikipedia 2010 look and feel for DokuWiki.
It is a mostly optical port of the original MediaWiki "vector" skin.
- Website: <http://www.dokuwiki.org/template:vector>
- Maintainer: Andreas Haerter <http://andreas-haerter.com/>
+ Website: <https://www.dokuwiki.org/template:vector>
+ Maintainer: ARSAVA <https://dev.arsava.com/>
Contact: See "IV. Support" and "V. Contact".
@@ -25,8 +25,8 @@
workaround for this, simply delete vector's "style.ini" to trigger
the template to use it.
- [1] <http://www.dokuwiki.org/template>
- [2] <http://www.dokuwiki.org/template:vector#update>
+ [1] <https://www.dokuwiki.org/template>
+ [2] <https://www.dokuwiki.org/template:vector#update>
[3] <http://bugs.php.net/bug.php?id=49692>
@@ -129,40 +129,40 @@
using the DokuWiki Search page [2]. If you found nothing helpful, ask your
question at the DokuWiki forum [3] (preferred) or IRC channel [4].
- [1] <http://www.dokuwiki.org/template:vector#faq>
+ [1] <https://www.dokuwiki.org/template:vector#faq>
[2] <http://search.dokuwiki.org/>
- [3] <http://forum.dokuwiki.org/>
- [4] <http://www.dokuwiki.org/irc>
+ [3] <https://forum.dokuwiki.org/>
+ [4] <https://www.dokuwiki.org/irc>
V. Contact
If you think you have found a bug or have a useful idea (a.k.a. "feature
- request"), create an issue [1] on GitHub (preferred), or contact me by
+ request"), create an issue [1] on GitHub (preferred), or contact us by
mail [2].
Feel free to submit patches as GitHub pull requests (preferred) or by mail
as well. However, please try to respect the DokuWiki coding style [3] as
this template follows its rules.
- [1] <https://github.com/andreashaerter/dokuwiki-template-vector/issues>
- [2] Andreas Haerter <development@andreas-haerter.com>
- [3] <http://www.dokuwiki.org/devel:coding_style>
+ [1] <https://github.com/arsava/dokuwiki-template-vector/issues>
+ [2] ARSAVA <dokuwiki@dev.arsava.com>
+ [3] <https://www.dokuwiki.org/devel:coding_style>
VI. Other notes
- If you like this free project, you might buy me a coffee [1], or get some
+ If you like this free project, you might buy us a coffee [1], or get some
cool QR Code merchandise [2]. Thank you! :-)
- Do not hesitate to contact Andreas Haerter [3] if you need professional
- support, training or if you think I am the one to get your project done.
+ Do not hesitate to contact ARSAVA [3] if you need professional DokuWiki
+ support, training or if you think we are the ones to get your project done.
- [1] <http://donate.andreas-haerter.com/dokuwiki-template-vector/>
+ [1] <https://donate.arsava.com/dokuwiki-template-vector/>
[2] <http://goqr.me/>
- [3] <http://andreas-haerter.com/>
+ [3] <https://dev.arsava.com/>
@@ -200,8 +200,8 @@
a logo.[png|gif|jpg] in here. See "III. Customizing the template" for
details.
- [1] <http://www.dokuwiki.org/devel:configuration#default_settings>
- [2] <http://www.dokuwiki.org/devel:configuration#configuration_metadata>
+ [1] <https://www.dokuwiki.org/devel:configuration#default_settings>
+ [2] <https://www.dokuwiki.org/devel:configuration#configuration_metadata>
[3] <http://j.mp/eq8zSo>
@@ -277,7 +277,7 @@
- Worked worked worked a few days.... and done! :-P
- After ~1 year, I switched the CSS base from DokuWiki's default template
- to <http://www.dokuwiki.org/template:starter>. See <http://j.mp/f7V4ES>
+ to <https://www.dokuwiki.org/template:starter>. See <http://j.mp/f7V4ES>
for more information about this. I edited some files, see
"vector/static/3rd/dokuwiki/00_starter-tmpl-notes.txt" for details.
View
@@ -7,12 +7,12 @@ ACHTUNG: Diese Datei stellt eine AUSZUGSWEISE Übersetzung der wichtigsten Teile
II. Installation und Aktualisierung
"vector" zu nutzen ist einfach und funktioniert wie unter
- <http://www.dokuwiki.org/template> beschrieben: Entpacken Sie das
+ <https://www.dokuwiki.org/template> beschrieben: Entpacken Sie das
heruntergeladene Archiv in das "lib/tpl/"-Verzeichnis Ihrer DokuWiki. Wählen
Sie es dann einfach im Config Manager über die "template"-Option aus.
Falls Sie eine bestehende vector-Installation aktualisieren wollen, werfen
- Sie bitte einen Blick auf <http://www.dokuwiki.org/template:vector>. Dort
+ Sie bitte einen Blick auf <https://www.dokuwiki.org/template:vector>. Dort
sollten Sie alle benötigten Informationen finden.
HINWEIS: Falls alles unformatiert angezeigt wird, ist Ihre PHP-Umgebung ggf.
@@ -88,10 +88,11 @@ ACHTUNG: Diese Datei stellt eine AUSZUGSWEISE Übersetzung der wichtigsten Teile
Um eigene Tabs anzuzeigen, editieren Sie einfach "vector/user/tabs.php".
Kein Sorge: Sie finden dort einige Beispiele wie eigene Tabs definiert
werden. Falls Sie nach dem ausprobieren der Beispiele immernoch Fragen
- haben, durchsuchen Sie am besten <http://dokuwiki.org/template:vector>
- und/oder das DokuWiki-Forum unter <http://forum.dokuwiki.org> und/oder
- fragen Sie die dortige Gemeinschaft falls Sie die Probleme beim
- Konfigurieren der eigenen Tabs nicht selbst lösen können.
+ haben, durchsuchen Sie am besten
+ <https://www.dokuwiki.org/template:vector> und/oder das DokuWiki-Forum
+ unter <https://forum.dokuwiki.org> und/oder fragen Sie die dortige
+ Gemeinschaft falls Sie die Probleme beim Konfigurieren der eigenen Tabs
+ nicht selbst lösen können.
Falls "vector/user/tabs.php" nicht existiert, kopieren Sie die Datei
einfach aus dem aktuellen Installationsarchiv.
@@ -100,10 +101,11 @@ ACHTUNG: Diese Datei stellt eine AUSZUGSWEISE Übersetzung der wichtigsten Teile
80x15 Bildchen), editieren Sie einfach "vector/user/buttons.php".
Kein Sorge: Sie finden dort einige Beispiele wie eigene Buttons definiert
werden. Falls Sie nach dem ausprobieren der Beispiele immernoch Fragen
- haben, durchsuchen Sie am besten <http://dokuwiki.org/template:vector>
- und/oder das DokuWiki-Forum unter <http://forum.dokuwiki.org> und/oder
- fragen Sie die dortige Gemeinschaft falls Sie die Probleme beim
- Konfigurieren der eigenen Buttons nicht selbst lösen können.
+ haben, durchsuchen Sie am besten
+ <https://www.dokuwiki.org/template:vector> und/oder das DokuWiki-Forum
+ unter <https://forum.dokuwiki.org> und/oder fragen Sie die dortige
+ Gemeinschaft falls Sie die Probleme beim Konfigurieren der eigenen
+ Buttons nicht selbst lösen können.
Falls "vector/user/buttons.php" nicht existiert, kopieren Sie die Datei
einfach aus dem aktuellen Installationsarchiv.
@@ -112,10 +114,10 @@ ACHTUNG: Diese Datei stellt eine AUSZUGSWEISE Übersetzung der wichtigsten Teile
"vector/user/boxes.php". Kein Sorge: Sie finden dort einige Beispiele wie
eigene Boxen definiert werden. Falls Sie nach dem ausprobieren der
Beispiele immernoch Fragen haben, durchsuchen Sie am besten
- <http://dokuwiki.org/template:vector> und/oder das DokuWiki-Forum unter
- <http://forum.dokuwiki.org> und/oder fragen Sie die dortige Gemeinschaft
- falls Sie die Probleme beim Konfigurieren der eigenen Buttons nicht selbst
- lösen können.
+ <https://www.dokuwiki.org/template:vector> und/oder das DokuWiki-Forum
+ unter <https://forum.dokuwiki.org> und/oder fragen Sie die dortige
+ Gemeinschaft falls Sie die Probleme beim Konfigurieren der eigenen Buttons
+ nicht selbst lösen können.
Falls "vector/user/boxes.php" nicht existiert, kopieren Sie die Datei
einfach aus dem aktuellen Installationsarchiv.
View
@@ -23,11 +23,11 @@
* the author(s) of this file in doubt.
*
* @license GPLv2 (http://www.gnu.org/licenses/gpl2.html)
- * @author Andreas Haerter <development@andreas-haerter.com>
+ * @author ARSAVA <dokuwiki@dev.arsava.com>
* @link http://bugs.php.net/bug.php?id=49692
- * @link http://forum.dokuwiki.org/thread/4827
- * @link http://www.dokuwiki.org/template:vector
- * @link http://www.dokuwiki.org/devel:css#styleini
+ * @link https://forum.dokuwiki.org/thread/4827
+ * @link https://www.dokuwiki.org/template:vector
+ * @link https://www.dokuwiki.org/devel:style.ini
*/
View
@@ -9,9 +9,9 @@
* the author(s) of this file in doubt.
*
* @license GPLv2 (http://www.gnu.org/licenses/gpl2.html)
- * @author Andreas Haerter <development@andreas-haerter.com>
- * @link http://www.dokuwiki.org/template:vector
- * @link http://www.dokuwiki.org/devel:configuration
+ * @author ARSAVA <dokuwiki@dev.arsava.com>
+ * @link https://www.dokuwiki.org/template:vector
+ * @link https://www.dokuwiki.org/devel:configuration
*/
@@ -41,7 +41,7 @@
!tpl_getConf("vector_closedwiki")){
//Languages/translations provided by Andreas Gohr's translation plugin,
- //see <http://www.dokuwiki.org/plugin:translation>. Create plugin object if
+ //see <https://www.dokuwiki.org/plugin:translation>. Create plugin object if
//needed.
if (file_exists(DOKU_PLUGIN."translation/syntax.php") &&
!plugin_isdisabled("translation")){
@@ -130,18 +130,18 @@
//define default, predefined exportbox
$_vector_boxes["p-coll-print_export"]["xhtml"] = " <ul>\n";
//ODT plugin
- //see <http://www.dokuwiki.org/plugin:odt> for info
+ //see <https://www.dokuwiki.org/plugin:odt> for info
if (file_exists(DOKU_PLUGIN."odt/syntax.php") &&
!plugin_isdisabled("odt")){
$_vector_boxes["p-coll-print_export"]["xhtml"] .= " <li id=\"coll-download-as-odt\"><a href=\"".wl(cleanID(getId()), array("do" => "export_odt"))."\" rel=\"nofollow\">".hsc($lang["vector_exportbxdef_downloadodt"])."</a></li>\n";
}
//dw2pdf plugin
- //see <http://www.dokuwiki.org/plugin:dw2pdf> for info
+ //see <https://www.dokuwiki.org/plugin:dw2pdf> for info
if (file_exists(DOKU_PLUGIN."dw2pdf/action.php") &&
!plugin_isdisabled("dw2pdf")){
$_vector_boxes["p-coll-print_export"]["xhtml"] .= " <li id=\"coll-download-as-rl\"><a href=\"".wl(cleanID(getId()), array("do" => "export_pdf"))."\" rel=\"nofollow\">".hsc($lang["vector_exportbxdef_downloadpdf"])."</a></li>\n";
//html2pdf plugin
- //see <http://www.dokuwiki.org/plugin:html2pdf> for info
+ //see <https://www.dokuwiki.org/plugin:html2pdf> for info
} else if (file_exists(DOKU_PLUGIN."html2pdf/action.php") &&
!plugin_isdisabled("html2pdf")){
$_vector_boxes["p-coll-print_export"]["xhtml"] .= " <li id=\"coll-download-as-rl\"><a href=\"".wl(cleanID(getId()), array("do" => "export_pdf"))."\" rel=\"nofollow\">".hsc($lang["vector_exportbxdef_downloadpdf"])."</a></li>\n";
@@ -223,13 +223,13 @@
}
}
- //QR Code of current page's URL (powered by <http://qrserver.com/api/>)
+ //QR Code of current page's URL (powered by <http://goqr.me/api/>)
if (tpl_getConf("vector_qrcodebox")){
//headline
$_vector_boxes["p-qrcode"]["headline"] = $lang["vector_qrcodebox"];
//content
- $_vector_boxes["p-qrcode"]["xhtml"] = " <span id=\"t-qrcode\">".((cleanID(getID()) === "start") ? "<a href=\"http://".(($conf["lang"] !== "de") ? "goqr.me" : "qr-code-generator.de")."/\" target=\"_blank\">" : "")."<img src=\"".((!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] === "on") ? "https" : "http")."://api.qrserver.com/v1/create-qr-code/?data=".urlencode(wl(cleanID(getId()), false, true, "&"))."&#38;size=130x130&#38;margin=0&#38;bgcolor=f3f3f3\" alt=\"".hsc($lang["vector_qrcodebox_qrcode"])." ".hsc(tpl_pagetitle(null, true))." (".hsc($lang["vector_qrcodebox_genforcurrentpage"]).")\" title=\"".hsc($lang["vector_qrcodebox_urlofcurrentpage"])."\" />".((cleanID(getID()) === "start") ? "</a>" : "")."</span>";
+ $_vector_boxes["p-qrcode"]["xhtml"] = " <span id=\"t-qrcode\">".((cleanID(getID()) === "start") ? "<a href=\"http://".(($conf["lang"] !== "de") ? "goqr.me" : "goqr.me/de")."/\" target=\"_blank\" rel=\"nofollow\">" : "")."<img src=\"".((!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] === "on") ? "https" : "http")."://api.qrserver.com/v1/create-qr-code/?data=".urlencode(wl(cleanID(getId()), false, true, "&"))."&#38;size=130x130&#38;margin=0&#38;bgcolor=f3f3f3\" alt=\"".hsc($lang["vector_qrcodebox_qrcode"])." ".hsc(tpl_pagetitle(null, true))." (".hsc($lang["vector_qrcodebox_genforcurrentpage"]).")\" title=\"".hsc($lang["vector_qrcodebox_urlofcurrentpage"])."\" />".((cleanID(getID()) === "start") ? "</a>" : "")."</span>";
}
}else{
View
@@ -9,9 +9,9 @@
* the author(s) of this file in doubt.
*
* @license GPLv2 (http://www.gnu.org/licenses/gpl2.html)
- * @author Andreas Haerter <development@andreas-haerter.com>
- * @link http://www.dokuwiki.org/template:vector
- * @link http://www.dokuwiki.org/devel:configuration
+ * @author ARSAVA <dokuwiki@dev.arsava.com>
+ * @link https://www.dokuwiki.org/template:vector
+ * @link https://www.dokuwiki.org/devel:configuration
*/
@@ -46,9 +46,8 @@
//"vector for DokuWiki" button
-//Note: please do NOT remove this button. Thank you. :-)
$_vector_btns["vecfdw"]["img"] = DOKU_TPL."static/img/button-vector.png";
-$_vector_btns["vecfdw"]["href"] = "http://andreas-haerter.com/";
+$_vector_btns["vecfdw"]["href"] = "https://www.dokuwiki.org/template:vector";
$_vector_btns["vecfdw"]["width"] = 80;
$_vector_btns["vecfdw"]["height"] = 15;
$_vector_btns["vecfdw"]["title"] = $lang["vector_mdtemplatefordw"];
@@ -62,27 +61,17 @@
$_vector_btns["donate"]["width"] = 80;
$_vector_btns["donate"]["height"] = 15;
$_vector_btns["donate"]["title"] = $lang["vector_donate"];
- $_vector_btns["donate"]["nofollow"] = !(cleanID(getID()) === "start");
+ $_vector_btns["donate"]["nofollow"] = true;
}
-//QR Code button
-//Note: please do NOT remove this button. Thank you. :-)
-$_vector_btns["qrcode"]["img"] = DOKU_TPL."static/img/button-qrcode.png";
-$_vector_btns["qrcode"]["href"] = "http://".(($conf["lang"] !== "de") ? "goqr.me" : "qr-code-generator.de")."/";
-$_vector_btns["qrcode"]["width"] = 80;
-$_vector_btns["qrcode"]["height"] = 15;
-$_vector_btns["qrcode"]["title"] = $lang["vector_qrcodebtn"];
-$_vector_btns["qrcode"]["nofollow"] = !(cleanID(getID()) === "start");
-
-
//DokuWiki button
$_vector_btns["dw"]["img"] = DOKU_TPL."static/img/button-dw.png";
-$_vector_btns["dw"]["href"] = "http://www.dokuwiki.org";
+$_vector_btns["dw"]["href"] = "https://www.dokuwiki.org/";
$_vector_btns["dw"]["width"] = 80;
$_vector_btns["dw"]["height"] = 15;
$_vector_btns["dw"]["title"] = "DokuWiki";
-$_vector_btns["dw"]["nofollow"] = false;
+$_vector_btns["dw"]["nofollow"] = !(cleanID(getID()) === "start");
View
@@ -9,11 +9,9 @@
* the same directory as this file.
* - To change/translate the descriptions showed in the admin/configuration
* menu of DokuWiki, have a look at the file
- * "/lib/tpl/vector/lang/<your lang>/settings.php". If it does not exists,
+ * /lib/tpl/vector/lang/<your lang>/settings.php. If it does not exists,
* copy and translate the English one. Don't forget to mail your translation
- * to
- * Andreas Haerter <development@andreas-haerter.com>
- * Thanks :-D.
+ * to ARSAVA <dokuwiki@dev.arsava.com>. Thanks! :-D
* - To change the [tabs|boxes|buttons] configuration, have a look at
* "/user/[tabs|boxes|buttons].php".
*
@@ -23,9 +21,9 @@
* the author(s) of this file in doubt.
*
* @license GPLv2 (http://www.gnu.org/licenses/gpl2.html)
- * @author Andreas Haerter <development@andreas-haerter.com>
- * @link http://www.dokuwiki.org/template:vector
- * @link http://www.dokuwiki.org/devel:configuration
+ * @author ARSAVA <dokuwiki@dev.arsava.com>
+ * @link https://www.dokuwiki.org/template:vector
+ * @link https://www.dokuwiki.org/devel:configuration
*/
@@ -45,12 +43,12 @@
//site notice
$conf["vector_sitenotice"] = true; //TRUE: use/show sitenotice
$conf["vector_sitenotice_location"] = ":wiki:site_notice"; //page/article used to store the sitenotice
-$conf["vector_sitenotice_translate"] = true; //TRUE: load translated sitenotice if translation plugin is available (see <http://www.dokuwiki.org/plugin:translation>)
+$conf["vector_sitenotice_translate"] = true; //TRUE: load translated sitenotice if translation plugin is available (see <https://www.dokuwiki.org/plugin:translation>)
//navigation
$conf["vector_navigation"] = true; //TRUE: use/show navigation
$conf["vector_navigation_location"] = ":wiki:navigation"; //page/article used to store the navigation
-$conf["vector_navigation_translate"] = true; //TRUE: load translated navigation if translation plugin is available (see <http://www.dokuwiki.org/plugin:translation>)
+$conf["vector_navigation_translate"] = true; //TRUE: load translated navigation if translation plugin is available (see <https://www.dokuwiki.org/plugin:translation>)
//exportbox ("print/export")
$conf["vector_exportbox"] = true; //TRUE: use/show exportbox
@@ -69,11 +67,11 @@
$conf["vector_copyright"] = true; //TRUE: use/show copyright notice
$conf["vector_copyright_default"] = true; //TRUE: use default copyright notice (if copyright notice is enabled at all)
$conf["vector_copyright_location"] = ":wiki:copyright"; //page/article used to store a custom copyright notice
-$conf["vector_copyright_translate"] = true; //TRUE: load translated copyright notice if translation plugin is available (see <http://www.dokuwiki.org/plugin:translation>)
+$conf["vector_copyright_translate"] = true; //TRUE: load translated copyright notice if translation plugin is available (see <https://www.dokuwiki.org/plugin:translation>)
//donation link/button
-$conf["vector_donate"] = true; //TRUE: use/show donation link/button
-$conf["vector_donate_url"] = "http://donate.andreas-haerter.com/dokuwiki-template-vector/"; //custom donation URL
+$conf["vector_donate"] = false; //TRUE: use/show donation link/button
+$conf["vector_donate_url"] = "https://donate.arsava.com/dokuwiki-template-vector/"; //custom donation URL
//TOC
$conf["vector_toc_position"] = "article"; //article: show TOC embedded within the article; "sidebar": show TOC near the navigation, left column
Oops, something went wrong.

0 comments on commit e3217ae

Please sign in to comment.