From 8dfc709219dfae6f03400e6daa67e9fcfb0723d6 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 30 Sep 2014 12:12:18 +0200 Subject: [PATCH 1/4] 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

+ +
+
+
+
+
+
+
From
+
Zammad Feedback <feedback@zammad.org>
+
+
+
+
+
+ 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
+
+
+
+
+
+
+
Kanal
+
+ + phone +
+
+
+
+ + set to internal + + + reply + + + split + +
+
+
+ +
+ +
+
+
+
+
+
From
+
Felix Niklas
+
+
+
+
+
+ +
+
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
+
+
+
+
+
+
+
+
+
Kanal
+
+ + note +
+
+
+
+ + set to internal + +
+
+
+ +
+
+ +
+

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; } From a14710353b24ad8c23ac31fd0d52a35a7ce22f24 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 30 Sep 2014 13:15:40 +0200 Subject: [PATCH 2/4] style admin section --- .../javascripts/app/views/maintenance.jst.eco | 46 ++++++++----------- .../javascripts/app/views/package.jst.eco | 4 +- .../app/views/settings/item.jst.eco | 11 +++-- app/assets/stylesheets/zzz.css.erb | 34 ++++++++++++++ 4 files changed, 61 insertions(+), 34 deletions(-) diff --git a/app/assets/javascripts/app/views/maintenance.jst.eco b/app/assets/javascripts/app/views/maintenance.jst.eco index 9eef2f1f2..e9ee7f9ce 100644 --- a/app/assets/javascripts/app/views/maintenance.jst.eco +++ b/app/assets/javascripts/app/views/maintenance.jst.eco @@ -1,29 +1,21 @@ -
      -
      -
      -

      <%- @T('Maintenance Message') %>

      +
      +

      <%- @T('Maintenance Message') %>

      +
      +
      +
      + +
      + +
      - -
      -
      - -
      - -
      +
      + +
      +
      -
      - -
      - -
      -
      -
      - -
      - -
      -
      -
      - -
      -
      \ No newline at end of file +
      +
      + +
      + + \ No newline at end of file diff --git a/app/assets/javascripts/app/views/package.jst.eco b/app/assets/javascripts/app/views/package.jst.eco index 53c8741f9..f2721019c 100644 --- a/app/assets/javascripts/app/views/package.jst.eco +++ b/app/assets/javascripts/app/views/package.jst.eco @@ -11,9 +11,9 @@ -->

      -

      + - +

      diff --git a/app/assets/javascripts/app/views/settings/item.jst.eco b/app/assets/javascripts/app/views/settings/item.jst.eco index 8a6cb30e8..7825d7d00 100644 --- a/app/assets/javascripts/app/views/settings/item.jst.eco +++ b/app/assets/javascripts/app/views/settings/item.jst.eco @@ -1,7 +1,8 @@ -
      +

      <%- @T( @setting.title ) %>

      <%- @T( @setting.description ) %>

      -
      - -
      -
      \ No newline at end of file +
      +
      + +
      + \ No newline at end of file diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 266dc92e2..6b94ad480 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -9,6 +9,11 @@ ol, ul { } +p { + color: hsl(198,19%,72%); + margin-bottom: 14px; +} + a.create { color: hsl(145,51%,45%); text-decoration: underline; @@ -547,6 +552,14 @@ textarea, margin-left: 10px; } +.help-block { + margin: 0; +} + +.help-block:not(:empty) { + margin: 5px 0 10px; +} + .help-block { color: #bcbcbc; } @@ -3618,6 +3631,27 @@ footer { border-color: hsl(0,0%,90%); } +.main .nav-tabs:first-child { + margin: 28px 0 50px; +} + +.settings-entry { + margin-bottom: 42px; + max-width: 700px; +} + +.form-item .form-group { + margin-bottom: 0; +} + +.form-item .form-group + .form-group { + margin-top: 15px; +} + +.form-item + .btn { + margin-left: 15px; +} + /* ---------------- From 4280268580b4c76a6084148126680a8fdc22d426 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 30 Sep 2014 13:33:45 +0200 Subject: [PATCH 3/4] admin: update success buttons for 'create' --- app/assets/javascripts/app/controllers/groups.js.coffee | 2 +- app/assets/javascripts/app/controllers/organizations.js.coffee | 2 +- app/assets/javascripts/app/controllers/overview.js.coffee | 2 +- app/assets/javascripts/app/controllers/sla.js.coffee | 2 +- app/assets/javascripts/app/controllers/text_module.js.coffee | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/app/controllers/groups.js.coffee b/app/assets/javascripts/app/controllers/groups.js.coffee index c59309d8a..4bf2ad3e8 100644 --- a/app/assets/javascripts/app/controllers/groups.js.coffee +++ b/app/assets/javascripts/app/controllers/groups.js.coffee @@ -19,7 +19,7 @@ class Index extends App.ControllerContent 'Groups are ...' ], buttons: [ - { name: 'New Group', 'data-type': 'new', class: 'primary' }, + { name: 'New Group', 'data-type': 'new', class: 'btn--success' }, ], }, ) diff --git a/app/assets/javascripts/app/controllers/organizations.js.coffee b/app/assets/javascripts/app/controllers/organizations.js.coffee index 33dfa3860..11648b712 100644 --- a/app/assets/javascripts/app/controllers/organizations.js.coffee +++ b/app/assets/javascripts/app/controllers/organizations.js.coffee @@ -19,7 +19,7 @@ class Index extends App.ControllerContent 'Organizations are for any person in the system. Agents (Owners, Resposbiles, ...) and Customers.' ], buttons: [ - { name: 'New Organization', 'data-type': 'new', class: 'primary' }, + { name: 'New Organization', 'data-type': 'new', class: 'btn--success' }, ], }, ) diff --git a/app/assets/javascripts/app/controllers/overview.js.coffee b/app/assets/javascripts/app/controllers/overview.js.coffee index cc39c3af4..a4af2d849 100644 --- a/app/assets/javascripts/app/controllers/overview.js.coffee +++ b/app/assets/javascripts/app/controllers/overview.js.coffee @@ -19,7 +19,7 @@ class Index extends App.ControllerContent 'Overview are ...' ], buttons: [ - { name: 'New Overview', 'data-type': 'new', class: 'primary' }, + { name: 'New Overview', 'data-type': 'new', class: 'btn--success' }, ], }, ) diff --git a/app/assets/javascripts/app/controllers/sla.js.coffee b/app/assets/javascripts/app/controllers/sla.js.coffee index b046eff88..8567b6e49 100644 --- a/app/assets/javascripts/app/controllers/sla.js.coffee +++ b/app/assets/javascripts/app/controllers/sla.js.coffee @@ -19,7 +19,7 @@ class Index extends App.ControllerContent # 'SLA are ...' ], buttons: [ - { name: 'New SLA', 'data-type': 'new', class: 'primary' }, + { name: 'New SLA', 'data-type': 'new', class: 'btn--success' }, ], }, ) diff --git a/app/assets/javascripts/app/controllers/text_module.js.coffee b/app/assets/javascripts/app/controllers/text_module.js.coffee index b6394d296..687d8b4ac 100644 --- a/app/assets/javascripts/app/controllers/text_module.js.coffee +++ b/app/assets/javascripts/app/controllers/text_module.js.coffee @@ -19,7 +19,7 @@ class Index extends App.ControllerContent 'TextModules are ...' ], buttons: [ - { name: 'New TextModule', 'data-type': 'new', class: 'primary' }, + { name: 'New TextModule', 'data-type': 'new', class: 'btn--success' }, ], }, ) From eea3429734cbe709775f2e7b0b618b566c2369e8 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 30 Sep 2014 13:34:05 +0200 Subject: [PATCH 4/4] admin: remove flex scrollable --- .../app/views/generic/admin/index.jst.eco | 13 +- .../javascripts/app/views/package.jst.eco | 74 ++++---- .../javascripts/app/views/scheduler.jst.eco | 177 +++++++++--------- .../javascripts/app/views/session.jst.eco | 57 +++--- 4 files changed, 152 insertions(+), 169 deletions(-) diff --git a/app/assets/javascripts/app/views/generic/admin/index.jst.eco b/app/assets/javascripts/app/views/generic/admin/index.jst.eco index d5a626078..fc172e9f5 100644 --- a/app/assets/javascripts/app/views/generic/admin/index.jst.eco +++ b/app/assets/javascripts/app/views/generic/admin/index.jst.eco @@ -1,17 +1,14 @@ -
      +
      -
      -

      <%- @T( @head ) %> <%- @T( 'Management' ) %>

      -
      +

      <%- @T( @head ) %> <%- @T( 'Management' ) %>

      <% if @buttons: %> <% for button in @buttons: %> - <%- @T( button.name ) %> + <%- @T( button.name ) %> <% end %> <% end %>
      +
      -
      - -
      \ No newline at end of file +
      \ No newline at end of file diff --git a/app/assets/javascripts/app/views/package.jst.eco b/app/assets/javascripts/app/views/package.jst.eco index f2721019c..094049bec 100644 --- a/app/assets/javascripts/app/views/package.jst.eco +++ b/app/assets/javascripts/app/views/package.jst.eco @@ -1,43 +1,39 @@ -
      -
      -
      -

      <%- @T( 'Package' ) %> <%- @T( 'Management' ) %>

      -
      +
      +

      <%- @T( 'Package' ) %> <%- @T( 'Management' ) %>

      +
      -

      -

      - - -
      -

      +

      +

      + + +
      +

      - - - - - - - - - - - - <% for item in @packages: %> - - - - - - - - <% end %> - -
      <%- @T('Name') %><%- @T('Version') %><%- @T('Vendor') %><%- @T('State') %><%- @T('Action') %>
      <%= item.name %><%= item.version %><%= item.vendor %><%- @T(item.state) %><% for action in item.action: %><%- @T(action) %>
      <% end %>
      - -
      \ No newline at end of file + + + + + + + + + + + + <% for item in @packages: %> + + + + + + + + <% end %> + +
      <%- @T('Name') %><%- @T('Version') %><%- @T('Vendor') %><%- @T('State') %><%- @T('Action') %>
      <%= item.name %><%= item.version %><%= item.vendor %><%- @T(item.state) %><% for action in item.action: %><%- @T(action) %>
      <% end %>
      \ No newline at end of file diff --git a/app/assets/javascripts/app/views/scheduler.jst.eco b/app/assets/javascripts/app/views/scheduler.jst.eco index 7424e48d5..ecc7b1e8e 100644 --- a/app/assets/javascripts/app/views/scheduler.jst.eco +++ b/app/assets/javascripts/app/views/scheduler.jst.eco @@ -1,98 +1,91 @@ -
      -
      -
      -

      Scheduler Management

      -
      -
      +
      +

      Scheduler Management

      +
      - + -
      -
      - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - -
      HostUserTypeActiveDelete
      lalal.example.comwpt234rwrIMAPtruex
      l31alal.example.comwpt23dd4rwrPOP3truex
      - -
      -
      - - - - - - - - - - - - - - - - - - - - - - -
      HostUserTypeActiveDelete
      lalal.example.comwpt234rwrSMTPtruex
      l31alal.example.comwpt23dd4rwrSendmailtruex
      -
      -
      - - - - - - - - - - - - - - - - - - - -
      NameActiveLast RunDelete
      lalal.example.comtruetruex
      wpt23dd4rwrtruetruex
      -
      +
      +
      + +
      +
      + + + + + + + + + + + + + + + + + + + + + + +
      HostUserTypeActiveDelete
      lalal.example.comwpt234rwrIMAPtruex
      l31alal.example.comwpt23dd4rwrPOP3truex
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + +
      HostUserTypeActiveDelete
      lalal.example.comwpt234rwrSMTPtruex
      l31alal.example.comwpt23dd4rwrSendmailtruex
      +
      +
      + + + + + + + + + + + + + + + + + + + +
      NameActiveLast RunDelete
      lalal.example.comtruetruex
      wpt23dd4rwrtruetruex
      -
      \ No newline at end of file diff --git a/app/assets/javascripts/app/views/session.jst.eco b/app/assets/javascripts/app/views/session.jst.eco index a0f8145e1..3e9ac61fb 100644 --- a/app/assets/javascripts/app/views/session.jst.eco +++ b/app/assets/javascripts/app/views/session.jst.eco @@ -1,30 +1,27 @@ -
      -
      -
      -

      <%- @T('Sessions') %>

      -
      - - - - - - - - - - - - - <% for session in @sessions: %> - - - - - - - - - <% end %> - -
      <%- @T('User') %><%- @T('Browser') %><%- @T('Location') %><%- @T('Age') %><%- @T('Update') %>
      <% if session.data.user: %><%= session.data.user.displayName() %><% end %><% if session.data.user_agent: %><%= session.data.user_agent %><% end %><% if session.data.geo: %><%= session.data.geo.country_code %> <%= session.data.geo.city %><% end %>??
      -
      \ No newline at end of file +
      +

      <%- @T('Sessions') %>

      +
      + + + + + + + + + + + + + <% for session in @sessions: %> + + + + + + + + + <% end %> + +
      <%- @T('User') %><%- @T('Browser') %><%- @T('Location') %><%- @T('Age') %><%- @T('Update') %>
      <% if session.data.user: %><%= session.data.user.displayName() %><% end %><% if session.data.user_agent: %><%= session.data.user_agent %><% end %><% if session.data.geo: %><%= session.data.geo.country_code %> <%= session.data.geo.city %><% end %>??
      \ No newline at end of file