##// END OF EJS Templates
Initial work to add Wijmo based menu.
Brian Granger -
Show More
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
@@ -1933,13 +1933,18 b' button.ui-button::-moz-focus-inner'
1933 border-radius: 2px;
1933 border-radius: 2px;
1934 }
1934 }
1935
1935
1936 .wijmo-wijinput, .wijmo-wijtextbox, .wijmo-checkbox-box, .wijmo-wijradio-box, .wijmo-wijgrid .wijmo-wijinput
1936 .wijmo-wijinput, .wijmo-wijtextbox, .wijmo-wijgrid .wijmo-wijinput
1937 {
1937 {
1938 /*background: #242122 url(images/ui-bg_inset-soft_15_242122_1x100.png) 50% 50% repeat-x !important;*/ /*background: #e1e1e1 url(images/ui-bg_inset-soft_100_e1e1e1_1x100.png) 50% 50% repeat-x !important;*/
1938 /*background: #242122 url(images/ui-bg_inset-soft_15_242122_1x100.png) 50% 50% repeat-x !important;*/ /*background: #e1e1e1 url(images/ui-bg_inset-soft_100_e1e1e1_1x100.png) 50% 50% repeat-x !important;*/
1939 background: #f1f1f1 !important;
1939 background: #f1f1f1 !important;
1940 color: #404040;
1940 color: #404040;
1941 border: solid 1px #e1e1e1;
1941 border: solid 1px #e1e1e1;
1942 }
1942 }
1943 .wijmo-checkbox .wijmo-checkbox-box, div.wijmo-wijradio-box
1944 {
1945 background: #f1f1f1;
1946 border: solid 1px #e1e1e1;
1947 }
1943 .wijmo-wijinput.ui-state-focus, .wijmo-wijtextbox.ui-state-focus
1948 .wijmo-wijinput.ui-state-focus, .wijmo-wijtextbox.ui-state-focus
1944 {
1949 {
1945 /*background: #e1e1e1 url(images/ui-bg_inset-soft_100_e1e1e1_1x100.png) 50% 50% repeat-x !important;*/
1950 /*background: #e1e1e1 url(images/ui-bg_inset-soft_100_e1e1e1_1x100.png) 50% 50% repeat-x !important;*/
@@ -2062,6 +2067,13 b' button.ui-button::-moz-focus-inner'
2062 box-shadow: inset 0 3px 10px rgba(0,0,0,0.25);
2067 box-shadow: inset 0 3px 10px rgba(0,0,0,0.25);
2063 }
2068 }
2064
2069
2070 .wijmo-wijsuperpanel .wijmo-wijsuperpanel-handle
2071 {
2072 -moz-border-radius: 0;
2073 -webkit-border-radius: 0;
2074 border-radius: 0;
2075 }
2076
2065 .wijmo-wijcalendar
2077 .wijmo-wijcalendar
2066 {
2078 {
2067 display: block;
2079 display: block;
@@ -2090,14 +2102,14 b' button.ui-button::-moz-focus-inner'
2090 border-top: solid 1px #d3d3d3;
2102 border-top: solid 1px #d3d3d3;
2091 }
2103 }
2092
2104
2093 .wijmo-wijcalendar-day-selectable .ui-state-default
2105 .wijmo-wijcalendar-table .wijmo-wijcalendar-day-selectable .ui-state-default
2094 {
2106 {
2095 background: none;
2107 background: none;
2096 border: solid 1px transparent;
2108 border: solid 1px transparent;
2097 color: #404040;
2109 color: #404040;
2098 }
2110 }
2099
2111
2100 .wijmo-wijcalendar-day-selectable .ui-state-highlight
2112 .wijmo-wijcalendar-table .wijmo-wijcalendar-day-selectable .ui-state-highlight
2101 {
2113 {
2102 background: #9eca38 url(images/ui-bg_highlight-soft_15_9eca38_1x100.png) 50% 50% repeat-x;
2114 background: #9eca38 url(images/ui-bg_highlight-soft_15_9eca38_1x100.png) 50% 50% repeat-x;
2103 border: 1px solid #9eca38;
2115 border: 1px solid #9eca38;
@@ -2110,7 +2122,7 b' button.ui-button::-moz-focus-inner'
2110
2122
2111
2123
2112
2124
2113 .wijmo-wijcalendar-day-selectable .ui-state-hover
2125 .wijmo-wijcalendar-table .wijmo-wijcalendar-day-selectable .ui-state-hover
2114 {
2126 {
2115 -moz-box-shadow: inset 1px 1px 0 rgba(255,255,255,0.15);
2127 -moz-box-shadow: inset 1px 1px 0 rgba(255,255,255,0.15);
2116 -webkit-box-shadow: inset 1px 1px 0 rgba(255,255,255,0.15);
2128 -webkit-box-shadow: inset 1px 1px 0 rgba(255,255,255,0.15);
@@ -2121,7 +2133,6 b' button.ui-button::-moz-focus-inner'
2121 color: #fafafa;
2133 color: #fafafa;
2122 text-shadow: none;
2134 text-shadow: none;
2123 }
2135 }
2124
2125 .wijmo-wijmenu .wijmo-wijmenu-separator
2136 .wijmo-wijmenu .wijmo-wijmenu-separator
2126 {
2137 {
2127 border: 1px solid #00a6dd;
2138 border: 1px solid #00a6dd;
@@ -2134,7 +2145,7 b' button.ui-button::-moz-focus-inner'
2134 line-height: 22px;
2145 line-height: 22px;
2135 }
2146 }
2136
2147
2137 .wijmo-wijcalendar-day-selectable .ui-state-active
2148 .wijmo-wijcalendar-table .wijmo-wijcalendar-day-selectable .ui-state-active
2138 {
2149 {
2139 -moz-box-shadow: inset 1px 1px 0 rgba(255,255,255,0.15);
2150 -moz-box-shadow: inset 1px 1px 0 rgba(255,255,255,0.15);
2140 -webkit-box-shadow: inset 1px 1px 0 rgba(255,255,255,0.15);
2151 -webkit-box-shadow: inset 1px 1px 0 rgba(255,255,255,0.15);
@@ -2145,7 +2156,7 b' button.ui-button::-moz-focus-inner'
2145 color: #fafafa;
2156 color: #fafafa;
2146 }
2157 }
2147
2158
2148 .wijmo-wijcalendar-day-selectable .ui-priority-secondary
2159 .wijmo-wijcalendar-table .wijmo-wijcalendar-day-selectable .ui-priority-secondary
2149 {
2160 {
2150 -moz-box-shadow: inset 1px 1px 0 rgba(255,255,255,0.05);
2161 -moz-box-shadow: inset 1px 1px 0 rgba(255,255,255,0.05);
2151 -webkit-box-shadow: inset 1px 1px 0 rgba(255,255,255,0.05);
2162 -webkit-box-shadow: inset 1px 1px 0 rgba(255,255,255,0.05);
@@ -2310,3 +2321,32 b' a.ui-button:link, a.ui-button'
2310 {
2321 {
2311 color: #404040;
2322 color: #404040;
2312 }
2323 }
2324 /* Ribbon */
2325 .wijmo-wijribbon-group .wijmo-wijribbon-abbrevgroup:hover .wijmo-wijribbon-text
2326 {
2327 color: #fafafa;
2328 }
2329 div.wijmo-wijribbon .ui-icon
2330 {
2331 background-image: url("images/wijmo-ui-icons_000000_240x112.png");
2332 }
2333 div.wijmo-wijribbon-simple span.ui-icon, div.wijmo-wijribbon .ui-state-active .ui-icon, .wijmo-wijribbon .wijmo-wijribbon-group .ui-button:hover .ui-icon, div.wijmo-wijribbon-modes span.ui-icon, .wijmo-wijribbon-group .wijmo-wijribbon-abbrevgroup:hover .ui-icon, .wijmo-wijribbon-group .wijmo-wijribbon-abbrevgroup:hover .wijmo-wijribbon-abbrevicon
2334 {
2335 background-image: url("images/wijmo-ui-icons_ffffff_240x112.png");
2336 }
2337 .wijmo-wijeditor .ui-tabs .ui-tabs-nav li.ui-tabs-selected
2338 {
2339 padding-bottom: 0;
2340 }
2341 div.wijmo-wijribbon-simple .ui-button-text-icon-secondary .ui-button-text
2342 {
2343 color: #fafafa;
2344 }
2345
2346
2347 div.wijmo-wijribbon .ui-state-active .ui-button-text
2348 {
2349 border: solid 1px transparent;
2350 border-radius: 4px;
2351 margin: -1px;
2352 } No newline at end of file
1 NO CONTENT: modified file chmod 100644 => 100755
NO CONTENT: modified file chmod 100644 => 100755
@@ -79,6 +79,8 b' $(document).ready(function () {'
79 $('div#main_app').addClass('border-box-sizing ui-widget ui-widget-content');
79 $('div#main_app').addClass('border-box-sizing ui-widget ui-widget-content');
80 $('div#notebook_panel').addClass('border-box-sizing ui-widget');
80 $('div#notebook_panel').addClass('border-box-sizing ui-widget');
81
81
82 $('ul#menus').wijmenu();
83
82 IPython.layout_manager = new IPython.LayoutManager();
84 IPython.layout_manager = new IPython.LayoutManager();
83 IPython.pager = new IPython.Pager('div#pager', 'div#pager_splitter');
85 IPython.pager = new IPython.Pager('div#pager', 'div#pager_splitter');
84 IPython.left_panel = new IPython.LeftPanel('div#left_panel', 'div#left_panel_splitter');
86 IPython.left_panel = new IPython.LeftPanel('div#left_panel', 'div#left_panel_splitter');
@@ -73,10 +73,11 b''
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.6.2.min.js" type="text/javascript" charset="utf-8"></script>
76 <script src="/static/jquery/js/jquery-ui-1.8.14.custom.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>
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>
80
80 {% block script %}
81 {% block script %}
81 {% end %}
82 {% end %}
82
83
@@ -15,6 +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/aristo/jquery-wijmo.css" type="text/css" />
19 <link rel="stylesheet" href="/static/jquery/css/themes/aristo/jquery-wijmo.css" type="text/css" />
19 <link rel="stylesheet" href="/static/codemirror/lib/codemirror.css">
20 <link rel="stylesheet" href="/static/codemirror/lib/codemirror.css">
20 <link rel="stylesheet" href="/static/codemirror/mode/markdown/markdown.css">
21 <link rel="stylesheet" href="/static/codemirror/mode/markdown/markdown.css">
@@ -64,6 +65,77 b''
64 <span id="kernel_status">Idle</span>
65 <span id="kernel_status">Idle</span>
65 </div>
66 </div>
66
67
68 <div id="menu_bar">
69 <ul id="menus">
70 <li><a href="#">File</a>
71 <ul>
72 <li><a href="#">New</a></li>
73 <li><a href="#">Open...</a></li>
74 <li></li>
75 <li><a href="#">Save</a></li>
76 <li></li>
77 <li><a href="#">Download as</a>
78 <ul>
79 <li><a href="#">IPython (.ipynb)</a></li>
80 <li><a href="#">Python (.py)</a></li>
81 </ul>
82 </li>
83 <li></li>
84 <li><a href="#">Print</a></li>
85
86 </ul>
87 </li>
88 <li><a href="#">Edit</a>
89 <ul>
90 <li><a href="#">Delete</a></li>
91 <li></li>
92 <li><a href="#">Move Up</a></li>
93 <li><a href="#">Move Down</a></li>
94 </ul>
95 </li>
96 <li><a href="#">Insert</a>
97 <ul>
98 <li><a href="#">Insert Above</a>
99 <li><a href="#">Insert Below</a>
100 </li>
101 </ul>
102 </li>
103 <li><a href="#">Cell</a>
104 <ul>
105 <li><a href="#">Run</a></li>
106 <li><a href="#">Run in Place</a></li>
107 <li><a href="#">Run All</a></li>
108 <li></li>
109 <li><a href="#">Code Cell</a></li>
110 <li><a href="#">Markdown Cell</a></li>
111 <li></li>
112 <li><a href="#">Toggle Output</a></li>
113 <li><a href="#">Clear All Output</a></li>
114 </ul>
115 </li>
116 <li><a href="#">Kernel</a>
117 <ul>
118 <li><a href="#">Interrupt</a></li>
119 <li><a href="#">Restart</a></li>
120 </ul>
121 </li>
122 <li><a href="#">Help</a>
123 <ul>
124 <li><a href="#">IPython Help</a></li>
125 <li><a href="#">Notebook Help</a></li>
126 <li><a href="#">Notebook QuickRef</a></li>
127 <li><h2>External Docs</h2></li>
128 <li><a href="#">Python</a></li>
129 <li><a href="#">NumPy</a></li>
130 <li><a href="#">SciPy</a></li>
131 <li><a href="#">SymPy</a></li>
132 <li><a href="#">Matplotlib</a></li>
133 </ul>
134 </li>
135 </ul>
136
137 </div>
138
67 <div id="main_app">
139 <div id="main_app">
68
140
69 <div id="left_panel">
141 <div id="left_panel">
@@ -259,8 +331,10 b''
259 </div>
331 </div>
260
332
261 <script src="/static/jquery/js/jquery-1.6.2.min.js" type="text/javascript" charset="utf-8"></script>
333 <script src="/static/jquery/js/jquery-1.6.2.min.js" type="text/javascript" charset="utf-8"></script>
262 <script src="/static/jquery/js/jquery-ui-1.8.14.custom.min.js" type="text/javascript" charset="utf-8"></script>
334 <script src="/static/jquery/js/jquery-ui-1.8.16.custom.min.js" type="text/javascript" charset="utf-8"></script>
263 <script src="/static/jquery/js/jquery.autogrow.js" type="text/javascript" charset="utf-8"></script>
335 <script src="/static/jquery/js/jquery.wijmo-open.all.2.0.0b1.min.js" type="text/javascript" charset="utf-8"></script>
336 <script src="/static/jquery/js/jquery.bgiframe-2.1.3-pre.js" type="text/javascript" charset="utf-8"></script>
337 <script src="/static/jquery/js/jquery.mousewheel.min.js" type="text/javascript" charset="utf-8"></script>
264
338
265 <script src="/static/codemirror/lib/codemirror.js" charset="utf-8"></script>
339 <script src="/static/codemirror/lib/codemirror.js" charset="utf-8"></script>
266 <script src="/static/codemirror/mode/python/python.js" charset="utf-8"></script>
340 <script src="/static/codemirror/mode/python/python.js" charset="utf-8"></script>
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (568 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (789 lines changed) Show them Hide them
General Comments 0
You need to be logged in to leave comments. Login now