hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 11:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

refatored html code to use proper font-awesome classes

Browse Source
This commit is contained in:
Mike Ng
2018-01-19 13:32:20 +04:00
parent 431d9dc46a
commit 802c52d7ff
51 changed files with 233 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bower.json
View File

@@ -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"

2
package.json
View File

@@ -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",

6
resources/gulp/components/common.js
View File

@@ -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'));
});

3
resources/www/_shared/styles/_variables.scss
View File

@@ -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;

2
resources/www/account/styles/main.scss
View File

@@ -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;

3
resources/www/authentication/styles/main.scss
View File

@@ -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

2
resources/www/common/styles/main.scss
View File

@@ -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;

6
resources/www/prod/js/jquery.main-prod.js
View File

@@ -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');
}

6
resources/www/prod/skins/ui-components/_workzone.scss
View File

@@ -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;
}
}

2
templates/web/account/access.html.twig
View File

@@ -181,7 +181,7 @@
{% set TOU = attribute(baseInfo["config"]["cgu"], app['locale']) %}
<tr>
<td colspan="3" style="text-align: center;">
<i class="icon-warning"></i>
<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
<h4>{{ "Access to the above bases constitutes acceptance of the following Terms of Use (TOU)." | trans }}</h4>
</td>
</tr>

4
templates/web/account/change-password.html.twig
View File

@@ -32,11 +32,11 @@
</div>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.oldPassword, "passwordChangeForm", 'icon-lock') }}
{{ auth_macro.fieldInput(form.oldPassword, "passwordChangeForm", 'fa fa-lock') }}
</div>
</div>
{{ auth_macro.repeatedInput(form.password, "passwordChangeForm", 'icon-lock') }}
{{ auth_macro.repeatedInput(form.password, "passwordChangeForm", 'fa fa-lock') }}
{{ form_rest(form) }}
<div class="row-fluid">

2
templates/web/account/reset-email.html.twig
View File

@@ -50,7 +50,7 @@
</div>
</form>
<div class="well well-small alert-info">
<i class="icon icon-info-sign"></i> &nbsp;
<i class="icon fa fa-info-circle" aria-hidden="true"></i> &nbsp;
<b>{{ "admin::compte-utilisateur: Pourquoi me demande-t-on mon mot de passe pour changer mon adresse email ?" | trans }}</b>
<br />
{{ "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 }}

12
templates/web/admin/collection/collection.html.twig
View File

@@ -147,7 +147,7 @@
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(bas_id, constant('\\ACL::COLL_MANAGE')) %}
<form method="post" action="{{ path('admin_collection_delete_logo', { 'bas_id' : bas_id }) }}" style="margin:0;">
<button class="btn btn-danger btn-mini" >
<i class="icon-trash icon-white"></i>
<i class="fa fa-trash-o icon-white" aria-hidden="true"></i>
{{ 'boutton::supprimer' | trans }}
</button>
</form>
@@ -156,7 +156,7 @@
<span>{{ 'admin::base:collection: aucun fichier (minilogo, watermark ...)' | trans }}</span>
<form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_logo', { 'bas_id' : bas_id }) }}" style="margin:0;">
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<i class="fa fa-plus icon-white" aria-hidden="true"></i>
<span>{% trans %}Select files...{% endtrans %}</span>
<input name="newLogo" type="file" accept="image/*" />
</span>
@@ -172,7 +172,7 @@
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(bas_id, constant('\\ACL::COLL_MANAGE')) %}
<form method="post" action="{{ path('admin_collection_delete_watermark', { 'bas_id' : bas_id }) }}" style="margin:0;">
<button class="btn btn-danger btn-mini">
<i class="icon-trash icon-white"></i>
<i class="fa fa-trash-o icon-white" aria-hidden="true"></i>
{{ 'boutton::supprimer' | trans }}
</button>
</form>
@@ -181,7 +181,7 @@
<span>{{ 'admin::base:collection: aucun fichier (minilogo, watermark ...)' | trans }}</span>
<form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_watermark', { 'bas_id' : bas_id }) }}" style="margin:0;">
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<i class="fa fa-plus icon-white" aria-hidden="true"></i>
<span>{% trans %}Select files...{% endtrans %}</span>
<input name="newWm" type="file" accept="image/*" />
</span>
@@ -197,7 +197,7 @@
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(bas_id, constant('\\ACL::COLL_MANAGE')) %}
<form method="post" action="{{ path('admin_collection_delete_stamp', { 'bas_id' : bas_id }) }}" style="margin:0;">
<button class="btn btn-danger btn-mini">
<i class="icon-trash icon-white"></i>
<i class="fa fa-trash-o icon-white" aria-hidden="true"></i>
{{ 'boutton::supprimer' | trans }}
</button>
</form>
@@ -206,7 +206,7 @@
<span>{{ 'admin::base:collection: aucun fichier (minilogo, watermark ...)' | trans }}</span>
<form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_stamp', { 'bas_id' : bas_id }) }}" style="margin:0;">
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<i class="fa fa-plus icon-white" aria-hidden="true"></i>
<span>{% trans %}Select files...{% endtrans %}</span>
<input name="newStamp" type="file" accept="image/*" />
</span>

12
templates/web/admin/collection/reorder.html.twig
View File

@@ -15,8 +15,16 @@
</td>
<td valign="center" align="left">
<ul style="list-style:none;">
<li><button class="btn" id="upbutton" disabled><i class="icon-chevron-up"></i>{{ 'admin::base:collorder: monter' | trans }}</button></li>
<li><button class="btn" id="downbutton" disabled ><i class="icon-chevron-down"></i>{{ 'admin::base:collorder: descendre' | trans }}</button></li>
<li>
<button class="btn" id="upbutton" disabled><i class="fa fa-chevron-up"
aria-hidden="true"></i>{{ 'admin::base:collorder: monter' | trans }}
</button>
</li>
<li>
<button class="btn" id="downbutton" disabled><i class="fa fa-chevron-down"
aria-hidden="true"></i>{{ 'admin::base:collorder: descendre' | trans }}
</button>
</li>
<li><a href="#" id="natcase-reorder">{{ 'admin::base:collorder: reinitialiser en ordre alphabetique' | trans }}</a></li>
</ul>
</td>

23
templates/web/admin/fields/templates.html.twig
View File

