Index: /Users/mh/Documents/workspace/slimpy/HTML/EN/html/settings.js
===================================================================
--- /Users/mh/Documents/workspace/slimpy/HTML/EN/html/settings.js	(revision 12277)
+++ /Users/mh/Documents/workspace/slimpy/HTML/EN/html/settings.js	(working copy)
@@ -121,28 +121,32 @@
 	// resize the scrolling part of the settings page
 	new Event.observe(window, 'resize', function(){resizeSettingsSection();});
 
-	new Event.observe('saveSettings', 'click', function(e){
-		$('settingsForm').setStyle({cursor:'wait'});
-		Event.stop(e);
-		$('settingsForm').request({
-			parameters: { useAJAX: 1, rescan: '' },
-			onComplete: function(response) {
-				var results = parseData(response.responseText);
-
-				$('statusarea').update(results['warning']);
-				resizeSettingsSection();
-
-				// highlight fields
-				for (field in results) {
-					if ($(field)) {
-						highlightField($(field), (results[field] == '1'));
+	if ($('saveSettings')) {
+		new Event.observe('saveSettings', 'click', function(e){
+			Event.stop(e);
+			if ($('settingsForm').page.value != 'PLUGINS') {
+				$('settingsForm').setStyle({cursor:'wait'});
+				$('settingsForm').request({
+					parameters: { useAJAX: 1, rescan: '' },
+					onComplete: function(response) {
+						var results = parseData(response.responseText);
+		
+						$('statusarea').update(results['warning']);
+						resizeSettingsSection();
+		
+						// highlight fields
+						for (field in results) {
+							if ($(field)) {
+								highlightField($(field), (results[field] == '1'));
+							}
+						}
+		
+						$('settingsForm').setStyle({cursor:'auto'});
 					}
-				}
-
-				$('settingsForm').setStyle({cursor:'auto'});
+				});
 			}
 		});
-	});
+	}
 
 	resizeSettingsSection();
 });
Index: /Users/mh/Documents/workspace/slimpy/HTML/EN/settings/server/plugins.html
===================================================================
--- /Users/mh/Documents/workspace/slimpy/HTML/EN/settings/server/plugins.html	(revision 12277)
+++ /Users/mh/Documents/workspace/slimpy/HTML/EN/settings/server/plugins.html	(working copy)
@@ -1,9 +1,5 @@
 [% PROCESS settings/header.html %]
 
-	<script type="text/javascript" src="/html/prototype.js"></script>
-	<script type="text/javascript" src="/html/scriptaculous/scriptaculous.js"></script>
-	<script type="text/javascript" src="/html/scriptaculous/effects.js"></script>
-
 	<div class="settingSection">
 	
 		<div class="prefHead">[% "SETUP_GROUP_PLUGINS" | string | upper %]</div>
@@ -11,8 +7,6 @@
 
 		<p/>
 
-		<form method="POST" action="/settings/server/plugins.html">
-
 		[% FOREACH plugin = plugins.keys.sort %]
 
 			[% name     = plugins.$plugin.name %]
@@ -52,15 +46,40 @@
 					<!-- XXXX - need to check for pending uninstall / install -->
 					[% IF enabled %]
 
-					<input type="submit" name="[% name %].disable" value="[% 'DISABLE' | string %]">
+					<input type="submit" id="[% name %].toggle" name="[% name %].disable" value="[% 'DISABLE' | string %]">
 
 					[% ELSE %]
 
-					<input type="submit" name="[% name %].enable" value="[% 'ENABLE' | string %]">
+					<input type="submit" id="[% name %].toggle" name="[% name %].enable" value="[% 'ENABLE' | string %]">
 
 					[% END %]
 
-					<input type="submit" name="[% name %].uninstall" value="[% 'UNINSTALL' | string %]">
+					<input type="submit" id="[% name %].uninstall" name="[% name %].uninstall" value="[% 'UNINSTALL' | string %]">
+
+					[% IF NOT useTabList %]
+					<script type="text/javascript">
+						new Event.observe($('[% name %].toggle'), 'click', function(e){
+							$('settingsForm').setStyle({cursor:'wait'});
+							Event.stop(e);
+							new Ajax.Request($('settingsForm').action, 
+								parameters: { useAJAX: 1, '[% name _ '.' _ (enabled ? 'disable' : 'enable') %]': 1},
+								onSuccess: function() {
+									if ($('[% name %].toggle').name == '[% name %].enable') {
+										$('[% name %].toggle').name = '[% name %].disable';
+										$('[% name %].toggle').value = '[% "DISABLE" | string %]';
+									}
+									else {
+										$('[% name %].toggle').name = '[% name %].enable';
+										$('[% name %].toggle').value = '[% "ENABLE" | string %]';
+									}
+									resizeSettingsSection();
+									$('settingsForm').setStyle({cursor:'auto'});
+								}
+							});
+						});
+
+					</script>
+					[% END %]
 				</td>
 			</tr>
 			</table>
@@ -68,8 +87,6 @@
 			<hr width="90%" /><p/>
 
 		[%- END -%]
-
-		</form>
 		
 	</div>