Merge branch 'develop' of github.com:martini/zammad into develop

app/assets/javascripts/app/controllers/_application_controller_table.coffee

@@ -45,7 +45,7 @@ class App.ControllerTable extends App.Controller
           helper = tr.clone()
           helper.children().each (index) ->
             # Set helper cell sizes to match the original sizes
-            $(this).width( originals.eq(index).outerWidth() )
+            $(@).width( originals.eq(index).outerWidth() )
           return helper
         update:               @dndCallback
       @el.find('table > tbody').sortable(dndOptions)

app/assets/javascripts/app/controllers/widget/online_notification.coffee

@@ -113,9 +113,7 @@ class App.OnlineNotificationWidget extends App.Controller
       processData: true
     )
 
-  onShow: =>
-    @updateContent()
-
+  updateHeight: ->
     # set height of notification popover
     notificationsContainer  = $('.js-notificationsContainer')
     heightApp               = $('#app').height()
@@ -131,6 +129,10 @@ class App.OnlineNotificationWidget extends App.Controller
 
     notificationsContainer.find('.popover-content').css('height', "#{heightPopoverContentNew}px")
 
+  onShow: =>
+    @updateContent()
+    @updateHeight()
+
     # mark all notifications as read
     notificationsContainer.find('.js-markAllAsRead').on('click', (e) =>
       e.preventDefault()
@@ -221,7 +223,7 @@ class App.OnlineNotificationWidget extends App.Controller
       row = $(e.target).closest('.activity-entry')
       id = row.data('id')
       App.OnlineNotification.destroy(id)
-      @resetHeight()
+      @updateHeight()
     )
 
   createContainer: =>
@@ -254,7 +256,3 @@ class App.OnlineNotificationWidget extends App.Controller
     @counterUpdate(0)
     @toggle.popover('destroy')
 
-  resetHeight: ->
-    notificationsContainer = $('.js-notificationsContainer')
-    notificationsContainer.find('.popover-content').css('height', 'auto')
-

app/assets/javascripts/app/views/generic/table.jst.eco

@@ -2,10 +2,10 @@
   <thead>
     <tr>
     <% if @sortable: %>
-      <th style="width: 36px"></th>
+      <th style="width: 36px" class="table-draggable"></th>
     <% end %>
     <% if @checkbox: %>
-      <th style="width: 40px" class="no-padding">
+      <th style="width: 40px" class="table-checkbox">
         <label class="checkbox-replacement">
           <input type="checkbox" value="" name="bulk_all">
           <%- @Icon('checkbox', 'icon-unchecked') %>
@@ -14,7 +14,7 @@
       </th>
     <% end %>
     <% if @radio: %>
-      <th style="width: 40px" class="no-padding"></th>
+      <th style="width: 40px" class="table-radio"></th>
     <% end %>
     <% for item, i in @header: %>
       <th class="js-tableHead<%= " #{ item.className }" if item.className %><%= " align-#{ item.align }" if item.align %>" style="width:<%= item.displayWidth %>px" data-column-key="<%= item.name %>">
@@ -53,10 +53,10 @@
   <% position++ %>
   <tr class="item<%= ' is-inactive' if object.active is false %>" data-id="<%= object.id %>" data-position="<%= position %>" >
     <% if @sortable: %>
-      <td><%- @Icon('draggable') %></td>
+      <td class="table-draggable"><%- @Icon('draggable') %></td>
     <% end %>
     <% if @checkbox: %>
-      <td class="no-padding">
+      <td class="table-checkbox">
         <label class="checkbox-replacement">
           <input type="checkbox" value="<%= object.id %>" name="bulk">
           <%- @Icon('checkbox', 'icon-unchecked') %>
@@ -65,7 +65,7 @@
       </td>
     <% end %>
     <% if @radio: %>
-      <td class="no-padding">
+      <td class="table-radio">
         <label class="radio-replacement">
           <input type="radio" value="<%= object.id %>" name="radio">
           <%- @Icon('radio', 'icon-unchecked') %>

app/assets/stylesheets/print.scss

@@ -1,15 +1,14 @@
 #app > *:not(.content):not(.active),
-#app > .hide,
-.icon,
-.btn,
-.avatar {
+#app > .hide {
   display: none;
 }
 
 .table {
-  margin: 1em 0;
-  border: 1px solid;
-  padding: 1em;
+  border: 1px solid hsl(0,0%,90%);
+}
+
+.table thead tr {
+  border-bottom: 1px solid hsl(0,0%,90%);
 }
 
 /*
@@ -32,7 +31,8 @@
 
 .bulkAction,
 .overviews .checkbox-replacement,
-.overviews .overview-header {
+.overviews .overview-header,
+.table-checkbox {
   display: none;
 }
 
@@ -53,22 +53,8 @@
   display: none;
 }
 
-.ticket-title {
-  font-size: 2em;
-}
-
-.ticket-article-item {
-  margin: 1em 0;
-  border: 1px solid;
-  padding: 1em;
-}
-
-.article-meta-value {
-  font-weight: bold;
-}
-
-.article-content {
-  margin: 0.5em 0;
+.tabsSidebar-sidebarSpacer {
+  margin-right: 0;
 }
 
 .article-meta .article-meta-key {

app/assets/stylesheets/zammad.scss

@@ -930,6 +930,11 @@ th.align-right {
   fill: hsl(240,1%,77%);
 }
 
+.table-checkbox,
+.table-radio {
+  padding: 0 !important;
+}
+
 .table .table-sort-arrow {
   opacity: 1;
   fill: hsl(206,7%,33%);

app/views/layouts/application.html.erb

@@ -3,8 +3,8 @@
 <head>
   <meta charset="utf-8">
   <title><%= Setting.get('product_name') %></title>
-  <%= stylesheet_link_tag    "application" %>
-  <%= stylesheet_link_tag    "application-print", :media => 'print' %>
+  <%= stylesheet_link_tag "application", :media => 'all' %>
+  <%= stylesheet_link_tag "application-print", :media => 'print' %>
   <% if Rails.configuration.assets.debug %>
   <%= javascript_include_tag "application" %>
   <% else %>