diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Query.php b/lib/Alchemy/Phrasea/Controller/Prod/Query.php index 1bd5833387..5e822eab44 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('%total% reponses', ['%total%' => ''.$result->getTotal().'']) . '' . $app->trans('%number% documents
selectionnes', ['%number%' => '']); + $infoResult = '' .$app->trans('%total% reponses', ['%total%' => ''.$result->getTotal().'']) . ''; $json['infos'] = $infoResult; $json['navigation'] = $string; diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 7e27453728..9d59d7ccbb 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -172,7 +172,7 @@ -
+
{% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %} {{WorkZoneMacros.make_bloc(app, WorkZone)}}
diff --git a/www/skins/icons/proposition_off32.png b/www/skins/icons/proposition_off32.png index 35a4306dd8..e9efa06afb 100644 Binary files a/www/skins/icons/proposition_off32.png and b/www/skins/icons/proposition_off32.png differ diff --git a/www/skins/icons/thesaurus_32.png b/www/skins/icons/thesaurus_32.png index 8fd1c989fb..94e81e9920 100644 Binary files a/www/skins/icons/thesaurus_32.png and b/www/skins/icons/thesaurus_32.png differ diff --git a/www/skins/icons/vsplitter.png b/www/skins/icons/vsplitter.png index 3aa34381cb..06f171f7c8 100644 Binary files a/www/skins/icons/vsplitter.png and b/www/skins/icons/vsplitter.png differ diff --git a/www/skins/icons/workzone32.png b/www/skins/icons/workzone32.png index 8315b16418..97598e4e02 100644 Binary files a/www/skins/icons/workzone32.png and b/www/skins/icons/workzone32.png differ diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index e2e647f689..2a0195526a 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -109,7 +109,7 @@ body { } .PNB .ui-corner-top { - top: 73px; + top: 100px; } @@ -235,7 +235,7 @@ span.ww_winTitle { #idFrameC .ui-tabs .ui-tabs-nav li { width: auto; - height: 81px; + height: 73px; display: inline-block; background-color: #3b3b3b; z-index: 10; @@ -273,7 +273,7 @@ span.ww_winTitle { } #idFrameC .ui-tabs .ui-tabs-nav li.ui-state-active a { - background-color: #666666; + background-color: #333; border-bottom: 3px solid #076882; } @@ -285,22 +285,22 @@ span.ww_winTitle { display: block; background-image: url("/skins/icons/workzone32.png"); background-repeat: no-repeat; - background-position: 18px 18px; - width: 91px; - height: 78px; + background-position: 9px 16px; + width: 70px; + height: 70px; } #idFrameC .icon-menu .WZtabs { display: block; - width: 91px; - height: 78px; - line-height: 78px; + width: 70px; + height: 70px; + line-height: 70px; vertical-align: middle; text-align: center; } #basket_menu_trigger { - padding: 34px 9px 0 0; + padding: 27px 7px 0 0; float: right; font-size: 9px; cursor: pointer; @@ -522,17 +522,23 @@ span.ww_winTitle { /******* FORMULAIRE DE RECHERCHE **********************************************/ .searchFormWrapper { - margin: 25px 0 0 45px; + margin: 25px 0 0 5px; line-height: 30px; } +#searchForm { + width: 80%; + float: left; +} + #searchForm .input-append { float: left; + width: 80%; } #searchForm .control-group { float: left; - margin-left: 30px; + margin-left: 0; } #searchForm .input-append .btn { @@ -541,10 +547,12 @@ span.ww_winTitle { #searchForm .input-append a.btn { height: 22px; + width: 5%; } #searchForm .input-append button.btn { height: 30px; + width: 15%; } /******* PRESENTATION DE MINIATURES *******************************************/ @@ -624,7 +632,7 @@ div.diapo { } #answers_status{ - width: 200px; + width: auto; float: right; } @@ -917,7 +925,7 @@ div.diapo { #idFrameC .ui-tabs .ui-tabs-panel,#idFrameE .ui-tabs .ui-tabs-panel { position: absolute; - top: 31px; + top: 44px; left: 0px; bottom: 0px; right: 0px; @@ -1106,7 +1114,7 @@ form.phrasea_query input.query { padding-left: 30px; font-size: 16px; margin: 0; - width: 370px; + width: 80%; } #basket-rename-box .btn, #reorder_box .btn { @@ -1657,12 +1665,12 @@ input.btn-mini { .gui_vsplitter,.ui-resizable-e { top: 50%; - width: 10px; - padding: 35px 0; - height: 0; + width: 13px; + padding: 0 0; + height: 54px; position: absolute; - /*background-image: url('../../icons/vsplitter.png');*/ - background-color: #212121; + background-image: url('../../icons/vsplitter.png'); + background-color: #3b3b3b; background-position: center center; background-repeat: no-repeat; right: 0; diff --git a/www/skins/prod/jquery.main-prod.js b/www/skins/prod/jquery.main-prod.js index ed6e729a06..dcc9a4eb8b 100644 --- a/www/skins/prod/jquery.main-prod.js +++ b/www/skins/prod/jquery.main-prod.js @@ -310,7 +310,7 @@ function resize() { if ($('#idFrameC').data('ui-resizable')) { $('#idFrameC').resizable('option', 'maxWidth', (bodySize.x - 670)); - $('#idFrameC').resizable('option', 'minWidth', 265); + $('#idFrameC').resizable('option', 'minWidth', 305); } answerSizer();