From 3fae74635bda8633a7f82b1d2f401ab5b23c14f3 Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Thu, 10 Oct 2013 10:29:46 +0530 Subject: [PATCH] [IMP]:If Location and description is not added put - and change color of label bzr revid: aja@tinyerp.com-20131010045946-58i7kxd2611q2agj --- addons/base_calendar/crm_meeting_data.xml | 54 ++++++++++++++----- .../static/src/xml/base_calender.xml | 4 +- 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml index d4607242750..f07d17b5b9c 100644 --- a/addons/base_calendar/crm_meeting_data.xml +++ b/addons/base_calendar/crm_meeting_data.xml @@ -72,26 +72,54 @@
- : ${object.location or ''} + : ${object.location} (View Map)
% endif + % if not object.location : + + +
+ Where +
+ + +
+ : - +
+ + + % endif % if object.description : - - -
- What -
- - -
- : ${object.description or ''} -
- - + + +
+ What +
+ + +
+ : ${object.description or ''} +
+ + + % endif + % if not object.description : + + +
+ What +
+ + +
+ : - +
+ + % endif diff --git a/addons/base_calendar/static/src/xml/base_calender.xml b/addons/base_calendar/static/src/xml/base_calender.xml index 038c105a2e9..fc326f0fd05 100644 --- a/addons/base_calendar/static/src/xml/base_calender.xml +++ b/addons/base_calendar/static/src/xml/base_calender.xml @@ -23,9 +23,9 @@ When : - + Where - : + : Who