diff --git a/bower.json b/bower.json index 8613854..d1c94d5 100644 --- a/bower.json +++ b/bower.json @@ -19,10 +19,13 @@ ], "dependencies": { "jquery-1.11.3.min": "http://code.jquery.com/jquery-1.11.3.min.js", - "jQuery.dotdotdot": "~1.7.3" + "jQuery.dotdotdot": "~1.7.3", + "requirejs-html": "~1.2.0" }, "moduleType": [ "amd", "globals" - ] + ], + "devDependencies": { + } } diff --git a/css/main.min.css b/css/main.min.css index 32934eb..a437016 100644 --- a/css/main.min.css +++ b/css/main.min.css @@ -1 +1 @@ -button,html,input,select,textarea{color:#222}html{font-size:1em;line-height:1.4}textarea{resize:vertical}.browsehappy{margin:.2em 0;background:#ccc;color:#000;padding:.2em 0}.jumbotron.istex-header{padding-bottom:0;padding-top:1px;background-color:#fff;color:#fff;background-image:url(../img/istex-logo.svg);background-size:20% 50%;background-repeat:no-repeat;background-position:center}.jumbotron.istex-header h1{font-weight:700;text-align:center}#logoIA{text-align:center}.container{height:100%}.form-group{max-width:250px}.pager li{font-size:20px}#searchFieldRow{text-align:center}#searchField{max-width:250px}#advancedSearchTitle{text-align:center}#tableResult span.glyphicon{font-size:20px}#header{border-radius:0;margin-bottom:0}#accordion .panel-heading{background-color:#226a8c;border-radius:0}#accordion .panel{border-radius:0;border:0}.loading{height:16px}.truncate{width:42px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.truncate:hover{overflow:visible;white-space:normal}.downloadFilesTable th{text-align:center}#footer{text-align:center}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid gray}.ui-slider .ui-slider-range{background:none repeat scroll 0 0 gray}.text-istex-blue{color:#458ca5}a.text-istex-blue:hover{color:#366d81}.text-istex-green{color:#c4d733}a.text-istex-green:hover{color:#a3b423}.text-istex-orange{color:#ffb465}a.text-istex-orange:hover{color:#ff9b32}.text-istex-violet{color:#5b59b7}a.text-istex-violet:hover{color:#45439a}.text-istex-yellow{color:#ffd965}a.text-istex-yellow:hover{color:#ffcc32}.bg-istex-blue{background-color:#458ca5}a.bg-istex-blue:hover{background-color:#366d81}.vertical-middle{vertical-align:middle}.inline-block{display:inline-block}.inline-push-left-1{margin-left:1em}.inline-push-left-2{margin-left:2em}.inline-push-left-3{margin-left:3em}.inline-push-left-4{margin-left:4em}.link-external:after{font-size:85%;position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:"\e164"}.label-istex-documentation{background-color:#f1c40f;background:linear-gradient(135deg,#eaa800 0,#f1c40f 100%);color:#333;text-shadow:#AAA 1px 1px 2px}.qtip{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05);padding:9px;border-radius:3px;max-width:none;border-radius:6px;border:2px solid #428bca;background-color:#EDEDED}@media (min-width:768px){#request-tooltip{max-width:698px}}@media (min-width:992px){#request-tooltip{max-width:918px}}@media (min-width:1200px){#request-tooltip{max-width:1118px}}#request-tooltip-content{font-family:"Lucida Console",Monaco,monospace}#request-tooltip-content>p>mark{white-space:nowrap}.qtip-content{padding:0}.istex-tooltip{display:none;max-width:350px;font-size:14px;line-height:20px}.istex-tooltip>h5{display:inline-block;font-family:inherit;font-weight:500;line-height:1.1;color:inherit;margin-top:10px;margin-bottom:10px;font-size:18px;color:#fff;background-color:#428bca}.istex-tooltip>p{font-size:12px}.istex-tooltip>.references{font-size:85%}.istex-tooltip>.references>h6{margin-bottom:5px}.istex-tooltip hr{margin-top:10px;margin-bottom:10px;border-top-color:#999}.istex-tooltip .query-chunk{font-size:18px}.istex-tooltip .query-chunk:after,.istex-tooltip .query-chunk:before{content:"..."}.istex-tooltip .query-chunk>mark bg-corpus,.istex-tooltip .query-chunk>mark[data-ng-bind*=corpus]{background-color:#b3d4df}.istex-tooltip .query-chunk>mark[data-ng-bind*=copyrightDate]{background-color:#d4e26a}.istex-tooltip .query-chunk>mark[data-ng-bind*=pubDate]{background-color:#ffe9a7}.istex-tooltip .query-chunk>mark[data-ng-bind*=searchKeys]{background-color:#a1a0d6}.istex-tooltip .query-chunk>mark[data-ng-bind*=title]{background-color:#ffe6cb}.istex-tooltip .query-chunk>mark[data-ng-bind*=author]{background-color:#92bce0}.istex-tooltip .query-chunk>mark[data-ng-bind*=subject]{background-color:#a3d7a3}.bg-corpus{background-color:#b3d4df}.bg-copyrightDate{background-color:#d4e26a}.bg-pubDate{background-color:#ffe9a7}.bg-searchKeys{background-color:#a1a0d6}.bg-title{background-color:#ffe6cb}.bg-author{background-color:#92bce0}.bg-subject{background-color:#a3d7a3}.bg-stats{background-color:#c7e6c7}.amount{border:0;padding-top:0;padding-left:0}#tableResult>tr>td>h4{max-height:1.13em}.abstract:hover{background-color:#e8e8e8;cursor:zoom-out}.abstract.ellipsed{max-height:5.6em}.abstract.ellipsed:hover{cursor:zoom-in}.glyphicon-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1,1);-ms-transform:scale(-1,1);transform:scale(-1,1)}.istex-pager.tweaked{position:relative;bottom:-30px}.reset-box{padding:0!important;width:auto!important;height:auto!important}#surentete{position:relative;margin-top:5px!important;width:auto!important}#surentete:after,#surentete:before{content:" ";display:table}#surentete:after{clear:both}#surentete .logoistex{display:inline-block;vertical-align:middle}#surentete .logoanr{display:inline-block;padding:0}#surentete .srent{position:absolute;top:0;right:0}#surentete .srent:after,#surentete .srent:before{content:" ";display:table}#surentete .srent:after{clear:both} \ No newline at end of file +html,button,input,select,textarea{color:#222}html{font-size:1em;line-height:1.4}textarea{resize:vertical}.browsehappy{margin:.2em 0;background:#ccc;color:#000;padding:.2em 0}.jumbotron.istex-header{padding-bottom:0;padding-top:1px;background-color:white;color:white;background-image:url(../img/istex-logo.svg);background-size:20% 50%;background-repeat:no-repeat;background-position:center}.jumbotron.istex-header h1{font-weight:bold;text-align:center}#logoIA{text-align:center}.container{height:100%}.form-group{max-width:250px}.pager li{font-size:20px}#searchFieldRow{text-align:center}#searchField{max-width:250px}#advancedSearchTitle{text-align:center}#tableResult span.glyphicon{font-size:20px}#header{border-radius:0;margin-bottom:0}#accordion .panel-heading{background-color:#226a8c;border-radius:0}#accordion .panel{border-radius:0;border:0}.loading{height:16px}.truncate{width:42px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.truncate:hover{overflow:visible;white-space:normal}#footer{text-align:center}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid gray}.ui-slider .ui-slider-range{background:none repeat scroll 0 0 gray}.text-istex-blue{color:#458ca5}a.text-istex-blue:hover{color:#366d81}.text-istex-green{color:#c4d733}a.text-istex-green:hover{color:#a3b423}.text-istex-orange{color:#ffb465}a.text-istex-orange:hover{color:#ff9b32}.text-istex-violet{color:#5b59b7}a.text-istex-violet:hover{color:#45439a}.text-istex-yellow{color:#ffd965}a.text-istex-yellow:hover{color:#ffcc32}.bg-istex-blue{background-color:#458ca5}a.bg-istex-blue:hover{background-color:#366d81}.vertical-middle{vertical-align:middle}.inline-block{display:inline-block}.inline-push-left-1{margin-left:1em}.inline-push-left-2{margin-left:2em}.inline-push-left-3{margin-left:3em}.inline-push-left-4{margin-left:4em}.reset-box{padding:0 !important;width:auto !important;height:auto !important}.link-external:after{font-size:85%;position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;content:"\e164"}.label-istex-documentation{background-color:#f1c40f;background:linear-gradient(135deg, #eaa800 0, #f1c40f 100%);color:#333;text-shadow:#aaa 1px 1px 2px}.qtip{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);padding:9px;border-radius:3px;max-width:none;border-radius:6px;border:2px solid #428bca;background-color:#ededed}@media (min-width:768px){#request-tooltip{max-width:698px}}@media (min-width:992px){#request-tooltip{max-width:918px}}@media (min-width:1200px){#request-tooltip{max-width:1118px}}#request-tooltip-content{font-family:"Lucida Console",Monaco,monospace}#request-tooltip-content>p>mark{white-space:nowrap}.qtip-content{padding:0}.istex-tooltip{display:none;max-width:350px;font-size:14px;line-height:20px}.istex-tooltip>h5{display:inline-block;font-family:inherit;font-weight:500;line-height:1.1;color:inherit;margin-top:10px;margin-bottom:10px;font-size:18px;color:#fff;background-color:#428bca}.istex-tooltip>p{font-size:12px}.istex-tooltip>.references{font-size:85%}.istex-tooltip>.references>h6{margin-bottom:5px}.istex-tooltip hr{margin-top:10px;margin-bottom:10px;border-top-color:#999}.istex-tooltip .query-chunk{font-size:18px}.istex-tooltip .query-chunk:before,.istex-tooltip .query-chunk:after{content:"..."}.istex-tooltip .query-chunk>mark[data-ng-bind*="corpus"],.istex-tooltip .query-chunk>mark bg-corpus{background-color:#b3d4df}.istex-tooltip .query-chunk>mark[data-ng-bind*="copyrightDate"]{background-color:#d4e26a}.istex-tooltip .query-chunk>mark[data-ng-bind*="pubDate"]{background-color:#ffe9a7}.istex-tooltip .query-chunk>mark[data-ng-bind*="searchKeys"]{background-color:#a1a0d6}.istex-tooltip .query-chunk>mark[data-ng-bind*="title"]{background-color:#ffe6cb}.istex-tooltip .query-chunk>mark[data-ng-bind*="author"]{background-color:#92bce0}.istex-tooltip .query-chunk>mark[data-ng-bind*="subject"]{background-color:#a3d7a3}.bg-corpus{background-color:#b3d4df}.bg-copyrightDate{background-color:#d4e26a}.bg-pubDate{background-color:#ffe9a7}.bg-searchKeys{background-color:#a1a0d6}.bg-title{background-color:#ffe6cb}.bg-author{background-color:#92bce0}.bg-subject{background-color:#a3d7a3}.bg-stats{background-color:#c7e6c7}.amount{border:0;padding-top:0;padding-left:0}#tableResult>tr>td>h4{max-height:1.13em}.abstract:hover{background-color:#e8e8e8;cursor:zoom-out}.abstract.ellipsed{max-height:5.6em}.abstract.ellipsed:hover{cursor:zoom-in}.glyphicon-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}#topResultPager{margin-top:10px}#surentete{position:relative;margin-top:5px !important;width:auto !important}#surentete:before,#surentete:after{content:" ";display:table}#surentete:after{clear:both}#surentete .logoistex{display:inline-block;vertical-align:middle}#surentete .logoanr{display:inline-block;padding:0}#surentete .srent{position:absolute;top:0;right:0}#surentete .srent:before,#surentete .srent:after{content:" ";display:table}#surentete .srent:after{clear:both} \ No newline at end of file diff --git a/index.html b/index.html index 5fd4b9e..4c46e3d 100644 --- a/index.html +++ b/index.html @@ -33,7 +33,7 @@ +
@@ -58,7 +58,8 @@

Bienvenue sur le démonstrateur de l'API - ISTEX!

+ ISTEX! +

Avant toute chose, ce site ne constitue pas une portail sur l'API. Il s'agit ici de montrer les différents aspects de l'API ISTEX. Le corps du site peut cependant être matière de base à la construction d'un portail. Le code sera bientôt disponible publiquement.

@@ -675,40 +676,7 @@
-
-
- -
- */ - * -
-
-
+
@@ -734,40 +702,7 @@

-
-
- -
- */ - * -
-
-
+
@@ -781,32 +716,8 @@
Site officiel du projet : www.istex.fr -
- - - -
@@ -824,25 +735,53 @@ Ce démonstrateur a été optimisé pour Mozilla Firefox et Google Chrome, la compatibilité Internet Explorer ne peut être garantie. - - - - - - - - - - - - - - - + +
+
+ +
+ */ + * +
+
+
+ + + + + + + + + + + \ No newline at end of file diff --git a/js/controllers/searchPageController.js b/js/controllers/searchPageController.js index 2d646d3..76f85a0 100644 --- a/js/controllers/searchPageController.js +++ b/js/controllers/searchPageController.js @@ -1,606 +1,600 @@ -/*global jquery: true, angular: true, $: true, define: true, e: true, DOMException: true */ +/*global jquery: true, angular: true, $: true, define: true, e: true, DOMException: true, istexMustacheTemplate: true */ /*jslint node: true, browser: true, unparam: true */ /*jslint indent: 2 */ -define(["js/models/searchPage", "js/config", "js/vendor/mustache", "js/vendor/jsonview/jquery.jsonview.js", "js/polyfill.js"], function (searchPage, config, mustache) { - "use strict"; - var searchPageController = {}, - timeStamp = null, - ctrlScope; - // On récupére le scope du controleur Angular - if (angular) { - ctrlScope = angular.element('[ng-controller=istexAppCtrl]').scope(); - } - ctrlScope.app.apiUrl = config.apiUrl.rtrim('/ '); - ctrlScope.safeApply(); - (function () { - var err = $.ajax({ - url: config.apiUrl + "corpus", - dataType: "jsonp", - success: function (data, status, xhr) { - var corpusTemplate = "{{#corpusList}}{{/corpusList}}"; - $('#editorField').append(mustache.render(corpusTemplate, {corpusList: data})); - } - }); - window.setTimeout(function () { - console.log(err); - }, 60000); - }()); - - searchPageController.displayRanges = function (data, field, slider, amount, nb, type) { +define( + [ + "models/searchPage", + "config", + "vendor/mustache", + "text!views/resultRow.html", + "vendor/jsonview/jquery.jsonview", + "polyfill" + ], + function (searchPage, config, mustache, resultRowTemplate) { + "use strict"; - var minDate, maxDate; - if (type === 'integer') { - minDate = parseInt(data.aggregations[field].buckets[0].from, 10); - maxDate = parseInt(data.aggregations[field].buckets[0].to, 10); - } else if (type === 'float') { - minDate = parseFloat(data.aggregations[field].buckets[0].from); - maxDate = parseFloat(data.aggregations[field].buckets[0].to); - } else if (type === 'date') { - minDate = parseInt(data.aggregations[field].buckets[0].fromAsString); - maxDate = parseInt(data.aggregations[field].buckets[0].toAsString); + + var searchPageController = {}, + timeStamp = null, + ctrlScope + ; + + // On récupére le scope du controleur Angular + if (angular) { + ctrlScope = angular.element('[ng-controller=istexAppCtrl]').scope(); } + ctrlScope.app.apiUrl = config.apiUrl.rtrim('/ '); + ctrlScope.safeApply(); + (function () { + var err = $.ajax({ + url: config.apiUrl + "corpus", + dataType: "jsonp", + success: function (data, status, xhr) { + var corpusTemplate = "{{#corpusList}}{{/corpusList}}"; + $('#editorField').append(mustache.render(corpusTemplate, {corpusList: data})); + } + }); + window.setTimeout(function () { + console.log(err); + }, 60000); + }()); - if (nb !== '') $(nb).text(data.aggregations[field].buckets[0].docCount); - $(slider).slider({ - range: true, - min: minDate, - max: maxDate, - values: [minDate, maxDate] - }); - $(amount).val($(slider).slider("values", 0) + - " à " + $(slider).slider("values", 1)); - }; - searchPageController.displayResults = function (data) { - $("#jsonFromApi").JSONView(data); + searchPageController.displayRanges = function (data, field, slider, amount, nb, type) { - if (data.total > 0) { - $("#accordeon").show(); - $(".istex-pager") - .show() - .find(".first") - .attr("href", data.firstPageURI) - .end() - .find(".last") - .attr("href", data.lastPageURI) - .end() - ; - - $(".js-firstPageURI").html(data.firstPageURI); - $(".js-lastPageURI").html(data.lastPageURI); - - // Selon les réponses, il peut ne pas y avoir de prevPageURI ou de nextPageURI - $(".prev").attr("href", data.prevPageURI); - $(".js-prevPageURI").html(data.prevPageURI); - if (data.prevPageURI) { - $(".prev").show(); - } else { - $(".prev").hide(); // Assurance si une recherche a déjà été effectué en amont + var minDate, maxDate; + if (type === 'integer') { + minDate = parseInt(data.aggregations[field].buckets[0].from, 10); + maxDate = parseInt(data.aggregations[field].buckets[0].to, 10); + } else if (type === 'float') { + minDate = parseFloat(data.aggregations[field].buckets[0].from); + maxDate = parseFloat(data.aggregations[field].buckets[0].to); + } else if (type === 'date') { + minDate = parseInt(data.aggregations[field].buckets[0].fromAsString); + maxDate = parseInt(data.aggregations[field].buckets[0].toAsString); } - $(".next").attr("href", data.nextPageURI); - $(".js-nextPageURI").html(data.nextPageURI); - if (data.nextPageURI) { - $(".next").show(); - } else { - $(".next").hide(); // Assurance si une recherche a déjà été effectué en amont - } + if (nb !== '') $(nb).text(data.aggregations[field].buckets[0].docCount); + $(slider).slider({ + range: true, + min: minDate, + max: maxDate, + values: [minDate, maxDate] + }); + $(amount).val($(slider).slider("values", 0) + + " à " + $(slider).slider("values", 1)); + }; + searchPageController.displayResults = function (data) { + $("#jsonFromApi").JSONView(data); - searchPage.numberOfResults = data.total; - searchPage.numberOfPages = searchPage.numberOfResults === 0 ? 0 : Math.ceil(searchPage.numberOfResults / searchPage.resultsPerPage); - searchPage.currentPage = searchPage.numberOfResults === 0 ? 0 : searchPage.currentPage; - $(".page").find(".current").text(searchPage.currentPage === 0 ? "*" : searchPage.currentPage); - $(".page").find(".total").text(searchPage.numberOfPages === 0 ? "*" : searchPage.numberOfPages); + if (data.total > 0) { + $("#accordeon").show(); + $(".istex-pager") + .show() + .find(".first") + .attr("href", data.firstPageURI) + .end() + .find(".last") + .attr("href", data.lastPageURI) + .end() + ; - $("#totalResults").val(data.total); - $("#totalms").val(data.stats.elasticsearch.took + data.stats['istex-api'].took); - // On wrap l'objet data avant de lui donner de nouvelles méthodes. - data = Object.create(data); - data.abstr = function () { - return function (text, render) { - if (render(text) === "") { - return "Pas de résumé pour ce résultat."; - } - return render(text); + $(".js-firstPageURI").html(data.firstPageURI); + $(".js-lastPageURI").html(data.lastPageURI); + + // Selon les réponses, il peut ne pas y avoir de prevPageURI ou de nextPageURI + $(".prev").attr("href", data.prevPageURI); + $(".js-prevPageURI").html(data.prevPageURI); + if (data.prevPageURI) { + $(".prev").show(); + } else { + $(".prev").hide(); // Assurance si une recherche a déjà été effectué en amont + } + + $(".next").attr("href", data.nextPageURI); + $(".js-nextPageURI").html(data.nextPageURI); + if (data.nextPageURI) { + $(".next").show(); + } else { + $(".next").hide(); // Assurance si une recherche a déjà été effectué en amont + } + + searchPage.numberOfResults = data.total; + searchPage.numberOfPages = searchPage.numberOfResults === 0 ? 0 : Math.ceil(searchPage.numberOfResults / searchPage.resultsPerPage); + searchPage.currentPage = searchPage.numberOfResults === 0 ? 0 : searchPage.currentPage; + $(".page").find(".current").text(searchPage.currentPage === 0 ? "*" : searchPage.currentPage); + $(".page").find(".total").text(searchPage.numberOfPages === 0 ? "*" : searchPage.numberOfPages); + + $("#totalResults").val(data.total); + $("#totalms").val(data.stats.elasticsearch.took + data.stats['istex-api'].took); + + // On wrap l'objet data avant de lui donner de nouvelles méthodes. + data = Object.create(data); + data.abstr = function () { + return function (text, render) { + if (render(text) === "") { + return "Pas de résumé pour ce résultat."; + } + return render(text); + }; }; - }; +console.log(data); + data.linksIcon = function () { - data.linksIcon = function () { + return function (text, render) { + var infos = render(text).split(" "), + html = (infos.length === 2) ? "" : "
" + infos[0] + "
", + i = 1, + typeFile; + while ((i + 1) < infos.length) { + /*jslint white: true */ + switch (infos[i]) { + case 'application/zip': + typeFile = 'img/mimetypes/32px/zip.png'; + break; + case 'application/pdf': + typeFile = 'img/mimetypes/32px/pdf.png'; + break; + case 'image/tiff': + typeFile = 'img/mimetypes/32px/tiff.png'; + break; + case 'application/xml': + typeFile = 'img/mimetypes/32px/xml.png'; + break; + case 'application/mods+xml': + typeFile = 'img/mimetypes/32px/mods.png'; + break; + case 'application/tei+xml': + typeFile = 'img/mimetypes/32px/tei.png'; + break; + case 'text/plain': + typeFile = 'img/mimetypes/32px/txt.png'; + break; + case 'image/jpeg': + typeFile = 'img/mimetypes/32px/jpg.png'; + break; + case 'image/gif': + typeFile = 'img/mimetypes/32px/gif.png'; + break; + case 'application/vnd.ms-powerpoint': + typeFile = 'img/mimetypes/32px/ppt.png'; + break; + case 'application/msword': + typeFile = 'img/mimetypes/32px/doc.png'; + break; + case 'video/quicktime': + typeFile = 'img/mimetypes/32px/qt.png'; + break; + case 'application/rtf': + typeFile = 'img/mimetypes/32px/rtf.png'; + break; + case 'application/vnd.ms-excel': + typeFile = 'img/mimetypes/32px/xls.png'; + break; + default: + typeFile = 'img/mimetypes/32px/_blank.png'; + break; + } + /*jslint white: false */ + html += "\'""; + i = i + 2; + } - return function (text, render) { - var infos = render(text).split(" "), - html = (infos.length === 2) ? "" : "
" + infos[0] + "
", - i = 1, - typeFile; - while ((i + 1) < infos.length) { - /*jslint white: true */ - switch (infos[i]) { - case 'application/zip': - typeFile = 'img/mimetypes/32px/zip.png'; + html += (infos.length === 2) ? "" : "
"; + return html; + }; + }; + + data.lang = function () { + return function (text, render) { + switch (render(text)) { + case 'en': + return 'Anglais (en)'; break; - case 'application/pdf': - typeFile = 'img/mimetypes/32px/pdf.png'; + case 'eng': + return 'Anglais (eng)'; break; - case 'image/tiff': - typeFile = 'img/mimetypes/32px/tiff.png'; + case 'fr': + return 'Français (fr)'; break; - case 'application/xml': - typeFile = 'img/mimetypes/32px/xml.png'; + case 'fre': + return 'Français (fre)'; break; - case 'application/mods+xml': - typeFile = 'img/mimetypes/32px/mods.png'; + case 'de': + return 'Allemand'; break; - case 'application/tei+xml': - typeFile = 'img/mimetypes/32px/tei.png'; + case 'la': + case 'lat': + return 'Latin'; break; - case 'text/plain': - typeFile = 'img/mimetypes/32px/txt.png'; + case 'es': + return 'Espagnol'; break; - case 'image/jpeg': - typeFile = 'img/mimetypes/32px/jpg.png'; + case 'it': + return 'Italien'; break; - case 'image/gif': - typeFile = 'img/mimetypes/32px/gif.png'; + case 'nl': + return 'Néerlandais'; break; - case 'application/vnd.ms-powerpoint': - typeFile = 'img/mimetypes/32px/ppt.png'; + case 'ru': + return 'Russe'; break; - case 'application/msword': - typeFile = 'img/mimetypes/32px/doc.png'; + case 'pt': + return 'Portugais'; break; - case 'video/quicktime': - typeFile = 'img/mimetypes/32px/qt.png'; + case 'pl': + return 'Polonais'; break; - case 'application/rtf': - typeFile = 'img/mimetypes/32px/rtf.png'; + case 'cs': + return 'Tchèque'; break; - case 'application/vnd.ms-excel': - typeFile = 'img/mimetypes/32px/xls.png'; + case 'ka': + return 'Géorgien'; + break; + case 'ja': + return 'Japonais'; break; default: - typeFile = 'img/mimetypes/32px/_blank.png'; + return render(text); break; } - /*jslint white: false */ - html += "\'""; - i = i + 2; - } - - html += (infos.length === 2) ? "" : "
"; - return html; + ; + }; }; - }; - data.lang = function () { - return function (text, render) { - switch (render(text)) { - case 'en': - return 'Anglais (en)'; - break; - case 'eng': - return 'Anglais (eng)'; - break; - case 'fr': - return 'Français (fr)'; - break; - case 'fre': - return 'Français (fre)'; - break; - case 'de': - return 'Allemand'; - break; - case 'la': - case 'lat': - return 'Latin'; - break; - case 'es': - return 'Espagnol'; - break; - case 'it': - return 'Italien'; - break; - case 'nl': - return 'Néerlandais'; - break; - case 'ru': - return 'Russe'; - break; - case 'pt': - return 'Portugais'; - break; - case 'pl': - return 'Polonais'; - break; - case 'cs': - return 'Tchèque'; - break; - case 'ka': - return 'Géorgien'; - break; - case 'ja': - return 'Japonais'; - break; - default: - return render(text); - break; - } - ; - }; - }; + data.titleClic = function () { + return function (text, render) { + var res = render(text), + infos = res.split(" "), + index = infos.indexOf("application/pdf"), + title = res.slice(res.indexOf("\"") + 1, res.length - 1); - data.titleClic = function () { - return function (text, render) { - var res = render(text), - infos = res.split(" "), - index = infos.indexOf("application/pdf"), - title = res.slice(res.indexOf("\"") + 1, res.length - 1); - - if (index !== -1) { - return "" + title + ""; - } - - return title; - }; - }; - - data.quality = function () { - return function (text, render) { - if (render(text).split(':')[1] === " ") { - return ""; - } - return "
" + render(text) + ""; - }; - }; - - data.presence = function () { - return function (text, render) { - var res = render(text); - if (res === 'T') { - return "Présente(s)"; - } else { - return "Absente(s)"; - } - ; - }; - }; - - var tableLine = "{{#hits}}

" + - "{{#titleClic}}{{#fulltext}}{{{mimetype}}} {{{uri}}} {{/fulltext}} \"{{title}}\"{{/titleClic}}" + - "

" + - "

" + - "{{#abstr}}{{abstract}}{{/abstr}}" + - "

" + - "
" + - "{{#linksIcon}}Fulltext {{#fulltext}}{{{mimetype}}} {{{uri}}} {{/fulltext}}{{/linksIcon}} " + - "
" + - "{{#linksIcon}}Metadata {{#metadata}}{{{mimetype}}} {{{uri}}} {{/metadata}}{{/linksIcon}} " + - "
" + - "{{#linksIcon}}Annexes {{#annexes}}{{{mimetype}}} {{{uri}}} {{/annexes}}{{/linksIcon}} " + - "
" + - "{{#linksIcon}}Covers {{#covers}}{{{mimetype}}} {{{uri}}} {{/covers}}{{/linksIcon}}" + - "
" + - "
" + - "Corpus : {{corpusName}}" + - "
{{#quality}}Score : {{qualityIndicators.score}}{{/quality}}" + - "
{{#quality}}Mots : {{qualityIndicators.pdfWordCount}}{{/quality}}" + - "
{{/hits}}", - template; - - $("#tableResult").html(mustache.render(tableLine, data)); - - if (!searchPage.reaffine) { - - // Vidage des facets avant remplissage - $('#facetCorpus').empty(); - $('#facetPDFVersion').empty(); - $('#facetRefBibsNative').empty(); - $('#facetWos').empty(); - $('#facetLang').empty(); - // CorpusFacet - template = "{{#aggregations.corpusName.buckets}}
" + - "
" + - "{{docCount}}
{{/aggregations.corpusName.buckets}}"; - $('#nbCorpusFacet').text(data.aggregations.corpusName.buckets.length); - $('#facetCorpus').append(mustache.render(template, data)); - if (data.aggregations.corpusName.buckets.length === 1) { - $('#facetCorpus').get(0).getElementsByTagName('input').item(0).checked = true; - $('#facetCorpus').get(0).getElementsByTagName('input').item(0).disabled = true; - } - - // PDFVersionFacet - template = "{{#aggregations.pdfVersion.buckets}}
" + - "
" + - "{{docCount}}
{{/aggregations.pdfVersion.buckets}}"; - $('#facetPDFVersion').append(mustache.render(template, data)); - if (data.aggregations.pdfVersion.buckets.length === 1) { - $('#facetPDFVersion').get(0).getElementsByTagName('input').item(0).checked = true; - $('#facetPDFVersion').get(0).getElementsByTagName('input').item(0).disabled = true; - } - - // RefBibsNativeFacet - template = "{{#aggregations.refBibsNative.buckets}}
" + - "
" + - "{{docCount}}
{{/aggregations.refBibsNative.buckets}}"; - $('#facetRefBibsNative').append(mustache.render(template, data)); - if (data.aggregations.refBibsNative.buckets.length === 1) { - $('#facetRefBibsNative').get(0).getElementsByTagName('input').item(0).checked = true; - $('#facetRefBibsNative').get(0).getElementsByTagName('input').item(0).disabled = true; - } - - // LanguageFacet - template = "{{#aggregations.language.buckets}}
" + - "
" + - "{{docCount}}
{{/aggregations.language.buckets}}"; - $('#nbLangFacet').text(data.aggregations.language.buckets.length); - $('#facetLang').append(mustache.render(template, data)); - if (data.aggregations.language.buckets.length === 1) { - $('#facetLang').get(0).getElementsByTagName('input').item(0).checked = true; - $('#facetLang').get(0).getElementsByTagName('input').item(0).disabled = true; - } - - // WosFacet - template = "{{#aggregations.wos.buckets}}
" + - "
" + - "{{docCount}}
{{/aggregations.wos.buckets}}"; - $('#nbWOSFacet').text(data.aggregations.wos.buckets.length); - $('#facetWos').append(mustache.render(template, data)); - if (data.aggregations.wos.buckets.length === 1) { - $('#facetWos').get(0).getElementsByTagName('input').item(0).checked = true; - $('#facetWos').get(0).getElementsByTagName('input').item(0).disabled = true; - } - - // ScoreFacet - searchPageController.displayRanges(data, "score", "#slider-range-score", "#amountScore", '', 'float'); - // CopyrightDateFacet - searchPageController.displayRanges(data, "copyrightDate", "#slider-range-copyright", "#amountCopyrightDate", '#nbCopyrightFacet', 'date'); - // PubDateFacet - searchPageController.displayRanges(data, "publicationDate", "#slider-range-pubdate", "#amountPubDate", '#nbPublicationFacet', 'date'); - // PdfWordCountFacet - searchPageController.displayRanges(data, "pdfWordCount", "#slider-range-PDFWordCount", "#amountPDFWordCount", '', 'integer'); - // PdfCharCountFacet - searchPageController.displayRanges(data, "pdfCharCount", "#slider-range-PDFCharCount", "#amountPDFCharCount", '', 'integer'); - } - - } else { - - $("#totalResults").val(0); - $("#tableResult").html("Pas de résultat pour cette recherche."); - $(".istex-pager").hide(); - - $("#currentPage").text("*"); - $("#totalPages").text("*"); - - if (!searchPage.reaffine) { - $('#accordeon').hide(); - } - } - $("button").button('reset'); - $("#result").css("opacity", 1); - }; - searchPageController.manageError = function (err) { - $("button").button('reset'); - $(".alert span").html("Houston ... Problem!" + err.responseText); - $(".alert").alert(); - }; - searchPageController.search = function () { - var - query = "document/?q=", - fields = [], - // ctrlScope, - minCopyright, - maxCopyright, - minPubdate, - maxPubdate, - minWordCount, - maxWordCount, - minCharCount, - maxCharCount, - minScore, - maxScore, - corpusQuery, - queryFrom, - facetQuery, - softHyphen; - if (searchPage.searchField) { - ctrlScope.helper.searchKeys.query = "q=" + searchPage.searchField; - fields.push(searchPage.searchField); - } else { - ctrlScope.helper.searchKeys.query = "q=*"; - fields.push('*'); - } - - corpusQuery = ''; - $.each(searchPage.editor, function (index, editor) { - if (editor !== "-1") { - corpusQuery += editor + ','; - } - }); - if (corpusQuery) { - ctrlScope.helper.corpus.query = "AND corpusName:" + corpusQuery.slice(0, -1); - fields.push(" corpusName:" + corpusQuery.slice(0, -1)); - } else { - ctrlScope.helper.corpus.query = null; - } - - if ($("#advancedSearchPanel").is(':visible')) { - - if (searchPage.author !== "" && searchPage.author !== undefined) { - ctrlScope.helper.author.query = "AND author.name:" + searchPage.author; - fields.push("author.name:" + searchPage.author); - } - if (searchPage.title !== "" && searchPage.title !== undefined) { - ctrlScope.helper.title.query = "AND title:" + searchPage.title; - fields.push("title:" + searchPage.title); - } - if (searchPage.keywords !== "" && searchPage.keywords !== undefined) { - ctrlScope.helper.subject.query = "AND subject.value:" + searchPage.keywords; - fields.push("subject.value:" + searchPage.keywords); - } - } - - if (searchPage.copyrightdate) { - ctrlScope.helper.copyrightDate.query = "AND copyrightDate:" + searchPage.copyrightdate; - fields.push("copyrightDate:" + searchPage.copyrightdate); - } - if (searchPage.pubdate !== undefined) { - ctrlScope.helper.pubDate.query = "AND publicationDate:" + searchPage.pubdate; - fields.push("publicationDate:" + searchPage.pubdate); - } - - if (searchPage.WOS.length > 0) { - var wosQuery = '(' + searchPage.WOS.join(" OR ") + ')'; - ctrlScope.helper.WOS.query = "categories.wos:" + wosQuery; - fields.push("categories.wos:" + wosQuery); - } else { - ctrlScope.helper.WOS.query = null; - } - - if (searchPage.language.length > 0) { - var langQuery = '(' + searchPage.language.join(" OR ") + ')'; - ctrlScope.helper.lang.query = "language:" + langQuery; - fields.push("language:" + langQuery); - } else { - ctrlScope.helper.lang.query = null; - } - - // Facette qualité - ctrlScope.helper.quality.query = ''; - if (searchPage.score !== undefined) { - ctrlScope.helper.score.query = " AND qualityIndicators.score:" + searchPage.score; - ctrlScope.helper.quality.query += ctrlScope.helper.score.query; - fields.push("qualityIndicators.score:" + searchPage.score); - } - - if (searchPage.PDFWordCount !== undefined) { - ctrlScope.helper.PDFWordCount.query = " AND qualityIndicators.pdfWordCount:" + searchPage.PDFWordCount; - ctrlScope.helper.quality.query += ctrlScope.helper.PDFWordCount.query; - fields.push("qualityIndicators.pdfWordCount:" + searchPage.PDFWordCount); - } - - if (searchPage.PDFCharCount !== undefined) { - ctrlScope.helper.PDFCharCount.query = " AND qualityIndicators.pdfCharCount:" + searchPage.PDFCharCount; - ctrlScope.helper.quality.query += ctrlScope.helper.PDFCharCount.query; - fields.push("qualityIndicators.pdfCharCount:" + searchPage.PDFCharCount); - } - - if (searchPage.PDFVersion.length > 0) { - var pdfQuery = '(' + searchPage.PDFVersion.join(" OR ") + ')'; - ctrlScope.helper.PDFVersion.query = " AND qualityIndicators.pdfVersion:" + pdfQuery; - ctrlScope.helper.quality.query += ctrlScope.helper.PDFVersion.query; - fields.push("qualityIndicators.pdfVersion:" + pdfQuery); - } else { - ctrlScope.helper.PDFVersion.query = null; - } - - if (searchPage.refBibsNative) { - if (searchPage.refBibsNative.length === 1) { - ctrlScope.helper.refBibsNative.query = " AND qualityIndicators.refBibsNative:" + searchPage.refBibsNative[0]; - ctrlScope.helper.quality.query += ctrlScope.helper.refBibsNative.query; - fields.push("qualityIndicators.refBibsNative:" + searchPage.refBibsNative[0]); - } else { - ctrlScope.helper.refBibsNative.query = null; - } - } - - query += fields.join(" AND "); - query += "&size=" + searchPage.resultsPerPage; - query += queryFrom = "&from=" + searchPage.resultsPerPage * (searchPage.currentPage === 0 ? 1 : searchPage.currentPage - 1); - ctrlScope.safeApply(); - // Facets (à compléter au fur et à mesure de l'ajout de fonctionnalités) - facetQuery = "&facet=corpusName,pdfVersion,refBibsNative,wos,language"; - if (searchPage.reaffine && ($("#slider-range-copyright").slider("instance") !== undefined)) { - minCopyright = $("#slider-range-copyright").slider("values", 0); - maxCopyright = $("#slider-range-copyright").slider("values", 1); - minPubdate = $("#slider-range-pubdate").slider("values", 0); - maxPubdate = $("#slider-range-pubdate").slider("values", 1); - minWordCount = $("#slider-range-PDFWordCount").slider("values", 0); - maxWordCount = $("#slider-range-PDFWordCount").slider("values", 1); - minCharCount = $("#slider-range-PDFCharCount").slider("values", 0); - maxCharCount = $("#slider-range-PDFCharCount").slider("values", 1); - minScore = $("#slider-range-score").slider("values", 0); - maxScore = $("#slider-range-score").slider("values", 1); - facetQuery += ",copyrightDate[" + minCopyright + "-" + maxCopyright + "]"; - facetQuery += ",publicationDate[" + minPubdate + "-" + maxPubdate + "]"; - facetQuery += ",pdfWordCount[" + minWordCount + "-" + maxWordCount + "]"; - facetQuery += ",pdfCharCount[" + minCharCount + "-" + maxCharCount + "]"; - facetQuery += ",score[" + minScore + "-" + maxScore + "]"; - } else { - facetQuery += ",copyrightDate,publicationDate,pdfWordCount,pdfCharCount,score"; - } - facetQuery += "&output=*&stats"; - query += facetQuery; - softHyphen = ""; - // Construction du contenu des tooltips (sur plusieurs lignes pour la lisibilité) - var tooltipsContent = "

" + config.apiUrl + "document/?" + softHyphen + - "" + (ctrlScope.helper.searchKeys.query || '') + "" + softHyphen + - "" + (ctrlScope.helper.corpus.query || '') + "" + softHyphen + - "" + (ctrlScope.helper.copyrightDate.query || '') + "" + softHyphen + - "" + (ctrlScope.helper.pubDate.query || '') + "" + softHyphen + - "" + (ctrlScope.helper.title.query || '') + "" + softHyphen + - "" + (ctrlScope.helper.author.query || '') + "" + softHyphen + - "" + (ctrlScope.helper.subject.query || '') + "" + softHyphen + - "" + (ctrlScope.helper.score.query || '') + "" + softHyphen + - "&size=" + (searchPage.resultsPerPage || '') + softHyphen + (queryFrom || '') + softHyphen + - (facetQuery || '').replace(/,/g, ",").replace('&stats', "&stats") + "

"; - $("#request-tooltip-content").html(tooltipsContent); - searchPageController.request(config.apiUrl + query); - }; - - searchPageController.request = function (url) { - $("#searchButton").button('loading'); - $("#result").css("opacity", 0.4); - $("#reqForApi").val(url); - var timeStampLocal = (new Date()).getTime(); - timeStamp = timeStampLocal; - var request = { - url: url, - dataType: "jsonp", - crossDomain: true, - success: function (data) { - //Vérification qu'il n'y a pas eu d'autres requêtes entretemps, sinon annulation - if (timeStamp === timeStampLocal) { - try { - localStorage && localStorage.setItem(url, JSON.stringify(data)); - } catch(e) { - if (e instanceof DOMException && e.name === 'QuotaExceededError') { - localStorage.clear(); - console.log("localStorage cleared"); - } else { - throw e; + if (index !== -1) { + return "" + title + ""; } - } finally { - searchPageController.displayResults(data); - $(document).trigger("resultsLoaded"); - } - } - }, - error: function (err) { - //Vérification qu'il n'y a pas eu d'autres requêtes entretemps, sinon annulation - if (timeStamp === timeStampLocal) { - searchPageController.manageError(err); - } - }, - timeout: 10000, - complete: function () { - //Vérification qu'il n'y a pas eu d'autres requêtes entretemps, sinon annulation - if (timeStamp === timeStampLocal) { + return title; + }; + }; + + data.quality = function () { + return function (text, render) { + if (render(text).split(':')[1] === " ") { + return ""; + } + return "
" + render(text) + ""; + }; + }; + + data.presence = function () { + return function (text, render) { + var res = render(text); + if (res === 'T') { + return "Présente(s)"; + } else { + return "Absente(s)"; + } + ; + }; + }; + + var template; + + $("#tableResult").html(mustache.render(resultRowTemplate, data)); + + if (!searchPage.reaffine) { + + // Vidage des facets avant remplissage + $('#facetCorpus').empty(); + $('#facetPDFVersion').empty(); + $('#facetRefBibsNative').empty(); + $('#facetWos').empty(); + $('#facetLang').empty(); + // CorpusFacet + template = "{{#aggregations.corpusName.buckets}}
" + + "
" + + "{{docCount}}
{{/aggregations.corpusName.buckets}}"; + $('#nbCorpusFacet').text(data.aggregations.corpusName.buckets.length); + $('#facetCorpus').append(mustache.render(template, data)); + if (data.aggregations.corpusName.buckets.length === 1) { + $('#facetCorpus').get(0).getElementsByTagName('input').item(0).checked = true; + $('#facetCorpus').get(0).getElementsByTagName('input').item(0).disabled = true; + } + + // PDFVersionFacet + template = "{{#aggregations.pdfVersion.buckets}}
" + + "
" + + "{{docCount}}
{{/aggregations.pdfVersion.buckets}}"; + $('#facetPDFVersion').append(mustache.render(template, data)); + if (data.aggregations.pdfVersion.buckets.length === 1) { + $('#facetPDFVersion').get(0).getElementsByTagName('input').item(0).checked = true; + $('#facetPDFVersion').get(0).getElementsByTagName('input').item(0).disabled = true; + } + + // RefBibsNativeFacet + template = "{{#aggregations.refBibsNative.buckets}}
" + + "
" + + "{{docCount}}
{{/aggregations.refBibsNative.buckets}}"; + $('#facetRefBibsNative').append(mustache.render(template, data)); + if (data.aggregations.refBibsNative.buckets.length === 1) { + $('#facetRefBibsNative').get(0).getElementsByTagName('input').item(0).checked = true; + $('#facetRefBibsNative').get(0).getElementsByTagName('input').item(0).disabled = true; + } + + // LanguageFacet + template = "{{#aggregations.language.buckets}}
" + + "
" + + "{{docCount}}
{{/aggregations.language.buckets}}"; + $('#nbLangFacet').text(data.aggregations.language.buckets.length); + $('#facetLang').append(mustache.render(template, data)); + if (data.aggregations.language.buckets.length === 1) { + $('#facetLang').get(0).getElementsByTagName('input').item(0).checked = true; + $('#facetLang').get(0).getElementsByTagName('input').item(0).disabled = true; + } + + // WosFacet + template = "{{#aggregations.wos.buckets}}
" + + "
" + + "{{docCount}}
{{/aggregations.wos.buckets}}"; + $('#nbWOSFacet').text(data.aggregations.wos.buckets.length); + $('#facetWos').append(mustache.render(template, data)); + if (data.aggregations.wos.buckets.length === 1) { + $('#facetWos').get(0).getElementsByTagName('input').item(0).checked = true; + $('#facetWos').get(0).getElementsByTagName('input').item(0).disabled = true; + } + + // ScoreFacet + searchPageController.displayRanges(data, "score", "#slider-range-score", "#amountScore", '', 'float'); + // CopyrightDateFacet + searchPageController.displayRanges(data, "copyrightDate", "#slider-range-copyright", "#amountCopyrightDate", '#nbCopyrightFacet', 'date'); + // PubDateFacet + searchPageController.displayRanges(data, "publicationDate", "#slider-range-pubdate", "#amountPubDate", '#nbPublicationFacet', 'date'); + // PdfWordCountFacet + searchPageController.displayRanges(data, "pdfWordCount", "#slider-range-PDFWordCount", "#amountPDFWordCount", '', 'integer'); + // PdfCharCountFacet + searchPageController.displayRanges(data, "pdfCharCount", "#slider-range-PDFCharCount", "#amountPDFCharCount", '', 'integer'); + } + + } else { + + $("#totalResults").val(0); + $("#tableResult").html("Pas de résultat pour cette recherche."); + $(".istex-pager").hide(); + + $("#currentPage").text("*"); + $("#totalPages").text("*"); + + if (!searchPage.reaffine) { + $('#accordeon').hide(); } } + $("button").button('reset'); + $("#result").css("opacity", 1); + }; + searchPageController.manageError = function (err) { + $("button").button('reset'); + $(".alert span").html("Houston ... Problem!" + err.responseText); + $(".alert").alert(); + }; + searchPageController.search = function () { + var + query = "document/?q=", + fields = [], + // ctrlScope, + minCopyright, + maxCopyright, + minPubdate, + maxPubdate, + minWordCount, + maxWordCount, + minCharCount, + maxCharCount, + minScore, + maxScore, + corpusQuery, + queryFrom, + facetQuery, + softHyphen; + if (searchPage.searchField) { + ctrlScope.helper.searchKeys.query = "q=" + searchPage.searchField; + fields.push(searchPage.searchField); + } else { + ctrlScope.helper.searchKeys.query = "q=*"; + fields.push('*'); + } + + corpusQuery = ''; + $.each(searchPage.editor, function (index, editor) { + if (editor !== "-1") { + corpusQuery += editor + ','; + } + }); + if (corpusQuery) { + ctrlScope.helper.corpus.query = "AND corpusName:" + corpusQuery.slice(0, -1); + fields.push(" corpusName:" + corpusQuery.slice(0, -1)); + } else { + ctrlScope.helper.corpus.query = null; + } + + if ($("#advancedSearchPanel").is(':visible')) { + + if (searchPage.author !== "" && searchPage.author !== undefined) { + ctrlScope.helper.author.query = "AND author.name:" + searchPage.author; + fields.push("author.name:" + searchPage.author); + } + if (searchPage.title !== "" && searchPage.title !== undefined) { + ctrlScope.helper.title.query = "AND title:" + searchPage.title; + fields.push("title:" + searchPage.title); + } + if (searchPage.keywords !== "" && searchPage.keywords !== undefined) { + ctrlScope.helper.subject.query = "AND subject.value:" + searchPage.keywords; + fields.push("subject.value:" + searchPage.keywords); + } + } + + if (searchPage.copyrightdate) { + ctrlScope.helper.copyrightDate.query = "AND copyrightDate:" + searchPage.copyrightdate; + fields.push("copyrightDate:" + searchPage.copyrightdate); + } + if (searchPage.pubdate !== undefined) { + ctrlScope.helper.pubDate.query = "AND publicationDate:" + searchPage.pubdate; + fields.push("publicationDate:" + searchPage.pubdate); + } + + if (searchPage.WOS.length > 0) { + var wosQuery = '(' + searchPage.WOS.join(" OR ") + ')'; + ctrlScope.helper.WOS.query = "categories.wos:" + wosQuery; + fields.push("categories.wos:" + wosQuery); + } else { + ctrlScope.helper.WOS.query = null; + } + + if (searchPage.language.length > 0) { + var langQuery = '(' + searchPage.language.join(" OR ") + ')'; + ctrlScope.helper.lang.query = "language:" + langQuery; + fields.push("language:" + langQuery); + } else { + ctrlScope.helper.lang.query = null; + } + + // Facette qualité + ctrlScope.helper.quality.query = ''; + if (searchPage.score !== undefined) { + ctrlScope.helper.score.query = " AND qualityIndicators.score:" + searchPage.score; + ctrlScope.helper.quality.query += ctrlScope.helper.score.query; + fields.push("qualityIndicators.score:" + searchPage.score); + } + + if (searchPage.PDFWordCount !== undefined) { + ctrlScope.helper.PDFWordCount.query = " AND qualityIndicators.pdfWordCount:" + searchPage.PDFWordCount; + ctrlScope.helper.quality.query += ctrlScope.helper.PDFWordCount.query; + fields.push("qualityIndicators.pdfWordCount:" + searchPage.PDFWordCount); + } + + if (searchPage.PDFCharCount !== undefined) { + ctrlScope.helper.PDFCharCount.query = " AND qualityIndicators.pdfCharCount:" + searchPage.PDFCharCount; + ctrlScope.helper.quality.query += ctrlScope.helper.PDFCharCount.query; + fields.push("qualityIndicators.pdfCharCount:" + searchPage.PDFCharCount); + } + + if (searchPage.PDFVersion.length > 0) { + var pdfQuery = '(' + searchPage.PDFVersion.join(" OR ") + ')'; + ctrlScope.helper.PDFVersion.query = " AND qualityIndicators.pdfVersion:" + pdfQuery; + ctrlScope.helper.quality.query += ctrlScope.helper.PDFVersion.query; + fields.push("qualityIndicators.pdfVersion:" + pdfQuery); + } else { + ctrlScope.helper.PDFVersion.query = null; + } + + if (searchPage.refBibsNative) { + if (searchPage.refBibsNative.length === 1) { + ctrlScope.helper.refBibsNative.query = " AND qualityIndicators.refBibsNative:" + searchPage.refBibsNative[0]; + ctrlScope.helper.quality.query += ctrlScope.helper.refBibsNative.query; + fields.push("qualityIndicators.refBibsNative:" + searchPage.refBibsNative[0]); + } else { + ctrlScope.helper.refBibsNative.query = null; + } + } + + query += fields.join(" AND "); + query += "&size=" + searchPage.resultsPerPage; + query += queryFrom = "&from=" + searchPage.resultsPerPage * (searchPage.currentPage === 0 ? 1 : searchPage.currentPage - 1); + ctrlScope.safeApply(); + // Facets (à compléter au fur et à mesure de l'ajout de fonctionnalités) + facetQuery = "&facet=corpusName,pdfVersion,refBibsNative,wos,language"; + if (searchPage.reaffine && ($("#slider-range-copyright").slider("instance") !== undefined)) { + minCopyright = $("#slider-range-copyright").slider("values", 0); + maxCopyright = $("#slider-range-copyright").slider("values", 1); + minPubdate = $("#slider-range-pubdate").slider("values", 0); + maxPubdate = $("#slider-range-pubdate").slider("values", 1); + minWordCount = $("#slider-range-PDFWordCount").slider("values", 0); + maxWordCount = $("#slider-range-PDFWordCount").slider("values", 1); + minCharCount = $("#slider-range-PDFCharCount").slider("values", 0); + maxCharCount = $("#slider-range-PDFCharCount").slider("values", 1); + minScore = $("#slider-range-score").slider("values", 0); + maxScore = $("#slider-range-score").slider("values", 1); + facetQuery += ",copyrightDate[" + minCopyright + "-" + maxCopyright + "]"; + facetQuery += ",publicationDate[" + minPubdate + "-" + maxPubdate + "]"; + facetQuery += ",pdfWordCount[" + minWordCount + "-" + maxWordCount + "]"; + facetQuery += ",pdfCharCount[" + minCharCount + "-" + maxCharCount + "]"; + facetQuery += ",score[" + minScore + "-" + maxScore + "]"; + } else { + facetQuery += ",copyrightDate,publicationDate,pdfWordCount,pdfCharCount,score"; + } + facetQuery += "&output=*&stats"; + query += facetQuery; + softHyphen = ""; + // Construction du contenu des tooltips (sur plusieurs lignes pour la lisibilité) + var tooltipsContent = "

" + config.apiUrl + "document/?" + softHyphen + + "" + (ctrlScope.helper.searchKeys.query || '') + "" + softHyphen + + "" + (ctrlScope.helper.corpus.query || '') + "" + softHyphen + + "" + (ctrlScope.helper.copyrightDate.query || '') + "" + softHyphen + + "" + (ctrlScope.helper.pubDate.query || '') + "" + softHyphen + + "" + (ctrlScope.helper.title.query || '') + "" + softHyphen + + "" + (ctrlScope.helper.author.query || '') + "" + softHyphen + + "" + (ctrlScope.helper.subject.query || '') + "" + softHyphen + + "" + (ctrlScope.helper.score.query || '') + "" + softHyphen + + "&size=" + (searchPage.resultsPerPage || '') + softHyphen + (queryFrom || '') + softHyphen + + (facetQuery || '').replace(/,/g, ",").replace('&stats', "&stats") + "

"; + $("#request-tooltip-content").html(tooltipsContent); + searchPageController.request(config.apiUrl + query); }; - localStorage && localStorage.refreshIfNeeded(); + searchPageController.request = function (url) { + $("#searchButton").button('loading'); + $("#result").css("opacity", 0.4); + $("#reqForApi").val(url); + var timeStampLocal = (new Date()).getTime(); + timeStamp = timeStampLocal; + var request = { + url: url, + dataType: "jsonp", + crossDomain: true, + success: function (data) { + //Vérification qu'il n'y a pas eu d'autres requêtes entretemps, sinon annulation + if (timeStamp === timeStampLocal) { + try { + localStorage && localStorage.setItem(url, JSON.stringify(data)); + } catch(e) { + if (e instanceof DOMException && e.name === 'QuotaExceededError') { + localStorage.clear(); + console.log("localStorage cleared"); + } else { + throw e; + } + } finally { + searchPageController.displayResults(data); + $(document).trigger("resultsLoaded"); + } + } + }, + error: function (err) { + //Vérification qu'il n'y a pas eu d'autres requêtes entretemps, sinon annulation + if (timeStamp === timeStampLocal) { + searchPageController.manageError(err); + } + }, + timeout: 10000, + complete: function () { + //Vérification qu'il n'y a pas eu d'autres requêtes entretemps, sinon annulation + if (timeStamp === timeStampLocal) { - if (localStorage && localStorage.getItem(url)) { - searchPageController.displayResults(JSON.parse(localStorage.getItem(url))); - } else { - $.ajax(request); - } + } + } + }; - $("#result").removeClass('hide'); - $(document).trigger("resultsLoaded"); - $(".istex-pager").removeClass('hide'); - $(".pager").removeClass('hide'); - }; - return searchPageController; -}); \ No newline at end of file + localStorage && localStorage.refreshIfNeeded(); + + if (localStorage && localStorage.getItem(url)) { + searchPageController.displayResults(JSON.parse(localStorage.getItem(url))); + } else { + $.ajax(request); + } + + $("#result").removeClass('hide'); + $(document).trigger("resultsLoaded"); + $(".istex-pager").removeClass('hide'); + $(".pager").removeClass('hide'); + }; + return searchPageController; + }); \ No newline at end of file diff --git a/js/main.js b/js/main.js index 859c076..09f5b6f 100755 --- a/js/main.js +++ b/js/main.js @@ -1,9 +1,19 @@ -/*global jquery: true, angular: true, $: true */ +/*global jquery: true, angular: true, $: true, require: true */ /*jslint node: true, browser: true, unparam: true */ /*jslint indent: 2 */ "use strict"; var globalSearchPage = {}, - globalSearchPageController = {}; + globalSearchPageController = {}, + istexTemplate = {}; +require.config( + { + baseUrl: 'js/', + paths: { + 'text': '../bower_components/requirejs-text/text', + 'qTip': ['//cdn.jsdelivr.net/qtip2/2.2.1/jquery.qtip'] + } + } +); var istexApp = angular.module("istexApp", []); @@ -77,49 +87,52 @@ }; }); -$(document).ready(function () { +require(["config"], function (config) { + $(document).ready(function () { - /** - * Istex tooltip - * Pour déclencher le tooltip: data-toggle='istex-tooltip' - * Par défaut le tooltip doit étre le premier element frère 'div.istex-tooltip' - * sauf si l'attribut 'data-content-text' est précisé avec un selecteur. - */ - $("[data-toggle='istex-tooltip']").each(function () { - var $this = $(this), - dataTooltipTarget = $this.data("tooltip-target"), - $targetElement = dataTooltipTarget ? $this.find(dataTooltipTarget) : $this, - dataContentText = $this.data("content-text"), - $qtipContent = dataContentText ? $this.children(dataContentText) : $this.next("div.istex-tooltip"), - position = { - my: $qtipContent.data("my-position") || "left top", - at: $qtipContent.data("at-position") || "right top" - }; + $("#pager-prototype").appendTo(".pager-placeholder"); - $targetElement.qtip({ - content: { - text: $qtipContent - }, - show: { - solo: true, - delay: 382 - }, - hide: { - // event: false, - fixed: true, - delay: 236 - }, - position: { - my: position.my, - at: position.at - }, - style: { - def: false - } + /** + * Istex tooltip + * Pour déclencher le tooltip: data-toggle='istex-tooltip' + * Par défaut le tooltip doit étre le premier element frère 'div.istex-tooltip' + * sauf si l'attribut 'data-content-text' est précisé avec un selecteur. + */ + $("[data-toggle='istex-tooltip']").each(function () { + var $this = $(this), + dataTooltipTarget = $this.data("tooltip-target"), + $targetElement = dataTooltipTarget ? $this.find(dataTooltipTarget) : $this, + dataContentText = $this.data("content-text"), + $qtipContent = dataContentText ? $this.children(dataContentText) : $this.next("div.istex-tooltip"), + position = { + my: $qtipContent.data("my-position") || "left top", + at: $qtipContent.data("at-position") || "right top" + }; + + $targetElement.qtip({ + content: { + text: $qtipContent + }, + show: { + solo: true, + delay: 382 + }, + hide: { + // event: false, + fixed: true, + delay: 146 + }, + position: { + my: position.my, + at: position.at + }, + style: { + def: false + } + }); }); - }); - require(["js/config"], function (config) { + $.ajax({ url: "include/top_header/surenteteistex.html", @@ -139,247 +152,243 @@ } }); - }); - $(document).on("resultsLoaded", function (e) { + $(document).on("resultsLoaded", function (e) { - // Toolip pour les icons des fichiers - $(".downloadFilesTable").find('a').each(function () { - var $this = $(this), - $thisImg = $this.children("img"), - mimetype = $thisImg.attr("title"); + // Toolip pour les icons des fichiers + $(".download-links").find('a').each(function () { + var $this = $(this), + $thisImg = $this.children("img"), + mimetype = $thisImg.attr("title"); - $thisImg - .removeAttr("title") - .qtip({ - content: { - text: $("
" + mimetype + "
" + "

" + $this.attr("href") + "

") - }, - show: { - solo: true, - delay: 382 - }, - hide: { - // event: false, - fixed: true, - delay: 146 - }, - position: { - my: "top left", - at: "bottom center" - }, - style: { - def: false - } - }); - }); + $thisImg + .removeAttr("title") + .qtip({ + content: { + text: $("
" + mimetype + "
" + "

" + $this.attr("href") + "

") + }, + show: { + solo: true, + delay: 382 + }, + hide: { + // event: false, + fixed: true, + delay: 146 + }, + position: { + my: "top left", + at: "bottom center" + }, + style: { + def: false + } + }); + }); - /** - * ellipse sur les abstracts et titles - */ - var $tableResult = $("#tableResult"), - dotdotdotConfig = {ellipsis: '…', watch: "window"} - ; - $tableResult.find("h4").dotdotdot(dotdotdotConfig); - - $tableResult - .find(".abstract") - .addClass("ellipsed") - .dotdotdot( - dotdotdotConfig - ) - .click(function () { - var $this = $(this); - var content = $this.triggerHandler("originalContent"); - $this - .toggleClass("ellipsed") - .append(content) - .trigger("update.dot") - ; - }) + /** + * ellipse sur les abstracts et titles + */ + var $tableResult = $("#tableResult"), + dotdotdotConfig = {ellipsis: '…', watch: "window"} ; + $tableResult.find("h4").dotdotdot(dotdotdotConfig); - // Retour au top - if(document.body.scrollTop > document.getElementById("result").offsetTop) { - $("html, body").animate({ - scrollTop: 0 - }, 600); - } - + $tableResult + .find(".abstract") + .addClass("ellipsed") + .dotdotdot( + dotdotdotConfig + ) + .click(function () { + var $this = $(this); + var content = $this.triggerHandler("originalContent"); + $this + .toggleClass("ellipsed") + .append(content) + .trigger("update.dot") + ; + }) + ; + + // Retour au top + if (document.body.scrollTop > document.getElementById("result").offsetTop) { + $("html, body").animate({ + scrollTop: 0 + }, 600); + } + + }); }); -}); + + + require( + ["models/searchPage", "controllers/searchPageController"], + function (searchPage, searchPageController) { + globalSearchPage = searchPage; + globalSearchPageController = searchPageController; -//require.config({ -// paths: { -// 'piwik': '//piwik.inist.fr/piwik' -// } -//}); + $("#searchform").submit(function (event) { + event.preventDefault(); + search(searchPage, searchPageController); + }); -require( - ["js/models/searchPage", "js/controllers/searchPageController"], - function (searchPage, searchPageController) { - globalSearchPage = searchPage; - globalSearchPageController = searchPageController; + $("#advancedSearchForm").submit(function (event) { + event.preventDefault(); + $("#searchform").submit(); + }); - $("#searchform").submit(function (event) { - event.preventDefault(); - search(searchPage, searchPageController); + $("#advancedSearchForm").on("input", ":input", function (event) { + $("#searchform").submit(); + }); + + + var $pager = $(".istex-pager"); + $pager.find(".prev").click(function (e) { + e.preventDefault(); + searchPage.currentPage = searchPage.currentPage - 1; + searchPageController.request($(".prev").attr("href")); + }); + + $pager.find(".first").click(function (e) { + e.preventDefault(); + searchPage.currentPage = 1; + searchPageController.request($(".first").attr("href")); + }); + + $pager.find(".next").click(function (e) { + e.preventDefault(); + searchPage.currentPage = searchPage.currentPage + 1; + searchPageController.request($(".next").attr("href")); + }); + + $pager.find(".last").click(function (e) { + e.preventDefault(); + searchPage.currentPage = searchPage.numberOfPages; + searchPageController.request($(".last").attr("href")); + }); + + $("#facetCorpus").on("click", "input", function () { + searchPage.reaffine = true; + if (this.checked) { + searchPage.editor.push(this.value); + } else { + var index = searchPage.editor.indexOf(this.value); + searchPage.editor.splice(index, 1); + } + searchPageController.search(); + }); + + $("#slider-range-copyright").on("slide", function (event, ui) { + $("#amountCopyrightDate").val(ui.values[0] + " à " + ui.values[1]); + }); + + $("#slider-range-copyright").on("slidestop", function (event, ui) { + searchPage.reaffine = true; + searchPage.copyrightdate = []; + searchPage.copyrightdate.push("[" + ui.values[0] + " TO " + ui.values[1] + "]"); + searchPageController.search(); + }); + + $("#slider-range-pubdate").on("slide", function (event, ui) { + $("#amountPubDate").val(ui.values[0] + " à " + ui.values[1]); + }); + + $("#slider-range-pubdate").on("slidestop", function (event, ui) { + searchPage.reaffine = true; + searchPage.pubdate = []; + searchPage.pubdate.push("[" + ui.values[0] + " TO " + ui.values[1] + "]"); + searchPageController.search(); + }); + + $("#slider-range-PDFWordCount").on("slide", function (event, ui) { + $("#amountPDFWordCount").val(ui.values[0] + " à " + ui.values[1]); + }); + + $("#slider-range-PDFWordCount").on("slidestop", function (event, ui) { + searchPage.reaffine = true; + searchPage.PDFWordCount = []; + searchPage.PDFWordCount.push("[" + ui.values[0] + " TO " + ui.values[1] + "]"); + searchPageController.search(); + }); + + $("#slider-range-PDFCharCount").on("slide", function (event, ui) { + $("#amountPDFCharCount").val(ui.values[0] + " à " + ui.values[1]); + }); + + $("#slider-range-PDFCharCount").on("slidestop", function (event, ui) { + searchPage.reaffine = true; + searchPage.PDFCharCount = []; + searchPage.PDFCharCount.push("[" + ui.values[0] + " TO " + ui.values[1] + "]"); + searchPageController.search(); + }); + + $("#slider-range-score").slider({ + step: 0.3 + }); + + $("#slider-range-score").on("slide", function (event, ui) { + $("#amountScore").val(ui.values[0] + " à " + ui.values[1]); + }); + + $("#slider-range-score").on("slidestop", function (event, ui) { + searchPage.reaffine = true; + searchPage.score = []; + searchPage.score.push("[" + ui.values[0] + " TO " + ui.values[1] + "]"); + searchPageController.search(); + }); + + $("#facetPDFVersion").on("click", "input", function () { + searchPage.reaffine = true; + if (this.checked) { + searchPage.PDFVersion.push(this.value); + } else { + var index = searchPage.PDFVersion.indexOf(this.value); + searchPage.PDFVersion.splice(index, 1); + } + searchPageController.search(); + }); + + $("#facetWos").on("click", "input", function () { + searchPage.reaffine = true; + var valueHTML = "\"" + this.value.replace(/"/g, '%22').replace(/&/g, '%26').replace(/ /g, '%20') + "\""; + if (this.checked) { + searchPage.WOS.push(valueHTML); + } else { + var index = searchPage.WOS.indexOf(valueHTML); + searchPage.WOS.splice(index, 1); + } + searchPageController.search(); + }); + + $("#facetLang").on("click", "input", function () { + searchPage.reaffine = true; + if (this.checked) { + searchPage.language.push(this.value); + } else { + var index = searchPage.language.indexOf(this.value); + searchPage.language.splice(index, 1); + } + searchPageController.search(); + }); + + $("#facetRefBibsNative").on("click", "input", function () { + searchPage.reaffine = true; + var bool = (this.value === 'T'); + if (this.checked) { + searchPage.refBibsNative.push(bool); + } else { + var index = searchPage.refBibsNative.indexOf(bool); + searchPage.refBibsNative.splice(index, 1); + } + searchPageController.search(); + }); + + $("button.js-resetFacet").on("click", function (event, ui) { + search(searchPage, searchPageController); + }); }); - $("#advancedSearchForm").submit(function (event) { - event.preventDefault(); - $("#searchform").submit(); - }); - - $("#advancedSearchForm").on("input", ":input", function (event) { - $("#searchform").submit(); - }); - - - var $pager = $(".istex-pager"); - $pager.find(".prev").click(function (e) { - e.preventDefault(); - searchPage.currentPage = searchPage.currentPage - 1; - searchPageController.request($(".prev").attr("href")); - }); - - $pager.find(".first").click(function (e) { - e.preventDefault(); - searchPage.currentPage = 1; - searchPageController.request($(".first").attr("href")); - }); - - $pager.find(".next").click(function (e) { - e.preventDefault(); - searchPage.currentPage = searchPage.currentPage + 1; - searchPageController.request($(".next").attr("href")); - }); - - $pager.find(".last").click(function (e) { - e.preventDefault(); - searchPage.currentPage = searchPage.numberOfPages; - searchPageController.request($(".last").attr("href")); - }); - - $("#facetCorpus").on("click", "input", function () { - searchPage.reaffine = true; - if (this.checked) { - searchPage.editor.push(this.value); - } else { - var index = searchPage.editor.indexOf(this.value); - searchPage.editor.splice(index, 1); - } - searchPageController.search(); - }); - - $("#slider-range-copyright").on("slide", function (event, ui) { - $("#amountCopyrightDate").val(ui.values[0] + " à " + ui.values[1]); - }); - - $("#slider-range-copyright").on("slidestop", function (event, ui) { - searchPage.reaffine = true; - searchPage.copyrightdate = []; - searchPage.copyrightdate.push("[" + ui.values[0] + " TO " + ui.values[1] + "]"); - searchPageController.search(); - }); - - $("#slider-range-pubdate").on("slide", function (event, ui) { - $("#amountPubDate").val(ui.values[0] + " à " + ui.values[1]); - }); - - $("#slider-range-pubdate").on("slidestop", function (event, ui) { - searchPage.reaffine = true; - searchPage.pubdate = []; - searchPage.pubdate.push("[" + ui.values[0] + " TO " + ui.values[1] + "]"); - searchPageController.search(); - }); - - $("#slider-range-PDFWordCount").on("slide", function (event, ui) { - $("#amountPDFWordCount").val(ui.values[0] + " à " + ui.values[1]); - }); - - $("#slider-range-PDFWordCount").on("slidestop", function (event, ui) { - searchPage.reaffine = true; - searchPage.PDFWordCount = []; - searchPage.PDFWordCount.push("[" + ui.values[0] + " TO " + ui.values[1] + "]"); - searchPageController.search(); - }); - - $("#slider-range-PDFCharCount").on("slide", function (event, ui) { - $("#amountPDFCharCount").val(ui.values[0] + " à " + ui.values[1]); - }); - - $("#slider-range-PDFCharCount").on("slidestop", function (event, ui) { - searchPage.reaffine = true; - searchPage.PDFCharCount = []; - searchPage.PDFCharCount.push("[" + ui.values[0] + " TO " + ui.values[1] + "]"); - searchPageController.search(); - }); - - $("#slider-range-score").slider({ - step: 0.3 - }); - - $("#slider-range-score").on("slide", function (event, ui) { - $("#amountScore").val(ui.values[0] + " à " + ui.values[1]); - }); - - $("#slider-range-score").on("slidestop", function (event, ui) { - searchPage.reaffine = true; - searchPage.score = []; - searchPage.score.push("[" + ui.values[0] + " TO " + ui.values[1] + "]"); - searchPageController.search(); - }); - - $("#facetPDFVersion").on("click", "input", function () { - searchPage.reaffine = true; - if (this.checked) { - searchPage.PDFVersion.push(this.value); - } else { - var index = searchPage.PDFVersion.indexOf(this.value); - searchPage.PDFVersion.splice(index, 1); - } - searchPageController.search(); - }); - - $("#facetWos").on("click", "input", function () { - searchPage.reaffine = true; - var valueHTML = "\"" + this.value.replace(/"/g, '%22').replace(/&/g, '%26').replace(/ /g, '%20') + "\""; - if (this.checked) { - searchPage.WOS.push(valueHTML); - } else { - var index = searchPage.WOS.indexOf(valueHTML); - searchPage.WOS.splice(index, 1); - } - searchPageController.search(); - }); - - $("#facetLang").on("click", "input", function () { - searchPage.reaffine = true; - if (this.checked) { - searchPage.language.push(this.value); - } else { - var index = searchPage.language.indexOf(this.value); - searchPage.language.splice(index, 1); - } - searchPageController.search(); - }); - - $("#facetRefBibsNative").on("click", "input", function () { - searchPage.reaffine = true; - var bool = (this.value === 'T'); - if (this.checked) { - searchPage.refBibsNative.push(bool); - } else { - var index = searchPage.refBibsNative.indexOf(bool); - searchPage.refBibsNative.splice(index, 1); - } - searchPageController.search(); - }); - - $("button.js-resetFacet").on("click", function (event, ui) { - search(searchPage, searchPageController); - }); - }); \ No newline at end of file +}); \ No newline at end of file diff --git a/js/models/searchPage.js b/js/models/searchPage.js index a19414c..9bd7ad3 100644 --- a/js/models/searchPage.js +++ b/js/models/searchPage.js @@ -1,10 +1,3 @@ -/** - * Created with IntelliJ IDEA. - * User: billey - * Date: 24/02/14 - * Time: 15:55 - */ - /****************************************** * Gestion des évènements * ******************************************/ diff --git a/js/views/resultRow.html b/js/views/resultRow.html new file mode 100644 index 0000000..0b08f4a --- /dev/null +++ b/js/views/resultRow.html @@ -0,0 +1,46 @@ +{{#hits}} + + +

+ + {{#titleClic}}{{#fulltext}}{{{mimetype}}} {{{uri}}} {{/fulltext}} "{{title}}"{{/titleClic}} + +

+
+

+ {{#abstr}}{{abstract}}{{/abstr}} +

+
+
+ {{#linksIcon}}Fulltext {{#fulltext}}{{{mimetype}}} {{{uri}}} {{/fulltext}}{{/linksIcon}} +
+
+ {{#linksIcon}}Metadata {{#metadata}}{{{mimetype}}} {{{uri}}} {{/metadata}}{{/linksIcon}} +
+
+ {{#linksIcon}}Annexes {{#annexes}}{{{mimetype}}} {{{uri}}} {{/annexes}}{{/linksIcon}} +
+
+ {{#linksIcon}}Covers {{#covers}}{{{mimetype}}} {{{uri}}} {{/covers}}{{/linksIcon}} +
+
+ {{#linksIcon}}Enrichments {{#enrichments}}{{{mimetype}}} {{{uri}}} {{/enrichments}}{{/linksIcon}} +
+ {{#enrichments}} + yolo + {{/enrichments}} +
+
+
+
+ Corpus : {{corpusName}} +
{{#quality}}Score : {{qualityIndicators.score}}{{/quality}}
+
{{#quality}}Mots : {{qualityIndicators.pdfWordCount}}{{/quality}}
+
+
+ + +{{/hits}} + + + diff --git a/less/istex/main.less b/less/istex/main.less index dee6241..b253904 100644 --- a/less/istex/main.less +++ b/less/istex/main.less @@ -94,9 +94,7 @@ overflow: visible; white-space: normal; } -.downloadFilesTable th { - text-align: center; -} + #footer { text-align: center; } @@ -164,7 +162,13 @@ .generate-inline-push-left(4); +.reset-box{ + padding: 0 !important; + width: auto !important; height: auto !important; +} + +// link .link-external { &:after { .small; @@ -172,6 +176,9 @@ content: "\e164"; } } + + +// Label .label-istex-documentation { background-color: #f1c40f; background: linear-gradient(135deg, #EAA800 0%,#F1C40F 100%); @@ -327,26 +334,17 @@ } // Pager -.istex-pager{ - &.tweaked{ - position: relative; - bottom: -30px; - } +#topResultPager{ + margin-top: 10px; } /* ========================================================================== - Helper classes - @helper - ========================================================================== */ -.reset-box{ - padding: 0 !important; - width: auto !important; height: auto !important; -} -/* ========================================================================== Top header @top ========================================================================== */ + +// surentete include #surentete{ position: relative; margin-top: 5px !important;