diff --git a/bower.json b/bower.json index db25adfe2b..6f9af1e3db 100644 --- a/bower.json +++ b/bower.json @@ -5,8 +5,7 @@ "underscore-amd": "~1.4", "alchemy-embed-medias": "~0.3.4", "i18next": "~1.6", - "backbone-amd": "~1.0", - "font-awesome": "~3.2.1" + "backbone-amd": "~1.0" }, "resolutions": { "jquery": "~1.11.3" diff --git a/package.json b/package.json index 75741875da..2e5e9cdbed 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "modernizr": "^3.0.0", "normalize-css": "^2.1.0", "npm": "^5.6.0", - "phraseanet-production-client": "../Phraseanet-production-client", + "phraseanet-production-client": "^0.32.3", "qunit": "^1.0.0", "requirejs": "^2.1.22", "tinymce": "^4.0.28", diff --git a/resources/gulp/components/common.js b/resources/gulp/components/common.js index 54aad6036e..34426d61d9 100644 --- a/resources/gulp/components/common.js +++ b/resources/gulp/components/common.js @@ -9,12 +9,12 @@ gulp.task('copy-common-images', function(){ }); gulp.task('copy-common-fonts',function(){ - return gulp.src([config.paths.vendors + 'font-awesome/font/*']) - .pipe(gulp.dest( config.paths.build + 'common/font')); + return gulp.src([config.paths.nodes + 'font-awesome/fonts/*']) + .pipe(gulp.dest(config.paths.build + 'common/fonts')); }); gulp.task('build-common-font-css', ['copy-common-fonts'],function(){ - return gulp.src([config.paths.vendors + 'font-awesome/css/font-awesome-ie7.min.css']) + return gulp.src([config.paths.nodes + 'font-awesome/css/font-awesome.min.css']) .pipe(gulp.dest( config.paths.build + 'common/css')); }); diff --git a/resources/www/_shared/styles/_variables.scss b/resources/www/_shared/styles/_variables.scss index e535d95d82..015f3ade95 100644 --- a/resources/www/_shared/styles/_variables.scss +++ b/resources/www/_shared/styles/_variables.scss @@ -1,4 +1,5 @@ -$FontAwesomePath: '/assets/common/font' !default; // dist path +$FontAwesomePath: '/assets/common/fonts' !default; // dist path +$fa-font-path: "/assets/common/fonts" !default; $iconsPath: '/assets/common/images/icons/' !default; $mainMenuHeight: 40px !default; diff --git a/resources/www/account/styles/main.scss b/resources/www/account/styles/main.scss index 7adacdd6ab..dbdf9dfa4d 100644 --- a/resources/www/account/styles/main.scss +++ b/resources/www/account/styles/main.scss @@ -4,7 +4,7 @@ @import 'variables'; @import '../../vendors/bootstrap/bootstrap'; @import 'skin'; -@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss'; +@import '../../../../node_modules/font-awesome/scss/font-awesome.scss'; @import '../../../../node_modules/jquery-ui/themes/base/autocomplete'; // not extension for inline import $mainMenuBackgroundColor: #3b3b3b; diff --git a/resources/www/authentication/styles/main.scss b/resources/www/authentication/styles/main.scss index 1facedf326..1c66295bc4 100644 --- a/resources/www/authentication/styles/main.scss +++ b/resources/www/authentication/styles/main.scss @@ -2,6 +2,5 @@ @import 'variables'; @import '../../vendors/bootstrap/bootstrap'; @import '../../account/styles/skin'; - -@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss'; +@import '../../../../node_modules/font-awesome/scss/font-awesome.scss'; @import '../../../../node_modules/jquery-ui/themes/base/autocomplete'; // not extension for inline import diff --git a/resources/www/common/styles/main.scss b/resources/www/common/styles/main.scss index 63a1762667..ede6c8d318 100644 --- a/resources/www/common/styles/main.scss +++ b/resources/www/common/styles/main.scss @@ -1,11 +1,11 @@ /** * Common stylesheet, builded into assets/common/styles/common.css */ +@import '../../../../node_modules/font-awesome/scss/font-awesome.scss'; @import '../../_shared/styles/variables'; @import '../../vendors/bootstrap/bootstrap'; @import '../../vendors/bootstrap/responsive'; @import '../../_shared/styles/override-bootstrap'; -@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss'; @import '../../_shared/styles/main'; $mainMenuBackgroundColor: #212121; //BFBFBF; diff --git a/resources/www/prod/js/jquery.main-prod.js b/resources/www/prod/js/jquery.main-prod.js index f1ef70c798..cb96878458 100644 --- a/resources/www/prod/js/jquery.main-prod.js +++ b/resources/www/prod/js/jquery.main-prod.js @@ -1209,7 +1209,7 @@ $(document).ready(function () { $('#idFrameC .ui-tabs-nav li').removeClass('ui-state-active'); $('.WZbasketTab').css('background-position', '15px 25px'); $('#idFrameC').addClass('closed'); - previousTab = $('#idFrameC .icon-menu').find('li.ui-tabs-active'); + previousTab = $('#idFrameC .prod-icon-menu').find('li.ui-tabs-active'); }else{ $(this).find('i').removeClass('icon-double-angle-right').addClass('icon-double-angle-left') $('#idFrameC').width(360); @@ -1219,8 +1219,8 @@ $(document).ready(function () { $('.ui-resizable-handle, #basket_menu_trigger').show(); $('.WZbasketTab').css('background-position', '9px 25px'); $('#idFrameC').removeClass('closed'); - $('#idFrameC .icon-menu li').last().find('a').trigger('click'); - $('#idFrameC .icon-menu li').first().find('a').trigger('click'); + $('#idFrameC .prod-icon-menu li').last().find('a').trigger('click'); + $('#idFrameC .prod-icon-menu li').first().find('a').trigger('click'); $(previousTab).find('a').trigger('click'); } diff --git a/resources/www/prod/skins/ui-components/_workzone.scss b/resources/www/prod/skins/ui-components/_workzone.scss index 36c0f8e750..bf4fbf092c 100644 --- a/resources/www/prod/skins/ui-components/_workzone.scss +++ b/resources/www/prod/skins/ui-components/_workzone.scss @@ -137,10 +137,10 @@ $workzoneTabDisabledTextColor: $mediumTextActiveColor !default; } } - ul.icon-menu { + ul.prod-icon-menu { width: 100%; } - .icon-menu { + .prod-icon-menu { .WZtabs, .WZplugins { display: block; width: 70px; @@ -159,7 +159,7 @@ $workzoneTabDisabledTextColor: $mediumTextActiveColor !default; } } .closed { - .icon-menu li { + .prod-icon-menu li { clear: left; } } diff --git a/templates/web/account/access.html.twig b/templates/web/account/access.html.twig index d420fdeaba..c73a7063c6 100644 --- a/templates/web/account/access.html.twig +++ b/templates/web/account/access.html.twig @@ -181,7 +181,7 @@ {% set TOU = attribute(baseInfo["config"]["cgu"], app['locale']) %} - +

{{ "Access to the above bases constitutes acceptance of the following Terms of Use (TOU)." | trans }}

diff --git a/templates/web/account/change-password.html.twig b/templates/web/account/change-password.html.twig index cf5ed7dc57..93ae08b162 100644 --- a/templates/web/account/change-password.html.twig +++ b/templates/web/account/change-password.html.twig @@ -32,11 +32,11 @@
- {{ auth_macro.fieldInput(form.oldPassword, "passwordChangeForm", 'icon-lock') }} + {{ auth_macro.fieldInput(form.oldPassword, "passwordChangeForm", 'fa fa-lock') }}
- {{ auth_macro.repeatedInput(form.password, "passwordChangeForm", 'icon-lock') }} + {{ auth_macro.repeatedInput(form.password, "passwordChangeForm", 'fa fa-lock') }} {{ form_rest(form) }}
diff --git a/templates/web/account/reset-email.html.twig b/templates/web/account/reset-email.html.twig index 62b9be8785..ae8056b801 100644 --- a/templates/web/account/reset-email.html.twig +++ b/templates/web/account/reset-email.html.twig @@ -50,7 +50,7 @@
-   +   {{ "admin::compte-utilisateur: Pourquoi me demande-t-on mon mot de passe pour changer mon adresse email ?" | trans }}
{{ "admin::compte-utilisateur: Votre adresse e-mail sera utilisee lors de la perte de votre mot de passe afin de pouvoir le reinitialiser, il est important que vous soyez la seule personne a pouvoir la changer." | trans }} diff --git a/templates/web/admin/collection/collection.html.twig b/templates/web/admin/collection/collection.html.twig index 35af4790cb..ce48d7ae18 100644 --- a/templates/web/admin/collection/collection.html.twig +++ b/templates/web/admin/collection/collection.html.twig @@ -147,7 +147,7 @@ {% if app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(bas_id, constant('\\ACL::COLL_MANAGE')) %}
@@ -156,7 +156,7 @@ {{ 'admin::base:collection: aucun fichier (minilogo, watermark ...)' | trans }}
- + {% trans %}Select files...{% endtrans %} @@ -172,7 +172,7 @@ {% if app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(bas_id, constant('\\ACL::COLL_MANAGE')) %}
@@ -181,7 +181,7 @@ {{ 'admin::base:collection: aucun fichier (minilogo, watermark ...)' | trans }}
- + {% trans %}Select files...{% endtrans %} @@ -197,7 +197,7 @@ {% if app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(bas_id, constant('\\ACL::COLL_MANAGE')) %}
@@ -206,7 +206,7 @@ {{ 'admin::base:collection: aucun fichier (minilogo, watermark ...)' | trans }}
- + {% trans %}Select files...{% endtrans %} diff --git a/templates/web/admin/collection/reorder.html.twig b/templates/web/admin/collection/reorder.html.twig index 343671066f..a91f666cae 100644 --- a/templates/web/admin/collection/reorder.html.twig +++ b/templates/web/admin/collection/reorder.html.twig @@ -15,8 +15,16 @@ diff --git a/templates/web/admin/fields/templates.html.twig b/templates/web/admin/fields/templates.html.twig index cd83ce98b3..7a566a2df4 100644 --- a/templates/web/admin/fields/templates.html.twig +++ b/templates/web/admin/fields/templates.html.twig @@ -5,7 +5,7 @@ @@ -39,7 +39,9 @@
- +
- +
@@ -77,7 +81,11 @@ {% trans %}Order{% endtrans %} <%= field.sorter %> - + + + @@ -249,14 +257,14 @@ @@ -279,7 +287,8 @@ diff --git a/templates/web/admin/plugins/show_fallback.html.twig b/templates/web/admin/plugins/show_fallback.html.twig index 892579d26b..962312c44f 100644 --- a/templates/web/admin/plugins/show_fallback.html.twig +++ b/templates/web/admin/plugins/show_fallback.html.twig @@ -52,7 +52,7 @@ contentsDownloaded[e.target.hash] = true; }, function(error) { console.log(error); - targetDiv.empty().html('{{ 'admin::plugins: retrieveConfigurationError'|trans }}'); + targetDiv.empty().html(''); }); } }); diff --git a/templates/web/admin/statusbit/edit.html.twig b/templates/web/admin/statusbit/edit.html.twig index c1df6065ca..f8619f4d29 100644 --- a/templates/web/admin/statusbit/edit.html.twig +++ b/templates/web/admin/statusbit/edit.html.twig @@ -51,7 +51,7 @@
- + {% trans %}Select files...{% endtrans %} @@ -115,7 +115,7 @@
- + {% trans %}Select files...{% endtrans %} diff --git a/templates/web/admin/task-manager/index.html.twig b/templates/web/admin/task-manager/index.html.twig index 45af0c45d4..2cd87603ec 100644 --- a/templates/web/admin/task-manager/index.html.twig +++ b/templates/web/admin/task-manager/index.html.twig @@ -15,9 +15,9 @@
diff --git a/templates/web/admin/user/import/file.html.twig b/templates/web/admin/user/import/file.html.twig index 6f792730f4..f6d4ad6608 100644 --- a/templates/web/admin/user/import/file.html.twig +++ b/templates/web/admin/user/import/file.html.twig @@ -33,13 +33,17 @@
- {{ 'You can download an example by clicking here' | trans }} + {{ 'You can download an example by clicking here' | trans }} +
- {{ 'You can download the documentation here' | trans }} + {{ 'You can download the documentation here' | trans }} +
- + {% trans %}Select files...{% endtrans %} diff --git a/templates/web/common/macros.html.twig b/templates/web/common/macros.html.twig index 7bd1f095b2..a8abb904d6 100644 --- a/templates/web/common/macros.html.twig +++ b/templates/web/common/macros.html.twig @@ -15,7 +15,8 @@
- {{ "Incorrect please try again" | trans }} + {{ "Incorrect please try again" | trans }}
@@ -28,9 +29,13 @@ @@ -38,9 +43,12 @@ @@ -67,7 +75,7 @@
- +
<%= name %>
<%= tag %>
 - +
