diff --git a/squelettes/content/scrutarijs.html b/squelettes/content/scrutarijs.html index 35c3d31..0c5ef91 100644 --- a/squelettes/content/scrutarijs.html +++ b/squelettes/content/scrutarijs.html @@ -131,13 +131,17 @@ Structure du client

Vos résultats

-
- -

Recherche effectuée par Scrutari

- -
+ +
+

+ + Recherche effectuée par Scrutari + +

+
+ diff --git a/squelettes/head_js/scrutarijs.html b/squelettes/head_js/scrutarijs.html index 6533781..87e8e85 100644 --- a/squelettes/head_js/scrutarijs.html +++ b/squelettes/head_js/scrutarijs.html @@ -13,7 +13,7 @@ [] [(#REM) Structure et gabarits par défaut] -[] +[] [] diff --git a/squelettes/javascript/scrutarijs/Scrutari.Lav.js b/squelettes/javascript/scrutarijs/Scrutari.Lav.js index a047c86..62b3043 100644 --- a/squelettes/javascript/scrutarijs/Scrutari.Lav.js +++ b/squelettes/javascript/scrutarijs/Scrutari.Lav.js @@ -32,7 +32,7 @@ Scrutari.Lav.formatSearchSequence = function (client, scrutariResult) { q = q.replace(/\|\|/g, '@%ou%@'); q = q.replace(/\*/g, '@%*%@'); q = Scrutari.escape(q); - q = q.replace(/@%/g, ''); + q = q.replace(/@%/g, ''); q = q.replace(/%@/g, ''); return q; }; @@ -234,7 +234,8 @@ Scrutari.Lav.getInitOptions = function () { return { withCorpus: false, ficheTarget: "_blank", - ficheBodyList: "fiche_mtitre,fiche_msoustitre,libreavous_start_ul,fiche_primaryattributearray,fiche_mcomplementarray,fiche_secondaryattributearray,fiche_motclearray,fiche_bythesaurusarray,libreavous_end_ul", //Ajout de libreavous_start_ul et libreavous_end_ul, retrait de fiche_year + ficheBodyList: "fiche_mtitre,fiche_msoustitre,libreavous_start_ul,fiche_primaryattributearray,fiche_mcomplementarray,fiche_secondaryattributearray,fiche_motclearray,fiche_bythesaurusarray,libreavous_end_ul", //Ajout de libreavous_start_ul et libreavous_end_ul, retrait de fiche_year, + historyAtLast: true, ignoreList: "area-title,area-stats,modal-*", //Utilisé en mode développement hooks: Scrutari.Lav.HOOKS, functions: Scrutari.Lav.FUNCTIONS diff --git a/squelettes/javascript/scrutarijs/frameworks/_default.js b/squelettes/javascript/scrutarijs/frameworks/default.js similarity index 51% rename from squelettes/javascript/scrutarijs/frameworks/_default.js rename to squelettes/javascript/scrutarijs/frameworks/default.js index 2c3f6c0..9103949 100644 --- a/squelettes/javascript/scrutarijs/frameworks/_default.js +++ b/squelettes/javascript/scrutarijs/frameworks/default.js @@ -1,26 +1,26 @@ var SCRUTARI_HTML = { -_name:'_default', +_name:'default', structure:{ -'area-input':'
', +'area-input':'
', 'area-parameters':'
{{panel-options}} {{panel-corpus}} {{panel-base}} {{panel-lang}} {{panel-category}}
', -'area-result':'
{{result-links}}
{{result-history}}
{{result-subsearch}}
{{result-poweredby}}
', +'area-poweredby':'

_ link_poweredby

', +'area-result':'
{{result-links}}
{{result-history}}
{{result-subsearch}}
', 'area-stats':'
{{stats-table}}
', -'area-title':'

', +'area-title':'

', 'main-form':'
{{area-input}} {{area-parameters}}
', -'main':'{{area-title}} {{main-form}} {{area-stats}} {{area-result}} {{modal-*}}', +'main':'{{area-title}} {{main-form}} {{area-stats}} {{area-result}} {{area-poweredby}} {{modal-*}}', 'modal-help_mode':'', 'modal-help_periode':'', 'modal-help_ponderation':'', 'modal-loading':'', -'panel-base':'

_ title_filter_base _ filter_off

', -'panel-category':'

_ title_filter_category _ filter_off

', -'panel-corpus':'

_ title_filter_corpus _ filter_off

', -'panel-lang':'

_ title_filter_lang _ filter_off

', -'panel-options':'

_ title_options

_ mode_title

_ ponderation_title

_ periode_title

', +'panel-base':'
_ title_filter_base _ filter_off
', +'panel-category':'
_ title_filter_category _ filter_off
', +'panel-corpus':'
_ title_filter_corpus _ filter_off
', +'panel-lang':'
_ title_filter_lang _ filter_off
', +'panel-options':'
_ title_options

_ mode_title

_ ponderation_title

_ periode_title

', 'result-history':'

_ title_history

', -'result-links':'

_ title_share

_ title_download

ods csv

_ title_feed

atom

', -'result-poweredby':'

_ link_poweredby

', -'result-subsearch':'

_ title_subsearch

', +'result-links':'

_ title_share

_ title_download

ods csv

_ title_feed

atom

', +'result-subsearch':'

_ title_subsearch

', 'stats-filter':' _ stats_filter_short ', 'stats-global':' _ stats_global_short ', 'stats-result':' _ stats_result_short ', @@ -45,8 +45,8 @@ templates:{ 'lang':'

', 'loading':' {{>~scrutari_loc(\'_ loading_pagination\')}}', 'pagination_empty':'

{{>~scrutari_loc("_ result_none")}}

{{if withFilter}}

{{>~scrutari_loc("_ result_fitlerwarning")}}

{{else scrutariResult.searchMeta.reportArray.length > 0}}

Analyse des termes de la recherche{{>~scrutari_loc("_ colon")}}

{{for scrutariResult.searchMeta.reportArray}}
{{> text}}
{{if canonicalArray.length > 0}}

Correspondances trouvées (entre parenthèses, le nombre d\'occurrences par langue):

    {{for canonicalArray}}
  • {{> canonical}} ({{for langreportArray}}{{if #index > 0}}, {{/if}}{{:lang}}={{:ficheCount}}{{/for}})
    • {{/for}}
{{/if}} {{if neighbourArray.length > 0}}

Pas de correspondances trouvées. Termes se rapprochant (entre parenthèses, le code des langues concernées) :

    {{for neighbourArray}}
  • {{> neighbour}} ({{for langArray}}{{if #index > 0}}, {{/if}}{{:#data}}{{/for}})
    • {{/for}}
{{/if}} {{if canonicalArray.length == 0 && neighbourArray.length == 0}}

Aucune correspondance ou terme voisin trouvé

{{/if}}
{{/for}}
{{/if}}', -'pagination_groups':'
{{for array}} {{>title}} ({{:fichestat}}) {{/for}}
{{for array}}
{{/for}}', +'pagination_groups':'
{{for array}} {{/for}}
{{for array}}
{{/for}}', 'pagination_unique':'
', -'tabs':'
{{for tabArray}} {{if state===\'active\'}} {{>title}} {{else state===\'disabled\'}} {{>title}} {{else}} {{>title}} {{/if}} {{/for}}
' +'tabs':'
{{for tabArray}} {{if state===\'active\'}} {{else state===\'etc\'}} {{>title}} {{else}} {{/if}} {{/for}}
' } }; \ No newline at end of file diff --git a/squelettes/javascript/scrutarijs/perso.css b/squelettes/javascript/scrutarijs/perso.css index e1495d8..098f0d6 100644 --- a/squelettes/javascript/scrutarijs/perso.css +++ b/squelettes/javascript/scrutarijs/perso.css @@ -28,6 +28,17 @@ input[type="text"], input[type="search"] { } +/***************************************************** +* .scrutari-area : Surcharge de classes Scrutari par défaut +******************************************************/ + +.scrutari-area-Poweredby { + font-size: 0.8em; + text-align: center; + margin-top: 20px; + padding-bottom: 10px; +} + /***************************************************** * .scrutari-fiche : Surcharge de classes Scrutari par défaut ******************************************************/ @@ -63,6 +74,9 @@ input[type="text"], input[type="search"] { .scrutari-history-Block { display: inline-block; + padding: 2px; + margin-top: 6px; + margin-left: 6px; } .scrutari-history-Load, .scrutari-history-Remove { @@ -74,6 +88,10 @@ input[type="text"], input[type="search"] { text-rendering: geometricPrecision; } +.scrutari-history-Subsearch { + margin-left: 10px; +} + /***************************************************** * .scrutari-overlay : Surcharge de classes Scrutari par défaut @@ -100,13 +118,20 @@ input[type="text"], input[type="search"] { } .scrutari-overlay-button-Close { - margin-right: 1.5rem; - margin-top: 1.5rem; - border-radius: 00; - font-size: inherit; - color:#BDDDFE; - background-color: rgb(0, 81, 132); - border:1px solid #BDDDFE; + position: absolute; + display: block; + top: -12.5px; + right: -12.5px; + display: block; + width: 30px; + height: 30px; + margin-right: 1.5rem; + margin-top: 1.5rem; + border-radius: 00; + font-size: inherit; + color:#BDDDFE; + background-color: rgb(0, 81, 132); + border:1px solid #BDDDFE; } .scrutari-overlay-button-Close:hover { @@ -141,6 +166,21 @@ input[type="text"], input[type="search"] { font-size: 1.1em; } +.scrutari-pagination-Tab { + padding-left: 4px; + padding-right: 4px; + border: none; + background-color: transparent; + cursor: pointer; + color: #005184; +} + +.scrutari-pagination-Tab:disabled { + cursor: auto; + background-color: #648bab; + color: #fff; +} + /***************************************************** * .lav- : Classes spécifiques à la version diff --git a/squelettes/javascript/scrutarijs/scrutarijs.css b/squelettes/javascript/scrutarijs/scrutarijs.css index 264f79b..1f5223f 100644 --- a/squelettes/javascript/scrutarijs/scrutarijs.css +++ b/squelettes/javascript/scrutarijs/scrutarijs.css @@ -2,19 +2,21 @@ * .scrutari ******************************************************/ -.scrutari-Hidden { -display: none !important; +.scrutari-Disabled { + color: grey; } -.scrutari-Disabled { -color: grey; +.scrutari-Excluded { + text-decoration: line-through; + color: grey; +} + +.scrutari-Hidden { + display: none !important; } .scrutari-Mark { -background-color: #e9e9e9; -} - -.scrutari-On { + background-color: #e9e9e9; } @@ -23,25 +25,25 @@ background-color: #e9e9e9; ******************************************************/ .scrutari-fiche-Attribute { -margin-left: 15px; -font-size: 1.0em; -margin-bottom: 2px; + margin-left: 15px; + font-size: 1.0em; + margin-bottom: 2px; } .scrutari-fiche-AttributeBlock { -margin-bottom: 2px; + margin-bottom: 2px; } .scrutari-fiche-AttributeTitle { -margin-left: 15px; -font-size: 1.0em; -margin-bottom: 0; + margin-left: 15px; + font-size: 1.0em; + margin-bottom: 0; } .scrutari-fiche-AttributeValue { -margin-left: 30px; -font-size: 1.0em; -margin-bottom: 0; + margin-left: 30px; + font-size: 1.0em; + margin-bottom: 0; } .scrutari-fiche-AttributeValues { @@ -57,107 +59,86 @@ margin-bottom: 0; } .scrutari-fiche-Block { -margin-bottom: 15px; -padding-left: 3px; + margin-bottom: 15px; + padding-left: 3px; } .scrutari-fiche-Body { -margin-left: 21px; + margin-left: 21px; } .scrutari-fiche-Body.scrutari-fiche-ThumbnailBody { -margin-left: 110px; + margin-left: 110px; } .scrutari-fiche-Body::after { -content: ''; -display: block; -clear: left; + content: ''; + display: block; + clear: left; } .scrutari-fiche-Complement { -margin-left: 15px; -font-size: 1.0em; -margin-bottom: 2px; + margin-left: 15px; + font-size: 1.0em; + margin-bottom: 2px; } .scrutari-fiche-Icon { -float: left; -margin-top: 0; + float: left; + margin-top: 0; } .scrutari-fiche-Motcle { -font-variant: small-caps; -font-size: 1.0em; -margin-left: 15px; -margin-bottom: 2px; + font-variant: small-caps; + font-size: 1.0em; + margin-left: 15px; + margin-bottom: 2px; } .scrutari-fiche-Soustitre { -margin-bottom: 3px; -font-style: italic; -margin-left: 10px; + margin-bottom: 3px; + font-style: italic; + margin-left: 10px; } .scrutari-fiche-Thumbnail { -float: left; -margin-top: 0; -position: relative; + float: left; + margin-top: 0; + position: relative; } .scrutari-fiche-ThumbnailImg { -max-width: 100px; + max-width: 100px; } .scrutari-fiche-ThumbnailIcon { -display: block; -position: absolute; -top: 0; -left: 0; -border-right-color: #fff; -border-right-style: solid; -border-right-width: 3px; -border-bottom-color: #fff; -border-bottom-style: solid; -border-bottom-width: 2px; -background-color: #fff; -border-bottom-right-radius: 2px; -z-index: 100; + display: block; + position: absolute; + top: 0; + left: 0; + border-right-color: #fff; + border-right-style: solid; + border-right-width: 3px; + border-bottom-color: #fff; + border-bottom-style: solid; + border-bottom-width: 2px; + background-color: #fff; + border-bottom-right-radius: 2px; + z-index: 100; } .scrutari-fiche-Titre { -font-size: 1.1em; -margin-bottom: 4px; -margin-left: 0; -margin-top: 0; + font-size: 1.1em; + margin-bottom: 4px; + margin-left: 0; + margin-top: 0; } .scrutari-fiche-Year { -font-size: 1.0em; -margin-bottom: 3px; -font-style: italic; -margin-left: 15px; -} - - -/***************************************************** -* .scrutari-group -******************************************************/ - -.scrutari-group-Tab { -display: inline-block; -padding-left: 4px; -padding-right: 4px; -cursor: pointer; -} - -.scrutari-group-Tab:hover { -background-color: #e9e9e9; -} - -.scrutari-group-Tab.scrutari-On { -cursor: auto; -background-color: #e9e9e9; + font-size: 1.0em; + margin-bottom: 3px; + font-style: italic; + margin-left: 15px; } @@ -166,51 +147,33 @@ background-color: #e9e9e9; ******************************************************/ .scrutari-history-Active { -background-color: #e9e9e9; + background-color: #e9e9e9; } .scrutari-history-Block { -padding: 2px; -margin-top: 6px; -margin-left: 6px; -word-wrap: break-word; + word-wrap: break-word; } -.scrutari-history-Load { - -} - -.scrutari-history-Remove { - -} - -.scrutari-history-Search { - -} - -.scrutari-history-Subsearch { - margin-left: 10px; -} /***************************************************** * .scrutari-icon ******************************************************/ .scrutari-icon-Loader { -background-image: url("images/ajax-loader.gif"); -position: relative; -display: inline-block; -width: 16px; -height: 16px; + background-image: url("images/ajax-loader.gif"); + position: relative; + display: inline-block; + width: 16px; + height: 16px; } .scrutari-icon-Logo { -background-image: url("images/logo-scrutari.png"); -position: relative; -bottom: -10px; -display: inline-block; -width: 32px; -height: 32px; + background-image: url("images/logo-scrutari.png"); + position: relative; + bottom: -10px; + display: inline-block; + width: 32px; + height: 32px; } @@ -219,16 +182,16 @@ height: 32px; ******************************************************/ .scrutari-label-Attribute { -font-style: italic; + font-style: italic; } .scrutari-label-Complement { -font-style: italic; + font-style: italic; } .scrutari-label-Motcle { -font-style: italic; -font-variant: normal; + font-style: italic; + font-variant: normal; } @@ -236,76 +199,15 @@ font-variant: normal; * .scrutari-links ******************************************************/ -.scrutari-links-ButtonLike { -display: inline-block; -padding-top: 2px; -padding-right: 5px; -padding-left: 5px; -border-radius: 3px; -border-style: solid; -border-width: 1px; -border-color: #a0a0a0; -margin-right: 5px; -color: #515151; -} - -.scrutari-links-ButtonLike:visited { -color: #515151; -} - -.scrutari-links-ButtonLike:hover { -background-color: #dfdfdf; -color: #515151; -text-decoration: none; -} - .scrutari-links-Permalink { -text-overflow: ellipsis; -white-space: nowrap; -overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } .scrutari-links-Permalink:hover { -white-space: normal; -overflow-wrap: break-word; -} - -.scrutari-links-Poweredby { -font-size: 0.8em; -text-align: center; -margin-top: 20px; -} - -.scrutari-links-Title { -margin-top: 20px; -margin-bottom: 5px; -word-wrap: break-word; -font-weight: bold; -} - - - -/***************************************************** -* .scrutari-pagination -******************************************************/ - -.scrutari-pagination-TabList { -margin-top: 15px; -margin-bottom: 15px; -} - -.scrutari-pagination-Tab, .scrutari-pagination-Current, .scrutari-pagination-Disabled { -display: inline-block; -padding-left: 4px; -padding-right: 4px; -} - -.scrutari-pagination-Tab { -cursor: pointer; -} - -.scrutari-pagination-Current, .scrutari-pagination-Tab:hover { -background-color: #e9e9e9; + white-space: normal; + overflow-wrap: break-word; } @@ -314,20 +216,15 @@ background-color: #e9e9e9; ******************************************************/ .scrutari-panel-Active { -color: green; + color: green; } -.scrutari-panel-ColumnDisabled { -opacity: 0.5; -} - -.scrutari-panel-Excluded { -text-decoration: line-through; -color: grey; +.scrutari-panel-Columns.scrutari-Disabled { + opacity: 0.5; } .scrutari-panel-Icon { -vertical-align: baseline; + vertical-align: baseline; } @@ -344,7 +241,6 @@ vertical-align: baseline; padding: 20px; box-sizing: border-box; background-color: rgba(0,0,0, 0.75); - text-align: center; display: flex; flex-direction: column; justify-content: center; @@ -352,41 +248,21 @@ vertical-align: baseline; } .scrutari-overlay-Component_content { - padding: 10px 20px; - text-align: left; - font-size: 90%; min-width: 20vw; max-width: 90vw; max-height: 70vh; overflow: auto; - background-color: #fff; } .scrutari-overlay-Component_dialog { position: relative; box-sizing: border-box; - background: #fff; + background-color: #fff; box-shadow: 0 0 10px #000; - text-align: left; -} - -.scrutari-overlay-Component_footer { - clear: both; - padding-bottom: 8px; - padding-top: 8px; - padding-left: 10px; - padding-right: 10px; - text-align: right; } .scrutari-overlay-Component_header { - text-align: left; - font-size: large; min-height: 10px; - padding-top: 20px; - padding-bottom: 20px; - padding-left: 10px; - padding-right: 10px; } .scrutari-overlay-Waiting { @@ -394,91 +270,26 @@ vertical-align: baseline; } -/******************************************************************************* -* .overlay-button- -*******************************************************************************/ - -.scrutari-overlay-button-Close { - position: absolute; - top: -12.5px; - right: -12.5px; - display: block; - width: 30px; - height: 30px; - border-radius: 15px; - border: none; - font-size: 20px; - background-color: #000; - color: #fff; -} - -.scrutari-overlay-button-Close:hover { - background-color: #ddd; -} - - /***************************************************** * .scrutari-stats ******************************************************/ -.scrutari-stats-Table { - margin-bottom: 5px; -} - .scrutari-stats-Abbr { -text-decoration: none; -} - -.scrutari-stats-Count { -font-family: monospace; -font-weight: bold; -text-align: right; + text-decoration: none; } .scrutari-stats-Filter { -color: green; + color: green; } .scrutari-stats-None { -color: red; -} - -.scrutari-stats-Titles { -font-size: 0.9em; -padding-left: 10px; + color: red; } .scrutari-stats-Cell { -vertical-align: baseline; + vertical-align: baseline; } .scrutari-stats-Number { -text-align: right; -padding-left: 10px; -padding-right: 3px; -} - - -/***************************************************** -* .scrutari-subsearch -******************************************************/ - -.scrutari-subsearch-Title { -margin-top: 0; -margin-bottom: 0; -} -.scrutari-subsearch-Form { -margin-top: 0; -margin-bottom: 25px; -} - - -/***************************************************** -* .scrutari-title -******************************************************/ - -.scrutari-title-Main { -font-size: 1.3em; -margin-top: 20px; -margin-bottom: 10px; + text-align: right; } \ No newline at end of file diff --git a/squelettes/javascript/scrutarijs/scrutarijs.js b/squelettes/javascript/scrutarijs/scrutarijs.js index f22607e..1e3299b 100644 --- a/squelettes/javascript/scrutarijs/scrutarijs.js +++ b/squelettes/javascript/scrutarijs/scrutarijs.js @@ -1,4 +1,4 @@ -/* version: 4198 */ +/* version: 4209 */ var Scrutari = {}; Scrutari.log = function (msg) { if ((console) && (console.log)) { @@ -1092,7 +1092,7 @@ Scrutari.Utils.getTabArray = function (ficheCount, paginationLength, currentPagi result.push({ number: 0, title: "…", - state: 'disabled' + state: 'etc' }); } for(var i = paginationNumberStart; i <= paginationNumberEnd; i++) { @@ -1110,7 +1110,7 @@ Scrutari.Utils.getTabArray = function (ficheCount, paginationLength, currentPagi result.push({ number: 0, title: "…", - state: 'disabled' + state: 'etc' }); } return result; @@ -1985,7 +1985,12 @@ Scrutari.History.prototype.setCurrentResult = function (scrutariResult, searchOr fichestat: scrutariResult.getFicheCount(), sequence: Scrutari.Utils.formatSearchSequence(client, scrutariResult) }; - $historyListBlock.prepend(client.render("history", contextObj)); + let html = client.render("history", contextObj); + if (client.options.historyAtLast) { + $historyListBlock.append(html); + } else { + $historyListBlock.prepend(html); + } } }; Scrutari.History.prototype.removeHistory = function (historyName) { @@ -2056,6 +2061,7 @@ Scrutari.Client = function (scrutariConfig, clientId) { ignoreThumbnail: false, ficheBodyList: null, mainTitle: null, + historyAtLast: false, hooks: {}, functions: { uiInit: null @@ -2079,15 +2085,14 @@ Scrutari.Client = function (scrutariConfig, clientId) { }; this.cssClasses = { disabled: "scrutari-Disabled", + excluded: "scrutari-Excluded", hidden: "scrutari-Hidden", mark: "scrutari-Mark", on: "scrutari-On", activeHistory: "scrutari-history-Active", activePanel: "scrutari-panel-Active", - excludedPanel: "scrutari-panel-Excluded", filterStat: "scrutari-stats-Filter", - noneStat: "scrutari-stats-None", - disabledPanelColumn: "scrutari-panel-ColumnDisabled" + noneStat: "scrutari-stats-None" }; this._locInstance = new Scrutari.Loc(); this._ignoreArray = new Array(); @@ -2246,9 +2251,6 @@ Scrutari.Client.prototype.$count = function (name, action, value) { Scrutari.Client.prototype.$form = function (name) { return this.$({scrutariForm: name}); }; -Scrutari.Client.prototype.$group = function (name) { - return this.$({scrutariGroup: name}); -}; Scrutari.Client.prototype.$hidden = function (name, action) { var $hidden = this.$({scrutariHidden: name}); if (action) { @@ -2447,13 +2449,6 @@ Scrutari.Client.prototype.initButtons = function (actionHandler) { case 'clearHistory': client.history.clear(); break; - case 'toggleBlock': - if (Scrutari.Utils.toggle($(button), "scrutariState") === 'on') { - client.show(client.$block(target)); - } else { - client.hide(client.$block(target)); - } - break; case 'ficheGroupTab': _ficheGroupTab(target); break; @@ -2481,12 +2476,7 @@ Scrutari.Client.prototype.initButtons = function (actionHandler) { } }); client.$button("ficheGroupTab").each(function (index, element) { - let onClass = client.cssClasses.on; - if (element.dataset.scrutariTarget === target) { - element.classList.add(onClass); - } else { - element.classList.remove(onClass); - } + element.disabled = (element.dataset.scrutariTarget === target); }); } function _paginationTab (button) { @@ -3093,28 +3083,24 @@ Scrutari.DefaultUi.init = function (client) { if (langSortFunction) { langArray = langArray.sort(langSortFunction); } - Scrutari.Utils.divideIntoColumns(langArray, client.$group("langColumns"), client.getTemplate("lang")); - client.$panel('lang', 'show'); + Scrutari.DefaultUi.initColumns(client, langArray,"lang"); } if ((scrutariMeta.withCategory()) && (Scrutari.exists(client.$panel('category')))) { var categoryArray = scrutariMeta.getCategoryArray(Scrutari.Utils.getCategorySortFunction(client.options.categorySort, locales)); - Scrutari.Utils.divideIntoColumns(categoryArray, client.$group("categoryColumns"), client.getTemplate("category")); - client.$panel('category', 'show'); + Scrutari.DefaultUi.initColumns(client, categoryArray, "category"); } if (client.options.withCorpus) { if (Scrutari.exists(client.$panel('corpus'))) { var corpusArray = scrutariMeta.getCorpusArray(Scrutari.Utils.getCorpusSortFunction(client.options.corpusSort, locales)); if (corpusArray.length > 1) { - Scrutari.Utils.divideIntoColumns(corpusArray, client.$group("corpusColumns"), client.getTemplate("corpus")); - client.$panel('corpus', 'show'); + Scrutari.DefaultUi.initColumns(client, corpusArray, "corpus"); } } } else { if (Scrutari.exists(client.$panel('base'))) { var baseArray = scrutariMeta.getBaseArray(Scrutari.Utils.getBaseSortFunction(client.options.baseSort, locales)); if (baseArray.length > 1) { - Scrutari.Utils.divideIntoColumns(baseArray, client.$group("baseColumns"), client.getTemplate("base")); - client.$panel('base', 'show'); + Scrutari.DefaultUi.initColumns(client, baseArray, "base"); } } } @@ -3270,7 +3256,7 @@ Scrutari.DefaultUi.actionHandler = function (client, button, action, target) { var state = Scrutari.Utils.toggle($button, "scrutariState"); _enableChekButtons(); Scrutari.Utils.toggle.classes($button, state, client.cssClasses.on, ""); - Scrutari.Utils.toggle.classes(client.$group(target + "Columns"), state, "", client.cssClasses.disabledPanelColumn); + Scrutari.Utils.toggle.classes(client.$block("columnsBlock", target), state, "", client.cssClasses.disabled); Scrutari.Utils.toggle.text($button.children("span"), "scrutariAlternate"); var $filterLabel = client.$label(target + "Filter"); Scrutari.Utils.toggle.text($filterLabel, "scrutariAlternate"); @@ -3343,6 +3329,10 @@ Scrutari.DefaultUi.initFilter = function (client, target, checkedArray) { client.$button("enablePanel", target).click(); } }; +Scrutari.DefaultUi.initColumns = function (client, array, name) { + Scrutari.Utils.divideIntoColumns(array, client.$block("columnsBlock", name).children("div"), client.getTemplate(name)); + client.$panel(name, 'show'); +}; Scrutari.DefaultUi.filterChange = function (client) { var globalFicheCount = client.scrutariMeta.getGlobalFicheCount(); var filterState = client.buildFilterState(); @@ -3408,18 +3398,18 @@ Scrutari.DefaultUi.filterChange = function (client) { var key = element.dataset.scrutariStatKey; var ficheCount = client.stats.getFicheCount(type, key); var $statTitle = Scrutari.$parents($el, {scrutariComponent: "stat-text"}); - let excludedPanelClass = client.cssClasses.excludedPanel; + let excludedClass = client.cssClasses.excluded; if (ficheCount != element.dataset.scrutariStatDefault) { if (ficheCount === 0) { $el.html(""); - $statTitle.addClass(excludedPanelClass); + $statTitle.addClass(excludedClass); } else { - $statTitle.removeClass(excludedPanelClass); + $statTitle.removeClass(excludedClass); $el.html(client.formatNumber(ficheCount) + " / "); } } else { $el.html(""); - $statTitle.removeClass(excludedPanelClass); + $statTitle.removeClass(excludedClass); } }); }