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

Fixed missing initial article "internal" border. Removed not needed z-index classes.

Browse source
This commit is contained in:
Martin Edenhofer 2016-05-06 14:27:11 +02:00
parent 97aac2cb0f
commit 179582852f
8 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/ticket_zoom/article_view.coffee
View file

@ -84,6 +84,8 @@ class ArticleViewItem extends App.ObserverController
@el.addClass("ticket-article-item #{article.sender.name.toLowerCase()}")
@el.attr('data-id', article.id)
@el.attr('id', "article-#{article.id}")
if article.internal
@el.addClass('is-internal')
# prepare html body
if article.content_type is 'text/html'

2
app/assets/javascripts/app/views/layout_ref/chat_to_ticket.jst.eco
View file

@ -49,7 +49,7 @@
<div class="formGroup-label">
<label for="Ticket_448391_customer_id">Customer <span>*</span></label>
</div>
<div class="controls"><div class="dropdown js-recipientDropdown zIndex-2"><div class="u-positionOrigin">
<div class="controls"><div class="dropdown js-recipientDropdown"><div class="u-positionOrigin">
<input type="hidden" name="customer_id" value="">
<input name="customer_id_completion" class="user-select form-control" autocapitalize="off" placeholder="Enter Person or Organization/Company" autocomplete="off" role="textbox" aria-autocomplete="list" aria-haspopup="true">
<svg class="icon icon-arrow-down dropdown-arrow"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="assets/images/icons.svg#icon-arrow-down"></use></svg>

16
app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco
View file

@ -55,7 +55,7 @@
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<span class="avatar unique user-popover " data-id="2" style="background-position: -96.5079185759074px -112.28590086669901px;" data-placement="left" data-original-title="" title="">NB</span>
<div class="flex bubble-gap internal-border">
<div class="textBubble">
@ -102,7 +102,7 @@ The <a href="http://Zammad.org" title="http://Zammad.org" target="_blank">Zammad
</div>
</div>
</div>
<small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2014-07-11T10:10:32.000Z" title="2014-07-11 12:10">2014-07-11</time></small>
<small class="task-subline"><time class="humanTimeFromNow" data-time="2014-07-11T10:10:32.000Z" title="2014-07-11 12:10">2014-07-11</time></small>
</div>
<div class="ticket-article-item agent note" data-id="23" id="article-23">
@ -116,7 +116,7 @@ The <a href="http://Zammad.org" title="http://Zammad.org" target="_blank">Zammad
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<span class="avatar user-popover" data-id="3" style="background-image: url(api/v1/users/image/bb100af55234cf61fb6f207636f095f8)" data-placement="right" data-original-title="" title=""></span>
<div class="flex bubble-gap internal-border">
<div class="textBubble"><div class="bubble-arrow"></div>Hallp HP, du kannst dich nur einmal einloggen. Was machst du genau?</div>
@ -140,7 +140,7 @@ The <a href="http://Zammad.org" title="http://Zammad.org" target="_blank">Zammad
</div>
</div>
</div>
<small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2014-08-05T13:34:01.000Z" title="2014-08-05 15:34">2014-08-05</time></small>
<small class="task-subline"><time class="humanTimeFromNow" data-time="2014-08-05T13:34:01.000Z" title="2014-08-05 15:34">2014-08-05</time></small>
</div>
<div class="ticket-article-item customer phone" data-id="1" id="article-1">
@ -154,7 +154,7 @@ The <a href="http://Zammad.org" title="http://Zammad.org" target="_blank">Zammad
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<span class="avatar unique user-popover " data-id="2" style="background-position: -96.5079185759074px -112.28590086669901px;" data-placement="left" data-original-title="" title="">NB</span>
<div class="flex bubble-gap internal-border">
<div class="textBubble"><div class="bubble-arrow"></div>Ich wollte mir die Lyrics von Maria herunterladen, aber ich schaff es einfach nicht, da raufzukommen. Schick mir bitte mein Passwort.
@ -186,7 +186,7 @@ Grüße, Peter</div>
</div>
</div>
</div>
<small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2014-07-11T10:10:32.000Z" title="2014-07-11 12:10">2014-07-11</time></small>
<small class="task-subline"><time class="humanTimeFromNow" data-time="2014-07-11T10:10:32.000Z" title="2014-07-11 12:10">2014-07-11</time></small>
</div>
<div class="ticket-article-item agent note" data-id="23" id="article-23">
@ -200,7 +200,7 @@ Grüße, Peter</div>
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<span class="avatar user-popover " data-id="3" style="background-image: url(api/v1/users/image/bb100af55234cf61fb6f207636f095f8)" data-placement="right" data-original-title="" title=""></span>
<div class="flex bubble-gap internal-border">
<div class="textBubble">
@ -269,7 +269,7 @@ Oliver<br>
</div>
</div>
</div>
<small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2014-08-05T13:34:01.000Z" title="2014-08-05 15:34">2014-08-05</time></small>
<small class="task-subline"><time class="humanTimeFromNow" data-time="2014-08-05T13:34:01.000Z" title="2014-08-05 15:34">2014-08-05</time></small>
</div>
</div>
</div>

