adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 09:03:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1057 use a popin instead of popup to display admin page help.

Browse Source 
The "old way" still works with the popuphelp() javascript function.
This commit is contained in:
plegall
2019-08-13 12:07:16 +02:00
parent b4f8d6d994
commit 3478033515
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/popuphelp.php
+6
View File
@@ -61,6 +61,12 @@ $template->assign(
'HELP_CONTENT' => $help_content
));
if (isset($_GET['output']) and 'content_only' == $_GET['output'])
{
echo $help_content;
exit();
}
// +-----------------------------------------------------------------------+
// | html code display |
// +-----------------------------------------------------------------------+
admin/themes/default/template/admin.tpl
+5 -2
View File
@@ -143,9 +143,12 @@ jQuery(document).ready(function() {
{$TABSHEET}
{/if}
{if isset($U_HELP)}
{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
{include file='include/colorbox.inc.tpl'}
{footer_script}
jQuery('.help-popin').colorbox({ width:"500px" });
{/footer_script}
<ul class="HelpActions">
<li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" class="icon-help-circled"></a></li>
<li><a href="{$U_HELP}&amp;output=content_only" title="{'Help'|@translate}" class="help-popin"><span class="icon-help-circled"></span></a></li>
</ul>
{/if}
admin/themes/default/template/batch_manager_global.tpl
+4 -2
View File
@@ -1,5 +1,5 @@
{include file='include/datepicker.inc.tpl' load_mode='async'}
{include file='include/colorbox.inc.tpl' load_mode='async'}
{include file='include/colorbox.inc.tpl' load_mode='footer'}
{include file='include/add_album.inc.tpl' load_mode='async'}
{combine_script id='common' load='footer' path='admin/themes/default/js/common.js'}
@@ -28,6 +28,8 @@ var lang = {
jQuery(document).ready(function() {
jQuery('.help-popin').colorbox({ width:"500px" });
{* <!-- TAGS --> *}
var tagsCache = new TagsCache({
serverKey: '{$CACHE_KEYS.tags}',
@@ -456,7 +458,7 @@ var sliders = {
{'Search'|@translate}
<input name="q" size=40 value="{$filter.search.q|stripslashes|htmlspecialchars}">
{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
<a href="admin/popuphelp.php?page=quick_search" onclick="popuphelp(this.href);return false;" title="{'Help'|@translate}"><span class="icon-help-circled"></span></a>
<a href="admin/popuphelp.php?page=quick_search&amp;output=content_only" class="help-popin" title="{'Help'|@translate}"><span class="icon-help-circled"></span></a>
{if (isset($no_search_results))}
<div>{'No results for'|@translate} :
<em><strong>