4 files changed, 7 insertions, 21 deletions
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index f243ed87..ac9f3c92 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? // @todo Set hover on AlbumGrid list items ?>
-<form action="<?= url::site("/search") ?>" id="g-search-form">
+<form action="<?= url::site("/search") ?>" id="g-search-form" class="g-short-form">
   <fieldset>
     <legend>
       <?= t("Search") ?>
diff --git a/modules/search/views/search_link.html.php b/modules/search/views/search_link.html.php
index d0b93bba..481d0c82 100644
--- a/modules/search/views/search_link.html.php
+++ b/modules/search/views/search_link.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<form action="<?= url::site("search") ?>" id="g-quick-search-form">
+<form action="<?= url::site("search") ?>" id="g-quick-search-form" class="g-short-form">
   <ul>
     <li>
       <label for="g-search"><?= t("Search the gallery") ?></label>
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index d4278802..a2104e9d 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -98,7 +98,7 @@ class tag_Core {
   }
 
   static function get_add_form($item) {
-    $form = new Forge("tags", "", "post", array("id" => "g-add-tag-form"));
+    $form = new Forge("tags", "", "post", array("id" => "g-add-tag-form", "class" => "g-short-form"));
     $label = $item->is_album() ?
       t("Add tag to album") :
       ($item->is_photo() ? t("Add tag to photo") : t("Add tag to movie"));
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index 27fb9664..357e6081 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -23,29 +23,15 @@ $(document).ready(function() {
   $("#g-login-link").addClass("g-dialog-link");
   $(".g-dialog-link").gallery_dialog();
 
-  // Initialize view menu
+  // Apply jQuery UI button css to submit inputs
+  $(".g-short-form input[type=text]").addClass("ui-corner-left");
+  $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
+  $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
   if ($("#g-view-menu").length) {
     $("#g-view-menu ul").removeClass("g-menu").removeClass("sf-menu");
     $("#g-view-menu a").addClass("ui-icon");
   }
 
-  // Initialize short forms
-  var short_forms = new Array(
-    "#g-quick-search-form",
-    "#g-add-tag-form",
-    "#g-search-form"
-  );
-
-  for (var i in short_forms) {
-    short_form_init(short_forms[i]);
-    $(short_forms[i]).addClass("g-short-form");
-  }
-  $(".g-short-form input[type=text]").addClass("ui-corner-left");
-  $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
-
-  // Apply jQuery UI button css to submit inputs
-  $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
-
   // Apply styles and icon classes to g-context-menu
   if ($(".g-context-menu").length) {
     $(".g-context-menu li").addClass("ui-state-default");