mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Fix for Form handler submit_button image paths.

Browse Source
This commit is contained in:
Cameron
2017-01-16 14:05:04 -08:00
parent 675aa7cf91
commit 9f8fa3b2c7
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e107_core/templates/admin_icons_template.php
View File

@@ -440,14 +440,25 @@ if (!defined('E_16_FAILEDLOGIN')) {
define("E_32_TRUE", "<i class='S32 e-true-32'></i>"); define("E_32_TRUE", "<i class='S32 e-true-32'></i>");
/*
define("ADMIN_TRUE_ICON", "<i class='fa fa-check text-success'></i>");
define("ADMIN_FALSE_ICON", "<i class='fa fa-times text-danger'></i>");
define("ADMIN_WARNING_ICON", "<i class='fa fa-warning text-warning'></i>");
define("ADMIN_EDIT_ICON", "<i class='fa fa-edit fa-2x fa-fw'></i>");
define("ADMIN_DELETE_ICON", "<i class='fa fa-trash fa-2x fa-fw'></i>");
define("ADMIN_EXECUTE_ICON", "<i class='fa fa-power-off fa-2x fa-fw'></i>");
define("ADMIN_SORT_ICON", "<i class='fa fa-sort fa-2x fa-fw'></i>");
*/
define("ADMIN_TRUE_ICON", "<i class='S16 e-true-16'></i>"); define("ADMIN_TRUE_ICON", "<i class='S16 e-true-16'></i>");
define("ADMIN_FALSE_ICON", "<i class='S16 e-false-16'></i>"); define("ADMIN_FALSE_ICON", "<i class='S16 e-false-16'></i>");
define("ADMIN_WARNING_ICON", "<i class='S16 e-warning-16'></i>"); define("ADMIN_WARNING_ICON", "<i class='S16 e-warning-16'></i>");
define("ADMIN_EDIT_ICON", "<i class='S32 e-edit-32'></i>"); define("ADMIN_EDIT_ICON", "<i class='S32 e-edit-32'></i>");
define("ADMIN_DELETE_ICON", "<i class='S32 e-delete-32'></i>"); define("ADMIN_DELETE_ICON", "<i class='S32 e-delete-32'></i>");
define("ADMIN_ADD_ICON", "<i class='S32 e-add-32'></i>"); define("ADMIN_ADD_ICON", "<i class='S32 e-add-32'></i>");
define("ADMIN_INFO_ICON", "<i class='S16 e-info-16'></i>"); define("ADMIN_INFO_ICON", "<i class='S16 e-info-16'></i>");
define("ADMIN_CONFIGURE_ICON", "<i class='S32 e-settings-32'></i>"); define("ADMIN_CONFIGURE_ICON", "<i class='S32 e-settings-32'></i>");
@@ -463,6 +474,7 @@ define("E_32_TRUE", "<i class='S32 e-true-32'></i>");
define("ADMIN_EXECUTE_ICON", "<i class='S32 e-execute-32'></i>"); define("ADMIN_EXECUTE_ICON", "<i class='S32 e-execute-32'></i>");
// FOR BC // FOR BC
define("ADMIN_EDIT_ICON_PATH", e_IMAGE_ABS."admin_images/edit_32.png"); define("ADMIN_EDIT_ICON_PATH", e_IMAGE_ABS."admin_images/edit_32.png");

10
e107_handlers/form_handler.php
View File

@@ -2763,29 +2763,29 @@ e107::getDebug()->log($sc_parameters);
switch ($image) switch ($image)
{ {
case 'edit': case 'edit':
$icon = "e-edit-32"; $icon = (e_ADMIN_AREA === true) ? ADMIN_EDIT_ICON : $tp->toIcon("e-edit-32");
$options['class'] = $options['class'] == 'action' ? 'btn btn-default action edit' : $options['class']; $options['class'] = $options['class'] == 'action' ? 'btn btn-default action edit' : $options['class'];
break; break;
case 'delete': case 'delete':
$icon = (e_ADMIN_AREA === true) ? "e-delete-32" : 'fa-trash.glyph'; $icon = (e_ADMIN_AREA === true) ? ADMIN_DELETE_ICON : $tp->toIcon('fa-trash.glyph');
$options['class'] = $options['class'] == 'action' ? 'btn btn-default action delete' : $options['class']; $options['class'] = $options['class'] == 'action' ? 'btn btn-default action delete' : $options['class'];
$options['other'] = 'data-confirm="'.LAN_JSCONFIRM.'"'; $options['other'] = 'data-confirm="'.LAN_JSCONFIRM.'"';
break; break;
case 'execute': case 'execute':
$icon = "e-execute-32"; $icon = (e_ADMIN_AREA === true) ? ADMIN_EXECUTE_ICON : $tp->toIcon('fa-power-off.glyph');
$options['class'] = $options['class'] == 'action' ? 'btn btn-default action execute' : $options['class']; $options['class'] = $options['class'] == 'action' ? 'btn btn-default action execute' : $options['class'];
break; break;
case 'view': case 'view':
$icon = "e-view-32"; $icon = $tp->toIcon("e-view-32");
$options['class'] = $options['class'] == 'action' ? 'btn btn-default action view' : $options['class']; $options['class'] = $options['class'] == 'action' ? 'btn btn-default action view' : $options['class'];
break; break;
} }
$options['title'] = $title;//shorthand $options['title'] = $title;//shorthand
return "<button type='submit' name='{$name}' data-placement='left' value='{$value}'".$this->get_attributes($options, $name, $value)." >".$tp->toIcon($icon)."</button>"; return "<button type='submit' name='{$name}' data-placement='left' value='{$value}'".$this->get_attributes($options, $name, $value)." >".$icon."</button>";
} }