@@ -5,7 +5,7 @@
<script type="text/template" id="save_template">
<button type="button" class="btn btn-primary save-all">
<i class="icon-hdd icon-white"></i> {% trans %}Save all changes{% endtrans %}
<i class="fa fa-hdd-o icon-white" aria-hidden="true"></i> {% trans %}Save all changes{% endtrans %}
</button>
</script>
@@ -39,7 +39,9 @@
<div class="row-fluid">
<div class="span12">
<div class="sidebar-add-block">
<button type="button" class="btn btn-success btn-add-field"><i class="icon-plus icon-white"></i>{% trans %}Add a new field{% endtrans %}</button>
<button type="button" class="btn btn-success btn-add-field"><i class="fa fa-plus icon-white"
aria-hidden="true"></i>{% trans %}Add a
new field{% endtrans %}</button>
</div>
<div class="well well-small add-field-block" style="display:none">
<h3>{% trans %}Add a new field{% endtrans %}</h3>
@@ -60,7 +62,9 @@
</div>
<div class="control-group">
<div class="controls">
<button type="button" class="btn btn-success btn-submit-field"><i class="icon-ok icon-white"></i>{% trans %}Add{% endtrans %}</button>
<button type="button" class="btn btn-success btn-submit-field"><i
class="fa fa-check icon-white" aria-hidden="true"></i>{% trans %}
Add{% endtrans %}</button>
<button type="button" class="btn btn-cancel-field">{% trans %}Cancel{% endtrans %}</button>
</div>
</div>
@@ -77,7 +81,11 @@
<tr class="edit-order">
<td>{% trans %}Order{% endtrans %}</td>
<td><%= field.sorter %></td>
<td><button type="button" class="btn btn-danger delete-field pull-right"><i class="icon-trash icon-white"></i>delete</button></td>
<td>
<button type="button" class="btn btn-danger delete-field pull-right"><i
class="fa fa-trash-o icon-white" aria-hidden="true"></i>delete
</button>
</td>
</tr>
<tr class="edit-name">
<td colspan="2">
@@ -249,14 +257,14 @@
<table>
<tr>
<td class="handle">
<i class="icon-move"></i>
<i class="fa fa-arrows" aria-hidden="true"></i>
</td>
<td rowspan="2" class="trigger-click">
<div class="field-name"><%= name %></div>
<div class="field-tag"><%= tag %></div>
</td>
<td rowspan="2" class="chip trigger-click">
<i class="icon-chevron-right"></i>
<i class="fa fa-chevron-right" aria-hidden="true"></i>
</td>
</tr>
<tr>
@@ -279,7 +287,8 @@
<script type="text/template" id="field_error_template">
<% if(messages.length > 0) { %>
<div class="well well-small">
<i class="icon-exclamation-sign"></i> {% trans %}Current configuration contains some errors{% endtrans %}
<i class="fa fa-exclamation-circle" aria-hidden="true"></i> {% trans %}Current configuration contains some
errors{% endtrans %}
</div>
<% } %>
</script>

2
templates/web/admin/plugins/show_fallback.html.twig
View File

@@ -52,7 +52,7 @@
contentsDownloaded[e.target.hash] = true;
}, function(error) {
console.log(error);
targetDiv.empty().html('<i class="icon-fire">{{ 'admin::plugins: retrieveConfigurationError'|trans }}</i>');
targetDiv.empty().html('<i class="fa fa-fire" aria-hidden="true">{{ 'admin::plugins: retrieveConfigurationError'|trans }}</i>');
});
}
});

4
templates/web/admin/statusbit/edit.html.twig
View File

@@ -51,7 +51,7 @@
</label>
<div class="controls clearfix">
<span class="btn btn-success fileinput-button pull-left">
<i class="icon-plus icon-white"></i>
<i class="fa fa-plus icon-white" aria-hidden="true"></i>
<span>{% trans %}Select files...{% endtrans %}</span>
<input type="file" name="image_off" accept="image/jpg, image/png"/>
</span>
@@ -115,7 +115,7 @@
</label>
<div class="controls clearfix">
<span class="btn btn-success fileinput-button pull-left">
<i class="icon-plus icon-white"></i>
<i class="fa fa-plus icon-white" aria-hidden="true"></i>
<span>{% trans %}Select files...{% endtrans %}</span>
<input type="file" name="image_on" accept="image/jpg, image/png"/>
</span>

4
templates/web/admin/task-manager/index.html.twig
View File

@@ -15,9 +15,9 @@
<tr>
<th class="refresh-view" style="width:80px;" data-refresh-url="{{ path('admin_tasks_live_info') }}">
<button class="btn btn-refresh">
<i class="icon icon-refresh"/>
<i class="icon fa fa-refresh" aria-hidden="true"/>
</button>
<i id="spinner" style="font-size:16px" class='icon-spinner icon-spin'>
<i id="spinner" style="font-size:16px" class="fa fa-spinner icon-spin" aria-hidden="true">
</th>
<th>ID</th>
<th>PID</th>

10
templates/web/admin/user/import/file.html.twig
View File

@@ -33,13 +33,17 @@
<div>
<div class="well well-small">
<a target="_blank" href="{{ path('users_import_csv') }}" class="no-ajax"> <i class="icon-share"></i> {{ 'You can download an example by clicking here' | trans }}</a>
<a target="_blank" href="{{ path('users_import_csv') }}" class="no-ajax"> <i class="fa fa-share-square-o"
aria-hidden="true"></i> {{ 'You can download an example by clicking here' | trans }}
</a>
</div>
<div class="well well-small">
<a target="_blank" href="{{ path('users_import_rtf') }}" class="no-ajax"> <i class="icon-share"></i> {{ 'You can download the documentation here' | trans }}</a>
<a target="_blank" href="{{ path('users_import_rtf') }}" class="no-ajax"> <i class="fa fa-share-square-o"
aria-hidden="true"></i> {{ 'You can download the documentation here' | trans }}
</a>
</div>
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<i class="fa fa-plus icon-white" aria-hidden="true"></i>
<span>{% trans %}Select files...{% endtrans %}</span>
<input id="fileupload" type="file" name="files" data-url="/admin/users/import/file/" accept="text/csv, text/rtf">
</span>

24
templates/web/common/macros.html.twig
View File

