From bb76398ac11667c627fb64e223b7463dde393735 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Thu, 23 Jan 2014 04:38:48 -0800
Subject: [PATCH] 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 .

---
 e107_admin/frontpage.php               |   6 +-----
 e107_admin/users_extended.php          |   4 ++--
 e107_admin/wmessage.php                |   2 +-
 e107_handlers/form_handler.php         |   9 +++------
 e107_images/admin_images/delete_16.png | Bin 0 -> 1032 bytes
 e107_images/admin_images/delete_32.png | Bin 0 -> 2437 bytes
 e107_plugins/gsitemap/admin_config.php |   4 ++--
 e107_plugins/poll/admin_config.php     |   4 ++--
 8 files changed, 11 insertions(+), 18 deletions(-)
 create mode 100644 e107_images/admin_images/delete_16.png
 create mode 100644 e107_images/admin_images/delete_32.png

diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php
index 551cf6516..8270e78e1 100644
--- a/e107_admin/frontpage.php
+++ b/e107_admin/frontpage.php
@@ -411,11 +411,7 @@ class frontpage
 						</td>
 					</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 .= "
 		 		</tbody>
diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php
index d9dc03184..16f2d1d3f 100755
--- a/e107_admin/users_extended.php
+++ b/e107_admin/users_extended.php
@@ -910,8 +910,8 @@ class users_ext
 				<div>
 				<input type='hidden' name='eu_action' value='delcat' />
 				<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>
-				<input type='image' title='".LAN_DELETE."' name='eudel' src='".ADMIN_DELETE_ICON_PATH."' />
+				<a class='btn btn-default'  href='".e_SELF."?cat.{$ext['user_extended_struct_id']}'>".ADMIN_EDIT_ICON."</a>
+				<button class='btn btn-default action delete' type='submit' title='".LAN_DELETE."' name='eudel' data-confirm='".LAN_JSCONFIRM."' >".ADMIN_DELETE_ICON."</button>
 				</div>
 				</form>
 				</td>
diff --git a/e107_admin/wmessage.php b/e107_admin/wmessage.php
index b8aee0403..6eac55730 100644
--- a/e107_admin/wmessage.php
+++ b/e107_admin/wmessage.php
@@ -150,7 +150,7 @@ if ($action == "main" || $action == "")
 				<td>".r_userclass_name($row['gen_intdata'])."</td>
             	<td class='center nowrap'>
             		<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>
 			</tr>";
 		}
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 44ec03e4b..77e572729 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -1531,39 +1531,36 @@ class e_form
 
 	function submit_image($name, $value, $image, $title='', $options = array())
 	{
+		$tp = e107::getParser();
 		$options = $this->format_options('submit_image', $name, $options);
 		switch ($image)
 		{
 			case 'edit':
-				$image = ADMIN_EDIT_ICON_PATH;
 				$icon = "e-edit-32";
 				$options['class'] = $options['class'] == 'action' ? 'btn btn-default action edit' : $options['class'];
 			break;
 
 			case 'delete':
-				$image = ADMIN_DELETE_ICON_PATH;
 				$icon = "e-delete-32";
 				$options['class'] = $options['class'] == 'action' ? 'btn btn-default action delete' : $options['class'];
 				$options['other'] = 'data-confirm="'.LAN_JSCONFIRM.'"';
 			break;
 
 			case 'execute':
-				$image = ADMIN_EXECUTE_ICON_PATH;
 				$icon = "e-execute-32";
 				$options['class'] = $options['class'] == 'action' ? 'btn btn-default action execute' : $options['class'];
 			break;
 
 			case 'view':
-				$image = ADMIN_VIEW_ICON_PATH;
 				$icon = "e-view-32";
 				$options['class'] = $options['class'] == 'action' ? 'btn btn-default action view' : $options['class'];
 			break;
 		}
 		$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)." />";
