Amit Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons13-event-apa into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons13-event-apa/+merge/128002
[FIX]:
when we subscribe for event, the label of button in kanban view looks
"Subscribed Unsubscribe"
event view in FF is not well formatted
https://docs.google.com/open?id=0BzK8IdwLAVd9V1p1LWZmS2J2dnM
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons13-event-apa/+merge/128002
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons13-event-apa.
=== modified file 'event/event_view.xml'
--- event/event_view.xml 2012-09-30 14:16:38 +0000
+++ event/event_view.xml 2012-10-04 12:46:46 +0000
@@ -116,29 +116,28 @@
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
</div>
- <div>
- <group>
- <group>
- <label for="address_id" string="Location"/>
- <div>
- <field name="address_id" on_change="on_change_address_id(address_id)" />
- <field name="street" placeholder="Street..."/>
- <field name="street2"/>
- <div class="address_format">
- <field name="city" placeholder="City" style="width: 40%%"/>
- <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
- <field name="zip" placeholder="ZIP" style="width: 20%%"/>
- </div>
- <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
- </div>
- </group>
- <group>
- <field name="type" on_change="onchange_event_type(type,context)"/>
- <field name="date_begin"/>
- <field name="date_end"/>
- </group>
- </group>
- </div>
+ <group>
+ <group>
+ <label for="address_id" string="Location"/>
+ <div>
+ <field name="address_id" on_change="on_change_address_id(address_id)" />
+ <field name="street" placeholder="Street..."/>
+ <field name="street2"/>
+ <div class="address_format">
+ <field name="city" placeholder="City" style="width: 40%%"/>
+ <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
+ <field name="zip" placeholder="ZIP" style="width: 20%%"/>
+ </div>
+ <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
+ </div>
+ </group>
+ <group>
+ <field name="type" on_change="onchange_event_type(type,context)" />
+ <field name="date_begin"/>
+ <field name="date_end"/>
+ </group>
+ </group>
+
<notebook>
<page string="Event Description">
<field name="note" colspan="4" nolabel="1"/>
@@ -272,13 +271,13 @@
<t t-if="record.register_avail.raw_value != 0">
<t t-if="!record.is_subscribed.raw_value">
<input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
- <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_mail_button_follow">
+ <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button">
<span >Subscribe</span>
</button>
</t>
</t>
<t t-if="record.is_subscribed.raw_value">
- <button type="object" name="unsubscribe_to_event" class="oe_mail_button_unfollow">
+ <button type="object" name="unsubscribe_to_event" class="unsubscribe_button ">
<span>Subscribed</span>
<span class="unsubscribe">Unsubscribe</span>
</button>
=== modified file 'event/static/src/css/event.css'
--- event/static/src/css/event.css 2012-05-25 07:28:29 +0000
+++ event/static/src/css/event.css 2012-10-04 12:46:46 +0000
@@ -42,4 +42,10 @@
width:256px;
border: 1px solid #eeeeee;
}
+.unsubscribe, .unsubscribe_button:hover span {
+ display: none;
+ }
+.unsubscribe_button:hover .unsubscribe {
+ display: inline;
+ }
_______________________________________________
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
