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

Merge pull request #2362 from mike-esokia/PHRAS-1525_port_PHRAS-1434_1435_1436_1437_1457

Browse Source 
PHRAS-1525 port phras 1434 1435 1436 1437 1457
This commit is contained in:
Nicolas Maillat
2017-11-15 13:43:05 +01:00
committed by GitHub
parent 468f273dec 8f8d9bb706
commit acc674be43
9 changed files with 124 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/www/lightbox/styles/main-ie6.scss
View File

@@ -402,6 +402,8 @@ table th i {
#sc_wrapper .thumb_wrapper {
position: absolute;
top: 28px;
left: 0px;
right: 0px;
}
.record_display_box .notes_overlay {

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

@@ -453,6 +453,8 @@ table th i {
#sc_wrapper .thumb_wrapper {
position: absolute;
top: 28px;
left: 0px;
right: 0px;
}
.record_display_box {

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

@@ -667,29 +667,37 @@
</div>
<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'>
<div style="padding-top: 0px; padding-left: 5px;">
<span id="PREVIEWTITLE_COLLLOGO"> </span>
&nbsp;
<span id="PREVIEWTITLE_COLLNAME"> </span>
&nbsp;
<span id="SPANTITLE"> </span>
</div>
<div id="PREVIEWTITLE" style="height:55px;bottom:auto;" class="PNB">
<div class="PNB10 ui-corner-top" id='PREVIEWTITLEWRAPPER'>
<div style="padding-top: 0px; padding-left: 5px;">
<span id="PREVIEWTITLE_COLLLOGO"> </span>
&nbsp;
<span id="PREVIEWTITLE_COLLNAME"> </span>
&nbsp;
<span id="SPANTITLE"> </span>
</div>
</div>
</div>
<div class="PNB" style="right:180px;">
<div class="PNB" style="top:55px;">
<div id="PREVIEWLEFT" class="preview_col PNB" style="width:60%;right:auto;overflow:hidden;">
<div id="PREVIEWCURRENT" class="ui-corner-bottom PNB10" style="top:0;height:116px;bottom:auto;">
<div id="PREVIEWCURRENT" class="ui-corner-bottom PNB10" style="top:11px;height:116px;bottom:auto;">
<div id="PREVIEWCURRENTGLOB" style=""></div>
</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>
</button>
<button id="right-btn" class="invisible-btn preview-navigate-action" data-direction="forward">
<i class="icon-caret-right"></i>
</button>
</div>
<div id="PREVIEWIMGCONT" class="dblclick preview_col_cont PNB10" style="overflow:hidden;top:146px;"></div>
</div>
<div class="gui_vsplitter gui_vsplitter2" style="left:60%;">
</div>
<div id="PREVIEWRIGHT" class="preview_col PNB">
<div id="PREVIEWRIGHT" class="preview_col PNB" style="top:0px;left:60%;overflow:hidden;">
<div id="PREVIEWIMGDESC" class="PNB10">
<ul class="PNB" style="height:30px;bottom:auto;">
<li><a href="#PREVIEWIMGDESCINNER-BOX">{{ 'preview:: Description' | trans }}</a></li>
@@ -720,8 +728,8 @@
<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>
<div id="PREVIEWOTHERS" style="top:95px;" class="PNB10 ui-corner-all">
<div id="PREVIEWOTHERSINNER" style=""></div>
</div>
</div>
</div>
@@ -767,4 +775,14 @@
<div id="modal_feed" title="{{ 'action : publier' | trans }}" style="display:none;"></div>
<div id="dialog_dwnl" title="{{ 'action : exporter' | trans }}" style="display:none;"></div>
<script type="text/javascript" id="bitly_loader"></script>
<script type="text/javascript">
$(document).ready(function(){
$('#right-btn').mouseenter(function() {
$('#right-btn i').stop(true, true).fadeIn(200).delay(500).fadeOut(200);
});
$('#left-btn').mouseenter(function() {
$('#left-btn i').stop(true, true).fadeIn(200).delay(500).fadeOut(200);
});
});
</script>
{% endblock %}

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

@@ -47,14 +47,20 @@
</ul>
</div>
<div class="cont_infos">
<div>
<img src="/assets/common/images/icons/light_left.gif" style="margin-right:10px;" class="preview-navigate-action" data-direction="backward"/>
<img src="/assets/common/images/icons/light_right.gif" style="margin-left:10px;" class="preview-navigate-action" data-direction="forward"/><br/>
<span class="preview-start-slideshow-action" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }}</span>
<span class="preview-stop-slideshow-action" id="stop_slide">{{ 'preview:: arreter le diaporama' | trans }}</span>
</div>
</div>
<div id="PREVIEWTOOL">
{% include 'prod/preview/tools.html.twig' %}
</div>
<div class="wrapper_diaspo">
<div class="cont_infos">
<div>
<button class="preview-navigate-action" data-direction="backward">
<i class="icon-caret-left"></i>
</button>
<button class="preview-navigate-action" data-direction="forward">
<i class="icon-caret-right"></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>
</div>
</div>
<div id="PREVIEWTOOL">
{% include 'prod/preview/tools.html.twig' %}
</div>
</div>

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

