From a5f70b8fa4d52c5b9154ecca8dcfe8f194d5156c Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Mon, 25 Jun 2012 16:26:20 +0530
Subject: [PATCH] [IMP] caldav wizard

bzr revid: kjo@tinyerp.com-20120625105620-nvv3g7fqq63y3vbw
---
 addons/caldav/wizard/caldav_browse_view.xml | 76 ++++++++++++---------
 addons/crm/crm_meeting_view.xml             | 32 +++++----
 addons/crm_caldav/crm_caldav_view.xml       |  2 +-
 3 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 9d088ae55f6..584268e54bc 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -7,18 +7,30 @@
             <field name="model">caldav.browse</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Browse Caldav" >
-                    <group colspan="4" width="700" height="500">
-                        <separator string="Browse Caldav" colspan="4"/>
-                        <field name="url" colspan="4" />
-                        <separator string="Description" colspan="4"/>
-                        <field name="description"  colspan="4"  nolabel="1"/>
-                        <separator colspan="4"/>
-                        <group col="4" colspan="4">
-                            <label string="" colspan="2"/>
-                            <button special="cancel" string="_Close" icon="gtk-close"/>
+                <form string="Browse Caldav" version="7.0">
+                    <header>
+                        <button special="cancel" string="_Close" icon="gtk-close"/>
+                    </header>
+                    <sheet>
+                        <group colspan="4" width="700" height="500">
+                            <separator string="Browse Caldav" colspan="4"/>
+                            <field name="url" colspan="2" />
+                            <separator string="Help" colspan="4"/>
+                            <label string=" * Webdav server that provides remote access to calendar" colspan="4"/>
+                            <label string=" * Synchronisation of calendar using WebDAV" colspan="4"/>
+                            <label string=" * Customize calendar event and todo attribute with any of OpenERP model" colspan="4"/>
+                            <label string=" * Provides iCal Import/Export functionality" colspan="4"/>
+                            <label string=" To access Calendars using CalDAV clients, point them to:
+        http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c" colspan="4"/>
+                            <label string=" To access OpenERP Calendar using WebCal to remote site use the URL like:
+        http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics" colspan="4"/>
+                            <label string=" Where,
+        HOSTNAME: Host on which OpenERP server(With webdav) is running
+        PORT : Port on which OpenERP server is running (By Default : 8069)
+        DATABASE_NAME: Name of database on which OpenERP Calendar is created" colspan="4"/>
+                            <separator colspan="4"/>
                         </group>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -28,18 +40,15 @@
            <field name="model">user.preference</field>
            <field name="type">form</field>
             <field name="arch" type="xml">
-               <form string="Caldav's host name configuration">
-                	<label string="Configure your openerp hostname. For example : " colspan="4"></label>
-                    <newline/>
-                    <label string="database.my.openerp.com  or companyserver.com" colspan="4"/>
-                    <newline/>
-                    <separator colspan="4"/>
-                    <field name="host_name"  colspan="4" width="250" />
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                       <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+               <form string="Caldav's host name configuration" version="7.0">
+                    <header>
                        <button name="next_window" string="Next" type="object" icon="gtk-go-forward"/>
-                    </group>
+                    </header>
+                    <sheet>
+                        <group>
+                            <field name="host_name"  colspan="2" width="250" placeholder="For example : database.my.openerp.com or companyserver.com"/>
+                        </group>
+                    </sheet>
                </form>
             </field>
         </record>
@@ -49,19 +58,18 @@
             <field name="model">user.preference</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="User Preference">
-                    <separator string="" colspan="4"/>
-                    <field name="service"  colspan="4" width="250" readonly="1"/>
-                    <field name="collection"  colspan="4" width="250" invisible="1" />
-                    <field name="calendar"  colspan="4" width="250" domain="[('collection_id','=', collection)]" readonly="1"/>
-                    <field name="device"  colspan="4" width="250" />
-                    <separator colspan="4"/>
-                    
-                    <group col="4" colspan="4">
-                        <label string="" colspan="2"/>
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                <form string="User Preference" version="7.0">
+                    <header>
                         <button name="open_window" string="_Open" type="object" icon="gtk-ok"/>
-                    </group>
+                    </header>
+                    <sheet>
+                        <group>
+                            <field name="service"  colspan="2" readonly="1"/>
+                            <field name="collection"  colspan="2" invisible="1" />
+                            <field name="calendar"  colspan="2" domain="[('collection_id','=', collection)]" readonly="1"/>
+                            <field name="device"  colspan="2"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 85e9864115a..925c188b235 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -47,24 +47,26 @@
                         <h1>
                             <field name="name"/>
                         </h1>
+                    </div>
+                    <group>
                         <h2>
+                            <field name="date" string="Start Date" required="1"
+                            class="oe_edit_only oe_inline"/>
                             At <field name="location" class="oe_inline" />
                         </h2>
-                    </div>
-                    <h2>
-                        <label for="duration" string="Duration" />
-                        <field name="duration" widget="float_time"
-                            on_change="onchange_dates(date,duration,False,allday)"
-                            class="oe_inline"/> from
-                        <field name="date"
-                            string="Start Date" 
-                            required="1"
-                            class="oe_edit_only oe_inline"/> to
-                        <field name="date_deadline" 
-                            string="End Date" required="1"
-                            on_change="onchange_dates(date,False,date_deadline)"                            
-                            class="oe_inline"/> 
-                    </h2>
+                    </group>
+                    <group>
+                        <h2>
+                            <label for="duration" string="Duration" />
+                            <field name="duration" widget="float_time"
+                                on_change="onchange_dates(date,duration,False,allday)"
+                                class="oe_inline"/> to
+                            <field name="date_deadline" 
+                                string="End Date" required="1"
+                                on_change="onchange_dates(date,False,date_deadline)"                            
+                                class="oe_inline"/> 
+                        </h2>
+                    </group>
                 <group colspan="4" col="4">
                     <group colspan="2">
                         <field name="user_id" />
diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml
index 287e301532e..5746a3af0aa 100644
--- a/addons/crm_caldav/crm_caldav_view.xml
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <record id="action_caldav_browse" model="ir.actions.act_window">
-            <field name="name">Caldav Browse</field>
+            <field name="name">Synchronize Your Meetings</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">user.preference</field>
             <field name="view_id" ref="caldav.host_prefernce_form"/>