]> git.ipfire.org Git - people/jschlag/pbs.git/commitdiff
Revert "Drop unused HeadingDateModule"
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Oct 2017 22:38:31 +0000 (23:38 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Oct 2017 22:38:31 +0000 (23:38 +0100)
This reverts commit 5f8985bb5a43c192f53a1398da1d320b0fbc7c0c.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/web/__init__.py
src/web/ui_modules.py

index 2ac913336a1db3fa75ed4d29d685710e43bc29ff..27fd59f4048b7fba4e15078375351864773b55eb 100644 (file)
@@ -82,6 +82,8 @@ class Application(tornado.web.Application):
                                "UsersTable"         : ui_modules.UsersTableModule,
                                "WatchersSidebarTable" : ui_modules.WatchersSidebarTableModule,
 
+                               "HeadingDate"        : ui_modules.HeadingDateModule,
+
                                "SelectLocale"       : ui_modules.SelectLocaleModule,
                                "SelectTimezone"     : ui_modules.SelectTimezoneModule,
                        },
index 88b8070972eca0dd70decb055a5d3c941123ff62..ed6c79d281c40dc54cff727b40b536238d62ff2e 100644 (file)
@@ -129,6 +129,26 @@ class FooterModule(UIModule):
                return self.render_string("modules/footer.html")
 
 
+class HeadingDateModule(UIModule):
+       def render(self, date):
+               _ = self.locale.translate
+
+               # Check if this is today.
+               today = datetime.date.today()
+               if date == today:
+                       return _("Today")
+
+               # Check if this was yesterday.
+               yesterday = today - datetime.timedelta(days=1)
+               if date == yesterday:
+                       return _("Yesterday")
+
+               # Convert date to datetime.
+               date = datetime.datetime(date.year, date.month, date.day)
+
+               return self.locale.format_date(date, shorter=True, relative=False)
+
+
 class PackagesTableModule(UIModule):
        def render(self, job, packages):
                return self.render_string("modules/packages-table.html", job=job,