From 884271afdc639c669349eac6a133fb09aa033f37 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 20 Apr 2020 14:34:58 +0200
Subject: [PATCH] updated footer and favicons

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 .../WEB-INF/liferay-plugin-package.properties |   2 +-
 .../favicon32-territori-aperti-orange.png     | Bin 0 -> 673 bytes
 .../images/favicon32-territori-aperti.png     | Bin 0 -> 375 bytes
 src/main/webapp/templates/portal_normal.vm    |  37 ++++++++++++------
 5 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 src/main/webapp/images/favicon32-territori-aperti-orange.png
 create mode 100644 src/main/webapp/images/favicon32-territori-aperti.png

diff --git a/.DS_Store b/.DS_Store
index c441d425b615a6b1e26ce9a4710d4fd54c7ea9ce..fe3e1c36c824da094001330b4854df76602c6f02 100644
GIT binary patch
delta 24
fcmZoMXffEZfSKLY*hojg$ZYZ&Ca29WnWaSlUjGMT

delta 16
XcmZoMXffEZfO+y#CeO_;nWaSlH<Jbp

diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
index 4edfb92..8b1a568 100644
--- a/src/main/webapp/WEB-INF/liferay-plugin-package.properties
+++ b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -1,6 +1,6 @@
 name=territori-aperti-theme
 module-group-id=liferay
-module-incremental-version=8
+module-incremental-version=9
 tags=
 short-description=
 change-log=
