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

PHRAS-845 - fix close button

Browse Source 
PHRAS-846 - fix admin log view
PHRAS-843 - fix action icons
added white skin
misc fix on skin color handling
replace image icons by fonts icons
This commit is contained in:
Florian BLOUET
2015-12-01 18:48:38 +01:00
parent 696d7401d4
commit ebaf36f2d2
46 changed files with 672 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
templates/web/prod/preview/appears_in.html.twig
View File

@@ -18,7 +18,20 @@
{% for basket in baskets %}
<li onclick="openPreview('BASK',0,'{{basket.getId()}}',true); return(false);"
class="otherBaskToolTip" title="{{basket.getDescription()}}">
<img style="vertical-align:middle;" title="" src="/assets/common/images/icons/basket.gif"/>
{#<img style="vertical-align:middle" src="/assets/common/images/icons/basket.png" width="16">#}
{% if basket.getValidation() %}
<img src='/assets/common/images/icons/basket_validation.png' title='' width="16" class="btn-image"/>
{% elseif basket.getPusher() %}
{% if not basket.getIsRead() %}
<img src='/assets/common/images/icons/basket_push_unread.png' title='' width="16" class="btn-image"/>
{% else %}
<img src='/assets/common/images/icons/basket_push.png' title='' width="16" class="btn-image"/>
{% endif %}
{% else %}
<img src='/assets/common/images/icons/basket.png' title='' width="16" class="btn-image"/>
{% endif %}
<span class="title">{{basket.getName()}}</span>
</li>
{% endfor %}

2
templates/web/prod/preview/caption.html.twig
View File

@@ -6,7 +6,7 @@
{% if can_edit %}
<div class="edit_button" style="text-align:right">
<a href="#" onclick="editThis('IMGT','{{ record.get_serialize_key }}');">
<img style="vertical-align:middle" src="/assets/common/images/icons/ppen_history.png" width="16"/>
<img style="vertical-align:middle" src="/assets/common/images/icons/ppen_history.png" width="16" class="btn-image"/>
{{ 'action : editer' | trans }}
</a>
</div>

19
templates/web/prod/preview/tools.html.twig
View File

@@ -2,22 +2,29 @@
{% if (record.is_from_basket is empty) and app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(record.get_base_id(), 'canputinalbum') %}
<div sbas="{{record.get_sbas_id()}}" id="PREV_BASKADD_{{record.get_serialize_key}}"
class="baskAdder" title="{{ 'action : ajouter au panier' | trans }}"
onclick="evt_add_in_chutier('{{record.get_sbas_id()}}','{{record.get_record_id()}}',false,this);return(false);"></div>
onclick="evt_add_in_chutier('{{record.get_sbas_id()}}','{{record.get_record_id()}}',false,this);return(false);">
<img src="/assets/common/images/icons/basket.png" height="16" width="16" class="btn-image">
</div>
{% endif %}
{% if record.is_from_basket() %}
<a sbas="{{record.get_sbas_id()}}" id="PREV_BASKDEL_{{record.get_serialize_key}}"
class="baskDeleter WorkZoneElementRemover" title="{{ 'Remove from basket' | trans }}"
class="WorkZoneElementRemover"
data-context="reg_train_basket"
onclick="remove_from_basket($(this), false);return false;"
href="{{ path('prod_baskets_basket_element_remove', { 'basket' : record.get_container().getId(), 'basket_element_id' : record.get_original_item().getId()}) }}">
<img src="/assets/common/images/icons/delete.png" height="16" width="16" class="btn-image" title="{{ 'Remove from basket' | trans }}">
</a>
{% endif %}
<div class="printer" title="'{{ 'action : print' | trans }}"
onclick="evt_print('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);"></div>
<div onclick="evt_print('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);">
<img src="/assets/common/images/icons/print_history.png" height="16" width="16" class="btn-image" title="'{{ 'action : print' | trans }}">
</div>
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(record.get_base_id(), 'candwnldhd') or app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(record.get_base_id(), 'candwnldpreview') %}
<div class="downloader" title="{{ 'action : exporter' | trans }}"
onclick="evt_dwnl('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);"></div>
<div onclick="evt_dwnl('{{record.get_sbas_id()}}_{{record.get_record_id()}}');return(false);">
<img src="/assets/common/images/icons/disktt_history.png" height="16" width="16" class="btn-image" title="{{ 'action : exporter' | trans }}">
{# <img style="vertical-align:middle" src="/assets/common/images/icons/basket.png" width="16">#}
</div>
{% endif %}