Merge lp:~syleam/vim-openerp/xml_colors_snippet_fix into lp:vim-openerp

[Sylvain Garancher]

Fixed separator in "colors" XML snippet.

[lp:~syleam/vim-openerp/xml_colors_snippet_fix]

101. By Sylvain Garancher on 2011-12-27

[FIX] Fixed wizard snippets

=== modified file 'vim/snippets/xml.snippets'
--- vim/snippets/xml.snippets	2011-12-22 14:55:50 +0000
+++ vim/snippets/xml.snippets	2011-12-27 10:48:23 +0000
@@ -91,7 +91,7 @@
 snippet col
 	col="4"
 snippet colors
-	colors="${1:grey}:${2:state}${3:==}'${4:draft}'${5:,}"
+	colors="${1:grey}:${2:state}${3:==}'${4:draft}'${5:;}"
 snippet editable top
 	editable="top"
 snippet editable bottom
@@ -154,8 +154,8 @@
 	</record>
 	
 	<menuitem id="menu_$1_wizard"
-	    parent="menu_${2:menu_parent}"
-	    sequence="${3:20}"
+	    parent="menu_${6:menu_parent}"
+	    sequence="${7:20}"
 	    action="action_$1_view"/>
 snippet wizard osv_memory toolbar
 	<record id="view_${1:model}_form" model="ir.ui.view">
@@ -186,7 +186,7 @@
 	    <field name="object" eval="1"/>
 	    <field name="key">action</field>
 	    <field name="key2">client_action_multi</field>
-	    <field name="model">${2:Model to launch wizard}</field>
+	    <field name="model">${5:Model to launch wizard}</field>
 	    <field name="value" eval="'ir.actions.act_window,' + str(ref('action_$1_view'))" />
 	</record>
 snippet view form