diff --git a/package.json b/package.json index 4b89b778ce..fc730f3db4 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.77-d", + "phraseanet-production-client": "0.34.80-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index e33805ddeb..f6f73c85c8 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. @@ -9940,6 +9940,21 @@ Änderungen wurden hergestellt admin/databox/databox.html.twig + + generate_cterms + generate_cterms + admin/fields/templates.html.twig + + + gui_editable + gui_editable + admin/fields/templates.html.twig + + + gui_visible + gui_visible + admin/fields/templates.html.twig + help::help-section-bullet: check-spelling Vergewissern Sie sich, dass kein Schreibfehler oder Tippfehler vorliegt @@ -10082,9 +10097,15 @@ Die Dienstleistung wird in einige Minuten wieder verfügbar sein. actions/Bridge/deactivated.html.twig + + lightbox::list + lightbox::list + mobile/lightbox/validate.html.twig + lightbox::recaptitulatif Übersicht + mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig web/lightbox/validate.html.twig @@ -13131,7 +13152,7 @@ validation:: note Kommentare - mobile/lightbox/sc_note.html.twig + mobile/lightbox/sc_note.html.twig validation:: votre note @@ -13141,8 +13162,8 @@ validation::envoyer mon rapport Meinen Bericht senden - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/basket_options.html.twig web/lightbox/basket_options.html.twig diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 4392499d5e..2bdfd5b0cd 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. @@ -9940,6 +9940,21 @@ Modifications done admin/databox/databox.html.twig + + generate_cterms + generate_cterms + admin/fields/templates.html.twig + + + gui_editable + gui_editable + admin/fields/templates.html.twig + + + gui_visible + gui_visible + admin/fields/templates.html.twig + help::help-section-bullet: check-spelling Check that there are no misspellings or typing errors. @@ -10083,9 +10098,15 @@ See documentation for more examples https://docs.phraseanet.com Service will be available again in a few minutes actions/Bridge/deactivated.html.twig + + lightbox::list + lightbox::list + mobile/lightbox/validate.html.twig + lightbox::recaptitulatif Summary + mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig web/lightbox/validate.html.twig @@ -13135,7 +13156,7 @@ It is possible to place several search areas validation:: note Comments - mobile/lightbox/sc_note.html.twig + mobile/lightbox/sc_note.html.twig validation:: votre note @@ -13145,8 +13166,8 @@ It is possible to place several search areas validation::envoyer mon rapport Send my feedback - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/basket_options.html.twig web/lightbox/basket_options.html.twig diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 71c3b52cf7..1eb4a7f0ca 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. @@ -9940,6 +9940,21 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Modifications effectuées admin/databox/databox.html.twig + + generate_cterms + generate_cterms + admin/fields/templates.html.twig + + + gui_editable + gui_editable + admin/fields/templates.html.twig + + + gui_visible + gui_visible + admin/fields/templates.html.twig + help::help-section-bullet: check-spelling help::help-section-bullet: check-spelling @@ -10082,9 +10097,15 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Le service sera de nouveau disponible dans quelques minutes. actions/Bridge/deactivated.html.twig + + lightbox::list + lightbox::list + mobile/lightbox/validate.html.twig + lightbox::recaptitulatif Récapitulatif + mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig web/lightbox/validate.html.twig @@ -13131,7 +13152,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le validation:: note Annotation - mobile/lightbox/sc_note.html.twig + mobile/lightbox/sc_note.html.twig validation:: votre note @@ -13141,8 +13162,8 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le validation::envoyer mon rapport Envoyer mon rapport - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/basket_options.html.twig web/lightbox/basket_options.html.twig diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 6fbc835166..5b9362ba05 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. @@ -9947,6 +9947,21 @@ Bewerking correct uitgevoerd admin/databox/databox.html.twig + + generate_cterms + generate_cterms + admin/fields/templates.html.twig + + + gui_editable + gui_editable + admin/fields/templates.html.twig + + + gui_visible + gui_visible + admin/fields/templates.html.twig + help::help-section-bullet: check-spelling help::help-section-bullet: check-spelling @@ -10089,9 +10104,15 @@ de service zal binnen enkele minuten opnieuw beschibaar zijn actions/Bridge/deactivated.html.twig + + lightbox::list + lightbox::list + mobile/lightbox/validate.html.twig + lightbox::recaptitulatif Beknopt + mobile/lightbox/validate.html.twig web/lightbox/agreement_box.html.twig web/lightbox/validate.html.twig @@ -13138,7 +13159,7 @@ validation:: note Nota - mobile/lightbox/sc_note.html.twig + mobile/lightbox/sc_note.html.twig validation:: votre note @@ -13148,8 +13169,8 @@ validation::envoyer mon rapport stuur mijn rapport - mobile/lightbox/validate.html.twig - mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig + mobile/lightbox/validate.html.twig web/lightbox/basket_options.html.twig web/lightbox/basket_options.html.twig diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 1e99babf4b..777d9db988 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 753b0bd9e2..ef9ae08f16 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.nl.xlf b/resources/locales/validators.nl.xlf index af3a53e211..63998943cb 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/lightbox/styles/jquery-mobile/_jquery-validator.scss b/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss index 67e49407ee..259ade124d 100644 --- a/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss +++ b/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss @@ -1,4 +1,5 @@ $iconsPath: '../../../assets/common/images/icons/'; + ul.image_set{ padding:0; margin:0; @@ -6,26 +7,57 @@ ul.image_set{ width:100%; border:none; list-style-type: none; + display: flex; + flex-wrap: wrap; } li.image_box a img{ position:relative; - vertical-align:middle; border:none; + width: auto!important; + height: 100% !important; + top: 0 !important; + object-fit: contain; } li.image_box a{ padding:0; text-shadow:0; margin:0; + width: 100%; } li.image_box{ - width:80px; - height:80px; - position:relative; - float:left; - margin:0px 15px 15px 0px; - padding:0px; - text-align:center; + width: 18%; + position: relative; + margin: 0 2.5% 15px 0; + padding: 0; + display: flex; + align-items: center; + text-align: center; + background: #ededed; + &:nth-child(5n) { + margin-right: 0; + } + .thumb_wrapper { + background: #ededed; + width: 100%!important; + height: 160px!important; + @media screen and (max-width: 767px) { + height: 130px !important; + } + } } +@media screen and (max-width: 767px) { + li.image_box{ + width: 32%; + margin: 0 2% 15px 0; + &:nth-child(5n) { + margin-right: 2% ; + } + &:nth-child(3n) { + margin-right: 0; + } + } +} + a.no.active_choice{ background-color:red; color: #fff; @@ -45,10 +77,12 @@ a.active_choice{ } .valid_choice.agree{ - background-image: url('#{$iconsPath}ok.png'); + background: #7ed321; + border-top-left-radius: 100px; } .valid_choice.disagree{ - background-image: url('#{$iconsPath}delete.png'); + background: #d0021b; + border-top-left-radius: 100px; } .thumb_wrapper { @@ -70,3 +104,7 @@ a.active_choice{ } } + +.ui-footer .ui-title, .ui-header .ui-title { + font-size: 18px; +} diff --git a/resources/www/lightbox/styles/main-mobile.scss b/resources/www/lightbox/styles/main-mobile.scss index a3476342d9..e5c9e1e93e 100644 --- a/resources/www/lightbox/styles/main-mobile.scss +++ b/resources/www/lightbox/styles/main-mobile.scss @@ -1,5 +1,28 @@ @import './jquery-mobile/jquery-validator'; +@font-face { + font-family: 'icomoon'; + src: url("../../common/fonts/PhraseanetIcomoon/fonts/icomoon.eot?xt8hfo"); + src: url("../../common/fonts/PhraseanetIcomoon/fonts/icomoon.eot?xt8hfo#iefix") format("embedded-opentype"), url("../../common/fonts/PhraseanetIcomoon/fonts/icomoon.ttf?xt8hfo") format("truetype"), url("../../common/fonts/PhraseanetIcomoon/fonts/icomoon.woff?xt8hfo") format("woff"), url("../../common/fonts/PhraseanetIcomoon/fonts/icomoon.svg?xt8hfo#icomoon") format("svg"); + font-weight: normal; + font-style: normal; +} + +[class^="icon-"], [class*=" icon-"] { + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'icomoon' !important; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + .nav_button { width: 90%; margin: 0px auto; @@ -24,4 +47,669 @@ #right-btn { float: right; -} \ No newline at end of file +} + +.report-modal, .ui-dialog .ui-dialog-content { + background: linear-gradient(#3c3c3c, #111); +} + +.ui-bar-c, .ui-body-c, .ui-btn-down-c, .ui-btn-hover-c, .ui-btn-up-c, .ui-overlay-c { + text-shadow: none; +} + +@import '../../_shared/styles/variables'; +$lightboxPath: '../images/'; +$imagesPath: '/assets/vendors/jquery-ui/images/dark-hive/'; + +$mainMenuBackgroundColor: #c7c7c7; //BFBFBF; +$mainMenuBottomBorder: 1px solid #c7c7c7; +$mainMenuLinkColor: #212121; +$mainMenuLinkHoverColor: #000000; +$mainMenuLinkActiveColor: #BFBFBF; +$mainMenuLinkBackgroundHoverColor: transparent; + +body { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; +} + +ul { + list-style-type: none; + margin: 0; + padding: 0; +} + +img { + border: none; + vertical-align: middle; +} + +.title15 { + font-size: 15px; + font-weight: bold; +} + +.record_display_box { + width: 100%; + height: 100%; + display: block; + table { + vertical-align: middle; + table-layout: fixed; + } + .title { + margin: 0 10px; + } + .record { + position: relative; + max-width: none; + max-height: none; + } + .header { + color: #BFBFBF; + height: 30px; + bottom: auto; + overflow: hidden; + .title { + overflow: hidden; + line-height: 20px; + height: 20px; + } + } + .lightbox_container { + top: 30px; + overflow: hidden; + } + .display_id { + top: 5px; + margin: 0 0 0 5px; + background: #bebebe; + } +} + +#sc_wrapper { + left: 20px; + right: 20px; + overflow-x: scroll; + overflow-y: hidden; +} + +#sc_container { + position: relative; + height: 100%; +} + +.basket_element_wrapper { + position: relative; + float: left; + padding: 0 5px; +} + +.basket_element { + position: relative; + float: left; + width: 114px; + height: 130px; + border: 1px solid #212121; + text-align: left; + padding: 5px 8px; + &.selected { + background-color: #212121; + } + .display_id { + top: 4px; + left: 8px; + } + .agreement { + position: absolute; + top: 4px; + right: 8px; + z-index: 99; + } + .image { + position: relative; + z-index: 90; + } + .previewTips { + background-image: url('#{$iconsPath}zoom.gif'); + background-position: center center; + background-repeat: no-repeat; + cursor: help; + position: absolute; + bottom: 4px; + right: 8px; + height: 18px; + width: 18px; + z-index: 99; + } +} + +#report .display_id { + top: 0; + left: 0; + border-radius: 0; + background-color: rgba(216, 216, 216, 0.7); + font-weight: 700; + z-index: 99; + color: #333333; + position: absolute; + width: 22px; + padding: 2px 0; + font-size: 12px; +} + +#report .CHIM.diapo { + text-align: center; +} + +.display_id { + background-color: #FFFFFF; + padding: 3px 6px; + font-weight: bold; + z-index: 99; + color: #212121; + -moz-border-radius: 50%; + -webkit-border-radius: 50%; + border-radius: 50%; + position: absolute; +} + +.not_decided { + opacity: 0.30; + filter: alpha(opacity=30); +} + +#sc_wrapper .not_decided { + display: none; +} + +#right_scroller { + width: 30px; + right: -10px; + left: auto; + background-image: url('#{$lightboxPath}right_arrow.png'); + background-position: center center; + background-repeat: no-repeat; +} + +#left_scroller { + width: 30px; + left: -10px; + right: auto; + background-image: url('#{$lightboxPath}left_arrow.png'); + background-position: center center; + background-repeat: no-repeat; +} + +#basket_infos { + overflow: hidden; + background-color: #1F1E1B; + color: #BFBFBF; +} + +#basket_options { + height: 35px; + top: auto; + background-color: #1F1E1B; + text-align: center; +} + +#basket_options .confirm_report { + margin: 5px auto; +} + +#basket_infos .user_infos { + height: 120px; + top: auto; +} + +#basket_infos { + table { + width: 100%; + margin: 5px 0; + .title { + width: 100%; + } + .report_wrapper { + text-align: right; + } + } +} + +#right_column { + left: auto; + right: 0; + width: 240px; +} + +#right_column_validation_toggle { + bottom: 45px; + background-color: #1F1E1B; + height: 30px; + top: auto; + text-align: center; + display: none; + line-height: 25px; + color: #BFBFBF; +} + +#right_column .right_column_title { + height: 30px; + bottom: auto; +} + +#right_column .right_column_title img.expanded { + display: none; +} + +#right_column .right_column_title img.collapsed { + display: inline; +} + +#right_column .right_column_title.expanded img.expanded { + display: inline; +} + +#right_column .right_column_title.expanded img.collapsed { + display: none; +} + +#right_column .right_column_wrapper { + top: 30px; + bottom: 45px; +} + +#right_column .right_column_wrapper.caption { + bottom: 85px; +} + +#record_infos { + overflow-x: hidden; + overflow-y: auto; +} + +#record_compare { + visibility: hidden; + top: auto; + left: auto; +} + +#record_compare .header, #record_compare .lightbox_container { + left: 5px; +} + +#record_wrapper.comparison #record_main .header, #record_wrapper.comparison #record_main .lightbox_container { + right: 5px; +} + +.agreement_selector { + position: absolute; + bottom: 10px; + right: 10px; +} + +.clickable { + cursor: pointer; +} + +.big_box.agree { + border: 2px solid #35AC00; + background-color: #35AC00; +} + +.big_box.disagree { + border: 2px solid #DE1200; + background-color: #DE1200; +} + +.big_box, .big_box.not_decided { + width: 95px; + margin: 0 auto; + padding: 6px 10px; + height: 30px; + color: #1F1E1B; + background-color: #353430; + border: 2px solid #353430; + text-align: center; + opacity: 1; + filter: alpha(opacity=100); +} + +.big_box span { + margin: 0 10px; +} + +li.userchoice { + margin: 5px 0 0px 20px; +} + +.userchoice.disagree { + color: #DE1200; +} + +.userchoice.agree { + color: #35AC00; +} + +.basket_report_user { + padding: 7px 10px; +} + +.basket_report_user_wrapper { + margin: 0; + border-bottom: 1px solid #b2b2b2; + border-radius: 0; + display: inline-block; + padding: 10px 15px; + width: 100%; + box-sizing: border-box; + background: #e5e5e5; + text-shadow: none; + float: left; +} + +.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { + padding: 0.2em 1em 0.2em 2.1em; +} + +/******* +* +* Index +* +* ******/ +#main_index { + position: relative; + width: 600px; + margin: 0 auto; +} + +#main_wrapper { + width: 100%; +} + +#main_wrapper h1 { + font-weight: bold; + font-size: 25px; +} + +table th { + text-align: right; + vertical-align: bottom; + height: 60px; + border-bottom: 1px solid #8F8F8F; +} + +table th.title { + text-align: left; +} + +table th h1 { + margin-left: 20px; +} + +table th i { + margin-right: 20px; +} + +.ui-state-default.note_closer, .ui-state-default.note_saver { + background-color: #353430; + padding: 5px; + margin: 0 10px; +} + +.ui-state-default.note_saver { + background-color: #1F1E1B; +} + +.record_display_box form .buttons { + margin: 5px; + text-align: right; +} + +.record_display_box form { + margin: 15px 0; + width: 90%; +} + +.record_display_box form textarea { + width: 100%; + height: 75px; +} + +#navigation { + width: 200px; +} + +.basket_downloader { + background-color: #1F1E1B; + margin: 0 10px; + padding: 2px; + border: 0; +} + +hr { + width: 100%; + height: 1px; + background-color: #212121; + border: none; +} + +.report { + margin: 0 10px; + vertical-align: bottom; +} + +/* +* +* Overrides JqueryUI +* +*/ +.ui-button { + background: transparent; + border: none; + margin: 0; + padding: 0; +} + +.ui-button-text-only .ui-button-text { + padding: 0.15em; +} + +.ui-dialog { + .ui-dialog-titlebar { + padding: 1em 1em; + } +} + +.videoTips { + width: 100%; + height: 100%; +} + +#basket_infos { + margin-bottom: 20px; + .mobile_aggreement_box { + padding: 20px; + } +} + +.ui-button-icon.ui-icon.ui-icon-closethick { + background-position: -73px 0px; + background-color: rgba(0, 0, 0, .9); + padding: 0; +} + +.btn-container { + padding: 0 20px; +} + +button.confirm_report { + background: #38c !important; + color: #fff !important; + font-size: 16px; + font-weight: bold; + padding: 6px; + display: inline-block; + border: 1px solid #38c; + text-shadow: 0 1px 0 #111; + border-radius: 16px; + font-family: Roboto, sans-serif; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2) !important; +} + +.report_wrapper { + position: relative; + margin-bottom: 20px; +} + +.report_btn { + position: absolute; + top: -41px; + right: 0; + z-index: 1; + background: #8bc34a; + border: 1px solid #8bc34a; + box-sizing: border-box; + padding: 8px 13px; + min-width: 110px; + border-radius: 4px; + color: #fff !important; + text-decoration: none; + text-align: center; + transition: all 0.3s; + &:hover, &:focus { + background: darken(#8bc34a, 0.2); + border-color: darken(#8bc34a, 0.3); + } + &.report_list { + background: #f44336; + border-color: #f44336; + &:hover, &:focus { + background: darken(#f44336, 0.2); + border-color: darken(#f44336, 0.3); + } + } +} + +.report_list { + display: none; +} + +.report_summary_backup, .report_list_backup { + display: none; +} + +.chim-wrapper-block { + margin-bottom: 15px; + .chim-block { + margin: 0; + } + .chim-inner { + width: 100%; + display: inline-block; + min-width: 296px; + } + .chim-left { + display: inline-block; + width: 100%; + background: #ededed; + text-align: center; + position: relative; + .diapo { + display: inline-block; + div { + max-width: 100%; + } + } + } + + .chim-right { + width: 100%; + .validate-icon { + float: left; + height: 25px; + vertical-align: middle; + display: flex; + flex-wrap: wrap; + align-items: center; + } + h3 { + font-size: 16px; + margin: 0; + padding-top: 3px; + } + } +} + +.thumb_wrapper img.record_image { + max-width: 100%; +} + +/*header lightbox*/ +.ui-footer .ui-title, .ui-header .ui-title { + min-height: 26px; + padding: 10px 0; +} + +.ui-listview.lightbox-list-view { + & > .ui-li-static { + padding: .7em 1em; + text-overflow: inherit; + white-space: inherit; + } + & > li { + border-color: #b2b2b2; + background: none; + p { + text-overflow: inherit; + white-space: inherit; + line-height: 15px; + font-size: 13px; + color: #141414; + } + } + h3 { + font-family: Roboto, sans-serif;; + font-size: 16px; + font-weight: bold; + font-stretch: normal; + font-style: normal; + line-height: 0.94; + letter-spacing: normal; + color: #141414; + } + +} + +.ui-footer.ui-bar-inherit { + border: 0; +} + +.center-image { + text-align: center; +} + +/*validate page*/ +.validate-icon { + float: left; + position: absolute; + .icomoon { + color: #fff; + font-size: 17px; + padding: 3px; + border-radius: 50px; + display: inline-block; + } + .icon-disagree { + background: #cd2f2f; + } + .icon-agree { + background: #8bc34a; + } + +} +.validate-info { + float: left; + padding-left: 36px; +} + diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig index 0cd2a1be3b..08cfc9bd1b 100644 --- a/templates/mobile/lightbox/basket_element.html.twig +++ b/templates/mobile/lightbox/basket_element.html.twig @@ -50,7 +50,6 @@ class="ui-btn-right jqm-home">{{ 'Home' | trans }}
- {{ thumbnail.format100percent(record.get_preview()) }}
{% if prevId != NULL %}
+
{{ thumbnail.format100percent(record.get_preview()) }}
{% if basket_element.getBasket().getValidation() %} {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %}
- + - +
@@ -81,7 +81,7 @@
-
    +