@@ -6,19 +6,19 @@
{% if can_edit %}
<div class="edit_button" style="text-align:right">
<a href="#" class="edit-record-action" data-kind="record" data-id="{{ record.get_serialize_key }}">
<img style="vertical-align:middle" src="/assets/common/images/icons/ppen_history.png" width="16" class="btn-image"/>
{{ 'action : editer' | trans }}
<img style="vertical-align:middle" src="/assets/common/images/icons/ppen_history.png" />
<span style="vertical-align: middle">{{ 'action : editer' | trans }}</span>
</a>
</div>
{% endif %}
<div style="text-align:center;">
<div style="text-align:center;">
{% for flag in record_flags(record) %}
<img src="{{ flag.path }}" title="{{ attribute(flag.labels, app.locale) }}" />
{% endfor %}
</div>
</div>
{% if record.is_from_reg() %}
{% if record.is_from_reg() %}
{{macro.caption(record, can_see_business)}}
{% else %}
{% else %}
{{macro.caption(record, can_see_business)}}
{% endif %}
{% endif %}

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

@@ -45,14 +45,20 @@
</ul>
</div>
<div class="cont_infos">
<div>
<img src="/assets/common/images/icons/light_left.gif" style="margin-right:10px;" class="preview-navigate-action" data-direction="backward"/>
<img src="/assets/common/images/icons/light_right.gif" style="margin-left:10px;" class="preview-navigate-action" data-direction="forward"/><br/>
<span class="preview-start-slideshow-action" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }}</span>
<span class="preview-stop-slideshow-action" id="stop_slide">{{ 'preview:: arreter le diaporama' | trans }}</span>
</div>
</div>
<div id="PREVIEWTOOL">
{% include 'prod/preview/tools.html.twig' %}
</div>
<div class="wrapper_diaspo">
<div class="cont_infos">
<div>
<button class="preview-navigate-action" data-direction="backward">
<i class="icon-caret-left"></i>
</button>
<button class="preview-navigate-action" data-direction="forward">
<i class="icon-caret-right"></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>
</div>
</div>
<div id="PREVIEWTOOL">
{% include 'prod/preview/tools.html.twig' %}
</div>
</div>

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

@@ -80,15 +80,21 @@
{% endfor %}
</ul>
</div>
<div class="cont_infos">
<div>
<img src="/assets/common/images/icons/light_left.gif" style="margin-right:10px;" class="preview-navigate-action" data-direction="backward"/>
<img src="/assets/common/images/icons/light_right.gif" style="margin-left:10px;" class="preview-navigate-action" data-direction="forward"/><br/>
<span class="preview-start-slideshow-action" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }}</span>
<span class="preview-stop-slideshow-action" id="stop_slide">{{ 'preview:: arreter le diaporama' | trans }}</span>
</div>
</div>
<div id="PREVIEWTOOL">
</div>
<div class="wrapper_diaspo">
<div class="cont_infos">
<div>
<button class="preview-navigate-action" data-direction="backward">
<i class="icon-caret-left"></i>
</button>
<button class="preview-navigate-action" data-direction="forward">
<i class="icon-caret-right"></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>
</div>
</div>
<div id="PREVIEWTOOL">
{% include 'prod/preview/tools.html.twig' %}
</div>
</div>
</div>

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

@@ -41,12 +41,19 @@
</ul>
</div>
<div class="cont_infos">
<div>
<img src="/assets/common/images/icons/light_left.gif" style="margin-right:10px;" class="preview-navigate-action" data-direction="backward">
<img src="/assets/common/images/icons/light_right.gif" style="margin-left:10px;" class="preview-navigate-action" data-direction="forward"><br/>
<span class="preview-start-slideshow-action" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }} </span>
<span class="preview-stop-slideshow-action" id="stop_slide"> {{ 'preview:: arreter le diaporama' | trans }} </span>
<div class="wrapper_diaspo">
<div class="cont_infos">
<div>
<button class="preview-navigate-action" data-direction="backward">
<i class="icon-caret-left"></i>
</button>
<button class="preview-navigate-action" data-direction="forward">
<i class="icon-caret-right"></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>
</div>
</div>
</div>
<div id="PREVIEWTOOL"></div>
<div id="PREVIEWTOOL"></div>
</div>

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

@@ -1,12 +1,16 @@
<div id="PREVIEWCURRENTCONT" class="PNB10">
<div style="margin:2px 0;">
<img src="/assets/common/images/icons/light_left.gif" style="margin-right:20px;" class="preview-navigate-action" data-direction="backward"/>
<span class="preview-start-slideshow-action" id="start_slide">{{ 'preview:: demarrer le diaporama' | trans }}</span>
<span class="preview-stop-slideshow-action" id="stop_slide">{{ 'preview:: arreter le diaporama' | trans }}</span>
<img src="/assets/common/images/icons/light_right.gif" style="margin-left:20px;" class="preview-navigate-action" data-direction="forward"/><br/>
</div>
</div>
<div id="PREVIEWTOOL" style="top:0;bottom:auto;">
{% include 'prod/preview/tools.html.twig' %}
</div>
<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>
</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>
</button><br/>
</div>
</div>
<div id="PREVIEWTOOL" style="top:0;bottom:auto;">
{% include 'prod/preview/tools.html.twig' %}
</div>