diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee index 3e6313fc3..106ced9c9 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee @@ -462,14 +462,13 @@ class App.Controller extends Spine.Controller class App.ControllerPermanent extends App.Controller constructor: -> super - $('.content').hide() - + $('.content').attr('style', 'display: none!important') class App.ControllerContent extends App.Controller constructor: -> super - $('.content').hide() - $('#content').show() + $('.content').attr('style', 'display: none!important') + $('#content').attr('style', 'display: flex!important') @navShow() class App.ControllerModal extends App.Controller diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 4852430a4..a1ee5a3eb 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -178,7 +178,7 @@ class App.TicketZoom extends App.Controller new ArticleView( ticket: @ticket ticket_article_ids: @ticket_article_ids - el: @el.find('.article-view') + el: @el.find('.ticket-article') ui: @ ) @@ -186,7 +186,7 @@ class App.TicketZoom extends App.Controller # show edit new Edit( ticket: @ticket - el: @el.find('.edit') + el: @el.find('.ticket-edit') edit_form: @edit_form task_key: @task_key ui: @ @@ -433,9 +433,9 @@ class Edit extends App.Controller if !@autosaveLast || ( diff && !_.isEmpty( diff ) ) @autosaveLast = currentData @log 'notice', 'form hash changed', diff, currentData - @el.find('.ticket-edit').addClass('form-changed') - @el.find('.ticket-edit').find('.reset-message').show() - @el.find('.ticket-edit').find('.reset-message').removeClass('hide') + @el.find('.edit').addClass('form-changed') + @el.find('.edit').find('.reset-message').show() + @el.find('.edit').find('.reset-message').removeClass('hide') App.TaskManager.update( @task_key, { 'state': currentData }) @interval( update, 3000, 'autosave' ) diff --git a/app/assets/javascripts/app/lib/app_post/browser.coffee b/app/assets/javascripts/app/lib/app_post/browser.coffee index 6b5559ed1..109f35a0d 100644 --- a/app/assets/javascripts/app/lib/app_post/browser.coffee +++ b/app/assets/javascripts/app/lib/app_post/browser.coffee @@ -9,31 +9,31 @@ class App.Browser data = @detection() # disable Crome 13 and older - if data.browser == 'Chrome' && data.version <= 13 + if data.browser == 'Chrome' && data.version <= 20 @message(data) console.log('Browser not supported') return false # disable Firefox 9 and older - else if data.browser == 'Firefox' && data.version <= 9 + else if data.browser == 'Firefox' && data.version <= 27 @message(data) console.log('Browser not supported') return false # disable IE 8 and older - else if data.browser == 'Explorer' && data.version <= 8 + else if data.browser == 'Explorer' && data.version <= 9 @message(data) console.log('Browser not supported') return false # disable Safari 3 and older - else if data.browser == 'Safari' && data.version <= 3 + else if data.browser == 'Safari' && data.version <= 6 @message(data) console.log('Browser not supported') return false # disable Opera 10 and older - else if data.browser == 'Opera' && data.version <= 10 + else if data.browser == 'Opera' && data.version <= 21 @message(data) console.log('Browser not supported') return false diff --git a/app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee b/app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee index a11b81903..64d2d9cab 100644 --- a/app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee @@ -47,7 +47,7 @@ class App.Run extends App.Controller App.Event.trigger( event + ':ready') class App.Content extends App.Controller - className: 'content flex' + className: 'content flex horizontal' constructor: -> super diff --git a/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee b/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee index 87de8bb71..4a710a3d1 100644 --- a/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee @@ -151,7 +151,8 @@ class _taskManagerSingleton extends App.Controller $('#content').empty() # hide all tasks - $('.content').hide() + $('.content').attr('style', 'display: none!important') + #$('.content').hide() $('.content').removeClass('active') # create div for task if not exists @@ -160,10 +161,12 @@ class _taskManagerSingleton extends App.Controller # set task to shown and active if @activeTask is key - $('#content_permanent_' + key ).show() + #$('#content_permanent_' + key ).show() + $('#content_permanent_' + key).attr('style', 'display: flex!important') $('#content_permanent_' + key ).addClass('active') else - $('#content_permanent_' + key ).hide() + #$('#content_permanent_' + key ).hide() + $('#content_permanent_' + key).attr('style', 'display: none!important') $('#content_permanent_' + key ).removeClass('active') # set all tasks to active false, only new/selected one to active diff --git a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco index f6514f22c..c61b5549e 100644 --- a/app/assets/javascripts/app/views/agent_ticket_create.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_create.jst.eco @@ -1,26 +1,24 @@ -
-
-
-
-
-
-
-
- -
- -
-

<%- @T( 'New Ticket' ) %> (<%- @T( @title ) %>)<% if @admin: %> <% end %>