@@ -15,7 +15,8 @@
</div>
<div class="row-fluid recaptcha_only_if_incorrect_sol">
<div class="alert-error" style="padding:2px;margin: 2px 0;border:1px solid #c9322b">
<i class="icon-warning-sign"></i> {{ "Incorrect please try again" | trans }}
<i class="fa fa-exclamation-triangle"
aria-hidden="true"></i> {{ "Incorrect please try again" | trans }}
</div>
</div>
@@ -28,9 +29,13 @@
</td>
<td style="width:70px;"class="text-right hidden-phone">
<div class="btn-group">
<a href="javascript:Recaptcha.reload()" class="btn btn-mini btn-info"><i class="icon-refresh"></i></a>
<a href="javascript:Recaptcha.switch_type('image')" class="btn btn-mini btn-info"><i class="icon-volume-up"></i></a>
<a href="javascript:Recaptcha.showhelp()" class="btn btn-mini btn-info"><i class="icon-question-sign"></i></a>
<a href="javascript:Recaptcha.reload()" class="btn btn-mini btn-info"><i
class="fa fa-refresh" aria-hidden="true"></i></a>
<a href="javascript:Recaptcha.switch_type('image')"
class="btn btn-mini btn-info"><i class="fa fa-volume-up"
aria-hidden="true"></i></a>
<a href="javascript:Recaptcha.showhelp()" class="btn btn-mini btn-info"><i
class="fa fa-question-sign" aria-hidden="true"></i></a>
</div>
</td>
</tr>
@@ -38,9 +43,12 @@
<td>
<div class="btn-toolbar">
<div class="btn-group text-right">
<a href="javascript:Recaptcha.reload()" class="btn btn-info"><i class="icon-refresh"></i></a>
<a href="javascript:Recaptcha.switch_type('image')" class="btn btn-info"><i class="icon-volume-up"></i></a>
<a href="javascript:Recaptcha.showhelp()" class="btn btn-info"><i class="icon-question-sign"></i></a>
<a href="javascript:Recaptcha.reload()" class="btn btn-info"><i
class="fa fa-refresh" aria-hidden="true"></i></a>
<a href="javascript:Recaptcha.switch_type('image')" class="btn btn-info"><i
class="fa fa-volume-up" aria-hidden="true"></i></a>
<a href="javascript:Recaptcha.showhelp()" class="btn btn-info"><i
class="fa fa-question-sign" aria-hidden="true"></i></a>
</div>
</div>
</td>
@@ -67,7 +75,7 @@
<table>
<tr>
<td class="alert-block-logo">
<i class="icon-2x icon-white icon-exclamation-sign"></i>
<i class="fa-2x icon-white fa fa-exclamation-circle" aria-hidden="true"></i>
</td>
<td class="alert-block-content">{{ message }}</td>
<td class="alert-block-close">

2
templates/web/common/menubar.html.twig
View File

@@ -139,7 +139,7 @@
<span>
{{ 'phraseanet:: aide' | trans }}
<span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;"
id="help-trigger"> <i class="icon-caret-down"></i></span>
id="help-trigger"> <i class="fa fa-caret-down" aria-hidden="true"></i></span>
</span>
</a>
<table cellspacing="0" cellpadding="0" style="display:none;" class="contextMenu helpcontextmenu">

14
templates/web/lightbox/feed_options_box.html.twig
View File

@@ -1,25 +1,25 @@
<span style="padding:10px 4px 7px;">
{% if feed_element %}
<button class="previous_button play btn btn-mini" title="{{ 'boutton::precedent' | trans }}">
<i class="icon-chevron-left"></i>
<i class="fa fa-chevron-left" aria-hidden="true"></i>
</button>
<button class="previous_button pause btn btn-mini btn-inverse" title="{{ 'boutton::precedent' | trans }}">
<i class="icon-chevron-left icon-white"></i>
<i class="fa fa-chevron-left icon-white" aria-hidden="true"></i>
</button>
<button class="play_button btn btn-mini" title="{{ 'boutton::demarrer' | trans }}">
<i class="icon-play"></i>
<i class="fa fa-play" aria-hidden="true"></i>
</button>
<button class="pause_button btn btn-mini" title="{{ 'boutton::pause' | trans }}">
<i class="icon-pause"></i>
<i class="fa fa-pause" aria-hidden="true"></i>
</button>
<button class="next_button play btn btn-mini" title="{{ 'boutton::suivant' | trans }}">
<i class="icon-chevron-right"></i>
<i class="fa fa-chevron-right" aria-hidden="true"></i>
</button>
<button class="next_button pause btn btn-mini btn-inverse" title="{{ 'boutton::suivant' | trans }}">
<i class="icon-chevron-right icon-white"></i>
<i class="fa fa-chevron-right icon-white" aria-hidden="true"></i>
</button>
<button class="download_button btn btn-mini btn-inverse" title="{{ 'boutton::telecharger' | trans }}">
<i class="icon-download icon-white"></i>
<i class="fa fa-arrow-circle-o-down icon-white" aria-hidden="true"></i>
</button>
<form name="download_form" style="display:none;">
<input type="hidden" name="basrec" value="{{feed_element.getRecord(app).get_serialize_key()}}"/>

16
templates/web/lightbox/sc_options_box.html.twig
View File

@@ -1,25 +1,25 @@
<span style="padding:10px 4px 7px;">
{% if basket_element %}
<button class="previous_button play btn btn-mini" title="{{ 'boutton::precedent' | trans }}">
<i class="icon-chevron-left"></i>
<i class="fa fa-chevron-left" aria-hidden="true"></i>
</button>
<button class="previous_button pause btn btn-mini btn-inverse" title="{{ 'boutton::precedent' | trans }}" style="display:none">
<i class="icon-chevron-left icon-white"></i>
<i class="fa fa-chevron-left icon-white" aria-hidden="true"></i>
</button>
<button class="play_button btn btn-mini" title="{{ 'boutton::demarrer' | trans }}">
<i class="icon-play"></i>
<i class="fa fa-play" aria-hidden="true"></i>
</button>
<button class="pause_button btn btn-mini" title="{{ 'boutton::pause' | trans }}" style="display:none">
<i class="icon-pause"></i>
<i class="fa fa-pause" aria-hidden="true"></i>
</button>
<button class="next_button play btn btn-mini" title="{{ 'boutton::suivant' | trans }}">
<i class="icon-chevron-right"></i>
<i class="fa fa-chevron-right" aria-hidden="true"></i>
</button>
<button class="next_button pause btn btn-mini btn-inverse" title="{{ 'boutton::suivant' | trans }}" style="display:none">
<i class="icon-chevron-right icon-white"></i>
<i class="fa fa-chevron-right icon-white" aria-hidden="true"></i>
</button>
<button class="download_button btn btn-mini btn-inverse" title="{{ 'boutton::telecharger' | trans }}">
<i class="icon-download icon-white"></i>
<i class="fa fa-arrow-circle-o-down icon-white" aria-hidden="true"></i>
</button>
<form name="download_form" style="display:none;">
<input type="hidden" name="basrec" value="{{basket_element.getRecord(app).get_serialize_key()}}"/>
@@ -27,7 +27,7 @@
|
{% if basket_element.getBasket().getValidation() %}
<button class="comment_button btn btn-mini btn-inverse">
<i class="icon-edit icon-white"></i>
<i class="fa fa-pencil-square-o icon-white" aria-hidden="true"></i>
{% set n = 0 %}
{% for validationData in basket_element.getValidationDatas() %}
{% if validationData.getNote() %}

