From 6581bb5873b24d05b06ec92dcbc5943b36528508 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sun, 26 Jul 2015 22:08:24 +0200 Subject: [PATCH] Removed one not needed div level. --- .../ticket_zoom/article_view.js.coffee | 9 ++ .../views/ticket_zoom/article_view.jst.eco | 148 +++++++++--------- 2 files changed, 81 insertions(+), 76 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.js.coffee index 752338d53..dc7172f67 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_view.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_view.js.coffee @@ -75,6 +75,15 @@ class ArticleViewItem extends App.Controller # get articles @article = App.TicketArticle.fullLocal( @ticket_article_id ) + # set @el attributes + @el.addClass("ticket-article-item #{@article.sender.name.toLowerCase()}") + if @article.internal is true + @el.addClass('is-internal') + else + @el.removeClass('is-internal') + @el.attr('data-id', @article.id) + @el.attr('id', "article-#{@article.id}") + # check if rerender is needed return if !@hasChanged(@article) diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco index 2c649a092..ff7b2a567 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco @@ -1,89 +1,85 @@ -
+
+
+
+ <% if @article.from: %> +
+
<%- @T( 'From' ) %>
+
<%- @AddressLine(@article.from) %>
+
+ <% end %> + <% if @article.to: %> +
+
<%- @T( 'To' ) %>
+
<%- @AddressLine(@article.to) %>
+
+ <% end %> + <% if @article.cc: %> +
+
<%- @T( 'Cc' ) %>
+
<%- @AddressLine(@article.cc) %>
+
+ <% end %> + <% if @article.subject: %> +
+
<%- @T( 'Subject' ) %>
+
<%= @article.subject %>
+
+ <% end %> +
+
+
- -
-
-
- <% if @article.from: %> -
-
<%- @T( 'From' ) %>
-
<%- @AddressLine(@article.from) %>
+
+ <% if @article.sender.name isnt 'Agent': %> + <% position = 'left' %> + <% else: %> + <% position = 'right' %> + <% end %> +
+
+
+
+
+
+ <%- App.Utils.signatureIdentify( @article.html ) %> +
+
<%- @T('See more') %>
+
- <% end %> - <% if @article.to: %> -
-
<%- @T( 'To' ) %>
-
<%- @AddressLine(@article.to) %>
-
- <% end %> - <% if @article.cc: %> -
-
<%- @T( 'Cc' ) %>
-
<%- @AddressLine(@article.cc) %>
-
- <% end %> - <% if @article.subject: %> -
-
<%- @T( 'Subject' ) %>
-
<%= @article.subject %>
-
- <% end %> + <% if !_.isEmpty( @article.attachments ): %> +
+ +

<%- @article.attachments.length %> <%- @T('Attached Files') %>

+ <% for attachment in @article.attachments: %> +
+ <%= attachment.filename %> +
<%- @humanFileSize(attachment.size) %>
+
+ <% end %> +
+ <% end %>
+
-
- <% if @article.sender.name isnt 'Agent': %> - <% position = 'left' %> - <% else: %> - <% position = 'right' %> - <% end %> -
-
-
-
-
-
- <%- App.Utils.signatureIdentify( @article.html ) %> -
-
<%- @T('See more') %>
-
-
- <% if !_.isEmpty( @article.attachments ): %> -
- -

<%- @article.attachments.length %> <%- @T('Attached Files') %>

- <% for attachment in @article.attachments: %> -
- <%= attachment.filename %> -
<%- @humanFileSize(attachment.size) %>
-
- <% end %> -
+
+
+
+
+
<%- @T( 'Channel' ) %>
+
+ + <%- @T(@article.type.name) %> + <% if @article.type.name is 'email': %> + <%- @T( 'raw' ) %> <% end %>
+
-
-
-
-
-
<%- @T( 'Channel' ) %>
-
- - <%- @T(@article.type.name) %> - <% if @article.type.name is 'email': %> - <%- @T( 'raw' ) %> - <% end %> -
-
-
-
-
+
-
- - -
\ No newline at end of file +