From 9e08e47414d454a0817da92e95729742dc713326 Mon Sep 17 00:00:00 2001
From: Ken Hawkins <khawkins98@gmail.com>
Date: Fri, 6 Jul 2018 14:34:12 +0200
Subject: [PATCH] Further cleanup

---
 Gruntfile.js                              | 33 ++++++++++++-----------
 source/common/functional/add-user.svg     |  1 -
 source/common/functional/add.svg          |  1 -
 source/common/functional/approve.svg      |  1 -
 source/common/functional/delete.svg       |  1 -
 source/common/functional/download-alt.svg |  1 +
 source/common/functional/menu.svg         |  1 -
 source/common/functional/refresh.svg      |  1 -
 source/common/functional/remove-user.svg  |  1 -
 source/common/functional/settings.svg     |  1 -
 source/common/functional/stop.svg         |  1 -
 source/common/functional/view.svg         |  1 -
 source/common/functional/zoom-in.svg      |  1 -
 source/common/functional/zoom-out.svg     |  1 -
 source/common/generic/alert.svg           |  1 -
 source/common/generic/email.svg           |  1 -
 source/common/generic/find-us.svg         |  1 -
 source/common/generic/help.svg            |  1 -
 source/common/generic/lovedata.svg        |  1 -
 19 files changed, 18 insertions(+), 33 deletions(-)
 delete mode 100755 source/common/functional/add-user.svg
 delete mode 100755 source/common/functional/add.svg
 delete mode 100755 source/common/functional/approve.svg
 delete mode 100755 source/common/functional/delete.svg
 create mode 100755 source/common/functional/download-alt.svg
 delete mode 100755 source/common/functional/menu.svg
 delete mode 100755 source/common/functional/refresh.svg
 delete mode 100755 source/common/functional/remove-user.svg
 delete mode 100755 source/common/functional/settings.svg
 delete mode 100755 source/common/functional/stop.svg
 delete mode 100755 source/common/functional/view.svg
 delete mode 100755 source/common/functional/zoom-in.svg
 delete mode 100755 source/common/functional/zoom-out.svg
 delete mode 100755 source/common/generic/alert.svg
 delete mode 100755 source/common/generic/email.svg
 delete mode 100755 source/common/generic/find-us.svg
 delete mode 100755 source/common/generic/help.svg
 delete mode 100755 source/common/generic/lovedata.svg