ID PID
- - - + + +
- - - + + +
{{ message }} diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig index 4d0de42c83..f3396d960b 100644 --- a/templates/web/common/menubar.html.twig +++ b/templates/web/common/menubar.html.twig @@ -139,7 +139,7 @@ {{ 'phraseanet:: aide' | trans }} + id="help-trigger"> diff --git a/templates/web/lightbox/feed_options_box.html.twig b/templates/web/lightbox/feed_options_box.html.twig index e8afc3eb9b..ea555b12cb 100644 --- a/templates/web/lightbox/feed_options_box.html.twig +++ b/templates/web/lightbox/feed_options_box.html.twig @@ -1,25 +1,25 @@ {% if feed_element %} diff --git a/templates/web/lightbox/sc_options_box.html.twig b/templates/web/lightbox/sc_options_box.html.twig index 7f5813ee6e..930ef37f98 100644 --- a/templates/web/lightbox/sc_options_box.html.twig +++ b/templates/web/lightbox/sc_options_box.html.twig @@ -1,25 +1,25 @@ {% if basket_element %} @@ -27,7 +27,7 @@ | {% if basket_element.getBasket().getValidation() %}
- + {{ form_widget(field, { 'attr': attributes })}} @@ -70,7 +70,8 @@
- + {% if errors|keys|length >= 1 %} {% for error in errors %}
+ @@ -122,16 +123,16 @@
  • - {{ user.getDisplayName() }} + {{ user.getDisplayName() }}
    • {% if user.getEmail() %}
  • - {{ user.getEmail() }} + {{ user.getEmail() }}
    • {% endif %} {% if user.getCompany() %}
  • - {{ user.getCompany() }} + {{ user.getCompany() }}
    • {% endif %}