2
app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco
View file

@ -7,7 +7,7 @@
<h2>Article Reply</h2>
<div class="article-new">
<div class="article-content zIndex-5">
<div class="article-content">
<div class="internal-border">
<div class="textBubble">
<div class="bubble-arrow"></div>

14
app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco
View file

@ -69,7 +69,7 @@
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<div class="js-avatar">
<span class="avatar unique size-40 user-popover" data-id="2" data-original-title="" style="background-position: -96.5079185759074px -112.28590086669901px;" title="">NB</span>
</div>
@ -155,7 +155,7 @@
<div class="article-content article-actions horizontal stretch">
<a class="article-action u-clickable" data-type="internal" href="">set to internal</a> <a class="article-action u-clickable" data-type="reply" href="#">reply</a> <a class="article-action u-clickable" data-type="split" href="#ticket/create/1/1">split</a>
</div>
</div><small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2015-01-12T12:58:42.000Z" title="01/12/2015 13:58">01/12/2015</time></small>
</div><small class="task-subline"><time class="humanTimeFromNow" data-time="2015-01-12T12:58:42.000Z" title="01/12/2015 13:58">01/12/2015</time></small>
</div>
<div class="ticket-article-item agent" data-id="2" id="article-2">
@ -175,7 +175,7 @@
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<div class="js-avatar">
<span class="avatar user-popover size-40" data-id="3" data-original-title="" style="background-image: url(api/v1/users/image/f8729042ca563c5a0161d232f045728a)" title=""></span>
</div>
@ -329,7 +329,7 @@
<div class="article-content article-actions horizontal stretch">
<a class="article-action u-clickable" data-type="internal" href="">set to internal</a> <a class="article-action u-clickable" data-type="split" href="#ticket/create/1/2">split</a>
</div>
</div><small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2015-01-12T14:02:35.000Z" title="01/12/2015 15:02">01/12/2015</time></small>
</div><small class="task-subline"><time class="humanTimeFromNow" data-time="2015-01-12T14:02:35.000Z" title="01/12/2015 15:02">01/12/2015</time></small>
</div>
<div class="ticket-article-item agent" data-id="6" id="article-6">
@ -349,7 +349,7 @@
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<div class="js-avatar">
<span class="avatar user-popover size-40" data-id="4" data-original-title="" style="background-image: url(api/v1/users/image/f7d0245ed93f0ea29edc32252f6729c6)" title=""></span>
</div>
@ -393,7 +393,7 @@
<div class="article-content article-actions horizontal stretch">
<a class="article-action u-clickable" data-type="internal" href="">set to internal</a> <a class="article-action u-clickable" data-type="split" href="#ticket/create/1/6">split</a>
</div>
</div><small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2015-05-05T10:25:01.000Z" title="05/05/2015 12:25">05/05/2015</time></small>
</div><small class="task-subline"><time class="humanTimeFromNow" data-time="2015-05-05T10:25:01.000Z" title="05/05/2015 12:25">05/05/2015</time></small>
</div>
</div>
@ -427,7 +427,7 @@
</div>
</div>
<div class="article-content zIndex-5 bubble-gap">
<div class="article-content bubble-gap">
<div class="internal-border">
<div class="input form-group hide">

16
app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco
View file