-
- -
- -
-
-   -
-
- -
+
+
+
+
+
+ +
+ +
+

<%- @T( 'New Ticket' ) %> (<%- @T( @title ) %>)<% if @admin: %> <% end %>

+
+ +
+ +
+
+   +
+
+ +
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/agent_ticket_view.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view.jst.eco index 224756a31..69df40de0 100644 --- a/app/assets/javascripts/app/views/agent_ticket_view.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_view.jst.eco @@ -1,4 +1,2 @@ -
-
-
-
+
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/agent_ticket_view/content.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/content.jst.eco index d03ec4023..2cca743b8 100644 --- a/app/assets/javascripts/app/views/agent_ticket_view/content.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_view/content.jst.eco @@ -1,4 +1,4 @@ -
+

<%- @T( @overview.name ) %> <% if @edit: %><% end %>

diff --git a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco index 3024b1ffe..251204c7e 100644 --- a/app/assets/javascripts/app/views/customer_ticket_create.jst.eco +++ b/app/assets/javascripts/app/views/customer_ticket_create.jst.eco @@ -1,26 +1,23 @@ -
-
-
-
+
+
+
-
-
-
-

<%- @T( 'New Ticket' ) %>

-
-
-
-
- -
-
- - -
-
+
+
+
+

<%- @T( 'New Ticket' ) %>

- +
+
+ +
+
+ + +
+
+
-
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/dashboard.jst.eco b/app/assets/javascripts/app/views/dashboard.jst.eco index 809ee98b4..dd07de816 100644 --- a/app/assets/javascripts/app/views/dashboard.jst.eco +++ b/app/assets/javascripts/app/views/dashboard.jst.eco @@ -1,126 +1,124 @@ -
-
-
+
+
+
My Stats
+
My Group
+
All
-
-
-
My Stats
-
My Group
-
All
-
-
-
-
-

∅ Waiting time today

-
-
- -
-
-
-
My handling time: 25 minutes
-
Average: 13%
-
-
-
-
-

Mood

-
-
-
-
3% of my tickets escalated.
-
Average: 17%
-
-
-
-
-

Channel Distribution

-
- -
-
-
-
-
-
-
26%
-
-
-
-
-
-
-
-
24%
-
- - +
+
+
+

∅ Waiting time today

+
+
+ +
+
My handling time: 25 minutes
+
Average: 13%
-
-
-

Status

-
-
-
-
-
-
-
-
+
+
+
+

Mood

+
+
+
+
3% of my tickets escalated.
+
Average: 17%
+
+
+
+
+

Channel Distribution

+
+ -
Tickets of my Group: 78 of 234
-
Average: 22%
-
-
-
-
-

Tickets in process

-
-
+
+
+
+
+
+
+
26%
-
74% are currently in process
-
Average: 62%
-
-
-
-
-

Reopening rate

-
-
+
+
+
+
+
+
+
24%
+
+ + -
7% are being reopened
-
Average: 6%
- -
+
+
+

Status

+
+
+
+
+
+
+
+
+
+
+
+
Tickets of my Group: 78 of 234
+
Average: 22%
+
+
+
+
+

Tickets in process

+
+
+
+
74% are currently in process
+
Average: 62%
+
+
+
+
+

Reopening rate

+
+
+
+
7% are being reopened
+
Average: 6%
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/dashboard/ticket.jst.eco b/app/assets/javascripts/app/views/dashboard/ticket.jst.eco index 34387c912..aab5c722c 100644 --- a/app/assets/javascripts/app/views/dashboard/ticket.jst.eco +++ b/app/assets/javascripts/app/views/dashboard/ticket.jst.eco @@ -1,31 +1,31 @@ -
-
-
-

<%- @T( @overview.name ) %>

-
-
-
    -
  • - <% if @start_page != 1: %> - « - <% else: %> - « - <% end %> -
    • - <% for item in [1..@pages_total]: %> -
  • - <%= item %> -
    • - <% end %> -
  • - <% if @start_page != @pages_total: %> - » - <% else: %> - » -
    • - <% end %> -
-
+
+
+
+

<%- @T( @overview.name ) %>

+
+
+
    +
  • + <% if @start_page != 1: %> + « + <% else: %> + « + <% end %> +
    • + <% for item in [1..@pages_total]: %> +
  • + <%= item %> +
    • + <% end %> +
  • + <% if @start_page != @pages_total: %> + » + <% else: %> + » +
    • + <% end %> +
-
+
+
\ No newline at end of file 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 0306e890d..5bbc782f6 100644 --- a/app/assets/javascripts/app/views/generic/admin/index.jst.eco +++ b/app/assets/javascripts/app/views/generic/admin/index.jst.eco @@ -1,4 +1,4 @@ -
+

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

