From 8dfc709219dfae6f03400e6daa67e9fcfb0723d6 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 30 Sep 2014 12:12:18 +0200 Subject: [PATCH] ticket article attachments layout_ref --- app/assets/images/sprite.svg | 1 + .../app/views/layout_ref/content.jst.eco | 134 ++++++++++++++++-- app/assets/stylesheets/zzz.css.erb | 29 +++- 3 files changed, 148 insertions(+), 16 deletions(-) diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index 500a9f62c..e9f234e9e 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -157,5 +157,6 @@ + \ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/content.jst.eco b/app/assets/javascripts/app/views/layout_ref/content.jst.eco index 71f7d8254..8cab9551c 100644 --- a/app/assets/javascripts/app/views/layout_ref/content.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/content.jst.eco @@ -42,6 +42,121 @@
+

Ticket Article

+ +
+
+ +
+ NB +
+
Welcome! + +Thank you for installing Zammad. + +You will find updates and patches at http://zammad.org/. Online +documentation is available at http://guides.zammad.org/. You can also +use our forums at http://forums.zammad.org/ + +Regards, +See more
+The Zammad.org Project
+
+
+ + +
+ +
+ +
+ +
+
Lieber HP, +anbei findest du die Midi Noten für Maria Maria "I Like it Loud". +Wünsche dir einen guten Auftritt in Hamburg. + +Alles gute, +Oliver +
+
+

2 <%- @T('Attached Files') %>

+
+
midinotes_view.jpg
+
35.5kb
+
+
+
lyrics_I_Like_it_Loud.txt
+
17.1kb
+
+
+
+
+ + +
+
+ +
+

Article Reply

@@ -126,10 +241,7 @@ Albrecht & Bertschler GmbH - 4 Personen
-
- - -
  • +
  • @@ -212,10 +324,7 @@
    <%- @T('Create new Customer') %>
    - - - - - - - - - -
    +

    Ordered list

      diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 2694cae92..266dc92e2 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -1114,6 +1114,12 @@ ol.tabs li { background-position: -141px -216px; } + .paperclip.icon { + width: 31px; + height: 29px; + background-position: -141px -263px; + } + .stat-all-tickets.icon { width: 48px; height: 83px; @@ -2566,6 +2572,27 @@ footer { box-shadow: none; } + .ticket-article-item .attachments:not(:empty) { + white-space: normal; + margin: 0 -20px; + padding: 26px 20px 7px 72px; + position: relative; + } + + .ticket-article-item .attachments h3 { + color: hsl(60,1%,34%); + letter-spacing: 0; + font-weight: bold; + padding: 0 7px; + margin: 0 0 4px; + } + + .attachments .paperclip { + position: absolute; + left: 33px; + top: 27px; + } + .ticket-article-item .task-subline { margin-top: 12px; } @@ -2840,7 +2867,7 @@ footer { .attachment { font-size: 13px; - padding: 3px 10px 3px 7px; + padding: 1px 10px 1px 7px; cursor: default; }