mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Merge branch 'master' into PHRAS-2721_Edit_form_fix_submit_form
This commit is contained in:
@@ -31,17 +31,13 @@ var commonModule = (function ($, p4) {
|
||||
$(this).removeClass('context-menu-item-hover');
|
||||
});
|
||||
|
||||
// $('#help-trigger').contextMenu('#mainMenu .helpcontextmenu', {openEvt: 'click', dropDown: true, theme: 'vista', dropDown: true,
|
||||
// showTransition: 'slideDown',
|
||||
// hideTransition: 'hide',
|
||||
// shadow: false
|
||||
// });
|
||||
|
||||
$('body').on('click', '.infoDialog', function (event) {
|
||||
infoDialog($(this));
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
function showOverlay(n, appendto, callback, zIndex) {
|
||||
|
||||
var div = "OVERLAY";
|
||||
|
@@ -88,4 +88,20 @@ $mainMenuLinkBackgroundHoverColor: transparent;
|
||||
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.39);
|
||||
}
|
||||
}
|
||||
/*Help menu*/
|
||||
.contextMenu.helpcontextmenu {
|
||||
display: none;
|
||||
&.shown {
|
||||
display: block;
|
||||
position: absolute;
|
||||
z-index: 101;
|
||||
}
|
||||
}
|
||||
.help-trigger {
|
||||
display:inline-block;
|
||||
cursor:pointer;
|
||||
padding: 0 4px;
|
||||
border:none;
|
||||
margin-left: -12px;
|
||||
}
|
||||
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 682 B After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
Before Width: | Height: | Size: 802 B After Width: | Height: | Size: 1.7 KiB |
@@ -356,3 +356,7 @@ $select-height: 26px;
|
||||
background-color: #212121;
|
||||
}
|
||||
}
|
||||
|
||||
#mainMenu li .context-menu-item-inner a:hover {
|
||||
color: #000;
|
||||
}
|
||||
|
@@ -235,11 +235,10 @@
|
||||
<a target="_blank" href="https://docs.phraseanet.com/4.0/">
|
||||
<span>
|
||||
{{ 'phraseanet:: aide' | trans }}
|
||||
<span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;"
|
||||
id="help-trigger"> <i class="fa fa-caret-down" aria-hidden="true"></i></span>
|
||||
</span>
|
||||
</a>
|
||||
<table cellspacing="0" cellpadding="0" style="display:none;" class="contextMenu helpcontextmenu">
|
||||
<span id="help-trigger" class="help-trigger"> <i class="fa fa-caret-down" aria-hidden="true"></i></span>
|
||||
<table cellspacing="0" cellpadding="0" class="contextMenu helpcontextmenu context-menu-theme-vistamenu-bar">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
@@ -301,6 +300,10 @@
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function () {
|
||||
$('body').on('click', '#help-trigger', function (event) {
|
||||
$('#mainMenu .helpcontextmenu').toggleClass('shown');
|
||||
console.log('mety');
|
||||
});
|
||||
// var key = 'help';
|
||||
var configurationSettingLinks = {{ configuration|json_encode|raw }};
|
||||
//seperate array based on location of link
|
||||
|
@@ -102,4 +102,22 @@
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
//load the next result page
|
||||
jQuery(document).ready(function(){
|
||||
jQuery('.next_res').click(function(){
|
||||
jQuery('.results').append('<img class="result_loader" src="/assets/common/images/icons/loading.svg">');
|
||||
jQuery('.results').load($(this).attr('href'));
|
||||
return false;
|
||||
});
|
||||
});
|
||||
//load the prev result page
|
||||
jQuery(document).ready(function(){
|
||||
jQuery('.prev_res').click(function(){
|
||||
jQuery('.results').append('<img class="result_loader" src="/assets/common/images/icons/loading.svg">');
|
||||
jQuery('.results').load($(this).attr('href'));
|
||||
return false;
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
|
@@ -14,35 +14,30 @@
|
||||
<div class="PNB datas">
|
||||
<div class="PNB" style="right:10px">
|
||||
{% for Basket in Baskets %}
|
||||
<div class="result {% if loop.index is odd %}odd{% endif %}">
|
||||
<a href="{{ path('basket_delete', {basket: Basket.getId()}) }}" class="delete-basket close" title="{% trans %}Delete basket{% endtrans %}" style="color:#fff;padding:2px">×</a>
|
||||
<div class="result {{ Basket.getArchived ? '' : 'unarchived' }}">
|
||||
<a href="{{ path('basket_delete', {basket: Basket.getId()}) }}" class="delete-basket close icon-baseline-close-24px" title="{% trans %}Delete basket{% endtrans %}" style="color:#fff;padding:2px"> </a>
|
||||
<div class="PNB10 rightBrowserInner">
|
||||
<table>
|
||||
<tr>
|
||||
<td class="thumbnail">
|
||||
<div class="item-table">
|
||||
|
||||
<div class="thumbnail">
|
||||
{% set BasketElement = Basket.getElements().first() %}
|
||||
{% if BasketElement %}
|
||||
{{thumbnail.format(BasketElement.getRecord(app).get_thumbnail(), 150, 106, '', true, false)}}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="" width="12" style="font-size: 0"> </td>
|
||||
<td class="content">
|
||||
</div>
|
||||
<div class="content">
|
||||
<h1 class="title">
|
||||
<img class="loader" src="/assets/prod/images/Basket/Browser/loader.gif" />
|
||||
{% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(app.getAuthenticatedUser()) %}
|
||||
<a href="{{ path('prod_baskets_basket_archive', { 'basket' : Basket.getId(), 'archive' : 1 }) }}" class="archiver archive_toggler" style="display:{{ Basket.getArchived ? 'none' : '' }};">
|
||||
<span>
|
||||
<img src="/assets/prod/images/Basket/Browser/archive.png"/>
|
||||
</span>
|
||||
|
||||
</a>
|
||||
<a href="{{ path('prod_baskets_basket_archive', { 'basket' : Basket.getId(), 'archive' : 0 }) }}" class="unarchiver archive_toggler" style="display:{{ Basket.getArchived ? '' : 'none' }};">
|
||||
<span>
|
||||
<img src="/assets/prod/images/Basket/Browser/archived.png"/>
|
||||
</span>
|
||||
|
||||
</a>
|
||||
{% endif %}
|
||||
<a class="basket_link" href="{{ path('prod_workzone_basket', { basket : Basket.getId() }) }}">
|
||||
{{ Basket.getName() }}
|
||||
<span>{{ Basket.getName() }}</span>
|
||||
<br><span class="basketCount">
|
||||
{{ Basket.getElements().count() }} {{ ' records' }}
|
||||
</span></a>
|
||||
@@ -74,12 +69,11 @@
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
</td>
|
||||
</div>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
@@ -99,37 +93,16 @@
|
||||
</td>
|
||||
<td class="paginator">
|
||||
{% if Page - 1 > 0 %}
|
||||
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="result prev_res">
|
||||
<
|
||||
</a>
|
||||
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page - 1) }) }}" class="result prev_res icon-round-chevron_left-24px"> </a>
|
||||
{% endif %}
|
||||
<span>
|
||||
Page {{ Page }} / {{ MaxPage }}
|
||||
</span>
|
||||
{% if Page + 1 <= MaxPage %}
|
||||
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="result next_res">
|
||||
>
|
||||
</a>
|
||||
<a href="{{ path('prod_workzone_search', { 'Query' : Query, 'Year' : Year, 'Type' : Type, 'Page' : (Page + 1) }) }}" class="result next_res icon-round-chevron_right-24px"> </a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<script>
|
||||
//load the next result page
|
||||
jQuery(document).ready(function(){
|
||||
jQuery('.next_res').click(function(){
|
||||
jQuery('.results').append('<img class="result_loader" src="/assets/common/images/icons/loading.svg">');
|
||||
jQuery('.results').load($(this).attr('href'));
|
||||
return false;
|
||||
});
|
||||
});
|
||||
//load the prev result page
|
||||
jQuery(document).ready(function(){
|
||||
jQuery('.prev_res').click(function(){
|
||||
jQuery('.results').append('<img class="result_loader" src="/assets/common/images/icons/loading.svg">');
|
||||
jQuery('.results').load($(this).attr('href'));
|
||||
return false;
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
|
Reference in New Issue
Block a user