From 7ee00fe2723d690b6311ebe219a364a066d35f03 Mon Sep 17 00:00:00 2001 From: bsinou Date: Thu, 2 Feb 2017 13:36:30 +0100 Subject: [PATCH] Clean styling --- org.argeo.suite.core/bnd.bnd | 1 + org.argeo.suite.web/META-INF/spring/ui.xml | 2 +- .../theme/argeo-classic/documents-classic.css | 116 ++++++++++++++++++ .../theme/argeo-classic/fs-classic.css | 87 ------------- .../argeo-classic/icons/fs/addFolder.gif | Bin 0 -> 343 bytes .../argeo-classic/icons/fs/bookmarkFolder.png | Bin 0 -> 557 bytes .../theme/argeo-classic/icons/fs/delete.png | Bin 0 -> 249 bytes .../{createFolder.png => downloadFolder.png} | Bin .../theme/argeo-classic/icons/fs/file.gif | Bin 0 -> 577 bytes .../theme/argeo-classic/icons/fs/folder.gif | Bin 0 -> 219 bytes .../argeo-classic/icons/fs/fsBrowser.png | Bin 0 -> 496 bytes .../theme/argeo-classic/icons/fs/open.png | Bin 0 -> 340 bytes .../theme/argeo-classic/icons/fs/rename.png | Bin 0 -> 619 bytes .../argeo-classic/icons/fs/shareFolder.png | Bin 0 -> 510 bytes .../theme/argeo-classic/icons/fs/upload.png | Bin 0 -> 335 bytes 15 files changed, 118 insertions(+), 88 deletions(-) create mode 100644 org.argeo.suite.web/theme/argeo-classic/documents-classic.css delete mode 100644 org.argeo.suite.web/theme/argeo-classic/fs-classic.css create mode 100644 org.argeo.suite.web/theme/argeo-classic/icons/fs/addFolder.gif create mode 100644 org.argeo.suite.web/theme/argeo-classic/icons/fs/bookmarkFolder.png create mode 100644 org.argeo.suite.web/theme/argeo-classic/icons/fs/delete.png rename org.argeo.suite.web/theme/argeo-classic/icons/fs/{createFolder.png => downloadFolder.png} (100%) create mode 100644 org.argeo.suite.web/theme/argeo-classic/icons/fs/file.gif create mode 100644 org.argeo.suite.web/theme/argeo-classic/icons/fs/folder.gif create mode 100644 org.argeo.suite.web/theme/argeo-classic/icons/fs/fsBrowser.png create mode 100644 org.argeo.suite.web/theme/argeo-classic/icons/fs/open.png create mode 100644 org.argeo.suite.web/theme/argeo-classic/icons/fs/rename.png create mode 100644 org.argeo.suite.web/theme/argeo-classic/icons/fs/shareFolder.png create mode 100644 org.argeo.suite.web/theme/argeo-classic/icons/fs/upload.png diff --git a/org.argeo.suite.core/bnd.bnd b/org.argeo.suite.core/bnd.bnd index 7537584..d316eb5 100644 --- a/org.argeo.suite.core/bnd.bnd +++ b/org.argeo.suite.core/bnd.bnd @@ -3,6 +3,7 @@ cms.datamodel; filter:="(name=documents)" Import-Package:\ javax.jcr.nodetype,\ org.argeo.node,\ +org.argeo.util,\ javax.jcr.security,\ * diff --git a/org.argeo.suite.web/META-INF/spring/ui.xml b/org.argeo.suite.web/META-INF/spring/ui.xml index 8e5f084..bbf3325 100644 --- a/org.argeo.suite.web/META-INF/spring/ui.xml +++ b/org.argeo.suite.web/META-INF/spring/ui.xml @@ -76,7 +76,7 @@ theme/argeo-classic/argeo-classic.css theme/argeo-classic/people-classic.css - theme/argeo-classic/fs-classic.css + theme/argeo-classic/documents-classic.css theme/argeo-classic/maintenance-classic.css diff --git a/org.argeo.suite.web/theme/argeo-classic/documents-classic.css b/org.argeo.suite.web/theme/argeo-classic/documents-classic.css new file mode 100644 index 0000000..8721244 --- /dev/null +++ b/org.argeo.suite.web/theme/argeo-classic/documents-classic.css @@ -0,0 +1,116 @@ +/** +Argeo Blue: #00294b +*/ + + + +/** Same styles are also provided by the workbench CSS. TODO: enhance single sourcing */ + + +/* Breadcrumb ***/ +Button.breadCrumb_btn { + border: 1px solid #f4f6f7; + border-radius: 3px; + padding: 2px 2px 2px 2px; + background-color: transparent; + background-repeat: no-repeat; + animation: hoverOut 500ms ease-out; + cursor: pointer; + font-color: #00294b; + text-decoration: none; +} + +Button.breadCrumb_btn:hover { + text-decoration: underline; +} + +/* Documents lists context menu */ +.contextMenu_box { + border: 0px solid #fde2d5; + padding: 0px; + box-shadow: 2px 2px 5px #fde2d5; +} + +Button[PUSH][FLAT].createFolder_btn { + background-image: url( theme/argeo-classic/icons/fs/addFolder.gif); +} + +Button[PUSH][FLAT].shareFolder_btn { + background-image: url( theme/argeo-classic/icons/fs/shareFolder.png); +} + +Button[PUSH][FLAT].bookmarkFolder_btn { + background-image: url( theme/argeo-classic/icons/fs/bookmarkFolder.png); +} + +Button[PUSH][FLAT].downloadFolder_btn { + background-image: url( theme/argeo-classic/icons/fs/downloadFolder.png); +} + +Button[PUSH][FLAT].delete_btn, +Button[PUSH][FLAT].deleteBookmark_btn { + background-image: url( theme/argeo-classic/icons/fs/delete.png); +} + +Button[PUSH][FLAT].rename_btn, +Button[PUSH][FLAT].renameBookmark_btn { + background-image: url( theme/argeo-classic/icons/fs/rename.png); +} + + +Button[PUSH][FLAT].uploadFiles_btn { + background-image: url( theme/argeo-classic/icons/fs/upload.png); +} + +Button[PUSH][FLAT].open_btn { + background-image: url( theme/argeo-classic/icons/fs/open.png); +} + + +Button[PUSH][FLAT].createFolder_btn, +Button[PUSH][FLAT].shareFolder_btn, +Button[PUSH][FLAT].bookmarkFolder_btn, +Button[PUSH][FLAT].downloadFolder_btn, +Button[PUSH][FLAT].delete_btn, +Button[PUSH][FLAT].rename_btn, +Button[PUSH][FLAT].uploadFiles_btn, +Button[PUSH][FLAT].open_btn, +Button[PUSH][FLAT].deleteBookmark_btn, +Button[PUSH][FLAT].renameBookmark_btn { + border: 0px solid white; + border-left: 10px solid transparent; + border-radius: 0px; + padding: 4px 5px 4px 24px; + background-color: transparent; + background-repeat: no-repeat; + background-position: left; + animation: hoverOut 500ms ease-out; + cursor: pointer; +} + +Button[PUSH][FLAT].createFolder_btn:hover, +Button[PUSH][FLAT].shareFolder_btn:hover, +Button[PUSH][FLAT].bookmarkFolder_btn:hover, +Button[PUSH][FLAT].downloadFolder_btn:hover, +Button[PUSH][FLAT].delete_btn:hover, +Button[PUSH][FLAT].rename_btn:hover, +Button[PUSH][FLAT].uploadFiles_btn:hover, +Button[PUSH][FLAT].open_btn:hover, +Button[PUSH][FLAT].deleteBookmark_btn:hover, +Button[PUSH][FLAT].renameBookmark_btn:hover { + background-color: #fef0ea; +} + +Button[PUSH][FLAT].createFolder_btn:pressed, +Button[PUSH][FLAT].shareFolder_btn:pressed, +Button[PUSH][FLAT].bookmarkFolder_btn:pressed, +Button[PUSH][FLAT].shareFolder_btn:pressed, +Button[PUSH][FLAT].downloadFolder_btn:pressed, +Button[PUSH][FLAT].delete_btn:pressed, +Button[PUSH][FLAT].rename_btn:pressed, +Button[PUSH][FLAT].uploadFiles_btn:pressed, +Button[PUSH][FLAT].open_btn:pressed, +Button[PUSH][FLAT].deleteBookmark_btn:pressed, +Button[PUSH][FLAT].renameBookmark_btn:pressed{ + background-color: #fde2d5; +} \ No newline at end of file diff --git a/org.argeo.suite.web/theme/argeo-classic/fs-classic.css b/org.argeo.suite.web/theme/argeo-classic/fs-classic.css deleted file mode 100644 index 923fd39..0000000 --- a/org.argeo.suite.web/theme/argeo-classic/fs-classic.css +++ /dev/null @@ -1,87 +0,0 @@ -/** -Argeo Blue: #00294b -*/ - -/**** BREAD CRUMB ***/ -Button.breadCrumb_btn { - border: 1px solid #f4f6f7; - border-radius: 3px; - padding: 5px 2px 5px 2px; - background-color: transparent; - background-repeat: no-repeat; - animation: hoverOut 500ms ease-out; - cursor: pointer; - font-color: #00294b; - text-decoration: none; -} - -Button.breadCrumb_btn:hover { - text-decoration: underline; -} - - -/****** Context menu *********/ -.contextMenu_box { - border: 1px solid #fde2d5; - padding: 0px; - box-shadow: 2px 2px 5px #fde2d5; -} - -Button[PUSH][FLAT].createFolder_btn { - background-image: url( theme/argeo-classic/icons/fs/createFolder.png); -} - -Button[PUSH][FLAT].shareFolder_btn { - background-image: url( theme/argeo-classic/icons/fs/createFolder.png); -} - -Button[PUSH][FLAT].downloadFolder_btn { - background-image: url( theme/argeo-classic/icons/fs/createFolder.png); -} - -Button[PUSH][FLAT].delete_btn { - background-image: url( theme/argeo-classic/icons/fs/createFolder.png); -} - -Button[PUSH][FLAT].uploadFiles_btn { - background-image: url( theme/argeo-classic/icons/fs/createFolder.png); -} - -Button[PUSH][FLAT].open_btn { - background-image: url( theme/argeo-classic/icons/fs/createFolder.png); -} - -Button[PUSH][FLAT].shareFolder_btn, -Button[PUSH][FLAT].downloadFolder_btn, -Button[PUSH][FLAT].delete_btn, -Button[PUSH][FLAT].uploadFiles_btn, -Button[PUSH][FLAT].open_btn, -Button[PUSH][FLAT].createFolder_btn { - border: 0px solid white; - border-left: 10px solid transparent; - border-radius: 0px; - padding: 8px 5px 8px 24px; - background-color: transparent; - background-repeat: no-repeat; - background-position: left; - animation: hoverOut 500ms ease-out; - cursor: pointer; -} - -Button[PUSH][FLAT].shareFolder_btn:hover, -Button[PUSH][FLAT].downloadFolder_btn:hover, -Button[PUSH][FLAT].delete_btn:hover, -Button[PUSH][FLAT].uploadFiles_btn:hover, -Button[PUSH][FLAT].open_btn:hover, -Button[PUSH][FLAT].createFolder_btn:hover { - background-color: #fef0ea; -} - -Button[PUSH][FLAT].shareFolder_btn:pressed, -Button[PUSH][FLAT].downloadFolder_btn:pressed, -Button[PUSH][FLAT].delete_btn:pressed, -Button[PUSH][FLAT].uploadFiles_btn:pressed, -Button[PUSH][FLAT].open_btn:pressed, -Button[PUSH][FLAT].createFolder_btn:pressed { - background-color: #fde2d5; -} diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/addFolder.gif b/org.argeo.suite.web/theme/argeo-classic/icons/fs/addFolder.gif new file mode 100644 index 0000000000000000000000000000000000000000..d3f43d9775346f8c3bc3e7f781a4bfe852d42cc1 GIT binary patch literal 343 zcmZ?wbhEHb6krfwxT?jlYr5LjNy>k}oL|=^|Nm0SzrXK)y_|Qr)9ml(^YbdjmNrRk zE>Qb_f9jiy-T!ZOY@Mh)vqbp+>n)or4gNe|{QGY6|6A?fl zjZ!=6j2<7X-BD|Fb5r5B`_ukkEd770^Z)D3|DP`T59EG5^Z(Z?ku4)and9)6>(=d)mgLW n@W?m|DJ@#Om`_y7SyOTKnl&senl74~w`|?$w_~TLBZD;nnW}>Q literal 0 HcmV?d00001 diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/bookmarkFolder.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/bookmarkFolder.png new file mode 100644 index 0000000000000000000000000000000000000000..8bb2361071fd53d06bcff2f9d0a53cc94dda6466 GIT binary patch literal 557 zcmV+|0@D47P)NklJa&zHWO#S{Qd%gIg<*%ESy;d)Li?2`J(p!hYoD~zjxP) z|3o^yU>DH#fAgnT{9m@P?f=33>w%hA{@=V|7GVRnFAguAHL>vjk~vNP7Xe+ccvj8- z-P@P^-?Cx$|5eL+@Eh>zgqqFE6IvhltRA-;kmUwkS^V^S`1^@p%?fw7v)7<}m-`4{*#{ga8`2Xc8lmF*d z8@*pYGsF$MzmF-ayg8}+{Liz#|9?Nv2WqbU|L;{4Fbo|2zc^|1=iC~@_s5nQYoKWQ zdR^{57~fF3|MO|W{r8t#-@iDn`|as5<9APv7{9-}*WkmoE&89&tu=gup&1vrzu!RM v{&o$8o7?qmuC6yQIKSRNVgGys0c>gkB(6{-NEP-;00000NkvXXu0mjf*5)jq literal 0 HcmV?d00001 diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/delete.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..9150e40d3dbca70d2af97231eb52798d929a06da GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XW_!9ghE&{2N{|S7uwYi4jlgH&fW`br{u$T_Ph#1)x^2Ia%vU44OwvwPu?{D;7L?j@Kd?3q4l() tx=Llttc8I!f+tnES4^A2F2}$k!Eo0nRLXF>oCVOC44$rjF6*2UngFN7QcnN? literal 0 HcmV?d00001 diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/createFolder.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/downloadFolder.png similarity index 100% rename from org.argeo.suite.web/theme/argeo-classic/icons/fs/createFolder.png rename to org.argeo.suite.web/theme/argeo-classic/icons/fs/downloadFolder.png diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/file.gif b/org.argeo.suite.web/theme/argeo-classic/icons/fs/file.gif new file mode 100644 index 0000000000000000000000000000000000000000..ef302880717d12cc7dcc93a5ec9409488a788e7f GIT binary patch literal 577 zcmZ?wbhEHb6krfwc*elsm$lF@Yk_~(g0RA6@s(>r3zvl!E{&^PlisvBy=hZM)24#1 z9pw}ERe;dm+Gz(r{{H{r&;OtQ{(t!Q|KtDv-~Rvq{{R1v|Nnpf|Nra%|KI=r|M~y_ z-~a!`S@y+Q4#n9HCE1Rpxvu3o4n>&`#aWIO`R*0@-c7}JwfXjydCp}yuI;7P)2fXp zRG4;`S*&W)UD#kSyUuV%wZWWvqeU&IE7~m{9cy0KrnROYC}Z5GBYybE5lN#yT~U6Xo$Ra(3=+D1dScga+z`_1)0SMcgq@9vNlLp4}NkYYq1|o9u5f+1+4#yxaU}r`gdi^F!@s8_V^#R2r-=)!$xYw6WY^bAj4_ zFkpZI#h)yU3=A?1Iv@d%oeZoI3hI3+ne)<@xV>1B`(fEuK?V+&Lu+13upU?-aN>~% z+leJYmV$v?7gmUP30m^pSR?jZz)|4A1_>U)M7|eWr0xntihbB2lP8!e@?(!&ykzXZ OhQ@l`mR1!-25SJE4`R#! literal 0 HcmV?d00001 diff --git a/org.argeo.suite.web/theme/argeo-classic/icons/fs/fsBrowser.png b/org.argeo.suite.web/theme/argeo-classic/icons/fs/fsBrowser.png new file mode 100644 index 0000000000000000000000000000000000000000..3f56074f7817b41c52e978b6d405b1d8a60cb9a9 GIT binary patch literal 496 zcmVTL+@c706Xc<2?0}cp_ zh%g*Ia)jaSn>U1l!~v@TTwGiXrR5b2>KYnwiSEu0hQkLBFnD=*fbqGrXBh6@xr1Q< zBQ)UN@7}db;PK-}3`xl;V2MYM9x)`w$1x}y&?bphMvy$p-9f5Z2h!BK!Wqk(R%^8pQsS zWB^F>?k1V{_YXJ!{rltA|Gn+XKX=rL{zt~UTjcKUs1xzVFkok;u*S{?>G$^zHT?bi z{mOq_`03dx-*+_0JU}sETbYo|wtA`eclVV3{rmCYe?oXmmB@b-12$HOs%)u}`1a&z z_5VMw))K^Qv>Q%@q=_u?FJ0VnLe?Wn$kR z?@svt=U&_Y9SsU!*A)x>N5&gUML(`97LLamjjMo$tSb@w_Hb9+|22g||H(>7tMUbH mRu_tVSyLqZmMjB?1^@s?(bqz=W00000Qmg$qzT3_?;|TVF=kELB^T78>OH&0XLzO<0p0KBcBYz{(nv2NL zEux~1zwU>q(dqbv6twE|GHJ;L-(%SF5Sui~C^74{ykqc|A+7Wh z5esGXd$gLVx=a+LQLp%Aq>p9WHJGX8Xv<5~`zYBqSj1{;E?tHU66jQX{0ch!u}5ds zC8UW`2zDbacEsC~EB_6nYbG>Y&G!#_cKS;hs7U9V-zUFKz??QL1uYE?epNO1{czl0boj06_x^D%utD%Ub^Dl{V)qRyiN4 z+F190&y6kr)0Y(dm8*1`ghNxa14t7(mZ^05oU^U)f6>nJ{~4R||4UXlyuxEZ>tnF( zlFQ?hzz<_dGLeK@s0OT*J zN{7=@6%HR{D(w$R6gVg#8vsoQ!4S0$62PdO0t~MQa#cx%+_4vDG?vwN{qO9b^}n#94J94q0mG|uZ|(n_tp)!j z%kAG_H6Wp(fn(RchMczB>w;nw~JQ3-UpxZ0JiKm-2ZHDFhR*#G;7nt$wVm4AS4 z2#Nta>qNtMH_N`*Q78Hz8SiaZ{`vREt^fB9HvQP$Ecak5k|8Jt?5LOc_~zE~KYzbp z`Hu_VJy7>!N0SWP5EKKpREhlm`|%(_d}nvbkL?Z84^}mZ@}L;7sY3YwpI2)M;wML{ z{%om{e6zkmKmgT%a?$S}F17yu^JErI{CI!vpUssLZ#EYTYhZX`eX&sfhEkF5>xzZ` zBjX(n3Sa-+Yy1CrSHho-<>GJFKs6H`jcW>p{y*Fq_h)?>s%GL1C=!0VwpirdnjBQk hL>qt)P;3Cz006}fBvFScNA3Us002ovPDHLkV1lc)n+pH{ literal 0 HcmV?d00001 -- 2.30.2