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

Fixes #501 - restored delete_32.png and delete_16.png for Backward compatibility. Updated some scripts to use ADMIN_DELETE_ICON instead of the deprecated ADMIN_DELETE_ICON_PATH .

Browse Source
This commit is contained in:
Cameron
2014-01-23 04:38:48 -08:00
parent 4bfeb0c66b
commit bb76398ac1
8 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/frontpage.php
View File

@@ -411,11 +411,7 @@ class frontpage
</td> </td>
</tr>"; </tr>";
/*
<input class='btn ' type='image' src='".ADMIN_UP_ICON_PATH."' title='".FRTLAN_47."' value='".$order."' name='fp_inc".$order."' />
<input class='btn ' type='image' src='".ADMIN_DOWN_ICON_PATH."' title='".FRTLAN_48."' value='".$order."' name='fp_dec".$order."' />
<input class='btn delete' type='image' title='".LAN_DELETE."' data-confirm='". LAN_CONFDELETE."' name='fp_delete_rule[".$order."]' src='".ADMIN_DELETE_ICON_PATH."' />
*/
} }
$text .= " $text .= "
</tbody> </tbody>

4
e107_admin/users_extended.php
View File

@@ -910,8 +910,8 @@ class users_ext
<div> <div>
<input type='hidden' name='eu_action' value='delcat' /> <input type='hidden' name='eu_action' value='delcat' />
<input type='hidden' name='key' value='{$ext['user_extended_struct_id']},{$ext['user_extended_struct_name']}' /> <input type='hidden' name='key' value='{$ext['user_extended_struct_id']},{$ext['user_extended_struct_name']}' />
<a style='text-decoration:none' href='".e_SELF."?cat.{$ext['user_extended_struct_id']}'>".ADMIN_EDIT_ICON."</a> <a class='btn btn-default' href='".e_SELF."?cat.{$ext['user_extended_struct_id']}'>".ADMIN_EDIT_ICON."</a>
<input type='image' title='".LAN_DELETE."' name='eudel' src='".ADMIN_DELETE_ICON_PATH."' /> <button class='btn btn-default action delete' type='submit' title='".LAN_DELETE."' name='eudel' data-confirm='".LAN_JSCONFIRM."' >".ADMIN_DELETE_ICON."</button>
</div> </div>
</form> </form>
</td> </td>

2
e107_admin/wmessage.php
View File

@@ -150,7 +150,7 @@ if ($action == "main" || $action == "")
<td>".r_userclass_name($row['gen_intdata'])."</td> <td>".r_userclass_name($row['gen_intdata'])."</td>
<td class='center nowrap'> <td class='center nowrap'>
<a class='btn btn-large' href='".e_SELF."?create.edit.{$row['gen_id']}'>".ADMIN_EDIT_ICON."</a> <a class='btn btn-large' href='".e_SELF."?create.edit.{$row['gen_id']}'>".ADMIN_EDIT_ICON."</a>
<input class='btn btn-large' type='image' title='".LAN_DELETE."' name='main_delete[".$row['gen_id']."]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".LAN_CONFIRMDEL." [ID: {$row['gen_id']} ]')\"/> <button class='btn btn-large action delete' type='submit' title='".LAN_DELETE."' name='main_delete[".$row['gen_id']."]' data-confirm=\"".LAN_CONFIRMDEL." [ID: {$row['gen_id']} ]\" >".ADMIN_DELETE_ICON."</button>
</td> </td>
</tr>"; </tr>";
} }

9
e107_handlers/form_handler.php
View File

@@ -1531,39 +1531,36 @@ class e_form
function submit_image($name, $value, $image, $title='', $options = array()) function submit_image($name, $value, $image, $title='', $options = array())
{ {
$tp = e107::getParser();
$options = $this->format_options('submit_image', $name, $options); $options = $this->format_options('submit_image', $name, $options);
switch ($image) switch ($image)
{ {
case 'edit': case 'edit':
$image = ADMIN_EDIT_ICON_PATH;
$icon = "e-edit-32"; $icon = "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':
$image = ADMIN_DELETE_ICON_PATH;
$icon = "e-delete-32"; $icon = "e-delete-32";
$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':
$image = ADMIN_EXECUTE_ICON_PATH;
$icon = "e-execute-32"; $icon = "e-execute-32";
$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':
$image = ADMIN_VIEW_ICON_PATH;
$icon = "e-view-32"; $icon = "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)." ><i class='S32 {$icon}'></i></button>"; return "<button type='submit' name='{$name}' data-placement='left' value='{$value}'".$this->get_attributes($options, $name, $value)." >".$tp->toIcon($icon)."</button>";
// return "<input class='e-tip S16 {$icon} btn btn-large' data-placement='left' type='image' src='{$image}' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
} }
/** /**

BIN
e107_images/admin_images/delete_16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
e107_images/admin_images/delete_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

4
e107_plugins/gsitemap/admin_config.php
View File

@@ -164,8 +164,8 @@ class gsitemap
<td class='center' style='white-space:nowrap'> <td class='center' style='white-space:nowrap'>
<div> <div>
<input type='image' name='edit[{$row2['gsitemap_id']}]' value='edit' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' /> <button class='btn btn-default' type='submit' name='edit[{$row2['gsitemap_id']}]' value='edit' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' />
<input type='image' name='delete[{$row2['gsitemap_id']}]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$row2['gsitemap_name']."]")."') \" src='".ADMIN_DELETE_ICON_PATH."' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' /> <button class='btn btn-default action delete' type='submit' name='delete[{$row2['gsitemap_id']}]' value='del' data-confirm='".$tp->toJS(LAN_CONFIRMDEL." [".$row2['gsitemap_name']."]")."' title='".LAN_DELETE."' >".ADMIN_DELETE_ICON."</button>
</div> </div>
</td> </td>
</tr> </tr>

4
e107_plugins/poll/admin_config.php
View File

@@ -202,8 +202,8 @@ function poll_list()
$text .= " $text .= "
<td class='center' style='white-space:nowrap'> <td class='center' style='white-space:nowrap'>
<input class='btn btn-large' type='image' name='edit[{$poll_id}]' value='edit' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' /> <button class='btn btn-large' type='submit' name='edit[{$poll_id}]' value='edit' alt='".LAN_EDIT."' title='".LAN_EDIT."' >".ADMIN_EDIT_ICON."</button>
<input class='btn btn-large' type='image' name='delete[$poll_id]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$poll_id."]")."') \" src='".ADMIN_DELETE_ICON_PATH."' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' /> <button class='btn btn-large action delete' type='submit' name='delete[$poll_id]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$poll_id."]")."') \" title='".LAN_DELETE."' >".ADMIN_DELETE_ICON."</button>
</td> </td>
</tr>"; </tr>";
} }