From 49e57291d78de2b583d6f2197ae6f9d9ff05e456 Mon Sep 17 00:00:00 2001
Message-Id: <49e57291d78de2b583d6f2197ae6f9d9ff05e456.1715519874.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Wed, 4 Jun 2008 09:16:08 +0100
Subject: [PATCH] Fiddle with CSS+HTML in effort to get more consistent buttons
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 disobedience/menu.c    |  1 -
 templates/choose.tmpl  |  8 +++++---
 templates/disorder.css | 22 +++++++++++++++++++---
 templates/login.tmpl   | 24 +++++++++++++++++-------
 templates/playing.tmpl |  8 +++++---
 templates/prefs.tmpl   |  8 +++++---
 6 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/disobedience/menu.c b/disobedience/menu.c
index f24569a..3b39a44 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -130,7 +130,6 @@ void menu_update(int page) {
                            t->selectall_sensitive(tab));
   gtk_widget_set_sensitive(selectnone_widget,
                            t->selectnone_sensitive(tab));
-  /* TODO Users should only be sensitive if have RIGHT_ADMIN */
 }
    
 /** @brief Fetch version in order to display the about... popup */
diff --git a/templates/choose.tmpl b/templates/choose.tmpl
index 383f281..16cb985 100644
--- a/templates/choose.tmpl
+++ b/templates/choose.tmpl
@@ -94,9 +94,11 @@ USA
      <p class=search>Enter search terms:
        <input class=query name=query type=text value="@argq{query}"
               size=50>
-       <button class=search name=submit type=submit>
-         @label{search.search}
-       </button>
+       <span class=button>
+        <button class=search name=submit type=submit>
+          @label{search.search}
+        </button>
+       </span>
        <input name=action type=hidden value=choose>
        <a class=button
           href="@url?action=choose">
diff --git a/templates/disorder.css b/templates/disorder.css
index e647da0..5df11db 100644
--- a/templates/disorder.css
+++ b/templates/disorder.css
@@ -181,9 +181,20 @@ div.filesdirectories p.all {
 
 /* buttons *******************************************************************/
 
+button {
+  border: 0px;
+  background-color: transparent;
+  padding: 0px;
+  cursor: pointer
+  font-family: helvetica,sans-serif;
+  font-weight: normal;
+  font-variant: normal;
+  font-size: 12pt;
+}
+
 /* Buttons and links that look like buttons share the same formatting */
-button,a.button {
-  padding: 1px;
+span.button, a.button {
+  padding-top: 2px;
   border-width: 3px;
   border-color: #fefefe;	/* Off-white */
   border-style: inset;
@@ -194,7 +205,12 @@ button,a.button {
   font-weight: normal;
   font-variant: normal;
   font-size: 12pt;
-  overflow: visible             /* For IE's benefit */
+  cursor: pointer
+}
+
+a.button {
+  padding-left: 4px;
+  padding-right: 4px;
 }
 
 a.button:active,button:active {
diff --git a/templates/login.tmpl b/templates/login.tmpl
index 71552c4..c780ad5 100644
--- a/templates/login.tmpl
+++ b/templates/login.tmpl
@@ -63,9 +63,11 @@ USA
        </tr>
        <tr>
          <td colspan=2>
+          <span class=button>
            <button class=login name=button type=submit>
              @label{login.login}
            </button>
+          </span>
          </td>
        </tr>
      </table>
@@ -90,9 +92,11 @@ USA
        </tr>
        <tr>
          <td colspan=2>
+          <span class=button>
            <button class=login name=button type=submit>
-             @label{login.reminder}
-           </button>
+            @label{login.reminder}
+           </span>
+          </button>
          </td>
        </tr>
      </table>
@@ -144,9 +148,11 @@ USA
        </tr>
        <tr>
          <td colspan=3>
-           <button class=register name=button type=submit>
+	   <span class=button>
+            <button class=register name=button type=submit>
              @label{login.register}
-           </button>
+            </button>
+	   </span>
          </td>
        </tr>
      </table>
@@ -159,9 +165,11 @@ USA
    <form class=logout action="@url" method=POST
          enctype="multipart/form-data" accept-charset=utf-8>
      <div class=logout>
-       <button class=logout name=submit type=submit>
+       <span class=button>
+        <button class=logout name=submit type=submit>
          @label{login.logout}
-       </button>
+        </button>
+       </span>
      </div>
      <input name=action type=hidden value=logout>
    </form>
@@ -197,9 +205,11 @@ USA
        </tr>
        <tr>
          <td colspan=3>
+	  <span class=button>
            <button class=edituser name=submit type=submit>
-             @label{login.edituser}
+            @label{login.edituser}
            </button>
+	  </span>
          </td>
        </tr>
      </table>
diff --git a/templates/playing.tmpl b/templates/playing.tmpl
index e1dc280..29ddbe1 100644
--- a/templates/playing.tmpl
+++ b/templates/playing.tmpl
@@ -94,9 +94,11 @@ USA
 	   <input size=3 name=right type=text value="@volume{right}">
 	   <input name=back type=hidden value="@quote{@thisurl}">
 	   @right{volume}{
-	     <button class=volume name=submit type=submit>
-		@label{volume.set}
-	     </button>
+             <span class=button>
+	      <button class=volume name=submit type=submit>
+               @label{volume.set}
+	      </button>
+             </span>
 	     <input name=action type=hidden value=volume>
 	   }
 	   @vbutton{down}{-}
diff --git a/templates/prefs.tmpl b/templates/prefs.tmpl
index 74240da..f0daf8c 100644
--- a/templates/prefs.tmpl
+++ b/templates/prefs.tmpl
@@ -39,9 +39,11 @@ USA
       {@tracks{@arg{dir}}
               {@mprefs{@index}{@track}}}
    <p>
-    <button type=submit name=submit>
-     @label{prefs.set}
-    </button>
+    <span class=button>
+     <button type=submit name=submit>
+      @label{prefs.set}
+     </button>
+    </span>
    </p>
   </form>
 
-- 
[mdw]