21
templates/web/login/common/macros.html.twig
View File

@@ -11,7 +11,7 @@
<table class="input-table">
<tr>
<td class="icon">
<i class="{{ icon_name|default('icon-angle-right') }} icon-white"></i>
<i class="{{ icon_name|default('fa fa-angle-right') }} icon-white"></i>
</td>
<td class="input">
{{ form_widget(field, { 'attr': attributes })}}
@@ -70,7 +70,8 @@
<div class="popover-content">
<table>
<tr>
<td style="width:35px;"><i class="icon-warning-sign icon-white"></i></td>
<td style="width:35px;"><i class="fa fa-exclamation-triangle icon-white" aria-hidden="true"></i>
</td>
{% if errors|keys|length >= 1 %}
{% for error in errors %}
<td>
@@ -122,16 +123,16 @@
<div class="authentication-user-pres-phraseanet well">
<ul class="unstyled">
<li class="one-line">
<i class="icon-user"></i>{{ user.getDisplayName() }}
<i class="fa fa-user" aria-hidden="true"></i>{{ user.getDisplayName() }}
</li>
{% if user.getEmail() %}
<li class="one-line">
<i class="icon-envelope"></i>{{ user.getEmail() }}
<i class="fa fa-envelope" aria-hidden="true"></i>{{ user.getEmail() }}
</li>
{% endif %}
{% if user.getCompany() %}
<li class="one-line">
<i class="icon-briefcase"></i>{{ user.getCompany() }}
<i class="fa fa-briefcase" aria-hidden="true"></i>{{ user.getCompany() }}
</li>
{% endif %}
</ul>
@@ -140,19 +141,19 @@
{% macro alert(type, message) %}
<div class="alert alert-{{ type }}">
{% 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 %}
<table>
<tr>
<td class="alert-block-logo"><i class="icon-2x icon-white {{ sign }}"></i></td>
<td class="alert-block-logo"><i class="fa-2x icon-white {{ sign }}"></i></td>
<td class="alert-block-content">{{ message }}</td>
<td class="alert-block-close"><a href="#"><b>&times;</b></a></td>
</tr>

3
templates/web/login/common/templates.html.twig
View File

@@ -4,7 +4,8 @@
<div class="popover-content">
<table>
<tr>
<td style="width:35px;"><i class="icon-warning-sign icon-white"></i></td>
<td style="width:35px;"><i class="fa fa-exclamation-triangle icon-white" aria-hidden="true"></i>
</td>
<td>
<% _.each(errors, function(error) { %>
<div><%= error.message %></div>

2
templates/web/login/forgot-password.html.twig
View File

@@ -36,7 +36,7 @@
{% endif %}
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.email, "forgottenPasswordForm", "icon-envelope") }}
{{ auth_macro.fieldInput(form.email, "forgottenPasswordForm", "fa fa-envelope") }}
</div>
</div>
{{ form_rest(form) }}

3
templates/web/login/include/language-block.html.twig
View File

@@ -1,6 +1,7 @@
<div id="authentication-sidebar-language" class="text-right well-small clearfix">
<div class="pull-left">
<a href="{{ path("homepage") }}" title="{{ "Home" | trans }}"><i class="icon-home icon-white"></i></a>
<a href="{{ path("homepage") }}" title="{{ "Home" | trans }}"><i class="fa fa-home icon-white"
aria-hidden="true"></i></a>
</div>
<div class="pull-right btn-group">
<button id="language-button" class="btn btn-mini btn-flat dropdown-toggle" data-toggle="dropdown" type="button">

4
templates/web/login/index.html.twig
View File

@@ -57,12 +57,12 @@
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.login, "loginForm", 'icon-envelope') }}
{{ auth_macro.fieldInput(form.login, "loginForm", 'fa fa-envelope') }}
</div>
</div>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.password, "loginForm", 'icon-lock') }}
{{ auth_macro.fieldInput(form.password, "loginForm", 'fa fa-lock') }}
</div>
</div>
<div class="text-right">

4
templates/web/login/oauth/login.html.twig
View File

@@ -45,12 +45,12 @@
{% endif %}
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.email, "loginForm", 'icon-envelope') }}
{{ auth_macro.fieldInput(form.email, "loginForm", 'fa fa-envelope') }}
</div>
</div>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.password, "loginForm", 'icon-lock') }}
{{ auth_macro.fieldInput(form.password, "loginForm", 'fa fa-lock') }}
</div>
</div>
<div class="text-right">

4
templates/web/login/providers/bind.html.twig
View File

@@ -46,12 +46,12 @@
{% endif %}
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.login, "loginForm", 'icon-envelope') }}
{{ auth_macro.fieldInput(form.login, "loginForm", 'fa fa-envelope') }}
</div>
</div>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.password, "loginForm", 'icon-lock') }}
{{ auth_macro.fieldInput(form.password, "loginForm", 'fa fa-lock') }}
</div>
</div>
<div class="text-right">

4
templates/web/login/providers/mapping.html.twig
View File

@@ -62,12 +62,12 @@
{% endif %}
<div class="row-fluid hidden">
<div class="span12">
{{ auth_macro.fieldInput(form.login, "loginForm", 'icon-envelope', {'value' : 'nard', 'autocomplete' : 'off' }) }}
{{ auth_macro.fieldInput(form.login, "loginForm", 'fa fa-envelope', {'value' : 'nard', 'autocomplete' : 'off' }) }}
</div>
</div>
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.password, "loginForm", 'icon-lock') }}
{{ auth_macro.fieldInput(form.password, "loginForm", 'fa fa-lock') }}
</div>
</div>
<div class="text-right">

4
templates/web/login/register-classic.html.twig
View File

