web: Refactor events module

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/events/modules/system-message.html b/src/templates/events/modules/system-message.html
index 4adb5191b04acdfc9b7fc111d78762943d9a4f3a..41ed67d9e3d4a844f5ec751a7e18d2fecd6117b7 100644 (file)
--- a/src/templates/events/modules/system-message.html
+++ b/src/templates/events/modules/system-message.html
@@ -1,41 +1,39 @@
-<div class="media-object">
+<div class="media">
        {% block thumbnail %}{% end block %}
 
-       <div class="media-object-section main-section">
-               {% block content %}
-                       <p>
-                               {% if event.type == "build-created" %}
-                                       {{ _("Build Created") }}
-                               {% elif event.type == "build-deleted" %}
-                                       {{ _("Build Deleted") }}
-                               {% elif event.type == "build-watcher-added" %}
-                                       {{ _("%s started watching this build") % event.user }}
-                               {% elif event.type == "build-watcher-removed" %}
-                                       {{ _("%s stopped watching this build") % event.user }}
-                               {% else %}
-                                       {{ _("- Unknown Event -") }}
-                               {% end %}
-                       </p>
-               {% end %}
-
-               <small>
-                       {{ locale.format_date(event.t) }}
+       <div class="media-content">
+               <p>
+                       {% if event.type == "build-created" %}
+                               {{ _("Build Created") }}
+                       {% elif event.type == "build-deleted" %}
+                               {{ _("Build Deleted") }}
+                       {% elif event.type == "build-watcher-added" %}
+                               {{ _("%s started watching this build") % event.user }}
+                       {% elif event.type == "build-watcher-removed" %}
+                               {{ _("%s stopped watching this build") % event.user }}
+                       {% else %}
+                               {{ _("- Unknown Event -") }}
+                       {% end %}
 
-                       {% if event.build %}
-                               &dash;
+                       <small>{{ locale.format_date(event.t, shorter=True) }}</small>
+               </p>
 
-                               <a href="/builds/{{ event.build.uuid }}">
-                                       {{ event.build }}
-                               </a>
-                       {% end %}
+               {% block content %}{% end %}
 
-                       {% if event.by_user %}
-                               &dash;
+               <nav class="level">
+                       <div class="level-left is-small">
+                               {% if event.build %}
+                                       <a class="level-item" href="/builds/{{ event.build.uuid }}">
+                                               {{ event.build }}
+                                       </a>
+                               {% end %}
 
-                               <a href="/users/{{ event.by_user.name }}">
-                                       {{ _("by %s") % event.by_user }}
-                               </a>
-                       {% end %}
-               </small>
+                               {% if event.by_user %}
+                                       <a class="level-item" href="/users/{{ event.by_user.name }}">
+                                               {{ _("by %s") % event.by_user }}
+                                       </a>
+                               {% end %}
+                       </div>
+               </nav>
        </div>
 </div>

diff --git a/src/templates/events/modules/user-message.html b/src/templates/events/modules/user-message.html
index e79928bbbc88c1138a9adad68f79dd947e64e274..6b4f83cc616770a24cc70e17ebc2918bd6573c2f 100644 (file)
--- a/src/templates/events/modules/user-message.html
+++ b/src/templates/events/modules/user-message.html
@@ -3,9 +3,9 @@
 {% block thumbnail %}
        {% set user = event.user or event.by_user %}
 
-       <div class="media-object-section">
-               <div class="thumbnail">
-                       <img src="{{ user.avatar(96) }}" alt="{{ user }}">
-               </div>
+       <div class="media-left">
+               <p class="image is-48x48">
+                       <img src="{{ user.avatar(64) }}">
+               </p>
        </div>
 {% end block %}