Event Labels xibosignage/xibo#1502

dasgarner · May 25, 2018 · c2bceef · c2bceef
1 parent f706f3d
commit c2bceef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/lib/Widget/Calendar.php b/lib/Widget/Calendar.php
@@ -99,6 +99,7 @@ public function edit()
         $this->setOption('uri', urlencode($this->getSanitizer()->getString('uri')));
         $this->setOption('name', $this->getSanitizer()->getString('name'));
         $this->setOption('customInterval', $this->getSanitizer()->getString('customInterval'));
+        $this->setOption('eventLabelNow', $this->getSanitizer()->getString('eventLabelNow'));
 
         // Other options
         $this->setOption('dateFormat', $this->getSanitizer()->getString('dateFormat'));

diff --git a/modules/calendar-form-edit.twig b/modules/calendar-form-edit.twig
@@ -103,6 +103,10 @@
                         {% set helpText %}{% trans "Enter a string representing the interval to get events for." %}{% endset %}
                         {{ forms.input("customInterval", title, module.getOption("customInterval"), helpText)}}
 
+                        {% set title %}{% trans "Label Now" %}{% endset %}
+                        {% set helpText %}{% trans "Should we label the current event? We will use the current Date/Time to work out if the event is current. This will be replaced in the [Label] template tag." %}{% endset %}
+                        {{ forms.input("eventLabelNow", title, module.getOption("eventLabelNow"), helpText)}}
+
                         <div class="col-sm-6">
                             <div class="well">
                                 <div class="text-center text-info">{% trans "Available Substitutions" %}</div>
@@ -113,6 +117,7 @@
                                     <li class="ckeditor_snippits" linkedto="ta_text">Location</li>
                                     <li class="ckeditor_snippits" linkedto="ta_text">StartDate</li>
                                     <li class="ckeditor_snippits" linkedto="ta_text">EndDate</li>
+                                    <li class="ckeditor_snippits" linkedto="ta_text">Label</li>
                                 </ul>
                             </div>
                         </div>