diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index 2256beecd..9398a578c 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -1,5 +1,5 @@ - + sprite Created with Sketch (http://www.bohemiancoding.com/sketch) @@ -93,5 +93,7 @@ + + \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee b/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee index cbd90d78b..fc086d6ac 100644 --- a/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee +++ b/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee @@ -71,12 +71,17 @@ class App.DashboardTicket extends App.Controller @overview = data.overview @tickets_count = data.tickets_count @ticket_ids = data.ticket_ids - per_page = @overview.view.per_page || 10 + per_page = Math.min(@overview.view.per_page || 10, @tickets_count) + tickets_from = @start_page * per_page + tickets_till = Math.max(tickets_from + per_page-1, 0) pages_total = parseInt( ( @tickets_count / per_page ) + 0.99999 ) || 1 html = App.view('dashboard/ticket')( - overview: @overview, - pages_total: pages_total, - start_page: @start_page, + overview: @overview, + pages_total: pages_total, + start_page: @start_page, + tickets_from: tickets_from, + tickets_till: tickets_till, + tickets_count: @tickets_count ) html = $(html) html.find('li').removeClass('active') 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 2cca743b8..c55584211 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 %>

@@ -6,7 +6,7 @@ diff --git a/app/assets/javascripts/app/views/dashboard.jst.eco b/app/assets/javascripts/app/views/dashboard.jst.eco index dd07de816..d979e0648 100644 --- a/app/assets/javascripts/app/views/dashboard.jst.eco +++ b/app/assets/javascripts/app/views/dashboard.jst.eco @@ -116,7 +116,7 @@
-
+
diff --git a/app/assets/javascripts/app/views/dashboard/ticket.jst.eco b/app/assets/javascripts/app/views/dashboard/ticket.jst.eco index aab5c722c..1ead3df53 100644 --- a/app/assets/javascripts/app/views/dashboard/ticket.jst.eco +++ b/app/assets/javascripts/app/views/dashboard/ticket.jst.eco @@ -1,31 +1,37 @@ -
-
-
-

<%- @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 ) %>

-
-
\ No newline at end of file +
+
+ <%- @tickets_from %>-<%- @tickets_till %> <%- @T("of") %> <%- @tickets_count %> +
+
    +
  • + <% if @start_page != 1: %> + + + + <% else: %> + + + + <% end %> +
    • + <% for item in [1..@pages_total]: %> + <% end %> +
  • + <% if @start_page != @pages_total: %> + + + + <% else: %> + + + +
    • + <% end %> +
+
+
+
\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/table.jst.eco b/app/assets/javascripts/app/views/generic/table.jst.eco index e42bbd1ee..a12fef6b7 100644 --- a/app/assets/javascripts/app/views/generic/table.jst.eco +++ b/app/assets/javascripts/app/views/generic/table.jst.eco @@ -1,4 +1,4 @@ - +
<% if @checkbox: %> diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 5ccf69615..aa9698de6 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -27,22 +27,47 @@ body { table { table-layout: fixed; } -table th, table td { + +.table { + display: table; + color: #a9bcc4; +} + +.table .table-row { + display: table-row; +} + +.table th, +.table td { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } -.table { - display: table; + +.table > thead > tr > th { + padding: 12px 9px 9px; + border-bottom: none; + border-top: 1px solid #ececec; + background: #f0f1f2; + color: #444a4f; + font-weight: normal; + font-size: 12px; + text-transform: uppercase; } -.table .table-row { - display: table-row; + +.table > thead > tr > td, +.table > tbody > tr > td, +.table > tfoot > tr > td { + padding: 9px; + border-top-color: #f2f2f2; } -.table .table-cell{ + +.table .table-cell { vertical-align: top; display: table-cell; border-bottom: 1px solid #eeeeee; } + .hero-two { width: 100%; } @@ -492,39 +517,35 @@ label { } -/* - * bootstrap changes - */ -/* improve pagination if only one page is shown */ -.pagination li:only-child a { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -/* improved spacing */ - -.pagination-count { - padding: 6px 6px; - float: left; - color: #999; - border: none; - line-height: 17px; +.pagination { + margin: 0; } -.page-header { - margin: 0 0 12px; - padding-bottom: 5px; +.pagination > li > a, +.pagination > li > span { + padding: 0; + width: 31px; + height: 28px; + border-color: #ececec; +} + +.pagination-counter { + margin-right: 19px; + line-height: 28px; + color: #9c9c9b; +} + +.pagination-items-range { + color: #706f6f; } .page-header-title { - float: left; + margin-bottom: 20px; } + .page-header-meta { - float: right; - padding-top: 20px; -} -.page-header .page-header-meta ul.pagination { - margin: 0; + margin-top: 18px; + margin-left: auto; } .dropdown-menu .count { @@ -1025,6 +1046,26 @@ ol.tabs li { background-position: -257px -216px; } + .left.arrow.icon, + .right.arrow.icon { + width: 8px; + height: 12px; + opacity: .39; + } + + .inactive.left.arrow.icon, + .inactive.right.arrow.icon { + opacity: .23; + } + + .left.arrow.icon { + background-position: 0 -299px; + } + + .right.arrow.icon { + background-position: -8px -299px; + } + /* * removed margin of forms to not break the layout with submit buttons within area e. g. for modal dialogs @@ -1905,6 +1946,7 @@ footer { .stat-widgets { margin: 0 -7px; + display: none !important; } .stat-widget {