From 50ed2262ed4485f53f097e5a916a9e9df5dc6bf1 Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Thu, 19 Feb 2015 11:04:43 +0900 Subject: [PATCH 1/5] Fix broken layout fix #1 --- www/skins/prod/000000/prodcolor.css | 6 +++++- www/skins/prod/jquery.main-prod.js | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 5a9efa070b..8f1c1ef8e7 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -13,6 +13,10 @@ html, body { z-index: 1; } +#desktop { + min-width: 1100px; +} + *::-moz-selection, *::selection{ background: white; color: black; @@ -658,7 +662,7 @@ div.diapo { /******* idFrameT CSS *********************************************************/ #idFrameT { - margin-left: -29px; + margin-left: -20px; } .submenu .ui-buttonset{ diff --git a/www/skins/prod/jquery.main-prod.js b/www/skins/prod/jquery.main-prod.js index aa0bd46a4a..ed6e729a06 100644 --- a/www/skins/prod/jquery.main-prod.js +++ b/www/skins/prod/jquery.main-prod.js @@ -517,10 +517,11 @@ function initAnswerForm() { function answerSizer() { var el = $('#idFrameC').outerWidth(); if (!$.support.cssFloat) { - $('#idFrameC .insidebloc').width(el - 56); + // $('#idFrameC .insidebloc').width(el - 56); } var widthA = Math.round(bodySize.x - el - 10); $('#rightFrame').width(widthA); + $('#rightFrame').css('left', $('#idFrameC').width()); } From 7e26d48dafa02a961378a763aa4d1462101af1b0 Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Thu, 19 Feb 2015 11:05:55 +0900 Subject: [PATCH 2/5] Fix result padding fix #2 --- www/skins/prod/000000/prodcolor.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 8f1c1ef8e7..a2291cc133 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -957,6 +957,10 @@ div.diapo { position: absolute; bottom: 0px; } +#answers { + padding: 20px; +} + #answers .list { position: relative; float: left; From bd4bb78b599ff66c9e1c11d75073c13661874e0b Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Thu, 19 Feb 2015 17:39:36 +0900 Subject: [PATCH 3/5] Double arrow fix #3 --- templates/web/prod/index.html.twig | 2 +- www/skins/icons/workzoneEscamote.png | Bin 393 -> 1096 bytes www/skins/prod/000000/prodcolor.css | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 846066dd1c..c223df5c3f 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -167,7 +167,7 @@ {% endif %}
  • - +
    • diff --git a/www/skins/icons/workzoneEscamote.png b/www/skins/icons/workzoneEscamote.png index 0f467f31c38c27c5e9517f06eb540106520e3bce..9d676008caad7cc03ff2dcb1773f9783169cb7db 100644 GIT binary patch literal 1096 zcmaJ=O-K|`93Pd!)IDSwCKSUMQR2?*tUIea?dZBYySe4avM#xYh-PP=?x6G0%+npc zq!OZ1WT(_a9}q_(KPJVdtpvA0oE?-8Gy%Cu@5AHC=cKI0D>4+ zc1}s9VOr>9C0!*&2SeJbf!G)pY_knf>IV?dfIdazh#yOD30#pmqK6SYf)N2(rDMbd z-6LHoX{28Y$V6K!9<*5`paLl3wmP6$tj!U-x-8l|W{SXfA+Vn#_JT?a2|S{k0B6W1 zx8$K|-0vr8ALIAajkwoCdnpfk{chUFGJe+EjPE}L@@C4tY?6=d`$8v<$U6 z$XpYtn|%}=2m~Aruh)$bZfjVBqV3kK`ho%vEXh<1sOTE*D2f?<5OM^HbT0+fIFQw> z{W76~QMPDMH0g0tDgXuH|4>yuKwB^g4&(i&u$3A%0F?xmK4?m)alQ49D}#-gK!m!P z()EEt6%$z<>Q+`a@JP2GzaWT`qB(|(y9_~KmUf;A_?yGgSWAnKX2Jz7uSYeCoa%R3f-?^EueV}4j)=FN^g@R|Yzs?V23|C@m zI21f4(9^Z)vPAgg+9Ox~)mZh_r_*%)UERWs delta 365 zcmV-z0h0d62#EtWiBL{Q4GJ0x0000DNk~Le0000H0000H2nGNE06T3*`Tzg`32;bR za{vGf6951U69E94oEVWICw~DJNkl(5L5-5QZ z>_AGu4xj_5Ksa!hy9vHAgISm5_masbyE|{*zMV1pz85N7*A1~;5wv=|-5_#A+O};j z-#26uBs*9##7WHKK}A6J`XgZis&EwRP?1t1GNsLI1A*YX=}!q%(0}{y3rTOpj&hX! z^PnVNAV?4gM5j56ElHXVBsamk8}?0iC$w-7Xby5tE>?JB({r2&l5(xXrrJ1?2Q^e) zR*^{EsDc!xAbKL^ny)Y=1E=8A^N0-VUT6N$Ck}hyiEXH0NAOj`GZ0Pm!4x_k($N40 z{4@3f0eKjqcsU}G1}-t?DxM~p{JRYktR+zheKwX*BeB-q`v@=qe#vMVB!O>v00000 LNkvXXu0mjfEP{-! diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index a2291cc133..1a198f33cc 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -253,6 +253,11 @@ span.ww_winTitle { border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; + margin:8px 0; +} + +#idFrameC .ui-tabs .ui-tabs-nav li a.escamote { + margin:25px 25px 0 0; } #idFrameC .ui-tabs .ui-tabs-nav li:hover a { From 1f2d79355fb78627409b255e86396e5b01c34a2f Mon Sep 17 00:00:00 2001 From: Olivier Mayer Date: Thu, 19 Feb 2015 18:29:45 +0900 Subject: [PATCH 4/5] Result number fix #4 --- lib/Alchemy/Phrasea/Controller/Prod/Query.php | 2 +- templates/web/prod/index.html.twig | 26 ++++++-------- www/skins/prod/000000/prodcolor.css | 36 ++++++++++++++----- 3 files changed, 39 insertions(+), 25 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Query.php b/lib/Alchemy/Phrasea/Controller/Prod/Query.php index 09ad33fb7e..1bd5833387 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Query.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Query.php @@ -152,7 +152,7 @@ class Query implements ControllerProviderInterface $explain .= '
    ' . $result->getDuration() . ' s
    dans index ' . $result->getIndexes(); $explain .= ""; - $infoResult = '' . $app->trans('reponses:: %total% reponses', ['%total%' => $result->getTotal()]) . ' | ' . $app->trans('reponses:: %number% documents selectionnes', ['%number%' => '']); + $infoResult = '' .$app->trans('%total% reponses', ['%total%' => ''.$result->getTotal().'']) . '' . $app->trans('%number% documents
    selectionnes', ['%number%' => '']); $json['infos'] = $infoResult; $json['navigation'] = $string; diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index c223df5c3f..ae0faf1c56 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -468,6 +468,16 @@ +
    +
    + + + +
    + +