From eb085aa0003c219c191d23f75082c035984de4a5 Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Tue, 21 Apr 2015 20:11:50 +0900 Subject: [PATCH 1/8] Facettes + issue overflow basket --- templates/web/prod/index.html.twig | 2 +- www/skins/icons/bgd_facetFilter.png | Bin 0 -> 1081 bytes www/skins/prod/000000/prodcolor.css | 66 +++++++++++++++++++++------- 3 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 www/skins/icons/bgd_facetFilter.png diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 73742ee0f6..209288f67a 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -211,7 +211,7 @@ {{WorkZoneMacros.make_bloc(app, WorkZone)}} {% if GV_thesaurus %} -
diff --git a/www/skins/icons/bgd_facetFilter.png b/www/skins/icons/bgd_facetFilter.png new file mode 100644 index 0000000000000000000000000000000000000000..e17a856441242c9a7f38f2cd3a87b12770a7b524 GIT binary patch literal 1081 zcmaJ=Pe>F|7@ttY7Bwpq^WtMHQ)*{+cGt}rU2UCN-9=~H)`j-y?99_0bpAN=bVmAK&ly{l52o?{YHH zTj{Cy5Cl;fj|nNfR=Iz98J-(r-W9wYM$rr!FosZGvLF#rj4T9kO&W$NC@GU;uV4p3 zlpImh8I%$GIoZ%C$@QTe&BSPe=;(4xNgja+WZ|%?hsm!`pOHXS!sOXj(I=Wb%&D;{ z3l2;r((=@Z%qnD8C+KiEOrSv|0Y@9vZO#dko4g#}yJngMn=WW1Om2zFh)KX376h$S zz$^P0282Qs6KoBIm=nP7WBjxakC2xMa;+iGe-dneB#ve&LtIMe*^Y%zVKRr1$|zWfLKaTwJ%2q{}cagh|Xnsj9-UYX%Bh`@rql?+qp2szB$p1<$?xSMJX^U#8avz3IwKxc_Ez_4|#}b!!(N&5o@7 zn0J=;K3J&{7aA^UH-0TA8D-G(W_7M9S2{lHtqGiZc|CGGX13h@&b>=&(ewNSO5P%332UzHz>{OueFW3|c0Swp ak=Rp4jLHYkEOOjW_c6z#3E^?~;DtX)!C86$ literal 0 HcmV?d00001 diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 2ddb17ebb9..ad8375723f 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -1196,7 +1196,7 @@ div.diapo { left: 0pt; right: 1px; bottom: 0px; - overflow-y: hidden; + overflow-y: auto; overflow-x: hidden; } @@ -2149,6 +2149,20 @@ H4 { /******* PROPOSALS ************************************************************/ +#proposals { + border-top: 1px solid #303030; + top: 87px !important; +} + +#proposals ul li { + line-height: 17px; + font-size: 13px; +} + +#proposals ul ul { + background-color: #292929; +} + #proposals *:focus{ outline: none; } @@ -2157,21 +2171,36 @@ H4 { background-color: #3b3b3b; border: 0px none transparent; overflow-x: hidden; + padding-left: 0; + padding-top: 0; } #proposals UL.fancytree-container UL { - padding: 0; - padding-left: 6px; - margin-right: 30px; + padding: 20px 0; overflow: hidden; + width: 101%; +} + +#proposals UL.fancytree-container UL li { + padding-left: 30px; + line-height: 25px; +} + +#proposals UL.fancytree-container UL li:hover { + background-color: #4c5d84; } #proposals .fancytree-folder { font-weight: bold; height: 30px; - padding-top: 7px; - border-left: 4px solid #4c5d84; + padding-top: 13px; margin-left: 0; + border-left: 4px solid #3b3b3b; + border-bottom: 1px solid #303030; +} + +#proposals .fancytree-folder:hover { + border-left: 4px solid #4c5d84; } #proposals .fancytree-expander { @@ -2211,18 +2240,20 @@ H4 { font-weight: normal; position:absolute; width:100px; - height:22px; + height:25px; + line-height: 25px; + vertical-align: middle; border-radius: 4px; - right:30px; - background-color: #606060; - padding-top: 3px; - padding-left: 4px; - padding-right: 4px; + right:28px; + background-color: #4c5d84; + padding-left: 13px; + padding-right: 13px; + margin-top: -4px; } #proposals .facetFilter-label { position:absolute; - left:4px; + left:13px; right: 14px; overflow:hidden; cursor: default; @@ -2232,17 +2263,18 @@ H4 { position:absolute; width:20px; right: 0px; - background-image: linear-gradient(to right, transparent, #606060); } #proposals .facetFilter-closer { position:absolute; - right:5px; + right:13px; cursor: pointer; } -#proposals .facetFilter-closer:before { - content: 'x'; +#proposals .facetFilter-closer { + background: url('../../icons/bgd_facetFilter.png') 0 5px no-repeat; + height: 25px; + width: 14px; } /******* /PROPOSALS ************************************************************/ From b5a8a53fd70ee4d93b0dced9ea663bb27e0c89bd Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Tue, 21 Apr 2015 20:13:15 +0900 Subject: [PATCH 2/8] Favicon --- www/skins/prod/favicon.ico | Bin 1406 -> 4286 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/www/skins/prod/favicon.ico b/www/skins/prod/favicon.ico index e778aa4c4369985fc2dfbc6f856033f7fd08ccb4..a2e52bb47c920f5beacedb914a664b57aeb52773 100644 GIT binary patch literal 4286 zcmdUy3s6+&701_UTH8q*cZrFXK?OA+0)k-TgU6Bu(Et)a6DcujtRf(3cnM-qs3?yD zL5l<-D~QM=LM);JQKVW0vbrD;jRYH1gsU`Q#9d%vckjRF?q;JVlVNdeXL5J`_s)FZ zchB#fbI-Z^T^?@&{fv!y+?iL(=kZ?V@pyAcG{kczapT+(PjfFmua#!t7kmO>N~$BB zCe8kTg+i>~kYZW2y05ifaz)nLcm=GwpBv-m{+E7`eS6Zi?#^4S!7e_sxIYClUsn4t zS1X-miie%8G~Y>F;P zR0pdbxl3#FNt2(2A7tk(mSvfy3-!{~^Bt6{%opJuD<`}+-xW#gLYc7)~Kne1kS-?}@Vvu&`_d?EZT9kJfV1)E=W zN7{x+=3I#jQ1Dwnh;PV47p-yas`hppn z=h0GbiErC;TBttz$mVX+Z^!b3)<}DMn5%w{F84(<=D>Z{JouQs3O@^bthE+llihNJ zEb>Bx<0@nY#xke!L`-Q4ALZ!+9N%Yv>W?R*mU407&~$upWG0$FHOKW+BDrGV>nmjY z-(&IBYPQG5$VciteXeTxOe=VsEx>AvC3x5Rb!@a-hAj(MAl$(h+noJyAUKYx$PqDz zcJWc1#79}G02P#rQ~O`UnVcy&muCpBHl-!6$STXsT3J^8a4bIM{kDbCM$9)3yXR)= z{q@_LT6e~uZQT&O&=X&}*IuUE+f%Vt+{NIM=lr zeo@BjOlA}x+1mvW#|co7AkgL_P0%YoWZ2Geb<&q_X|xHp#*xHNfYY46!_}f-$lorx zInv3G*zaiAI(|W_1Cti^d+goHM^=mgxjO`GPO?CnUNA+OadgHH?D52JX%qlk6OO<8 zd;Vd#TUWxzuJ&exb4(Y<*73zj_RO9wzr)`?cpe``zHl=!jejTU6F$<8Ou>)&^iCKU z>-lr}w=~*J{H<7Qx`+6g6u*}5ZF_-yXuz6<n zCm~5}fOO*T{Zah-@TvapTTR;xJCi64UueD`ODzg1{*&;wy{O@HKKReTzf}N?v-_J)f$1nOL_Llu5|Gi_yPy7L^X@SI#evE(QC;a4y_HT|=%P&=4 z?{Ca63Aqs+KlKs+ppO5j_O#Dmb!UA1L^zvgQT#>l(8OPl_m*BBt~%Z)3CS4lc8nat z^70Xc)vNBF?`V^x=UB^jXT5;rgM#nle_DPJ#lH(Xe&b7aL;lW4$-N_=B-vrjDPDjb11F zYO4Ar{@aJXa|$MQ7%7_gJBP9CQw7{ljKcGb3SRXrHe7+cu7{D7)UNE&^}X&&{okce z{^w2S_%RS#q@p0Fr8zBE{*`cp98N*R4IP9-6tQ;o1lq;Op6FZRDe<5+~SS{N=MFF>B;#Z8q<8vjv z{-yqb&-wB8Wv~_9a%oLdyyiVf{dZfB_y@~MnlDBt%5Mt&WN=zX>;O3&-zWA~Vt+{N zU8H0M?9+%}G>qlPM&MCR{Buw8b-4)r65lrT+#rwG{;~M&Z0;J=itqlTz*Vx{qz8W@t&3N)=r5`o zZ4q*8uGY7a;)tF2h|Ter9@g~$@u>&A8y?lb%1c01FPd3^+aHIMo*Rp=o2RvAq_YEq zY)4?0g5hf2VfQfXQ=jC!77+iawg*k!I-Zj^|4EO(3mh zS=?*5p_VSqP^h?=AD3(Xpr!{kJwQF^*T^cHA3#bmbNgVw@$i0bE!i<3iIr;HORQ10 zKfymp{1R;sq_wF#l&prEOX~$cXYXmp$)*G8TGxHHZPh0u1Dqc&;z9UVC}g)EvMn^n zeSbJUt$ls&Bm2K5ZRhIqXp^e>Nb@M|>ooNhN8=OqvGFX{5Njr>hQ#gfxzFui&H{c^LTM89#8my$D8yl#MxqbJgsex!Lc|d9sdOr-a7{X literal 1406 zcmeH{%TB^j6h$|W%3Dzp-+%&&pwdEnK@d_pz-Xc-f+l_esE8O5^*PON<)vdH=GZ7N9WxPO> z2f3YyvMIZLKw^{RP9nypX@*#Uri)l)ewS-RVLtMHVu>kok}+|R+)d2WPfJ>!8RI_G M1y2Xv_R;PA2lbIhoB#j- From b4bebbe77a9cf5d84270ea695422a3a46ad886b3 Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Tue, 21 Apr 2015 21:39:52 +0900 Subject: [PATCH 3/8] fix preview title fix #71 --- lib/classes/record/preview.php | 2 +- www/skins/prod/000000/prodcolor.css | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php index 2e89aa55a7..e73612c086 100644 --- a/lib/classes/record/preview.php +++ b/lib/classes/record/preview.php @@ -279,7 +279,7 @@ class record_preview extends record_adapter switch ($this->env) { case "RESULT": - $this->title .= $this->app->trans('preview:: resultat numero %number%', ['%number%' => '' . ($this->number + 1) . ' : ']); + $this->title .= $this->app->trans('resultat numero %number%', ['%number%' => '' . ($this->number + 1) . ' : ']); $this->title .= parent::get_title($highlight, $searchEngine); break; case "BASK": diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index ad8375723f..892f2fa999 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -2176,9 +2176,11 @@ H4 { } #proposals UL.fancytree-container UL { - padding: 20px 0; - overflow: hidden; - width: 101%; + padding: 20px 0; + overflow: auto; + width: 101%; + max-height: 400px; + overflow-x: hidden; } #proposals UL.fancytree-container UL li { @@ -3307,6 +3309,10 @@ DIV.thesaurus U.w { cursor: pointer; } +#PREVIEWBOX #PREVIEWTITLE_COLLNAME { + display:none; +} + .PREVIEW_PIC,.PREVIEW_HD { position: absolute; } From c1e3172d96c0a31cf8d7ab9ca1ee75aa20a24293 Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Tue, 21 Apr 2015 21:45:44 +0900 Subject: [PATCH 4/8] preview scroll style fix #73 --- www/skins/prod/000000/prodcolor.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 892f2fa999..78ef4ff2b6 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -3424,6 +3424,24 @@ DIV.thesaurus U.w { overflow-y: hidden; } +#PREVIEWCURRENTCONT::-webkit-scrollbar-track +{ + border-radius: 0; + background-color: #262626; +} + +#PREVIEWCURRENTCONT::-webkit-scrollbar { + height: 5px; + border-radius: 0; +} + +#PREVIEWCURRENTCONT::-webkit-scrollbar-thumb { + border-radius: 0; + width: 3px; + background-color: #595959; +} + + #PREVIEWCURRENTCONT ul { position: relative; height: 80px; From 9968f1f9d74ee9fa0ea446fede41dac8d10d41f3 Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Tue, 21 Apr 2015 22:13:33 +0900 Subject: [PATCH 5/8] fix facette label max width --- www/skins/prod/000000/prodcolor.css | 6 +++++- www/skins/prod/jquery.main-prod.js | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 78ef4ff2b6..9c720f3296 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -2217,6 +2217,10 @@ H4 { font-size: 65%; } +#proposals UL.fancytree-container UL li{ + white-space: pre-line !important; +} + #proposals .fancytree-folder .fancytree-expander:before { content: '\25C0'; /* U+25C0 BLACK LEFT-POINTING TRIANGLE */ color: #a0a0a0; @@ -2241,7 +2245,7 @@ H4 { #proposals .facetFilter { font-weight: normal; position:absolute; - width:100px; + width:122px; height:25px; line-height: 25px; vertical-align: middle; diff --git a/www/skins/prod/jquery.main-prod.js b/www/skins/prod/jquery.main-prod.js index 1d72b1ce97..1d864ba1de 100644 --- a/www/skins/prod/jquery.main-prod.js +++ b/www/skins/prod/jquery.main-prod.js @@ -569,7 +569,12 @@ function getFacetsTree() { var s_label = document.createElement("SPAN"); s_label.setAttribute("class", "facetFilter-label"); s_label.setAttribute("title", facetFilter); - s_label.appendChild(document.createTextNode(facetFilter)); + + var length = 15; + var facetFilterString = facetFilter; + var facetFilterTruncatedString = facetFilterString.substring(0,length); + + s_label.appendChild(document.createTextNode(facetFilterTruncatedString)); var s_closer = document.createElement("A"); s_closer.setAttribute("class", "facetFilter-closer"); From 5a04b0ddcd9bc4f1bb88affa9d51e5b1ed0ccb59 Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Tue, 21 Apr 2015 22:19:28 +0900 Subject: [PATCH 6/8] Facette style clean --- www/skins/prod/000000/prodcolor.css | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 9c720f3296..0aa070b245 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -2176,7 +2176,7 @@ H4 { } #proposals UL.fancytree-container UL { - padding: 20px 0; + padding: 17px 0; overflow: auto; width: 101%; max-height: 400px; @@ -2203,6 +2203,15 @@ H4 { #proposals .fancytree-folder:hover { border-left: 4px solid #4c5d84; + color: #fff; +} + +#proposals .fancytree-folder:hover .fancytree-title { + color: #fff; +} + +#proposals .fancytree-folder .fancytree-title { + font-size: 13px; } #proposals .fancytree-expander { @@ -2237,11 +2246,16 @@ H4 { } #proposals .fancytree-title { - color: #FFFFFF; + font-size: 12px; + color: #A6A6A6; background-color: transparent; border: 0px none transparent; } +#proposals UL.fancytree-container UL li:hover .fancytree-title { + color: #fff; +} + #proposals .facetFilter { font-weight: normal; position:absolute; From 72e3e7d59b7039ab38f7f865e2746b074b488028 Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Tue, 21 Apr 2015 22:30:11 +0900 Subject: [PATCH 7/8] Paginate min-height --- www/skins/prod/000000/prodcolor.css | 1 + 1 file changed, 1 insertion(+) diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 0aa070b245..d50802c652 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -4912,6 +4912,7 @@ ui-dialog-titlebar { #paginate { float: right; margin: 0 65px 15px 0; + min-height: 52px; } #paginate #tool_navigate { From bd351659601121e8f9a9d55aff35330eea948df2 Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Tue, 21 Apr 2015 22:35:55 +0900 Subject: [PATCH 8/8] Facette title height --- www/skins/prod/000000/prodcolor.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index d50802c652..808d48e36a 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -2194,8 +2194,8 @@ H4 { #proposals .fancytree-folder { font-weight: bold; - height: 30px; - padding-top: 13px; + height: 49px; + line-height: 49px; margin-left: 0; border-left: 4px solid #3b3b3b; border-bottom: 1px solid #303030; @@ -2268,7 +2268,7 @@ H4 { background-color: #4c5d84; padding-left: 13px; padding-right: 13px; - margin-top: -4px; + margin-top: 11px; } #proposals .facetFilter-label {