diff --git a/app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco b/app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco index 32e6abf0f..993647f3c 100644 --- a/app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco +++ b/app/assets/javascripts/app/views/generic/admin_level2/index.jst.eco @@ -1,21 +1,19 @@ -
-
+
- -
-
- -
-

<%- @T( @page.head ) %> <%- @T( @page.sub_head ) %>

-
-
- -
+
+ +
+

<%- @T( @page.head ) %> <%- @T( @page.sub_head ) %>

+
+
+ +
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/content_two.jst.eco b/app/assets/javascripts/app/views/generic/content_two.jst.eco index 8bceca803..c20ae6fe6 100644 --- a/app/assets/javascripts/app/views/generic/content_two.jst.eco +++ b/app/assets/javascripts/app/views/generic/content_two.jst.eco @@ -1,6 +1,4 @@ -
-
-
-
-
+
+
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/content_two_title.jst.eco b/app/assets/javascripts/app/views/generic/content_two_title.jst.eco index 0b3646c90..aeef71032 100644 --- a/app/assets/javascripts/app/views/generic/content_two_title.jst.eco +++ b/app/assets/javascripts/app/views/generic/content_two_title.jst.eco @@ -1,10 +1,8 @@ -
-
-
-
-
-

<%- @T( @head ) %> <%- @T( @sub_head ) %>

-
-
-
+
+
+
+

<%- @T( @head ) %> <%- @T( @sub_head ) %>

+
+
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/navbar_l2.jst.eco b/app/assets/javascripts/app/views/generic/navbar_l2.jst.eco index 610816b04..81a10f246 100644 --- a/app/assets/javascripts/app/views/generic/navbar_l2.jst.eco +++ b/app/assets/javascripts/app/views/generic/navbar_l2.jst.eco @@ -1,19 +1,17 @@ -
-
+
- <% if @groups: %> - <% for group in @groups: %> -

<%- @T(group.name) %>

+ <% if @groups: %> + <% for group in @groups: %> +

<%- @T(group.name) %>

-
    - <% if group.items: %> - <% for item in group.items: %> -
  • class="active"<% end %>><%- @T(item.name) %>
    • - <% end %> - <% end %> -
- <% end %> +
    + <% if group.items: %> + <% for item in group.items: %> +
  • class="active"<% end %>><%- @T(item.name) %>
    • + <% end %> + <% end %> +
+ <% end %> -
-
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/getting_started.jst.eco b/app/assets/javascripts/app/views/getting_started.jst.eco index 5c8c07e65..a673232bb 100644 --- a/app/assets/javascripts/app/views/getting_started.jst.eco +++ b/app/assets/javascripts/app/views/getting_started.jst.eco @@ -7,13 +7,13 @@ <% if @master_user: %>
-
+
<% end %>
-
+
diff --git a/app/assets/javascripts/app/views/network.jst.eco b/app/assets/javascripts/app/views/network.jst.eco index c4c68680c..c6bb8a925 100644 --- a/app/assets/javascripts/app/views/network.jst.eco +++ b/app/assets/javascripts/app/views/network.jst.eco @@ -3,7 +3,7 @@
-
+
<% for network in @networks: %>
diff --git a/app/assets/javascripts/app/views/package.jst.eco b/app/assets/javascripts/app/views/package.jst.eco index bed004d08..91cf19ae7 100644 --- a/app/assets/javascripts/app/views/package.jst.eco +++ b/app/assets/javascripts/app/views/package.jst.eco @@ -18,29 +18,27 @@