@@ -40,11 +40,11 @@
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.email, "registerForm", 'icon-envelope') }}
{{ auth_macro.fieldInput(form.email, "registerForm", 'fa fa-envelope') }}
</div>
</div>
{{ auth_macro.repeatedInput(form.password, "registerForm", 'icon-lock') }}
{{ auth_macro.repeatedInput(form.password, "registerForm", 'fa fa-lock') }}
{% for field in registration_fields %}
{% set name = field['name'] %}

2
templates/web/login/register-provider.html.twig
View File

@@ -41,7 +41,7 @@
{% endif %}
<div class="row-fluid">
<div class="span12">
{{ auth_macro.fieldInput(form.email, "registerForm", 'icon-envelope') }}
{{ auth_macro.fieldInput(form.email, "registerForm", 'fa fa-envelope') }}
</div>
</div>

2
templates/web/login/register.html.twig
View File

@@ -22,7 +22,7 @@
{{ "Create an account manually" | trans }}
</span>
<span class="pull-right">
<i class="icon-arrow-right icon-white"></i>
<i class="fa fa-arrow-right icon-white" aria-hidden="true"></i>
</span>
</a>
</div>

2
templates/web/login/renew-password.html.twig
View File

@@ -32,7 +32,7 @@
</div>
{% endif %}
{{ auth_macro.repeatedInput(form.password, "passwordRenewForm", 'icon-lock') }}
{{ auth_macro.repeatedInput(form.password, "passwordRenewForm", 'fa fa-lock') }}
{{ form_rest(form) }}
<div class="row-fluid">

2
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -314,7 +314,7 @@
href="#"
{% endif %}
class="WorkZoneElementRemover {{ wz_scope }}" title="{{ 'delete' | trans }}" >
<i class="icon-remove"></i>
<i class="fa fa-times" aria-hidden="true"></i>
</a>
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') == '1' %}
<div class="captionRolloverTips" tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.getNumber() }) }}"></div>

6
templates/web/prod/actions/Tools/index.html.twig
View File

@@ -211,7 +211,8 @@
<div id="image" class="tabBox">
<div class="text-info">
<i class=" icon-info-sign"></i> {% trans %}Changes for rotation will be applied only on the sub-definitions of "image" type.{% endtrans %}
<i class="fa fa-info-circle" aria-hidden="true"></i> {% trans %}Changes for rotation will be applied only on
the sub-definitions of "image" type.{% endtrans %}
</div>
<form name="formpushdoc" action="{{ path('prod_tools_rotate') }}" method="post">
<fieldset style='border:1px solid #999;padding:20px;'>
@@ -242,7 +243,8 @@
<div id="substitution" class="tabBox">
{% if "unknown" == record.get_type() %}
<i class="icon-warning-sign icon-white"></i>{{ "Substitution is not possible for this kind of record" | trans }}
<i class="fa fa-exclamation-triangle icon-white"
aria-hidden="true"></i>{{ "Substitution is not possible for this kind of record" | trans }}
{% else %}
{% if app['conf'].get(['registry', 'modules', 'doc-substitution']) %}
<div id="substitution-hd">

23
templates/web/prod/actions/edit_default.html.twig
View File

@@ -43,14 +43,16 @@
</div>
<div style='position:absolute; bottom:0px; left:0px; height:20px' class="bottom actions">
<span class="icon-stack previewTips" tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}">
<i class="icon-circle icon-stack-base"></i>
<i class="icon-search icon-light"></i>
<span class="fa-stack previewTips"
tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true"></i>
<i class="fa fa-search fa-stack-1x fa-reverse" aria-hidden="true"></i>
</span>
<span class="icon-stack infoTips" tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}">
<i class="icon-circle icon-stack-base"></i>
<i class="icon-info icon-light"></i>
<span class="fa-stack infoTips"
tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true"></i>
<i class="fa fa-info fa-stack-1x fa-reverse" aria-hidden="true"></i>
</span>
</div>
<div class="reg_opts" style="display:none;position:absolute;bottom:0;right:0;">
@@ -92,10 +94,11 @@
<div class="edit_field edit-field-action" id="EditFieldBox_{{i}}"
data-id="{{i}}"
data-name="{{field.get_name()}}">
<i id="editSGtri_{{i}}" style="visibility:hidden;" class="icon-caret-right"></i>
<span class="icon-stack fieldTips" tooltipsrc="{{ path('prod_tooltip_metadata', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}">
<i class="icon-circle icon-stack-base"></i>
<i class="icon-info icon-light"></i>
<i id="editSGtri_{{ i }}" style="visibility:hidden;" class="fa fa-caret-right" aria-hidden="true"></i>
<span class="fa-stack fieldTips"
tooltipsrc="{{ path('prod_tooltip_metadata', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true"></i>
<i class="fa fa-info fa-stack-1x fa-inverse" aria-hidden="true"></i>
</span>
{% if field.get_dces_element %}
<img src="/assets/common/images/icons/dublincore.png" tooltipsrc="{{ path('prod_tooltip_dces', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}" alt="{{ 'Ce champ est decrit comme un element DublinCore' | trans }}" class="DCESTips" />

3
templates/web/prod/actions/publish/publish.html.twig
View File

@@ -37,7 +37,8 @@
{% if app['conf'].get(['registry', 'actions', 'enable-feed-notification']) %}
<label class="checkbox">
<input class="required_text checkbox" type="checkbox" name="notify" id="feed_add_notify" value="1" style="min-height: 0; height: auto" />
<i class="icon icon-envelope"></i>&nbsp;{{ 'Notify users about this publication' | trans }}
<i class="icon fa fa-envelope"
aria-hidden="true"></i>&nbsp;{{ 'Notify users about this publication' | trans }}
</label>
<br />
{% endif %}

12
templates/web/prod/index.html.twig
View File

