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

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2015-06-12 07:59:20 +02:00
commit d790947617
7 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/app/views/agent_ticket_create.jst.eco
View file

@ -70,7 +70,7 @@
<div class="icon-holder"> <div class="icon-holder">
<div class="priority icon"></div> <div class="priority icon"></div>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Micro-SIM doesn't work</div> <div class="name">Micro-SIM doesn't work</div>
<div class="time">23 minutes ago</div> <div class="time">23 minutes ago</div>
</div> </div>
@ -78,7 +78,7 @@
<div class="icon-holder"> <div class="icon-holder">
<div class="priority icon"></div> <div class="priority icon"></div>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Superb Service!</div> <div class="name">Superb Service!</div>
<div class="time">43 minutes ago</div> <div class="time">43 minutes ago</div>
</div> </div>
@ -86,7 +86,7 @@
<div class="icon-holder"> <div class="icon-holder">
<div class="priority icon"></div> <div class="priority icon"></div>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Print sheets strip off</div> <div class="name">Print sheets strip off</div>
<div class="time">1 hour ago</div> <div class="time">1 hour ago</div>
</div> </div>
@ -94,7 +94,7 @@
<div class="icon-holder"> <div class="icon-holder">
<div class="priority icon"></div> <div class="priority icon"></div>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Block not properly wrought</div> <div class="name">Block not properly wrought</div>
<div class="time">2 hour ago</div> <div class="time">2 hour ago</div>
</div> </div>

8
app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco
View file

@ -376,7 +376,7 @@
<div class="icon-holder"> <div class="icon-holder">
<div class="priority icon"></div> <div class="priority icon"></div>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Micro-SIM doesn't work</div> <div class="name">Micro-SIM doesn't work</div>
<div class="time">23 minutes ago</div> <div class="time">23 minutes ago</div>
</div> </div>
@ -384,7 +384,7 @@
<div class="icon-holder"> <div class="icon-holder">
<div class="priority icon"></div> <div class="priority icon"></div>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Superb Service!</div> <div class="name">Superb Service!</div>
<div class="time">43 minutes ago</div> <div class="time">43 minutes ago</div>
</div> </div>
@ -392,7 +392,7 @@
<div class="icon-holder"> <div class="icon-holder">
<div class="priority icon"></div> <div class="priority icon"></div>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Print sheets strip off</div> <div class="name">Print sheets strip off</div>
<div class="time">1 hour ago</div> <div class="time">1 hour ago</div>
</div> </div>
@ -400,7 +400,7 @@
<div class="icon-holder"> <div class="icon-holder">
<div class="priority icon"></div> <div class="priority icon"></div>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Block not properly wrought</div> <div class="name">Block not properly wrought</div>
<div class="time">2 hour ago</div> <div class="time">2 hour ago</div>
</div> </div>

12
app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco
View file

@ -78,7 +78,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority level-2"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority level-2"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Micro-SIM doesn't work</div> <div class="name">Micro-SIM doesn't work</div>
<div class="time">23 minutes ago</div> <div class="time">23 minutes ago</div>
</div> </div>
@ -86,7 +86,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority level-2"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority level-2"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Superb Service here_with_some_extrem_example_sting_witch_can_really_be!</div> <div class="name">Superb Service here_with_some_extrem_example_sting_witch_can_really_be!</div>
<div class="time">43 minutes ago</div> <div class="time">43 minutes ago</div>
</div> </div>
@ -94,7 +94,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority level-2"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority level-2"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Print sheets strip off</div> <div class="name">Print sheets strip off</div>
<div class="time">1 hour ago</div> <div class="time">1 hour ago</div>
</div> </div>
@ -102,7 +102,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority level-2"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority level-2"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Block not properly wrought</div> <div class="name">Block not properly wrought</div>
<div class="time">2 hour ago</div> <div class="time">2 hour ago</div>
</div> </div>
@ -116,7 +116,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority level-1"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority level-1"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Micro-SIM doesn't work</div> <div class="name">Micro-SIM doesn't work</div>
<div class="time">23 minutes ago</div> <div class="time">23 minutes ago</div>
</div> </div>
@ -124,7 +124,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority level-1"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority level-1"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Superb Service!</div> <div class="name">Superb Service!</div>
<div class="time">43 minutes ago</div> <div class="time">43 minutes ago</div>
</div> </div>

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

