Power button tweaks from the hackathon.

svn path=/trunk/packages/sipb-xen-www/; revision=644

diff --git a/code/static/power_button.png b/code/static/power_button.png
deleted file mode 100644 (file)
index 72ee631..0000000
Binary files a/code/static/power_button.png and /dev/null differ

diff --git a/code/static/power_button_off.png b/code/static/power_button_off.png
index 33e5910..8a6a867 100644 (file)
Binary files a/code/static/power_button_off.png and b/code/static/power_button_off.png differ

diff --git a/code/static/power_button_off_to_on.png b/code/static/power_button_off_to_on.png
deleted file mode 100644 (file)
index f0f4c90..0000000
Binary files a/code/static/power_button_off_to_on.png and /dev/null differ

diff --git a/code/static/power_button_off_to_on_bg.png b/code/static/power_button_off_to_on_bg.png
deleted file mode 100644 (file)
index 72a2437..0000000
Binary files a/code/static/power_button_off_to_on_bg.png and /dev/null differ

diff --git a/code/static/power_button_on.png b/code/static/power_button_on.png
index c001104..f929443 100644 (file)
Binary files a/code/static/power_button_on.png and b/code/static/power_button_on.png differ

diff --git a/code/static/power_button_on_to_off.png b/code/static/power_button_on_to_off.png
deleted file mode 100644 (file)
index 8222de5..0000000
Binary files a/code/static/power_button_on_to_off.png and /dev/null differ

diff --git a/code/static/power_button_on_to_off_bg.png b/code/static/power_button_on_to_off_bg.png
deleted file mode 100644 (file)
index 323f835..0000000
Binary files a/code/static/power_button_on_to_off_bg.png and /dev/null differ

diff --git a/code/static/style.css b/code/static/style.css
index 29216cc..49fe8e2 100644 (file)
--- a/code/static/style.css
+++ b/code/static/style.css
@@ -75,18 +75,32 @@ td.error {
 }
 
 /* Machine list power buttons */
-.power.on:hover {
-  background: url(/static/power_button_on_to_off_bg.png);
-}
-.power.off:hover {
-  background: url(/static/power_button_off_to_on_bg.png);
+.power {
+  width: 32px;
+  height: 32px;
+  background-color: transparent;
+  background-position: 0 0;
+  margin: 0;
+  border: 0;
+  text-indent: 64px;
+  line-height: 128px;
+  cursor: pointer;
+}
+.power:hover {
+  background-position: 0 32px;
+}
+.power.on {
+  background-image: url(power_button_on.png);
+}
+.power.off {
+  background-image: url(power_button_off.png);
 }
 
 /* Striping applied (by JavaScript) to every other row in /list. */
 tr.stripedrow {
-  background-color: #DDF;
+  background-color: #e8e8ff;
 }
 
-#machinelist tr > td:first-child {
-  padding-right: 1em;
+#machinelist td, #machinelist th {
+  padding: 0.1em 0.5em;
 }

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index e9200dd..93f7181 100644 (file)
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -113,12 +113,10 @@ $errorRow('cdrom', $err)
            <input type="hidden" name="back" value="list"/>
            <input type="hidden" name="machine_id"
                   value="$machine.machine_id"/>
-<input type="image" class="power #slurp
+<input type="submit" class="power #slurp
 #if $machine.uptime then 'on' else 'off'
 " name="action" value="#slurp
 #if $machine.uptime then 'Power off' else 'Power on'
-" src="#slurp
-#if $machine.uptime then 'static/power_button_on.png' else 'static/power_button_off.png'
 "/>
          </form>
        </td>