mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-29 10:38:08 +01:00
Code Issues Releases Wiki Activity

Added Media-Manager loading indicator. Use deftrue() for checking admin area in form handler.

Browse Source
This commit is contained in:
Cameron 2021-01-25 09:35:08 -08:00
parent 748e5ee11d
commit dfddca2e24
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
e107_handlers/admin_ui.php
View File

@ -7426,6 +7426,13 @@ class e_admin_form_ui extends e_form
$paginate = http_build_query($vars, null, '&');
e107::js('footer-inline', "
\$('#admin-ui-list-filter a.nextprev-item').on('click', function() {
\$('#admin-ui-list-filter .indicator').show();
});
");
return $this->pagination(e_REQUEST_SELF.'?'.$paginate,$totalRecords,$fromPage,$perPage,array('template'=>'basic'));
}

16
e107_handlers/form_handler.php
View File

@ -2013,7 +2013,7 @@ class e_form
*/
public function file($name, $options = array())
{
if(e_ADMIN_AREA && empty($options['class']))
if(deftrue('e_ADMIN_AREA') && empty($options['class']))
{
$options = array('class'=>'tbox well file');
}
@ -2828,7 +2828,7 @@ class e_form
$options_off = array_merge($options, array('class' => 'e-expandit-off'));
}
if(e_ADMIN_AREA === true)
if(deftrue('e_ADMIN_AREA'))
{
$options['switch'] = 'small';
$label_enabled = ($label_enabled) ? strtoupper($label_enabled) : strtoupper(LAN_ON);
@ -2912,7 +2912,7 @@ class e_form
$options += $switchAttributes;
if(e_ADMIN_AREA === true)
if(deftrue('e_ADMIN_AREA'))
{
$options['data-wrapper'] = 'wrapper form-control';
@ -3512,18 +3512,18 @@ var_dump($select_options);*/
switch ($image)
{
case 'edit':
$icon = (e_ADMIN_AREA === true) ? ADMIN_EDIT_ICON : $tp->toIcon('e-edit-32');
$icon = deftrue('e_ADMIN_AREA') ? ADMIN_EDIT_ICON : $tp->toIcon('e-edit-32');
$options['class'] = $options['class'] === 'action' ? 'btn btn-default btn-secondary action edit' : $options['class'];
break;
case 'delete':
$icon = (e_ADMIN_AREA === true) ? ADMIN_DELETE_ICON : $tp->toIcon('fa-trash.glyph');
$icon = deftrue('e_ADMIN_AREA') ? ADMIN_DELETE_ICON : $tp->toIcon('fa-trash.glyph');
$options['class'] = $options['class'] === 'action' ? 'btn btn-default btn-secondary action delete' : $options['class'];
$options['other'] = 'data-confirm="'.LAN_JSCONFIRM.'"';
break;
case 'execute':
$icon = (e_ADMIN_AREA === true) ? ADMIN_EXECUTE_ICON : $tp->toIcon('fa-power-off.glyph');
$icon = deftrue('e_ADMIN_AREA') ? ADMIN_EXECUTE_ICON : $tp->toIcon('fa-power-off.glyph');
$options['class'] = $options['class'] === 'action' ? 'btn btn-default btn-secondary action execute' : $options['class'];
break;
@ -6917,7 +6917,7 @@ var_dump($select_options);*/
$parms = 'total='.$total;
$parms .= '&amount='.$amount;
$parms .= '&current='.$from;
if(defined('ADMIN_AREA') && ADMIN_AREA)
if(deftrue('e_ADMIN_AREA'))
{
$parms .= '&tmpl_prefix=admin';
}
@ -7138,7 +7138,7 @@ var_dump($select_options);*/
$parms .= '&amount='.$amount;
$parms .= '&current='.$from;
if(ADMIN_AREA)
if(deftrue('e_ADMIN_AREA'))
{
$parms .= '&tmpl_prefix=admin';
}