Discussion #78: Add option for custom greeting message

daledavies · Apr 13, 2023 · ed9178b · ed9178b
1 parent 0f2045c
commit ed9178b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/jumpapp/.jump-version b/jumpapp/.jump-version
@@ -1 +1 @@
-v1.3.2 (1681419310)
+v1.3.2 (1681425251)
diff --git a/...sets/js/index.fd2874ea51dbd2dad294.min.js → ...sets/js/index.f2468ba60142a7aa8d24.min.js b/...sets/js/index.fd2874ea51dbd2dad294.min.js → ...sets/js/index.f2468ba60142a7aa8d24.min.js
diff --git a/jumpapp/classes/Pages/HomePage.php b/jumpapp/classes/Pages/HomePage.php
@@ -19,7 +19,9 @@ protected function render_header(): string {
         $template = $this->mustache->loadTemplate('header');
         $greeting = null;
         if (!$this->config->parse_bool($this->config->get('showgreeting'))) {
-            $greeting = $this->language->get('tags.home');
+            $greeting = '#'.$this->language->get('tags.home');
+        } else if ($this->config->get('customgreeting') !== ''){
+            $greeting = $this->config->get('customgreeting');
         }
         $csrfsection = $this->session->getSection('csrf');
         $unsplashdata = $this->cache->load('unsplash');

diff --git a/jumpapp/classes/Pages/TagPage.php b/jumpapp/classes/Pages/TagPage.php
@@ -20,14 +20,15 @@ class TagPage extends AbstractPage {
     protected function render_header(): string {
         $template = $this->mustache->loadTemplate('header');
         $this->tagname = $this->routeparams['tag'];
+        $greeting = '#'.$this->tagname;
         $title = 'Tag: '.$this->tagname;
         $csrfsection = $this->session->getSection('csrf');
         $unsplashdata = $this->cache->load('unsplash');
         $showsearch = $this->config->parse_bool($this->config->get('showsearch', false));
         $checkstatus = $this->config->parse_bool($this->config->get('checkstatus', false));
         $templatecontext = [
             'csrftoken' => $csrfsection->get('token'),
-            'greeting' => $this->tagname,
+            'greeting' => $greeting,
             'noindex' => $this->config->parse_bool($this->config->get('noindex')),
             'title' => $title,
             'owmapikey' => !!$this->config->get('owmapikey', false),

diff --git a/jumpapp/config.php b/jumpapp/config.php
@@ -39,8 +39,11 @@
     'showclock'      => getenv('SHOWCLOCK')      ?:   true,
     // 12 hour clock format?
     'ampmclock'      => getenv('AMPMCLOCK')      ?:   false,
-    // Show a friendly greeting message rather than "#home".
+    // Show a friendly greeting message rather than "#home", defaults to a dynamic
+    // greeting based on time of day. E.g Good Morning.
     'showgreeting'   => getenv('SHOWGREETING')   ?:   true,
+    // Custom greeting string as alternative to built-in friendy greeting.
+    'customgreeting' => getenv('CUSTOMGREETING') ?:   '',
     // Show the search bar, requires /search/searchengines.json etc.
     'showsearch'     => getenv('SHOWSEARCH')     ?:   true,
     // Include the robots noindex meta tag in site header.

diff --git a/jumpapp/templates/header.mustache b/jumpapp/templates/header.mustache
@@ -33,7 +33,7 @@
     <body>
         <div class="content fixed hidden {{# checkstatus}}status{{/ checkstatus}}">
             <div class="greeting">
-            {{# greeting}}<span class="tagname"><span>#</span>{{greeting}}</span>{{/ greeting}}
+            {{# greeting}}<span class="tagname"><span></span>{{greeting}}</span>{{/ greeting}}
             {{^ greeting}}<span class="chosen"></span>{{/ greeting}}
             </div>
 
diff --git a/jumpapp/templates/partials/jsbundle.mustache b/jumpapp/templates/partials/jsbundle.mustache
@@ -1 +1 @@
-<script defer src="{{{wwwurl}}}/assets/js/index.fd2874ea51dbd2dad294.min.js"></script>
+<script defer src="{{{wwwurl}}}/assets/js/index.f2468ba60142a7aa8d24.min.js"></script>