diff --git a/lib/Alchemy/Phrasea/Controller/Prod/RootController.php b/lib/Alchemy/Phrasea/Controller/Prod/RootController.php index 99c550051d..bed1941d1f 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/RootController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/RootController.php @@ -45,7 +45,7 @@ class RootController extends Controller return $this->app->redirectPath('logout'); } - $cssPath = $this->app['root.path'] . '/www/skins/prod/'; + $cssPath = $this->app['root.path'] . '/www/assets/prod/'; $css = []; diff --git a/lib/Alchemy/Phrasea/Core/PhraseaExceptionHandler.php b/lib/Alchemy/Phrasea/Core/PhraseaExceptionHandler.php index 4e3f6800e5..15d193b59d 100644 --- a/lib/Alchemy/Phrasea/Core/PhraseaExceptionHandler.php +++ b/lib/Alchemy/Phrasea/Core/PhraseaExceptionHandler.php @@ -110,25 +110,25 @@ class PhraseaExceptionHandler extends SymfonyExceptionHandler switch ($exception->getStatusCode()) { case 403: - $errorImg = '/skins/error-pages/403.png'; + $errorImg = '/assets/common/images/error-pages/403.png'; break; case 404: - $errorImg = '/skins/error-pages/404.png'; + $errorImg = '/assets/common/images/error-pages/404.png'; break; case 500: - $errorImg = '/skins/error-pages/500.png'; + $errorImg = '/assets/common/images/error-pages/500.png'; break; case 503: - $errorImg = '/skins/error-pages/503.png'; + $errorImg = '/assets/common/images/error-pages/503.png'; break; default: - $errorImg = '/skins/error-pages/error.png'; + $errorImg = '/assets/common/images/error-pages/error.png'; break; } return << + {% endblock %} {% block stylesheet %} diff --git a/templates/mobile/lightbox/feed.html.twig b/templates/mobile/lightbox/feed.html.twig index 9b4fabd0aa..dc2cd826b6 100644 --- a/templates/mobile/lightbox/feed.html.twig +++ b/templates/mobile/lightbox/feed.html.twig @@ -2,7 +2,7 @@ {% extends "common/index.html.twig" %} {% block javascript %} - + {% endblock %} {% block stylesheet %} diff --git a/templates/mobile/lightbox/feed_element.html.twig b/templates/mobile/lightbox/feed_element.html.twig index 4fda73c029..6408f4baba 100644 --- a/templates/mobile/lightbox/feed_element.html.twig +++ b/templates/mobile/lightbox/feed_element.html.twig @@ -3,7 +3,7 @@ {% extends "common/index.html.twig" %} {% block javascript %} - + {% endblock %} {% block stylesheet %} diff --git a/templates/mobile/lightbox/index.html.twig b/templates/mobile/lightbox/index.html.twig index 4110dbbd34..87a6fb0301 100644 --- a/templates/mobile/lightbox/index.html.twig +++ b/templates/mobile/lightbox/index.html.twig @@ -1,7 +1,7 @@ {% extends "common/index.html.twig" %} {% block javascript %} - + {% endblock %} {% block stylesheet %} @@ -9,7 +9,7 @@ {% endblock %} {% block icon %} - + {% endblock %} {% macro valid_baskets_length(baskets) %} diff --git a/templates/mobile/lightbox/note_form.html.twig b/templates/mobile/lightbox/note_form.html.twig index d7471991e9..771a75c2a6 100644 --- a/templates/mobile/lightbox/note_form.html.twig +++ b/templates/mobile/lightbox/note_form.html.twig @@ -3,7 +3,7 @@ {% extends "common/index.html.twig" %} {% block javascript %} - + {% endblock %} {% block stylesheet %} diff --git a/templates/mobile/lightbox/sc_note.html.twig b/templates/mobile/lightbox/sc_note.html.twig index 7e41144d3f..c987560a99 100644 --- a/templates/mobile/lightbox/sc_note.html.twig +++ b/templates/mobile/lightbox/sc_note.html.twig @@ -5,7 +5,7 @@

{% if is_mine == false and validationDatas.getAgreement() is not null %} + src="/assets/lightbox/images/{% if validationDatas.getAgreement() == true %}agree.png{% else %}disagree.png{% endif %}" /> {% endif %} {{ validationDatas.getParticipant().getUser().getDisplayName() }}

