From 4a2cb5e2061b6e4d5ae5add15e224732a59018bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 26 Apr 2013 14:45:20 +0200
Subject: [PATCH] Update bootstrap to 2.3.1

---
 src/root/Makefile.am          |  2 +-
 src/root/static/css/hydra.css | 25 ++++++++++++++++++++++---
 src/root/topbar.tt            | 10 +++++-----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/root/Makefile.am b/src/root/Makefile.am
index 4ef68ab8..c9ee52c0 100644
--- a/src/root/Makefile.am
+++ b/src/root/Makefile.am
@@ -7,7 +7,7 @@ STATIC = \
 FLOT = flot-0.6.zip
 TABLESORTER = jquery.tablesorter.zip
 JQUERY = jquery-ui-1.8.5.custom.zip
-BOOTSTRAP = bootstrap-2.0.3.zip
+BOOTSTRAP = bootstrap-2.3.1.zip
 
 ZIPS = $(FLOT) $(TABLESORTER) $(JQUERY) $(BOOTSTRAP)
 
diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css
index 987f00be..a162cf6b 100644
--- a/src/root/static/css/hydra.css
+++ b/src/root/static/css/hydra.css
@@ -56,7 +56,26 @@ table.clickable-rows > tbody > tr {
     cursor: pointer;
 }
 
-h3 {
-    margin-top: 0.5em;
-    margin-bottom: 0.5em;
+h2 {
+    font-size: 150%;
+    margin-bottom: 0em;
+}
+
+h3 {
+    font-size: 120%;
+    margin-top: 0.5em;
+    margin-bottom: 0em;
+}
+
+div.page-header {
+    margin-top: 0em;
+    margin-bottom: 1em;
+}
+
+div.page-header h1 {
+    margin-bottom: 0em;
+}
+
+div.page-header h1 small {
+    font-size: 45%;
 }
diff --git a/src/root/topbar.tt b/src/root/topbar.tt
index 5cc83cab..860b267a 100644
--- a/src/root/topbar.tt
+++ b/src/root/topbar.tt
@@ -1,5 +1,5 @@
 [% BLOCK menuItem %]
-  <li class="[% IF "${root}${curUri}" == uri %]active[% END %]">
+  <li class="[% IF "${root}${curUri}" == uri %]active[% END %]" [% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>
     <a href="[% uri %]">[% title %]</a>
   </li>
 [% END %]
@@ -167,14 +167,14 @@
         uri = c.uri_for(c.controller('Admin').action_for('users'))
         title = "Manage users" %]
       <li class="divider"></li>
-      [% INCLUDE maybeLink
+      [% INCLUDE menuItem
         uri = c.uri_for(c.controller('Admin').action_for('clearfailedcache'))
-        content = "Clear failed builds cache"
+        title = "Clear failed builds cache"
         confirmmsg = "Are you sure you want to clear the failed builds cache?"
         class = "" %]
-      [% INCLUDE maybeLink
+      [% INCLUDE menuItem
         uri = c.uri_for(c.controller('Admin').action_for('clear_queue_non_current'))
-        content = "Clear all non-running old builds from queue"
+        title = "Clear all non-running old builds from queue"
         confirmmsg = "Are you sure you want to clear the queue?"
         class = "" %]
     [% END %]