Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed one not needed div level.

Browse source
This commit is contained in:
Martin Edenhofer 2015-07-26 22:08:24 +02:00
parent 8b0e6c8cee
commit 6581bb5873
2 changed files with 81 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/app/controllers/ticket_zoom/article_view.js.coffee
View file

@ -75,6 +75,15 @@ class ArticleViewItem extends App.Controller
# get articles # get articles
@article = App.TicketArticle.fullLocal( @ticket_article_id ) @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 # check if rerender is needed
return if !@hasChanged(@article) return if !@hasChanged(@article)

22
app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
View file

@ -1,7 +1,4 @@
<div class="ticket-article-item <%= @article.sender.name.toLowerCase() %> <%= @article.type.name %><%= ' is-internal' if @article.internal is true %>" data-id="<%= @article.id %>" id="article-<%= @article.id %>"> <div class="article-meta-clip top">
<div class="article-meta-clip top">
<div class="article-content-meta top hide"> <div class="article-content-meta top hide">
<div class="article-meta top"> <div class="article-meta top">
<% if @article.from: %> <% if @article.from: %>
@ -30,9 +27,9 @@
<% end %> <% end %>
</div> </div>
</div> </div>
</div> </div>
<div class="article-content zIndex-1"> <div class="article-content zIndex-1">
<% if @article.sender.name isnt 'Agent': %> <% if @article.sender.name isnt 'Agent': %>
<% position = 'left' %> <% position = 'left' %>
<% else: %> <% else: %>
@ -64,9 +61,9 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="article-meta-clip bottom"> <div class="article-meta-clip bottom">
<div class="article-content-meta bottom hide"> <div class="article-content-meta bottom hide">
<div class="article-meta bottom"> <div class="article-meta bottom">
<div class="horizontal article-meta-row"> <div class="horizontal article-meta-row">
@ -81,9 +78,8 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="js-article-actions"></div>
<small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="<%- @article.created_at %>">?</time></small>
</div> </div>
<div class="js-article-actions"></div>
<small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="<%- @article.created_at %>">?</time></small>