##// END OF EJS Templates
Initial try at adding tabs to project dashboard.
Brian Granger -
Show More
@@ -1,53 +1,57 b''
1
1
2 /**
2 /**
3 * Primary styles
3 * Primary styles
4 *
4 *
5 * Author: IPython Development Team
5 * Author: IPython Development Team
6 */
6 */
7
7
8 #main_app {
8 #main_app {
9 width: 920px;
9 width: 920px;
10 margin: auto;
10 margin: 30px auto 0px auto;
11 }
11 }
12
12
13 #notebooks_toolbar {
13 #notebooks_toolbar {
14 padding: 5px;
14 padding: 5px;
15 height: 25px;
15 height: 25px;
16 line-height: 25px;
16 line-height: 25px;
17 }
17 }
18
18
19 #drag_info {
19 #drag_info {
20 float: left;
20 float: left;
21 }
21 }
22
22
23 #notebooks_buttons {
23 #notebooks_buttons {
24 float: right;
24 float: right;
25 }
25 }
26
26
27 #project_name {
27 #project_name {
28 height: 25px;
28 height: 25px;
29 line-height: 25px;
29 line-height: 25px;
30 padding: 3px;
30 padding: 3px;
31 }
31 }
32
32
33 .notebook_item {
33 .notebook_item {
34 height: 25px;
34 height: 25px;
35 line-height: 25px;
35 line-height: 25px;
36 padding: 3px;
36 padding: 3px;
37 }
37 }
38
38
39 .notebook_item a {
39 .notebook_item a {
40 text-decoration: none;
40 text-decoration: none;
41 }
41 }
42
42
43 .item_buttons {
43 .item_buttons {
44 float: right;
44 float: right;
45 }
45 }
46
46
47 .item_buttons .upload_button {
47 .item_buttons .upload_button {
48 color: darkred;
48 color: darkred;
49 }
49 }
50
50
51 .highlight_text {
51 .highlight_text {
52 color: blue;
52 color: blue;
53 }
53 }
54
55 .ui-tabs .ui-tabs-nav li a {
56 padding: .3em .5em;
57 }
@@ -1,32 +1,33 b''
1 //----------------------------------------------------------------------------
1 //----------------------------------------------------------------------------
2 // Copyright (C) 2008-2011 The IPython Development Team
2 // Copyright (C) 2008-2011 The IPython Development Team
3 //
3 //
4 // Distributed under the terms of the BSD License. The full license is in
4 // Distributed under the terms of the BSD License. The full license is in
5 // the file COPYING, distributed as part of this software.
5 // the file COPYING, distributed as part of this software.
6 //----------------------------------------------------------------------------
6 //----------------------------------------------------------------------------
7
7
8 //============================================================================
8 //============================================================================
9 // On document ready
9 // On document ready
10 //============================================================================
10 //============================================================================
11
11
12
12
13 $(document).ready(function () {
13 $(document).ready(function () {
14
14
15 IPython.page = new IPython.Page();
15 IPython.page = new IPython.Page();
16
16
17 $('div#tabs').tabs();
17 $('div#main_app').addClass('border-box-sizing ui-widget');
18 $('div#main_app').addClass('border-box-sizing ui-widget');
18 $('div#notebooks_toolbar').addClass('ui-widget ui-helper-clearfix');
19 $('div#notebooks_toolbar').addClass('ui-widget ui-helper-clearfix');
19 $('#new_notebook').button().click(function (e) {
20 $('#new_notebook').button().click(function (e) {
20 window.open($('body').data('baseProjectUrl')+'new');
21 window.open($('body').data('baseProjectUrl')+'new');
21 });
22 });
22
23
23 IPython.read_only = $('body').data('readOnly') === 'True';
24 IPython.read_only = $('body').data('readOnly') === 'True';
24 IPython.notebook_list = new IPython.NotebookList('div#notebook_list');
25 IPython.notebook_list = new IPython.NotebookList('div#notebook_list');
25 IPython.login_widget = new IPython.LoginWidget('span#login_widget');
26 IPython.login_widget = new IPython.LoginWidget('span#login_widget');
26
27
27 IPython.notebook_list.load_list();
28 IPython.notebook_list.load_list();
28
29
29 IPython.page.show();
30 IPython.page.show();
30
31
31 });
32 });
32
33
@@ -1,48 +1,57 b''
1 {% extends page.html %}
1 {% extends page.html %}
2
2
3 {% block title %}IPython Dashboard{% end %}
3 {% block title %}IPython Dashboard{% end %}
4
4
5 {% block stylesheet %}
5 {% block stylesheet %}
6 <link rel="stylesheet" href="{{static_url("css/projectdashboard.css") }}" type="text/css" />
6 <link rel="stylesheet" href="{{static_url("css/projectdashboard.css") }}" type="text/css" />
7 {% end %}
7 {% end %}
8
8
9
9
10 {% block params %}
10 {% block params %}
11
11
12 data-project={{project}}
12 data-project={{project}}
13 data-base-project-url={{base_project_url}}
13 data-base-project-url={{base_project_url}}
14 data-base-kernel-url={{base_kernel_url}}
14 data-base-kernel-url={{base_kernel_url}}
15 data-read-only={{read_only}}
15 data-read-only={{read_only}}
16
16
17 {% end %}
17 {% end %}
18
18
19
19
20 {% block site %}
20 {% block site %}
21
21
22 <div id="main_app">
22 <div id="main_app">
23
23
24 {% if logged_in or not read_only %}
24 <div id="tabs">
25
25 <ul>
26 <div id="notebooks_toolbar">
26 <li><a href="#tab1">Notebooks</a></li>
27 <span id="drag_info">Drag files onto the list to import
27 <li><a href="#tab2">Clusters</a></li>
28 notebooks.</span>
28 </ul>
29
29
30 <span id="notebooks_buttons">
30 <div id="tab1">
31 <button id="new_notebook">New Notebook</button>
31 {% if logged_in or not read_only %}
32 </span>
32 <div id="notebooks_toolbar">
33 <span id="drag_info">Drag files onto the list to import
34 notebooks.</span>
35
36 <span id="notebooks_buttons">
37 <button id="new_notebook">New Notebook</button>
38 </span>
39 </div>
40 {% end %}
41
42 <div id="notebook_list">
43 <div id="project_name"><h2>{{project}}</h2></div>
44 </div>
33 </div>
45 </div>
34
46 <div id="tab2">
35 {% end %}
36
37 <div id="notebook_list">
38 <div id="project_name"><h2>{{project}}</h2></div>
39 </div>
47 </div>
48 </div>
40
49
41 </div>
50 </div>
42
51
43 {% end %}
52 {% end %}
44
53
45 {% block script %}
54 {% block script %}
46 <script src="{{static_url("js/notebooklist.js") }}" type="text/javascript" charset="utf-8"></script>
55 <script src="{{static_url("js/notebooklist.js") }}" type="text/javascript" charset="utf-8"></script>
47 <script src="{{static_url("js/projectdashboardmain.js") }}" type="text/javascript" charset="utf-8"></script>
56 <script src="{{static_url("js/projectdashboardmain.js") }}" type="text/javascript" charset="utf-8"></script>
48 {% end %}
57 {% end %}
General Comments 0
You need to be logged in to leave comments. Login now