Merge lp:~openerp-dev/openerp-web/trunk-fontawsome into lp:openerp-web
- trunk-fontawsome
- Merge into trunk
Proposed by
Ishwar Malvi(OpenERP)
Status: | Needs review |
---|---|
Proposed branch: | lp:~openerp-dev/openerp-web/trunk-fontawsome |
Merge into: | lp:openerp-web |
Diff against target: |
736 lines (+126/-117) 9 files modified
addons/web/static/src/css/base.css (+30/-38) addons/web/static/src/css/base.sass (+41/-40) addons/web/static/src/js/search.js (+6/-6) addons/web/static/src/xml/base.xml (+14/-15) addons/web/static/test/search.js (+2/-2) addons/web_graph/static/src/xml/web_graph.xml (+1/-1) addons/web_kanban/static/src/css/kanban.css (+13/-5) addons/web_kanban/static/src/css/kanban.sass (+17/-8) addons/web_kanban/static/src/xml/web_kanban.xml (+2/-2) |
To merge this branch: | bzr merge lp:~openerp-dev/openerp-web/trunk-fontawsome |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP R&D Web Team | Pending | ||
Review via email: mp+199072@code.launchpad.net |
Commit message
Description of the change
Hello,
i have applied fontawesome icons and replaced .oe_i, .oe_e with fontawesome class .fa.
Thanks,
Ishwar Malvi(ima)
To post a comment you must log in.
Unmerged revisions
- 3907. By Ishwar Malvi(OpenERP)
-
[IMP]improved code formview icon, star icon and kanban dropdown icon.
- 3906. By Ishwar Malvi(OpenERP)
-
[MERGE]with trunk.
- 3905. By Ishwar Malvi(OpenERP)
-
[IMP]improved message for search test case.
- 3904. By Ishwar Malvi(OpenERP)
-
[IMP]improved code for search view and search test case.
- 3903. By Ishwar Malvi(OpenERP)
-
[IMP]improved code for search view and attach file button.
- 3902. By Ishwar Malvi(OpenERP)
-
[MERGE]with trunk.
- 3901. By Ishwar Malvi(OpenERP)
-
[IMP]improved code for search view to select filter and group.
- 3900. By Ishwar Malvi(OpenERP)
-
[IMP]improved code to replace .oe_e to .fa and also for searchview.
- 3899. By Ishwar Malvi(OpenERP)
-
[MERGE]with trunk.
- 3898. By Ishwar Malvi(OpenERP)
-
[IMP]improved code for kanban, graphview and attach file icon.
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-12-02 13:19:43 +0000 |
3 | +++ addons/web/static/src/css/base.css 2013-12-16 05:51:14 +0000 |
4 | @@ -341,16 +341,6 @@ |
5 | filter: alpha(opacity=30); |
6 | opacity: 0.3; |
7 | } |
8 | -.openerp .oe_i { |
9 | - font-family: "mnmliconsRegular" !important; |
10 | - font-size: 21px; |
11 | - font-weight: 300 !important; |
12 | -} |
13 | -.openerp .oe_e { |
14 | - font-family: "entypoRegular" !important; |
15 | - font-size: 34px; |
16 | - font-weight: 300 !important; |
17 | -} |
18 | .openerp .oe_left { |
19 | float: left; |
20 | margin-right: 8px; |
21 | @@ -519,7 +509,6 @@ |
22 | text-shadow: 0 0 2px black; |
23 | vertical-align: top; |
24 | position: relative; |
25 | - top: -5px; |
26 | } |
27 | .openerp .oe_webclient .oe_star_on:hover, .openerp .oe_webclient .oe_star_off:hover { |
28 | text-decoration: none; |
29 | @@ -1482,18 +1471,15 @@ |
30 | } |
31 | .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_list:after, .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_tree:after { |
32 | padding: 2px; |
33 | - content: "i"; |
34 | + content: "\f0c9"; |
35 | } |
36 | .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_form:after { |
37 | - content: "m"; |
38 | + content: "\f096"; |
39 | + font-size: 17px; |
40 | + font-weight: bold; |
41 | } |
42 | .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_graph:after { |
43 | - font-family: "mnmliconsRegular" !important; |
44 | - font-size: 21px; |
45 | - font-weight: 300 !important; |
46 | - content: "}"; |
47 | - top: -2px; |
48 | - position: relative; |
49 | + content: "\f080"; |
50 | } |
51 | .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_gantt:after { |
52 | font-family: "mnmliconsRegular" !important; |
53 | @@ -1504,10 +1490,10 @@ |
54 | position: relative; |
55 | } |
56 | .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_calendar:after { |
57 | - content: "P"; |
58 | + content: "\f133"; |
59 | } |
60 | .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_kanban:after { |
61 | - content: "k"; |
62 | + content: "\f009"; |
63 | } |
64 | .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_diagram:after { |
65 | content: "f"; |
66 | @@ -1752,8 +1738,9 @@ |
67 | color: white; |
68 | text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); |
69 | } |
70 | -.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category.oe_i { |
71 | - font-size: 16px; |
72 | +.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_category.fa { |
73 | + font-size: 13px; |
74 | + margin-top: -4px; |
75 | } |
76 | .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_value { |
77 | border-left: 1px solid #afafb6; |
78 | @@ -1875,14 +1862,11 @@ |
79 | position: relative; |
80 | } |
81 | .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section li.oe_selected:before { |
82 | - content: "W"; |
83 | - font-family: "entypoRegular" !important; |
84 | - font-size: 24px; |
85 | - font-weight: 300 !important; |
86 | + font-family: "FontAwesome" !important; |
87 | + content: "\f00c"; |
88 | color: #a3a3a3; |
89 | position: absolute; |
90 | left: 4px; |
91 | - top: -2px; |
92 | } |
93 | .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section li:hover { |
94 | background-color: #f0f0fa; |
95 | @@ -2576,10 +2560,11 @@ |
96 | border: none; |
97 | text-shadow: none; |
98 | } |
99 | -.openerp .oe_fileupload .oe_add button.oe_attach .oe_e { |
100 | +.openerp .oe_fileupload .oe_add button.oe_attach .fa { |
101 | position: relative; |
102 | - top: -1px; |
103 | - left: -9px; |
104 | + top: -4px; |
105 | + left: -4px; |
106 | + font-size: 20px; |
107 | } |
108 | .openerp .oe_fileupload .oe_add input.oe_form_binary_file { |
109 | display: inline-block; |
110 | @@ -2591,7 +2576,7 @@ |
111 | } |
112 | .openerp .oe_fileupload .oe_add .oe_attach_label { |
113 | color: #7c7bad; |
114 | - margin-left: -3px; |
115 | + margin-left: -1px; |
116 | } |
117 | .openerp .oe_fileupload .oe_attachments { |
118 | margin-bottom: 4px; |
119 | @@ -2605,11 +2590,11 @@ |
120 | padding-left: 4px; |
121 | padding-right: 4px; |
122 | } |
123 | -.openerp .oe_fileupload .oe_attachments .oe_attachment .oe_e { |
124 | +.openerp .oe_fileupload .oe_attachments .oe_attachment .fa { |
125 | font-size: 23px; |
126 | margin-top: -5px; |
127 | } |
128 | -.openerp .oe_fileupload .oe_attachments .oe_attachment .oe_e:hover { |
129 | +.openerp .oe_fileupload .oe_attachments .oe_attachment .fa:hover { |
130 | text-decoration: none; |
131 | } |
132 | .openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(odd) { |
133 | @@ -2829,9 +2814,6 @@ |
134 | padding: 0px 8px; |
135 | line-height: 16px; |
136 | } |
137 | -.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_i, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td .oe_i { |
138 | - font-size: 13px; |
139 | -} |
140 | .openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group { |
141 | height: auto; |
142 | line-height: 16px; |
143 | @@ -3407,7 +3389,7 @@ |
144 | .openerp .tree_header button, .openerp .oe_mail .oe_mail_thread_msg .oe_mail_unread, .openerp .oe_mail_fetch_more, .openerp .oe_m2o_drop_down_button img, .openerp .oe_form_field_one2many_list_row_add { |
145 | visibility: hidden; |
146 | } |
147 | - .openerp a.oe_m2o_cm_button, .openerp a.oe_e { |
148 | + .openerp a.oe_m2o_cm_button, .openerp a.fa { |
149 | visibility: hidden; |
150 | } |
151 | .openerp .oe_form .oe_form_field_date img, .openerp .oe_form .oe_form_field_datetime img { |
152 | @@ -3574,6 +3556,16 @@ |
153 | height: 18px; |
154 | } |
155 | |
156 | +.fa { |
157 | + padding-top: 5px !important; |
158 | + font-family: FontAwesome !important; |
159 | +} |
160 | + |
161 | +.fa-star { |
162 | + font-size: 15px; |
163 | + padding-top: 4px; |
164 | +} |
165 | + |
166 | input[type="radio"], input[type="checkbox"] { |
167 | margin-right: 4px; |
168 | margin-left: 4px; |
169 | |
170 | === modified file 'addons/web/static/src/css/base.sass' |
171 | --- addons/web/static/src/css/base.sass 2013-12-02 13:19:43 +0000 |
172 | +++ addons/web/static/src/css/base.sass 2013-12-16 05:51:14 +0000 |
173 | @@ -362,14 +362,6 @@ |
174 | |
175 | // }}} |
176 | // Generic classes {{{ |
177 | - .oe_i |
178 | - font-family: "mnmliconsRegular" !important |
179 | - font-size: 21px |
180 | - font-weight: 300 !important |
181 | - .oe_e |
182 | - font-family: "entypoRegular" !important |
183 | - font-size: 34px |
184 | - font-weight: 300 !important |
185 | .oe_left |
186 | float: left |
187 | margin-right: 8px |
188 | @@ -462,7 +454,6 @@ |
189 | text-shadow: 0 0 2px black |
190 | vertical-align: top |
191 | position: relative |
192 | - top: -5px |
193 | .oe_star_on:hover, .oe_star_off:hover |
194 | text-decoration: none |
195 | .oe_star_on |
196 | @@ -472,7 +463,7 @@ |
197 | .oe_grey |
198 | color: #aaa |
199 | // Added for generic error message and customize bootstrap3 <pre>,<hr> |
200 | - .oe_error_detail |
201 | + .oe_error_detail |
202 | hr |
203 | display: block |
204 | -webkit-margin-before: 0.5em |
205 | @@ -605,7 +596,7 @@ |
206 | //Customize label weight according bootstrap3 |
207 | > label:not([for]) |
208 | font-weight: normal !important |
209 | - // End of customize |
210 | + // End of customize |
211 | div.ui-tabs |
212 | padding: 3px 0px 3px 0px |
213 | .ui-tabs-hide |
214 | @@ -1207,16 +1198,14 @@ |
215 | position: relative |
216 | .oe_vm_switch_list:after, .oe_vm_switch_tree:after |
217 | padding: 2px |
218 | - content: "i" |
219 | + content: "\f0c9" // customize according FontAwesome |
220 | .oe_vm_switch_form:after |
221 | - content: "m" |
222 | + // customize according FontAwesome |
223 | + content: "\f096" |
224 | + font-size: 17px |
225 | + font-weight: bold |
226 | .oe_vm_switch_graph:after |
227 | - font-family: "mnmliconsRegular" !important |
228 | - font-size: 21px |
229 | - font-weight: 300 !important |
230 | - content: "}" |
231 | - top: -2px |
232 | - position: relative |
233 | + content: "\f080" // customize according FontAwesome and replace piechart icon to barchart due to absence of piechart icon |
234 | .oe_vm_switch_gantt:after |
235 | font-family: "mnmliconsRegular" !important |
236 | font-size: 21px |
237 | @@ -1225,9 +1214,9 @@ |
238 | top: -2px |
239 | position: relative |
240 | .oe_vm_switch_calendar:after |
241 | - content: "P" |
242 | + content: "\f133" // customize according FontAwesome |
243 | .oe_vm_switch_kanban:after |
244 | - content: "k" |
245 | + content: "\f009" // customize according FontAwesome |
246 | .oe_vm_switch_diagram:after |
247 | content: "f" |
248 | // }}} |
249 | @@ -1293,7 +1282,7 @@ |
250 | display: none |
251 | // }}} |
252 | // FormPopup {{{ |
253 | - .oe_popup_form |
254 | + .oe_popup_form |
255 | .oe_formview .oe_form_pager |
256 | display: none !important |
257 | // Customize label weight for popup wizard appear from another wizard according bootstrap3 |
258 | @@ -1327,7 +1316,7 @@ |
259 | input[type="checkbox"] |
260 | margin: 3px 3px 3px 4px |
261 | select |
262 | - margin: 2px 4px 2px 0 |
263 | + margin: 2px 4px 2px 0 |
264 | //End of customize |
265 | &.oe_focused |
266 | border-color: $tag-border-selected |
267 | @@ -1412,8 +1401,11 @@ |
268 | .oe_facet_category |
269 | color: white |
270 | text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) |
271 | - .oe_facet_category.oe_i |
272 | - font-size: 16px |
273 | + // Customize for search view filter and group icon according FontAwesome |
274 | + .oe_facet_category.fa |
275 | + font-size: 13px |
276 | + margin-top: -4px |
277 | + // End of customize |
278 | .oe_facet_value |
279 | border-left: 1px solid $tag-border |
280 | text-shadow: 0 1px 1px white |
281 | @@ -1506,14 +1498,13 @@ |
282 | cursor: pointer |
283 | position: relative |
284 | &.oe_selected:before |
285 | - content: "W" |
286 | - font-family: "entypoRegular" !important |
287 | - font-size: 24px |
288 | - font-weight: 300 !important |
289 | + // customize according FontAwesome |
290 | + font-family: "FontAwesome" !important |
291 | + content: "\f00c" |
292 | + // End of customize |
293 | color: #a3a3a3 |
294 | position: absolute |
295 | left: 4px |
296 | - top: -2px |
297 | // after oe_selected so background color is not overridden |
298 | &:hover |
299 | background-color: $hover-background |
300 | @@ -2075,10 +2066,13 @@ |
301 | box-shadow: none |
302 | border: none |
303 | text-shadow: none |
304 | - .oe_e |
305 | + // Customize .oe_e to .fa according FontAwesome |
306 | + .fa |
307 | position: relative |
308 | - top: -1px |
309 | - left: -9px |
310 | + top: -4px |
311 | + left: -4px |
312 | + font-size: 20px |
313 | + // End of customize |
314 | input.oe_form_binary_file |
315 | display: inline-block |
316 | margin-left: -85px |
317 | @@ -2088,7 +2082,7 @@ |
318 | cursor: pointer |
319 | .oe_attach_label |
320 | color: #7C7BAD |
321 | - margin-left: -3px |
322 | + margin-left: -1px |
323 | .oe_attachments |
324 | margin-bottom: 4px |
325 | margin-right: 0px |
326 | @@ -2099,10 +2093,10 @@ |
327 | padding: 2px |
328 | padding-left: 4px |
329 | padding-right: 4px |
330 | - .oe_e |
331 | + .fa |
332 | font-size: 23px |
333 | margin-top: -5px |
334 | - .oe_e:hover |
335 | + .fa:hover |
336 | text-decoration: none |
337 | .oe_attachment:nth-child(odd) |
338 | background: white |
339 | @@ -2253,8 +2247,6 @@ |
340 | td |
341 | padding: 0px 8px |
342 | line-height: 16px |
343 | - .oe_i |
344 | - font-size: 13px |
345 | .oe_pager_group |
346 | height: auto |
347 | line-height: 16px |
348 | @@ -2687,7 +2679,7 @@ |
349 | filter: alpha(opacity = 0) |
350 | border: none |
351 | width: 0 |
352 | - border-right: none |
353 | + border-right: none |
354 | > .label |
355 | border-bottom: 1px solid #cacaca |
356 | background: transparent |
357 | @@ -2717,7 +2709,7 @@ |
358 | .tree_header button, .oe_mail .oe_mail_thread_msg .oe_mail_unread, .oe_mail_fetch_more, .oe_m2o_drop_down_button img, .oe_form_field_one2many_list_row_add |
359 | visibility: hidden |
360 | a |
361 | - &.oe_m2o_cm_button, &.oe_e |
362 | + &.oe_m2o_cm_button, &.fa |
363 | visibility: hidden |
364 | .oe_form |
365 | .oe_form_field_date img, .oe_form_field_datetime img |
366 | @@ -2851,6 +2843,15 @@ |
367 | height: 18px |
368 | // End hack}}} |
369 | |
370 | + |
371 | +//Customize global tags for FontAwesome |
372 | +.fa |
373 | + padding-top: 5px !important |
374 | + font-family: FontAwesome !important |
375 | +.fa-star |
376 | + font-size: 15px |
377 | + padding-top: 4px |
378 | +//End of customize |
379 | input[type="radio"], input[type="checkbox"] |
380 | margin-right: 4px |
381 | margin-left: 4px |
382 | |
383 | === modified file 'addons/web/static/src/js/search.js' |
384 | --- addons/web/static/src/js/search.js 2013-12-13 09:35:42 +0000 |
385 | +++ addons/web/static/src/js/search.js 2013-12-16 05:51:14 +0000 |
386 | @@ -632,7 +632,7 @@ |
387 | make_widgets: function (items, fields, group) { |
388 | if (!group) { |
389 | group = new instance.web.search.Group( |
390 | - this, 'q', {attrs: {string: _t("Filters")}}); |
391 | + this, 'fa-filter', {attrs: {string: _t("Filters")}}); |
392 | } |
393 | var self = this; |
394 | var filters = []; |
395 | @@ -650,7 +650,7 @@ |
396 | break; |
397 | case 'group': |
398 | self.make_widgets(item.children, fields, |
399 | - new instance.web.search.Group(group, 'w', item)); |
400 | + new instance.web.search.Group(group, 'fa-stack-exchange', item)); |
401 | break; |
402 | case 'field': |
403 | var field = this.make_field( |
404 | @@ -1039,7 +1039,7 @@ |
405 | }); |
406 | instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends instance.web.search.FilterGroup# */{ |
407 | template: 'SearchView.filters', |
408 | - icon: 'q', |
409 | + icon: 'fa-filter', |
410 | completion_label: _lt("Filter on: %s"), |
411 | /** |
412 | * Inclusive group of filters, creates a continuous "button" with clickable |
413 | @@ -1207,7 +1207,7 @@ |
414 | } |
415 | }); |
416 | instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({ |
417 | - icon: 'w', |
418 | + icon: 'fa-stack-exchange', |
419 | completion_label: _lt("Group by: %s"), |
420 | init: function (filters, parent) { |
421 | this._super(filters, parent); |
422 | @@ -1683,7 +1683,7 @@ |
423 | facet_for: function (filter) { |
424 | return { |
425 | category: _t("Custom Filter"), |
426 | - icon: 'M', |
427 | + icon: 'fa-star', |
428 | field: { |
429 | get_context: function () { return filter.context; }, |
430 | get_groupby: function () { return [filter.context]; }, |
431 | @@ -1819,7 +1819,7 @@ |
432 | var col1 = [], col2 = visible_filters.map(function (group) { |
433 | var filters = _(group.children).filter(is_group); |
434 | return { |
435 | - name: _.str.sprintf("<span class='oe_i'>%s</span> %s", |
436 | + name: _.str.sprintf("<span class='fa %s'></span> %s", |
437 | group.icon, group.name), |
438 | filters: filters, |
439 | length: _(filters).chain().map(function (i) { |
440 | |
441 | === modified file 'addons/web/static/src/xml/base.xml' |
442 | --- addons/web/static/src/xml/base.xml 2013-12-02 13:19:43 +0000 |
443 | +++ addons/web/static/src/xml/base.xml 2013-12-16 05:51:14 +0000 |
444 | @@ -26,7 +26,7 @@ |
445 | </div> |
446 | </t> |
447 | <t t-name="Tipsy.alert"> |
448 | - <a class="oe_tooltip_close oe_e">[</a> |
449 | + <a class="oe_tooltip_close fa">[</a> |
450 | <span style="float:left; margin:2px 5px 0 0;" class="ui-icon ui-icon-alert ui-state-error"></span> |
451 | <div class="oe_tooltip_message"> |
452 | <t t-esc="message"/> |
453 | @@ -131,7 +131,7 @@ |
454 | <tr> |
455 | <td><label for="db_name">Select a database name:</label></td> |
456 | <td> |
457 | - <input type="text" name="db_name" class="required" matches="^[a-zA-Z0-9][a-zA-Z0-9_-]+$" autofocus="true" placeholder="e.g. mycompany"/> |
458 | + <input type="text" name="db_name" class="required" matches="^[a-zA-Z0-9][a-zA-Z0-9_-]+$" autofocus="true" placeholder="e.g. mycompany"/> |
459 | </td> |
460 | </tr> |
461 | <tr> |
462 | @@ -529,7 +529,7 @@ |
463 | <td> |
464 | <ul class="oe_view_manager_switch oe_button_group oe_right"> |
465 | <t t-if="widget.views_src.length > 1" t-foreach="widget.views_src" t-as="view"> |
466 | - <li class="oe_e"> |
467 | + <li class="fa"> |
468 | <a t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" |
469 | t-att-title="view.button_label"/> |
470 | </li> |
471 | @@ -606,10 +606,10 @@ |
472 | </button> |
473 | --> |
474 | <li> |
475 | - <a class="oe_i" type="button" data-pager-action="previous">(</a> |
476 | + <a class="fa fa-arrow-left" type="button" data-pager-action="previous"></a> |
477 | </li> |
478 | <li> |
479 | - <a class="oe_i" type="button" data-pager-action="next">)</a> |
480 | + <a class="fa fa-arrow-right" type="button" data-pager-action="next"></a> |
481 | </li> |
482 | <!-- |
483 | <button class="oe_button oe_button_pager" type="button" data-pager-action="last"> |
484 | @@ -790,7 +790,7 @@ |
485 | ><t t-raw="render_cell(record, column)"/></td> |
486 | </t> |
487 | <td t-if="options.deletable" class='oe_list_record_delete' width="13px"> |
488 | - <button type="button" name="delete" class="oe_i">d</button> |
489 | + <button type="button" name="delete" class="fa fa-trash-o"></button> |
490 | </td> |
491 | </tr> |
492 | <t t-extend="ListView.buttons"> |
493 | @@ -1065,7 +1065,7 @@ |
494 | ></textarea><img class="oe_field_translate oe_input_icon" |
495 | t-if="widget.field.translate and !widget.get('effective_readonly')" |
496 | t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0" |
497 | - /> |
498 | + /> |
499 | </t> |
500 | <t t-if="widget.get('effective_readonly')"> |
501 | <span class="oe_form_text_content"></span> |
502 | @@ -1153,7 +1153,7 @@ |
503 | </t> |
504 | <t t-if="!widget.get('effective_readonly')"> |
505 | <a t-if="! widget.options.no_open" href="#" tabindex="-1" |
506 | - class="oe_m2o_cm_button oe_e" draggable="false">/</a> |
507 | + class="oe_m2o_cm_button fa fa-share-square-o" draggable="false"></a> |
508 | <div> |
509 | <input type="text" |
510 | t-att-id="widget.id_for_label" |
511 | @@ -1248,7 +1248,7 @@ |
512 | <div class="oe_form_field_image_controls oe_edit_only"> |
513 | <t t-call="HiddenInputFile"> |
514 | <t t-set="fileupload_id" t-value="widget.fileupload_id"/> |
515 | - Edit |
516 | + Edit |
517 | </t> |
518 | <div class="oe_form_binary_progress" style="display: none"> |
519 | <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/> |
520 | @@ -1347,7 +1347,7 @@ |
521 | <t t-raw="file.name || file.filename"/> |
522 | </a> |
523 | <t t-if="(!file.upload or file.percent_loaded>=100)"> |
524 | - <a class="oe_right oe_delete oe_e" title="Delete this file" t-attf-data-id="{file.id}">[</a> |
525 | + <a class="oe_right oe_delete fa" title="Delete this file" t-attf-data-id="{file.id}">[</a> |
526 | </t> |
527 | </div> |
528 | </t> |
529 | @@ -1369,7 +1369,7 @@ |
530 | <div class="oe_placeholder_files"/> |
531 | <div class="oe_add" t-if="!widget.get('effective_readonly')"> |
532 | <!-- uploader of file --> |
533 | - <button class="oe_attach"><span class="oe_e">'</span></button> |
534 | + <button class="oe_attach"><span class="fa fa-paperclip"></span></button> |
535 | <span class='oe_attach_label'><t t-esc="widget.string"/></span> |
536 | <t t-call="HiddenInputFile"> |
537 | <t t-set="fileupload_id" t-value="widget.fileupload_id"/> |
538 | @@ -1514,9 +1514,8 @@ |
539 | class="oe_tag oe_tag_dark oe_searchview_facet" |
540 | tabindex="0" |
541 | ><span class="oe_facet_remove">x</span |
542 | - ><span class="oe_facet_category oe_i" t-if="widget.model.has('icon')"> |
543 | - <t t-esc="widget.model.get('icon')"/> |
544 | - </span |
545 | + ><span class="oe_facet_category fa" t-if="widget.model.has('icon')"> |
546 | + <span t-att-class="widget.model.get('icon')"></span></span |
547 | ><span class="oe_facet_category" t-if="!widget.model.has('icon')"> |
548 | <t t-esc="widget.model.get('category')"/> |
549 | </span ><span class="oe_facet_values" |
550 | @@ -1663,7 +1662,7 @@ |
551 | </div> |
552 | <div t-name="SearchView.CustomFilters" class="oe_searchview_custom oe_searchview_section"> |
553 | <div> |
554 | - <h3><span class="oe_i">M</span> Custom Filters</h3> |
555 | + <h3><span class="fa fa-star"> </span> Custom Filters</h3> |
556 | <ul class="oe_searchview_custom_list"/> |
557 | <div class="oe_searchview_custom"> |
558 | <h4>Save current filter</h4> |
559 | |
560 | === modified file 'addons/web/static/test/search.js' |
561 | --- addons/web/static/test/search.js 2013-11-07 11:12:31 +0000 |
562 | +++ addons/web/static/test/search.js 2013-12-16 05:51:14 +0000 |
563 | @@ -1523,8 +1523,8 @@ |
564 | 1, |
565 | "should only display one group"); |
566 | strictEqual($fix.find('.oe_searchview_filters h3').text(), |
567 | - 'w Visibles', |
568 | - "should only display the Visibles group (and its icon char)"); |
569 | + ' Visibles', |
570 | + "should only display the Visibles group"); |
571 | |
572 | var $fs = $fix.find('.oe_searchview_filters ul'); |
573 | strictEqual($fs.children().length, 1, |
574 | |
575 | === modified file 'addons/web_graph/static/src/xml/web_graph.xml' |
576 | --- addons/web_graph/static/src/xml/web_graph.xml 2012-09-04 16:42:41 +0000 |
577 | +++ addons/web_graph/static/src/xml/web_graph.xml 2013-12-16 05:51:14 +0000 |
578 | @@ -1,6 +1,6 @@ |
579 | <template> |
580 | <div t-name="GraphView" id="element-chart" class="oe_semantic_html_override editor-render" style="position:relative; width: 300px;"> |
581 | - <a href="#" class="oe_e dropdown-menu-icon" data-toggle="dropdown" title="Graph Options">&iacute;</a> |
582 | + <a href="#" class="fa fa-arrow-circle-o-down dropdown-menu-icon" data-toggle="dropdown" title="Graph Options"></a> |
583 | <div class="graph_header_legend"> |
584 | </div> |
585 | <div class="graph-dropdown"> |
586 | |
587 | === modified file 'addons/web_kanban/static/src/css/kanban.css' |
588 | --- addons/web_kanban/static/src/css/kanban.css 2013-11-15 11:23:11 +0000 |
589 | +++ addons/web_kanban/static/src/css/kanban.css 2013-12-16 05:51:14 +0000 |
590 | @@ -72,7 +72,6 @@ |
591 | text-shadow: 0 0 2px black; |
592 | vertical-align: top; |
593 | position: relative; |
594 | - top: -5px; |
595 | } |
596 | .openerp .oe_kanban_view .oe_kanban_content .oe_star_on:hover, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off:hover { |
597 | text-decoration: none; |
598 | @@ -193,11 +192,12 @@ |
599 | } |
600 | .openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle { |
601 | margin-left: 4px; |
602 | + margin-top: -1px; |
603 | cursor: pointer; |
604 | position: relative; |
605 | } |
606 | .openerp .oe_kanban_view .oe_kanban_add { |
607 | - top: -8px; |
608 | + top: -2px; |
609 | } |
610 | .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle { |
611 | top: -2px; |
612 | @@ -455,6 +455,9 @@ |
613 | .openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban .oe_kanban_project_times li, .openerp .oe_kanban_view .oe_kanban_quick_create .oe_dropdown_kanban .oe_kanban_project_times li { |
614 | float: left; |
615 | } |
616 | +.openerp .oe_kanban_view .oe_kanban_card .fa-arrow-circle-o-down, .openerp .oe_kanban_view .oe_kanban_quick_create .fa-arrow-circle-o-down { |
617 | + padding-top: 7px !important; |
618 | +} |
619 | .openerp .oe_kanban_view .oe_kanban_star { |
620 | float: left; |
621 | position: inline-block; |
622 | @@ -483,9 +486,9 @@ |
623 | -webkit-border-radius: 3px; |
624 | border-radius: 3px; |
625 | } |
626 | -.openerp .oe_kanban_view .oe_kanban_footer_left > span .oe_e { |
627 | - line-height: 12px; |
628 | - font-size: 22px; |
629 | +.openerp .oe_kanban_view .oe_kanban_footer_left > span .fa { |
630 | + line-height: 5px; |
631 | + font-size: 12px; |
632 | } |
633 | .openerp .oe_kanban_view .oe_kanban_footer_left .oe_tags { |
634 | margin-right: 0; |
635 | @@ -706,3 +709,8 @@ |
636 | text-shadow: none !important; |
637 | } |
638 | } |
639 | + |
640 | +.fa-arrow-circle-o-down { |
641 | + font-size: 1.4em; |
642 | + padding: 4px 4px 0 0 !important; |
643 | +} |
644 | |
645 | === modified file 'addons/web_kanban/static/src/css/kanban.sass' |
646 | --- addons/web_kanban/static/src/css/kanban.sass 2013-11-15 11:23:11 +0000 |
647 | +++ addons/web_kanban/static/src/css/kanban.sass 2013-12-16 05:51:14 +0000 |
648 | @@ -103,7 +103,6 @@ |
649 | text-shadow: 0 0 2px black |
650 | vertical-align: top |
651 | position: relative |
652 | - top: -5px |
653 | &:hover |
654 | text-decoration: none |
655 | .oe_star_on |
656 | @@ -209,16 +208,19 @@ |
657 | // KanbanQuickCreate {{{ |
658 | .oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle |
659 | margin-left: 4px |
660 | + margin-top: -1px // Customize according FontAwesome |
661 | cursor: pointer |
662 | position: relative |
663 | .oe_kanban_add |
664 | - top: -8px |
665 | + // Customize for fa-plus icon in FontAwesome |
666 | + top: -2px |
667 | + // End of customize |
668 | .oe_kanban_header .oe_dropdown_toggle |
669 | top: -2px |
670 | height: 14px |
671 | .oe_kanban_card, .oe_dropdown_toggle |
672 | cursor: pointer |
673 | - display: inline-block |
674 | + display: inline-block |
675 | .oe_kanban_add |
676 | float: right |
677 | |
678 | @@ -407,7 +409,9 @@ |
679 | .oe_kanban_project_times |
680 | li |
681 | float: left |
682 | - |
683 | + .fa-arrow-circle-o-down |
684 | + padding-top: 7px !important |
685 | + |
686 | .oe_kanban_star |
687 | float: left |
688 | position: inline-block |
689 | @@ -426,9 +430,11 @@ |
690 | padding: 0 2px |
691 | line-height: 16px |
692 | @include radius(3px) |
693 | - .oe_e |
694 | - line-height: 12px |
695 | - font-size: 22px |
696 | + // Customize .oe_e to .fa according FontAwesome |
697 | + .fa |
698 | + line-height: 5px |
699 | + font-size: 12px |
700 | + //End of customize |
701 | .oe_tags |
702 | margin-right: 0 |
703 | .oe_tag |
704 | @@ -587,6 +593,9 @@ |
705 | visibility: hidden |
706 | .oe_kanban_view .oe_kanban_group_title |
707 | text-shadow: none !important |
708 | - |
709 | +//Customize in kanban dropdown according FontAwesome |
710 | +.fa-arrow-circle-o-down |
711 | + font-size: 1.4em |
712 | + padding: 4px 4px 0 0 !important |
713 | // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css" |
714 | // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: |
715 | |
716 | === modified file 'addons/web_kanban/static/src/xml/web_kanban.xml' |
717 | --- addons/web_kanban/static/src/xml/web_kanban.xml 2013-03-20 13:09:31 +0000 |
718 | +++ addons/web_kanban/static/src/xml/web_kanban.xml 2013-12-16 05:51:14 +0000 |
719 | @@ -32,7 +32,7 @@ |
720 | <t t-if="widget.view.group_by"> |
721 | <div class="oe_kanban_header oe_semantic_html_override"> |
722 | <t t-if="widget.view._is_quick_create_enabled()"> |
723 | - <div class="oe_kanban_add oe_e" title="Quick create">]</div> |
724 | + <div class="oe_kanban_add fa fa-plus" title="Quick create"></div> |
725 | </t> |
726 | <div class="oe_dropdown_toggle oe_dropdown_kanban"> |
727 | <div class="oe_kanban_group_length"> |
728 | @@ -40,7 +40,7 @@ |
729 | <t t-if="widget.group.get('length') > 99"> 99+ </t><t t-if="widget.group.get('length') <= 99"> <t t-esc="widget.group.get('length')"/> </t> |
730 | </span> |
731 | </div> |
732 | - <span class="oe_e">í</span> |
733 | + <span class="fa fa-arrow-circle-o-down"></span> |
734 | <ul class="oe_dropdown_menu oe_kanban_group_dropdown"> |
735 | <li><a data-action="toggle_fold" href="#">Fold</a></li> |
736 | <t t-if="widget.view.grouped_by_m2o and widget.value"> |