From: Jonatan Schlag Date: Sat, 2 Dec 2017 16:22:48 +0000 (+0100) Subject: bootstrap4: reworked log module X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fff1e9353d98cab036108cb8453f01ce46ca3a19;p=pbs.git bootstrap4: reworked log module Signed-off-by: Jonatan Schlag --- diff --git a/src/templates/modules/log-entry-small.html b/src/templates/modules/log-entry-small.html index 24632b15..5ea2af60 100644 --- a/src/templates/modules/log-entry-small.html +++ b/src/templates/modules/log-entry-small.html @@ -1,8 +1,7 @@ -
  • -
    +
  • -

    +

    {{ format_date(entry.time) }}

    diff --git a/src/templates/modules/log-entry.html b/src/templates/modules/log-entry.html index 7b995493..a2fcff06 100644 --- a/src/templates/modules/log-entry.html +++ b/src/templates/modules/log-entry.html @@ -1,22 +1,21 @@ -
  • -
    - +
  • {% block body %} {% if u %} - - {{ u.realname }} - + + {{ u.realname }} {% end %} -
    + {% block title %} -

    +

    {% block extra-title %}{% end block %} {{ format_date(entry.time) }}

    {% if entry.user %} -

    +

    {% if current_user == entry.user %} {{ _("You") }} {% else %} diff --git a/src/templates/modules/log.html b/src/templates/modules/log.html index 755cb6ef..99203aca 100644 --- a/src/templates/modules/log.html +++ b/src/templates/modules/log.html @@ -1,9 +1,11 @@ -
      - {% for entry in entries %} - {% if entry.type == "comment" %} - {% module LogEntryComment(entry, **args) %} - {% else %} - {% module LogEntry(entry, **args) %} +
      +
        + {% for entry in entries %} + {% if entry.type == "comment" %} + {% module LogEntryComment(entry, **args) %} + {% else %} + {% module LogEntry(entry, **args) %} + {% end %} {% end %} - {% end %} -
      +
    +

    \ No newline at end of file