diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php
index 00f98e8f9..5e26f75e1 100644
--- a/e107_admin/admin_log.php
+++ b/e107_admin/admin_log.php
@@ -9,8 +9,8 @@
  * Administration Area - Admin Log
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/admin_log.php,v $
- * $Revision: 1.28 $
- * $Date: 2009-08-09 07:03:51 $
+ * $Revision: 1.29 $
+ * $Date: 2009-08-15 15:44:37 $
  * $Author: marj_nl_fr $
  *
 */
@@ -221,8 +221,8 @@ if(($action == "confdel") || ($action == "auditdel"))
 				</table>
 				<div class='buttons-bar center'>
 					<input type='hidden' name='backdeltype' value='{$action}' />
-					<button class='delete' type='submit' name='confirmdeleteold' value='".RL_LAN_049."'><span>".RL_LAN_049."</span></button>
-					<button class='cancel' type='submit' name='confirmcancelold' value='".RL_LAN_055."'><span>".RL_LAN_055."</span></button>
+					<button class='delete' type='submit' name='confirmdeleteold' value='no-value'><span>".RL_LAN_049."</span></button>
+					<button class='cancel' type='submit' name='confirmcancelold' value='no-value'><span>".RL_LAN_055."</span></button>
 				</div>
 			</fieldset>
 		</form>
@@ -454,7 +454,7 @@ if($action == "config")
 				</tbody>
 			</table>
 			<div class='buttons-bar center'>
-				<button class='update' type='submit' name='setoptions' value='".RL_LAN_010."'><span>".RL_LAN_010."</span></button>
+				<button class='update' type='submit' name='setoptions' value='no-value'><span>".RL_LAN_010."</span></button>
 			</div>
 		</fieldset>
 	</form>
@@ -475,7 +475,7 @@ if($action == "config")
 					<tr>
 						<td class='label'>".RL_LAN_045." </td>
 						<td class='control'>
-							".gen_log_delete('rolllog_clearadmin').RL_LAN_046."<button class='delete no-confirm' type='submit' name='deleteoldadmin' value='".RL_LAN_049."'><span>".RL_LAN_049."</span></button>
+							".gen_log_delete('rolllog_clearadmin').RL_LAN_046."<button class='delete no-confirm' type='submit' name='deleteoldadmin' value='no-value'><span>".RL_LAN_049."</span></button>
 						</td>
 					</tr>
 	";
@@ -486,7 +486,7 @@ if($action == "config")
 					<tr>
 						<td class='label'>".RL_LAN_066." </td>
 						<td class='control'>
-							".gen_log_delete('rolllog_clearaudit').RL_LAN_046."<button class='delete no-confirm' type='submit' name='deleteoldaudit' value='".RL_LAN_049."'><span>".RL_LAN_049."</span></button>
+							".gen_log_delete('rolllog_clearaudit').RL_LAN_046."<button class='delete no-confirm' type='submit' name='deleteoldaudit' value='no-value'><span>".RL_LAN_049."</span></button>
 						</td>
 					</tr>
 				</tbody>
@@ -814,8 +814,8 @@ if(isset($page_title[$action]))
 	$text .= "
 			</table>
 			<div class='buttons-bar center'>
-				<button class='delete no-confirm' type='submit' name='clearfilters' value='".RL_LAN_114."'><span>".RL_LAN_114."</span></button>
-				<button class='update' type='submit' name='updatefilters' value='".RL_LAN_028."'><span>".RL_LAN_028."</span></button>
+				<button class='delete no-confirm' type='submit' name='clearfilters' value='no-value'><span>".RL_LAN_114."</span></button>
+				<button class='update' type='submit' name='updatefilters' value='no-value'><span>".RL_LAN_028."</span></button>
 			</div>
 			</fieldset>
 		</form>
@@ -971,12 +971,12 @@ if(isset($page_title[$action]))
 				</tbody>
 			</table>
 			<div class='buttons-bar center'>
