Porting PHRAS-1434, PHRAS-1435, PHRAS-1436, PHRAS-1437, PHRAS-1457 to 4.1

This commit is contained in:
Mike Ng
2017-08-21 14:34:53 +04:00
parent 888440529e
commit 9ed6a0210f
9 changed files with 124 additions and 73 deletions

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