Redesign log messages.

diff --git a/data/templates/modules/log-entry-comment.html b/data/templates/modules/log-entry-comment.html
index d576ff11dbdd7136764fbcdbbd781688de4db96a..d66f1d8bf86224d1919abbe58b142891070f0c33 100644 (file)
--- a/data/templates/modules/log-entry-comment.html
+++ b/data/templates/modules/log-entry-comment.html
@@ -2,11 +2,15 @@
 
 {% block extra-title %}
        {% if entry.vote == "up" %}
-               <span class="label label-success pull-right"
-                       title="{{ _("This build works for %s.") % entry.user.firstname }}">+{{ entry.credit }}</span>
+               <span class="label label-success" title="{{ _("This build works for %s.") % entry.user.firstname }}">
+                       +{{ entry.credit }}
+               </span>
+               &dash;
        {% elif entry.vote == "down" %}
-               <span class="label label-important pull-right"
-                       title="{{ _("This build does not work for %s.") % entry.user.firstname }}">-1</span>
+               <span class="label label-important" title="{{ _("This build does not work for %s.") % entry.user.firstname }}">
+                       -{{ entry.credit }}
+               </span>
+               &dash;
        {% end %}
 {% end %}
 
@@ -14,6 +18,8 @@
        {% if entry.get_message(current_user) %}
                {% module Text(entry.get_message(current_user), pre=False) %}
        {% else %}
-               <em>{{ _("No comment given.") }}</em>
+               <p>
+                       <em>{{ _("No comment given.") }}</em>
+               </p>
        {% end %}
 {% end %}

diff --git a/data/templates/modules/log-entry-small.html b/data/templates/modules/log-entry-small.html
new file mode 100644 (file)
index 0000000..4ae75f5
--- /dev/null
+++ b/data/templates/modules/log-entry-small.html
@@ -0,0 +1,11 @@
+<li class="media">
+       <hr>
+
+       <div class="media-body">
+               <p class="muted pull-right">
+                       {{ format_date(entry.time) }}
+               </p>
+
+               {% module Text(entry.get_message(current_user), pre=False) %}
+       </div>
+</li>

diff --git a/data/templates/modules/log-entry.html b/data/templates/modules/log-entry.html
index 70f3446f4e59c5e56e2d2f7a43ddb3e78e056a7e..c73fa92012e8957977506db99a916c742dd85f54 100644 (file)
--- a/data/templates/modules/log-entry.html
+++ b/data/templates/modules/log-entry.html
@@ -1,40 +1,34 @@
-<div class="well well-small">
+<li class="media">
+       <hr>
+
        {% block body %}
-               {% block title %}
-                       {% block extra-title %}{% end block %}
-                       <h4>
-                               {% if entry.system_msg %}
-                                       <i class="icon-star"></i>
-                               {% else %}
-                                       <i class="icon-comment"></i>
-                               {% end %}
+               {% if u %}
+                       <a class="pull-left hidden-phone" href="/user/{{ u.name }}">
+                               <img class="media-object" src="{{ u.gravatar_icon(96) }}" alt="{{ u.realname }}">
+                       </a>
+               {% end %}
+
+               <div class="media-body">
+                       {% block title %}
+                               <p class="muted pull-right">
+                                       {% block extra-title %}{% end block %}
+                                       {{ format_date(entry.time) }}
+                               </p>
 
                                {% if entry.user %}
-                                       {% if current_user == entry.user %}
-                                               <a href="/profile">{{ _("You") }}</a>
-                                       {% else %}
-                                               <a href="/user/{{ entry.user.name }}">{{ entry.user.realname }}</a>
-                                       {% end %}
-                               {% else %}
-                                       {{ _("Pakfire Build Service") }}
+                                       <h4 class="media-heading">
+                                               {% if current_user == entry.user %}
+                                                       <a href="/profile">{{ _("You") }}</a>
+                                               {% else %}
+                                                       <a href="/user/{{ entry.user.name }}">{{ entry.user.realname }}</a>
+                                               {% end %}
+                                       </h4>
                                {% end %}
-                               -
-                               {{ format_date(entry.time) }}
-                       </h4>
-               {% end block %}
+                       {% end block %}
 
-               {% block message %}
-                       <p>
+                       {% block message %}
                                {% module Text(entry.get_message(current_user), pre=False) %}
-                       </p>
-               {% end block %}
-
-               {% block footer %}
-                       {% if entry.get_footer(current_user) %}
-                               <p>
-                                       {{ entry.get_footer(current_user) }}
-                               </p>
-                       {% end %}
-               {% end block %}
+                       {% end block %}
+               </div>
        {% end block %}
-</div>
+</li>

diff --git a/data/templates/modules/log.html b/data/templates/modules/log.html
index 33f46119179701a432ae586bfbdd9aabf39c8373..755cb6efd955adbcdcdf49364a46fd2cbfcf6053 100644 (file)
--- a/data/templates/modules/log.html
+++ b/data/templates/modules/log.html
@@ -1,4 +1,4 @@
-<div class="log">
+<ul class="media-list">
        {% for entry in entries %}
                {% if entry.type == "comment" %}
                        {% module LogEntryComment(entry, **args) %}
@@ -6,4 +6,4 @@
                        {% module LogEntry(entry, **args) %}
                {% end %}
        {% end %}
-</div>
+</ul>

diff --git a/web/ui_modules.py b/web/ui_modules.py
index 1550318094cf6b618d4f0c18c29eb8a13ffcc7ac..59f34fe70eafd2fd9327f510bc252e6d73b5f03a 100644 (file)
--- a/web/ui_modules.py
+++ b/web/ui_modules.py
@@ -2,6 +2,7 @@
 
 import re
 import string
+import textile
 import tornado.escape
 import tornado.web
 
@@ -52,7 +53,7 @@ class TextModule(UIModule):
                if pre:
                        return "<pre>%s</pre>" % o
 
-               return o.replace("\n", "<br />")
+               return textile.textile(o)
 
 
 class ModalModule(UIModule):
@@ -203,15 +204,19 @@ class LogModule(UIModule):
 
 
 class LogEntryModule(UIModule):
-       def render(self, entry, **args):
-               return self.render_string("modules/log-entry.html",
-                       entry=entry, **args)
+       def render(self, entry, small=None, **args):
+               if small or entry.system_msg:
+                       template = "modules/log-entry-small.html"
+               else:
+                       template = "modules/log-entry.html"
+
+               return self.render_string(template, entry=entry, u=entry.user, **args)
 
 
 class LogEntryCommentModule(LogEntryModule):
        def render(self, entry, **args):
                return self.render_string("modules/log-entry-comment.html",
-                       entry=entry, **args)
+                       entry=entry, u=entry.user, **args)
 
 
 class MaintainerModule(UIModule):