@@ -173,7 +173,7 @@
<div class="PNB wrapper">
<div class="tabs ui-tabs">
{% block tabs_panel %}
<div id="retractableButton"><i class="icon-double-angle-left"></i></div>
<div id="retractableButton"><i class="fa fa-angle-double-left" aria-hidden="true"></i></div>
{% include 'prod/tab_headers.html.twig' %}
<div id="baskets" class="PNB">
{% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %}
@@ -443,12 +443,14 @@
<span id="ADVSRCH_DATE_SELECTORS">
{{ 'phraseanet::time:: de' | trans }}
<div class="input-prepend">
<span class="add-on"><i class="icon-calendar"></i></span>
<span class="add-on"><i class="fa fa-calendar"
aria-hidden="true"></i></span>
<input onchange="prodApp.appEvents.emit('search.doCheckFilters', true);" class="datepicker input-small" type="text" name="date_min" placeholder="{% trans %}YYYY/MM/DD{% endtrans %}" style="margin: 0;position: relative; z-index: 10001;" />
</div>
{{ 'phraseanet::time:: a' | trans }}
<div class="input-prepend">
<span class="add-on"><i class="icon-calendar"></i></span>
<span class="add-on"><i class="fa fa-calendar"
aria-hidden="true"></i></span>
<input onchange="prodApp.appEvents.emit('search.doCheckFilters', true);" class="datepicker input-small" type="text" name="date_max" placeholder="{% trans %}YYYY/MM/DD{% endtrans %}" style="margin: 0;position: relative; z-index: 10001;" />
</div>
</span>
@@ -733,10 +735,10 @@
</div>
<div class="PNB10" style="top:146px;">
<button id="left-btn" class="invisible-btn preview-navigate-action" data-direction="backward">
<i class="icon-caret-left"></i>
<i class="fa fa-caret-left" aria-hidden="true"></i>
</button>
<button id="right-btn" class="invisible-btn preview-navigate-action" data-direction="forward">
<i class="icon-caret-right"></i>
<i class="fa fa-caret-right" aria-hidden="true"></i>
</button>
</div>
<div id="PREVIEWIMGCONT" class="dblclick preview_col_cont PNB10" style="overflow:hidden;top:146px;"></div>

43
templates/web/prod/orders/order_box.html.twig
View File

@@ -23,7 +23,7 @@
<div id="ORDERPREVIEW">
<div id="filter-date">
<a href="#"><span id="filter-text">{{ 'order-manager::order-list: no-filter' | trans }}</span> <span class="order-indicator">&#x25bc;</span></a>
<i class="icon-remove-sign reset-btn" style="display: none"></i>
<i class="fa fa-times-circle reset-btn" aria-hidden="true" style="display: none"></i>
</div>
<div>
<form id="date-form">
@@ -52,7 +52,7 @@
<button class="toggle-button-text" type="button" name="BEFORE">{{ 'order-manager::order-list: before' | trans }}</button>
<button class="toggle-button-text" type="button" name="AFTER">{{ 'order-manager::order-list: after' | trans }}</button>
<div class="input-prepend">
<span class="add-on"><i class="icon icon-calendar"></i></span>
<span class="add-on"><i class="icon fa fa-calendar" aria-hidden="true"></i></span>
<input type="text" id="datepicker" class="datepicker" name="datepicker" size="10" value="{{ "today"|date("Y/m/d") }}" />
</div>
</td>
@@ -68,14 +68,14 @@
</div>
<ul style="height:30px;bottom:auto;">
<li><a href="#TODO-ORDER">{{ 'order-manager::order-list: pending' | trans }}
<span class="icon-stack infoTips">
<i class="icon-circle icon-stack-base" style="color:#7CD11E"></i>
<i class="icon-exclamation" style="color:#FFF"></i>
<span class="fa-stack infoTips">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true" style="color:#7CD11E"></i>
<i class="fa fa-exclamation fa-stack-1x" aria-hidden="true" style="color:#FFF"></i>
</span></a></li>
<li><a href="#PROCESSED-ORDER">{{ 'order-manager::order-list: processed' | trans }}
<span class="icon-stack infoTips">
<i class="icon-circle icon-stack-base" style="color:#999"></i>
<i class="icon-check" style="color:#FFF"></i>
<span class="fa-stack infoTips">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true" style="color:#999"></i>
<i class="fa fa-check-square-o fa-stack-1x" aria-hidden="true" style="color:#FFF"></i>
</span></a></li></a></li>
</ul>
<div id="TODO-ORDER" class="order_preview_box">
@@ -86,9 +86,9 @@
{% for order in orders_todo %}
{% set deadline = order.getDeadline()|date('d/m/Y') %}
<tr id="order_{{ order.getId() }}" class="order_row" {{ current_date > order.getDeadline() ? "style=color:#777": "" }}>
<td> <span class="icon-stack infoTips">
<i class="icon-circle icon-stack-base" style="color:#7CD11E"></i>
<i class="icon-exclamation" style="color:#FFF"></i>
<td> <span class="fa-stack infoTips">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true" style="color:#7CD11E"></i>
<i class="fa fa-exclamation fa-stack-1x" aria-hidden="true" style="color:#FFF"></i>
</span>
</td>
<td>
@@ -136,9 +136,10 @@
{% for order in orders_processed %}
{% set deadline = order.getDeadline()|date('d/m/Y') %}
<tr id="order_{{ order.getId() }}" class="order_row" {{ current_date > order.getDeadline() ? "style=color:#777": "" }}>
<td> <span class="icon-stack infoTips">
<i class="icon-circle icon-stack-base" style="color:#999"></i>
<i class="icon-check" style="color:#FFF"></i>
<td> <span class="fa-stack infoTips">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true" style="color:#999"></i>
<i class="fa fa-check-square-o fa-stack-1x" aria-hidden="true"
style="color:#FFF"></i>
</span>
</td>
<td>
@@ -185,10 +186,13 @@
{% set previousPage = page < 2 ? false : (page - 1) %}
{% set nextPage = page >= (totalTodo / perPage)|ceil ? false : (page + 1) %}
{% if previousPage %}
<li class="previous"><a class="btn btn-inverse" data-page="{{ previousPage }}" href="#">{{ 'Previous' | trans }}&nbsp;<i class="icon-arrow-left"></i></a></li>
<li class="previous"><a class="btn btn-inverse" data-page="{{ previousPage }}"
href="#">{{ 'Previous' | trans }}&nbsp;<i class="fa fa-arrow-left"
aria-hidden="true"></i></a></li>
{% endif %}
{% if nextPage %}
<li class="next"><a class="btn btn-inverse" data-page="{{ nextPage }}" href="#"><i class="icon-arrow-right"></i>&nbsp;{{ 'Next' | trans }}</a></li>
<li class="next"><a class="btn btn-inverse" data-page="{{ nextPage }}" href="#"><i
class="fa fa-arrow-right" aria-hidden="true"></i>&nbsp;{{ 'Next' | trans }}</a></li>
{% endif %}
</ul>
</div>
@@ -198,10 +202,13 @@
{% set previousPage = page < 2 ? false : (page - 1) %}
{% set nextPage = page >= (totalProcessed / perPage)|ceil ? false : (page + 1) %}
{% if previousPage %}
<li class="previous"><a class="btn btn-inverse" data-page="{{ previousPage }}" href="#">{{ 'Previous' | trans }}&nbsp;<i class="icon-arrow-left"></i></a></li>
<li class="previous"><a class="btn btn-inverse" data-page="{{ previousPage }}"
href="#">{{ 'Previous' | trans }}&nbsp;<i class="fa fa-arrow-left"
aria-hidden="true"></i></a></li>
{% endif %}
{% if nextPage %}
<li class="next"><a class="btn btn-inverse" data-page="{{ nextPage }}" href="#"><i class="icon-arrow-right"></i>&nbsp;{{ 'Next' | trans }}</a></li>
<li class="next"><a class="btn btn-inverse" data-page="{{ nextPage }}" href="#"><i
class="fa fa-arrow-right" aria-hidden="true"></i>&nbsp;{{ 'Next' | trans }}</a></li>
{% endif %}
</ul>
</div>

