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

LICENSE-ICONS-3RD-PARTY.json

@@ -1,4 +1,14 @@
 {
+    "draggable.svg": {
+        "author": "Felix Niklas",
+        "url": "",
+        "license": "MIT"
+    },
+    "zammad.svg": {
+        "author": "Zammad",
+        "url": "",
+        "license": "MIT"
+    },
     "website.svg": {
         "author": "Pickin Studio",
         "url": "https:\/\/thenounproject.com\/search\/?q=website&i=16523",

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

@@ -40,6 +40,13 @@ class App.ControllerTable extends App.Controller
         opacity:              0.6
         forcePlaceholderSize: true
         items:                'tr'
+        helper: (e, tr) ->
+          originals = tr.children()
+          helper = tr.clone()
+          helper.children().each (index) ->
+            # Set helper cell sizes to match the original sizes
+            $(this).width( originals.eq(index).outerWidth() )
+          return helper
         update:               @dndCallback
       @el.find('table > tbody').sortable(dndOptions)
 
@@ -285,6 +292,7 @@ class App.ControllerTable extends App.Controller
       class:      @class
       destroy:    destroy
       callbacks:  @callbackAttributes
+      sortable: @dndCallback
     )
 
     # convert to jquery object

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

@@ -1,5 +1,10 @@
 <div class="<%= @attribute.class %> checkbox">
 <% for row in @attribute.options: %>
-  <label><input type="checkbox" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %>/> <%= row.name %> <% if row.note: %>- <%= row.note %><% end %></label>
+  <label class="inline-label checkbox-replacement">
+    <input type="checkbox" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %>/>
+    <%- @Icon('checkbox', 'icon-unchecked') %>
+    <%- @Icon('checkbox-checked', 'icon-checked') %>
+    <span class="label-text"><%= row.name %> <% if row.note: %>- <span class="help-text"><%= row.note %></span><% end %></span>
+  </label>
 <% end %>
 </div>

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

@@ -1,6 +1,9 @@
 <table class="table table-hover<%- " #{@class}" if @class %>">
   <thead>
     <tr>
+    <% if @sortable: %>
+      <th style="width: 36px"></th>
+    <% end %>
     <% if @checkbox: %>
       <th style="width: 40px" class="no-padding">
         <label class="checkbox-replacement">
@@ -49,6 +52,9 @@
   <% end %>
   <% position++ %>
   <tr class="item<%= ' is-inactive' if object.active is false %>" data-id="<%= object.id %>" data-position="<%= position %>" >
+    <% if @sortable: %>
+      <td><%- @Icon('draggable') %></td>
+    <% end %>
     <% if @checkbox: %>
       <td class="no-padding">
         <label class="checkbox-replacement">

app/assets/stylesheets/svg-dimensions.css

@@ -14,6 +14,7 @@
 .icon-dashboard { width: 24px; height: 24px; }
 .icon-diagonal-cross { width: 13px; height: 13px; }
 .icon-download { width: 14px; height: 13px; }
+.icon-draggable { width: 16px; height: 16px; }
 .icon-dropdown-list { width: 19px; height: 14px; }
 .icon-email-button { width: 29px; height: 22px; }
 .icon-email { width: 17px; height: 17px; }
@@ -85,5 +86,6 @@
 .icon-unmute { width: 16px; height: 16px; }
 .icon-user { width: 16px; height: 16px; }
 .icon-website { width: 17px; height: 17px; }
+.icon-zammad { width: 17px; height: 17px; }
 .icon-zoom-in { width: 20px; height: 20px; }
 .icon-zoom-out { width: 20px; height: 20px; }

app/assets/stylesheets/zammad.scss

@@ -874,7 +874,7 @@ th.align-right {
 }
 
 .table > tbody > tr > td {
-  padding: 11px 10px 7px;
+  padding: 10px 10px 8px;
   border: none;
   box-shadow: 0 1px rgba(0,0,0,.03);
 }
@@ -924,6 +924,7 @@ th.align-right {
   }
 }
 
