From 6961c2a4eb9825b978eff57da0dd455cd23723a6 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 2 Feb 2011 17:15:38 +0000
Subject: [PATCH] NIHVIVO-1954: Done some markup refactoring changing ID's into
 classes.

Also,  in some cases I wasn't able to change id selectors because these are used temporarily due to the custom jsp tags (<v:input>)
for editing forms which require an id and do not allow a class. This will be
removed once we refactor the editing forms to Freemarker
---
 themes/wilma/css/wilma.css           | 15 +++++++++++++--
 themes/wilma/templates/identity.ftl  |  2 +-
 themes/wilma/templates/page-home.ftl |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index 81f337d2..49804f5f 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -93,6 +93,11 @@ input.block {
 label {
     margin-top: .5em;
 }
+input.submit, 
+input.submit:visited,
+/* the id selectors are used temporarily due to the custom jsp tags (<v:input>) 
+for editing forms which require an id and do not allow a class. This will be 
+removed once we refactor the editing forms to Freemarker */
 input#submit, 
 input#submit:visited {
     background: #222 url(../images/alert-overlay.png) repeat-x;
@@ -114,6 +119,8 @@ input#submit:visited {
     margin-right: .6em;
     margin-top: .5em;
 }
+input.delete,
+input.delete:visited,
 input#delete,
 input#delete:visited {
     background: #222 url(../images/alert-overlay.png) repeat-x;
@@ -135,15 +142,19 @@ input#delete:visited {
     line-height: 1;
     margin-right: .6em;
 }
+input.submit:hover,
 input#submit:hover {
     color: #fff;
     background-color: #b2d15a;
 }
+input.delete:hover,
 input#delete:hover {
     color: #fff;
     background-color: #93c3d4;
 }
+input.delete:active,
 input#delete:active,
+input.submit:active,
 input#submit:active {
     top: 1px;
 }
@@ -406,7 +417,7 @@ ul#header-nav  a:active {
     height: 38px;
     background: url(../images/search-interior-pages.png) 0 0 no-repeat;
 }
-#search-field .submit {
+#search-field input.search {
     text-decoration: none;
     background-color: transparent;
     color: #fff;
@@ -647,7 +658,7 @@ p.password-note {
     height: 44px;
     background: url(../images/search-field-and-button.png) 0 0 no-repeat;
 }
-#search-home-field input.submit {
+#search-home-field input.search {
     text-decoration: none;
     background-color: transparent;
     color: #fff;
diff --git a/themes/wilma/templates/identity.ftl b/themes/wilma/templates/identity.ftl
index 94058fc1..84e5e4c8 100644
--- a/themes/wilma/templates/identity.ftl
+++ b/themes/wilma/templates/identity.ftl
@@ -45,7 +45,7 @@
                 
                 <div id="search-field">
                     <input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
-                    <input type="submit" value="Search" class="submit">
+                    <input type="submit" value="Search" class="search">
                 </div>
             </form>
         </fieldset>
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index f95b92d8..337fa840 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -36,7 +36,7 @@
                            </#if> 
                             <div id="search-home-field">
                                 <input type="text" name="querytext" class="search-home-vivo" value="${querytext!}" />
-                                <input type="submit" value="Search" class="submit">
+                                <input type="submit" value="Search" class="search">
                             </div>
                         </form>
                     </fieldset>