40
templates/web/prod/orders/order_item.html.twig
View File

@@ -5,7 +5,8 @@
<div class="alert">
{{ '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 }}
</div>
<button class="order_launcher btn rightside"><i class="icon-chevron-left"></i>{{ 'Retour aux commandes' | trans }}</button>
<button class="order_launcher btn rightside"><i class="fa fa-chevron-left"
aria-hidden="true"></i>{{ 'Retour aux commandes' | trans }}</button>
</div>
<div style="display:none;position:relative;" id="basket-window" >
@@ -88,9 +89,9 @@
<td colspan="2">
<span class="text_block">{{ displayName }} (<a
style="font-size: 12px;color: #4990E2;" href="#" id="email-btn">{{ order.getUser().getEmail() }}</a>)
<span class="icon-stack infoTips" id="userInfo">
<i class="icon-circle icon-stack-base" style="color:#737373"></i>
<i class="icon-info" style="color:#FFF"></i>
<span class="fa-stack infoTips" id="userInfo">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true" style="color:#737373"></i>
<i class="fa fa-info fa-stack-1x" style="color:#FFF" aria-hidden="true"></i>
</span>
</span>
</td>
@@ -102,7 +103,9 @@
</td>
</tr>
</table>
<button class="btn validate outline" disabled><i class="icon-ok-circle"></i>{{ 'order-manager::order-item: validate' |trans }}</button>
<button class="btn validate outline" disabled><i class="fa fa-check-circle-o"
aria-hidden="true"></i>{{ 'order-manager::order-item: validate' |trans }}
</button>
<div class="order-list-container">
<div class="order_list" style="width:40%;float:left">
<div class="top-bar">
@@ -176,9 +179,13 @@
<div id="order_detail" style="width:60%;">
<div class="external-order-action" id="order-action" style="display:none; margin: 0 0 1.2em 30px;">
<span class="action-text">{{ 'order-manager::order-item: refused-previously' | trans }}</span>
<button class="btn deny outline"><i class="icon-remove"></i>{{ 'Deny' | trans }}</button>
<button class="btn btn-primary send outline"><i class="icon-ok"></i>{{ 'Send' | trans }}</button>
<button class="btn reset outline"><i class="icon-refresh"></i>{{ 'order-manager::order-item: reset' | trans }}</button>
<button class="btn deny outline"><i class="fa fa-times" aria-hidden="true"></i>{{ 'Deny' | trans }}
</button>
<button class="btn btn-primary send outline"><i class="fa fa-check"
aria-hidden="true"></i>{{ 'Send' | trans }}</button>
<button class="btn reset outline"><i class="fa fa-refresh"
aria-hidden="true"></i>{{ 'order-manager::order-item: reset' | trans }}
</button>
<img src="/assets/common/images/icons/loader000000.gif" class="activity_indicator" style="display:none;"/>
<input name="order_id" type="hidden" value="{{ order.getId() }}" />
</div>
@@ -187,9 +194,9 @@
{% include 'common/preview.html.twig' with {'record': order.getElements()[0].getRecord(app)}%}
</div>
<div id="info-header">
<span class="icon-stack infoTips">
<i class="icon-circle icon-stack-base" style="color:#4990E2"></i>
<i class="icon-info" style="color:#FFF"></i>
<span class="fa-stack infoTips">
<i class="fa fa-circle" aria-hidden="true" style="color:#4990E2"></i>
<i class="fa fa-info" aria-hidden="true" style="color:#FFF"></i>
</span>
<span class="info-text">{{ 'order-manager::order-item: information' | trans }}</span>
</div>
@@ -207,9 +214,14 @@
<div id="text-content"></div>
</div>
<div id="order-action" style="color:#333;">
<button class="btn deny outline"><i class="icon-remove"></i>{{ 'Deny' | trans }}</button>
<button class="btn btn-primary send outline"><i class="icon-ok"></i>{{ 'Send' | trans }}</button>
<button class="btn reset outline"><i class="icon-refresh"></i>{{ 'order-manager::order-item: reset' | trans }}</button>
<button class="btn deny outline"><i class="fa fa-times"
aria-hidden="true"></i>{{ 'Deny' | trans }}</button>
<button class="btn btn-primary send outline"><i class="fa fa-check"
aria-hidden="true"></i>{{ 'Send' | trans }}
</button>
<button class="btn reset outline"><i class="fa fa-refresh"
aria-hidden="true"></i>{{ 'order-manager::order-item: reset' | trans }}
</button>
<img src="/assets/common/images/icons/loader000000.gif" class="activity_indicator" style="display:none;"/>
<input name="order_id" type="hidden" value="{{ order.getId() }}" />
</div>

4
templates/web/prod/preview/basket_train.html.twig
View File

@@ -51,10 +51,10 @@
<div class="cont_infos">
<div>
<button class="preview-navigate-action" data-direction="backward">
<i class="icon-caret-left"></i>
<i class="fa fa-caret-left" aria-hidden="true"></i>
</button>
<button class="preview-navigate-action" data-direction="forward">
<i class="icon-caret-right"></i>
<i class="fa fa-caret-right" aria-hidden="true"></i>
</button><br/>
<span onclick="startSlide()" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }}</span>
<span onclick="stopSlide()" id="stop_slide">{{ 'preview:: arreter le diaporama' | trans }}</span>

4
templates/web/prod/preview/feed_train.html.twig
View File

