diff --git a/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss b/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss index 259ade124d..7f49c0af1c 100644 --- a/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss +++ b/resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss @@ -108,3 +108,22 @@ a.active_choice{ .ui-footer .ui-title, .ui-header .ui-title { font-size: 18px; } + + +.ui-listview .ui-li-has-thumb .ui-li-thumb, .ui-listview .ui-li-has-thumb>.ui-btn>img:first-child, .ui-listview .ui-li-has-thumb>img:first-child { + top: 50%; + transform: translateY(-50%); +} + +/*user status*/ +.menu-bar-item { + background: #000; + padding: 12px; + text-align: center; + a { + color: #fff!important; + text-decoration: none!important; + font-weight: normal; + } +} + diff --git a/templates/mobile/common/menubar.html.twig b/templates/mobile/common/menubar.html.twig new file mode 100644 index 0000000000..03a41053f7 --- /dev/null +++ b/templates/mobile/common/menubar.html.twig @@ -0,0 +1,17 @@ +{% set configuration = app['conf'].get(['registry', 'custom-links']) %} + +{% if app.getAuthenticator().isAuthenticated() %} + +{% endif %} + diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig index 08cfc9bd1b..06e6d590a1 100644 --- a/templates/mobile/lightbox/basket_element.html.twig +++ b/templates/mobile/lightbox/basket_element.html.twig @@ -26,7 +26,7 @@ #content { position: fixed; - top:50px; + top:90px; bottom: 0; right: 0; left: 0; @@ -40,17 +40,19 @@ {% block content %} {% set record = basket_element.getRecord(app) %} -
-
- {{ 'Back' | trans }} -

{{basket_element.getOrd()}} - {{record.get_title()}}

- {{ 'Home' | trans }} -
-
- + {% if basket_element.getBasket().getValidation() %} + {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %} +
+ + + + +
+ {% endif %} +
+ + {{ 'validation:: editer ma note' | trans }} + +
+
+ +
+ {% endif %} +
diff --git a/templates/mobile/lightbox/feed_element.html.twig b/templates/mobile/lightbox/feed_element.html.twig index 9aa5f0aa99..997bd5ad36 100644 --- a/templates/mobile/lightbox/feed_element.html.twig +++ b/templates/mobile/lightbox/feed_element.html.twig @@ -17,7 +17,7 @@ #content { position: fixed; - top:50px; + top:90px; bottom: 0; right: 0; left: 0; @@ -36,9 +36,12 @@

{{feed_element.getOrd()}} - {{record.get_title()}}

Home
+
{{ thumbnail.format100percent(record.get_preview()) }}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/mobile/lightbox/index.html.twig b/templates/mobile/lightbox/index.html.twig index 4d8cc7cd96..a270116c9c 100644 --- a/templates/mobile/lightbox/index.html.twig +++ b/templates/mobile/lightbox/index.html.twig @@ -40,6 +40,9 @@

{{module_name}}

{{ 'a propos' | trans }} +
+

Phraseanet Version {{ app['phraseanet.version'].getName() }} - {{ app['phraseanet.version'].getNumber() }}

@@ -85,12 +91,15 @@ {{ 'Back' | trans }}

{{ 'Validations' | trans }}

+

{{ 'Voici vos validations en cours' | trans }}

+

{{ 'Voici vos paniers' | trans }} diff --git a/templates/mobile/lightbox/validate.html.twig b/templates/mobile/lightbox/validate.html.twig index fbaa154a2a..f45998a029 100644 --- a/templates/mobile/lightbox/validate.html.twig +++ b/templates/mobile/lightbox/validate.html.twig @@ -32,6 +32,9 @@

{{basket.getName()}}

{{ 'Home' | trans }}
+