From 1cebaaf96f0e34a7995f960e07aa62fb6c5f40b9 Mon Sep 17 00:00:00 2001 From: bsinou Date: Wed, 15 Feb 2017 12:06:34 +0100 Subject: [PATCH] Adapt branding, use latest connect snapshot --- org.argeo.suite.web/META-INF/spring/ui.xml | 4 ++-- .../src/org/argeo/suite/web/DefaultMainPage.java | 7 +++---- .../theme/argeo-classic/icons/favicon.ico | Bin 0 -> 1150 bytes .../theme/argeo-classic/icons/favicon.png | Bin 1125 -> 0 bytes pom.xml | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 org.argeo.suite.web/theme/argeo-classic/icons/favicon.ico delete mode 100644 org.argeo.suite.web/theme/argeo-classic/icons/favicon.png diff --git a/org.argeo.suite.web/META-INF/spring/ui.xml b/org.argeo.suite.web/META-INF/spring/ui.xml index bbf3325..4e80f83 100644 --- a/org.argeo.suite.web/META-INF/spring/ui.xml +++ b/org.argeo.suite.web/META-INF/spring/ui.xml @@ -48,8 +48,8 @@ - - + + diff --git a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java index 7b3ae2e..d7ae032 100644 --- a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java +++ b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java @@ -11,7 +11,6 @@ import javax.jcr.nodetype.NodeType; import org.argeo.cms.CmsMsg; import org.argeo.cms.auth.CurrentUser; -import org.argeo.cms.text.TextStyles; import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.LifeCycleUiProvider; @@ -32,8 +31,8 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; /** - * Default entry point for the Argeo Suite CMS. Forwards the request to the relevant - * CmsUiProvider + * Default entry point for the Argeo Suite CMS. Forwards the request to the + * relevant CmsUiProvider */ public class DefaultMainPage implements LifeCycleUiProvider { @@ -89,7 +88,7 @@ public class DefaultMainPage implements LifeCycleUiProvider { Label anonymousLbl = new Label(body, SWT.WRAP); anonymousLbl.setText("You should login or register to access your private dashboard"); - + return body; } diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/favicon.ico b/org.argeo.suite.web/theme/argeo-classic/icons/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..6e6a050224d967e89af5faa3113edd5151a0d97e GIT binary patch literal 1150 zcmaizUr19?9LKMfy;;6g4^d7Nvk7BR!$Lzd%|8vbw3eYPacqfVE{a)hWNDI340Y1H zbDNephnjA4e@XmPbd@;=6yb2n#bd@xm>Of4u@l%=lON3)%uazq0Y|E z6Mqw7Y$Oti4F-d@si`T@S{RK+=yW=$)oN5%SEI495gi>Juvjc3xw*M}WHMO{(_$=H zEZHJsX&!ajYGhw)hC<4E-r3|sA2Q_{czX^ zP<6KlNBVvuaR5jnW39vq$l8{0PI&=^1qIM*wJ@1XFNobuex+m>8yiF2<6$J&h~uNi z`iH155&xN9rp^pyVLl870~#6{vWVpafdF{B6G_(JQI@#0hi{<1{Rr)rK{P&FLaJ>; zn3LE6rNM@lmV0nIokPSg`=@=l%)i_6oATr{3bN8sQd$a)MuWE2R@fbbIA#AXtV!lK z;C}9a*Xw;x{942}ft3DVTYM7vm-c;yvi1Q=l?5m-FGqcSJzC8@I6bh6k#R5l{s0)u zY}6CN!TxB@%y(+<7bLR0Dc|E=E4Wyth4OqMR4NskZs|ew0CrX)zwGkOZ1HmaC@L#1 zp`v>h$>LtJoE4@pGBYwzR8)kfrY2B*f$C+MH2C?j7YU+&xp4-0XU{-WQ-k~M9VoKA z72;rL!eTn9>q7G#1Ke&m^Usq>BcUKv!=Ix0Q_Oi+>qsL9#l^+AQdWYDn?qoG!ZZ|= z&r?e`sLmNL-K?L9v_~fc7~o?3K7?6XU+^<+wSzi7hn3?0-)STT3># HlM~oK1ZrJU literal 0 HcmV?d00001 diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/favicon.png b/org.argeo.suite.web/theme/argeo-classic/icons/favicon.png deleted file mode 100644 index cd8207a2a5f64d42794e9f8d6b8441365a1cec39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1125 zcmV-r1e*JaP)WFU8GbZ8()Nlj2>E@cM*00YTML_t(o!|j$|XdFcx z$3L^VBX@gEYe`R0QHwP#Ta&HWst;9A5U*h=QfX_fRs>NHp=1dt3R3@o(4ua&Qbfc) zR3v$*Z>tp%L{PEdLpGIdBG@JtA=;KS&E3UoFXKag=S?+So%mF)ydgid= zyRQL*8m0lPe<6HNP^aecq*KGVX)la{jzWr5Dv#y@aH$EZhicVDvQ;7J9mHEdGQ3sh7+N7n)SO1`U0zWet1r`B3Y0Jk)W=Q`<+ z11|$Vn9fgr%~Gzay<#4+gXoo95XE*79R%(HifUF9KO5Vg&SWyxqVHa90vI-KU1*Rc zdE#&{ad>LJ>UCO%X>)!?^DR)B9daMAN9DG%w2Ix2!BqvV=T*hc(%&lO z&kWsEy(;RlRHDX@0Nps=df-K1$J{E4p3Mk009OL{o~>AGHK+uF^yHq-9AE<@_JQcM z;d?{+uXDlBkLoXeyK8`NfV|9nNE|+#pnWy)J@A1PrwKiaXadM+xLv_H$+TAm{Fp*@ zWP`zq!tpGi1DGHV$D06|mQb7_4zFth;Ic53k?>i1J~d-Nza2!+nrXHiI0<|O+}VVS zaVa*{KjG^=JBa!g`b#yHyrIeM6_6F{%YXVwW&%hzS<_S3fPTJ#zbyTw#XTw1<3 z;I!Ow7+4A11>7ONO~m1MiTLjj;jNdcPk}x=h)yl+RpWS@fnC5xiFFp36m5J=9KP9T r^98@NwE=VG6~T$>(tCfY{cqauC9*2UPcgIr00000NkvXXu0mjfjyLr* diff --git a/pom.xml b/pom.xml index 0873cd0..bfcd3c2 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 0.1.5-SNAPSHOT 0.1 - 2.1.67 + 2.1.68-SNAPSHOT 2.1.9 -- 2.30.2