Merge pull request #18 from LaswitchTech/dev

LouisOuellet · web-flow · commit 8a87f58f34d0 · 2026-02-12T13:26:04.000-05:00
General: Version bumped to v2026-02-12
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [LaswitchTech]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,69 @@
+name: Bug report
+description: Create a report to help us improve
+title: ""
+labels: ["bug"]
+assignees:
+  - LouisOuellet
+
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Describe the bug or feature.
+      placeholder: "Description of the bug or feature"
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: Provide clear steps to reproduce.
+      placeholder: |
+        1. First Step
+        2. Second Step
+        3. And so on...
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      placeholder: "What you expected to happen"
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual behavior
+      placeholder: "What actually happened"
+    validations:
+      required: true
+
+  - type: input
+    id: python_version
+    attributes:
+      label: Python version
+      placeholder: "e.g. 3.11.2"
+    validations:
+      required: false
+
+  - type: input
+    id: os_version
+    attributes:
+      label: Operating system version
+      placeholder: "e.g. Windows 10 / macOS 13.4 / Ubuntu 22.04"
+    validations:
+      required: false
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Screenshots or Logs
+      description: Paste logs or attach screenshots.
+      placeholder: "Paste your logs or attach the screenshot"
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,2 @@
+blank_issues_enabled: false
+contact_links: []
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,48 @@
+name: Feature request
+description: Suggest an idea for this project
+title: ""
+labels: ["feature request"]
+assignees:
+  - LouisOuellet
+
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: Is your feature request related to a problem?
+      description: Describe the problem this feature would solve.
+      placeholder: >
+        A clear and concise description of what the problem is.
+        Example: I'm always frustrated when [...]
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution you'd like
+      description: Describe what you want to happen.
+      placeholder: >
+        A clear and concise description of the desired solution.
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you've considered
+      description: Describe any alternative solutions or features you've considered.
+      placeholder: >
+        A clear and concise description of any alternative approaches.
+    validations:
+      required: false
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request.
+      placeholder: >
+        Add any other context, links, or screenshots here.
+    validations:
+      required: false
diff --git a/.github/no-response.yml b/.github/no-response.yml
@@ -10,4 +10,4 @@ closeComment: >
   to our request for more information from the original author. With only the
   information that is currently in the issue, we don't have enough information
   to take action. Please reach out if you have or find the answers we need so
-  that we can investigate further.
+  that we can investigate further.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v2026-01-07
+v2026-02-12
diff --git a/conf/default.php b/conf/default.php
@@ -28,3 +28,4 @@
 $conf['enableStarredBookmark']          = 0;
 
 $conf['_customizations']                = '';
+$conf['profile_pic_variant']            = 'white';
diff --git a/conf/metadata.php b/conf/metadata.php
@@ -28,3 +28,8 @@
 $meta['enableStarredBookmark']          = array('onoff');
 
 $meta['_customizations']                = array('fieldset');
+$meta['profile_pic_variant'] = ['multichoice',
+    '_choices' => [
+        'black',
+        'white']
+];
diff --git a/images/profile_pic_black.png b/images/profile_pic_black.png
diff --git a/images/profile_pic_white.png b/images/profile_pic_white.png
diff --git a/lang/de/lang.php b/lang/de/lang.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * German language file for template
+ *
+ */
+
+$lang['menu']                               = 'Menü';
+$lang['__tooltips_background_color__']      = 'Hintergrundfarbe der Tooltips';
+$lang['__tooltips_text_color__']            = 'Textfarbe der Tooltips';
+$lang['__tooltips_border_color__']          = 'Rahmenfarbe der Tooltips';
+$lang['__sidebar_user_tools_color__']       = 'Hintergrundfarbe der Benutzerwerkzeuge';
+$lang['__theme_color__']                    = 'Primäre Theme-Farbe';
+$lang['__theme_color_alt__']                = 'Sekundäre Theme-Farbe';
+$lang['__content_width__']                  = 'Breite des Inhaltsbereichs';
+$lang['__content_border__']                 = 'Rahmenbreite des rechten Inhaltsbereichs';
+$lang['AddNewPage']                         = 'Neue Seite hinzufügen';
+$lang['Language']                           = 'Sprache';
+$lang['__font__']                           = 'Schriftart';
+$lang['Bookmarks']                          = 'Lesezeichen';
diff --git a/lang/de/settings.php b/lang/de/settings.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Language File for Configuration
+ *
+ * @author   Louis Ouellet <louis_ouellet@hotmail.com>
+ * @license  GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ */
+
+$lang['_tools']                             = 'Werkzeuge konfigurieren';
+$lang['showPageToolsTitle']                 = 'Titel der Seitenwerkzeuge anzeigen';
+$lang['showSiteToolsTitle']                 = 'Titel der Website-Werkzeuge anzeigen';
+$lang['showUserToolsTitle']                 = 'Titel der Benutzerwerkzeuge anzeigen';
+$lang['doSiteToolsRequireLogin']            = 'Sollen die Website-Werkzeuge eine Anmeldung erfordern';
+
+$lang['_extra']                             = 'Extras konfigurieren';
+$lang['useToolbar']                         = 'Symbolleiste aktivieren';
+$lang['useTooltips']                        = 'Tooltips aktivieren';
+$lang['makeFullWidth']                      = 'Inhaltsbereich auf volle Breite setzen';
+$lang['doLogoChangesByNamespace']           = 'Sollen Logo-Änderungen nach Namespace erfolgen';
+$lang['doLogoLinkChangesByNamespace']       = 'Sollen Änderungen des Logo-Links nach Namespace erfolgen';
+$lang['doTitleChangesByNamespace']          = 'Sollen Änderungen des Seitentitels nach Namespace erfolgen';
+$lang['doTaglineChangesByNamespace']        = 'Sollen Änderungen des Slogans nach Namespace erfolgen';
+
+$lang['_plugins']                           = 'Plugins konfigurieren';
+$lang['defaultAddNewPage']                  = 'Namespace für das AddNewPage-Plugin';
+$lang['enableStarredBookmark']              = 'Markierte Lesezeichen in der Symbolleiste aktivieren';
+
+$lang['_customizations']                    = 'Template anpassen';
+$lang['profile_pic_variant']                = 'Farbe der Umrandung für das Profilbild (falls kein Gravatar vorhanden ist)';
+$lang['profile_pic_variant_o_white']        = 'Weiß';
+$lang['profile_pic_variant_o_black']        = 'Schwarz';
diff --git a/lang/de/style.txt b/lang/de/style.txt
@@ -0,0 +1,6 @@
+Wenn du das Logo ändern möchtest, lade über den Medienmanager eine „logo.png“ in den Root-Namespace hoch, und das Logo wird automatisch verwendet.
+Dort kannst du auch das „favicon.ico“ hochladen.
+
+Wenn du ein geschlossenes Wiki verwendest, wird empfohlen, den Root-Namespace in den ACL-Einstellungen für alle lesbar zu machen, da sonst das Favicon für nicht eingeloggte Benutzer nicht angezeigt wird.
+
+Um eine Navigation zur Sidebar hinzuzufügen, kannst du eine Seite mit dem Namen „topnav“ anlegen und dort eine Liste von Links einfügen (Andere Inhalte werden nicht unterstützt).
diff --git a/lang/en/lang.php b/lang/en/lang.php
@@ -16,5 +16,4 @@
 $lang['AddNewPage']                         = 'Add new page';
 $lang['Language']                           = 'Language';
 $lang['__font__']                           = 'Font';
