diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 1b41d6868e..3ac74c93c3 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -9627,7 +9627,7 @@ web/thesaurus/export-topics.html.twig web/thesaurus/accept.html.twig web/thesaurus/accept.html.twig - web/thesaurus/properties.html.twig + web/thesaurus/properties.html.twig web/thesaurus/link-field-step3.html.twig web/common/dialog_export.html.twig web/lightbox/sc_note.html.twig @@ -13418,7 +13418,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben thesaurus:: Confirmer la suppression du terme %s Das Löschen des Begriffes "%s" bestätigen - web/thesaurus/properties.html.twig + web/thesaurus/properties.html.twig thesaurus:: Editer le thesaurus @@ -13647,16 +13647,6 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben erzeugte Datei am %date% Controller/Thesaurus/ThesaurusController.php - - thesaurus:: hits - Ergebnisse - web/thesaurus/properties.html.twig - - - thesaurus:: ids - Benutzernamen - web/thesaurus/properties.html.twig - thesaurus:: langue par default Standardmässige Sprache @@ -13717,6 +13707,11 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben Keine Wieder Indexierung web/thesaurus/link-field-step2.html.twig + + thesaurus:: populate button + thesaurus:: populate button + web/thesaurus/thesaurus.html.twig + thesaurus:: presentation Anzeigeoptionen @@ -13906,12 +13901,12 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben thesaurus::populate: Warning populate is in process to indexing databox thesaurus::populate: Warning populate is in process to indexing databox - web/thesaurus/thesaurus.html.twig + web/thesaurus/thesaurus.html.twig thesaurus::populate: success message thesaurus::populate: success message - web/thesaurus/thesaurus.html.twig + web/thesaurus/thesaurus.html.twig thesaurus:dialog:: export @@ -13923,6 +13918,11 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben thesaurus:dialog:: properties web/thesaurus/thesaurus.html.twig + + thesaurus:termePorperties:termeId + thesaurus:termePorperties:termeId + web/thesaurus/properties.html.twig + thumbnail validation Miniaturansicht Bestätigung diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 8a5a89646c..fa96551c02 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -9630,7 +9630,7 @@ web/thesaurus/export-topics.html.twig web/thesaurus/accept.html.twig web/thesaurus/accept.html.twig - web/thesaurus/properties.html.twig + web/thesaurus/properties.html.twig web/thesaurus/link-field-step3.html.twig web/common/dialog_export.html.twig web/lightbox/sc_note.html.twig @@ -12197,19 +12197,19 @@ It is possible to place several search areas Type a subtitle actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: End time - End + End actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: No caption message - No Subtitle set for this language + No Subtitle set for this language actions/Tools/videoEditor.html.twig - + prod:videoeditor:subtitletab:: Show for - Duration + Duration actions/Tools/videoEditor.html.twig @@ -13393,7 +13393,7 @@ It is possible to place several search areas Thesaurus has been updated web/thesaurus/load-thesaurus.html.twig - + thesaurus: Populate title Indexing web/thesaurus/thesaurus.html.twig @@ -13426,7 +13426,7 @@ It is possible to place several search areas thesaurus:: Confirmer la suppression du terme %s Confirm term "%s" delete - web/thesaurus/properties.html.twig + web/thesaurus/properties.html.twig thesaurus:: Editer le thesaurus @@ -13528,7 +13528,7 @@ It is possible to place several search areas starts with web/thesaurus/thesaurus.html.twig - + thesaurus:: confirm populate Launch databases indexing web/thesaurus/thesaurus.html.twig @@ -13655,16 +13655,6 @@ It is possible to place several search areas Generated file on %date% Controller/Thesaurus/ThesaurusController.php - - thesaurus:: hits - hits - web/thesaurus/properties.html.twig - - - thesaurus:: ids - ids - web/thesaurus/properties.html.twig - thesaurus:: langue par default Default language @@ -13725,6 +13715,11 @@ It is possible to place several search areas No re-index web/thesaurus/link-field-step2.html.twig + + thesaurus:: populate button + Indexing + web/thesaurus/thesaurus.html.twig + thesaurus:: presentation Display options @@ -13849,7 +13844,7 @@ It is possible to place several search areas thesaurus::menu: Mettre dans le stock - Place in the stock + Move to the stock web/thesaurus/thesaurus.html.twig @@ -13911,27 +13906,31 @@ It is possible to place several search areas web/thesaurus/properties.html.twig web/thesaurus/thesaurus.html.twig - + thesaurus::populate: Warning populate is in process to indexing databox - Warning populate is in process to indexing databox, -Wait the end of this indexing, before launch a new one. - web/thesaurus/thesaurus.html.twig + Warning populate is in process to indexing databox. Wait the end of this indexing, before launch a new one. + web/thesaurus/thesaurus.html.twig thesaurus::populate: success message thesaurus::populate: success message - web/thesaurus/thesaurus.html.twig + web/thesaurus/thesaurus.html.twig thesaurus:dialog:: export - Candidats export + Export Candidats web/thesaurus/thesaurus.html.twig - + thesaurus:dialog:: properties Properties web/thesaurus/thesaurus.html.twig + + thesaurus:termePorperties:termeId + Id + web/thesaurus/properties.html.twig + thumbnail validation Confirm thumbnail diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index ec3cb5ada4..6604467592 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -9630,7 +9630,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/thesaurus/export-topics.html.twig web/thesaurus/accept.html.twig web/thesaurus/accept.html.twig - web/thesaurus/properties.html.twig + web/thesaurus/properties.html.twig web/thesaurus/link-field-step3.html.twig web/common/dialog_export.html.twig web/lightbox/sc_note.html.twig @@ -13396,7 +13396,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles Le thésaurus a été mis à jour web/thesaurus/load-thesaurus.html.twig - + thesaurus: Populate title Indéxation web/thesaurus/thesaurus.html.twig @@ -13429,7 +13429,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles thesaurus:: Confirmer la suppression du terme %s Confirmer la suppression du terme "%s" - web/thesaurus/properties.html.twig + web/thesaurus/properties.html.twig thesaurus:: Editer le thesaurus @@ -13531,7 +13531,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles commence par web/thesaurus/thesaurus.html.twig - + thesaurus:: confirm populate Lancer une indexation de l'intégralité de la base web/thesaurus/thesaurus.html.twig @@ -13658,16 +13658,6 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles Fichier généré le %date% Controller/Thesaurus/ThesaurusController.php - - thesaurus:: hits - hits - web/thesaurus/properties.html.twig - - - thesaurus:: ids - Nom de l'utilisateur - web/thesaurus/properties.html.twig - thesaurus:: langue par default Langue par défaut @@ -13728,6 +13718,11 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles Pas de ré-indexation web/thesaurus/link-field-step2.html.twig + + thesaurus:: populate button + Indexation + web/thesaurus/thesaurus.html.twig + thesaurus:: presentation Options d'affichage @@ -13850,7 +13845,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles Tout fermer (navigable) web/thesaurus/export-topics-dialog.html.twig - + thesaurus::menu: Mettre dans le stock Déplacer dans le stock web/thesaurus/thesaurus.html.twig @@ -13914,27 +13909,31 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles web/thesaurus/properties.html.twig web/thesaurus/thesaurus.html.twig - + thesaurus::populate: Warning populate is in process to indexing databox - Attention une indexation de la base est deja en cours. -Il est nécéssaire d'attendre la fin de cette indexation pour en relancer une nouvelle - web/thesaurus/thesaurus.html.twig + Attention une indexation de la base est deja en cours. Il est nécéssaire d'attendre la fin de cette indexation pour en relancer une nouvelle. + web/thesaurus/thesaurus.html.twig thesaurus::populate: success message thesaurus::populate: success message - web/thesaurus/thesaurus.html.twig + web/thesaurus/thesaurus.html.twig - + thesaurus:dialog:: export Export des termes candidats web/thesaurus/thesaurus.html.twig - + thesaurus:dialog:: properties Propriétés web/thesaurus/thesaurus.html.twig + + thesaurus:termePorperties:termeId + ID + web/thesaurus/properties.html.twig + thumbnail validation Validation de la vignette diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index b62b31a6ce..453cf56d46 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -9637,7 +9637,7 @@ web/thesaurus/export-topics.html.twig web/thesaurus/accept.html.twig web/thesaurus/accept.html.twig - web/thesaurus/properties.html.twig + web/thesaurus/properties.html.twig web/thesaurus/link-field-step3.html.twig web/common/dialog_export.html.twig web/lightbox/sc_note.html.twig @@ -13427,7 +13427,7 @@ thesaurus:: Confirmer la suppression du terme %s Bevestig verwijderinng van de term %s - web/thesaurus/properties.html.twig + web/thesaurus/properties.html.twig thesaurus:: Editer le thesaurus @@ -13656,16 +13656,6 @@ thesaurus:: fichier genere le %date% Controller/Thesaurus/ThesaurusController.php - - thesaurus:: hits - Hits - web/thesaurus/properties.html.twig - - - thesaurus:: ids - Ids - web/thesaurus/properties.html.twig - thesaurus:: langue par default Default taal @@ -13726,6 +13716,11 @@ Geen herindexatie web/thesaurus/link-field-step2.html.twig + + thesaurus:: populate button + thesaurus:: populate button + web/thesaurus/thesaurus.html.twig + thesaurus:: presentation Presentatie @@ -13915,12 +13910,12 @@ thesaurus::populate: Warning populate is in process to indexing databox thesaurus::populate: Warning populate is in process to indexing databox - web/thesaurus/thesaurus.html.twig + web/thesaurus/thesaurus.html.twig thesaurus::populate: success message thesaurus::populate: success message - web/thesaurus/thesaurus.html.twig + web/thesaurus/thesaurus.html.twig thesaurus:dialog:: export @@ -13932,6 +13927,11 @@ thesaurus:dialog:: properties web/thesaurus/thesaurus.html.twig + + thesaurus:termePorperties:termeId + thesaurus:termePorperties:termeId + web/thesaurus/properties.html.twig + thumbnail validation thumbnail goedkeuring diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index ad0069ab04..3b6c8979f1 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index f545aa3b4d..da01b0a9ed 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index 0ff28fc224..409b81d1f9 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index dbf80183e1..c7e8765468 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/www/thesaurus/images/caret-right-solid-grey.svg b/resources/www/thesaurus/images/caret-right-solid-grey.svg new file mode 100644 index 0000000000..fdb08248f8 --- /dev/null +++ b/resources/www/thesaurus/images/caret-right-solid-grey.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/thesaurus/images/caret-right-solid.svg b/resources/www/thesaurus/images/caret-right-solid.svg new file mode 100644 index 0000000000..3a94fb933c --- /dev/null +++ b/resources/www/thesaurus/images/caret-right-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/www/thesaurus/styles/main.scss b/resources/www/thesaurus/styles/main.scss index d50b9d9270..96a602ee38 100644 --- a/resources/www/thesaurus/styles/main.scss +++ b/resources/www/thesaurus/styles/main.scss @@ -1,6 +1,6 @@ $blue-tsr: #2196f3; $grey-tsr: #aaa; - +$iconsPath: '../../../assets/thesaurus/images/'; @mixin blue-btn { color: #fff; background: $blue-tsr; @@ -275,17 +275,13 @@ H3, H4 { .menu { FONT-FAMILY: Arial, helvetica, sans-serif; font-size: 12px; - border-left: 1px solid #ffffff; - border-top: 1px solid #ffffff; - border-right: 2px solid #000000; - border-bottom: 2px solid #000000; padding: 0px; margin: 0px; visibility: hidden; position: absolute; - top: 0px; - left: 0px; - background-color: #d4d0c8; + top: 0; + left: 0; + background-color: #535353; } .menu IMG { @@ -299,19 +295,19 @@ H3, H4 { position: relative; } -.menu A { +.menu a { font-size: 12px; display: block; position: relative; text-decoration: none; - color: #000000; - padding-top: 1px; - padding-bottom: 1px; - padding-left: 13px; - padding-right: 3px; - overflow: hidden; - border: none 0px #FFFFFF; - white-space: nowrap; + color: #fff; + padding: 5px 6px 5px 16px; + background-image: url('#{$iconsPath}caret-right-solid.svg'); + background-size: 5px; + background-position: 5px; + background-color: #535353; + background-repeat: no-repeat; + } .menu A:hover { @@ -320,7 +316,7 @@ H3, H4 { position: relative; text-decoration: none; color: #ffffff; - background-color: #000080; + background-color: #884c92; } .menu A.disabled { @@ -328,12 +324,9 @@ H3, H4 { display: block; position: relative; text-decoration: none; - color: #A0A0A0; - padding-top: 1px; - padding-bottom: 1px; - padding-left: 13px; - padding-right: 3px; + color: lighten(#535353, 10%); overflow: hidden; + background-image: url('#{$iconsPath}caret-right-solid-grey.svg'); } .menu A.disabled:hover { @@ -341,8 +334,8 @@ H3, H4 { display: block; position: relative; text-decoration: none; - color: #A0A0A0; - background-color: #d4d0c8; + color: lighten(#535353, 5%); + background-color: #535353; } .menu .line { @@ -398,15 +391,17 @@ H3, H4 { &:nth-child(1) { @include grey-btn } - &:nth-child(2) { + &:nth-child(2) { @include blue-btn } } } + .text-center { text-align: center; padding-bottom: 10px; } + .populate_btn { position: absolute; background: $blue-tsr; @@ -417,10 +412,21 @@ H3, H4 { color: #fff; padding: 7px 10px; font-weight: bold; - border: 1px solid #d0d0d0; + border: 1px solid #d0d0d0; cursor: pointer; &:hover { background: darken($blue-tsr, 20%); } +} + +.thesaurus-page { + .ui-widget-header { + border: 1px solid darken(#884c92, 20%); + background: #884c92; + border-top-left-radius: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + } } \ No newline at end of file diff --git a/templates/web/thesaurus/properties.html.twig b/templates/web/thesaurus/properties.html.twig index 33d3732fcf..87de82a6ca 100644 --- a/templates/web/thesaurus/properties.html.twig +++ b/templates/web/thesaurus/properties.html.twig @@ -65,9 +65,7 @@     {{ 'thesaurus:: synonymes' | trans }} - {{ 'thesaurus:: hits' | trans }} - {{ 'thesaurus:: ids' | trans }} - + {{ 'thesaurus:termePorperties:termeId' | trans }} @@ -98,7 +96,6 @@ {% endif %} {{ data['t'] }} - {{ data['hits'] }} {{ data['id'] }} diff --git a/templates/web/thesaurus/thesaurus.html.twig b/templates/web/thesaurus/thesaurus.html.twig index 7574aadd64..8d33e0b25f 100644 --- a/templates/web/thesaurus/thesaurus.html.twig +++ b/templates/web/thesaurus/thesaurus.html.twig @@ -223,7 +223,7 @@
- Populate + {{ 'thesaurus:: populate button' | trans }}
@@ -1535,6 +1535,8 @@ $('.cancel_button').click(function () { $('.close-dialog').trigger('click'); }); + $('#CTERMS').find('.OB').addClass('ob').removeClass('OB'); + $('#THP_C').html('+'); }