diff --git a/src/main/webapp/images/favicon32-territori-aperti-orange.png b/src/main/webapp/images/favicon32-territori-aperti-orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..96218452dc9130ef05cdaf5928b58db1ee6fd839
GIT binary patch
literal 673
zcmV;S0$%-zP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007LNkl<ZScSEh
zJxEq@6vlr=5C)P6jyXh&4dK%8h8caXHKc>mU<vAwMuL%pQG-!nqz)RGO*v#kEiDnz
zmjyLcgCImh4M9l-LLaomiRX>m+r8)h?_Yi3zVQCfbDs0ud(Z#lu2~u*7Mp+(<@N*b
zV|3O=mxm_cfUc%kk#&)I$AGEC{~2HdaJ8sV%oFIYC|<^tVykN4I56SFC&XD511Euy
zmK_s!MGc%zbbJU#l(QlR&H}>)ikC60++`WK01P?tkHB{)J|vAO1DAmTC;kR#07}3w
zhc_UtLI$jx`yA1EU<dFScm?bQzB&B9tl5)hU^-_$zXWyypAut_WMaw5>z1}_;5yLZ
zh&%^&>&`3j4A=vFb@Dq@Bh|nSpv_5ss=M?Gya09qiw>tvwf-8|4BP@*oTP^VkGPE2
z+MGT(oEFurx6SAZu+Jgi%rTdS1z;O+2iTs$IcPu2*^cwDnDe>}>&-wHaN8jr1|9%a
z1&UWGXTQU-nq6k#EpP~!b;!-YJ)k<Ec(u6A4rf+1-z8r`s}2@fC`q`+;navzayT=p
z^#_$b&<<R4lC7cc1GOo!TE()O4r#Y12hy7GC@|@WG-~CmON`ZNtkKDvl=eT!ngu<;
zs3W!&m;*NIn$uVoMy2^5yhG^;;HR@AZqcG+sCRTO0;jTqd8cAa{NbDlyuyZaz!{Ga
zvJjcTU;wWYgL%b64H(Yr>n9Zb%E?8MrT7xi8^G%oHwZ=dg7K_w7J9@9M$Bep^SLu+
zyfbJ0NJZ>!Xy1TGbPoKYLq_56LPPAwso@E5SJU)ylmhS@Jri%mHBP&)00000NkvXX
Hu0mjf!pbvd

literal 0
HcmV?d00001

diff --git a/src/main/webapp/images/favicon32-territori-aperti.png b/src/main/webapp/images/favicon32-territori-aperti.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa1c9b0928ec3897dd15caa29897702c6001760b
GIT binary patch
literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz8A(JzRCwCVmpu-`FbqbUMnWAJdIXNp
znTc`|I0G{iGiQJ+aDsMY<tPjch^euZp+iaS&#sh6QKKr&d;N>;qENK;>9V7)S))|I
zZ{g5Uk7KBL1^h5N)vUJr&F|Sg78jU+t0cS;9G38ga7e-%!^IMQ0k}xQE8*|ZzoA#C
zgj2%XIHvuePRzZ3uID3LfC~?czT*4_m2g`4=sHNkS->?C&I*o7I7>Jp;bJ)Ltl&b4
z77oW&tqgb8)8k0YsbkD<jPIUaL7&G*n8k0H#YU9HR-8pJ5=s;(d^R7TI8O1L;`*N{
zRU#Ldg|jjuh6D^}=Y)U+3ogov1rltyxGrEwh~Q9Vl#md^;o5LQ0)nfXMR`65FaRPh
V@i5<${5${v002ovPDHLkV1nLMo|ymu

literal 0
HcmV?d00001

diff --git a/src/main/webapp/templates/portal_normal.vm b/src/main/webapp/templates/portal_normal.vm
index d3e4614..c8f405f 100644
--- a/src/main/webapp/templates/portal_normal.vm
+++ b/src/main/webapp/templates/portal_normal.vm
@@ -158,18 +158,31 @@ $theme.include($body_top_include)
 		<a target="_blank" href="https://www.iubenda.com/privacy-policy/441050">Privacy Policy</a>  |  
 		<a target="_blank" href="$theme.getSetting("footer-website-url")">$theme.getSetting("footer-website-name")</a>        
     </div> 
-	<div style="float:right; text-align: right;">  
-		<div class="custom-footer-container">Con il contributo del Fondo Territori Lavoro e Conoscenza CGIL CISL UIL</div>
-		<img src="$themeDisplay.getPathThemeImages()/custom/CGIL.png" style="width: 50px;" alt="CGIL" hspace="5" />
-		<img src="$themeDisplay.getPathThemeImages()/custom/cisl.png" style="width: 50px;" alt="CISL" hspace="5" />
-		<img src="$themeDisplay.getPathThemeImages()/custom/uil.jpeg" style="width: 50px;" alt="UIL" hspace="5" />
-		<div class="custom-footer-container">Partner:</div>
-		<img src="$themeDisplay.getPathThemeImages()/custom/citta_aquila.png" style="width: 150px;" alt="Città dell'Aquila" hspace="5" />
-		<img src="$themeDisplay.getPathThemeImages()/custom/logo-univaq.png" style="width: 50px;" alt="Università dell'Aquila" hspace="5" />
-		<img src="$themeDisplay.getPathThemeImages()/custom/SoBigData.png" style="width: 150px;" alt="SoBigData Plus Plus" hspace="5" />
-		<div style="color: #CCC; font-size: 12px;">$theme.getSetting("footer-text-about")</div>
-	</div>	
-</footer>
+    <div style="float:right; text-align: right;">
+	    <table width="100%">
+	    	<tr>
+			    <td width="50%">
+				    <div style="padding-bottom: 20px; text-align: left; left: 10px; position: absolute; ">  
+							<img src="$themeDisplay.getPathThemeImages()/custom/citta_aquila.png" style="width: 150px;" alt="Città dell'Aquila" hspace="5" />
+							<img src="$themeDisplay.getPathThemeImages()/custom/logo-univaq.png" style="width: 50px;" alt="Università dell'Aquila" hspace="5" />
+							<img src="$themeDisplay.getPathThemeImages()/custom/SoBigData.png" style="width: 150px;" alt="SoBigData Plus Plus" hspace="5" />
+							<div>&nbsp;</div>
+							<div>&nbsp;</div>
+					</div>
+				</td>
+				<td width="50%">
+					<div style="color: #CCC; font-size: 12px;text-align: right;">Con il contributo del Fondo Territori Lavoro e Conoscenza CGIL CISL UIL</div>
+					<div style="text-align: right;padding-top: 10px;">  
+						<img src="$themeDisplay.getPathThemeImages()/custom/CGIL.png" style="width: 50px;" alt="CGIL" hspace="5" />
+						<img src="$themeDisplay.getPathThemeImages()/custom/cisl.png" style="width: 50px;" alt="CISL" hspace="5" />
+						<img src="$themeDisplay.getPathThemeImages()/custom/uil.jpeg" style="width: 50px;" alt="UIL" hspace="5" />
+					</div>	
+				</td>
+		    </tr>
+		</table>
+		<div style="color: #CCC; font-size: 12px;text-align: right; margin-top: 10px;">$theme.getSetting("footer-text-about")</div>
+	   </div>
+	</footer>
 $theme.include($body_bottom_include)
 
 $theme.include($bottom_include)