From f186091823e34fe02552f90fe2eb65a96efa743d Mon Sep 17 00:00:00 2001 From: Florian BLOUET Date: Tue, 17 Nov 2015 16:23:04 +0100 Subject: [PATCH] wip: component reorg, gathering js, css, images, ... --- .../Controller/Prod/RootController.php | 2 +- .../Phrasea/Core/PhraseaExceptionHandler.php | 12 +- resources/gulp/components/admin.js | 6 +- resources/gulp/components/common.js | 2 +- resources/gulp/components/lightbox.js | 13 +- resources/gulp/components/prod.js | 22 +- .../gulp/components/vendors/bootstrap.js | 1 + resources/www/account/styles/_variables.scss | 10 +- resources/www/account/styles/main.scss | 3 +- .../www/admin/js}/template-dialogs.js | 0 .../www/authentication/images}/ie6dead.png | Bin .../www/authentication/images}/link.png | Bin .../www/common/images}/error-pages/403.png | Bin .../www/common/images}/error-pages/404.png | Bin .../www/common/images}/error-pages/500.png | Bin .../www/common/images}/error-pages/503.png | Bin .../common/images}/error-pages/background.png | Bin .../www/common/images}/error-pages/error.png | Bin .../www/common/images}/grey.gif | Bin .../www/common/images}/lng/ar_flag_18.gif | Bin .../www/common/images}/lng/de_flag_18.gif | Bin .../www/common/images}/lng/en_flag_18.gif | Bin .../www/common/images}/lng/es_flag_18.gif | Bin .../www/common/images}/lng/fr_flag_18.gif | Bin .../www/common/images}/lng/inclin-ar.png | Bin .../www/common/images}/lng/inclin-de.png | Bin .../www/common/images}/lng/inclin-en.png | Bin .../www/common/images}/lng/inclin-es.png | Bin .../www/common/images}/lng/inclin-fr.png | Bin .../www/common/images}/lng/inclin-nl.png | Bin .../www/common/images}/lng/nl_flag_18.gif | Bin .../www/common/images}/logo.png | Bin .../www/common/js}/jquery.Dialog.js | 0 resources/www/common/styles/main.scss | 4 +- .../www/lightbox/images}/agree-big.png | Bin .../www/lightbox/images}/agree-bigie6.gif | Bin .../www/lightbox/images}/agree.png | Bin .../www/lightbox/images}/agreeie6.gif | Bin .../www/lightbox/images}/collapsed.png | Bin .../www/lightbox/images}/collapsedie6.gif | Bin .../www/lightbox/images}/disagree-big.png | Bin .../www/lightbox/images}/disagree-bigie6.gif | Bin .../www/lightbox/images}/disagree.png | Bin .../www/lightbox/images}/disagreeie6.gif | Bin .../www/lightbox/images}/edit.png | Bin .../www/lightbox/images}/envoyer.png | Bin .../www/lightbox/images}/envoyerie6.gif | Bin .../www/lightbox/images}/expanded.png | Bin .../www/lightbox/images}/favicon.ico | Bin .../www/lightbox/images}/left_arrow.png | Bin .../www/lightbox/images}/next_pauseie6.png | Bin .../www/lightbox/images}/nextie6.png | Bin .../www/lightbox/images}/noteie6.png | Bin .../www/lightbox/images}/pauseie6.png | Bin .../www/lightbox/images}/playie6.png | Bin .../www/lightbox/images}/prev_pauseie6.png | Bin .../www/lightbox/images}/previe6.png | Bin .../www/lightbox/images}/retour.png | Bin .../www/lightbox/images}/right_arrow.png | Bin .../www/lightbox/images}/save.png | Bin .../www/lightbox/images}/saveie6.png | Bin .../www/lightbox/images}/toexpand.png | Bin .../www/lightbox/js}/jquery.lightbox.ie6.js | 0 .../www/lightbox/js}/jquery.lightbox.js | 0 .../lightbox/js}/jquery.validator.mobile.js | 0 resources/www/lightbox/styles/main-ie6.scss | 2 +- resources/www/lightbox/styles/main.scss | 2 +- .../www/prod/images}/000000/images/ccoch0.gif | Bin .../www/prod/images}/000000/images/ccoch1.gif | Bin .../www/prod/images}/000000/images/ccoch2.gif | Bin .../prod/images}/000000/images/chgcoll_0.gif | Bin .../prod/images}/000000/images/chgcoll_1.gif | Bin .../images}/000000/images/chgcoll_history.gif | Bin .../images}/000000/images/chgcoll_history.png | Bin .../images}/000000/images/chgstatus_0.gif | Bin .../images}/000000/images/chgstatus_1.gif | Bin .../000000/images/chgstatus_history.gif | Bin .../000000/images/chgstatus_history.png | Bin .../www/prod/images}/000000/images/chu.gif | Bin .../www/prod/images}/000000/images/closer.gif | Bin .../www/prod/images}/000000/images/delete.png | Bin .../prod/images}/000000/images/disktt_0.gif | Bin .../prod/images}/000000/images/disktt_1.gif | Bin .../images}/000000/images/disktt_history.gif | Bin .../images}/000000/images/disktt_history.png | Bin .../www/prod/images}/000000/images/grip.gif | Bin .../prod/images}/000000/images/imgtools_0.gif | Bin .../prod/images}/000000/images/imgtools_1.gif | Bin .../000000/images/imgtools_history.gif | Bin .../000000/images/imgtools_history.png | Bin .../www/prod/images}/000000/images/ppen_0.gif | Bin .../www/prod/images}/000000/images/ppen_1.gif | Bin .../images}/000000/images/ppen_history.gif | Bin .../images}/000000/images/ppen_history.png | Bin .../prod/images}/000000/images/print_0.gif | Bin .../prod/images}/000000/images/print_1.gif | Bin .../images}/000000/images/print_history.gif | Bin .../images}/000000/images/print_history.png | Bin .../prod/images}/000000/images/pubchut.gif | Bin .../images}/000000/images/pubchutmine.gif | Bin .../www/prod/images}/000000/images/push16.png | Bin .../prod/images}/000000/images/pushdoc_0.gif | Bin .../prod/images}/000000/images/pushdoc_1.gif | Bin .../prod/images}/000000/images/reducer.gif | Bin .../prod/images}/000000/images/regroup.gif | Bin .../prod/images}/000000/images/resizer.gif | Bin .../www/prod/images}/000000/images/rss16.png | Bin .../prod/images}/000000/images/suggested.gif | Bin .../prod/images}/000000/images/titrwin.gif | Bin .../prod/images}/000000/images/trash_0.gif | Bin .../prod/images}/000000/images/trash_1.gif | Bin .../ui-bg_dots-medium_30_0077BC_4x4.png | Bin .../images/ui-bg_dots-small_20_333333_2x2.png | Bin .../images/ui-bg_dots-small_30_a32d00_2x2.png | Bin .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_40_292929_40x100.png | Bin .../ui-bg_gloss-wave_20_111111_500x100.png | Bin .../ui-bg_highlight-hard_15_0077BC_1x100.png | Bin .../ui-bg_highlight-hard_40_0077BC_1x100.png | Bin .../000000/images/ui-icons_0077BC_256x240.png | Bin .../000000/images/ui-icons_98d2fb_256x240.png | Bin .../000000/images/ui-icons_9ccdfc_256x240.png | Bin .../000000/images/ui-icons_ffffff_256x240.png | Bin .../prod/images}/000000/images/vsplitter.gif | Bin .../prod/images}/000000/images/ww_title.gif | Bin .../prod/images}/959595/images/bask_back.png | Bin .../www/prod/images}/959595/images/ccoch0.gif | Bin .../www/prod/images}/959595/images/ccoch1.gif | Bin .../www/prod/images}/959595/images/ccoch2.gif | Bin .../prod/images}/959595/images/chgcoll_0.gif | Bin .../prod/images}/959595/images/chgcoll_1.gif | Bin .../images}/959595/images/chgcoll_history.gif | Bin .../images}/959595/images/chgstatus_0.gif | Bin .../images}/959595/images/chgstatus_1.gif | Bin .../959595/images/chgstatus_history.gif | Bin .../www/prod/images}/959595/images/chu.gif | Bin .../prod/images}/959595/images/disktt_0.gif | Bin .../prod/images}/959595/images/disktt_1.gif | Bin .../images}/959595/images/disktt_history.gif | Bin .../prod/images}/959595/images/imgtools_0.gif | Bin .../prod/images}/959595/images/imgtools_1.gif | Bin .../959595/images/imgtools_history.gif | Bin .../www/prod/images}/959595/images/ppen_0.gif | Bin .../www/prod/images}/959595/images/ppen_1.gif | Bin .../images}/959595/images/ppen_history.gif | Bin .../prod/images}/959595/images/print_0.gif | Bin .../prod/images}/959595/images/print_1.gif | Bin .../images}/959595/images/print_history.gif | Bin .../prod/images}/959595/images/pubchut.gif | Bin .../images}/959595/images/pubchutmine.gif | Bin .../prod/images}/959595/images/pushdoc_0.gif | Bin .../prod/images}/959595/images/pushdoc_1.gif | Bin .../prod/images}/959595/images/regroup.gif | Bin .../prod/images}/959595/images/suggested.gif | Bin .../prod/images}/959595/images/trash_0.gif | Bin .../prod/images}/959595/images/trash_1.gif | Bin .../ui-bg_dots-medium_30_0077BC_4x4.png | Bin .../images/ui-bg_dots-small_20_333333_2x2.png | Bin .../images/ui-bg_dots-small_30_a32d00_2x2.png | Bin .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_40_292929_40x100.png | Bin .../ui-bg_gloss-wave_20_111111_500x100.png | Bin .../ui-bg_highlight-hard_15_0077BC_1x100.png | Bin .../ui-bg_highlight-hard_40_0077BC_1x100.png | Bin .../959595/images/ui-icons_0077BC_256x240.png | Bin .../959595/images/ui-icons_98d2fb_256x240.png | Bin .../959595/images/ui-icons_9ccdfc_256x240.png | Bin .../959595/images/ui-icons_ffffff_256x240.png | Bin .../prod/images}/959595/images/vsplitter.gif | Bin .../prod/images}/959595/images/ww_title.gif | Bin .../images}/Basket/Browser/BASKET_LIST.png | Bin .../prod/images}/Basket/Browser/archive.png | Bin .../prod/images}/Basket/Browser/archived.png | Bin .../www/prod/images}/Basket/Browser/left.png | Bin .../prod/images}/Basket/Browser/loader.gif | Bin .../www/prod/images}/Basket/Browser/right.png | Bin .../www/prod/images}/Push/close_badge.png | Bin .../prod/images}/Push/contributeur_badge.png | Bin .../prod/images}/Push/contributeur_menu.png | Bin .../images}/Push/contributeur_off_badge.png | Bin .../www/prod/images}/Push/download_badge.png | Bin .../www/prod/images}/Push/download_menu.png | Bin .../prod/images}/Push/download_off_badge.png | Bin .../www/prod/images}/Push/list-icon.png | Bin .../www/prod/images}/Push/save_list_as.png | Bin .../www/prod/images}/Push/see_other_badge.png | Bin .../www/prod/images}/Push/see_other_menu.png | Bin .../prod/images}/Push/see_other_off_badge.png | Bin .../images}/ThumbExtractor/camera_button.png | Bin .../images}/ThumbExtractor/camera_title.png | Bin .../images}/ThumbExtractor/cancel_button.png | Bin .../prod/images}/ThumbExtractor/contrast.png | Bin .../prod/images}/ThumbExtractor/delete.png | Bin .../prod/images}/ThumbExtractor/fleche_d.png | Bin .../prod/images}/ThumbExtractor/fleche_g.png | Bin .../ThumbExtractor/flip_horizontal.png | Bin .../images}/ThumbExtractor/flip_vertical.png | Bin .../images}/ThumbExtractor/luminosity.png | Bin .../prod/images}/ThumbExtractor/ok_button.png | Bin .../images}/ThumbExtractor/question_mark.png | Bin .../www/prod/images}/ThumbExtractor/reset.png | Bin .../ThumbExtractor/validate_button.png | Bin .../www/prod/js}/ThumbExtractor.js | 0 .../www/prod/js}/jquery.Alerts.js | 0 .../www/prod/js}/jquery.Feedback.js | 0 .../www/prod/js}/jquery.Prod.js | 0 .../www/prod/js}/jquery.Results.js | 0 .../www/prod/js}/jquery.Upload.js | 0 .../www/prod/js}/jquery.WorkZone.js | 0 .../www/prod/js}/jquery.edit.js | 0 .../www/prod/js}/jquery.main-prod.js | 0 .../www/prod/js}/publicator.js | 0 resources/www/prod/styles/skin-000000.scss | 2 +- .../www/vendors/bootstrap/_variables.scss | 301 +++++ .../bootstrap}/bootstrap.scss | 2 +- .../bootstrap/responsive.scss} | 2 +- .../mobile/lightbox/basket_element.html.twig | 2 +- templates/mobile/lightbox/feed.html.twig | 2 +- .../mobile/lightbox/feed_element.html.twig | 2 +- templates/mobile/lightbox/index.html.twig | 4 +- templates/mobile/lightbox/note_form.html.twig | 2 +- templates/mobile/lightbox/sc_note.html.twig | 2 +- templates/mobile/lightbox/validate.html.twig | 2 +- templates/web/admin/editusers.html.twig | 4 +- templates/web/common/menubar.html.twig | 2 +- templates/web/common/thumbnail.html.twig | 2 +- .../web/lightbox/IE6/agreement_box.html.twig | 4 +- .../web/lightbox/IE6/basket_options.html.twig | 2 +- templates/web/lightbox/IE6/feed.html.twig | 4 +- .../lightbox/IE6/feed_options_box.html.twig | 14 +- templates/web/lightbox/IE6/index.html.twig | 2 +- .../web/lightbox/IE6/sc_container.html.twig | 4 +- .../web/lightbox/IE6/sc_options_box.html.twig | 16 +- templates/web/lightbox/IE6/validate.html.twig | 6 +- .../web/lightbox/agreement_box.html.twig | 4 +- .../lightbox/basket_content_report.html.twig | 4 +- .../web/lightbox/basket_options.html.twig | 2 +- templates/web/lightbox/error.html.twig | 2 +- templates/web/lightbox/feed.html.twig | 2 +- templates/web/lightbox/index.html.twig | 2 +- templates/web/lightbox/sc_container.html.twig | 4 +- templates/web/lightbox/selector_box.html.twig | 4 +- templates/web/lightbox/validate.html.twig | 10 +- .../web/login/layout/base-layout.html.twig | 2 +- .../web/login/providers/mapping.html.twig | 2 +- templates/web/prod/WorkZone/Basket.html.twig | 12 +- .../prod/WorkZone/Browser/Basket.html.twig | 8 +- .../prod/WorkZone/Browser/Results.html.twig | 14 +- templates/web/prod/WorkZone/Macros.html.twig | 4 +- templates/web/prod/WorkZone/Story.html.twig | 12 +- .../actions/Feedback/List-Share.html.twig | 4 +- .../actions/Feedback/ListsMacros.html.twig | 2 +- .../web/prod/actions/Feedback/list.html.twig | 2 +- .../prod/actions/Feedback/lists-all.html.twig | 2 +- templates/web/prod/actions/Push.html.twig | 4 +- .../web/prod/actions/Tools/confirm.html.twig | 2 +- .../web/prod/actions/Tools/index.html.twig | 8 +- .../web/prod/actions/edit_default.html.twig | 2 +- templates/web/prod/preview/caption.html.twig | 2 +- templates/web/prod/templates/push.html.twig | 22 +- templates/web/prod/toolbar.html.twig | 12 +- templates/web/thesaurus/index.html.twig | 2 +- templates/web/thesaurus/properties.html.twig | 6 +- templates/web/thesaurus/thesaurus.html.twig | 6 +- .../login/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes www/skins/login/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes www/skins/login/less/ie6.less | 44 - www/skins/login/less/login.less | 66 -- www/skins/login/less/skin.less | 1016 ----------------- www/skins/login/less/variables.less | 344 ------ www/skins/prod/jquery.Search.js | 6 - 271 files changed, 466 insertions(+), 1636 deletions(-) rename {www/skins/admin => resources/www/admin/js}/template-dialogs.js (100%) rename {www/skins/login/img => resources/www/authentication/images}/ie6dead.png (100%) rename {www/skins/login/img => resources/www/authentication/images}/link.png (100%) rename {www/skins => resources/www/common/images}/error-pages/403.png (100%) rename {www/skins => resources/www/common/images}/error-pages/404.png (100%) rename {www/skins => resources/www/common/images}/error-pages/500.png (100%) rename {www/skins => resources/www/common/images}/error-pages/503.png (100%) rename {www/skins => resources/www/common/images}/error-pages/background.png (100%) rename {www/skins => resources/www/common/images}/error-pages/error.png (100%) rename {www/skins => resources/www/common/images}/grey.gif (100%) rename {www/skins => resources/www/common/images}/lng/ar_flag_18.gif (100%) rename {www/skins => resources/www/common/images}/lng/de_flag_18.gif (100%) rename {www/skins => resources/www/common/images}/lng/en_flag_18.gif (100%) rename {www/skins => resources/www/common/images}/lng/es_flag_18.gif (100%) rename {www/skins => resources/www/common/images}/lng/fr_flag_18.gif (100%) rename {www/skins => resources/www/common/images}/lng/inclin-ar.png (100%) rename {www/skins => resources/www/common/images}/lng/inclin-de.png (100%) rename {www/skins => resources/www/common/images}/lng/inclin-en.png (100%) rename {www/skins => resources/www/common/images}/lng/inclin-es.png (100%) rename {www/skins => resources/www/common/images}/lng/inclin-fr.png (100%) rename {www/skins => resources/www/common/images}/lng/inclin-nl.png (100%) rename {www/skins => resources/www/common/images}/lng/nl_flag_18.gif (100%) rename {www/skins/logos => resources/www/common/images}/logo.png (100%) rename {www/skins/prod => resources/www/common/js}/jquery.Dialog.js (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/agree-big.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/agree-bigie6.gif (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/agree.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/agreeie6.gif (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/collapsed.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/collapsedie6.gif (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/disagree-big.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/disagree-bigie6.gif (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/disagree.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/disagreeie6.gif (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/edit.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/envoyer.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/envoyerie6.gif (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/expanded.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/favicon.ico (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/left_arrow.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/next_pauseie6.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/nextie6.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/noteie6.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/pauseie6.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/playie6.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/prev_pauseie6.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/previe6.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/retour.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/right_arrow.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/save.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/saveie6.png (100%) rename {www/skins/lightbox => resources/www/lightbox/images}/toexpand.png (100%) rename {www/skins/lightbox => resources/www/lightbox/js}/jquery.lightbox.ie6.js (100%) rename {www/skins/lightbox => resources/www/lightbox/js}/jquery.lightbox.js (100%) rename {www/skins/lightbox => resources/www/lightbox/js}/jquery.validator.mobile.js (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ccoch0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ccoch1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ccoch2.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/chgcoll_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/chgcoll_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/chgcoll_history.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/chgcoll_history.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/chgstatus_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/chgstatus_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/chgstatus_history.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/chgstatus_history.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/chu.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/closer.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/delete.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/disktt_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/disktt_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/disktt_history.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/disktt_history.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/grip.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/imgtools_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/imgtools_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/imgtools_history.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/imgtools_history.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ppen_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ppen_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ppen_history.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ppen_history.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/print_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/print_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/print_history.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/print_history.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/pubchut.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/pubchutmine.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/push16.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/pushdoc_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/pushdoc_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/reducer.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/regroup.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/resizer.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/rss16.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/suggested.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/titrwin.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/trash_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/trash_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ui-bg_dots-medium_30_0077BC_4x4.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ui-bg_dots-small_20_333333_2x2.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ui-bg_dots-small_30_a32d00_2x2.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ui-bg_flat_40_292929_40x100.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ui-bg_gloss-wave_20_111111_500x100.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ui-bg_highlight-hard_15_0077BC_1x100.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ui-bg_highlight-hard_40_0077BC_1x100.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ui-icons_0077BC_256x240.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ui-icons_98d2fb_256x240.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ui-icons_9ccdfc_256x240.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ui-icons_ffffff_256x240.png (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/vsplitter.gif (100%) rename {www/skins/prod => resources/www/prod/images}/000000/images/ww_title.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/bask_back.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ccoch0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ccoch1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ccoch2.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/chgcoll_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/chgcoll_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/chgcoll_history.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/chgstatus_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/chgstatus_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/chgstatus_history.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/chu.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/disktt_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/disktt_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/disktt_history.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/imgtools_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/imgtools_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/imgtools_history.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ppen_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ppen_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ppen_history.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/print_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/print_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/print_history.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/pubchut.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/pubchutmine.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/pushdoc_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/pushdoc_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/regroup.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/suggested.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/trash_0.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/trash_1.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ui-bg_dots-medium_30_0077BC_4x4.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ui-bg_dots-small_20_333333_2x2.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ui-bg_dots-small_30_a32d00_2x2.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ui-bg_flat_40_292929_40x100.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ui-bg_gloss-wave_20_111111_500x100.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ui-bg_highlight-hard_15_0077BC_1x100.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ui-bg_highlight-hard_40_0077BC_1x100.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ui-icons_0077BC_256x240.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ui-icons_98d2fb_256x240.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ui-icons_9ccdfc_256x240.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ui-icons_ffffff_256x240.png (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/vsplitter.gif (100%) rename {www/skins/prod => resources/www/prod/images}/959595/images/ww_title.gif (100%) rename {www/skins/prod => resources/www/prod/images}/Basket/Browser/BASKET_LIST.png (100%) rename {www/skins/prod => resources/www/prod/images}/Basket/Browser/archive.png (100%) rename {www/skins/prod => resources/www/prod/images}/Basket/Browser/archived.png (100%) rename {www/skins/prod => resources/www/prod/images}/Basket/Browser/left.png (100%) rename {www/skins/prod => resources/www/prod/images}/Basket/Browser/loader.gif (100%) rename {www/skins/prod => resources/www/prod/images}/Basket/Browser/right.png (100%) rename {www/skins/prod => resources/www/prod/images}/Push/close_badge.png (100%) rename {www/skins/prod => resources/www/prod/images}/Push/contributeur_badge.png (100%) rename {www/skins/prod => resources/www/prod/images}/Push/contributeur_menu.png (100%) rename {www/skins/prod => resources/www/prod/images}/Push/contributeur_off_badge.png (100%) rename {www/skins/prod => resources/www/prod/images}/Push/download_badge.png (100%) rename {www/skins/prod => resources/www/prod/images}/Push/download_menu.png (100%) rename {www/skins/prod => resources/www/prod/images}/Push/download_off_badge.png (100%) rename {www/skins/prod => resources/www/prod/images}/Push/list-icon.png (100%) rename {www/skins/prod => resources/www/prod/images}/Push/save_list_as.png (100%) rename {www/skins/prod => resources/www/prod/images}/Push/see_other_badge.png (100%) rename {www/skins/prod => resources/www/prod/images}/Push/see_other_menu.png (100%) rename {www/skins/prod => resources/www/prod/images}/Push/see_other_off_badge.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/camera_button.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/camera_title.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/cancel_button.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/contrast.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/delete.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/fleche_d.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/fleche_g.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/flip_horizontal.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/flip_vertical.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/luminosity.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/ok_button.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/question_mark.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/reset.png (100%) rename {www/skins/prod => resources/www/prod/images}/ThumbExtractor/validate_button.png (100%) rename {www/skins/prod => resources/www/prod/js}/ThumbExtractor.js (100%) rename {www/skins/prod => resources/www/prod/js}/jquery.Alerts.js (100%) rename {www/skins/prod => resources/www/prod/js}/jquery.Feedback.js (100%) rename {www/skins/prod => resources/www/prod/js}/jquery.Prod.js (100%) rename {www/skins/prod => resources/www/prod/js}/jquery.Results.js (100%) rename {www/skins/prod => resources/www/prod/js}/jquery.Upload.js (100%) rename {www/skins/prod => resources/www/prod/js}/jquery.WorkZone.js (100%) rename {www/skins/prod => resources/www/prod/js}/jquery.edit.js (100%) rename {www/skins/prod => resources/www/prod/js}/jquery.main-prod.js (100%) rename {www/skins/prod => resources/www/prod/js}/publicator.js (100%) create mode 100644 resources/www/vendors/bootstrap/_variables.scss rename resources/www/{shared/styles => vendors/bootstrap}/bootstrap.scss (96%) rename resources/www/{shared/styles/bootstrap-responsive.scss => vendors/bootstrap/responsive.scss} (90%) delete mode 100644 www/skins/login/img/glyphicons-halflings-white.png delete mode 100644 www/skins/login/img/glyphicons-halflings.png delete mode 100644 www/skins/login/less/ie6.less delete mode 100644 www/skins/login/less/login.less delete mode 100644 www/skins/login/less/skin.less delete mode 100644 www/skins/login/less/variables.less delete mode 100644 www/skins/prod/jquery.Search.js 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() %}