diff --git a/squelettes/content/scrutarijs.html b/squelettes/content/scrutarijs.html index 9de2c76..35c3d31 100644 --- a/squelettes/content/scrutarijs.html +++ b/squelettes/content/scrutarijs.html @@ -40,48 +40,51 @@ Structure du client -
+ -
- - +
+ + + + +
-
- Option de recherche avancée -
+
+ Option de recherche avancée +

Relations : - - - + + +

Priorité : - - + +

Période : - +

Élargir : - - + +

@@ -92,25 +95,25 @@ Structure du client

Votre recherche :

-

+

-
+

Filtrer les résultats : - - () - - () - - () + + () + + () + + ()

-
- Votre historique : -
+
+ Votre historique : +
- +
@@ -124,7 +127,7 @@ Structure du client

-
+

Vos résultats

@@ -138,7 +141,6 @@ Structure du client -
diff --git a/squelettes/javascript/scrutarijs/frameworks/_default.js b/squelettes/javascript/scrutarijs/frameworks/_default.js index 426df1c..2c3f6c0 100644 --- a/squelettes/javascript/scrutarijs/frameworks/_default.js +++ b/squelettes/javascript/scrutarijs/frameworks/_default.js @@ -1,12 +1,12 @@ var SCRUTARI_HTML = { _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-stats':'
{{stats-table}}
', 'area-title':'

', -'main-form':' {{area-input}} {{area-parameters}} ', +'main-form':'
{{area-input}} {{area-parameters}}
', 'main':'{{area-title}} {{main-form}} {{area-stats}} {{area-result}} {{modal-*}}', 'modal-help_mode':'', 'modal-help_periode':'', @@ -16,11 +16,11 @@ structure:{ '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-options':'

_ title_options

_ mode_title

_ ponderation_title

_ periode_title

', 'result-history':'
', 'result-links':'

ods csv

atom

', 'result-poweredby':'', -'result-subsearch':'

_ title_subsearch

', +'result-subsearch':'

_ title_subsearch

', 'stats-filter':' _ stats_filter_short ', 'stats-global':' _ stats_global_short ', 'stats-result':' _ stats_result_short ', diff --git a/squelettes/javascript/scrutarijs/perso.css b/squelettes/javascript/scrutarijs/perso.css index c6b2a8c..e1495d8 100644 --- a/squelettes/javascript/scrutarijs/perso.css +++ b/squelettes/javascript/scrutarijs/perso.css @@ -11,6 +11,11 @@ kbd { font-size: 14px; } +input[type="text"], input[type="search"] { + background-color: #edf1f5; + color: #005184; +} + @@ -70,16 +75,6 @@ kbd { } -/***************************************************** -* .scrutari-input : Surcharge de classes Scrutari par défaut -******************************************************/ - -.scrutari-input-Text { - background-color: #edf1f5; - color: #005184; -} - - /***************************************************** * .scrutari-overlay : Surcharge de classes Scrutari par défaut ******************************************************/ @@ -148,95 +143,90 @@ kbd { /***************************************************** -* .scrutari-lav- : Classes spécifiques à la version +* .lav- : Classes spécifiques à la version * pour Libre à vous ******************************************************/ -.scrutari-lav-Filtre { +.lav-Filtre { padding-bottom: 5px; border-bottom: solid 1px #eaeef3; } -.scrutari-lav-FiltreLabel { +.lav-FiltreLabel { display: inline-block; margin-left: 5px; } -.scrutari-lav-Input { - display: grid; - grid-template-columns: 1fr max-content; - column-gap: 30px; -} - -.scrutari-lav-Operateur { +.lav-Operateur { color: #acd0f9; } -.scrutari-lav-Sequence { +.lav-Sequence { font-size: 2.5em; margin-bottom: 15px; } -.scrutari-lav-Submit { - background: #f7651a; - color: #FFF !important; -} - -.scrutari-lav-TitreResultats { +.lav-TitreResultats { margin-bottom: 25px; margin-top: 50px; } -.scrutari-lav-Total { +.lav-Total { font-size: 0.85em; } /***************************************************** -* .scrutari-lav-details- : Options de recherche +* .lav-details- : Options de recherche ******************************************************/ -.scrutari-lav-details-Container { +.lav-details-Container { border-bottom: solid 1px #eaeef3; margin-top: 10px; padding-bottom: 10px; margin-bottom: 35px; } -.scrutari-lav-details-Body { +.lav-details-Body { padding-left: 15px; margin-top: 10px; display: grid; grid-template-columns: max-content; } -.scrutari-lav-details-Body p { +.lav-details-Body p { border-bottom: solid 1px #eaeef3; margin: 0; padding-top: 4px; padding-bottom: 4px; } -.scrutari-lav-details-Body button { +.lav-details-Body button { background: transparent; padding: 0; margin: 0; border: none; } -.scrutari-lav-details-Body .fas { +.lav-details-Body .fas { color: #acd0f9; } -.scrutari-lav-details-Body .fas:hover { +.lav-details-Body .fas:hover { color: #00c4f5; } -.scrutari-lav-details-Body p:last-child { +.lav-details-Body p:last-child { border-bottom: none; } -.scrutari-lav-details-Summary { +.lav-details-Input { + border-color: #bbbcbc; + border-style: solid; + border-width: 1px; +} + +.lav-details-Summary { cursor: pointer; font-family: 'Metropolis',sans-serif; font-weight: 700; @@ -244,10 +234,10 @@ kbd { /***************************************************** -* .scrutari-lav-history- : Historique +* .lav-history- : Historique ******************************************************/ -.scrutari-lav-history-Container { +.lav-history-Container { display: flex; align-items: baseline; padding-top: 5px; @@ -256,27 +246,56 @@ kbd { margin-bottom: 5px; } -.scrutari-lav-history-List { +.lav-history-List { flex-grow: 1; } -.scrutari-lav-history-Label { +.lav-history-Label { flex-shrink: 0; } -.scrutari-lav-history-Clear { +.lav-history-Clear { flex-shrink: 0; background-color: transparent; } -.scrutari-lav-history-Clear .fas { +.lav-history-Clear .fas { color: #acd0f9; } -.scrutari-lav-history-Clear .fas:hover { +.lav-history-Clear .fas:hover { color: #00c4f5; } +/***************************************************** +* .lav-input- : Traitement +******************************************************/ +.lav-input-Area { + display: grid; + grid-template-columns: 1fr max-content; + column-gap: 30px; +} +.lav-input-Block { + display: flex; + align-items: center; + padding: 5px; + border-color: #bbbcbc; + border-style: solid; + border-width: 1px; + background-color: #edf1f5; +} + +.lav-input-Field { + border: none; + flex-grow: 1; + margin-left: 5px +} + +.lav-input-Submit { + background: #f7651a; + color: #FFF !important; + font-weight: 700; +} diff --git a/squelettes/javascript/scrutarijs/scrutarijs.css b/squelettes/javascript/scrutarijs/scrutarijs.css index 97f27b6..264f79b 100644 --- a/squelettes/javascript/scrutarijs/scrutarijs.css +++ b/squelettes/javascript/scrutarijs/scrutarijs.css @@ -18,54 +18,6 @@ background-color: #e9e9e9; } -/***************************************************** -* .scrutari-area -******************************************************/ - -.scrutari-area-Parameters { -margin-top: 5px; -margin-bottom: 25px; -} - -.scrutari-area-Result { -margin-bottom: 10px; -} - -.scrutari-area-Stats { -margin-top: 15px; -margin-bottom: 15px; -} - -.scrutari-area-Title { -} - -.scrutari-area-Resubmit { -margin-top: 5px; -text-align: right; -} - - -/***************************************************** -* .scrutari-category -******************************************************/ - -.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; -} - - /***************************************************** * .scrutari-fiche ******************************************************/ @@ -188,6 +140,27 @@ 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; +} + + /***************************************************** * .scrutari-history ******************************************************/ @@ -241,22 +214,6 @@ height: 32px; } -/***************************************************** -* .scrutari-input -******************************************************/ - -.scrutari-input-Text { -border-bottom-left-radius: 4px; -border-top-left-radius: 4px; -padding: 2px; -border-style: solid; -border-width: 1px; -border-color: #dfdfdf; -border-top-color: #a0a0a0; -border-left-color: #a0a0a0; -} - - /***************************************************** * .scrutari-label ******************************************************/ diff --git a/squelettes/javascript/scrutarijs/scrutarijs.js b/squelettes/javascript/scrutarijs/scrutarijs.js index f87e49b..f22607e 100644 --- a/squelettes/javascript/scrutarijs/scrutarijs.js +++ b/squelettes/javascript/scrutarijs/scrutarijs.js @@ -1,4 +1,4 @@ -/* version: 4195 */ +/* version: 4198 */ var Scrutari = {}; Scrutari.log = function (msg) { if ((console) && (console.log)) { @@ -2981,7 +2981,7 @@ Scrutari.Process.prototype.processEmpty = function ($paginationBlock) { var scrutariResult = this.scrutariResult; client.$hidden("empty", 'hide'); let withFilter; - if (searchOrigin === "subsearch") { + if (this.searchOrigin === "subsearch") { withFilter = true; } else { withFilter = Scrutari.Utils.hasFilter(scrutariResult.requestParameters);