From 37b2bd154be263e95edb3ca66420e0357535b183 Mon Sep 17 00:00:00 2001
From: Dylan Hardison <dylan@mozilla.com>
Date: Thu, 9 Jun 2016 15:28:26 -0400
Subject: Bug 1209219 - Add an option to the disable the "X months ago" format
 for dates

---
 .../en/default/bug_modal/activity_stream.html.tmpl        |  4 ++++
 .../template/en/default/bug_modal/attachments.html.tmpl   |  9 +++++++--
 .../BugModal/template/en/default/bug_modal/edit.html.tmpl | 10 ++++++++--
 .../template/en/default/bug_modal/flags.html.tmpl         |  9 +++++++--
 .../template/en/default/bug_modal/rel_time.html.tmpl      | 15 +++++++--------
 .../default/hook/global/setting-descs-settings.none.tmpl  |  1 +
 6 files changed, 34 insertions(+), 14 deletions(-)

(limited to 'extensions/BugModal/template')

diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
index 807f5772f..edec45428 100644
--- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl
@@ -158,7 +158,11 @@
       <table class="layout-table change-head default-collapsed" id="cc-[% comment.count FILTER none %]">
       <tr>
         <td class="comment-collapse-reason"
+            [% IF user.setting("ui_use_absolute_time") == "on" %]
+            title="[% comment.author.moz_nick FILTER html %] [[% comment.creation_ts FILTER time("%Y-%m-%d %H:%M %Z") FILTER html %]]">
+            [% ELSE %]
             title="[% comment.author.moz_nick FILTER html %] [[% comment.creation_ts FILTER time_duration FILTER html %]]">
+            [% END %]
             Comment hidden ([% comment.collapsed_reason FILTER html %])
         </td>
         <td class="comment-actions">
diff --git a/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl
index f9d219497..0604b41bc 100644
--- a/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl
@@ -68,8 +68,13 @@
             [% ELSE %]
               <span
             [% END %]
-              class="flag-name-status rel-time-title[% " activity-ref" IF activity_id %]"
-              title="[% flag.creation_date FILTER time_duration FILTER html %]"
+              [% IF user.setting("ui_use_absolute_time") == "on" %]
+                  class="flag-name-status abs-time-title[% " activity-ref" IF activity_id %]"
+                  title="[% flag.creation_date FILTER time("%Y-%m-%d %H:%M %Z") FILTER html %]"
+              [% ELSE %]
+                  class="flag-name-status rel-time-title[% " activity-ref" IF activity_id %]"
+                  title="[% flag.creation_date FILTER time_duration FILTER html %]"
+              [% END %]
               data-time="[% flag.creation_date FILTER epoch FILTER none %]"
             >
               [%+ flag.type.name FILTER html %][% flag.status FILTER none %]
diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
index f18d0e7b7..f78f74e0b 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -245,8 +245,14 @@
             [% ELSE %]
               (<span
             [% END %]
-              class="flag-name-status rel-time-title[% " activity-ref" IF activity_id %]"
-              title="[% ni.creation_date FILTER time_duration FILTER html %]"
+                   <!-- time("%Y-%m-%d %H:%M %Z") -->
+              [% IF user.setting("ui_use_absolute_time") == "on" %]
+                class="flag-name-status abs-time-title[% " activity-ref" IF activity_id %]"
+                title="[% ni.creation_date FILTER time("%Y-%m-%d %H:%M %Z") FILTER html %]"
+              [% ELSE %]
+                class="flag-name-status rel-time-title[% " activity-ref" IF activity_id %]"
+                title="[% ni.creation_date FILTER time_duration FILTER html %]"
+              [% END %]
               data-time="[% ni.creation_date FILTER epoch FILTER none %]"
             >NeedInfo
             [% activity_id ? "</a>" : "</span>" %]
diff --git a/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
index 53b5c08ca..6c49ef784 100644
--- a/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
@@ -84,8 +84,13 @@
       [% ELSE %]
         <span
       [% END %]
-        class="rel-time-title[% " activity-ref" IF activity_id %]"
-        title="[% f.creation_date FILTER time_duration FILTER html %]"
+        [% IF user.setting("ui_use_absolute_time") == "on"  %]
+            class="abs-time-title[% " activity-ref" IF activity_id %]"
+            title="[% f.creation_date FILTER time('%Y-%m-%d %H:%M %Z') %]"
+        [% ELSE %]
+            class="rel-time-title[% " activity-ref" IF activity_id %]"
+            title="[% f.creation_date FILTER time_duration FILTER html %]"
+        [% END %]
         data-time="[% f.creation_date FILTER epoch FILTER none %]"
       >
         [% f.type.name FILTER html %]
diff --git a/extensions/BugModal/template/en/default/bug_modal/rel_time.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/rel_time.html.tmpl
index 26a1b709b..8f8f4925b 100644
--- a/extensions/BugModal/template/en/default/bug_modal/rel_time.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/rel_time.html.tmpl
@@ -9,13 +9,12 @@
 [%#
   # ts: timestamp
   #%]
-
+[% IF user.setting("ui_use_absolute_time") == "on" -%]
+<span class="rel-time-title" title="[% ts FILTER time_duration FILTER html %]" data-time="[% ts FILTER epoch FILTER none %]">
+  [%~ ts FILTER time("%Y-%m-%d %H:%M %Z"); ~%]
+</span>
+[% ELSE -%]
 <span class="rel-time" title="[% ts FILTER time("%Y-%m-%d %H:%M %Z") %]" data-time="[% ts FILTER epoch FILTER none %]">
-  [%~
-    IF content.defined;
-      content;
-    ELSE;
-      ts FILTER time_duration FILTER html;
-    END;
-  ~%]
+  [%~ ts FILTER time_duration FILTER html; ~%]
 </span>
+[% END -%]
\ No newline at end of file
diff --git a/extensions/BugModal/template/en/default/hook/global/setting-descs-settings.none.tmpl b/extensions/BugModal/template/en/default/hook/global/setting-descs-settings.none.tmpl
index 4ca9c3003..0a253b282 100644
--- a/extensions/BugModal/template/en/default/hook/global/setting-descs-settings.none.tmpl
+++ b/extensions/BugModal/template/en/default/hook/global/setting-descs-settings.none.tmpl
@@ -9,4 +9,5 @@
 [%
   setting_descs.ui_experiments = "Use experimental user interface"
   setting_descs.ui_remember_collapsed = "Remember visibility of header sections when viewing a bug"
+  setting_descs.ui_use_absolute_time = "Use absolute format instead of relative time when viewing a bug"
 %]
-- 
cgit v1.2.3-24-g4f1b