-
- - - - - - - - - - - - <% 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 %>
-
+ + + + + + + + + + + + <% 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 faa893a72..c2a4cd6d7 100644 --- a/app/assets/javascripts/app/views/scheduler.jst.eco +++ b/app/assets/javascripts/app/views/scheduler.jst.eco @@ -8,7 +8,7 @@
  • Jobs
    • -
    +
      diff --git a/app/assets/javascripts/app/views/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/ticket_zoom.jst.eco index 423ef1750..e49c2e806 100644 --- a/app/assets/javascripts/app/views/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom.jst.eco @@ -1,33 +1,27 @@ -
      -
      -
      -
      -
      -
      +
      -
      -
      -
      -
      -
      - <% if @C( 'LastOverview' ) && @nav: %> -
      - <%= @C( 'LastOverviewPosition' ) %>/<%= @C( 'LastOverviewTotal' ) %> - <% base_url ="#ticket/view/#{ @C('LastOverview') }/#{ @C('LastOverviewPosition') }/" %> - -
      - <% end %> -
      +
      +

      +
      + <% if @C( 'LastOverview' ) && @nav: %> +
      + <%= @C( 'LastOverviewPosition' ) %>/<%= @C( 'LastOverviewTotal' ) %> + <% base_url ="#ticket/view/#{ @C('LastOverview') }/#{ @C('LastOverviewPosition') }/" %> + +
      + <% end %>
      - -
      -
      -
      -
      -
      + +
      +
      +
      +
      +
      +
      +
      \ No newline at end of file diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco index b2530ecf7..92f425838 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco @@ -1,44 +1,41 @@ -
      <% for article in @articles: %> -
      -
      - -
        -
      • <%- @T(article.type.name) %>
        • - <% if article.type.name is 'email': %>
      • <%- @T( 'raw' ) %>
        • <% end %> -
      -
      -
      -
      - <% if article.from: %> - <%= article.from %> - <% if article.actions: %> - <% for action in article.actions: %> - - - <%- @T( action.name ) %> - <% end %> - <% end %> - - ? - <% end %> - <% if article.to: %> -
      <%= article.to %>
      - <% end %> - <% if article.cc: %> -
      <%= article.cc %>
      - <% end %> - <% if article.subject: %> -
      <%= article.subject %>
      - <% end %> - <% if article.attachments: %> -
      - <% for attachment in article.attachments: %> - <%= attachment.filename %> - <% end %> -
      - <% end %> -
      -
      <%- article.html %>
      -
      +
      +
      + +
        +
      • <%- @T(article.type.name) %>
        • + <% if article.type.name is 'email': %>
      • <%- @T( 'raw' ) %>
        • <% end %> +
      -<% end %> -
      \ No newline at end of file +
      + <% if article.from: %> + <%= article.from %> + <% if article.actions: %> + <% for action in article.actions: %> + - + <%- @T( action.name ) %> + <% end %> + <% end %> + - ? + <% end %> + <% if article.to: %> +
      <%= article.to %>
      + <% end %> + <% if article.cc: %> +
      <%= article.cc %>
      + <% end %> + <% if article.subject: %> +
      <%= article.subject %>
      + <% end %> + <% if article.attachments: %> +
      + <% for attachment in article.attachments: %> + <%= attachment.filename %> + <% end %> +
      + <% end %> +
      <%- article.html %>
      +
      +
      +
      +<% end %> \ No newline at end of file diff --git a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco index 67cf27af3..dea7b41e1 100644 --- a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco +++ b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco @@ -1,23 +1,21 @@ -
      -
      -
      - -
      -
      -
      -

      <%- @T('Edit') %> - - <%- @T('Discard your unsaved changes.') %> - -

      -
      -
      - -
      -
      - - -
      +
      +
      + +
      +
      +
      +

      <%- @T('Edit') %> + + <%- @T('Discard your unsaved changes.') %> + +

      +
      +
      +
      +
      + +
      +
      \ No newline at end of file diff --git a/app/assets/javascripts/app/views/trigger.jst.eco b/app/assets/javascripts/app/views/trigger.jst.eco index b90146a16..7413af516 100644 --- a/app/assets/javascripts/app/views/trigger.jst.eco +++ b/app/assets/javascripts/app/views/trigger.jst.eco @@ -9,7 +9,7 @@
    • Actions
    -
    +
      diff --git a/app/assets/javascripts/app/views/user_zoom.jst.eco b/app/assets/javascripts/app/views/user_zoom.jst.eco index 7c50a5d79..834a28b47 100644 --- a/app/assets/javascripts/app/views/user_zoom.jst.eco +++ b/app/assets/javascripts/app/views/user_zoom.jst.eco @@ -1,21 +1,18 @@ -
      -
      -
      -
      -
      -
      - -
      -
      -
      -
      -
      - -
      -
      -
      -
      - -
      +
      +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +
      +
      + +
      \ No newline at end of file diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 3f640fa7a..82445e848 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -1200,41 +1200,6 @@ footer { } } -.ticket-article-view { - max-width: 750px; -} - -.ticket-article { - padding: 8px 0 6px 2px; - min-height: 116px; - margin: 2px 0; -} -.ticket-article-item { - border-bottom: 1px solid #eeeeee; -} -.ticket-article-item:last-child { - border-bottom: none; -} -.ticket-article h4 { - margin-top: 2px; - margin-bottom: 6px; -} -.ticket-article.well { - padding: 4px 0 20px 2px; - margin-top: 4px; -} -.ticket-article-meta { - border-bottom: 1px solid #eeeeee; - padding-bottom: 10px; -} -.ticket-article-message { - padding-left: 6px; - padding-top: 4px; - margin-left: 70px; -} -.ticket-edit .ticket-article-message { - padding-right: 40px; -} .message { padding-top: 6px; padding-bottom: 6px; @@ -1252,6 +1217,18 @@ footer { width: 160px; } +.ticket-article .avatar { + width: 80px; +} + +.ticket-article .avatar ul { + margin-left: -22px; +} + +.ticket-article-item { + min-height: 100px; +} + .show_toogle { font-size: 10px;