-
 $lang['Bookmarks']                          = 'Bookmarks';
diff --git a/lang/en/settings.php b/lang/en/settings.php
@@ -26,3 +26,4 @@
 $lang['enableStarredBookmark']              = 'Enable the Starred Bookmarks in the Toolbar';
 
 $lang['_customizations']                    = 'Customize the Template';
+$lang['profile_pic_variant']                = 'Colour of outline for profile picture (if no gravatar)';
diff --git a/lang/fr/lang.php b/lang/fr/lang.php
@@ -16,3 +16,4 @@
 $lang['AddNewPage']                         = 'Ajouter une nouvelle page';
 $lang['Language']                           = 'Langue';
 $lang['__font__']                           = 'Police';
+$lang['Bookmarks']                          = 'Les favoris';
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
@@ -23,5 +23,9 @@
 
 $lang['_plugins']                           = 'Configure les Extensions';
 $lang['defaultAddNewPage']                  = 'Namespace pour l\'extension AddNewPage';
+$lang['enableStarredBookmark']              = 'Activer les favoris étoilés dans la barre d\'outils';
 
 $lang['_customizations']                    = 'Personalise le Template';
+$lang['profile_pic_variant']                = 'Couleur du contour de l\'avatar (sans Gravatar)';
+$lang['profile_pic_variant_o_black']        = 'Noir';
+$lang['profile_pic_variant_o_white']        = 'Blanc';
diff --git a/template.info.txt b/template.info.txt
@@ -1,7 +1,7 @@
 base     writr
 author   Louis Ouellet
 email    louis_ouellet@hotmail.com
-date     2026-01-07
+date     2026-02-12
 name     Writr Template
 desc     Bold, minimalist and modern
 url      https://www.dokuwiki.org/template:writr
diff --git a/tpl_functions.php b/tpl_functions.php
@@ -87,11 +87,31 @@ function tpl_getSiteBranding()
 if (!function_exists('tpl_getGravatarURL')) {
     function tpl_getGravatarURL($email, $size = 96)
     {
-        return 'https://www.gravatar.com/avatar/'.md5(strtolower(trim($email))).'?s='.$size;
+        global $conf;
+        $email = trim(strtolower((string)$email));
+        $tplName = basename(__DIR__);
+        $variant = function_exists('tpl_getConf') ? tpl_getConf('profile_pic_variant') : 'white';
+
+        if ($variant === 'black') {
+            $fallback = DOKU_BASE.'lib/tpl/'.$tplName.'/images/profile_pic_black.png';
+        } else {
+            $fallback = DOKU_BASE.'lib/tpl/'.$tplName.'/images/profile_pic_white.png';
+        }
+
+        if (empty($email)) {
+            return $fallback;
+        }
+
+        $hash = md5(strtolower(trim($email)));
+        $testUrl = 'https://www.gravatar.com/avatar/'.$hash.'?s='.$size.'&d=404';
+        $headers = @get_headers($testUrl);
+        if ($headers && isset($headers[0]) && strpos($headers[0], '200') !== false) {
+            return 'https://www.gravatar.com/avatar/'.$hash.'?s='.$size;
+        }
+        return $fallback;
     }
 }
 
-
 /**
  * Generate the HTML for a menu
  *

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# These are supported funding model platforms`
	`2`	`+`
	`3`	`+github: [LaswitchTech]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+blank_issues_enabled: false`
	`2`	`+contact_links: []`
Original file line number	Diff line number	Diff line change
`@@ -28,3 +28,4 @@`
`28`	`28`	`$conf['enableStarredBookmark'] = 0;`
`29`	`29`
`30`	`30`	`$conf['_customizations'] = '';`
	`31`	`+$conf['profile_pic_variant'] = 'white';`