Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-event-kanban-apa-button-tooltip-kbh
into lp:~openerp-dev/openobject-addons/trunk-event-kanban-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-event-kanban-apa-button-tooltip-kbh/+merge/98385
Hello,
I have changed the tool-tip on button 'Up coming' in event module.
Thank you,
KBH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-event-kanban-apa-button-tooltip-kbh/+merge/98385
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-event-kanban-apa.
=== modified file 'event/event_view.xml'
--- event/event_view.xml 2012-03-07 09:53:36 +0000
+++ event/event_view.xml 2012-03-20 10:32:27 +0000
@@ -265,9 +265,9 @@
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
<separator orientation="vertical"/>
<filter icon="terp-go-today" string="Up Coming"
- name="upcoming"
- domain="[('date_begin','>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
- help="Up Coming Events" />
+ name="upcoming"
+ domain="[('date_begin','>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+ help="Up Coming Events form today" />
<field name="name"/>
<field name="type" widget="selection"/>
<field name="user_id" widget="selection">
=== modified file 'event/static/src/css/event.css'
--- event/static/src/css/event.css 2012-03-20 10:22:17 +0000
+++ event/static/src/css/event.css 2012-03-20 10:32:27 +0000
@@ -99,7 +99,10 @@
.oe_event_button_subscribe:hover {
cursor: pointer;
background-size: 100% 100%;
+<<<<<<< TREE
/*background: #DC5F59 none;*/
+=======
+>>>>>>> MERGE-SOURCE
}
.oe_event_button_unsubscribe:hover {
cursor: pointer;
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
