From a65e083fcadbd7e99af60cd7da13ee4998df8e72 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Sat, 28 Jul 2018 11:37:38 +0200
Subject: [PATCH] Change PCS template icons

---
 .../fonts/cptools/fonts/cptools.svg           |  12 +++++++
 .../fonts/cptools/fonts/cptools.ttf           | Bin 0 -> 1772 bytes
 .../fonts/cptools/fonts/cptools.woff          | Bin 0 -> 1848 bytes
 customize.dist/fonts/cptools/style.css        |  31 ++++++++++++++++++
 .../src/less2/include/creation.less           |  12 ++-----
 customize.dist/src/less2/include/font.less    |   6 ++++
 www/common/common-ui-elements.js              |   9 +++--
 7 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 customize.dist/fonts/cptools/fonts/cptools.svg
 create mode 100644 customize.dist/fonts/cptools/fonts/cptools.ttf
 create mode 100644 customize.dist/fonts/cptools/fonts/cptools.woff
 create mode 100644 customize.dist/fonts/cptools/style.css

diff --git a/customize.dist/fonts/cptools/fonts/cptools.svg b/customize.dist/fonts/cptools/fonts/cptools.svg
new file mode 100644
index 000000000..2ea458f12
--- /dev/null
+++ b/customize.dist/fonts/cptools/fonts/cptools.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="cptools" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe900;" glyph-name="template" horiz-adv-x="876" d="M804.244 960h-732.699c-39.513 0-71.545-32.032-71.545-71.545v0-880.909c0-39.513 32.032-71.545 71.545-71.545v0h732.699c39.513 0 71.545 32.032 71.545 71.545v0 880.909c0 39.513-32.032 71.545-71.545 71.545v0zM808.421 7.545c0-2.307-1.87-4.177-4.177-4.177v0h-732.699c-2.307 0-4.177 1.87-4.177 4.177v0 880.909c0 2.307 1.87 4.177 4.177 4.177v0h732.699c2.307 0 4.177-1.87 4.177-4.177v0zM107.789 852.211h660.211v-256h-660.211v256zM107.789 555.789h269.474v-256h-269.474v256zM417.684 70.737h350.316v-26.947h-350.316v26.947zM417.684 133.659h350.316v-26.947h-350.316v26.947zM417.684 196.446h350.316v-26.947h-350.316v26.947zM417.684 259.368h350.316v-26.947h-350.316v26.947zM417.684 555.789h350.316v-26.947h-350.316v26.947zM417.684 498.526h350.316v-26.947h-350.316v26.947zM417.684 441.263h350.316v-26.947h-350.316v26.947zM417.684 384h350.316v-26.947h-350.316v26.947zM417.684 326.737h350.316v-26.947h-350.316v26.947zM107.789 259.368h269.474v-215.579h-269.474v215.579z" />
+<glyph unicode="&#xe901;" glyph-name="new-template" horiz-adv-x="920" d="M103.696 856.304h635.139v-246.278h-635.139v246.278zM103.696 571.139h259.241v-246.278h-259.241v246.278zM401.823 165.039h337.013v-25.924h-337.013v25.924zM401.823 225.442h337.013v-25.924h-337.013v25.924zM401.823 285.975h337.013v-25.924h-337.013v25.924zM401.823 571.139h337.013v-25.924h-337.013v25.924zM401.823 516.051h337.013v-25.924h-337.013v25.924zM401.823 460.962h337.013v-25.924h-337.013v25.924zM401.823 405.873h337.013v-25.924h-337.013v25.924zM401.823 350.785h337.013v-25.924h-337.013v25.924zM103.696 285.975h259.241v-207.392h-259.241v207.392zM842.532 140.152v751.020c0 38.013-30.816 68.828-68.828 68.828v0h-704.875c-38.013 0-68.828-30.816-68.828-68.828v0-847.457c0-38.013 30.816-68.828 68.828-68.828v0h666.896c19.163-23.765 48.277-38.841 80.912-38.841 57.27 0 103.696 46.426 103.696 103.696 0 48.068-32.706 88.497-77.078 100.248l-0.724 0.163zM68.828 39.696c-2.219 0-4.018 1.799-4.018 4.018v0 847.457c0 2.219 1.799 4.018 4.018 4.018v0h704.875c2.219 0 4.018-1.799 4.018-4.018v0-755.297c-16.886-6.977-31.013-17.69-41.84-31.166l-0.157-0.202h-333.902v-25.924h318.607c-4.743-11.511-7.504-24.874-7.518-38.881v-0.006zM816.608-51.038c-50.111 0-90.734 40.623-90.734 90.734v0c0 0.068 0 0.148 0 0.228 0 14.058 3.253 27.357 9.047 39.184l-0.233-0.526c1.324 3.018 2.711 5.571 4.28 7.995l-0.132-0.218c9.3 15.303 22.547 27.384 38.344 35.021l0.542 0.236c11.301 5.562 24.6 8.814 38.658 8.814 0.080 0 0.16 0 0.241 0h-0.012c50.111 0 90.734-40.623 90.734-90.734s-40.623-90.734-90.734-90.734v0zM861.975 52.658h-32.405v32.405c0 3.579-2.902 6.481-6.481 6.481v0h-12.962c-3.579 0-6.481-2.902-6.481-6.481v0-32.405h-32.405c-3.579 0-6.481-2.902-6.481-6.481v0-12.962c0-3.579 2.902-6.481 6.481-6.481v0h32.405v-32.405c0-3.579 2.902-6.481 6.481-6.481v0h12.962c3.579 0 6.481 2.902 6.481 6.481v0 32.405h32.405c3.579 0 6.481 2.902 6.481 6.481v0 12.962c0 3.579-2.902 6.481-6.481 6.481v0z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/customize.dist/fonts/cptools/fonts/cptools.ttf b/customize.dist/fonts/cptools/fonts/cptools.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..179ba4d98d4afb8e71a47182735302e35bfe1d8d
GIT binary patch
literal 1772
zcmah}O>7%Q6#nLCo!G6NI<b?+PRu%X+{7s%n`G@qO43$JD<V`?DG)&rP&YAlE5~ca
zj+6)vaG*jQph6WY;(`$32!dNnk-`ZHAywkg^w3*Q5fUH}IiT3)&F&W55|y|6-hS_A
z-kW)|GhhG?;Y|pPoqzVJ@s3XII9YBJUtC_zReBbGdIw;Aq(4{4RV(y8Lc0347fPG2
z{qo`7Z=`PkVyKwUtpsoV{xTpxA%CVwhPEZ~J?ZyIPZn2e8-7U$a-YP}lC_*;w{Z*5
zLZk;)a~l<O<6F{`r0eC}YX0Vxbd>Zts&TbqRcka)BF~S?4<Q)41`XgJab<bm`Ldre
z!MrN2g&0lyVLAouGO^X%!YM&aPSuMCq}xDMQ`|>B=PT@}K1iG(yASQ)^f2hVtXXe1
z?NRzJY|NTFJ(9+?=4D_M)zM<(Kz7Ow`8V$IwgAxF5+#~-7mndL449b03{K+==5Y=S
zcpgi%ocMqzYy?By6GnVIV;aH9RH7^7Nf_~gl+rTF-W@iycrYHMHy&j1aNKO+AmK+J
zP5DK#o{Xi_F@9f3$$34=h2Z=?p*eoNUSj^nA1uROX?*&B-1tGoimh~P|C&lBDzWtb
z(<+;&D4A?huNwDk8I3MQUnFL8(OC2e;#hQedz-qc`f-E$A>l=Ux^fi#7;t-&p?;L`
zp8C(a)ZEpgOnasFQf*<|)Jn}qguPl#b&k6BPd8(1f*LxRI%a4Ow=x)DZ3d+Yu&~ji
zTql?@naLWnEE}F>C)q5U7#p8r)OEEF*#zZC7zvd)>`1j)6JcAbEi+XeLq!$&>-D#p
zXw+GnEi}G-95?Q&IKDI7S3lW5G}O;O4y1cWrbh<$|Kf_iW5OS9Z+y*Wg)F8_O)}2f
zx(>7UkdF<T=HQdM6n-J%TuL4n1f?z%y|A~}*de|WiA?wQ&O{=tKN88dyr=Kn`GEhb
zO74HvKhznX8A)cnE1Zk-s%+h_9q~oHA>T`8$`|r-$=TsfjY(+^rp%%)q!g+!mrh~H
zsjzb<>0B&a9X4L=nEn%o><a|jZ{4MP2kzJ1eY%tAEILGE?6Xb3gd%aH<-|D=9>?P-
zYM3b5agM=<5Mub8T_;tYOAo$L{~6JP3bx{k0KRbZGqjP-Imw*xMHdUg85c{!>n_&l
z_6@t(L-uD}>_Y_as=Gsa$r2!sgE`@Xiv{5s7fZr#xLBiGRClq5>=#_@!z4aiuGB26
zRK+qXsKKJAgz92`t$Nui>&EC97Lmsqs<=$9GUYKaim?Mn9ca9eFRYhxYg9B(6J4k5
zIjkKRdDbe|^g_OzU(40<EBd8PeSX<GXIbS@oV9D$sCt3Yl<gViXu5f<knIvSNzT&}
TEV}K~63R43+Pu~+`7iz(Im<5T

literal 0
HcmV?d00001

diff --git a/customize.dist/fonts/cptools/fonts/cptools.woff b/customize.dist/fonts/cptools/fonts/cptools.woff
new file mode 100644
index 0000000000000000000000000000000000000000..04cd4717226a602d38a761b1d2210f332edbe635
GIT binary patch
literal 1848
zcmah}QA}H96h8m|-&<%m3WXM=h1x>tpiJZfw}k}QmP|5Y7Q$4b7?locyQQ=ZEpbF&
zd~h*7C^3tf@y!??HTouMf{BTVF<Iin@L_K}EiSrf<iXI^@7#Omx=H4__niBk??3mP
z|3Clz?`sQlb0i4TG)c$!>AGY4j31PRXPz7*63t*&SX<lmldJ3L61W`vXIZ<JettWf
zE;IKHe2!&p%jUOU1@}FX8f5+LgM+)dOnQw-yMys0t8eFzmvSJ9^cZ|go0ioNx%J8w
zaOc21#@eD0<%_Evw*ueGifTLS=_{zKLn&fuCw*H;uV=t*qxMzSuP!G-rDC~)^>Qvd
zP5~(;#5U<f@<aI({P*mq_?5<m8-AmRwnmTfX`<Ug?bdhcw1R>W(0dZGfK>&k2V;zT
zU^%LXG@8WIgHB0Yf+Dv?y;`q>BVe+ysPA`a&KuSMj39xiRx69mNut!0Rr-GYM|0?2
zeOKi%>kc|WC&?g_rf7!F&{H%|=V_6iqh*we_PGLv&)+$2M8}e*;hTu}clcfXMzk-^
zUXuCFfT2fyQ6KK8PecPzvq62p4_`Wut5`J_P9(ze7F$iqYD_96<t?DI@>(@7T55la
zq<FdZ@&9S<M~+pyiSXezCsU<x;_w`2Qzf>sI(k+6#j>H$a_9x9I2#Iw9*2fQLwkGZ
zCimky`k|2<-&O~{xnAmXdXq#y^7Jn45Owg}c~PddQfsM}u{d6-`H-<zt8?ejwST)A
z7UO8>MEr!IKiEp2S2P(&;}rp;i-#tKF_BCevmzCk6{p0k7#|&*66iYbL#iJ+`i*{0
z9I!2K)_B0Oyk#cWF*qtGU$4F;RIMr!VzKu5qqKID<K+HOPxVyq;9#%($eZXMo*wQy
z{9CeoCsa$Ix%Q=)Ra!1?>Y9+EspGh4_It#DX%0LQ(Nv34QK@M%ssOc!VtM}HptcXa
z91Ko(ch3ZaqBj^!HQZ-z+<0I9&Lt1O=pAei%nZj;?lmdZ0++3}=xv^$+wXbNjC=fU
zsY!9XT^E{W4#dq|L}{Ah!cwyfYZ8U+Gl_Gtcy-8lrFHr*ItC81_vX#J_n*%0^M4B`
z#}d3_oo##)Eb4m0iL)4T*(0{Yuc^EhXA>UsQ<y##*WmKGbkW!Rok8wZupGyD=`$z4
zpeAtkNtVDX4pzWP2W!Ba4%YDp4>;Hb{%Hq$C`j+{ze96_@nXcr5;*H%1w7+m4fqWQ
z>(ogR2fM&uaIl9a=#$k_rC7|DX_ZP;p(3t4m6tLb<x9mv#26W+CCbnSmFW_O3dm#7
z2#p^3){*3eOm;J$-ayd|Cc262Y1%k4a;{jYM6#JeW+Pq6tVJ$vMdnwF=ZnR{2+diw
nE2y4Dnu0Z>G^U%OHE<Vc3w9n$DB^F&ODJHD*u2Iq`7izlV%jn=

literal 0
HcmV?d00001

diff --git a/customize.dist/fonts/cptools/style.css b/customize.dist/fonts/cptools/style.css
new file mode 100644
index 000000000..83c233e62
--- /dev/null
+++ b/customize.dist/fonts/cptools/style.css
@@ -0,0 +1,31 @@
+@font-face {
+  font-family: 'cptools';
+  src:
+    url('fonts/cptools.ttf?dysqmo') format('truetype'),
+    url('fonts/cptools.woff?dysqmo') format('woff'),
+    url('fonts/cptools.svg?dysqmo#cptools') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+.cptools {
+  /* use !important to prevent issues with browser extensions that change fonts */
+  font-family: 'cptools' !important;
+  speak: none;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
+
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.cptools-template:before {
+  content: "\e900";
+}
+.cptools-new-template:before {
+  content: "\e901";
+}
diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index 0fca7797d..e5c71a3db 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -279,12 +279,12 @@
                     color: black;
                     border: 1px solid transparent;
 
-                    &.cp-creation-template-selected {
+                    &.cp-creation-template-selected, &:hover {
                         color: @creation-color !important;
                         color: var(--creation-color) !important;
                         background-color: @creation-bg-color !important;
                         background-color: var(--creation-bg-color) !important;
-                        .fa {
+                        .fa, .cptools {
                             color: @creation-color;
                             color: var(--creation-color);
                         }
@@ -292,12 +292,6 @@
 
                     transition: all 0.1s;
 
-                    &:hover {
-                        //color: @colortheme_modal-fg;
-                        background-color: @colortheme_form-border;
-                        box-shadow: none;
-                    }
-
                     align-items: center;
 
                     img {
@@ -317,7 +311,7 @@
                         margin-top: 5px;
                         max-width: 100%;
                     }
-                    .fa {
+                    .fa, .cptools {
                         color: @creation-bg-color;
                         color: var(--creation-bg-color);
                         cursor: pointer;
diff --git a/customize.dist/src/less2/include/font.less b/customize.dist/src/less2/include/font.less
index 9247ae109..627a9a9f8 100644
--- a/customize.dist/src/less2/include/font.less
+++ b/customize.dist/src/less2/include/font.less
@@ -8,5 +8,11 @@
     src: url("/customize/fonts/neuropolitical.ttf");
 }
 
+// Fonts need to go on the global scope
+@font-tools {
+    font-family: CryptPadTools;
+    src: url("/customize/fonts/cryptpadtools.ttf");
+}
+
 @import (once) '/customize/fonts/open-sans.less';
 
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 3d696df93..c837c23d9 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -13,6 +13,7 @@ define([
     '/customize/messages.js',
     '/customize/application_config.js',
     '/bower_components/nthen/index.js',
+    'css!/customize/fonts/cptools/style.css'
 ], function ($, Config, Util, Hash, Language, UI, Constants, Feedback, h, MediaTag, Clipboard,
              Messages, AppConfig, NThen) {
     var UIElements = {};
@@ -2045,12 +2046,14 @@ define([
             allData.unshift({
                 name: Messages.creation_newTemplate,
                 id: -1,
-                icon: h('span.fa.fa-bookmark')
+                //icon: h('span.fa.fa-bookmark')
+                icon: h('span.cptools.cptools-new-template')
             });
             allData.unshift({
                 name: Messages.creation_noTemplate,
                 id: 0,
-                icon: h('span.fa.fa-file')
+                //icon: h('span.fa.fa-file')
+                icon: UI.getFileIcon({type: type})
             });
             var redraw = function (index) {
                 if (index < 0) { i = 0; }
@@ -2066,7 +2069,7 @@ define([
                     }).appendTo($container);
                     $span.data('id', obj.id);
                     if (idx === selected) { $span.addClass('cp-creation-template-selected'); }
-                    $span.append(obj.icon || UI.getFileIcon({type: type}));
+                    $span.append(obj.icon || h('span.cptools.cptools-template'));
                     $('<span>', {'class': 'cp-creation-template-element-name'}).text(name)
                         .appendTo($span);
                     $span.click(function () {