From eccf2fe5be61e5eb3db8b1608a3213aa8948c789 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Fri, 6 Mar 2015 17:29:12 -0800
Subject: [PATCH 1/3] Make theme closer to notebook.

improvement of admin page split
edit/delete in their own column
---
 share/jupyter/hub/static/less/page.less | 27 +++++++++++++++++++++----
 share/jupyter/hub/templates/admin.html  | 14 ++++++++-----
 share/jupyter/hub/templates/page.html   | 17 ++++++++++++++--
 3 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/share/jupyter/hub/static/less/page.less b/share/jupyter/hub/static/less/page.less
index 8152368b..f0753b98 100644
--- a/share/jupyter/hub/static/less/page.less
+++ b/share/jupyter/hub/static/less/page.less
@@ -1,13 +1,32 @@
 .jpy-logo {
-  height: 40px;
-  margin: 8px;
+  height: 35px;
+  margin: 2px;
 }
 
-div#header {
-  border-bottom: 1px solid #ccc;
+#header {
+  border-bottom: 1px solid #e7e7e7;
+  height: 40px;
+
+
+}
+.navbar {
+  min-height:20px;
 }
 
 .hidden {
   display: none;
 }
 
+
+.dropdown.navbar-btn{
+    padding:0 5px 0 0;
+}
+
+#login_widget{
+
+    & .navbar-btn.btn-sm {
+      margin-top: 5px;
+      margin-bottom: 5px;
+    }
+
+}
diff --git a/share/jupyter/hub/templates/admin.html b/share/jupyter/hub/templates/admin.html
index 742bf8cf..90a8b027 100644
--- a/share/jupyter/hub/templates/admin.html
+++ b/share/jupyter/hub/templates/admin.html
@@ -31,9 +31,9 @@
     </thead>
     <tbody>
       <tr class="user-row add-user-row">
-        <td colspan="5">
+        <td colspan="12">
           <a id="add-user" class="col-xs-5 btn btn-default">Add User</a>
-          <a id="shutdown-hub" class="col-xs-4 col-xs-offset-3 btn btn-danger">Shutdown Hub</a>
+          <a id="shutdown-hub" class="col-xs-5 col-xs-offset-2 btn btn-danger">Shutdown Hub</a>
         </td>
       </tr>
   {% for u in users %}
@@ -42,15 +42,19 @@
       <td class="name-col col-sm-2">{{u.name}}</td>
       <td class="admin-col col-sm-2">{% if u.admin %}admin{% endif %}</td>
       <td class="time-col col-sm-3">{{u.last_activity.isoformat() + 'Z'}}</td>
-      <td class="server-col col-sm-3 text-center">
+      <td class="server-col col-sm-2 text-center">
         <span class="stop-server btn btn-xs btn-danger {% if not u.running %}hidden{% endif %}">stop server</span>
+        <span class="start-server btn btn-xs btn-success {% if u.running %}hidden{% endif %}">start server</span>
+      </td>
+      <td class="server-col col-sm-1 text-center">
         {% if admin_access %}
         <span class="access-server btn btn-xs btn-success {% if not u.running %}hidden{% endif %}">access server</span>
         {% endif %}
-        <span class="start-server btn btn-xs btn-success {% if u.running %}hidden{% endif %}">start server</span>
       </td>
-      <td class="edit-col col-sm-2">
+      <td class="edit-col col-sm-1 text-center">
         <span class="edit-user btn btn-xs btn-primary">edit</span>
+      </td>
+      <td class="edit-col col-sm-1 text-center">
         {% if u.name != user.name %}
         <span class="delete-user btn btn-xs btn-danger">delete</span>
         {% endif %}
diff --git a/share/jupyter/hub/templates/page.html b/share/jupyter/hub/templates/page.html
index 49255338..a9b60c94 100644
--- a/share/jupyter/hub/templates/page.html
+++ b/share/jupyter/hub/templates/page.html
@@ -54,6 +54,7 @@
             },
           }
       });
+      require(["bootstrap"])
     </script>
     
     <script type="text/javascript">
@@ -88,9 +89,21 @@
 
     <span id="login_widget">
       {% if user %}
