Make settings change require button click, slight tweak to help non-javascript users, a=chris

diff --git a/src/css/search.css b/src/css/search.css
index e81d270e9..5147f4ba0 100755
--- a/src/css/search.css
+++ b/src/css/search.css
@@ -79,6 +79,10 @@ p
 {
     visibility: hidden;
 }
+.no-bullet
+{
+    list-style-type: none;
+}
 .left
 {
     float: left;
diff --git a/src/views/elements/AdminmenuElement.php b/src/views/elements/AdminmenuElement.php
index 8b7d0a1a4..430ed319b 100644
--- a/src/views/elements/AdminmenuElement.php
+++ b/src/views/elements/AdminmenuElement.php
@@ -73,13 +73,13 @@ class AdminmenuElement extends Element
             <div id='menu-options-background'
                 onclick='javascript:toggleOptions()'>
             </div><?php
-        }?>
+        }
+        ?>
         <nav id="<?=$admin_prefix ?>menu-options" class="menu-options">
-            <?php
-            $first = true; ?>
-            <div class="float-opposite medium-font slight-pad">[<a
-                href="javascript:toggleOptions()"
-                >X</a>]</div>
+            <script>
+            document.write('<div class="float-opposite medium-font ' +
+            'slight-pad">[<a href="javascript:toggleOptions()" >X</a>]</div>');
+            </script>
             <h2><a href="<?=C\SHORT_BASE_URL ?><?php
                 if ($logged_in) {
                     e("?$token_string");
@@ -93,6 +93,7 @@ class AdminmenuElement extends Element
                     setDisplay('menu-options', true);"><?=
                     $data['MENU_NAME']?>&Gt;</a></div><?php
                 }
+            $first = true;
             foreach ($data['COMPONENT_ACTIVITIES'] as
                 $component_name => $activities) {
                 $count = count($activities);
diff --git a/src/views/elements/GroupmenuElement.php b/src/views/elements/GroupmenuElement.php
index 2111411eb..ad77a2646 100644
--- a/src/views/elements/GroupmenuElement.php
+++ b/src/views/elements/GroupmenuElement.php
@@ -71,9 +71,10 @@ class GroupmenuElement extends Element implements CrawlConstants
             onclick='javascript:toggleOptions()'>
         </div>
         <nav id="menu-options" class="menu-options">
-        <div class="float-opposite medium-font slight-pad">[<a
-            href="javascript:toggleOptions()"
-            >X</a>]</div>
+        <script>
+        document.write('<div class="float-opposite medium-font ' +
+        'slight-pad">[<a href="javascript:toggleOptions()" >X</a>]</div>');
+        </script>
         <h2><a href="<?=C\SHORT_BASE_URL ?><?php
             if ($logged_in) {
                 e("?$token_string");
diff --git a/src/views/elements/SearchmenuElement.php b/src/views/elements/SearchmenuElement.php
index 752672d04..17714ff95 100644
--- a/src/views/elements/SearchmenuElement.php
+++ b/src/views/elements/SearchmenuElement.php
@@ -61,12 +61,13 @@ class SearchmenuElement extends Element
         }
         ?>
         <div id='menu-options-background'
-            onclick='elt("settings-form").submitOnChange()'>
+            onclick='toggleOptions()'>
         </div>
         <nav id="menu-options" class="menu-options">
-        <div class="float-opposite medium-font slight-pad">[<a
-            href="javascript:elt('settings-form').submitOnChange()"
-            >X</a>]</div>
+        <script>
+            document.write('<div class="float-opposite medium-font ' +
+            'slight-pad">[<a href="javascript:toggleOptions()" >X</a>]</div>');
+        </script>
         <h2><a href="<?=C\SHORT_BASE_URL ?><?php
             if ($logged_in) {
                 e("?$token_string");
@@ -208,8 +209,8 @@ class SearchmenuElement extends Element
                         $data['SAFE_SEARCH'] == 'true') {
                         ?>checked='checked'<?php
                     } ?> /></li>
-            <li class="none"><button type="submit"><?=
-                tl('searchmenu_element_save') ?></button></li>
+            <li class="center no-bullet"><button class="small-font"
+                type="submit"><?=tl('searchmenu_element_save') ?></button></li>
             </ul>
             </form>
         <?php
@@ -235,15 +236,6 @@ class SearchmenuElement extends Element
                 ?><li><a href='<?=$tool_url;?>'><?=$tool_name; ?>
                 </a></li><?php
             }
-            if (!empty(C\SEARCHBAR_PATH)) {
-                ?>
-                <li><a href="javascript:window.external.AddSearchProvider('<?=
-                C\SEARCHBAR_PATH
-                    ?>')"><?=tl('searchmenu_install_plugin')
-                ?></a></li>
-                </ul>
-                <?php
-            }
         }
         ?>
     </nav>