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

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

@@ -341,6 +341,7 @@
name="uploadHdsub"
height="0"
width="0"
border="0"
>
</iframe>
</div>

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

@@ -39,9 +39,13 @@
<div style='position:absolute; top:0px; left:0px; height:20px'>
<img class="require_alert" src="/assets/common/images/icons/alert.png" style="display:none;cursor:help;" title="{{ 'edit::Certains champs doivent etre remplis pour valider cet editing' | trans }}">
</div>
<div style='position:absolute; bottom:0px; left:0px; height:20px'>
<div style='position:absolute; bottom:0px; left:0px; height:20px' class="bottom actions">
<div class="previewTips" tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}"></div>
<img class="infoTips" tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id() }) }}" src="/assets/common/images/icons/info.gif"/>
<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>
</div>
<div class="reg_opts" style="display:none;position:absolute;bottom:0;right:0;">
<a style="float:right;padding:0;margin:0;cursor:pointer;" class="contextMenuTrigger" id="editContextTrigger_{{ record.get_serialize_key() }}">&#9660;</a>
@@ -78,8 +82,11 @@
{% set i = field.get_id() %}
{% if field.is_readonly() is empty %}
<div class="edit_field" id="EditFieldBox_{{i}}" onclick="return(edit_mdwn_fld(event, {{i}}, '{{field.get_name()}}'));" >
<img id="editSGtri_{{i}}" style="visibility:hidden;" src="/assets/prod/skins/{{cssfile}}/images/suggested.gif" />
<img src="/assets/common/images/icons/info.gif" tooltipsrc="{{ path('prod_tooltip_metadata', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}" class="fieldTips" alt=""/>
<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>
</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" />
{% endif %}

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

@@ -108,7 +108,7 @@
<div class="PNB wrapper">
<div class="tabs ui-tabs">
{% block tabs_panel %}
<div id="retractableButton"></div>
<div id="retractableButton"><i class="icon-double-angle-left"></i></div>
{% include 'prod/tab_headers.html.twig' %}
<div id="baskets" class="PNB">
{% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %}
@@ -631,7 +631,7 @@
</div>
</div>
<div id="PREVIEWBOX" class="PNB10" style="overflow:hidden;">
<div id="PREVIEWBOX" class="PNB10 ui-dialog " style="overflow:hidden;">
<div class="PNB" style="right:180px;">
<div id="PREVIEWTITLE" style="height:55px;bottom:auto;" class="PNB">
<div class="PNB10 ui-corner-top" id='PREVIEWTITLEWRAPPER'>
@@ -680,9 +680,10 @@
</div>
<div class="PNB" style="width:180px;left:auto;">
<div class="PNB10 ui-corner-all" style="height:20px;">
<div onclick="closePreview();" style="cursor:pointer;color:#CCCCCC;font-size:14px;font-weight:bold;text-align:center;text-decoration:underline;">
{{ 'boutton::fermer' | trans }}
</div>
<button type="button" onclick="closePreview();" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-icon-only ui-dialog-titlebar-close" role="button" aria-disabled="false" title="close">
<span class="ui-button-icon-primary ui-icon ui-icon-closethick"></span><span class="ui-button-text">close</span>
</button>
</div>
<div id="PREVIEWOTHERS" style="top:40px;" class="PNB10 ui-corner-all">
<div id="PREVIEWOTHERSINNER" style=""></div>

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 %}

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

@@ -50,7 +50,7 @@
</div>
</div>
<div style="height: 25px; position:relative; text-align:left;">
<table class="bottom" style="width:100%; table-layout:fixed;">
<table class="bottom actions" style="width:100%; table-layout:fixed;">
<tr>
<td style="text-align:left;text-overflow:ellipsis;overflow:hidden;">
{{ record.collectionName }}
@@ -67,10 +67,49 @@
{# drop down options #}
<td style='text-align:right;width:{{l_width}}px;' valign='bottom'>
<a style="float:right;padding:0;cursor:pointer;" class="contextMenuTrigger" id="contextTrigger_{{record.id}}">
{#<a style="float:right;padding:0;cursor:pointer;" class="contextMenuTrigger" id="contextTrigger_{{record.id}}">
<img src="/assets/common/images/icons/contextMenuTrigger.png" height="10" />
<i class="icon-caret-down"></i>
</a>
</a>#}
{% if record.subdefs.preview is defined and has_access_subdef(record, 'preview') %}
<span class="icon-stack previewTips"
tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}" class="previewTips"
>
<i class="icon-circle icon-stack-base"></i>
<i class="icon-search icon-light"></i>
</span>
{#<div tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}" class="previewTips"></div>#}
{% 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>
{% endif %}
{% if settings.technical_display == '1' %}
{#<img
class="infoTips"
tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}" src="/assets/common/images/icons/info.gif"/>#}
<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>
{% endif %}
<span class="icon-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>
</span>
<table cellspacing="0" cellpadding="0" style="display:none;" id="answerContext_{{record.id}}" class="contextMenu answercontextmenu">
<tbody>
<tr>
@@ -99,8 +138,8 @@
</div>
</div>
{% if app['conf'].get(['registry', 'actions', 'social-tools']) == 'all'
or (app['conf'].get(['registry', 'actions', 'social-tools']) == 'publishers'
and granted_on_databox(record.databoxId, 'bas_chupub')) %}
or (app['conf'].get(['registry', 'actions', 'social-tools']) == 'publishers'
and granted_on_databox(record.databoxId, 'bas_chupub')) %}
{% if record.story is empty %}
<div title="" class="context-menu-item">
<div class="context-menu-item-inner"
@@ -115,18 +154,6 @@
</tr>
</tbody>
</table>
{% if record.subdefs.preview is defined and has_access_subdef(record, 'preview') %}
<div tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}" class="previewTips"></div>
{% endif %}
{% if settings.rollover_thumbnail == 'preview' %}
<div tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId, 'context' : 'answer', 'number' : record.position|default(0) }) }}" class="captionRolloverTips"></div>
{% endif %}
{% if settings.technical_display == '1' %}
<img class="infoTips" tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : record.databoxId, 'record_id' : record.recordId }) }}" src="/assets/common/images/icons/info.gif"/>
{% endif %}
</td>
</tr>
</table>

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

@@ -23,7 +23,10 @@
<div class="input-append">
<input type="text" name="search_value" class="input-medium"
onkeyup="T_Gfilter_delayed(this.value, 300);"/>
<input type="submit" class="th_ok btn" value=""/>
<button type="submit" class="th_ok btn btn-inverse">
<i class="icon-search"></i>
</button>
<input type="button" class="th_clear"/>
<input type="button" class="th_cancel btn" value="{{ 'boutton::annuler' | trans }}"
onclick="thesauCancelWizard();return(false);"/>