@ -75,7 +75,7 @@
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<span class="avatar unique user-popover " data-id="2" style="background-position: -96.5079185759074px -112.28590086669901px;" data-placement="left" data-original-title="" title="">NB</span>
<div class="flex bubble-gap internal-border">
<div class="textBubble">
@ -127,7 +127,7 @@
</div>
</div>
</div>
<small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2014-07-11T10:10:32.000Z" title="2014-07-11 12:10">2014-07-11</time></small>
<small class="task-subline"><time class="humanTimeFromNow" data-time="2014-07-11T10:10:32.000Z" title="2014-07-11 12:10">2014-07-11</time></small>
</div>
<div class="ticket-article-item agent note" data-id="23" id="article-23">
@ -141,7 +141,7 @@
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<span class="avatar user-popover" data-id="3" style="background-image: url(api/v1/users/image/bb100af55234cf61fb6f207636f095f8)" data-placement="right" data-original-title="" title=""></span>
<div class="flex bubble-gap internal-border">
<div class="textBubble"><div class="bubble-arrow"></div>
@ -167,7 +167,7 @@
</div>
</div>
</div>
<small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2014-08-05T13:34:01.000Z" title="2014-08-05 15:34">2014-08-05</time></small>
<small class="task-subline"><time class="humanTimeFromNow" data-time="2014-08-05T13:34:01.000Z" title="2014-08-05 15:34">2014-08-05</time></small>
</div>
<div class="ticket-article-item customer phone" data-id="1" id="article-1">
@ -181,7 +181,7 @@
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<span class="avatar unique user-popover " data-id="2" style="background-position: -96.5079185759074px -112.28590086669901px;" data-placement="left" data-original-title="" title="">NB</span>
<div class="flex bubble-gap internal-border">
<div class="textBubble"><div class="bubble-arrow"></div><div class="article-text" id="article-35098758344">Ich wollte mir die Lyrics von Maria herunterladen, aber ich schaff es einfach nicht, da raufzukommen. Schick mir bitte mein Passwort.
@ -216,7 +216,7 @@
</div>
</div>
</div>
<small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2014-07-11T10:10:32.000Z" title="2014-07-11 12:10">2014-07-11</time></small>
<small class="task-subline"><time class="humanTimeFromNow" data-time="2014-07-11T10:10:32.000Z" title="2014-07-11 12:10">2014-07-11</time></small>
</div>
<div class="ticket-article-item agent note" data-id="23" id="article-23">
@ -230,7 +230,7 @@
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<span class="avatar user-popover " data-id="3" style="background-image: url(api/v1/users/image/bb100af55234cf61fb6f207636f095f8)" data-placement="right" data-original-title="" title=""></span>
<div class="flex bubble-gap internal-border">
<div class="textBubble">
@ -296,7 +296,7 @@
</div>
</div>
</div>
<small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2014-08-05T13:34:01.000Z" title="2014-08-05 15:34">2014-08-05</time></small>
<small class="task-subline"><time class="humanTimeFromNow" data-time="2014-08-05T13:34:01.000Z" title="2014-08-05 15:34">2014-08-05</time></small>
</div>
</div>
</div>

26
app/assets/javascripts/app/views/layout_ref/twitter_conversation.jst.eco
View file