diff --git a/Gruntfile.js b/Gruntfile.js
index 5f72698..2ce9585 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2081,16 +2081,16 @@ module.exports = function(grunt) {
             // EBI-FUNCTIONAL
             // - Some duplicate icons have been removed
             // - In general key codes HAVE NOT changed
-            'add': 0x002b,
+            // 'add': 0x002b,
             'add-job': 0x0029,
-            'add-user': 0x0037,
+            // 'add-user': 0x0037,
             'align': 0x0069,
             'analyse': 0x0041,
             'analyse-percent_0': 0x0042,
             'analyse-percent_40': 0x0043,
             'analyse-percent_100': 0x0045,
             'analyse-graph': 0x007a,
-            'approve': 0x002f,
+            // 'approve': 0x002f,
             'approved-job': 0x0028,
             'attach': 0x0061,
             'browse': 0x0062,
@@ -2100,8 +2100,9 @@ module.exports = function(grunt) {
             'collapse-open': 0x0038,
             'compare': 0x004f,
             'database-submit': 0x0044,
-            'delete': 0x0064,
+            // 'delete': 0x0064,
             'down-page': 0x2b07,
+            'download-alt': 0x003d,
             'edit-user': 0x0035,
             'expand': 0x0075,
             'filter': 0x0066,
@@ -2112,34 +2113,34 @@ module.exports = function(grunt) {
             'lock': 0x004c,
             'login': 0x006c,
             'mapping': 0x0030,
-            'menu': 0x004d,
+            // 'menu': 0x004d,
             'move': 0x006d,
             'next-page': 0x003e,
             'play': 0x0076,
             'previous-page': 0x003c,
             'print': 0x0050,
             'redo': 0x007d,
-            'refresh': 0x0052,
+            // 'refresh': 0x0052,
             'remove': 0x002d,
-            'remove-user': 0x0036,
+            // 'remove-user': 0x0036,
             'save': 0x0053,
             'scaleable': 0x0059,
             'search-document': 0x006a,
             'send': 0x006e,
-            'settings': 0x0073,
-            'stop': 0x006f,
+            // 'settings': 0x0073,
+            // 'stop': 0x006f,
             'submit': 0x005f,
             'tool': 0x0074,
             'unassigned-job': 0x002a,
             'up-page': 0x2b06,
-            'view': 0x0034,
-            'zoom-in': 0x0033,
-            'zoom-out': 0x0032,
+            // 'view': 0x0034,
+            // 'zoom-in': 0x0033,
+            // 'zoom-out': 0x0032,
             // EBI-GENERIC
             // - Some duplicate icons have been removed
             // - Key codes have changed from old EBI-Generic
             'accommodation': 0xf220,
-            'alert': 0xf22e,
+            // 'alert': 0xf22e,
             'alumni': 0xf22f,
             'announcement': 0xf230,
             'basket': 0xf23f,
@@ -2157,11 +2158,11 @@ module.exports = function(grunt) {
             'documentation': 0xf283,
             'drug': 0xf28c,
             'elixir': 0xf28e,
-            'email': 0xf28f,
+            // 'email': 0xf28f,
             'embl': 0xf29b,
             'external-systems': 0xf29f,
             'face-to-face': 0xf2af,
-            'find-us': 0xf2b7,
+            // 'find-us': 0xf2b7,
             'funding': 0xf2ba,
             'group': 0xf2be,
             'gtls': 0xf2bf,
@@ -2169,7 +2170,7 @@ module.exports = function(grunt) {
             'help': 0xf2c3,
             'info': 0xf129,
             'location': 0xf2cf,
-            'lovedata': 0xf2d3,
+            // 'lovedata': 0xf2d3,
             'mailing-list': 0xf2d4,
             'math': 0xf2df,
             'meet-us': 0xf2e1,
diff --git a/source/common/functional/add-user.svg b/source/common/functional/add-user.svg
deleted file mode 100755
index 17e57af..0000000
--- a/source/common/functional/add-user.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M20 17.049v3.083h-6v3.949c-.661.031-1.331.051-2.001.051-5.219 0-10.436-1.066-11.48-2.133-1.043-1.066-.332-2.92.521-3.734.888-.847 3.448-1.32 5.732-1.902.587-.151 1.939-.596 2.096-1.346-.023-2.58-1.045-2.618-1.566-3.684-.522-1.066-1.42-3.701-.522-8.002C7.457.101 11.999.132 11.999.132s4.543-.031 5.219 3.199c.899 4.301 0 6.936-.522 8.002-.523 1.067-1.544 1.104-1.566 3.684.158.75 1.509 1.196 2.096 1.346.924.236 1.888.453 2.774.686zm12 5.083v4h-6v6h-4v-6h-6v-4h6v-6h4v6z"/></svg>
\ No newline at end of file
diff --git a/source/common/functional/add.svg b/source/common/functional/add.svg
deleted file mode 100755
index 7a6c5d3..0000000
--- a/source/common/functional/add.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M31.429 11.561c.314 0 .571.256.571.571v8a.573.573 0 0 1-.572.571H20.571V31.56a.573.573 0 0 1-.571.572h-8a.574.574 0 0 1-.572-.573V20.703H.571A.573.573 0 0 1 0 20.132v-8c0-.315.257-.571.571-.572h10.858V.703c0-.314.256-.571.571-.571h8c.314 0 .571.257.571.571v10.858h10.858z"/></svg>
\ No newline at end of file
diff --git a/source/common/functional/approve.svg b/source/common/functional/approve.svg
deleted file mode 100755
index cbfa2f0..0000000
--- a/source/common/functional/approve.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M12.804 30.176L0 20.572l5.604-7.469 5.875 4.405 13.492-15.42L32 8.239 12.804 30.176z"/></svg>
\ No newline at end of file
diff --git a/source/common/functional/delete.svg b/source/common/functional/delete.svg
deleted file mode 100755
index fca82a7..0000000
--- a/source/common/functional/delete.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M4 30.132a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-22H4v22zm16-18h4v16h-4v-16zm-6 0h4v16h-4v-16zm-6 0h4v16H8v-16zm20-10h-8v-2h-8v2H4a4 4 0 0 0-4 4h32a4 4 0 0 0-4-4z"/></svg>
\ No newline at end of file
diff --git a/source/common/functional/download-alt.svg b/source/common/functional/download-alt.svg
new file mode 100755
index 0000000..a770b32
--- /dev/null
+++ b/source/common/functional/download-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M27.625 20.944H31.5v7.75H.5v-7.75h3.875v3.875h23.25v-3.875zm-3.875-9.687L16 22.882 8.25 11.258h5.813V1.57h3.875v9.687h5.812z"/></svg>
\ No newline at end of file
diff --git a/source/common/functional/menu.svg b/source/common/functional/menu.svg
deleted file mode 100755
index cc76168..0000000
--- a/source/common/functional/menu.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M1.9 4.832h28v4.9h-28v-4.9zm0 8.8h28v4.9h-28v-4.9zm0 8.7h28v4.9h-28v-4.9z"/></svg>
\ No newline at end of file
diff --git a/source/common/functional/refresh.svg b/source/common/functional/refresh.svg
deleted file mode 100755
index 8cf4010..0000000
--- a/source/common/functional/refresh.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M31.5 12.257H19.875l4.344-4.344A11.585 11.585 0 0 0 16 4.507c-6.42 0-11.625 5.205-11.625 11.625S9.58 27.757 16 27.757c3.211 0 6.117-1.3 8.221-3.404l2.74 2.74A15.459 15.459 0 0 1 16 31.632c-8.561 0-15.5-6.939-15.5-15.5S7.439.632 16 .632c4.28 0 8.155 1.735 10.959 4.541L31.5.632v11.625z"/></svg>
\ No newline at end of file
diff --git a/source/common/functional/remove-user.svg b/source/common/functional/remove-user.svg
deleted file mode 100755
index 3692937..0000000
--- a/source/common/functional/remove-user.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M19.247 16.857l-4.075 4.076 2.759 2.76a41.33 41.33 0 0 1-5.932.439c-5.219 0-10.436-1.066-11.48-2.133-1.043-1.066-.332-2.92.521-3.734.888-.847 3.448-1.32 5.732-1.902.587-.151 1.939-.596 2.096-1.346-.023-2.58-1.045-2.618-1.566-3.684-.522-1.066-1.42-3.701-.522-8.002C7.457.101 11.999.132 11.999.132s4.543-.031 5.219 3.198c.899 4.301 0 6.936-.522 8.002-.523 1.067-1.544 1.104-1.566 3.684.158.75 1.509 1.196 2.096 1.346.667.17 1.355.332 2.021.495zm8.553 8.275l4.2 4.199-2.801 2.801L25 27.933l-4.199 4.199L18 29.331l4.2-4.199-4.2-4.199 2.801-2.801L25 22.331l4.199-4.199L32 20.933z"/></svg>
\ No newline at end of file
diff --git a/source/common/functional/settings.svg b/source/common/functional/settings.svg
deleted file mode 100755
index f5904b6..0000000
--- a/source/common/functional/settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M31.36 18.253a16.111 16.111 0 0 0 0-4.242l-2.402-.199a13.418 13.418 0 0 0-1.131-3.544l1.826-1.595a15.84 15.84 0 0 0-2.456-3.431l-2.059 1.273a13.135 13.135 0 0 0-2.963-2.193l.556-2.381a15.152 15.152 0 0 0-3.97-1.31l-.93 2.26a12.878 12.878 0 0 0-3.663.001l-.93-2.26c-1.397.255-2.73.701-3.97 1.311l.555 2.38a13.246 13.246 0 0 0-2.964 2.193L4.801 5.243a15.803 15.803 0 0 0-2.455 3.431l1.826 1.595a13.428 13.428 0 0 0-1.13 3.544l-2.402.199a16.107 16.107 0 0 0 0 4.241l2.401.198c.216 1.25.599 2.44 1.13 3.545l-1.826 1.595a15.77 15.77 0 0 0 2.456 3.429l2.059-1.273a13.07 13.07 0 0 0 2.963 2.192l-.555 2.382a15.176 15.176 0 0 0 3.97 1.31l.93-2.26a12.868 12.868 0 0 0 3.665 0l.929 2.262c1.398-.255 2.73-.7 3.971-1.309l-.556-2.382a13.208 13.208 0 0 0 2.964-2.193l2.059 1.273a15.849 15.849 0 0 0 2.455-3.429l-1.826-1.596a13.435 13.435 0 0 0 1.131-3.543l2.4-.201zM16 20.692c-2.478 0-4.487-2.042-4.487-4.56 0-2.519 2.01-4.56 4.487-4.56s4.487 2.042 4.487 4.56-2.009 4.56-4.487 4.56z"/></svg>
\ No newline at end of file
diff --git a/source/common/functional/stop.svg b/source/common/functional/stop.svg
deleted file mode 100755
index b49fd76..0000000
--- a/source/common/functional/stop.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M30.466 12.822a1.943 1.943 0 0 1-.001 2.741l-.569.569c-4.882 4.882-6.616 15.499-16.303 15.499S1.968 21.944 1.968 18.069V8.382c0-1.065.87-1.938 1.936-1.938s1.938.873 1.938 1.938v5.813a.97.97 0 0 0 1.938 0V4.507c0-1.065.868-1.938 1.934-1.938s1.938.873 1.938 1.938v9.688a.97.97 0 0 0 1.938 0V2.57c0-1.066.872-1.938 1.938-1.938s1.938.873 1.938 1.938v11.625a.97.97 0 0 0 1.938 0V4.507c0-1.066.872-1.938 1.938-1.938s1.938.873 1.938 1.938v9.688c0 2.811 2.27.802 3.603-.53l.843-.843a1.942 1.942 0 0 1 2.74 0z"/></svg>
\ No newline at end of file
diff --git a/source/common/functional/view.svg b/source/common/functional/view.svg
deleted file mode 100755
index f2af7be..0000000
--- a/source/common/functional/view.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 7.452C5.831 7.452.5 14.944.5 16.132s5.331 8.68 15.5 8.68c10.168 0 15.5-7.492 15.5-8.68s-5.332-8.68-15.5-8.68zm0 15.357c-3.805 0-6.889-2.988-6.889-6.677S12.195 9.455 16 9.455s6.889 2.989 6.889 6.677c0 3.688-3.084 6.677-6.889 6.677zm0-6.677c-.631-.692 1.028-3.338 0-3.338-1.902 0-3.445 1.495-3.445 3.338s1.542 3.339 3.445 3.339 3.444-1.495 3.444-3.339c0-.847-2.908.589-3.444 0z"/></svg>
\ No newline at end of file
diff --git a/source/common/functional/zoom-in.svg b/source/common/functional/zoom-in.svg
deleted file mode 100755
index 5ea5574..0000000
--- a/source/common/functional/zoom-in.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M30.538 27.011l-7.343-6.245c-.76-.684-1.571-.997-2.227-.967a11.577 11.577 0 0 0 2.781-7.543C23.75 5.837 18.545.632 12.125.632 5.706.632.5 5.837.5 12.256c0 6.42 5.205 11.625 11.625 11.625 2.879 0 5.514-1.048 7.544-2.78-.03.655.282 1.467.967 2.227l6.245 7.343c1.069 1.188 2.815 1.289 3.882.224 1.065-1.068.965-2.815-.225-3.884zm-18.413-7.005a7.75 7.75 0 1 1 0-15.5 7.75 7.75 0 0 1 0 15.5zm1.833-13.25h-3.667v3.667H6.625v3.667h3.667v3.667h3.667V14.09h3.667v-3.667h-3.667V6.756z"/></svg>
\ No newline at end of file
diff --git a/source/common/functional/zoom-out.svg b/source/common/functional/zoom-out.svg
deleted file mode 100755
index e089a11..0000000
--- a/source/common/functional/zoom-out.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M30.538 27.012l-7.343-6.245c-.76-.684-1.571-.997-2.227-.967a11.577 11.577 0 0 0 2.781-7.543C23.75 5.838 18.545.632 12.125.632 5.706.632.5 5.838.5 12.257s5.205 11.625 11.625 11.625c2.879 0 5.514-1.048 7.544-2.78-.03.655.282 1.467.967 2.227l6.245 7.343c1.069 1.188 2.815 1.289 3.882.224 1.065-1.068.965-2.815-.225-3.884zm-18.413-7.005a7.75 7.75 0 1 1 0-15.5 7.75 7.75 0 0 1 0 15.5zm-5.5-9.583h11v3.667h-11v-3.667z"/></svg>
\ No newline at end of file
diff --git a/source/common/generic/alert.svg b/source/common/generic/alert.svg
deleted file mode 100755
index b95b3f6..0000000
--- a/source/common/generic/alert.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M30.997 25.975L18.143 3.711c-1.178-2.041-3.106-2.041-4.284 0L1.002 25.975c-1.178 2.042-.214 3.712 2.144 3.712h25.708c2.357 0 3.322-1.67 2.143-3.712zm-12.575-17.6l-.484 11.624h-3.875l-.485-11.624h4.844zM16 27.749a2.906 2.906 0 1 1 0-5.812 2.906 2.906 0 0 1 0 5.812z"/></svg>
\ No newline at end of file
diff --git a/source/common/generic/email.svg b/source/common/generic/email.svg
deleted file mode 100755
index 65f9ed9..0000000
--- a/source/common/generic/email.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M19.131 16.62l11.527-5.762A6.178 6.178 0 0 0 32 9.944v15.688c0 1.375-1.125 2.5-2.5 2.5h-27a2.507 2.507 0 0 1-2.5-2.5V9.944c.404.36.856.672 1.342.915l11.527 5.761c.868.434 1.98.674 3.131.674s2.263-.24 3.131-.674zM2.236 9.251C1.006 8.636 0 7.234 0 6.132c0-1.1 1.125-2 2.5-2h27c1.375 0 2.5.9 2.5 2 0 1.102-1.006 2.504-2.237 3.119l-11.527 5.764c-.615.307-1.425.461-2.236.461s-1.621-.154-2.236-.461L2.236 9.251z"/></svg>
\ No newline at end of file
diff --git a/source/common/generic/find-us.svg b/source/common/generic/find-us.svg
deleted file mode 100755
index 026c3df..0000000
--- a/source/common/generic/find-us.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M14.036 2.182c.34 0 .62.279.62.62V29.46c0 .342-.28.62-.62.62H12.64a.621.621 0 0 1-.62-.62V15.82H6.54c-.256 0-.574-.058-.879-.152a3.122 3.122 0 0 1-.808-.367l-3.681-2.526c-.208-.143-.312-.331-.312-.519s.104-.377.312-.519L4.853 9.21c.208-.142.502-.272.808-.366.305-.093.623-.152.879-.152h5.48v-5.89c0-.341.279-.62.62-.62h1.396zm17.513 6.456c.208.143.312.33.312.519s-.104.376-.312.519l-3.681 2.527a3.104 3.104 0 0 1-.808.367 3.203 3.203 0 0 1-.879.152h-9.354l-1.241-7.13h10.595c.256 0 .572.058.879.152.306.095.599.224.808.367l3.681 2.527z"/></svg>
\ No newline at end of file
diff --git a/source/common/generic/help.svg b/source/common/generic/help.svg
deleted file mode 100755
index e9e6731..0000000
--- a/source/common/generic/help.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M16 .632C7.439.632.5 7.571.5 16.132s6.939 15.5 15.5 15.5 15.5-6.939 15.5-15.5S24.561.632 16 .632zm0 27.125a2.906 2.906 0 1 1 0-5.812 2.906 2.906 0 0 1 0 5.812zm6.785-16.406c-.151.511-.36.996-.63 1.453a7.597 7.597 0 0 1-.969 1.3c-.378.41-.791.803-1.245 1.18-.506.419-.913.792-1.219 1.115s-.515.604-.622.839c-.203.435-.355 1.477-.163 2.769h-3.872c-.031-2.297.306-3.421.708-4.253.41-.841 1.173-1.729 2.293-2.666.486-.397.862-.751 1.131-1.059s.475-.581.613-.823c.14-.242.227-.469.26-.68.032-.209.049-.427.049-.653 0-.421-.074-.808-.219-1.163s-.353-.662-.621-.92a2.922 2.922 0 0 0-.953-.606 3.302 3.302 0 0 0-1.227-.218c-1.767 0-2.844 1.232-3.231 3.7H8.992c.097-1.056.336-2.011.719-2.867s.882-1.584 1.502-2.182 1.342-1.059 2.166-1.381c.824-.324 1.721-.485 2.69-.485 1.033 0 1.975.148 2.826.444.852.297 1.58.709 2.188 1.236a5.587 5.587 0 0 1 1.422 1.89c.339.732.51 1.53.51 2.391a5.88 5.88 0 0 1-.23 1.639z"/></svg>
\ No newline at end of file
diff --git a/source/common/generic/lovedata.svg b/source/common/generic/lovedata.svg
deleted file mode 100755
index 33dc086..0000000
--- a/source/common/generic/lovedata.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M23.362 2.462a8.141 8.141 0 0 1 8.138 8.139c0 8.846-9.561 11.59-15.499 20.568C9.718 22.134.5 19.738.5 10.601a8.14 8.14 0 0 1 8.138-8.139c3.258 0 6.063 2.651 7.363 5.419 1.299-2.768 4.103-5.419 7.361-5.419z"/></svg>
\ No newline at end of file