From b3730be7e0a3a6e86d003e2d98d3fd0d6c6379f0 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 27 Oct 2016 09:03:26 -0600
Subject: [PATCH] Fix some missing / incorrect icons - Addressbook advanced
 search was from default - Add favorite dialog had no icons on buttons - All
 dialogs using standard button sets were either missing or from default theme
 - Mail confirm all was missing Yes icon

---
 .../pixelegg/images/advanced-search.png        | Bin 0 -> 2996 bytes
 api/js/etemplate/et2_widget_dialog.js          |   2 +-
 api/js/jsapi/app_base.js                       |  17 +++++++++++------
 filemanager/js/app.js                          |   4 ++--
 mail/js/app.js                                 |   2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 addressbook/templates/pixelegg/images/advanced-search.png

diff --git a/addressbook/templates/pixelegg/images/advanced-search.png b/addressbook/templates/pixelegg/images/advanced-search.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7e3f68b114767b5de97e3ddf819fba34083a011
GIT binary patch
literal 2996
zcmbVOdpuNWA3tu*B)5@!VGJu>%+(BLjl!5rjI7AC70u;fFc&kE8JCn><XY)fXhUl^
zmC_=VYc!Gy6*iaLx-7-gZR<^VkGA%G|Jcv|@t)5)=Xsvr^ZR~(m*@98pL4{=d#k3p
zi8=rPnsg7UFEk>TANUIBEs2SF3k}9nccyfQFjy*Mi9x`HD`bO6I-eB+`hqNObmVQ&
z2>?_=d45bOli@|?2>EE%vJP6#7eQzMaM~;vu{hzN6v+ldcmfJ)w!RsK<Z&se03rj+
z5V?V&JdYSLxFg2fj}sHlapa;lJ0qRsWQc$dN?AxbKSCfO%PFYOykuy;EXJUapH-yc
z6x5$iF&REcH=!6r643-(4i<+)l1ONr9g#%BZ9?L)I6MXm-6UI_9hpcX<L!}OE)--<
z%nc^{QfXgoK`RO>R4NsbF&LRlhL#b~LU9NN=jiCT%z?+-LK?P`Xn~X^w-rb%zcNrk
z2}jHmNqIs6a+#6E7Vei)P>`p8hQJpw7=IB9BwrE*r3@oyi7+@c7Q^Q+$MsoTBJ~CT
z>&D+|OZ=imAjTJz2=|LQ(0K$~eg#9h`)5PTijX(t?P4BuD69yokh7l;3Z!%@1qJP(
zxjZfzOK^a)Xm5wL$74wjIGh94f#B|lb9A+*5@?Qi`>z~-hjp=Y#o4*jTxbq>2<eV@
zA-NG9s8k%yj%1I;(Wqasbb&<55^%t;c6pH9FIdNa#FE{_AWJF~`w4{+Un{^TR45fn
zLWLrv+YS=ahQZ?S1j~Z;%Lnvlyi`!kivqbcv5=4aoMAHWZ#=-^9SJT}H#a=>OXPUG
z3zbU5(nv&{tGlBs>I;_p|6~mVIfGd)kN+u`uOg@hm#2RfKeYI(eLw-!Gh(PY#!F|b
z001^Yr@Hvb2g?I?d+CMfjpY9@^Lyp+(`+Ase}X<j>6I@6=Ui<<AFQ6ry+ki$hO;x9
z>^2<Xd1Y!_hmA&<7chhDENB^qCRT$s^7U%^Cp?v&#W!Q7`9F`={xG2Rasw&ycvThQ
zP4~ejNtX<588J|)m_ut-{2E>-`7Qgy+o>Jl63Lrui;IicnS7h{ZDR53l&X;KK#jQV
z>J23}=`K3SOPYr|Bh?l418r?>HJzQE4C`F_c)VH8){%PIEO4gT3^05R|2b}Hae;O^
zZ%b&O6IZXlPB{<JqPy0Z_TzUeSFL(8)|@&YC6g5f!uA{o2hN>V4)}M%S_ctQb>FtR
zS{(zfx0e?)I3#4WZ9FSIy+Ea``BiyAdy(^j@2#WK+>e)f+(R<Tl2W7M)qs@FXy^Se
z{3d&Pde-IU=6?I)<;&cl2Kh0#0s&ZJyU-^+TgVo8yjZ;O@m+X8IrEifOWtT*q}w(+
zou1r>YV250)-LzduIsbCK^|>}0@&v7@2|iFHGTRx(il5Mp-_y|N`Qb)os-UXg4*3u
zhqdj~)6)j0p8y{;W;Y*P90s&)BofI^`L_P(EyWg0F|C5Kem!pxHa6at`h0h-V8&?e
z+D~V%UniUA9o}_mXUeqy-j~{0ondXgy(bXGnWm<u_lZPe`1w=a9u22X8J*m=B_`wj
z&6mGc2p?=LDk?IJni=%Bb-DKJMiNY+qM}md7L7Qun~rK!_-S1<R(83k>wMyuE~+O&
zOD31s1ypQ_E!uYyz4wKN2F!{7M<h^a-SRldB1=53x$zh*;%RnHj(J*kwwd<Im66KV
zcwDa4+F8ZKV2P53m64Kau%C}^>&NYDOiV^#cQ|*0tIB2j*=)8fFfcGSA|k@Jd^#k|
z;<>UbIMfjR=5=px?~(TQcKx|lCsKeN7MpwqZ<$#@Q#<T<Lvu4hX=Iglr>?lV`07=n
zTSmzWB!$v=>B^P4fYLpE?OAJJe(2DDd&zFO;(?p0hTD~afeNG^0l8-ryzxH!m(Uc(
z$TdlbX6yJ(VqT{J{=O`4aBy%U!Kl4(0arZ`krduve(g}*l611i!d-&vl6+d4yl?qE
zUY(VYo@(fP{lI*bvmRN?%!zsa`q1oBSC=>8G6e*|&11*aA`B+(c6SF%CNP<^GRodP
zzP=CA4dXXQzb-u+(iEkquYVhEy74TmP~*l#pbgzEbW_a4inPS*_q#*NzF7i$A3b6w
z?^N>l4Ds<=Bu7qAQ+JjsyFbxWYH76AD~|CfI>RMb*p?;h8BH4^%4;t4uk=3mFwMxD
z;As%<JO*=Xzsi9R*wo=K_G$EM>)cIR&{KzZg#88|T%~gmVRPWsEj9wEdvw10@V?Xn
zwm_iaxwb<!C+w18{*D|ClO2nc2AvHRS~crN{^i8QW@tYq5C|N_LYcy;SkP{cd2r`&
zJd4KHap|xd{?RB86XaY_SXd9!7p_Pq0Z%v1r<IhH#7$llsoozNT9dS-NYyqs2)w04
z`bJO|oM23}YOJWhn5cW%Ou3)f7;w3qvz~TP#QQW6n-F`XOw3Vjd3=<HuWU(d)yuhK
zD!eibcpjLk{plw~cKp7rE3B-otm?*M47<xud(7lLxs_AjYle{a>r_=%etg8<)#zd7
z=VW{j)E|6xa%+y6t)|yHQ~2ugDtjXFK<4lHS+WI2#-7Cac~LaRgN)We*j|PG6qSaF
zRFUHCfn8lio0|nv>D&6(uU~f~OJaJV60cO|4&<)e-sG-w$JpFF=i!F)1;34Gt|4J_
z7nzx!(+@{S8=|Yq&Yoqjc12z>@39Q^;bzts7Z+z0mS{^`QoO!hbp{jr=|f~(Z0tNN
z?PAuMhr@T&PvzzHC(GiUqNbS&HsGMBE}5n!#Ub9$j&?r@M&>5co+w|-ER+8M^>Zwh
zdeaUdmmHOpYEE6~3DXT|wx~?wb&TNVNNt-2igF|dCk*#A#YNk~LsJd)ViI@q9y6Z7
zZ(G6E)K))|0Pf$Jj5fx~Ovxih$@YOM_K5}tmS!TRPtX15JpEO$!zo5}1Euc(Ca<Sl
zvz=SRu4`0zcWB3PwKuNtN-HHod)T4Qu8xkmiTNLmr`E%c9|cZXYc)*Xyw#@av-+;y
zw(65fFqlref8orjq0^auIAqp*Mn=Y(;$pKY`=P!*eKkz}F$PV}i1}lB7b=s!t0p49
zzPkFY;}*Grd~8CI(b;rh{&d*hBAS`@K7&a`w8>5eY9sBJaVMv-r(+4N#Cx&%`T2W&
zhO5QTI!C9Y=KZCLc+pMOkw*aP2vLpFYKT7MacG_Iv4XBkyK8GuNyG8FVkOeCgeU{|
zlr8PA*xCgQLWgm}JzwlQ>$b-6uu)O#?lz!T*U<2Nh_`o_27Tr2<OjwzQ9J3uy0<eE
zZ)WqhT)Oh)F=eP$cy1)<la=a6HNu+5=_~1e=gg}<zOxG5A7pB?=Y!c?SR5d_%t$Dw
z^~cF)2Cp_iAC5kg{A(-tL9JsO`9n3A5aS!R9;;vIthH!#QL@QqblLBBzx?pPA)QC?
z(p7Dpu`eXXqbAXxJasxWw4>XE>cekj-%K&oN1l((m;H>Nxa%XmuzIyU*bY}s$n6jz
zduQfax<B@BYRuR!iBYB~GDfgR?r3d*!Grv!R`#Cq?<hxeZ#ddC#XRjmEKR=60aSqW
X3vTPwil167|3}l^y{VU7_a*)Zh&=1y

literal 0
HcmV?d00001

diff --git a/api/js/etemplate/et2_widget_dialog.js b/api/js/etemplate/et2_widget_dialog.js
index edfe6a153b..7d4f0702c8 100644
--- a/api/js/etemplate/et2_widget_dialog.js
+++ b/api/js/etemplate/et2_widget_dialog.js
@@ -387,7 +387,7 @@ var et2_dialog = (function(){ "use strict"; return et2_widget.extend(
 				}
 				if (button.image)
 				{
-					button.style = 'background-image: url('+this.egw().image(button.image)+')';
+					button.style = 'background-image: url('+this.egw().image(button.image,'etemplate')+')';
 					delete button.image;
 				}
 			}
diff --git a/api/js/jsapi/app_base.js b/api/js/jsapi/app_base.js
index df89758053..ab25cfcb89 100644
--- a/api/js/jsapi/app_base.js
+++ b/api/js/jsapi/app_base.js
@@ -739,6 +739,7 @@ var AppJS = (function(){ "use strict"; return Class.extend(
 		buttons['save'] = {
 			text: this.egw.lang('save'),
 			default: true,
+			style: 'background-image: url('+this.egw.image('save')+')',
 			click: function() {
 				// Add a new favorite
 				var name = jQuery("#name",this);
@@ -807,14 +808,18 @@ var AppJS = (function(){ "use strict"; return Class.extend(
 				jQuery(this).dialog("close");
 			}
 		};
-		buttons[this.egw.lang("cancel")] = function() {
-			if(typeof self.favorite_popup.group !== 'undefined' && self.favorite_popup.group.set_value)
-			{
-				self.favorite_popup.group.set_value(null);
+		buttons['cancel'] = {
+			text: this.egw.lang("cancel"),
+			style: 'background-image: url('+this.egw.image('cancel')+')',
+			click: function() {
+				if(typeof self.favorite_popup.group !== 'undefined' && self.favorite_popup.group.set_value)
+				{
+					self.favorite_popup.group.set_value(null);
+				}
+				jQuery(this).dialog("close");
 			}
-			jQuery(this).dialog("close");
 		};
-
+		
 		this.favorite_popup.dialog({
 			autoOpen: false,
 			modal: true,
diff --git a/filemanager/js/app.js b/filemanager/js/app.js
index 600cf10c15..ece8f823cd 100644
--- a/filemanager/js/app.js
+++ b/filemanager/js/app.js
@@ -353,8 +353,8 @@ app.classes.filemanager = AppJS.extend(
 			if (_data.uploaded[file].confirm && !_data.uploaded[file].confirmed)
 			{
 				var buttons = [
-					{text: this.egw.lang("Yes"), id: "overwrite", class: "ui-priority-primary", "default": true},
-					{text: this.egw.lang("Rename"), id:"rename"},
+					{text: this.egw.lang("Yes"), id: "overwrite", class: "ui-priority-primary", "default": true, image: 'check',},
+					{text: this.egw.lang("Rename"), id:"rename", image: 'edit',},
 					{text: this.egw.lang("Cancel"), id:"cancel"}
 				];
 				if (_data.uploaded[file].confirm === "is_dir")
diff --git a/mail/js/app.js b/mail/js/app.js
index c8dbe22cba..2fb4a7763d 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -2010,7 +2010,7 @@ app.classes.mail = AppJS.extend(
 			if (_confirm)
 			{
 				var buttons = [
-					{text: this.egw.lang("Yes"), id: "all", "class": "ui-priority-primary", "default": true},
+					{text: this.egw.lang("Yes"), id: "all", "class": "ui-priority-primary", "default": true, image: 'check'},
 					{text: this.egw.lang("Cancel"), id:"cancel"}
 				];
 				var messageToDisplay = '';