refatored html code to use proper font-awesome classes

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

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>

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>