diff --git a/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss b/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss index 67e49407ee..91ef05e1f3 100644 --- a/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss +++ b/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss @@ -25,6 +25,9 @@ li.image_box{ margin:0px 15px 15px 0px; padding:0px; text-align:center; + .thumb_wrapper { + background: #ededed; + } } a.no.active_choice{ background-color:red; @@ -45,10 +48,13 @@ 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 { diff --git a/resources/www/lightbox/styles/main-mobile.scss b/resources/www/lightbox/styles/main-mobile.scss index 5f9e33709b..5c786d4ca2 100644 --- a/resources/www/lightbox/styles/main-mobile.scss +++ b/resources/www/lightbox/styles/main-mobile.scss @@ -585,4 +585,9 @@ button.confirm_report { min-height: 26px; padding: 10px 0; } +.ui-listview >.ui-li-static { + padding: .7em 1em; + text-overflow: inherit; + white-space: inherit; +} diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig index 0cd2a1be3b..b37942cb82 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()) }}
+ {{ 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 eb6f48d1d7..a2ff375293 100644 --- a/templates/mobile/lightbox/sc_note.html.twig +++ b/templates/mobile/lightbox/sc_note.html.twig @@ -8,7 +8,7 @@ {{ validationDatas.getParticipant().getUser().getDisplayName() }} {% if validationDatas.getNote() != '' %} -

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

+

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

{% endif %} {% endfor %} diff --git a/templates/mobile/lightbox/validate.html.twig b/templates/mobile/lightbox/validate.html.twig index d94340024b..4a9a6a66c8 100644 --- a/templates/mobile/lightbox/validate.html.twig +++ b/templates/mobile/lightbox/validate.html.twig @@ -38,6 +38,7 @@ {% set basket_length = basket.getElements().count() %} {% trans with {'%basket_length%' : basket_length} %}%basket_length% documents{% endtrans %}

+ {% if basket.getValidation() %}
    @@ -78,6 +79,8 @@ {% endfor %}
+
+
{% if basket.getValidation() and basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %}
 
 
+ {% endblock %}