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-15 08:24:33 +02:00
commit 14f1b8f186
5 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -231,19 +231,19 @@ Oliver<br>
<div class="attachments"> <div class="attachments">
<svg class="icon-paperclip"><use xlink:href="#icon-paperclip" /></svg> <svg class="icon-paperclip"><use xlink:href="#icon-paperclip" /></svg>
<h3>2 <%- @T('Attached Files') %></h3> <h3>2 <%- @T('Attached Files') %></h3>
<div class="attachment horizontal"> <div class="attachment">
<div class="attachment-name u-highlight">midinotes_view.jpg</div> <div class="attachment-name u-highlight">midinotes_view.jpg</div>
<div class="attachment-size">35.5 kb</div> <div class="attachment-size">35.5 kb</div>
</div> </div>
<div class="attachment horizontal"> <div class="attachment">
<div class="attachment-name u-highlight">lyrics_I_Like_it_Loud.txt</div> <div class="attachment-name u-highlight">lyrics_I_Like_it_Loud.txt</div>
<div class="attachment-size">17.1 kb</div> <div class="attachment-size">17.1 kb</div>
</div> </div>
<div class="attachment horizontal"> <div class="attachment">
<div class="attachment-name u-highlight">something with very long line which is slonger as the container arount it if you can see it I wish you a very happy day.txt</div> <div class="attachment-name u-highlight">something with very long line which is slonger as the container arount it if you can see it I wish you a very happy day.txt</div>
<div class="attachment-size">17.1 kb</div> <div class="attachment-size">17.1 kb</div>
</div> </div>
<div class="attachment horizontal"> <div class="attachment">
<div class="attachment-name u-highlight">something-withverylonglinewhichisslongerasthecontainerarountitifyoucanseeitIwishyouaveryhappyday.txt</div> <div class="attachment-name u-highlight">something-withverylonglinewhichisslongerasthecontainerarountitifyoucanseeitIwishyouaveryhappyday.txt</div>
<div class="attachment-size">17.1 kb</div> <div class="attachment-size">17.1 kb</div>
</div> </div>

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

@ -16,14 +16,14 @@
<div class="attachments"></div> <div class="attachments"></div>
<!-- <div> <!-- <div>
<div class="attachment horizontal"> <div class="attachment">
<div class="attachment-name u-highlight">sega-genesis-box.gif</div> <div class="attachment-name u-highlight">sega-genesis-box.gif</div>
<div class="attachment-size">2.4mb</div> <div class="attachment-size">2.4mb</div>
<div class="attachment-delete js-delete align-right u-clickable"> <div class="attachment-delete js-delete align-right u-clickable">
<svg class="icon icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg><%- @T('Delete File') %> <svg class="icon icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg><%- @T('Delete File') %>
</div> </div>
</div> </div>
<div class="attachment horizontal"> <div class="attachment">
<div class="attachment-name u-highlight">license-key.txt</div> <div class="attachment-name u-highlight">license-key.txt</div>
<div class="attachment-size">7kb</div> <div class="attachment-size">7kb</div>
<div class="attachment-delete js-delete align-right u-clickable"> <div class="attachment-delete js-delete align-right u-clickable">

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

@ -63,7 +63,7 @@
</a> </a>
</ul> </ul>
</div> </div>
<div class="page-header horizontal"> <div class="page-header">
<div class="flex vertical center"> <div class="flex vertical center">
<span class="avatar unique user-popover size-50" data-id="2" style="background-position: -92.79607555375712px -106.24902447601627px;" data-original-title="" title="">NB</span> <span class="avatar unique user-popover size-50" data-id="2" style="background-position: -92.79607555375712px -106.24902447601627px;" data-original-title="" title="">NB</span>
<div class="ticket-title"> <div class="ticket-title">
@ -274,15 +274,15 @@ Oliver<br></div>
<div class="attachments"> <div class="attachments">
<svg class="icon-paperclip"><use xlink:href="#icon-paperclip" /></svg> <svg class="icon-paperclip"><use xlink:href="#icon-paperclip" /></svg>
<h3>2 <%- @T('Attached Files') %></h3> <h3>2 <%- @T('Attached Files') %></h3>
<div class="attachment horizontal"> <div class="attachment">
<div class="attachment-name u-highlight">midinotes_view.jpg</div> <div class="attachment-name u-highlight">midinotes_view.jpg</div>
<div class="attachment-size">35.5 kb</div> <div class="attachment-size">35.5 kb</div>
</div> </div>
<div class="attachment horizontal"> <div class="attachment">
<div class="attachment-name u-highlight">lyrics_I_Like_it_Loud.txt</div> <div class="attachment-name u-highlight">lyrics_I_Like_it_Loud.txt</div>
<div class="attachment-size">17.1 kb</div> <div class="attachment-size">17.1 kb</div>
</div> </div>
<div class="attachment horizontal"> <div class="attachment">
<div class="attachment-name u-highlight">something with very long line which is slonger as the container arount it if you can see it I wish you a very happy day.txt</div> <div class="attachment-name u-highlight">something with very long line which is slonger as the container arount it if you can see it I wish you a very happy day.txt</div>
<div class="attachment-size">17.1 kb</div> <div class="attachment-size">17.1 kb</div>
</div> </div>

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

@ -54,7 +54,7 @@
<svg class="icon-paperclip"><use xlink:href="#icon-paperclip" /></svg> <svg class="icon-paperclip"><use xlink:href="#icon-paperclip" /></svg>
<h3><%- @article.attachments.length %> <%- @T('Attached Files') %></h3> <h3><%- @article.attachments.length %> <%- @T('Attached Files') %></h3>
<% for attachment in @article.attachments: %> <% for attachment in @article.attachments: %>
<div class="attachment horizontal"> <div class="attachment">
<a class="attachment-name u-highlight" href="<%= App.Config.get('api_path') %>/ticket_attachment/<%= @article.ticket_id %>/<%= @article.id %>/<%= attachment.id %>" target="_blank" data-type="attachment"><%= attachment.filename %></a> <a class="attachment-name u-highlight" href="<%= App.Config.get('api_path') %>/ticket_attachment/<%= @article.ticket_id %>/<%= @article.id %>/<%= attachment.id %>" target="_blank" data-type="attachment"><%= attachment.filename %></a>
<div class="attachment-size"><%- @humanFileSize(attachment.size) %></div> <div class="attachment-size"><%- @humanFileSize(attachment.size) %></div>
</div> </div>

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

@ -28,7 +28,6 @@ body {
p { p {
margin: 14px 0; margin: 14px 0;
color: hsl(60,1%,34%); color: hsl(60,1%,34%);
max-width: 500px;
} }
.u-highlight { .u-highlight {
@ -3523,6 +3522,7 @@ footer {
.attachment-name { .attachment-name {
margin-right: 5px; margin-right: 5px;
min-width: 0;
@extend .u-highlight; @extend .u-highlight;
} }
@ -3538,7 +3538,8 @@ footer {
display: none; display: none;
white-space: nowrap; white-space: nowrap;
margin-left: auto; margin-left: auto;
@extend .u-clickable; cursor: pointer;
user-select: none;
} }
.attachment:hover .attachment-delete { .attachment:hover .attachment-delete {
@ -3562,7 +3563,8 @@ footer {
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
vertical-align: bottom; vertical-align: bottom;
@extend .u-highlight, .u-clickable; pointer-events: auto;
@extend .u-highlight;
} }
.attachmentUpload { .attachmentUpload {