diff --git a/templates/mobile/lightbox/validate.html.twig b/templates/mobile/lightbox/validate.html.twig index fefbd7d08b..2d6e88741f 100644 --- a/templates/mobile/lightbox/validate.html.twig +++ b/templates/mobile/lightbox/validate.html.twig @@ -7,7 +7,7 @@ var releasable = {% if basket.getValidation().getParticipant(app.getAuthenticatedUser()).isReleasable() %}"{{ 'Do you want to send your report ?' | trans }}"{% else %}false{% endif %} {% endif %} - + {% endblock %} {% block stylesheet %} diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig index d83b73aef4..ca65c94d7e 100644 --- a/templates/web/admin/editusers.html.twig +++ b/templates/web/admin/editusers.html.twig @@ -145,7 +145,7 @@ - + @@ -168,7 +168,7 @@ - + --> diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig index bc524865b3..df8d14f53d 100644 --- a/templates/web/common/menubar.html.twig +++ b/templates/web/common/menubar.html.twig @@ -3,7 +3,7 @@
  1. - +
    2. {% if module is defined and module != "lightbox" and app.getAuthenticator().isAuthenticated() %} diff --git a/templates/web/common/thumbnail.html.twig b/templates/web/common/thumbnail.html.twig index 498d32e5d2..aeb75a0ec2 100644 --- a/templates/web/common/thumbnail.html.twig +++ b/templates/web/common/thumbnail.html.twig @@ -53,7 +53,7 @@ {% else %} + src="{% if lazyload %}/assets/common/images/grey.gif{% else %}{{ url }}{% endif %}" data-original="{{ url }}" ondragstart="return false;"> {% endif %} diff --git a/templates/web/lightbox/IE6/agreement_box.html.twig b/templates/web/lightbox/IE6/agreement_box.html.twig index 9b5bca075b..042f7e7315 100644 --- a/templates/web/lightbox/IE6/agreement_box.html.twig +++ b/templates/web/lightbox/IE6/agreement_box.html.twig @@ -41,12 +41,12 @@ {% set agreement = basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() %}
    - {{ 'validation:: OUI' | trans }} + {{ 'validation:: OUI' | trans }}
    - {{ 'validation:: NON' | trans }} + {{ 'validation:: NON' | trans }}
    diff --git a/templates/web/lightbox/IE6/basket_options.html.twig b/templates/web/lightbox/IE6/basket_options.html.twig index 1b0bbc07b1..d107aefc65 100644 --- a/templates/web/lightbox/IE6/basket_options.html.twig +++ b/templates/web/lightbox/IE6/basket_options.html.twig @@ -1,6 +1,6 @@ {% if basket.getValidation() and basket.getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %} diff --git a/templates/web/lightbox/IE6/feed.html.twig b/templates/web/lightbox/IE6/feed.html.twig index b7d2cf412c..59dc294ab2 100644 --- a/templates/web/lightbox/IE6/feed.html.twig +++ b/templates/web/lightbox/IE6/feed.html.twig @@ -72,7 +72,7 @@ @@ -99,7 +99,7 @@
    - + {{ 'notice' | trans }}
    diff --git a/templates/web/lightbox/IE6/feed_options_box.html.twig b/templates/web/lightbox/IE6/feed_options_box.html.twig index 70c51c615e..572154e56f 100644 --- a/templates/web/lightbox/IE6/feed_options_box.html.twig +++ b/templates/web/lightbox/IE6/feed_options_box.html.twig @@ -1,25 +1,25 @@ {% if feed_element %}
    diff --git a/templates/web/lightbox/IE6/index.html.twig b/templates/web/lightbox/IE6/index.html.twig index 43c38b3fae..2f2b4341ab 100644 --- a/templates/web/lightbox/IE6/index.html.twig +++ b/templates/web/lightbox/IE6/index.html.twig @@ -12,7 +12,7 @@ {% endblock %} {% block icon %} - + {% endblock %} {% block content %} diff --git a/templates/web/lightbox/IE6/sc_container.html.twig b/templates/web/lightbox/IE6/sc_container.html.twig index b363faf2d8..5fcf85bc77 100644 --- a/templates/web/lightbox/IE6/sc_container.html.twig +++ b/templates/web/lightbox/IE6/sc_container.html.twig @@ -8,9 +8,9 @@
    {{element.getRecord(app).getNumber()}}
    {% if basket.getValidation() %}
    - -
    {% endif %} diff --git a/templates/web/lightbox/IE6/sc_options_box.html.twig b/templates/web/lightbox/IE6/sc_options_box.html.twig index 8736633c75..3f056e8e14 100644 --- a/templates/web/lightbox/IE6/sc_options_box.html.twig +++ b/templates/web/lightbox/IE6/sc_options_box.html.twig @@ -1,25 +1,25 @@ {% if basket_element %} @@ -27,7 +27,7 @@ | {% if basket_element.getBasket().getValidation() %}