@ -62,7 +62,7 @@
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<div class="js-avatar">
<span class="avatar size-40 user-popover user-popover" data-id="2" data-original-title="" style="background-image: url(https://pbs.twimg.com/profile_images/550102263013056512/tq9PC8NT.jpeg)" title=""></span>
</div>
@ -95,7 +95,7 @@
<div class="article-content article-actions horizontal stretch">
<a class="article-action u-clickable" data-type="internal" href=""><%- @Icon('lock', 'article-action-icon') %>set to internal</a> <a class="article-action u-clickable" data-type="reply" href="#"><%- @Icon('reply', 'article-action-icon') %>reply</a> <a class="article-action u-clickable" data-type="split" href="#ticket/create/1/1"><%- @Icon('split', 'article-action-icon') %>split</a>
</div>
</div><small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2015-10-05T12:56:33.000Z" title="10/05/2015 14:56">10/05/2015</time></small>
</div><small class="task-subline"><time class="humanTimeFromNow" data-time="2015-10-05T12:56:33.000Z" title="10/05/2015 14:56">10/05/2015</time></small>
</div>
<div class="ticket-article-item agent" data-id="3" id="article-3">
<div class="article-meta-clip top">
@ -112,7 +112,7 @@
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<div class="js-avatar">
<span class="avatar size-40 user-popover user-popover" data-id="3" data-original-title="" style="background-image: url(https://pbs.twimg.com/profile_images/473728709908647936/gc_1Mzqc.jpeg)" title=""></span>
</div>
@ -145,7 +145,7 @@
<div class="article-content article-actions horizontal stretch">
<a class="article-action u-clickable" data-type="internal" href=""><%- @Icon('lock', 'article-action-icon') %>set to internal</a> <a class="article-action u-clickable" data-type="split" href="#ticket/create/1/3"><%- @Icon('split', 'article-action-icon') %>split</a>
</div>
</div><small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2015-10-16T16:17:23.000Z" title="10/16/2015 18:17">6 days 16 hours ago</time></small>
</div><small class="task-subline"><time class="humanTimeFromNow" data-time="2015-10-16T16:17:23.000Z" title="10/16/2015 18:17">6 days 16 hours ago</time></small>
</div>
<div class="ticket-article-item customer" data-id="4" id="article-4">
<div class="article-meta-clip top">
@ -162,7 +162,7 @@
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<div class="js-avatar">
<span class="avatar size-40 user-popover user-popover" data-id="2" data-original-title="" style="background-image: url(https://pbs.twimg.com/profile_images/550102263013056512/tq9PC8NT.jpeg)" title=""></span>
</div>
@ -195,7 +195,7 @@
<div class="article-content article-actions horizontal stretch">
<a class="article-action u-clickable" data-type="internal" href=""><%- @Icon('lock', 'article-action-icon') %>set to internal</a> <a class="article-action u-clickable" data-type="split" href="#ticket/create/1/4"><%- @Icon('split', 'article-action-icon') %>split</a>
</div>
</div><small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2015-10-16T16:17:27.000Z" title="10/16/2015 18:17">6 days 16 hours ago</time></small>
</div><small class="task-subline"><time class="humanTimeFromNow" data-time="2015-10-16T16:17:27.000Z" title="10/16/2015 18:17">6 days 16 hours ago</time></small>
</div>
<div class="ticket-article-item agent" data-id="3" id="article-3">
<div class="article-meta-clip top">
@ -212,7 +212,7 @@
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<div class="js-avatar">
<span class="avatar size-40 user-popover user-popover" data-id="3" data-original-title="" style="background-image: url(https://pbs.twimg.com/profile_images/473728709908647936/gc_1Mzqc.jpeg)" title=""></span>
</div>
@ -245,7 +245,7 @@
<div class="article-content article-actions horizontal stretch">
<a class="article-action u-clickable" data-type="internal" href=""><%- @Icon('lock', 'article-action-icon') %>set to internal</a> <a class="article-action u-clickable" data-type="split" href="#ticket/create/1/3"><%- @Icon('split', 'article-action-icon') %>split</a>
</div>
</div><small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2015-10-16T16:17:23.000Z" title="10/16/2015 18:17">6 days 16 hours ago</time></small>
</div><small class="task-subline"><time class="humanTimeFromNow" data-time="2015-10-16T16:17:23.000Z" title="10/16/2015 18:17">6 days 16 hours ago</time></small>
</div>
<div class="ticket-article-item customer" data-id="4" id="article-4">
<div class="article-meta-clip top">
@ -262,7 +262,7 @@
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<div class="js-avatar">
<span class="avatar size-40 user-popover user-popover" data-id="2" data-original-title="" style="background-image: url(https://pbs.twimg.com/profile_images/550102263013056512/tq9PC8NT.jpeg)" title=""></span>
</div>
@ -295,7 +295,7 @@
<div class="article-content article-actions horizontal stretch">
<a class="article-action u-clickable" data-type="internal" href=""><%- @Icon('lock', 'article-action-icon') %>set to internal</a> <a class="article-action u-clickable" data-type="split" href="#ticket/create/1/4"><%- @Icon('split', 'article-action-icon') %>split</a>
</div>
</div><small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2015-10-16T16:17:27.000Z" title="10/16/2015 18:17">6 days 16 hours ago</time></small>
</div><small class="task-subline"><time class="humanTimeFromNow" data-time="2015-10-16T16:17:27.000Z" title="10/16/2015 18:17">6 days 16 hours ago</time></small>
</div>
<div class="ticket-article-item agent" data-id="3" id="article-3">
<div class="article-meta-clip top">
@ -312,7 +312,7 @@
</div>
</div>
</div>
<div class="article-content zIndex-1">
<div class="article-content">
<div class="js-avatar">
<span class="avatar size-40 user-popover user-popover" data-id="3" data-original-title="" style="background-image: url(https://pbs.twimg.com/profile_images/473728709908647936/gc_1Mzqc.jpeg)" title=""></span>
</div>
@ -345,7 +345,7 @@
<div class="article-content article-actions horizontal stretch">
<a class="article-action u-clickable" data-type="internal" href=""><%- @Icon('lock', 'article-action-icon') %>set to internal</a> <a class="article-action u-clickable" data-type="split" href="#ticket/create/1/3"><%- @Icon('split', 'article-action-icon') %>split</a>
</div>
</div><small class="task-subline zIndex-1"><time class="humanTimeFromNow" data-time="2015-10-16T16:17:23.000Z" title="10/16/2015 18:17">6 days 16 hours ago</time></small>
</div><small class="task-subline"><time class="humanTimeFromNow" data-time="2015-10-16T16:17:23.000Z" title="10/16/2015 18:17">6 days 16 hours ago</time></small>
</div>
</div>
@ -410,7 +410,7 @@
</div>
</div>
</div>
<div class="article-content zIndex-5 bubble-gap">
<div class="article-content bubble-gap">
<div class="internal-border">
<div class="input form-group hide">
<div class="formGroup-label">

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

@ -82,4 +82,4 @@
<div class="js-article-actions"></div>
<small class="task-subline zIndex-1"><%- @humanTime(@article.created_at) %></small>
<small class="task-subline"><%- @humanTime(@article.created_at) %></small>