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

Improved markup, QA need to be done by felix.

Browse source
This commit is contained in:
Martin Edenhofer 2014-08-26 01:34:22 +02:00
parent eeb2892205
commit 6ce1e7facf
3 changed files with 85 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
View file

@ -629,9 +629,9 @@ class ArticleView extends App.Controller
# runntime update # runntime update
if internal if internal
$(e.target).closest('.article-content').find('.text-bubble').addClass('internal') $(e.target).closest('.ticket-article-item').find('.text-bubble').addClass('internal')
else else
$(e.target).closest('.article-content').find('.text-bubble').removeClass('internal') $(e.target).closest('.ticket-article-item').find('.text-bubble').removeClass('internal')
show_toogle: (e) -> show_toogle: (e) ->
e.preventDefault() e.preventDefault()
@ -646,16 +646,16 @@ class ArticleView extends App.Controller
more_toogle: (e) -> more_toogle: (e) ->
e.preventDefault() e.preventDefault()
if !$(e.target).closest('.article-content').find('.article-meta.top').hasClass('hide') if !$(e.target).closest('.ticket-article-item').find('.article-meta.top').hasClass('hide')
$(e.target).closest('.article-content').find('.more').removeClass('hide') $(e.target).closest('.ticket-article-item').find('.more').removeClass('hide')
$(e.target).closest('.article-content').find('.close-details').addClass('hide') $(e.target).closest('.ticket-article-item').find('.close-details').addClass('hide')
$(e.target).closest('.article-content').find('.article-meta.top').addClass('hide') $(e.target).closest('.ticket-article-item').find('.article-meta.top').addClass('hide')
$(e.target).closest('.article-content').find('.article-meta.bottom').addClass('hide') $(e.target).closest('.ticket-article-item').find('.article-meta.bottom').addClass('hide')
else else
$(e.target).closest('.article-content').find('.more').addClass('hide') $(e.target).closest('.ticket-article-item').find('.more').addClass('hide')
$(e.target).closest('.article-content').find('.close-details').removeClass('hide') $(e.target).closest('.ticket-article-item').find('.close-details').removeClass('hide')
$(e.target).closest('.article-content').find('.article-meta.top').removeClass('hide') $(e.target).closest('.ticket-article-item').find('.article-meta.top').removeClass('hide')
$(e.target).closest('.article-content').find('.article-meta.bottom').removeClass('hide') $(e.target).closest('.ticket-article-item').find('.article-meta.bottom').removeClass('hide')
checkIfSignatureIsNeeded: (type) => checkIfSignatureIsNeeded: (type) =>

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

@ -1,8 +1,8 @@
<% for article in @articles: %> <% for article in @articles: %>
<div class="ticket-article-item bubble-grid <%= article.sender.name.toLowerCase() %> <%= article.type.name %>" data-id="<%= article.id %>" id="article-<%= article.id %>"> <div class="ticket-article-item bubble-grid <%= article.sender.name.toLowerCase() %> <%= article.type.name %>" data-id="<%= article.id %>" id="article-<%= article.id %>">
<div class="horizontal<%= ' reverse' if article.sender.name isnt 'Agent' %>">
<div class="avatar" style="background-image: url(<%= article.created_by.imageUrl %>)"></div>
<div class="article-content flex"> <div class="article-content-meta">
<div class="more"><%- @T('more') %></div> <div class="more"><%- @T('more') %></div>
<div class="close-details hide"><%- @T('close details') %></div> <div class="close-details hide"><%- @T('close details') %></div>
<div class="article-meta top hide"> <div class="article-meta top hide">
@ -31,7 +31,15 @@
</div> </div>
<% end %> <% end %>
</div> </div>
<div class="text-bubble <%= ' internal' if article.internal is true %>"><div class="bubble-arrow"></div><%- article.html %></div> </div>
<div class="article-content horizontal<%= ' reverse' if article.sender.name isnt 'Agent' %>">
<div class="avatar" style="background-image: url(<%= article.created_by.imageUrl %>)"></div>
<div class="flex text-bubble <%= ' internal' if article.internal is true %>"><div class="bubble-arrow"></div><%- article.html %></div>
</div>
<div class="article-content-meta">
<div class="article-meta bottom hide"> <div class="article-meta bottom hide">
<div class="horizontal article-meta-row"> <div class="horizontal article-meta-row">
<div class="article-meta-key"><%- @T( 'Kanal' ) %></div> <div class="article-meta-key"><%- @T( 'Kanal' ) %></div>
@ -44,6 +52,7 @@
</div> </div>
</div> </div>
</div> </div>
<% if article.attachments: %> <% if article.attachments: %>
<div class="always-shown"> <div class="always-shown">
<% for attachment in article.attachments: %> <% for attachment in article.attachments: %>
@ -51,6 +60,7 @@
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
<% if article.actions: %> <% if article.actions: %>
<div class="article-actions horizontal stretch"> <div class="article-actions horizontal stretch">
<% for action in article.actions: %> <% for action in article.actions: %>
@ -58,18 +68,8 @@
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
<!-- </div>
<div class="ticket-article ticket-article-item <% if article.internal is true: %> internal<% end %>" data-id="<%= article.id %>" id="article-<%= article.id %>">
<div class="avatar">
<img class="thumbnail user-popover" data-id="<%= article.created_by_id %>" src="<%= article.created_by.imageUrl %>" alt="">
</div>
<div class="ticket-article-message">
<div style="white-space:pre-wrap;" class="message"><%- article.html %></div>
-->
</div>
</div>
<small class="task-subline"><time class="humanTimeFromNow" datetime="<%- article.created_at %>" data-time="<%- article.created_at %>">?</time></small> <small class="task-subline"><time class="humanTimeFromNow" datetime="<%- article.created_at %>" data-time="<%- article.created_at %>">?</time></small>
</div> </div>
<% end %> <% end %>

8
app/assets/stylesheets/zzz.css.erb
View file

@ -426,6 +426,10 @@ table {
overflow-y: scroll; overflow-y: scroll;
} }
.inactive {
color: #ddd !important;
}
/* /*
#content > *:not(.active) { #content > *:not(.active) {
display: none !important; display: none !important;
@ -2382,6 +2386,10 @@ footer {
margin-bottom: 33px; margin-bottom: 33px;
} }
.article-content-meta {
margin-left: 55px;
margin-right: 55px;
}
.article-content { .article-content {
margin-right: 55px; margin-right: 55px;
} }