From 8393058ac15d72be702a6de481d6129aed4bbef3 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 19 Jun 2013 00:33:19 -0700
Subject: new ui for tickets

---
 help/app/views/tickets/_comment.html.haml | 34 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'help/app/views/tickets/_comment.html.haml')

diff --git a/help/app/views/tickets/_comment.html.haml b/help/app/views/tickets/_comment.html.haml
index 501ceec..c02246c 100644
--- a/help/app/views/tickets/_comment.html.haml
+++ b/help/app/views/tickets/_comment.html.haml
@@ -1,20 +1,20 @@
-- # style is super ugly but just for now
 - if admin? or !comment.private # only show comment if user is admin or comment is not private
   %tr
-    %td
-      - if comment.posted_by_user
-        %b
-          = 'Posted by' + (comment.posted_by_user.is_admin? ? ' admin' : '') + ':'
-        = comment.posted_by_user.login
-      - else
-        %b
-          Unauthenticated post
+    %td.user
+      %div
+        %strong
+          - if comment.posted_by_user
+            = comment.posted_by_user.login
+          - else
+            = t(:unknown)
+      %div= comment.posted_at.to_s(:short)
+      - if comment.posted_by_user.is_admin?
+        %div
+          %span.label.label-inverse
+            = t(:admin)
       - if comment.private
-        (Private comment)
-      .pull-right
-        %b
-          Posted at:
-        = comment.posted_at.to_s(:short)
-      %br
-      = comment.body
-
+        %div
+          %span.label.label-important
+            = t(:private)
+    %td.comment
+      = comment.body
\ No newline at end of file
-- 
cgit v1.2.3


From d121373b7c21a29e47708e8b67aeb964202e52c5 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sun, 23 Jun 2013 22:14:45 -0700
Subject: fix several issues with tickets: js error, when to redirect,
 navigation, localization.

---
 help/app/views/tickets/_comment.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'help/app/views/tickets/_comment.html.haml')

diff --git a/help/app/views/tickets/_comment.html.haml b/help/app/views/tickets/_comment.html.haml
index c02246c..4252eee 100644
--- a/help/app/views/tickets/_comment.html.haml
+++ b/help/app/views/tickets/_comment.html.haml
@@ -6,9 +6,9 @@
           - if comment.posted_by_user
             = comment.posted_by_user.login
           - else
-            = t(:unknown)
+            = t(:anonymous)
       %div= comment.posted_at.to_s(:short)
-      - if comment.posted_by_user.is_admin?
+      - if comment.posted_by_user && comment.posted_by_user.is_admin?
         %div
           %span.label.label-inverse
             = t(:admin)
-- 
cgit v1.2.3