+.table .icon-draggable,
 .table .icon-trash {
   vertical-align: middle;
   fill: hsl(240,1%,77%);

public/assets/images/icons/draggable.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
+    <title>draggable</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="draggable" fill="#50E3C2">
+            <rect id="line" x="0" y="5" width="16" height="1"></rect>
+            <rect id="line-copy-3" x="0" y="1" width="16" height="1"></rect>
+            <rect id="line-copy" x="0" y="9" width="16" height="1"></rect>
+            <rect id="line-copy-2" x="0" y="13" width="16" height="1"></rect>
+        </g>
+    </g>
+</svg>

public/assets/images/icons/zammad.svg

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
+    <title>zammad</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="zammad" fill="#50E3C2">
+            <g id="Group" transform="translate(0.000000, 1.000000)">
+                <path d="M11.6694915,5.37853107 L15.6745763,4.14915254 L13.3022599,5.65706215 L11.6694915,5.37853107 Z" id="Shape"></path>
+                <path d="M14.1090395,8.37514124 L13.3022599,5.65706215 L15.6745763,4.14915254 L14.9638418,6.58870056 L14.1090395,8.37514124 Z" id="Shape"></path>
+                <path d="M16.8463277,3.40960452 L16.4045198,4.14915254 L14.9638418,6.58870056 L15.6745763,4.14915254 L16.8463277,3.40960452 Z" id="Shape"></path>
+                <path d="M16.9903955,3.88983051 L15.8762712,5.03276836 L16.4045198,4.14915254 L16.9903955,3.88983051 Z" id="Shape"></path>
+                <path d="M11.9096045,4.61977401 L15.1847458,4.29322034 L12.9084746,4.99435028 L11.9096045,4.61977401 Z" id="Shape"></path>
+                <path d="M12.0344633,6.47344633 L13.3022599,5.65706215 L14.1090395,8.37514124 L13.6864407,9.23954802 L12.0344633,6.47344633 Z" id="Shape"></path>
+                <path d="M10.1423729,9.70056497 L9.53728814,2.30508475 L13.6864407,9.23954802 L10.1423729,9.70056497 Z" id="Shape"></path>
+                <path d="M8.42316384,11.5926554 L10.1423729,9.70056497 L13.6864407,9.23954802 L8.42316384,11.5926554 Z" id="Shape"></path>
+                <path d="M0.0672316384,15.3096045 L8.42316384,11.5926554 L10.1423729,9.70056497 L7.41468927,9.4220339 L0.0672316384,15.3096045 Z" id="Shape"></path>
+                <path d="M0.384180791,12.2745763 L4.67740113,11.6214689 L6.01242938,10.5457627 L5.35932203,10.2576271 L0.384180791,12.2745763 Z" id="Shape"></path>
+                <path d="M1.93050847,8.76892655 L6.01242938,10.5457627 L7.41468927,9.4220339 L1.93050847,8.76892655 Z" id="Shape"></path>
+                <path d="M9.2299435,4.98474576 L8.71129944,5.07118644 L7.41468927,9.4220339 L8.81694915,8.53841808 L9.2299435,4.98474576 Z" id="Shape"></path>
+                <path d="M9.98870056,7.78926554 L8.81694915,8.53841808 L9.53728814,2.30508475 L9.98870056,7.78926554 Z" id="Shape"></path>
+                <path d="M5.56101695,5.57062147 L9.2299435,4.98474576 L9.39322034,3.53446328 L5.56101695,5.57062147 Z" id="Shape"></path>
+                <path d="M5.16723164,2.17062147 L8.3559322,4.09152542 L9.39322034,3.53446328 L9.4220339,3.33276836 L5.16723164,2.17062147 Z" id="Shape"></path>
+                <path d="M5.79152542,0.0768361582 L8.6920904,3.13107345 L9.4220339,3.33276836 L9.53728814,2.30508475 L5.79152542,0.0768361582 Z" id="Shape"></path>
+                <path d="M7.41468927,9.4220339 L9.98870056,7.78926554 L10.1423729,9.70056497 L7.41468927,9.4220339 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>