-        <a id="logout" class="btn navbar-btn btn-default pull-right" href="{{logout_url}}">Logout</a>
+        <a id="logout" class="navbar-btn btn-sm btn btn-default pull-right" href="{{logout_url}}"> <i class="fa fa-sign-out"></i> Logout</a>
+        <div class="dropdown navbar-btn btn-sm pull-right">
+          <button class="btn-sm btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="true">
+            <i class="fa fa-cogs"></i>
+            <span class="caret"></span>
+          </button>
+              <ul class="dropdown-menu" role="menu" >
+            {% if user.admin %}
+                <li role="presentation"><a role="menuitem" tabindex="-1" href="{{base_url}}admin">Admin Panel</a></li>
+            {% endif %}
+            <li role="presentation"><a role="menuitem" tabindex="-1" href="{{base_url}}user/{{user.name}}/">My Server</a></li>
+          </ul>
+        </div>
       {% else %}
-        <a id="login" class="btn navbar-btn btn-default pull-right" href="{{login_url}}">Login</a>
+        <a id="login" class="btn-sm btn navbar-btn btn-default pull-right" href="{{login_url}}">Login</a>
       {% endif %}
     </span>
 

From 5bd649829a95b3bf35eb357163763a4e0b7534df Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 8 Mar 2015 17:44:46 -0700
Subject: [PATCH 2/3] remove dropdown

---
 share/jupyter/hub/templates/page.html | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/share/jupyter/hub/templates/page.html b/share/jupyter/hub/templates/page.html
index a9b60c94..6bf4d2c1 100644
--- a/share/jupyter/hub/templates/page.html
+++ b/share/jupyter/hub/templates/page.html
@@ -54,7 +54,6 @@
             },
           }
       });
-      require(["bootstrap"])
     </script>
     
     <script type="text/javascript">
@@ -90,18 +89,6 @@
     <span id="login_widget">
       {% if user %}
         <a id="logout" class="navbar-btn btn-sm btn btn-default pull-right" href="{{logout_url}}"> <i class="fa fa-sign-out"></i> Logout</a>
-        <div class="dropdown navbar-btn btn-sm pull-right">
-          <button class="btn-sm btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="true">
-            <i class="fa fa-cogs"></i>
-            <span class="caret"></span>
-          </button>
-              <ul class="dropdown-menu" role="menu" >
-            {% if user.admin %}
-                <li role="presentation"><a role="menuitem" tabindex="-1" href="{{base_url}}admin">Admin Panel</a></li>
-            {% endif %}
-            <li role="presentation"><a role="menuitem" tabindex="-1" href="{{base_url}}user/{{user.name}}/">My Server</a></li>
-          </ul>
-        </div>
       {% else %}
         <a id="login" class="btn-sm btn navbar-btn btn-default pull-right" href="{{login_url}}">Login</a>
       {% endif %}

From 301560b6f84b8c467f4ca2ebb446a4438b959b63 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 8 Mar 2015 18:06:43 -0700
Subject: [PATCH 3/3] use bootstrap variables

---
 share/jupyter/hub/static/less/page.less      | 6 ------
 share/jupyter/hub/static/less/variables.less | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/share/jupyter/hub/static/less/page.less b/share/jupyter/hub/static/less/page.less
index f0753b98..cdc97524 100644
--- a/share/jupyter/hub/static/less/page.less
+++ b/share/jupyter/hub/static/less/page.less
@@ -6,18 +6,12 @@
 #header {
   border-bottom: 1px solid #e7e7e7;
   height: 40px;
-
-
-}
-.navbar {
-  min-height:20px;
 }
 
 .hidden {
   display: none;
 }
 
-
 .dropdown.navbar-btn{
     padding:0 5px 0 0;
 }
diff --git a/share/jupyter/hub/static/less/variables.less b/share/jupyter/hub/static/less/variables.less
index a133ce20..89b45e53 100644
--- a/share/jupyter/hub/static/less/variables.less
+++ b/share/jupyter/hub/static/less/variables.less
@@ -1,6 +1,7 @@
 @border-radius-small: 2px;
 @border-radius-base: 2px;
 @border-radius-large: 3px;
+@navbar-height: 20px;
 
 @jupyter-orange: #F37524;
 @jupyter-red: #E34F21;