diff --git a/LICENSE-ICONS-3RD-PARTY.json b/LICENSE-ICONS-3RD-PARTY.json
index 5172a8284..2877461d9 100644
--- a/LICENSE-ICONS-3RD-PARTY.json
+++ b/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",
diff --git a/app/assets/javascripts/app/controllers/_application_controller_table.coffee b/app/assets/javascripts/app/controllers/_application_controller_table.coffee
index 2444c798b..a9656dcaa 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_table.coffee
+++ b/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
diff --git a/app/assets/javascripts/app/views/generic/checkbox.jst.eco b/app/assets/javascripts/app/views/generic/checkbox.jst.eco
index e67ed3243..4576fab6f 100644
--- a/app/assets/javascripts/app/views/generic/checkbox.jst.eco
+++ b/app/assets/javascripts/app/views/generic/checkbox.jst.eco
@@ -1,5 +1,10 @@
<% for row in @attribute.options: %>
- /> <%= row.name %> <% if row.note: %>- <%= row.note %><% end %>
+
+ />
+ <%- @Icon('checkbox', 'icon-unchecked') %>
+ <%- @Icon('checkbox-checked', 'icon-checked') %>
+ <%= row.name %> <% if row.note: %>- <%= row.note %> <% end %>
+
<% 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 322af181b..6bbf33c01 100644
--- a/app/assets/javascripts/app/views/generic/table.jst.eco
+++ b/app/assets/javascripts/app/views/generic/table.jst.eco
@@ -1,6 +1,9 @@
">
+ <% if @sortable: %>
+
+ <% end %>
<% if @checkbox: %>
@@ -49,6 +52,9 @@
<% end %>
<% position++ %>
+ <% if @sortable: %>
+ <%- @Icon('draggable') %>
+ <% end %>
<% if @checkbox: %>
diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css
index 03f5a19b7..9700782ed 100644
--- a/app/assets/stylesheets/svg-dimensions.css
+++ b/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; }
\ No newline at end of file
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 6db702175..d39064c56 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/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%);
diff --git a/contrib/icon-sprite.sketch b/contrib/icon-sprite.sketch
index 91e2ce89a..5962c3c59 100644
Binary files a/contrib/icon-sprite.sketch and b/contrib/icon-sprite.sketch differ
diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg
index 7a10e2e75..2f1d82ec3 100644
--- a/public/assets/images/icons.svg
+++ b/public/assets/images/icons.svg
@@ -1 +1 @@
-arrow-down arrow-left arrow-right arrow-up chat checkbox-checked checkbox checkmark clipboard clock cloud cog crown dashboard diagonal-cross download dropdown-list email-button email eyedropper facebook-button facebook full-logo google-button group help important in-process line-left-arrow line-right-arrow linkedin-button list loading lock-open lock logo logotype long-arrow-right magnifier marker message minus-small minus mood-bad mood-good mood-ok mood-super-bad mood-supergood mute note one-ticket organization outbound-calls overviews package paperclip pen person phone plus-small plus radio-checked radio received-calls reload reopening reply-all reply report signout small-dot split status-modified-outer-circle status stopwatch switchView task-state team templates tools total-tickets trash unmute user website zoom-in zoom-out
\ No newline at end of file
+arrow-down arrow-left arrow-right arrow-up chat checkbox-checked checkbox checkmark clipboard clock cloud cog crown dashboard diagonal-cross download draggable dropdown-list email-button email eyedropper facebook-button facebook full-logo google-button group help important in-process line-left-arrow line-right-arrow linkedin-button list loading lock-open lock logo logotype long-arrow-right magnifier marker message minus-small minus mood-bad mood-good mood-ok mood-super-bad mood-supergood mute note one-ticket organization outbound-calls overviews package paperclip pen person phone plus-small plus radio-checked radio received-calls reload reopening reply-all reply report signout small-dot split status-modified-outer-circle status stopwatch switchView task-state team templates tools total-tickets trash unmute user website zammad zoom-in zoom-out
\ No newline at end of file
diff --git a/public/assets/images/icons/draggable.svg b/public/assets/images/icons/draggable.svg
new file mode 100644
index 000000000..eb90769e8
--- /dev/null
+++ b/public/assets/images/icons/draggable.svg
@@ -0,0 +1,15 @@
+
+
+
+ draggable
+ Created with Sketch.
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/assets/images/icons/zammad.svg b/public/assets/images/icons/zammad.svg
new file mode 100644
index 000000000..0f87b044b
--- /dev/null
+++ b/public/assets/images/icons/zammad.svg
@@ -0,0 +1,30 @@
+
+
+
+ zammad
+ Created with Sketch.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file