diff --git a/templates/mobile/lightbox/sc_note.html.twig b/templates/mobile/lightbox/sc_note.html.twig index c987560a99..fe3ed24cd8 100644 --- a/templates/mobile/lightbox/sc_note.html.twig +++ b/templates/mobile/lightbox/sc_note.html.twig @@ -1,17 +1,21 @@ {% for validationDatas in basket_element.getValidationDatas() %} - {% set is_mine = validationDatas.getParticipant().getUser().getId() == app.getAuthenticatedUser().getId() %} - {% if validationDatas.getNote() != '' or (validationDatas.getAgreement() is not null and is_mine) %}
  • -

    - {% if is_mine == false and validationDatas.getAgreement() is not null %} - +
    + {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %} + {% if validationDatas.getAgreement() == true %}{% endif %} + {% if validationDatas.getAgreement() == false and validationDatas.getAgreement() is not null %} {{ validationDatas.getAgreement() }}{% endif %} + {% endif %} +
    +
    +

    + {{ validationDatas.getParticipant().getUser().getDisplayName() }} +

    + {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %} + {% if validationDatas.getNote() != '' %} +

    {{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }}

    + {% endif %} {% endif %} - {{ validationDatas.getParticipant().getUser().getDisplayName() }} -

    - {% if validationDatas.getNote() != '' %} -

    {{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }}

    - {% endif %} + +
    • - {% endif %} {% endfor %} diff --git a/templates/mobile/lightbox/validate.html.twig b/templates/mobile/lightbox/validate.html.twig index b06c6e7728..fbaa154a2a 100644 --- a/templates/mobile/lightbox/validate.html.twig +++ b/templates/mobile/lightbox/validate.html.twig @@ -38,29 +38,65 @@ {% set basket_length = basket.getElements().count() %} {% trans with {'%basket_length%' : basket_length} %}%basket_length% documents{% endtrans %}

    - - -
    - {% if basket.getValidation() and basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %} - - {% endif %} -
    + +
    + +
    + + +
    + {% if basket.getValidation() and basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %} + + {% endif %} +
    + + {% endblock %} diff --git a/templates/web/lightbox/basket_content_report.html.twig b/templates/web/lightbox/basket_content_report.html.twig index 54798fc9b5..224a604eac 100644 --- a/templates/web/lightbox/basket_content_report.html.twig +++ b/templates/web/lightbox/basket_content_report.html.twig @@ -4,48 +4,50 @@
    {% for basket_element in basket.getElements() %} {% set record = basket_element.getRecord(app) %} -
    -
    - - - - - - -
    -
    -
    - {{basket_element.getOrd()}} +
    +
    +
    +
    +
    +
    + {{basket_element.getOrd()}} +
    + {{thumbnail.format(record.get_thumbnail(),165, 125, '', true, false)}} +
    - {{thumbnail.format(record.get_thumbnail(),165, 125, '', true, false)}} +
    + {% for validationDatas in basket_element.getValidationDatas()%} +
    + {% if validationDatas.getAgreement() == true %} + {% set imguser = '' %} + {% set styleuser = '' %} + {% elseif validationDatas.getAgreement() is null %} + {% set imguser = ' ' %} + {% set styleuser = 'margin-left:18px;' %} + {% else %} + {% set imguser = '' %} + {% set styleuser = '' %} + {% endif %} + +
    + {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %} + {{imguser|raw}} + {% endif %}
    -
    		- - {% for validationDatas in basket_element.getValidationDatas()%} -
    -
    - {% if validationDatas.getAgreement() == true %} - {% set imguser = '' %} - {% set styleuser = '' %} - {% elseif validationDatas.getAgreement() is null %} - {% set imguser = '' %} - {% set styleuser = 'margin-left:18px;' %} - {% else %} - {% set imguser = '' %} - {% set styleuser = '' %} - {% endif %} - {{imguser|raw}} {{validationDatas.getParticipant().getUser().getDisplayName()}} - {% if validationDatas.getNote() != '' %} - : {{validationDatas.getNote()|nl2br}} - {% endif %} -
    -
    - {% endfor %} -
    +
    +

    {{validationDatas.getParticipant().getUser().getDisplayName()}}

    + {% if validationDatas.getNote() != '' %} + {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %} +

    {{validationDatas.getNote()|nl2br}}

    + {% endif %} + {% endif %} +
    +
    + {% endfor %} +
    -
    + {% endfor %} diff --git a/yarn.lock b/yarn.lock index dc8b7c1789..ebc0ac35a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.1: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.77-d: - version "0.34.77-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.77-d.tgz#5dfb4abf25a37b64b8bdf793cf4033ccff55e5ad" - integrity sha512-+ak+Nx0zsvrzVgqc6s/sdVznDuGc2hRadxhISLmLPqCOw3CC1F+lCk5wG/TjhfYzFw1AKSszgLKqWj5ab7KPWQ== +phraseanet-production-client@0.34.80-d: + version "0.34.80-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.80-d.tgz#1e54bee4306ab11528377cb63c19d8c7491ef0f3" + integrity sha512-ilGs7ndDNztwlyeW9MA2TMiMhZC+P1/lNNeIsIuh+KuJH8M3Y3SWBcmsN2lqu5iM1Xg5FbWJ6iXcCSrLWHTqsw== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6"