@@ -49,10 +49,10 @@
<div class="cont_infos">
<div>
<button class="preview-navigate-action" data-direction="backward">
<i class="icon-caret-left"></i>
<i class="fa fa-caret-left" aria-hidden="true"></i>
</button>
<button class="preview-navigate-action" data-direction="forward">
<i class="icon-caret-right"></i>
<i class="fa fa-caret-right" aria-hidden="true"></i>
</button><br/>
<span onclick="startSlide()" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }}</span>
<span onclick="stopSlide()" id="stop_slide">{{ 'preview:: arreter le diaporama' | trans }}</span>

4
templates/web/prod/preview/reg_train.html.twig
View File

@@ -85,10 +85,10 @@
<div class="cont_infos">
<div>
<button class="preview-navigate-action" data-direction="backward">
<i class="icon-caret-left"></i>
<i class="fa fa-caret-left" aria-hidden="true"></i>
</button>
<button class="preview-navigate-action" data-direction="forward">
<i class="icon-caret-right"></i>
<i class="fa fa-caret-right" aria-hidden="true"></i>
</button><br/>
<span onclick="startSlide()" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }}</span>
<span onclick="stopSlide()" id="stop_slide">{{ 'preview:: arreter le diaporama' | trans }}</span>

4
templates/web/prod/preview/result_train.html.twig
View File

@@ -45,10 +45,10 @@
<div class="cont_infos">
<div>
<button class="preview-navigate-action" data-direction="backward">
<i class="icon-caret-left"></i>
<i class="fa fa-caret-left" aria-hidden="true"></i>
</button>
<button class="preview-navigate-action" data-direction="forward">
<i class="icon-caret-right"></i>
<i class="fa fa-caret-right" aria-hidden="true"></i>
</button><br/>
<span onclick="startSlide()" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }} </span>
<span onclick="stopSlide()" id="stop_slide"> {{ 'preview:: arreter le diaporama' | trans }} </span>

4
templates/web/prod/preview/result_train_options.html.twig
View File

@@ -2,12 +2,12 @@
<div id="PREVIEWCURRENTCONT" class="PNB10">
<div style="margin:2px 0;" class="cont_infos">
<button class="preview-navigate-action" data-direction="backward">
<i class="icon-caret-left"></i>
<i class="fa fa-caret-left" aria-hidden="true"></i>
</button>
<span onclick="startSlide()" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }}</span>
<span onclick="stopSlide()" id="stop_slide">{{ 'preview:: arreter le diaporama' | trans }}</span>
<button class="preview-navigate-action" data-direction="forward">
<i class="icon-caret-right"></i>
<i class="fa fa-caret-right" aria-hidden="true"></i>
</button><br/>
</div>
</div>

27
templates/web/prod/results/record.html.twig
View File

@@ -77,31 +77,34 @@
{% if settings.rollover_thumbnail == 'caption' %}
{% if record_subdef_url(record, 'preview') is not null and has_access_subdef(record, 'preview') %}
<span class="icon-stack previewTips" tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}">
<i class="icon-circle icon-stack-base"></i>
<i class="icon-search icon-light"></i>
<span class="fa-stack fa-lg previewTips"
tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true"></i>
<i class="fa fa-search fa-stack-1x fa-inverse" aria-hidden="true"></i>
</span>
{% endif %}
{% endif %}
{% if settings.rollover_thumbnail == 'preview' %}
<span class="icon-stack captionRolloverTips" tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId, 'context' : 'answer', 'number' : record.position|default(0) }) }}">
<i class="icon-circle icon-stack-base"></i>
<i class="icon-list icon-light"></i>
<span class="fa-stack fa-lg captionRolloverTips"
tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId, 'context' : 'answer', 'number' : record.position|default(0) }) }}">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true"></i>
<i class="fa fa-list fa-stack-1x fa-inverse" aria-hidden="true"></i>
</span>
{% endif %}
{% if settings.technical_display == '1' %}
<span class="icon-stack infoTips" tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}">
<i class="icon-circle icon-stack-base"></i>
<i class="icon-info icon-light"></i>
<span class="fa-stack infoTips"
tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}">
<i class="fa fa-circle fa-stack-2x" aria-hidden="true"></i>
<i class="fa fa-info fa-stack-1x fa-inverse" aria-hidden="true"></i>
</span>
{% endif %}
{% if settings.show_context_menu %}
<span class="icon-stack contextMenuTrigger" id="contextTrigger_{{record.id}}"
<span class="fa-stack contextMenuTrigger" id="contextTrigger_{{ record.id }}"
tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}">
<i class="icon-circle icon-stack-base"></i>
<i class="icon-ellipsis-horizontal icon-light"></i>
<i class="fa fa-circle fa-stack-2x" aria-hidden="true"></i>
<i class="fa fa-ellipsis-h fa-stack-1x fa-inverse" aria-hidden="true"></i>
</span>
<table cellspacing="0" cellpadding="0" style="display:none;" id="answerContext_{{record.id}}" class="contextMenu answercontextmenu">
<tbody>

2
templates/web/prod/tab_headers.html.twig
View File

@@ -1,5 +1,5 @@
{% block tab_headers_wrapper %}
<ul class="icon-menu ui-tabs-nav ui-helper-reset">
<ul class="prod-icon-menu ui-tabs-nav ui-helper-reset">
{% block tab_headers %}
{% if GV_thesaurus %}
<li class="proposals_WZ">

4
templates/web/prod/tab_thesaurus.html.twig
View File

@@ -22,11 +22,11 @@
<div class="input-append">
<input type="text" name="search_value" class="input-medium thesaurus-filter-suggest-action"/>
<button type="submit" class="th_ok btn btn-inverse">
<i class="icon-search"></i>
<i class="fa fa-search" aria-hidden="true"></i>
</button>
<button type="button" class="th_cancel btn btn-inverse thesaurus-cancel-wizard-action">
<i class="icon-undo"></i>
<i class="fa fa-undo" aria-hidden="true"></i>
</button>
<input type="button" class="th_clear"/>
</div>

2
templates/web/prod/templates/push.html.twig
View File

@@ -164,7 +164,7 @@
</div>
<div class="control-group info">
<span class="help-inline" style="font-style: italic">
<i class="icon-info-sign"></i>
<i class="fa fa-info-circle" aria-hidden="true"></i>
{% trans %}
The parameter "force authentication" forces the recipient(s) of the push to possess a Phraseanet account
to see its contents.