##// END OF EJS Templates
upstream » ipython
RSS

Clone from https://github.com/ipython/ipython.git

Solid first go at jquery-ui based menus.
Brian Granger -
Show More
Show file before | Show file after | Hide comments
@@ -31,6 +31,25 b' span#notebook_name {'
31 font-size: 146.5%;
31 font-size: 146.5%;
32 }
32 }
33
33
34 .ui-menubar-item .ui-button .ui-button-text {
35 padding: 0.4em 1.0em;
36 font-size: 100%;
37 }
38
39 .ui-menu {
40 -moz-box-shadow: 0px 6px 10px -1px #adadad;
41 -webkit-box-shadow: 0px 6px 10px -1px #adadad;
42 box-shadow: 0px 6px 10px -1px #adadad;
43 }
44
45 .ui-menu .ui-menu-item a {
46 padding: 2px 0.9em;
47 }
48
49 .ui-menu hr {
50 margin: 0.3em 0;
51 }
52
34 span#quick_help_area {
53 span#quick_help_area {
35 position: static;
54 position: static;
36 padding: 5px 0px;
55 padding: 5px 0px;
@@ -58,14 +77,6 b' span#kernel_status {'
58 color: black;
77 color: black;
59 }
78 }
60
79
61 .wijmo-wijmenu {
62 padding: 0px;
63 }
64
65 .wijmo-wijmenu .wijmo-wijmenu-parent .wijmo-wijmenu-child {
66 width: 225px;
67 }
68
69 #kernel_persist {
80 #kernel_persist {
70 float: right;
81 float: right;
71 }
82 }
Show file before | Show file after | Hide comments
@@ -22,24 +22,7 b' var IPython = (function (IPython) {'
22
22
23
23
24 MenuBar.prototype.style = function () {
24 MenuBar.prototype.style = function () {
25 $('ul#menus').wijmenu();
25 $('ul#menus').menubar();
26 $('ul#menus').wijmenu("option", "showDelay", 200);
27 $('ul#menus').wijmenu("option", "hideDelay", 200);
28 $(".selector").wijmenu("option", "animation", {animated:"fade", duration: 200, easing: null})
29 // Close all menus when a menu item is clicked. This is needed when
30 // menu shortcuts are used as they have a slightly different structure
31 // in the DOM.
32 $(".wijmo-wijmenu-text").parent().bind("click", function () {
33 $('ul#menus').wijmenu("hideAllMenus");
34 });
35 // Make sure we hover over menu items correctly. This is needed when
36 // menu shortcuts are used as they have a slightly different structure
37 // in the DOM.
38 $(".wijmo-wijmenu-link").hover(function () {
39 $(this).addClass("ui-state-hover");
40 }, function () {
41 $(this).removeClass("ui-state-hover");
42 });
43 };
26 };
44
27
45
28
Show file before | Show file after | Hide comments
@@ -112,7 +112,7 b' var IPython = (function (IPython) {'
112 var new_item_name = $('<span/>').addClass('item_name');
112 var new_item_name = $('<span/>').addClass('item_name');
113 new_item_name.append(
113 new_item_name.append(
114 $('<a/>').
114 $('<a/>').
115 attr('href', $('body').data('baseProjectURL')+notebook_id).
115 attr('href', $('body').data('baseProjectUrl')+notebook_id).
116 attr('target','_blank').
116 attr('target','_blank').
117 text(nbname)
117 text(nbname)
118 );
118 );
Show file before | Show file after | Hide comments
@@ -57,8 +57,9 b' var IPython = (function (IPython) {'
57 .css({'margin-bottom': '10px'})
57 .css({'margin-bottom': '10px'})
58 );
58 );
59 dialog.append(
59 dialog.append(
60 $('<input/>').attr('type','text')
60 $('<input/>').attr('type','text').attr('size','35')
61 .attr('value',this.get_notebook_name()).wijtextbox()
61 .addClass('ui-widget ui-widget-content')
62 .attr('value',that.get_notebook_name())
62 );
63 );
63 $(document).append(dialog);
64 $(document).append(dialog);
64 dialog.dialog({
65 dialog.dialog({
Show file before | Show file after | Hide comments
@@ -6,7 +6,7 b''
6
6
7 <title>{% block title %}IPython Notebook{% end %}</title>
7 <title>{% block title %}IPython Notebook{% end %}</title>
8
8
9 <link rel="stylesheet" href="/static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" />
9 <link rel="stylesheet" href="/static/jquery/css/themes/base/jquery-ui.min.css" type="text/css" />
10 <link rel="stylesheet" href="/static/css/boilerplate.css" type="text/css" />
10 <link rel="stylesheet" href="/static/css/boilerplate.css" type="text/css" />
11 <link rel="stylesheet" href="/static/css/layout.css" type="text/css" />
11 <link rel="stylesheet" href="/static/css/layout.css" type="text/css" />
12 <link rel="stylesheet" href="/static/css/base.css" type="text/css"/>
12 <link rel="stylesheet" href="/static/css/base.css" type="text/css"/>
@@ -72,8 +72,8 b''
72
72
73 </div>
73 </div>
74
74
75 <script src="/static/jquery/js/jquery-1.6.2.min.js" type="text/javascript" charset="utf-8"></script>
75 <script src="/static/jquery/js/jquery-1.7.1.min.js" type="text/javascript" charset="utf-8"></script>
76 <script src="/static/jquery/js/jquery-ui-1.8.16.custom.min.js" type="text/javascript" charset="utf-8"></script>
76 <script src="/static/jquery/js/jquery-ui.min.js" type="text/javascript" charset="utf-8"></script>
77 <script src="/static/js/namespace.js" type="text/javascript" charset="utf-8"></script>
77 <script src="/static/js/namespace.js" type="text/javascript" charset="utf-8"></script>
78 <script src="/static/js/loginmain.js" type="text/javascript" charset="utf-8"></script>
78 <script src="/static/js/loginmain.js" type="text/javascript" charset="utf-8"></script>
79 <script src="/static/js/loginwidget.js" type="text/javascript" charset="utf-8"></script>
79 <script src="/static/js/loginwidget.js" type="text/javascript" charset="utf-8"></script>
Show file before | Show file after | Hide comments
@@ -15,8 +15,7 b''
15 window.mathjax_url = "{{mathjax_url}}";
15 window.mathjax_url = "{{mathjax_url}}";
16 </script>
16 </script>
17
17
18 <link rel="stylesheet" href="/static/jquery/css/jquery.wijmo-open.2.0.0b1.css" type="text/css" />
18 <link rel="stylesheet" href="/static/jquery/css/themes/base/jquery-ui.min.css" type="text/css" />
19 <link rel="stylesheet" href="/static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" />
20 <link rel="stylesheet" href="/static/codemirror/lib/codemirror.css">
19 <link rel="stylesheet" href="/static/codemirror/lib/codemirror.css">
21 <link rel="stylesheet" href="/static/codemirror/mode/markdown/markdown.css">
20 <link rel="stylesheet" href="/static/codemirror/mode/markdown/markdown.css">
22 <link rel="stylesheet" href="/static/codemirror/mode/rst/rst.css">
21 <link rel="stylesheet" href="/static/codemirror/mode/rst/rst.css">
@@ -65,145 +64,65 b''
65 <ul id="menus">
64 <ul id="menus">
66 <li><a href="#">File</a>
65 <li><a href="#">File</a>
67 <ul>
66 <ul>
68 <li id="new_notebook"><span class="wijmo-wijmenu-text">New</span></li>
67 <li id="new_notebook"><a href="#">New</a></li>
69 <li id="open_notebook"><span class="wijmo-wijmenu-text">Open...</span></li>
68 <li id="open_notebook"><a href="#">Open...</a></li>
70 <li></li>
69 <hr/>
71 <li id="copy_notebook"><span class="wijmo-wijmenu-text">Make a Copy...</span></li>
70 <li id="copy_notebook"><a href="#">Make a Copy...</a></li>
72 <li id="rename_notebook"><span class="wijmo-wijmenu-text">Rename...</span></li>
71 <li id="rename_notebook"><a href="#">Rename...</a></li>
73 <li id="save_notebook">
72 <li id="save_notebook"><a href="#">Save</a></li>
74 <div>
73 <hr/>
75 <span class="wijmo-wijmenu-text">Save</span>
76 <span class="wijmo-wijmenu-icon-right">Ctrl+m s</span>
77 </div>
78 </li>
79 <li></li>
80 <li><a href="#">Download as</a>
74 <li><a href="#">Download as</a>
81 <ul>
75 <ul>
82 <li id="download_ipynb"><a href="#">IPython (.ipynb)</a></li>
76 <li id="download_ipynb"><a href="#">IPython (.ipynb)</a></li>
83 <li id="download_py"><a href="#">Python (.py)</a></li>
77 <li id="download_py"><a href="#">Python (.py)</a></li>
84 </ul>
78 </ul>
85 </li>
79 </li>
86 <li></li>
80 <hr/>
87 <li id="print_notebook"><a href="#">Print</a></li>
81 <li id="print_notebook"><a href="#">Print</a></li>
88 </ul>
82 </ul>
89 </li>
83 </li>
90 <li><a href="#">Edit</a>
84 <li><a href="#">Edit</a>
91 <ul>
85 <ul>
92 <li id="delete_cell">
86 <li id="delete_cell"><a href="#">Delete</a></li>
93 <div>
87 <hr/>
94 <span class="wijmo-wijmenu-text">Delete</span>
88 <li id="move_cell_up"><a href="#">Move Cell Up</a></li>
95 <span class="wijmo-wijmenu-icon-right">Ctrl+m d</span>
89 <li id="move_cell_down"><a href="#">Move Cell Down</a></li>
96 </div>
90 <hr/>
97 </li>
91 <li id="select_previous"><a href="#">Select Previous</a></li>
98 <li></li>
92 <li id="select_next"><a href="#">Select Next</a></li>
99 <li id="move_cell_up">
100 <div>
101 <span class="wijmo-wijmenu-text">Move Cell Up</span>
102 <span class="wijmo-wijmenu-icon-right">Ctrl+m k</span>
103 </div>
104 </li>
105 <li id="move_cell_down">
106 <div>
107 <span class="wijmo-wijmenu-text">Move Cell Down</span>
108 <span class="wijmo-wijmenu-icon-right">Ctrl+m j</span>
109 </div>
110 </li>
111 <li></li>
112 <li id="select_previous">
113 <div>
114 <span class="wijmo-wijmenu-text">Select Previous</span>
115 <span class="wijmo-wijmenu-icon-right">Ctrl+m p</span>
116 </div>
117 </li>
118 <li id="select_next">
119 <div>
120 <span class="wijmo-wijmenu-text">Select Next</span>
121 <span class="wijmo-wijmenu-icon-right">Ctrl+m n</span>
122 </div>
123 </li>
124 </ul>
93 </ul>
125 </li>
94 </li>
126 <li><a href="#">Insert</a>
95 <li><a href="#">Insert</a>
127 <ul>
96 <ul>
128 <li id="insert_cell_above">
97 <li id="insert_cell_above"><a href="#">Insert Cell Above</a></li>
129 <div>
98 <li id="insert_cell_below"><a href="#">Insert Cell Below</a></li>
130 <span class="wijmo-wijmenu-text">Insert Cell Above</span>
131 <span class="wijmo-wijmenu-icon-right">Ctrl+m a</span>
132 </div>
133 </li>
134 <li id="insert_cell_below">
135 <div>
136 <span class="wijmo-wijmenu-text">Insert Cell Below</span>
137 <span class="wijmo-wijmenu-icon-right">Ctrl+m b</span>
138 </div>
139 </li>
140 </ul>
99 </ul>
141 </li>
100 </li>
142 <li><a href="#">Cell</a>
101 <li><a href="#">Cell</a>
143 <ul>
102 <ul>
144 <li id="run_cell">
103 <li id="run_cell"><a href="#">Run</a></li>
145 <div>
104 <li id="run_cell_in_place"><a href="#">Run in Place</a></li>
146 <span class="wijmo-wijmenu-text">Run</span>
147 <span class="wijmo-wijmenu-icon-right">Shift+Enter</span>
148 </div>
149 </li>
150 <li id="run_cell_in_place">
151 <div>
152 <span class="wijmo-wijmenu-text">Run in Place</span>
153 <span class="wijmo-wijmenu-icon-right">Ctrl+Enter</span>
154 </div>
155 </li>
156 <li id="run_all_cells"><a href="#">Run All</a></li>
105 <li id="run_all_cells"><a href="#">Run All</a></li>
157 <li></li>
106 <hr/>
158 <li id="to_code">
107 <li id="to_code"><a href="#">Code Cell</a></li>
159 <div>
108 <li id="to_markdown"><a href="#">Markdown Cell</a></li>
160 <span class="wijmo-wijmenu-text">Code Cell</span>
109 <hr/>
161 <span class="wijmo-wijmenu-icon-right">Ctrl+m c</span>
110 <li id="toggle_output"><a href="#">Toggle Output</a></li>
162 </div>
163 </li>
164 <li id="to_markdown">
165 <div>
166 <span class="wijmo-wijmenu-text">Markdown Cell</span>
167 <span class="wijmo-wijmenu-icon-right">Ctrl+m s</span>
168 </div>
169 </li>
170 <li></li>
171 <li id="toggle_output">
172 <div>
173 <span class="wijmo-wijmenu-text">Toggle Output</span>
174 <span class="wijmo-wijmenu-icon-right">Ctrl+m t</span>
175 </div>
176 </li>
177 <li id="clear_all_output"><a href="#">Clear All Output</a></li>
111 <li id="clear_all_output"><a href="#">Clear All Output</a></li>
178 </ul>
112 </ul>
179 </li>
113 </li>
180 <li><a href="#">Kernel</a>
114 <li><a href="#">Kernel</a>
181 <ul>
115 <ul>
182 <li id="int_kernel">
116 <li id="int_kernel"><a href="#">Interrupt</a></li>
183 <div>
117 <li id="restart_kernel"><a href="#">Restart</a></li>
184 <span class="wijmo-wijmenu-text">Interrupt</span>
185 <span class="wijmo-wijmenu-icon-right">Ctrl+m i</span>
186 </div>
187 </li>
188 <li id="restart_kernel">
189 <div>
190 <span class="wijmo-wijmenu-text">Restart</span>
191 <span class="wijmo-wijmenu-icon-right">Ctrl+m .</span>
192 </div>
193 </li>
194 </ul>
118 </ul>
195 </li>
119 </li>
196 <li><a href="#">Help</a>
120 <li><a href="#">Help</a>
197 <ul>
121 <ul>
198 <li><a href="http://ipython.org/documentation.html" target="_blank">IPython Help</a></li>
122 <li><a href="http://ipython.org/documentation.html" target="_blank">IPython Help</a></li>
199 <li><a href="http://ipython.org/ipython-doc/stable/interactive/htmlnotebook.html" target="_blank">Notebook Help</a></li>
123 <li><a href="http://ipython.org/ipython-doc/stable/interactive/htmlnotebook.html" target="_blank">Notebook Help</a></li>
200 <li id="keyboard_shortcuts">
124 <li id="keyboard_shortcuts"><a href="#">Keyboard Shortcuts</a></li>
201 <div>
125 <hr/>
202 <span class="wijmo-wijmenu-text">Keyboard Shortcuts</span>
203 <span class="wijmo-wijmenu-icon-right">Ctrl+m h</span>
204 </div>
205 </li>
206 <li><h2>External Docs</h2></li>
207 <li><a href="http://docs.python.org" target="_blank">Python</a></li>
126 <li><a href="http://docs.python.org" target="_blank">Python</a></li>
208 <li><a href="http://docs.scipy.org/doc/numpy/reference/" target="_blank">NumPy</a></li>
127 <li><a href="http://docs.scipy.org/doc/numpy/reference/" target="_blank">NumPy</a></li>
209 <li><a href="http://docs.scipy.org/doc/scipy/reference/" target="_blank">SciPy</a></li>
128 <li><a href="http://docs.scipy.org/doc/scipy/reference/" target="_blank">SciPy</a></li>
@@ -225,11 +144,8 b''
225
144
226 </div>
145 </div>
227
146
228 <script src="/static/jquery/js/jquery-1.6.2.min.js" type="text/javascript" charset="utf-8"></script>
147 <script src="/static/jquery/js/jquery-1.7.1.min.js" type="text/javascript" charset="utf-8"></script>
229 <script src="/static/jquery/js/jquery-ui-1.8.16.custom.min.js" type="text/javascript" charset="utf-8"></script>
148 <script src="/static/jquery/js/jquery-ui.min.js" type="text/javascript" charset="utf-8"></script>
230 <script src="/static/jquery/js/jquery.wijmo-open.all.2.0.0b1.min.js" type="text/javascript" charset="utf-8"></script>
231 <script src="/static/jquery/js/jquery.bgiframe-2.1.3-pre.js" type="text/javascript" charset="utf-8"></script>
232 <script src="/static/jquery/js/jquery.mousewheel.min.js" type="text/javascript" charset="utf-8"></script>
233
149
234 <script src="/static/codemirror/lib/codemirror.js" charset="utf-8"></script>
150 <script src="/static/codemirror/lib/codemirror.js" charset="utf-8"></script>
235 <script src="/static/codemirror/mode/python/python.js" charset="utf-8"></script>
151 <script src="/static/codemirror/mode/python/python.js" charset="utf-8"></script>
General Comments 0
You need to be logged in to leave comments. Login now