Merge pull request #1356 from kwemi/issue-tuesday

Issue tuesday

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%' => '<span id="current_result_n">' . ($this->number + 1) . '</span> : ']);
+                $this->title .= $this->app->trans('resultat numero %number%', ['%number%' => '<span id="current_result_n">' . ($this->number + 1) . '</span> : ']);
                 $this->title .= parent::get_title($highlight, $searchEngine);
                 break;
             case "BASK":

templates/web/prod/index.html.twig

@@ -211,7 +211,7 @@
                         {{WorkZoneMacros.make_bloc(app, WorkZone)}}
                     </div>
                     {% if GV_thesaurus %}
-                    <div id="proposals" class="PNB" style="top:85px;"
+                    <div id="proposals" class="PNB"
                         ondblclick="return(thesau_dblclickThesaurus(event));" onclick="return(thesau_clickThesaurus(event));">
                         <button id="facets-back-btn" style="display:none;">back</button>
                     </div>

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,47 @@ 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: 17px 0;
-    padding-left: 6px;
+  overflow: auto;
-    margin-right: 30px;
+  width: 101%;
-    overflow: hidden;
+  max-height: 400px;
+  overflow-x: hidden;
+}
+
+#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;
+    height: 49px;
-    padding-top: 7px;
+    line-height: 49px;  
-    border-left: 4px solid #4c5d84;
     margin-left: 0;
+    border-left: 4px solid #3b3b3b;
+    border-bottom: 1px solid #303030;
+}
+
+#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 {
@@ -2186,6 +2226,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;
@@ -2202,27 +2246,34 @@ 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;
-    width:100px;
+    width:122px;
-    height:22px;
+    height:25px;
+    line-height: 25px;
+    vertical-align: middle;
     border-radius: 4px;
-    right:30px;
+    right:28px;
-    background-color: #606060;
+    background-color: #4c5d84;
-    padding-top: 3px;
+    padding-left: 13px;
-    padding-left: 4px;
+    padding-right: 13px;
-    padding-right: 4px;
+    margin-top: 11px;
 }
 
 #proposals .facetFilter-label {
     position:absolute;
-    left:4px;
+    left:13px;
     right: 14px;
     overflow:hidden;
     cursor: default;
@@ -2232,17 +2283,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 {
+#proposals .facetFilter-closer {
-    content: 'x';
+    background: url('../../icons/bgd_facetFilter.png') 0 5px no-repeat;
+    height: 25px;
+    width: 14px;
 }
 
 /******* /PROPOSALS ************************************************************/
@@ -3275,6 +3327,10 @@ DIV.thesaurus U.w {
     cursor: pointer;
 }
 
+#PREVIEWBOX #PREVIEWTITLE_COLLNAME {
+    display:none;
+}
+
 .PREVIEW_PIC,.PREVIEW_HD {
     position: absolute;
 }
@@ -3386,6 +3442,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;
@@ -4838,6 +4912,7 @@ ui-dialog-titlebar {
 #paginate {
     float: right;
     margin: 0 65px 15px 0;
+    min-height: 52px;
 }
 
 #paginate #tool_navigate {

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");