Fiddle with CSS+HTML in effort to get more consistent buttons

diff --git a/disobedience/menu.c b/disobedience/menu.c
index f24569af7d481cf115f802dac57a0522253be41f..3b39a443c60bf7fdf0a73e99f273d87c21828281 100644 (file)
--- 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));
                            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 */
 }
    
 /** @brief Fetch version in order to display the about... popup */

diff --git a/templates/choose.tmpl b/templates/choose.tmpl
index 383f281da9101caa36d424625da6a23047d8ef38..16cb98549fab6a1af40438fa8561d0cadd9d0e38 100644 (file)
--- 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>
      <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">
        <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 e647da0697ed5d77cb918b26dd8c022615ab30f1..5df11db76fb5e07e5feaefbae46456fdf2691d0b 100644 (file)
--- a/templates/disorder.css
+++ b/templates/disorder.css
@@ -181,9 +181,20 @@ div.filesdirectories p.all {
 
 /* buttons *******************************************************************/
 
 
 /* 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 */
 /* 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;
   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;
   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 {
 }
 
 a.button:active,button:active {

diff --git a/templates/login.tmpl b/templates/login.tmpl
index 71552c4e632dc94dfa52ba1644fa890e807beb05..c780ad597ca4105e68f0ee27e31b1f3f4c229518 100644 (file)
--- a/templates/login.tmpl
+++ b/templates/login.tmpl
@@ -63,9 +63,11 @@ USA
        </tr>
        <tr>
          <td colspan=2>
        </tr>
        <tr>
          <td colspan=2>

+          <span class=button>

            <button class=login name=button type=submit>
              @label{login.login}
            </button>
            <button class=login name=button type=submit>
              @label{login.login}
            </button>

+          </span>

          </td>
        </tr>
      </table>
          </td>
        </tr>
      </table>


@@ -90,9 +92,11 @@ USA
        </tr>
        <tr>
          <td colspan=2>
        </tr>
        <tr>
          <td colspan=2>

+          <span class=button>

            <button class=login name=button type=submit>
            <button class=login name=button type=submit>

-             @label{login.reminder}
-           </button>
+            @label{login.reminder}
+           </span>
+          </button>

          </td>
        </tr>
      </table>
          </td>
        </tr>
      </table>


@@ -144,9 +148,11 @@ USA
        </tr>
        <tr>
          <td colspan=3>
        </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}
              @label{login.register}

-           </button>
+            </button>
+          </span>

          </td>
        </tr>
      </table>
          </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>
    <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}
          @label{login.logout}

-       </button>
+        </button>
+       </span>

      </div>
      <input name=action type=hidden value=logout>
    </form>
      </div>
      <input name=action type=hidden value=logout>
    </form>


@@ -197,9 +205,11 @@ USA
        </tr>
        <tr>
          <td colspan=3>
        </tr>
        <tr>
          <td colspan=3>

+         <span class=button>

            <button class=edituser name=submit type=submit>
            <button class=edituser name=submit type=submit>

-             @label{login.edituser}
+            @label{login.edituser}

            </button>
            </button>

+         </span>

          </td>
        </tr>
      </table>
          </td>
        </tr>
      </table>

diff --git a/templates/playing.tmpl b/templates/playing.tmpl
index e1dc280ef2a1e10dc9dd6682fc7b17e1d9e3c81c..29ddbe10c480c282e9904f330cf7944b13e8169a 100644 (file)
--- 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}{
           <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}{-}
             <input name=action type=hidden value=volume>
           }
           @vbutton{down}{-}

diff --git a/templates/prefs.tmpl b/templates/prefs.tmpl
index 74240da62285e61bbdec56d88bff59f7a3d78cb7..f0daf8c8a3b8da430f2e34d91ca2d2e401b28e80 100644 (file)
--- a/templates/prefs.tmpl
+++ b/templates/prefs.tmpl
@@ -39,9 +39,11 @@ USA
       {@tracks{@arg{dir}}
               {@mprefs{@index}{@track}}}
    <p>
       {@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>
 
    </p>
   </form>