Merge lp:~openerp-dev/openerp-web/trunk-web-bootstrap3-psa1 into lp:~openerp-dev/openerp-web/trunk-web-bootstrap3
- trunk-web-bootstrap3-psa1
- Merge into trunk-web-bootstrap3
Proposed by
Paramjit Singh Sahota(OpenERP)
Status: | Merged |
---|---|
Merged at revision: | 3883 |
Proposed branch: | lp:~openerp-dev/openerp-web/trunk-web-bootstrap3-psa1 |
Merge into: | lp:~openerp-dev/openerp-web/trunk-web-bootstrap3 |
Diff against target: |
602 lines (+213/-77) 6 files modified
addons/web/static/src/css/base.css (+93/-39) addons/web/static/src/css/base.sass (+60/-15) addons/web/static/src/js/chrome.js (+4/-4) addons/web/static/src/xml/base.xml (+21/-19) addons/web_calendar/static/src/css/web_calendar.css (+21/-0) addons/web_calendar/static/src/css/web_calendar.sass (+14/-0) |
To merge this branch: | bzr merge lp:~openerp-dev/openerp-web/trunk-web-bootstrap3-psa1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP R&D Team | Pending | ||
Review via email:
|
Commit message
Description of the change
Hello Sir,
Fixed the following issues:
1./ The issue of leftbar in database manager.
2./ The issue of login page footer.
3./ The issue in database manager in menu drop database and backup database.
4./ Used the bootstrap navbar instead topbar and done changes accordingly and fixed the changes were necessary.
5./ Fixed the issue of hiding of caret. Which hides when the cursor hovers it.
6./ Fixed the issue of topbar in login page.
7./ Fixed the position of timezone alert icon.
8./ Fixed the issue of size of navbar with anonymous user
9./ Fix the Day Week Month tabs position and the body part in week and month to specific height.
Thankz...
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'addons/web/static/src/css/base.css' |
2 | --- addons/web/static/src/css/base.css 2013-11-14 11:23:43 +0000 |
3 | +++ addons/web/static/src/css/base.css 2013-11-14 12:15:39 +0000 |
4 | @@ -997,7 +997,7 @@ |
5 | } |
6 | .openerp .oe_login .oe_login_footer a { |
7 | color: #eeeeee; |
8 | - margin: 0 8px; |
9 | + margin: 0 6px; |
10 | } |
11 | .openerp .oe_login .oe_login_footer a:hover { |
12 | text-decoration: underline; |
13 | @@ -1043,19 +1043,7 @@ |
14 | .openerp .oe_content_full_screen .oe_topbar, .openerp .oe_content_full_screen .oe_leftbar { |
15 | display: none; |
16 | } |
17 | -.openerp .oe_topbar { |
18 | - width: 100%; |
19 | - height: 32px; |
20 | - background-color: #414141; |
21 | - background-color: #454343; |
22 | - background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); |
23 | - background-image: -webkit-linear-gradient(top, #646060, #262626); |
24 | - background-image: -moz-linear-gradient(top, #646060, #262626); |
25 | - background-image: -ms-linear-gradient(top, #646060, #262626); |
26 | - background-image: -o-linear-gradient(top, #646060, #262626); |
27 | - background-image: linear-gradient(to bottom, #646060, #262626); |
28 | -} |
29 | -.openerp .oe_topbar .oe_topbar_anonymous_login { |
30 | +.openerp .navbar .oe_topbar_anonymous_login { |
31 | background-color: #dc5f59; |
32 | color: #eeeeee; |
33 | background-color: #be4343; |
34 | @@ -1066,11 +1054,11 @@ |
35 | background-image: -o-linear-gradient(top, #fc8787, maroon); |
36 | background-image: linear-gradient(to bottom, #fc8787, maroon); |
37 | } |
38 | -.openerp .oe_topbar .oe_topbar_anonymous_login a { |
39 | +.openerp .navbar .oe_topbar_anonymous_login a { |
40 | display: block; |
41 | padding: 5px 10px 7px; |
42 | line-height: 20px; |
43 | - height: 20px; |
44 | + height: 30px; |
45 | text-decoration: none; |
46 | color: white; |
47 | background: transparent; |
48 | @@ -1080,7 +1068,7 @@ |
49 | -o-transition: all 0.2s ease-out; |
50 | transition: all 0.2s ease-out; |
51 | } |
52 | -.openerp .oe_topbar .oe_topbar_anonymous_login a:hover { |
53 | +.openerp .navbar .oe_topbar_anonymous_login a:hover { |
54 | background: rgba(0, 0, 0, 0.1); |
55 | color: white; |
56 | text-shadow: 0px 0px 3px rgba(0, 0, 0, 0.2); |
57 | @@ -1088,9 +1076,9 @@ |
58 | -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; |
59 | box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; |
60 | } |
61 | -.openerp .oe_topbar .oe_topbar_item { |
62 | +.openerp .navbar .oe_topbar_item { |
63 | display: block; |
64 | - padding: 5px 10px 7px; |
65 | + padding: 5px 10px 26px; |
66 | line-height: 20px; |
67 | height: 20px; |
68 | text-decoration: none; |
69 | @@ -1103,7 +1091,7 @@ |
70 | -o-transition: all 0.2s ease-out; |
71 | transition: all 0.2s ease-out; |
72 | } |
73 | -.openerp .oe_topbar .oe_topbar_item:hover { |
74 | +.openerp .navbar .oe_topbar_item:hover { |
75 | background: rgba(0, 0, 0, 0.2); |
76 | text-shadow: black 0px 0px 3px; |
77 | color: white; |
78 | @@ -1111,7 +1099,7 @@ |
79 | -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; |
80 | box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; |
81 | } |
82 | -.openerp .oe_topbar .oe_topbar_avatar { |
83 | +.openerp .navbar .oe_topbar_avatar { |
84 | width: 24px; |
85 | height: 24px; |
86 | margin: -2px 2px 0 0; |
87 | @@ -1119,13 +1107,13 @@ |
88 | -webkit-border-radius: 3px; |
89 | border-radius: 3px; |
90 | } |
91 | -.openerp .oe_topbar .oe_topbar_avatar { |
92 | +.openerp .navbar .oe_topbar_avatar { |
93 | vertical-align: top; |
94 | } |
95 | -.openerp .oe_topbar .oe_dropdown_arrow:after { |
96 | +.openerp .navbar .oe_dropdown_arrow:after { |
97 | border-top: 4px solid white; |
98 | } |
99 | -.openerp .oe_topbar .oe_dropdown_menu { |
100 | +.openerp .navbar .dropdown_menu { |
101 | top: 32px; |
102 | background: #333333; |
103 | background: rgba(37, 37, 37, 0.9); |
104 | @@ -1140,14 +1128,14 @@ |
105 | -moz-background-clip: padding-box; |
106 | background-clip: padding-box; |
107 | } |
108 | -.openerp .oe_topbar .oe_dropdown_menu li { |
109 | +.openerp .navbar .dropdown_menu li { |
110 | float: none; |
111 | padding: 3px 12px; |
112 | } |
113 | -.openerp .oe_topbar .oe_dropdown_menu li a { |
114 | +.openerp .navbar .dropdown_menu li a { |
115 | color: #eeeeee; |
116 | } |
117 | -.openerp .oe_topbar .oe_dropdown_menu li:hover { |
118 | +.openerp .navbar .dropdown_menu li:hover { |
119 | background-color: #212121; |
120 | background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); |
121 | background-image: -webkit-linear-gradient(top, #292929, #191919); |
122 | @@ -1159,21 +1147,20 @@ |
123 | -webkit-box-shadow: none; |
124 | box-shadow: none; |
125 | } |
126 | -.openerp .oe_topbar .oe_topbar_name { |
127 | +.openerp .navbar .oe_topbar_name { |
128 | max-width: 150px; |
129 | - overflow: hidden; |
130 | display: inline-block; |
131 | max-height: 100%; |
132 | text-overflow: ellipsis; |
133 | white-space: nowrap; |
134 | } |
135 | -.openerp .oe_menu { |
136 | +.openerp .navbar-nav { |
137 | float: left; |
138 | padding: 0; |
139 | margin: 0; |
140 | font-size: 13px; |
141 | } |
142 | -.openerp .oe_menu > li { |
143 | +.openerp .navbar-nav > li { |
144 | list-style-type: none; |
145 | padding: 0; |
146 | margin: 0; |
147 | @@ -1181,13 +1168,13 @@ |
148 | display: block; |
149 | color: #eeeeee; |
150 | } |
151 | -.openerp .oe_menu > li > a { |
152 | +.openerp .navbar-nav > li > a { |
153 | display: block; |
154 | - padding: 5px 10px 7px; |
155 | + padding: 5px 10px 26px !important; |
156 | line-height: 20px; |
157 | height: 20px; |
158 | text-decoration: none; |
159 | - color: #eeeeee; |
160 | + color: #eeeeee !important; |
161 | vertical-align: top; |
162 | text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); |
163 | -webkit-transition: all 0.2s ease-out; |
164 | @@ -1196,7 +1183,7 @@ |
165 | -o-transition: all 0.2s ease-out; |
166 | transition: all 0.2s ease-out; |
167 | } |
168 | -.openerp .oe_menu > li > a:hover { |
169 | +.openerp .navbar-nav > li > a:hover { |
170 | background: rgba(0, 0, 0, 0.2); |
171 | text-shadow: black 0px 0px 3px; |
172 | color: white; |
173 | @@ -1204,7 +1191,7 @@ |
174 | -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; |
175 | box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; |
176 | } |
177 | -.openerp .oe_menu > li > .oe_active { |
178 | +.openerp .navbar-nav > li > .active { |
179 | background: rgba(0, 0, 0, 0.3); |
180 | text-shadow: black 0px 0px 3px; |
181 | -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset; |
182 | @@ -2298,7 +2285,7 @@ |
183 | } |
184 | .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { |
185 | font-size: 80%; |
186 | - color: darkGreen; |
187 | + color: darkgreen; |
188 | vertical-align: top; |
189 | position: relative; |
190 | top: -4px; |
191 | @@ -3443,7 +3430,6 @@ |
192 | overflow: hidden !important; |
193 | } |
194 | } |
195 | - |
196 | .nav li > a { |
197 | padding: 3px 4px 2px 18px; |
198 | color: #4c4c4c; |
199 | @@ -3476,7 +3462,12 @@ |
200 | line-height: normal; |
201 | } |
202 | |
203 | -h1, h2, h3 { |
204 | +h1, h2 { |
205 | + font-weight: bold; |
206 | +} |
207 | + |
208 | +h3 { |
209 | + font-size: 1.17em; |
210 | font-weight: bold; |
211 | } |
212 | |
213 | @@ -3502,6 +3493,69 @@ |
214 | margin-top: 0px; |
215 | } |
216 | |
217 | +.navbar { |
218 | + min-height: 32px; |
219 | + margin-bottom: 0px; |
220 | + border: none; |
221 | + background-color: #414141; |
222 | + background-color: #454343; |
223 | + background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); |
224 | + background-image: -webkit-linear-gradient(top, #646060, #262626); |
225 | + background-image: -moz-linear-gradient(top, #646060, #262626); |
226 | + background-image: -ms-linear-gradient(top, #646060, #262626); |
227 | + background-image: -o-linear-gradient(top, #646060, #262626); |
228 | + background-image: linear-gradient(to bottom, #646060, #262626); |
229 | +} |
230 | + |
231 | +.navbar-default .navbar-nav li a:hover, .navbar-default .navbar-nav li a:focus { |
232 | + background: rgba(0, 0, 0, 0.3); |
233 | +} |
234 | +.navbar-default .navbar-nav .open > a, .navbar-default .navbar-nav a:hover, .navbar-default .navbar-nav a:focus { |
235 | + background: rgba(0, 0, 0, 0.3) !important; |
236 | +} |
237 | +.navbar-default .navbar-nav .dropdown > a .caret { |
238 | + border-top-color: #777777 !important; |
239 | + border-bottom-color: #777777 !important; |
240 | +} |
241 | + |
242 | +.navbar-nav li a { |
243 | + padding: 4px 32px 4px 12px; |
244 | +} |
245 | + |
246 | +.dropdown-menu { |
247 | + font-size: 13px; |
248 | + padding: 4px 0; |
249 | + background: #333333 !important; |
250 | + background: rgba(37, 37, 37, 0.9) !important; |
251 | + border-color: #999999; |
252 | + border-color: rgba(0, 0, 0, 0.2); |
253 | + background-color: #414141; |
254 | + text-shadow: none; |
255 | + background-color: #454343; |
256 | + background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); |
257 | + background-image: -webkit-linear-gradient(top, #646060, #262626); |
258 | + background-image: -moz-linear-gradient(top, #646060, #262626); |
259 | + background-image: -ms-linear-gradient(top, #646060, #262626); |
260 | + background-image: -o-linear-gradient(top, #646060, #262626); |
261 | + background-image: linear-gradient(to bottom, #646060, #262626); |
262 | + -moz-border-radius: 3px; |
263 | + -webkit-border-radius: 3px; |
264 | + border-radius: 3px; |
265 | +} |
266 | +.dropdown-menu li a, .dropdown-menu li a:hover, .dropdown-menu li a:focus { |
267 | + color: #eeeeee; |
268 | +} |
269 | + |
270 | +.ui-icon { |
271 | + width: 18px; |
272 | + height: 18px; |
273 | +} |
274 | + |
275 | +input[type="radio"], input[type="checkbox"] { |
276 | + margin-right: 4px; |
277 | + margin-left: 4px; |
278 | +} |
279 | + |
280 | .blockUI.blockOverlay { |
281 | background-color: black; |
282 | opacity: 0.6; |
283 | |
284 | === modified file 'addons/web/static/src/css/base.sass' |
285 | --- addons/web/static/src/css/base.sass 2013-11-14 11:23:43 +0000 |
286 | +++ addons/web/static/src/css/base.sass 2013-11-14 12:15:39 +0000 |
287 | @@ -831,7 +831,7 @@ |
288 | text-align: center |
289 | a |
290 | color: #eee |
291 | - margin: 0 8px |
292 | + margin: 0 6px |
293 | &:hover |
294 | text-decoration: underline |
295 | span |
296 | @@ -874,11 +874,7 @@ |
297 | // }}} |
298 | // Top Menu {{{ |
299 | |
300 | - .oe_topbar |
301 | - width: 100% |
302 | - height: 32px |
303 | - background-color: #414141 |
304 | - @include vertical-gradient(#646060, #262626) |
305 | + .navbar |
306 | .oe_topbar_anonymous_login |
307 | background-color: #dc5f59 |
308 | color: #eeeeee |
309 | @@ -887,7 +883,7 @@ |
310 | display: block |
311 | padding: 5px 10px 7px |
312 | line-height: 20px |
313 | - height: 20px |
314 | + height: 30px |
315 | text-decoration: none |
316 | color: white |
317 | background: transparent |
318 | @@ -899,7 +895,7 @@ |
319 | @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset) |
320 | .oe_topbar_item |
321 | display: block |
322 | - padding: 5px 10px 7px |
323 | + padding: 5px 10px 26px |
324 | line-height: 20px |
325 | height: 20px |
326 | text-decoration: none |
327 | @@ -922,7 +918,7 @@ |
328 | vertical-align: top |
329 | .oe_dropdown_arrow:after |
330 | border-top: 4px solid white |
331 | - .oe_dropdown_menu |
332 | + .dropdown_menu |
333 | top: 32px |
334 | background: #333 |
335 | background: rgba(37,37,37,0.9) |
336 | @@ -942,7 +938,6 @@ |
337 | @include box-shadow(none) |
338 | .oe_topbar_name |
339 | max-width: 150px |
340 | - overflow: hidden |
341 | display: inline-block |
342 | max-height: 100% |
343 | text-overflow: ellipsis |
344 | @@ -952,7 +947,7 @@ |
345 | // So why aren't the buttons oe_topbar_items ? This sad state of affairs |
346 | // is a leftover from an uncomplete refactoring when the left and top menu |
347 | // were merged. You are welcome to refactor and clean this up |
348 | - .oe_menu |
349 | + .navbar-nav |
350 | float: left |
351 | padding: 0 |
352 | margin: 0 |
353 | @@ -966,11 +961,11 @@ |
354 | color: #eeeeee |
355 | > a |
356 | display: block |
357 | - padding: 5px 10px 7px |
358 | + padding: 5px 10px 26px !important |
359 | line-height: 20px |
360 | height: 20px |
361 | text-decoration: none |
362 | - color: #eee |
363 | + color: #eee !important |
364 | vertical-align: top |
365 | text-shadow: 0 1px 1px rgba(0,0,0,0.2) |
366 | @include transition(all 0.2s ease-out) |
367 | @@ -979,7 +974,7 @@ |
368 | text-shadow: black 0px 0px 3px |
369 | color: white |
370 | @include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset) |
371 | - > .oe_active |
372 | + > .active |
373 | background: rgba(0,0,0,0.30) |
374 | text-shadow: black 0px 0px 3px |
375 | @include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset) |
376 | @@ -2764,7 +2759,10 @@ |
377 | // Customize for global tags |
378 | button, body |
379 | line-height: normal |
380 | -h1,h2,h3 |
381 | +h1,h2 |
382 | + font-weight: bold |
383 | +h3 |
384 | + font-size: 1.17em |
385 | font-weight: bold |
386 | // End of customize |
387 | |
388 | @@ -2789,6 +2787,53 @@ |
389 | margin-top: 0px |
390 | // End of customize |
391 | |
392 | +// navbar hack {{{ |
393 | +.navbar |
394 | + min-height: 32px |
395 | + margin-bottom: 0px |
396 | + border: none |
397 | + background-color: #414141 |
398 | + @include vertical-gradient(#646060, #262626) |
399 | +.navbar-default |
400 | + .navbar-nav |
401 | + li |
402 | + a:hover,a:focus |
403 | + background: rgba(0, 0, 0, 0.3) |
404 | + .open > a,a:hover,a:focus |
405 | + background: rgba(0, 0, 0, 0.3) !important |
406 | + .dropdown > a .caret |
407 | + border-top-color: #777 !important |
408 | + border-bottom-color: #777 !important |
409 | +.navbar-nav |
410 | + li |
411 | + a |
412 | + padding: 4px 32px 4px 12px |
413 | +.dropdown-menu |
414 | + font-size: 13px |
415 | + padding: 4px 0 |
416 | + background: #333333 !important |
417 | + background: rgba(37, 37, 37, 0.9) !important |
418 | + border-color: #999999 |
419 | + border-color: rgba(0, 0, 0, 0.2) |
420 | + background-color: #414141 |
421 | + text-shadow: none |
422 | + @include vertical-gradient(#646060, #262626) |
423 | + @include radius(3px) |
424 | + li |
425 | + a,a:hover,a:focus |
426 | + color: #eeeeee |
427 | +// End hack }}} |
428 | + |
429 | +// Hack for ui icon {{{ |
430 | +.ui-icon |
431 | + width: 18px |
432 | + height: 18px |
433 | +// End hack}}} |
434 | + |
435 | +input[type="radio"], input[type="checkbox"] |
436 | + margin-right: 4px |
437 | + margin-left: 4px |
438 | + |
439 | .blockUI.blockOverlay |
440 | background-color: black |
441 | opacity: 0.6000000238418579 |
442 | |
443 | === modified file 'addons/web/static/src/js/chrome.js' |
444 | --- addons/web/static/src/js/chrome.js 2013-11-07 12:10:25 +0000 |
445 | +++ addons/web/static/src/js/chrome.js 2013-11-14 12:15:39 +0000 |
446 | @@ -982,8 +982,8 @@ |
447 | reflow: function() { |
448 | var self = this; |
449 | this.$el.height('auto').show(); |
450 | - var $more_container = this.$('.oe_menu_more_container').hide(); |
451 | - var $more = this.$('.oe_menu_more'); |
452 | + var $more_container = this.$('#menu_more_container').hide(); |
453 | + var $more = this.$('#menu_more'); |
454 | $more.children('li').insertBefore($more_container); |
455 | var $toplevel_items = this.$el.children('li').not($more_container).hide(); |
456 | $toplevel_items.each(function() { |
457 | @@ -1143,7 +1143,7 @@ |
458 | start: function() { |
459 | var self = this; |
460 | this._super.apply(this, arguments); |
461 | - this.$el.on('click', '.oe_dropdown_menu li a[data-menu]', function(ev) { |
462 | + this.$el.on('click', '.dropdown-menu li a[data-menu]', function(ev) { |
463 | ev.preventDefault(); |
464 | var f = self['on_menu_' + $(this).data('menu')]; |
465 | if (f) { |
466 | @@ -1284,7 +1284,7 @@ |
467 | self.action_manager.appendTo(self.$('.oe_application')); |
468 | }, |
469 | toggle_bars: function(value) { |
470 | - this.$('tr:has(td.oe_topbar),.oe_leftbar').toggle(value); |
471 | + this.$('tr:has(td.navbar),.oe_leftbar').toggle(value); |
472 | }, |
473 | has_uncommitted_changes: function() { |
474 | return false; |
475 | |
476 | === modified file 'addons/web/static/src/xml/base.xml' |
477 | --- addons/web/static/src/xml/base.xml 2013-11-07 12:10:25 +0000 |
478 | +++ addons/web/static/src/xml/base.xml 2013-11-14 12:15:39 +0000 |
479 | @@ -320,7 +320,7 @@ |
480 | </t> |
481 | <t t-name="DatabaseManager.menu"> |
482 | <div class="oe_secondary_menu_section">Database Management</div> |
483 | - <ul class="oe_secondary_submenu"> |
484 | + <ul class="oe_secondary_submenu nav nav-pills nav-stacked"> |
485 | <li><a href="#db_create">Create</a></li> |
486 | <li><a href="#db_duplicate">Duplicate</a></li> |
487 | <li><a href="#db_drop">Drop</a></li> |
488 | @@ -362,15 +362,13 @@ |
489 | </t> |
490 | |
491 | <t t-name="Menu"> |
492 | - <ul class="oe_menu" t-if="widget.data"> |
493 | + <ul class="nav navbar-nav navbar-left" t-if="widget.data"> |
494 | <li t-foreach="widget.data.data.children" t-as="menu"> |
495 | <t t-call="Menu.link"/> |
496 | </li> |
497 | - <li class="oe_menu_more_container" style="display: none;"> |
498 | - <span class="oe_topbar_item oe_menu_more_link oe_dropdown_toggle oe_dropdown_arrow"> |
499 | - More |
500 | - <ul class="oe_menu_more oe_dropdown_menu"/> |
501 | - </span> |
502 | + <li id="menu_more_container" class="dropdown" style="display: none;"> |
503 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a> |
504 | + <ul id="menu_more" class="dropdown-menu"></ul> |
505 | </li> |
506 | </ul> |
507 | </t> |
508 | @@ -417,17 +415,21 @@ |
509 | </t> |
510 | |
511 | <t t-name="UserMenu"> |
512 | - <span class="oe_user_menu oe_topbar_item oe_dropdown_toggle oe_dropdown_arrow"> |
513 | - <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/> |
514 | - <span class="oe_topbar_name"/> |
515 | - <ul class="oe_dropdown_menu"> |
516 | - <li><a href="#" data-menu="settings">Preferences</a></li> |
517 | - <li><a href="#" data-menu="account">My OpenERP.com account</a></li> |
518 | - <li><a href="#" data-menu="about">About OpenERP</a></li> |
519 | - <li><a href="#" data-menu="help">Help</a></li> |
520 | - <li><a href="#" data-menu="logout">Log out</a></li> |
521 | - </ul> |
522 | - </span> |
523 | + <ul class="nav navbar-nav navbar-right"> |
524 | + <li class="dropdown"> |
525 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> |
526 | + <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/> |
527 | + <span class="oe_topbar_name"/> <b class="caret"></b> |
528 | + </a> |
529 | + <ul class="dropdown-menu"> |
530 | + <li><a href="#" data-menu="settings">Preferences</a></li> |
531 | + <li><a href="#" data-menu="account">My OpenERP.com account</a></li> |
532 | + <li><a href="#" data-menu="about">About OpenERP</a></li> |
533 | + <li><a href="#" data-menu="help">Help</a></li> |
534 | + <li><a href="#" data-menu="logout">Log out</a></li> |
535 | + </ul> |
536 | + </li> |
537 | + </ul> |
538 | </t> |
539 | <t t-name="UserMenu.about"> |
540 | |
541 | @@ -450,7 +452,7 @@ |
542 | <div class="openerp openerp_webclient_container"> |
543 | <table class="oe_webclient"> |
544 | <tr> |
545 | - <td colspan="2" class="oe_topbar"> |
546 | + <td colspan="2" class="navbar navbar-default navbar-static-top" role="navigation"> |
547 | <div class="oe_menu_placeholder"/> |
548 | <div class="oe_user_menu_placeholder"/> |
549 | <div class="oe_systray"/> |
550 | |
551 | === modified file 'addons/web_calendar/static/src/css/web_calendar.css' |
552 | --- addons/web_calendar/static/src/css/web_calendar.css 2013-01-23 10:03:22 +0000 |
553 | +++ addons/web_calendar/static/src/css/web_calendar.css 2013-11-14 12:15:39 +0000 |
554 | @@ -24,3 +24,24 @@ |
555 | .openerp .oe_calendar.oe_cal_month .dhx_cal_data table tr td:last-child div.dhx_month_body { |
556 | padding-right: 5px; |
557 | } |
558 | + |
559 | +.dhx_cal_tab { |
560 | + height: 18px; |
561 | +} |
562 | + |
563 | +.dhx_cal_tab.active { |
564 | + height: 20px; |
565 | +} |
566 | + |
567 | +.dhx_cal_today_button { |
568 | + height: 20px; |
569 | +} |
570 | + |
571 | +.dhx_cal_event .dhx_body { |
572 | + width: auto !important; |
573 | + height: 28px !important; |
574 | +} |
575 | + |
576 | +.dhx_scale_hour { |
577 | + height: 42px !important; |
578 | +} |
579 | |
580 | === modified file 'addons/web_calendar/static/src/css/web_calendar.sass' |
581 | --- addons/web_calendar/static/src/css/web_calendar.sass 2013-01-23 10:03:22 +0000 |
582 | +++ addons/web_calendar/static/src/css/web_calendar.sass 2013-11-14 12:15:39 +0000 |
583 | @@ -31,5 +31,19 @@ |
584 | table tr td:last-child div.dhx_month_body |
585 | padding-right: 5px |
586 | |
587 | +// Hack for calender {{{ |
588 | +.dhx_cal_tab |
589 | + height: 18px |
590 | +.dhx_cal_tab.active |
591 | + height: 20px |
592 | +.dhx_cal_today_button |
593 | + height: 20px |
594 | +.dhx_cal_event .dhx_body |
595 | + width: auto !important |
596 | + height: 28px !important |
597 | +.dhx_scale_hour |
598 | + height: 42px !important |
599 | +// End hack }}} |
600 | + |
601 | // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css" |
602 | // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: |