bootstrap base, auth

IPython/frontend/html/notebook/static/auth/js/loginmain.js

@@ -1,22 +1,21 b''
 //----------------------------------------------------------------------------
 //  Copyright (C) 2008-2011  The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // On document ready
 //============================================================================
 
 
 $(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();
 
 });
 

IPython/frontend/html/notebook/static/auth/js/loginwidget.js

@@ -1,46 +1,45 b''
 //----------------------------------------------------------------------------
 //  Copyright (C) 2008-2011  The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // Login button
 //============================================================================
 
 var IPython = (function (IPython) {
 
     var LoginWidget = function (selector, options) {
         var options = options || {};
         this.base_url = options.baseProjectUrl || $('body').data('baseProjectUrl') ;
         this.selector = selector;
         if (this.selector !== undefined) {
             this.element = $(selector);
             this.style();
             this.bind_events();
         }
     };
 
     LoginWidget.prototype.style = function () {
-        this.element.find('button#logout').button();
-        this.element.find('button#login').button();
+        this.element.find("button").addClass("btn");
     };
 
 
     LoginWidget.prototype.bind_events = function () {
         var that = this;
         this.element.find("button#logout").click(function () {
             window.location = that.base_url+"logout";
         });
         this.element.find("button#login").click(function () {
             window.location = that.base_url+"login";
         });
     };
 
     // Set module variables
     IPython.LoginWidget = LoginWidget;
 
     return IPython;
 
 }(IPython));

IPython/frontend/html/notebook/static/auth/js/logoutmain.js

@@ -1,20 +1,20 b''
 //----------------------------------------------------------------------------
 //  Copyright (C) 2008-2011  The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // On document ready
 //============================================================================
 
 
 $(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();
 
 });
 

IPython/frontend/html/notebook/templates/login.html

@@ -1,40 +1,47 b''
 {% extends "page.html" %}
 
 
 {% block stylesheet %}
 {{super()}}
 <link rel="stylesheet" href="{{ static_url("auth/css/override.css") }}" type="text/css" />
 {% endblock %}
 
 {% block login_widget %}
 {% endblock %}
 
 {% block site %}
 
 <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 %}
       {% for key in message %}
         <div class="message {{key}}">
            {{message[key]}}
         </div>
       {% endfor %}
     {% endif %}
 
 <div/>
 
 {% endblock %}
 
 
 {% block script %}
 
 <script src="{{static_url("auth/js/loginmain.js") }}" type="text/javascript" charset="utf-8"></script>
 
 {% endblock %}

IPython/frontend/html/notebook/templates/tree.html

@@ -1,88 +1,90 b''
 {% extends "page.html" %}
 
 {% block title %}IPython Dashboard{% endblock %}
 
 
 {% block stylesheet %}
 {{super()}}
 <link rel="stylesheet" href="{{ static_url("tree/css/override.css") }}" type="text/css" />
 {% endblock %}
 
 {% block params %}
 
 data-project={{project}}
 data-base-project-url={{base_project_url}}
 data-base-kernel-url={{base_kernel_url}}
 data-read-only={{read_only}}
 
 {% endblock %}
 
 
 {% block site %}
 
 <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' >
                 <span id="drag_info" style="position:absolute" >
                     To import a notebook, drag the file onto the listing below or <strong>click here</strong>.
                     </span>
                 <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 %}
 
         <div id="notebook_list">
             <div id="project_name">
                 <ul class="breadcrumb">
                     {% for component in project_component %}
                         <li>{{component}} <span>/</span></li>
                     {% endfor %}
                 </ul>
             </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>
 
         <div id="cluster_list">
             <div id="cluster_header">
                 <span>profile</span>
                 <span>action</span>
                 <span title="Enter the number of engines to start or empty for default"># of engines</span>
                 <span>status</span>
             </div>
         </div>
-
+        </div>
     </div>
 </div>
 
 </div>
 
 {% endblock %}
 
 {% block script %}
     {{super()}}
     <script src="{{static_url("tree/js/notebooklist.js") }}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("tree/js/clusterlist.js") }}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("tree/js/main.js") }}" type="text/javascript" charset="utf-8"></script>
 {% endblock %}