-				<button class='submit' type='submit' name='refreshlog' value='".RL_LAN_018."'><span>".RL_LAN_018."</span></button>
+				<button class='submit' type='submit' name='refreshlog' value='no-value'><span>".RL_LAN_018."</span></button>
 	";
 	if($delete_button)
 	{
 		$text .= "
-				<button class='delete' type='submit' name='deleteitems' title='".RL_LAN_111."?' value='".RL_LAN_111."'><span>".RL_LAN_111."</span></button>
+				<button class='delete' type='submit' name='deleteitems' value='no-value'><span>".RL_LAN_111."</span></button>
 		";
 	}
 	$text .= "
diff --git a/e107_admin/banner.php b/e107_admin/banner.php
index 7b4e4e170..6913939fb 100644
--- a/e107_admin/banner.php
+++ b/e107_admin/banner.php
@@ -9,8 +9,8 @@
  * Banner Administration
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/banner.php,v $
- * $Revision: 1.12 $
- * $Date: 2009-08-15 11:55:29 $
+ * $Revision: 1.13 $
+ * $Date: 2009-08-15 15:44:37 $
  * $Author: marj_nl_fr $
  *
 */
@@ -477,7 +477,7 @@ if ($action == "create") {
 						<td class='label'>".BNRLAN_32."</td>
 						<td class='control'>
 							<div class='field-spacer'>
-								<button class='action' type='button' value='".BNRLAN_43."' onclick='e107Helper.toggle(\"banner-repo\")'><span>".BNRLAN_43."</span></button>
+								<button class='action' type='button' value='no-value' onclick='e107Helper.toggle(\"banner-repo\")'><span>".BNRLAN_43."</span></button>
 							</div>
 							<div class='e-hideme' id='banner-repo'>
 	";
@@ -611,11 +611,11 @@ if ($action == "create") {
 	if 	($sub_action == "edit" && $id) {
 		$text .= "
 				<input type='hidden' name='eid' value='".$id."' />
-				<button class='update' type='submit' name='updatebanner' value='".BNRLAN_40."'><span>".BNRLAN_40."</span></button>
+				<button class='update' type='submit' name='updatebanner' value='no-value'><span>".BNRLAN_40."</span></button>
 		";
 	} else {
 		$text .= "
-				<button class='create' type='submit' name='createbanner' value='".BNRLAN_41."'><span>".BNRLAN_41."</span></button>
+				<button class='create' type='submit' name='createbanner' value='no-value'><span>".BNRLAN_41."</span></button>
 		";
 	}
 	$text .= "
@@ -737,7 +737,7 @@ if ($action == "menu")
 					</tbody>
 				</table>
 				<div class='buttons-bar center'>
-					<button class='update' type='submit' name='update_menu' value='".BANNER_MENU_L18."'><span>".BANNER_MENU_L18."</span></button>
+					<button class='update' type='submit' name='update_menu' value='no-value'><span>".BANNER_MENU_L18."</span></button>
 				</div>
 			</fieldset>
 		</form>
diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php
index b3f562f03..b7ef39a52 100644
--- a/e107_admin/emoticon.php
+++ b/e107_admin/emoticon.php
@@ -9,9 +9,9 @@
  * Administration Area - Emotions Settings & Packs
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/emoticon.php,v $
- * $Revision: 1.14 $
- * $Date: 2009-07-17 23:23:36 $
- * $Author: e107coders $
+ * $Revision: 1.15 $
+ * $Date: 2009-08-15 15:44:37 $
+ * $Author: marj_nl_fr $
  *
 */
 
@@ -322,8 +322,8 @@ class emotec
 			</table>
 			<div class='buttons-bar center'>
 				<input type='hidden' name='packID' value='{$packID}' />
-				<button class='update' type='submit' name='sub_conf' value='".EMOLAN_14."'><span>".EMOLAN_14."</span></button>
-				<button class='cancel' type='submit' name='cancel' value='".LAN_CANCEL."'><span>".LAN_CANCEL."</span></button>
+				<button class='update' type='submit' name='sub_conf' value='no-value'><span>".EMOLAN_14."</span></button>
+				<button class='cancel' type='submit' name='cancel' value='no-value'><span>".LAN_CANCEL."</span></button>
 			</div>
 		</fieldset>
 	</form>";
diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php
index fb47ebf53..0b03378ae 100644
--- a/e107_admin/lancheck.php
+++ b/e107_admin/lancheck.php
@@ -10,8 +10,8 @@
  * With code from Izydor and Lolo.
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/lancheck.php,v $
- * $Revision: 1.14 $
- * $Date: 2009-07-19 11:44:28 $
+ * $Revision: 1.15 $
+ * $Date: 2009-08-15 15:44:37 $
  * $Author: marj_nl_fr $
  *
 */
@@ -667,7 +667,7 @@ function edit_lanfiles($dir1,$dir2,$f1,$f2){
 			<div style='text-align:center'>
 				".((!$writable) ? $dir2.$f2.LAN_NOTWRITABLE : "")."
 				<br />
-				<button class='submit' type='submit' name='language_sel' value='".LAN_BACK."'><span>".LAN_BACK."</span></button>
+				<button class='submit' type='submit' name='language_sel' value='no-value'><span>".LAN_BACK."</span></button>
 				<input type='hidden' name='language' value='$lan' />
 			</div>
 		</form>
diff --git a/e107_admin/language.php b/e107_admin/language.php
index 111afdd3a..c666295de 100644
--- a/e107_admin/language.php
+++ b/e107_admin/language.php
@@ -9,9 +9,9 @@
  * Administration Area - Languages
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/language.php,v $
- * $Revision: 1.15 $
- * $Date: 2009-03-26 21:55:37 $
- * $Author: e107steved $
+ * $Revision: 1.16 $
+ * $Date: 2009-08-15 15:44:37 $
+ * $Author: marj_nl_fr $
  *
 */
 
@@ -274,7 +274,7 @@ if (isset($_POST['edit_existing']))
 			</table>
 			<div class='buttons-bar center'>
 				<input type='hidden' name='language' value='{$_POST['lang_choices']}' />
-				<button class='{$baction}' type='submit' name='create_tables' value='{$bcaption}'><span>{$bcaption}</span></button>
+				<button class='{$baction}' type='submit' name='create_tables' value='no-value'><span>{$bcaption}</span></button>
 			</div>
 		</fieldset>
 	</form>
@@ -353,7 +353,7 @@ function multilang_prefs()
 				</tbody>
 			</table>
 			<div class='buttons-bar center'>
-				<button class='update' type='submit' name='submit_prefs' value='".LAN_SAVE."'><span>".LAN_SAVE."</span></button>
+				<button class='update' type='submit' name='submit_prefs' value='no-value'><span>".LAN_SAVE."</span></button>
 			</div>
 		</fieldset>
 	</form>
@@ -511,14 +511,14 @@ function multilang_db(){
    			if ($installed)
    			{
 				$text .= "
-								<button class='edit' type='submit' name='edit_existing' value='".LAN_EDIT."'><span>".LAN_EDIT."</span></button>
-								<button class='delete' type='submit' name='del_existing' value='".LAN_DELETE."' title='".sprintf(LANG_LAN_33, $lanlist[$i]).' '.LANG_LAN_09."'><span>".LAN_DELETE."</span></button>
+								<button class='edit' type='submit' name='edit_existing' value='no-value'><span>".LAN_EDIT."</span></button>
+								<button class='delete' type='submit' name='del_existing' value='no-value' title='".sprintf(LANG_LAN_33, $lanlist[$i]).' '.LANG_LAN_09."'><span>".LAN_DELETE."</span></button>
 				";
 			}
 			elseif($lanlist[$i] != $pref['sitelanguage'])
 			{
 				$text .= "
-								<button class='create' type='submit' name='create_edit_existing' value='".LAN_CREATE."'><span>".LAN_CREATE."</span></button>
+								<button class='create' type='submit' name='create_edit_existing' value='no-value'><span>".LAN_CREATE."</span></button>
 				";
 			}
 			$text .= "
@@ -580,7 +580,7 @@ function show_tools()
 
 	$text .= "
 								</select>
-								<button class='submit' type='submit' name='language_sel' value='".LAN_CHECK_2."'><span>".LAN_CHECK_2."</span></button>
+								<button class='submit' type='submit' name='language_sel' value='no-value'><span>".LAN_CHECK_2."</span></button>
 							</td>
 						</tr>
 					</tbody>
@@ -620,7 +620,7 @@ function show_tools()
 
 	$text .= "
 								</select>
-								<button class='submit' type='submit' name='ziplang' value='".LANG_LAN_24."'><span>".LANG_LAN_24."</span></button>
+								<button class='submit' type='submit' name='ziplang' value='no-value'><span>".LANG_LAN_24."</span></button>
 							</td>
 						</tr>
 					</tbody>
diff --git a/e107_admin/links.php b/e107_admin/links.php
index 21f2be90b..1f1e9ee5a 100644
--- a/e107_admin/links.php
+++ b/e107_admin/links.php
@@ -9,9 +9,9 @@
  * Administration Area - Site Links
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/links.php,v $
- * $Revision: 1.26 $
- * $Date: 2009-07-23 15:21:41 $
- * $Author: e107coders $
+ * $Revision: 1.27 $
+ * $Date: 2009-08-15 15:44:37 $
+ * $Author: marj_nl_fr $
  *
 */
 
@@ -362,7 +362,7 @@ class links
 					</tbody>
 				</table>
 				<div class='buttons-bar center'>
-					<button class='update' type='submit' name='update' value='".LAN_UPDATE."'><span>".LAN_UPDATE."</span></button>
+					<button class='update' type='submit' name='update' value='no-value'><span>".LAN_UPDATE."</span></button>
 				</div>
 			</fieldset>
 
@@ -635,13 +635,13 @@ class links
 		if($id && $sub_action == "edit")
 		{
 			$text .= "
-						<button class='update' type='submit' name='add_link' value='".LCLAN_27."'><span>".LCLAN_27."</span></button>
+						<button class='update' type='submit' name='add_link' value='no-value'><span>".LCLAN_27."</span></button>
 						<input type='hidden' name='link_id' value='{$link_id}' />
 			";
 		} else
 		{
 			$text .= "
-						<button class='create' type='submit' name='add_link' value='".LCLAN_28."'><span>".LCLAN_28."</span></button>
+						<button class='create' type='submit' name='add_link' value='no-value"'><span>".LCLAN_28."</span></button>
 			";
 		}
 		$text .= "
@@ -728,7 +728,7 @@ class links
 					</tbody>
 				</table>
 				<div class='buttons-bar center'>
-					<button class='update' type='submit' name='updateoptions' value='".LAN_UPDATE."'><span>".LAN_UPDATE."</span></button>
+					<button class='update' type='submit' name='updateoptions' value='no-value'><span>".LAN_UPDATE."</span></button>
 				</div>
 			</fieldset>
 		</form>
@@ -822,7 +822,7 @@ class links
 					</tbody>
 				</table>
 				<div class='buttons-bar center'>
-					<button class='create' type='submit' name='generate_sublinks' value='".LINKLAN_5."'><span>".LINKLAN_5."</span></button>
+					<button class='create' type='submit' name='generate_sublinks' value='no-value'><span>".LINKLAN_5."</span></button>
 				</div>
 			</fieldset>
 		</form>
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 6380bb625..da8191982 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $
-|     $Revision: 1.36 $
-|     $Date: 2009-08-14 21:11:49 $
-|     $Author: e107coders $
+|     $Revision: 1.37 $
+|     $Date: 2009-08-15 15:44:37 $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
@@ -825,7 +825,7 @@ class pluginManager{
 							{
 						  		$text .= ($plug['plugin_installflag'] ? "<a href=\"".e_SELF."?uninstall.{$plug['plugin_id']}'\" title='".EPL_ADLAN_1."'  >".ADMIN_UNINSTALLPLUGIN_ICON."</a>" : "<a href=\"".e_SELF."?install.{$plug['plugin_id']}\" title='".EPL_ADLAN_0."' >".ADMIN_INSTALLPLUGIN_ICON."</a>");
 
-                             //   $text .= ($plug['plugin_installflag'] ? "<button type='button' class='delete' value='".EPL_ADLAN_1."' onclick=\"location.href='".e_SELF."?uninstall.{$plug['plugin_id']}'\"><span>".EPL_ADLAN_1."</span></button>" : "<button type='button' class='update' value='".EPL_ADLAN_0."' onclick=\"location.href='".e_SELF."?install.{$plug['plugin_id']}'\"><span>".EPL_ADLAN_0."</span></button>");
+                             //   $text .= ($plug['plugin_installflag'] ? "<button type='button' class='delete' value='no-value' onclick=\"location.href='".e_SELF."?uninstall.{$plug['plugin_id']}'\"><span>".EPL_ADLAN_1."</span></button>" : "<button type='button' class='update' value='no-value' onclick=\"location.href='".e_SELF."?install.{$plug['plugin_id']}'\"><span>".EPL_ADLAN_0."</span></button>");
 								if (PLUGIN_SHOW_REFRESH && !varsettrue($plug_vars['plugin_php']))
 								{
 									$text .= "<br /><br /><input type='button' class='button' onclick=\"location.href='".e_SELF."?refresh.{$plug['plugin_id']}'\" title='".'Refresh plugin settings'."' value='".'Refresh plugin settings'."' /> ";
@@ -834,7 +834,7 @@ class pluginManager{
 							else
 							{
 							  //	$text .=  "<input type='button' class='button' onclick=\"location.href='".e_SELF."?install.{$plug['plugin_id']}'\" title='".EPL_ADLAN_0."' value='".EPL_ADLAN_0."' />";
-							  //	$text .= "<button type='button' class='update' value='".EPL_ADLAN_0."' onclick=\"location.href='".e_SELF."?install.{$plug['plugin_id']}'\"><span>".EPL_ADLAN_0."</span></button>";
+							  //	$text .= "<button type='button' class='update' value='no-value' onclick=\"location.href='".e_SELF."?install.{$plug['plugin_id']}'\"><span>".EPL_ADLAN_0."</span></button>";
                             	$text .= "<a href=\"".e_SELF."?install.{$plug['plugin_id']}\" title='".EPL_ADLAN_0."' >".ADMIN_INSTALLPLUGIN_ICON."</a>";
 							}
 						}
diff --git a/e107_admin/search.php b/e107_admin/search.php
index 425c29662..0c621d48c 100644
--- a/e107_admin/search.php
+++ b/e107_admin/search.php
@@ -9,9 +9,9 @@
  * Search Administration
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/search.php,v $
- * $Revision: 1.5 $
- * $Date: 2009-01-04 22:31:57 $
- * $Author: e107steved $
+ * $Revision: 1.6 $
+ * $Date: 2009-08-15 15:44:37 $
+ * $Author: marj_nl_fr $
  *
 */
 
@@ -338,7 +338,7 @@ elseif ($query[0] == 'edit')
 				</tbody>
 			</table>
 			<div class='buttons-bar center'>
-				<button class='update' type='submit' name='update_handler' value='".LAN_UPDATE."'><span>".LAN_UPDATE."</span></button>
+				<button class='update' type='submit' name='update_handler' value='no-value'><span>".LAN_UPDATE."</span></button>
 			</div>
 		</fieldset>
 	</form>
@@ -472,7 +472,7 @@ else
 				</tbody>
 			</table>
 			<div class='buttons-bar center'>
-				<button class='update' type='submit' name='update_main' value='".LAN_UPDATE."'><span>".LAN_UPDATE."</span></button>
+				<button class='update' type='submit' name='update_main' value='no-value'><span>".LAN_UPDATE."</span></button>
 			</div>
 		</fieldset>
 		</form>
diff --git a/e107_admin/updateadmin.php b/e107_admin/updateadmin.php
index e9cf0f91e..20e6d8c35 100644
--- a/e107_admin/updateadmin.php
+++ b/e107_admin/updateadmin.php
@@ -9,9 +9,9 @@
  * Administration Area - Update Admin
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/updateadmin.php,v $
- * $Revision: 1.5 $
- * $Date: 2009-01-11 22:11:19 $
- * $Author: e107steved $
+ * $Revision: 1.6 $
+ * $Date: 2009-08-15 15:44:37 $
+ * $Author: marj_nl_fr $
  *
 */
 
@@ -103,7 +103,7 @@ else
 			</table>
 			<div class='buttons-bar center'>
 				<input type='hidden' name='ac' value='".md5(ADMINPWCHANGE)."' />
-				<button class='update' type='submit' name='update_settings' value='".UDALAN_7."'><span>".UDALAN_7."</span></button>
+				<button class='update' type='submit' name='update_settings' value='no-value'><span>".UDALAN_7."</span></button>
 			</div>
 		</fieldset>
 	</form>
diff --git a/e107_files/jslib/core/admin.js b/e107_files/jslib/core/admin.js
index 819fde79d..34748647c 100644
--- a/e107_files/jslib/core/admin.js
+++ b/e107_files/jslib/core/admin.js
@@ -8,9 +8,9 @@
  * e107 Admin Helper
  *
  * $Source: /cvs_backup/e107_0.8/e107_files/jslib/core/admin.js,v $
- * $Revision: 1.20 $
- * $Date: 2009-08-15 01:00:38 $
- * $Author: bugrain $
+ * $Revision: 1.21 $
+ * $Date: 2009-08-15 15:44:37 $
+ * $Author: marj_nl_fr $
  *
 */
 
@@ -157,7 +157,7 @@ e107Admin.Helper = {
 	 * <input type='checkbox' class='checkbox' name='some_checkbox_array_some_more[]' /> (see the button example below)
 	 *
 	 * Example of button being auto-observed (see e107Admin.Helper#init)
-	 * <button class='action' type='button' name='check_all' value='Check All'><span>Check All</span></button> // default selector - multiaction
+	 * <button class='action' type='button' name='check_all' value='no-value'><span>Check All</span></button> // default selector - multiaction
 	 * OR
 	 * <button class='action' type='button' name='check_all' value='jstarget:some_checkbox_array'><span>Check All</span></button> // checkboxes names starting with - some_checkbox_array
 	 *
@@ -192,7 +192,7 @@ e107Admin.Helper = {
 	 * <input type='checkbox' class='checkbox' name='some_checkbox_array_some_more[]' /> (see the button example below)
 	 *
 	 * Example of button being auto-observed (see e107Admin.Helper#init)
-	 * <button class='action' type='button' name='uncheck_all' value='Uncheck All'><span>Uncheck All</span></button> // default selector - multiaction
+	 * <button class='action' type='button' name='uncheck_all' value='no-value'><span>Uncheck All</span></button> // default selector - multiaction
 	 * OR
 	 * <button class='action' type='button' name='uncheck_all' value='jstarget:some_checkbox_array'><span>Uncheck All</span></button> // checkboxes names starting with - some_checkbox_array
 	 *
diff --git a/e107_files/shortcode/batch/admin_shortcodes_class.php b/e107_files/shortcode/batch/admin_shortcodes_class.php
index 226636ed6..9b92b71fc 100644
--- a/e107_files/shortcode/batch/admin_shortcodes_class.php
+++ b/e107_files/shortcode/batch/admin_shortcodes_class.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-* $Id: admin_shortcodes_class.php,v 1.19 2009-08-03 18:45:18 marj_nl_fr Exp $
+* $Id: admin_shortcodes_class.php,v 1.20 2009-08-15 15:44:37 marj_nl_fr Exp $
 *
 * Admin shortcode batch - class
 */
@@ -250,7 +250,7 @@ class admin_shortcodes
 				$selected = ($lng == $sql->mySQLlanguage || ($lng == $pref['sitelanguage'] && !$sql->mySQLlanguage)) ? " selected='selected'" : "";
 				$select .= "<option value='".$langval."'{$selected}>$lng</option>\n";
 			}
-			$select .= "</select> ".(!isset($params['nobutton']) ? "<button class='update' type='submit' name='setlanguage' value='".UTHEME_MENU_L1."'><span>".UTHEME_MENU_L1."</span></button>" : '')."
+			$select .= "</select> ".(!isset($params['nobutton']) ? "<button class='update' type='submit' name='setlanguage' value='no-value'><span>".UTHEME_MENU_L1."</span></button>" : '')."
 			</div>
 			</form>
 			";
diff --git a/e107_files/shortcode/uploadfile.sc b/e107_files/shortcode/uploadfile.sc
index 6b7ff877e..a46dbb878 100644
--- a/e107_files/shortcode/uploadfile.sc
+++ b/e107_files/shortcode/uploadfile.sc
@@ -1,4 +1,4 @@
-// $Id: uploadfile.sc,v 1.2 2008-12-29 15:23:06 secretr Exp $
+// $Id: uploadfile.sc,v 1.3 2009-08-15 15:44:37 marj_nl_fr Exp $
 
 // Your <form> tag must include: enctype='multipart/form-data' - in order to work.
 // parm is the path to the upload folder.
@@ -25,8 +25,8 @@ $text .="
         <!-- Upload Shortcode -->
 		<div>
 			<div class='field-spacer'>
-				<button type='button' class='action duplicate' value=\"".LAN_UPLOAD_ADDFILE."\" onclick=\"duplicateHTML('upline','up_container');\"><span>".LAN_UPLOAD_ADDFILE."</span></button>
-				<button class='upload' type='submit' name='uploadfiles' value=\"".LAN_UPLOAD_FILES."\" onclick=\"return jsconfirm('".LAN_UPLOAD_CONFIRM."')\"><span>".LAN_UPLOAD_FILES."</span></button>
+				<button type='button' class='action duplicate' value='no-value' onclick=\"duplicateHTML('upline','up_container');\"><span>".LAN_UPLOAD_ADDFILE."</span></button>
+				<button class='upload' type='submit' name='uploadfiles' value='no-value' onclick=\"return jsconfirm('".LAN_UPLOAD_CONFIRM."')\"><span>".LAN_UPLOAD_FILES."</span></button>
 			</div>
 			<div id='up_container'>
 				<div id='upline' class='nowrap'>
diff --git a/e107_plugins/banner/admin_banner.php b/e107_plugins/banner/admin_banner.php
index 55f41256f..d878901eb 100644
--- a/e107_plugins/banner/admin_banner.php
+++ b/e107_plugins/banner/admin_banner.php
@@ -9,8 +9,8 @@
  * Banner Administration
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/banner/admin_banner.php,v $
- * $Revision: 1.2 $
- * $Date: 2009-08-15 11:55:30 $
+ * $Revision: 1.3 $
+ * $Date: 2009-08-15 15:44:37 $
  * $Author: marj_nl_fr $
  *
 */
@@ -477,7 +477,7 @@ if ($action == "create") {
 						<td class='label'>".BNRLAN_32."</td>
 						<td class='control'>
 							<div class='field-spacer'>
-								<button class='action' type='button' value='".BNRLAN_43."' onclick='e107Helper.toggle(\"banner-repo\")'><span>".BNRLAN_43."</span></button>
+								<button class='action' type='button' value='no-value' onclick='e107Helper.toggle(\"banner-repo\")'><span>".BNRLAN_43."</span></button>
 							</div>
 							<div class='e-hideme' id='banner-repo'>
 	";
@@ -611,11 +611,11 @@ if ($action == "create") {
 	if 	($sub_action == "edit" && $id) {
 		$text .= "
 				<input type='hidden' name='eid' value='".$id."' />
-				<button class='update' type='submit' name='updatebanner' value='".BNRLAN_40."'><span>".BNRLAN_40."</span></button>
+				<button class='update' type='submit' name='updatebanner' value='no-value'><span>".BNRLAN_40."</span></button>
 		";
 	} else {
 		$text .= "
-				<button class='create' type='submit' name='createbanner' value='".BNRLAN_41."'><span>".BNRLAN_41."</span></button>
+				<button class='create' type='submit' name='createbanner' value='no-value'><span>".BNRLAN_41."</span></button>
 		";
 	}
 	$text .= "
@@ -737,7 +737,7 @@ if ($action == "menu")
 					</tbody>
 				</table>
 				<div class='buttons-bar center'>
-					<button class='update' type='submit' name='update_menu' value='".BANNER_MENU_L18."'><span>".BANNER_MENU_L18."</span></button>
+					<button class='update' type='submit' name='update_menu' value='no-value'><span>".BANNER_MENU_L18."</span></button>
 				</div>
 			</fieldset>
 		</form>
diff --git a/e107_plugins/download/handlers/adminDownload_class.php b/e107_plugins/download/handlers/adminDownload_class.php
index 38fb1f89b..2064995d0 100644
--- a/e107_plugins/download/handlers/adminDownload_class.php
+++ b/e107_plugins/download/handlers/adminDownload_class.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/download/handlers/adminDownload_class.php,v $
-|     $Revision: 1.17 $
-|     $Date: 2009-08-15 01:00:38 $
-|     $Author: bugrain $
+|     $Revision: 1.18 $
+|     $Date: 2009-08-15 15:44:37 $
+|     $Author: marj_nl_fr $
 |
 +----------------------------------------------------------------------------+
 */
@@ -74,7 +74,7 @@ class adminDownload extends download
 
 /*			   $text .= "
             <div class='buttons-bar center'>
-               <button type='submit' class='update' name='download_search_submit' value='".DOWLAN_51."'><span>".DOWLAN_51."</span></button>
+               <button type='submit' class='update' name='download_search_submit' value='no-value'><span>".DOWLAN_51."</span></button>
                <br/>
 
             </div>";*/
@@ -171,7 +171,7 @@ class adminDownload extends download
             </table>
             <div class='buttons-bar center'>
 			      <span  class='e-show-if-js f-left'><a href='#download_advanced_search#download_search' class='e-swapit'>Simple search</a></span>
-               <button type='submit' class='update' name='download_advanced_search_submit' value='".DOWLAN_51."'><span>".DOWLAN_51."</span></button>
+               <button type='submit' class='update' name='download_advanced_search_submit' value='no-value'><span>".DOWLAN_51."</span></button>
             </div>
             </fieldset>
 			</div>
diff --git a/e107_plugins/user_menu/userlanguage_menu.php b/e107_plugins/user_menu/userlanguage_menu.php
index e2bf85dda..9eea84d4e 100644
--- a/e107_plugins/user_menu/userlanguage_menu.php
+++ b/e107_plugins/user_menu/userlanguage_menu.php
@@ -9,8 +9,8 @@
  *
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/user_menu/userlanguage_menu.php,v $
- * $Revision: 1.5 $
- * $Date: 2009-08-14 11:32:58 $
+ * $Revision: 1.6 $
+ * $Date: 2009-08-15 15:44:37 $
  * $Author: marj_nl_fr $
  */
 //TODO homogenisation with languagelinks + do not force www + unobtrusive redirect
@@ -60,7 +60,7 @@ else
 			</select>
 			<br />
 			<br />
-			<button class="button" type="submit" name="setlanguage"><span>'.UTHEME_MENU_L1.'</span></button>';
+			<button class="button" type="submit" name="setlanguage" value="no-value"><span>'.UTHEME_MENU_L1.'</span></button>';
 	$text .= '
 		</div>
 	</form>';