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

Linked Ticket - move to generic ticket list with icons like user profile

Browse source
This commit is contained in:
Felix Niklas 2015-06-08 13:02:01 +02:00
parent b21ae7c91a
commit 9f841d2d47
2 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,18 +2,21 @@
<% for type of @links: %> <% for type of @links: %>
<div class="ticketLinks"> <div class="ticketLinks">
<div class="sidebar-list-title"><%- @T( type ) %></div> <div class="sidebar-list-title"><%- @T( type ) %></div>
<ul class="sidebar-list"> <ol class="tasks tasks--standalone">
<% for item in @links[type]: %> <% for item in @links[type]: %>
<li class="sidebar-list-item"> <li class="task">
<div class="sidebar-list-item-name"> <div class="icon-holder">
<a href="#ticket/zoom/<%= item.id %>" data-type="" title="<%= item.title %>" class="<%= item.css %>"><span class="ticket-id">T:<%= item.number %></span> <%= item.title %></a> <svg class="<%- item.icon() %>"><use xlink:href="#icon-priority" /></svg>
</div>
<div class="flex">
<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> </div>
<!--<span>3</span>-->
<div class="sidebar-list-item-delete js-delete" data-object="Ticket" data-object-id="<%= item.id %>" data-link-type="<%= type %>" data-type="remove"> <div class="sidebar-list-item-delete js-delete" data-object="Ticket" data-object-id="<%= item.id %>" data-link-type="<%= type %>" data-type="remove">
<svg class="icon icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg> <svg class="icon icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg>
</div> </div>
<% end %> <% end %>
</ul> </ol>
</div> </div>
<% end %> <% end %>
<div class="text-muted u-clickable js-add">+ <%- @T('Add Link') %></div> <div class="text-muted u-clickable js-add">+ <%- @T('Add Link') %></div>

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

@ -671,7 +671,7 @@ h5 {
label, label,
.checkbox.form-group label { .checkbox.form-group label {
text-transform: uppercase; text-transform: uppercase;
color: hsl(0,0%,60%); color: hsl(198,19%,72%);
display: block; display: block;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
@ -1681,7 +1681,8 @@ footer {
.tasks.tasks--standalone { .tasks.tasks--standalone {
background: none; background: none;
margin-top: 8px; margin: 8px 0 0;
padding: 0;
} }
.tasks--standalone .task { .tasks--standalone .task {
@ -2177,6 +2178,7 @@ footer {
width: 32%; width: 32%;
max-width: 300px; max-width: 300px;
padding: 20px; padding: 20px;
color: hsl(60,1%,34%);
background: white; background: white;
border-right: 1px solid #e6e6e6; border-right: 1px solid #e6e6e6;
overflow: auto; overflow: auto;
@ -3701,7 +3703,7 @@ footer {
} }
.sidebar .text-muted { .sidebar .text-muted {
color: hsl(204,3%,72%); color: hsl(198,19%,72%);
} }
.alert { .alert {
@ -3741,13 +3743,17 @@ footer {
} }
.sidebar-list-title { .sidebar-list-title {
color: hsl(206,7%,28%);
text-transform: capitalize;
margin-top: 7px; margin-top: 7px;
margin-bottom: 4px;
text-transform: uppercase;
color: hsl(198,19%,84%);
display: block;
font-size: 12px;
font-weight: normal;
letter-spacing: 0.1em;
} }
.sidebar-list-item { .sidebar-list-item {
padding: 4px 1px;
display: flex; display: flex;
align-items: center; align-items: center;
color: hsl(206,7%,28%); color: hsl(206,7%,28%);
@ -3756,15 +3762,16 @@ footer {
.sidebar-list-item-name { .sidebar-list-item-name {
flex: 1; flex: 1;
padding: 4px 1px;
} }
.sidebar-list-item-delete { .sidebar-list-item-delete {
height: 100%;
padding: 0 10px; padding: 0 10px;
margin-right: -4px; margin-right: -3px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
align-self: stretch;
@extend .u-clickable; @extend .u-clickable;
.icon { .icon {
@ -5003,21 +5010,12 @@ label + .wizard-buttonList {
padding: 0 25px; padding: 0 25px;
.tasks { .tasks {
margin-bottom: 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
} }
.profile-ticketList {
ol {
padding: 0;
}
.name {
@extend .u-highlight;
}
}
.profile .frequency.stat-widget { .profile .frequency.stat-widget {
height: 230px; height: 230px;