wip #2251 @1

diff --git a/js/libs/fluidbook/fluidbook.search.js b/js/libs/fluidbook/fluidbook.search.js
index ba76d3b6d30f324cea41bfd23bfd8d5218c16f9c..1b274a43b9e61f00883d955cf40d07bed96cf954 100644 (file)
--- a/js/libs/fluidbook/fluidbook.search.js
+++ b/js/libs/fluidbook/fluidbook.search.js
@@ -623,6 +623,7 @@ FluidbookSearch.prototype = {
         // Set Highlighting of results keywords
         this.setHighlightTerms(results.terms);
         this.hideSearchHints();
+        this.highlightSearchTerms(this.fluidbook.currentPage);
 
         // Redirect to the only result page if the flag is enabled
         if (gotoPageIfOneResult && spreadEnabled === 1) {
@@ -633,8 +634,6 @@ FluidbookSearch.prototype = {
             return;
         }
 
-        this.highlightSearchTerms(this.fluidbook.currentPage);
-
         this.menuSearchResults.fadeIn(300).scrollTop(0);
 
         // On some phones, the height of the search results is miscalculated due to the

diff --git a/js/libs/fluidbook/special/wescosales.js b/js/libs/fluidbook/special/wescosales.js
index c83a747d9db99b514b6ba35d1198e7f053129e61..6d46be789b597c1054e3cff71b01551611ce31fb 100644 (file)
--- a/js/libs/fluidbook/special/wescosales.js
+++ b/js/libs/fluidbook/special/wescosales.js
@@ -327,7 +327,7 @@ WescoSalesSearchPlugin.prototype = {
                     $.each(pages, function (k, v) {
                         results.results[v] = 1;
                     });
-                    results.terms = [];
+                    results.terms = [v];
                     res = true;
                     fluidbook.search.openResults(results, true);
                     return true;

diff --git a/style/special/wescosales.less b/style/special/wescosales.less
index 4a6b9216d884c103ad5844c51177bb8639857be9..9b31e5566e7d41dfb8ada5f1968b195c258b6389 100644 (file)
--- a/style/special/wescosales.less
+++ b/style/special/wescosales.less
@@ -115,11 +115,15 @@
 
 .link a {
        &[data-wescosales-ref] {
+               background-repeat: repeat;
                &.supp, &.supp.export {
-                       background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoyMjk3NmM2ZS0xYTkyLTk1NDItOTdjZC1hZjEwYzFmZmY5ZmIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OEZFNUIwODBFMjRDMTFFNjlDRTc5MTdBRkE3NjBDODUiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OEZFNUIwN0ZFMjRDMTFFNjlDRTc5MTdBRkE3NjBDODUiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUuNSAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDoyMjk3NmM2ZS0xYTkyLTk1NDItOTdjZC1hZjEwYzFmZmY5ZmIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MjI5NzZjNmUtMWE5Mi05NTQyLTk3Y2QtYWYxMGMxZmZmOWZiIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+6H4n7wAAADhJREFUeNp8zzkOADAMAkHD//9M4jRRDqCyNNsYksoOEBOWBCbskwnf4MIz+OAODC6aT1rsDQEGAIKCGgpVj078AAAAAElFTkSuQmCC") repeat;
+                       background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoyMjk3NmM2ZS0xYTkyLTk1NDItOTdjZC1hZjEwYzFmZmY5ZmIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OEZFNUIwODBFMjRDMTFFNjlDRTc5MTdBRkE3NjBDODUiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OEZFNUIwN0ZFMjRDMTFFNjlDRTc5MTdBRkE3NjBDODUiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUuNSAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDoyMjk3NmM2ZS0xYTkyLTk1NDItOTdjZC1hZjEwYzFmZmY5ZmIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MjI5NzZjNmUtMWE5Mi05NTQyLTk3Y2QtYWYxMGMxZmZmOWZiIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+6H4n7wAAADhJREFUeNp8zzkOADAMAkHD//9M4jRRDqCyNNsYksoOEBOWBCbskwnf4MIz+OAODC6aT1rsDQEGAIKCGgpVj078AAAAAElFTkSuQmCC");
                }
                &.export {
-                       background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQyIDc5LjE2MDkyNCwgMjAxNy8wNy8xMy0wMTowNjozOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoyMjk3NmM2ZS0xYTkyLTk1NDItOTdjZC1hZjEwYzFmZmY5ZmIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NjY5NUE2ODhDOTJEMTFFNzkwNThENEQyQTVGM0I1OEQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NjY5NUE2ODdDOTJEMTFFNzkwNThENEQyQTVGM0I1OEQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUuNSAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo4RkU1QjA3RkUyNEMxMUU2OUNFNzkxN0FGQTc2MEM4NSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo4RkU1QjA4MEUyNEMxMUU2OUNFNzkxN0FGQTc2MEM4NSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgwvKjwAAAA5SURBVHjaYvz//z8DLsBaZvSfAaQAG2YpNfwP1oxPEqsCZEkMBeiSKAqwScIV4JIEK8AnCcIAAQYAFiqit0KbOMYAAAAASUVORK5CYII=") repeat;
+                       background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQyIDc5LjE2MDkyNCwgMjAxNy8wNy8xMy0wMTowNjozOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDoyMjk3NmM2ZS0xYTkyLTk1NDItOTdjZC1hZjEwYzFmZmY5ZmIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NjY5NUE2ODhDOTJEMTFFNzkwNThENEQyQTVGM0I1OEQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NjY5NUE2ODdDOTJEMTFFNzkwNThENEQyQTVGM0I1OEQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUuNSAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo4RkU1QjA3RkUyNEMxMUU2OUNFNzkxN0FGQTc2MEM4NSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo4RkU1QjA4MEUyNEMxMUU2OUNFNzkxN0FGQTc2MEM4NSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgwvKjwAAAA5SURBVHjaYvz//z8DLsBaZvSfAaQAG2YpNfwP1oxPEqsCZEkMBeiSKAqwScIV4JIEK8AnCcIAAQYAFiqit0KbOMYAAAAASUVORK5CYII=");
+               }
+               &.highlight {
+                       background-color: rgba(0, 255, 0, 0.35);
                }
        }
 }