@ -70,7 +70,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Micro-SIM doesn't work</div> <div class="name">Micro-SIM doesn't work</div>
<div class="time">23 minutes ago</div> <div class="time">23 minutes ago</div>
</div> </div>
@ -78,7 +78,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Superb Service!</div> <div class="name">Superb Service!</div>
<div class="time">43 minutes ago</div> <div class="time">43 minutes ago</div>
</div> </div>
@ -86,7 +86,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Print sheets strip_off_with_a_lot_of_text_in_the_headline</div> <div class="name">Print sheets strip_off_with_a_lot_of_text_in_the_headline</div>
<div class="time">1 hour ago</div> <div class="time">1 hour ago</div>
</div> </div>
@ -94,7 +94,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Block not properly wrought</div> <div class="name">Block not properly wrought</div>
<div class="time">2 hour ago</div> <div class="time">2 hour ago</div>
</div> </div>
@ -108,7 +108,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Micro-SIM doesn't work</div> <div class="name">Micro-SIM doesn't work</div>
<div class="time">23 minutes ago</div> <div class="time">23 minutes ago</div>
</div> </div>
@ -116,7 +116,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Superb Service!</div> <div class="name">Superb Service!</div>
<div class="time">43 minutes ago</div> <div class="time">43 minutes ago</div>
</div> </div>
@ -124,7 +124,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Print sheets strip off with a lot of text in the headline</div> <div class="name">Print sheets strip off with a lot of text in the headline</div>
<div class="time">1 hour ago</div> <div class="time">1 hour ago</div>
</div> </div>
@ -132,7 +132,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<div class="name">Block not properly wrought</div> <div class="name">Block not properly wrought</div>
<div class="time">2 hour ago</div> <div class="time">2 hour ago</div>
</div> </div>

2
app/assets/javascripts/app/views/link/info.jst.eco
View file

@ -8,7 +8,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="<%- item.icon() %>"><use xlink:href="#icon-priority" /></svg> <svg class="<%- item.icon() %>"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<a class="name ticket-popover" data-id="<%- item.id %>" href="#ticket/zoom/<%= item.id %>"><%= item.title %></a> <a class="name ticket-popover" data-id="<%- item.id %>" href="#ticket/zoom/<%= item.id %>"><%= item.title %></a>
<div class="time humanTimeFromNow" data-time="<%- item.created_at %>"></div> <div class="time humanTimeFromNow" data-time="<%- item.created_at %>"></div>
</div> </div>

2
app/assets/javascripts/app/views/widget/ticket_stats_list.jst.eco
View file

@ -7,7 +7,7 @@
<div class="icon-holder"> <div class="icon-holder">
<svg class="<%- ticket.icon() %>"><use xlink:href="#icon-priority" /></svg> <svg class="<%- ticket.icon() %>"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="task-text">
<a class="name ticket-popover" data-id="<%- ticket_id %>" href="<%- ticket.uiUrl() %>"><%= ticket.title %></a> <a class="name ticket-popover" data-id="<%- ticket_id %>" href="<%- ticket.uiUrl() %>"><%= ticket.title %></a>
<div class="time humanTimeFromNow" data-time="<%- ticket.created_at %>"></div> <div class="time humanTimeFromNow" data-time="<%- ticket.created_at %>"></div>
</div> </div>

11
app/assets/stylesheets/zammad.css.scss
View file

@ -1735,8 +1735,14 @@ footer {
display: flex; display: flex;
} }
.tasks--standalone .task-text {
flex: 1;
min-width: 0; /* Firefox wrong content-calculation with word-wrap workaround */
}
.tasks--standalone .name { .tasks--standalone .name {
@extend .u-highlight, .u-textTruncate; @extend .u-highlight, .u-textTruncate;
display: block;
} }
.tasks--standalone .time { .tasks--standalone .time {
@ -2746,7 +2752,7 @@ footer {
position: relative; position: relative;
display: flex; display: flex;
flex: 1; flex: 1;
min-width: 0; /* Firefox workaround */ min-width: 0; /* Firefox wrong content-calculation with word-wrap workaround */
} }
.activity-entry:not(:last-child) .activity-body:after { .activity-entry:not(:last-child) .activity-body:after {
@ -2769,7 +2775,7 @@ footer {
.activity-message { .activity-message {
flex: 1; flex: 1;
min-width: 0; /* Firefox workaround */ min-width: 0; /* Firefox wrong content-calculation with word-wrap workaround */
} }
.activity-time { .activity-time {
@ -5067,6 +5073,7 @@ label + .wizard-buttonList {
flex-direction: column; flex-direction: column;
flex: 1 1 50%; flex: 1 1 50%;
padding: 0 25px; padding: 0 25px;
min-width: 0; /* Firefox wrong content-calculation with word-wrap workaround */
.tasks { .tasks {
margin-bottom: 10px; margin-bottom: 10px;