+	
 	}
 
 	/**
diff --git a/e107_images/admin_images/delete_16.png b/e107_images/admin_images/delete_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfb80b2e5804352ead65535f1ba795ba9d7e5863
GIT binary patch
literal 1032
zcmV+j1o!)iP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#nn^@KRCwBA
z{Qv(y10?_;fLK7pQbtCGUknVIqN-|(h3xE&A8%a0?fsiKQGXd2K7x$@!@$7J$;-P)
zF)S?T*{M@E9$mg1_m6?$bOX?GfB<3uxnLns^HyV%8z1l7{{R2^{r@jcocg~=Lh|55
zpvDOd46M_Hgm>KEf8hV$M|b~!czFN+0td$jH4F@<AiV$q1U6u^y2iy%w}G1Hwf+C8
zDgOWe-gW<<pFRJ7mWb%y$=p0!9v(UR|Lfu1|1V02{eRq0`v1-2NB^fA7~Tcx1qdLp
z0mo9({{Me@AE=rC|0gMi|8Eu9{{P&$_Wz@!$N%5kzyJT|1H1lT6zBbaij(30AvWg!
zU$0#Jzon$)KS(b?05O5W;PJMtyI$OW#=tgZKErQz4u;=9e=)pBie%vb_?$tI@fX9r
z@F0d?Uq3VaWMpDcnLU%?-S2-4SJtjO0n!T)KwuZlWnd6lBq??9`Nhlsf9+WF|A92y
z|2rZK|8FR8{l6^F`~M6t!~erT+n>yx`TrTvs~yV9r;8XEWI%cW0toB^W(I~gpPxVT
z+3aAq`#G-^gW$|%41aid8Gd~E#_;p=XNF(w><n@<fvz(&W0-Gid-TQKyY8$E3{OCM
z0Rpf{$0z`RFbn_#F4q75)J2=x8pJ}j41w!ooC>8?<T?ywAK29pa&&pQro#*wfu-B3
z^Z&sWKwuXD<C&L3SY*B5j$OW@3_lni#fCBbdiR0h7ZWSPZ)SFe-ygp-T#kulV7zmS
zA@RTgXCW!6EkFZAKzacJ2y6hSsMrF}RV&?v{(fe-9}&dx`^y)GA3)os`(`pI%v{9q
z6J*e@-wdY`5*hwpzs?Z5YL%UkwDd}lUVs1s8=&at7bL5$#Be7hoZ<V2FAU%RFf%Al
zna%KD--zM2oC1U9qD2h9SXdc;{rbglAU2kPmxqTzKO({jq!%E7zy>@&b?VNSKTHfl
zS*Z-a*mxO~XUt$=w6bMb=IeWUp||$|MpZQiBcLHafEtzJ;~5wP1sU!hJ^B=+7a)MZ
z(b&eoV6wo`>HgbC5C4C?bm9Nwix>ZQDk+^V1o|_dfq|<=Qu5%9<0t+<J$L^9(+3a!
z_xkxgi)CPN0O<t?AVv_;1<Xue7#PeY_4OCZIlHJ|S+(-;iziPa*%=s~0)ql1Cm<jy
zvO+&5*8T3WV-K&LJedfT+dmJe7a)KbDb3CR0R{l>4W}+)g6FCL0000<MNUMnLSTY-
CMDnWu

literal 0
HcmV?d00001

diff --git a/e107_images/admin_images/delete_32.png b/e107_images/admin_images/delete_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..b953dd7e3ef3e834105d0a515bd5f6b74debb707
GIT binary patch
literal 2437
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

literal 0
HcmV?d00001

diff --git a/e107_plugins/gsitemap/admin_config.php b/e107_plugins/gsitemap/admin_config.php
index a023334d0..2a8a949f1 100644
--- a/e107_plugins/gsitemap/admin_config.php
+++ b/e107_plugins/gsitemap/admin_config.php
@@ -164,8 +164,8 @@ class gsitemap
 
 				<td class='center' style='white-space:nowrap'>
 				<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' />
-				<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' type='submit' 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 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>
 				</td>
 				</tr>
diff --git a/e107_plugins/poll/admin_config.php b/e107_plugins/poll/admin_config.php
index e343201f6..4ff91eed8 100644
--- a/e107_plugins/poll/admin_config.php
+++ b/e107_plugins/poll/admin_config.php
@@ -202,8 +202,8 @@ function poll_list()
 				
 				$text .= "
 				<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' />
-					<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' type='submit' name='edit[{$poll_id}]' value='edit' alt='".LAN_EDIT."' title='".LAN_EDIT."' >".ADMIN_EDIT_ICON."</button>
+					<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>
 			</tr>";
 		}