@@ -140,19 +141,19 @@ {% macro alert(type, message) %}
- {% set sign = "icon-exclamation-sign" %} + {% set sign = "fa fa-exclamation-circle" %} {% if type == "error" %} - {% set sign = "icon-warning-sign" %} + {% set sign = "fa fa-exclamation-triangle" %} {% elseif type == "success" %} - {% set sign = "icon-ok-sign" %} + {% set sign = "fa fa-check-circle" %} {% elseif type == "info" %} - {% set sign = "icon-info-sign" %} + {% set sign = "fa fa-info-circle" %} {% endif %} - + diff --git a/templates/web/login/common/templates.html.twig b/templates/web/login/common/templates.html.twig index 313b6189db..1b288d6f49 100644 --- a/templates/web/login/common/templates.html.twig +++ b/templates/web/login/common/templates.html.twig @@ -4,7 +4,8 @@
{{ message }} ×
- + @@ -68,14 +68,14 @@
@@ -86,9 +86,9 @@ {% for order in orders_todo %} {% set deadline = order.getDeadline()|date('d/m/Y') %}
order.getDeadline() ? "style=color:#777": "" }}> - order.getDeadline() ? "style=color:#777": "" }}> - @@ -102,7 +103,9 @@
+ <% _.each(errors, function(error) { %>
<%= error.message %>
diff --git a/templates/web/login/forgot-password.html.twig b/templates/web/login/forgot-password.html.twig index c88524e48f..6b9e57dbe5 100644 --- a/templates/web/login/forgot-password.html.twig +++ b/templates/web/login/forgot-password.html.twig @@ -36,7 +36,7 @@ {% endif %}
- {{ auth_macro.fieldInput(form.email, "forgottenPasswordForm", "icon-envelope") }} + {{ auth_macro.fieldInput(form.email, "forgottenPasswordForm", "fa fa-envelope") }}
{{ form_rest(form) }} diff --git a/templates/web/login/include/language-block.html.twig b/templates/web/login/include/language-block.html.twig index 54884bb36f..8aaea530a8 100644 --- a/templates/web/login/include/language-block.html.twig +++ b/templates/web/login/include/language-block.html.twig @@ -1,6 +1,7 @@
- +
diff --git a/templates/web/prod/orders/order_box.html.twig b/templates/web/prod/orders/order_box.html.twig index dcf1b69afc..77ae79b8ec 100644 --- a/templates/web/prod/orders/order_box.html.twig +++ b/templates/web/prod/orders/order_box.html.twig @@ -23,7 +23,7 @@
@@ -52,7 +52,7 @@
- +
- - + + + @@ -136,9 +136,10 @@ {% for order in orders_processed %} {% set deadline = order.getDeadline()|date('d/m/Y') %}
- - + + + @@ -185,10 +186,13 @@ {% set previousPage = page < 2 ? false : (page - 1) %} {% set nextPage = page >= (totalTodo / perPage)|ceil ? false : (page + 1) %} {% if previousPage %} - + {% endif %} {% if nextPage %} - + {% endif %} @@ -198,10 +202,13 @@ {% set previousPage = page < 2 ? false : (page - 1) %} {% set nextPage = page >= (totalProcessed / perPage)|ceil ? false : (page + 1) %} {% if previousPage %} - + {% endif %} {% if nextPage %} - + {% endif %} diff --git a/templates/web/prod/orders/order_item.html.twig b/templates/web/prod/orders/order_item.html.twig index f69a50729e..32ebc06112 100644 --- a/templates/web/prod/orders/order_item.html.twig +++ b/templates/web/prod/orders/order_item.html.twig @@ -5,7 +5,8 @@
{{ 'Il se peux que vous ne voyez pas tous les elements. Vous ne verrez que les elements correspondants aux collections sur lesquelles vous gerez les commandes' | trans }}
- + 		{{ displayName }} ({{ order.getUser().getEmail() }}) - - - + + +
- +
@@ -176,9 +179,13 @@
@@ -187,9 +194,9 @@ {% include 'common/preview.html.twig' with {'record': order.getElements()[0].getRecord(app)}%}
- - - + + + {{ 'order-manager::order-item: information' | trans }}
@@ -207,9 +214,14 @@
- - - + + +
diff --git a/templates/web/prod/preview/basket_train.html.twig b/templates/web/prod/preview/basket_train.html.twig index 14715074dd..1a1daa19f7 100644 --- a/templates/web/prod/preview/basket_train.html.twig +++ b/templates/web/prod/preview/basket_train.html.twig @@ -51,10 +51,10 @@

{{ 'preview:: demarrer le diaporama' | trans }} {{ 'preview:: arreter le diaporama' | trans }} diff --git a/templates/web/prod/preview/feed_train.html.twig b/templates/web/prod/preview/feed_train.html.twig index 867de472d0..4fd455e9fe 100644 --- a/templates/web/prod/preview/feed_train.html.twig +++ b/templates/web/prod/preview/feed_train.html.twig @@ -49,10 +49,10 @@

{{ 'preview:: demarrer le diaporama' | trans }} {{ 'preview:: arreter le diaporama' | trans }} diff --git a/templates/web/prod/preview/reg_train.html.twig b/templates/web/prod/preview/reg_train.html.twig index 743e3ca8c4..0a751418af 100644 --- a/templates/web/prod/preview/reg_train.html.twig +++ b/templates/web/prod/preview/reg_train.html.twig @@ -85,10 +85,10 @@

{{ 'preview:: demarrer le diaporama' | trans }} {{ 'preview:: arreter le diaporama' | trans }} diff --git a/templates/web/prod/preview/result_train.html.twig b/templates/web/prod/preview/result_train.html.twig index 4c4beb41d6..2b8110c09d 100644 --- a/templates/web/prod/preview/result_train.html.twig +++ b/templates/web/prod/preview/result_train.html.twig @@ -45,10 +45,10 @@

{{ 'preview:: demarrer le diaporama' | trans }} {{ 'preview:: arreter le diaporama' | trans }} diff --git a/templates/web/prod/preview/result_train_options.html.twig b/templates/web/prod/preview/result_train_options.html.twig index be233ff88a..9120495e15 100644 --- a/templates/web/prod/preview/result_train_options.html.twig +++ b/templates/web/prod/preview/result_train_options.html.twig @@ -2,12 +2,12 @@
{{ 'preview:: demarrer le diaporama' | trans }} {{ 'preview:: arreter le diaporama' | trans }}
diff --git a/templates/web/prod/results/record.html.twig b/templates/web/prod/results/record.html.twig index b7f34f1b1d..1c5765f233 100644 --- a/templates/web/prod/results/record.html.twig +++ b/templates/web/prod/results/record.html.twig @@ -77,31 +77,34 @@ {% if settings.rollover_thumbnail == 'caption' %} {% if record_subdef_url(record, 'preview') is not null and has_access_subdef(record, 'preview') %} - - - + + + {% endif %} {% endif %} {% if settings.rollover_thumbnail == 'preview' %} - - - + + + {% endif %} {% if settings.technical_display == '1' %} - - - + + + {% endif %} {% if settings.show_context_menu %} - - - + + + diff --git a/templates/web/prod/tab_headers.html.twig b/templates/web/prod/tab_headers.html.twig index ac694514e9..d4b5ae850f 100644 --- a/templates/web/prod/tab_headers.html.twig +++ b/templates/web/prod/tab_headers.html.twig @@ -1,5 +1,5 @@ {% block tab_headers_wrapper %} -
    +
      {% block tab_headers %} {% if GV_thesaurus %}
    • diff --git a/templates/web/prod/tab_thesaurus.html.twig b/templates/web/prod/tab_thesaurus.html.twig index 33fe6bcd12..7ad6feb90e 100644 --- a/templates/web/prod/tab_thesaurus.html.twig +++ b/templates/web/prod/tab_thesaurus.html.twig @@ -22,11 +22,11 @@
      diff --git a/templates/web/prod/templates/push.html.twig b/templates/web/prod/templates/push.html.twig index bac695439b..57d4aee2cb 100644 --- a/templates/web/prod/templates/push.html.twig +++ b/templates/web/prod/templates/push.html.twig @@ -164,7 +164,7 @@
      - + {% trans %} The parameter "force authentication" forces the recipient(s) of the push to possess a Phraseanet account to see its contents.