From 1ee1ce3b3cf22daf7448b546d377828fa8b94fbf Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Thu, 30 May 2013 17:00:37 -0700
Subject: [PATCH] bootstrap base, auth

---
 .../html/notebook/static/auth/js/loginmain.js |  3 +--
 .../notebook/static/auth/js/loginwidget.js    |  3 +--
 .../notebook/static/auth/js/logoutmain.js     |  2 +-
 .../html/notebook/templates/login.html        | 15 +++++++++----
 .../html/notebook/templates/tree.html         | 22 ++++++++++---------
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/auth/js/loginmain.js b/IPython/frontend/html/notebook/static/auth/js/loginmain.js
index 9718fb57b..4b6c53643 100644
--- a/IPython/frontend/html/notebook/static/auth/js/loginmain.js
+++ b/IPython/frontend/html/notebook/static/auth/js/loginmain.js
@@ -13,8 +13,7 @@
 $(document).ready(function () {
 
     IPython.page = new IPython.Page();
-    $('input#login_submit').button();
-    $('#ipython-main-app').addClass('border-box-sizing ui-widget');
+    $('button#login_submit').addClass("btn");
     IPython.page.show();
     $('input#password_input').focus();
 
diff --git a/IPython/frontend/html/notebook/static/auth/js/loginwidget.js b/IPython/frontend/html/notebook/static/auth/js/loginwidget.js
index 96fc030e6..4cf06eec8 100644
--- a/IPython/frontend/html/notebook/static/auth/js/loginwidget.js
+++ b/IPython/frontend/html/notebook/static/auth/js/loginwidget.js
@@ -23,8 +23,7 @@ var IPython = (function (IPython) {
     };
 
     LoginWidget.prototype.style = function () {
-        this.element.find('button#logout').button();
-        this.element.find('button#login').button();
+        this.element.find("button").addClass("btn");
     };
 
 
diff --git a/IPython/frontend/html/notebook/static/auth/js/logoutmain.js b/IPython/frontend/html/notebook/static/auth/js/logoutmain.js
index 16331d4c4..df107c6f6 100644
--- a/IPython/frontend/html/notebook/static/auth/js/logoutmain.js
+++ b/IPython/frontend/html/notebook/static/auth/js/logoutmain.js
@@ -13,7 +13,7 @@
 $(document).ready(function () {
 
     IPython.page = new IPython.Page();
-    $('#ipython-main-app').addClass('border-box-sizing ui-widget');
+    $('#ipython-main-app').addClass('border-box-sizing');
     IPython.page.show();
 
 });
diff --git a/IPython/frontend/html/notebook/templates/login.html b/IPython/frontend/html/notebook/templates/login.html
index 0a3764c49..1eb3ce4b8 100644
--- a/IPython/frontend/html/notebook/templates/login.html
+++ b/IPython/frontend/html/notebook/templates/login.html
@@ -14,10 +14,17 @@
 <div id="ipython-main-app">
 
     {% if login_available %}
-    <form action="{{base_project_url}}login?next={{next}}" method="post">
-        Password: <input type="password" class='ui-widget ui-widget-content' name="password" id="password_input">
-        <input type="submit" value="Log in" id="login_submit">
-    </form>
+    <div class="navbar">
+      <div class="navbar-inner">
+        <div class="container">
+          <p class="nav navbar-text">Password:</p>
+          <form action="{{base_project_url}}login?next={{next}}" method="post" class="navbar-form pull-left">
+            <input type="password" name="password" id="password_input">
+            <button type="submit" id="login_submit">Log in</button>
+          </form>
+        </div>
+      </div>
+    </div>
     {% endif %}
 
     {% if message %}
diff --git a/IPython/frontend/html/notebook/templates/tree.html b/IPython/frontend/html/notebook/templates/tree.html
index 5b39e02de..eb6e38820 100644
--- a/IPython/frontend/html/notebook/templates/tree.html
+++ b/IPython/frontend/html/notebook/templates/tree.html
@@ -22,13 +22,14 @@ data-read-only={{read_only}}
 
 <div id="ipython-main-app">
 
-<div id="tabs">
-    <ul>
-        <li><a href="#tab1">Notebooks</a></li>
-        <li><a href="#tab2">Clusters</a></li>
+<div id="tabs" class="tabbable">
+    <ul class="nav nav-tabs" id="tabs">
+        <li class="active"><a href="#tab1" data-toggle="tab">Notebooks</a></li>
+        <li><a href="#tab2" data-toggle="tab">Clusters</a></li>
     </ul>
 
-    <div id="tab1">
+    <div class="tab-content">
+    <div id="tab1" class="tab-pane active">
         {% if logged_in or not read_only %}
         <div id="notebook_toolbar">
             <form id='alternate_upload'  class='alternate_upload' >
@@ -38,8 +39,8 @@ data-read-only={{read_only}}
                 <input type="file" name="datafile" class="fileinput" multiple='multiple'>
             </form>
             <span id="notebook_buttons">
-                <button id="refresh_notebook_list" title="Refresh notebook list">Refresh</button>
-                <button id="new_notebook" title="Create new notebook">New Notebook</button>
+                <button id="refresh_notebook_list" title="Refresh notebook list" class="btn">Refresh</button>
+                <button id="new_notebook" title="Create new notebook" class="btn">New Notebook</button>
             </span>
         </div>
         {% endif %}
@@ -54,13 +55,14 @@ data-read-only={{read_only}}
             </div>
         </div>
     </div>
-    <div id="tab2">
+    
+    <div id="tab2" class="tab-pane">
 
         <div id="cluster_toolbar">
             <span id="cluster_list_info">IPython parallel computing clusters</span>
 
             <span id="cluster_buttons">
-                <button id="refresh_cluster_list" title="Refresh cluster list">Refresh</button>
+                <button id="refresh_cluster_list" title="Refresh cluster list" class="btn">Refresh</button>
             </span>
         </div>
 
@@ -72,7 +74,7 @@ data-read-only={{read_only}}
                 <span>status</span>
             </div>
         </div>
-
+        </div>
     </div>
 </div>