### Eclipse Workspace Patch 1.0
#P Ametys Plugin SkinEditor
Index: main/plugin-skineditor/cms-ribbon.xml
===================================================================
--- main/plugin-skineditor/cms-ribbon.xml	(revision 7129)
+++ main/plugin-skineditor/cms-ribbon.xml	(working copy)
@@ -20,17 +20,28 @@
 	
 		<tab label="plugin.skineditor:RIBBON_TABS_TAB_SKINEDITOR_LABEL" id="org.ametys.skineditor.ResourcesTab" contextualGroup="S" contextualColor="6" contextualLabel="plugin.skineditor:RIBBON_TABS_TAB_SKINEDITOR_GROUP_LABEL">
 			<groups>
-				<group label="plugin.skineditor:RIBBON_TABS_TAB_SKINEDITOR_GROUP_GROUP_SKIN_LABEL" icon="">
+				<group label="plugin.skineditor:RIBBON_TABS_TAB_SKINEDITOR_GROUP_GROUP_SKIN_LABEL" icon="" priority="-10">
 					<large/>
 					<medium>
 						<control id="org.ametys.plugins.skineditor.skin.CommitChanges"/>
 						<control id="org.ametys.plugins.skineditor.skin.RevertChanges"/>
 						<control id="org.ametys.plugins.skineditor.skin.Preview"/>
 					</medium>
-					<small/>
+					<small>
+						<layout size="small">
+							<control id="org.ametys.plugins.skineditor.skin.CommitChanges"/>
+							<control id="org.ametys.plugins.skineditor.skin.RevertChanges"/>
+							<control id="org.ametys.plugins.skineditor.skin.Preview"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.skineditor:RIBBON_TABS_TAB_SKINEDITOR_GROUP_GROUP_FOLDER_LABEL" icon="">
-					<large/>
+					<large>
+						<control id="org.ametys.plugins.skineditor.resources.Folder.add"/>
+						<control id="org.ametys.plugins.skineditor.resources.Folder.rename"/>
+						<control id="org.ametys.plugins.skineditor.resources.Folder.remove"/>
+						<control id="org.ametys.plugins.skineditor.resources.Folder.refresh"/>
+					</large>
 					<medium>
 						<control id="org.ametys.plugins.skineditor.resources.Folder.add"/>
 						<layout size="small">
@@ -39,10 +50,23 @@
 							<control id="org.ametys.plugins.skineditor.resources.Folder.refresh"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.plugins.skineditor.resources.Folder.add"/>
+						<layout size="very-small">
+							<control id="org.ametys.plugins.skineditor.resources.Folder.rename"/>
+							<control id="org.ametys.plugins.skineditor.resources.Folder.remove"/>
+							<control id="org.ametys.plugins.skineditor.resources.Folder.refresh"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.skineditor:RIBBON_TABS_TAB_SKINEDITOR_GROUP_GROUP_FILE_LABEL" icon="">
-					<large/>
+					<large>
+						<control id="org.ametys.plugins.skineditor.resources.File.add"/>
+						<control id="org.ametys.plugins.skineditor.resources.File.open"/>
+						<control id="org.ametys.plugins.skineditor.resources.File.rename"/>
+						<control id="org.ametys.plugins.skineditor.resources.File.remove"/>
+						<control id="org.ametys.plugins.skineditor.resources.File.download"/>
+					</large>
 					<medium>
 						<control id="org.ametys.plugins.skineditor.resources.File.add"/>
 						<control id="org.ametys.plugins.skineditor.resources.File.open"/>
@@ -52,10 +76,24 @@
 							<control id="org.ametys.plugins.skineditor.resources.File.download"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="small">
+							<control id="org.ametys.plugins.skineditor.resources.File.add"/>
+							<control id="org.ametys.plugins.skineditor.resources.File.open"/>
+						</layout>
+						<layout size="very-small">
+							<control id="org.ametys.plugins.skineditor.resources.File.rename"/>
+							<control id="org.ametys.plugins.skineditor.resources.File.remove"/>
+							<control id="org.ametys.plugins.skineditor.resources.File.download"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.skineditor:RIBBON_TABS_TAB_SKINEDITOR_GROUP_GROUP_CLIPBOARD_LABEL" icon="">
-					<large/>
+					<large>
+						<control id="org.ametys.plugins.skineditor.resources.Clipboard.paste"/>
+						<control id="org.ametys.plugins.skineditor.resources.Clipboard.copy"/>
+						<control id="org.ametys.plugins.skineditor.resources.Clipboard.cut"/>
+					</large>
 					<medium>
 						<control id="org.ametys.plugins.skineditor.resources.Clipboard.paste"/>
 						<layout size="small">
@@ -63,7 +101,13 @@
 							<control id="org.ametys.plugins.skineditor.resources.Clipboard.cut"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="small">
+							<control id="org.ametys.plugins.skineditor.resources.Clipboard.paste"/>
+							<control id="org.ametys.plugins.skineditor.resources.Clipboard.copy"/>
+							<control id="org.ametys.plugins.skineditor.resources.Clipboard.cut"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.skineditor:RIBBON_TABS_TAB_SKINEDITOR_GROUP_GROUP_HELP_LABEL" icon="">
 					<large/>
#P Ametys Plugin Forms
Index: main/plugin-forms/cms-ribbon.xml
===================================================================
--- main/plugin-forms/cms-ribbon.xml	(revision 7129)
+++ main/plugin-forms/cms-ribbon.xml	(working copy)
@@ -21,7 +21,18 @@
 		<tab label="plugin.forms:RIBBON_TABS_TAB_FORM_CMS_LABEL" id="org.ametys.web.content.FormsCMSTab" contextualColor="5" contextualGroup="FORM" contextualLabel="plugin.forms:RIBBON_TABS_TAB_FORM_GROUP_LABEL">
 			<groups>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_CMS_GROUP_PROPERTIES_LABEL" icon="">
-					<large/>
+					<large>
+						<layout size="small" align="middle">
+							<control id="org.ametys.plugins.forms.cms.Name"/>
+							<control id="org.ametys.plugins.forms.OpenInNewWindow"/>
+						</layout>
+						<control id="org.ametys.plugins.forms.Layout"/>
+						<control id="org.ametys.plugins.forms.Receipt"/>
+						<control id="org.ametys.plugins.forms.Redirection"/>
+						<control id="org.ametys.plugins.forms.cms.EmailProcessing"/>
+						<control id="org.ametys.plugins.forms.FormConvertToExternal"/>
+						<control id="org.ametys.plugins.forms.FormRemove"/>
+					</large>
 					<medium>
 						<layout size="small" align="middle">
 							<control id="org.ametys.plugins.forms.cms.Name"/>
@@ -38,10 +49,42 @@
 							<control id="org.ametys.plugins.forms.FormRemove"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="small" align="middle">
+							<control id="org.ametys.plugins.forms.cms.Name"/>
+							<control id="org.ametys.plugins.forms.OpenInNewWindow"/>
+						</layout>
+						<layout size="very-small" align="top">
+							<control id="org.ametys.plugins.forms.Layout"/>
+							<control id="org.ametys.plugins.forms.Receipt"/>
+							<control id="org.ametys.plugins.forms.Redirection"/>
+						</layout>
+						<control id="org.ametys.plugins.forms.cms.EmailProcessing"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.FormConvertToExternal"/>
+							<control id="org.ametys.plugins.forms.FormRemove"/>
+						</layout>
+					</small>
 				</group>
-				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_CMS_GROUP_INSERT_LABEL" icon="">
-					<large/>
+				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_CMS_GROUP_INSERT_LABEL" icon="" priority="10">
+					<large>
+						<control id="org.ametys.plugins.forms.insert.InputText"/>
+						<control id="org.ametys.plugins.forms.insert.Textarea"/>
+						<control id="org.ametys.plugins.forms.insert.Select"/>
+						<control id="org.ametys.plugins.forms.insert.InputCheckbox"/>
+						<control id="org.ametys.plugins.forms.insert.InputRadio"/>
+						<control id="org.ametys.plugins.forms.insert.InputPassword"/>
+						<layout size="small" align="top">
+							<control id="org.ametys.plugins.forms.insert.InputFile"/>
+							<control id="org.ametys.plugins.forms.insert.InputHidden"/>
+							<control id="org.ametys.plugins.forms.insert.Captcha"/>
+						</layout>
+						<layout size="small" align="top">
+							<control id="org.ametys.plugins.forms.insert.Fieldset"/>
+							<control id="org.ametys.plugins.forms.insert.InputSubmit"/>
+							<control id="org.ametys.plugins.forms.insert.InputReset"/>
+						</layout>
+					</large>
 					<medium>
 						<control id="org.ametys.plugins.forms.insert.InputText"/>
 						<control id="org.ametys.plugins.forms.insert.Textarea"/>
@@ -62,7 +105,28 @@
 							<control id="org.ametys.plugins.forms.insert.InputReset"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="small" align="top">
+							<control id="org.ametys.plugins.forms.insert.InputText"/>
+							<control id="org.ametys.plugins.forms.insert.Textarea"/>
+							<control id="org.ametys.plugins.forms.insert.Select"/>
+						</layout>
+						<layout size="very-small" align="top">
+							<control id="org.ametys.plugins.forms.insert.InputCheckbox"/>
+							<control id="org.ametys.plugins.forms.insert.InputRadio"/>
+							<control id="org.ametys.plugins.forms.insert.InputPassword"/>
+						</layout>
+						<layout size="very-small" align="top">
+							<control id="org.ametys.plugins.forms.insert.InputFile"/>
+							<control id="org.ametys.plugins.forms.insert.InputHidden"/>
+							<control id="org.ametys.plugins.forms.insert.Captcha"/>
+						</layout>
+						<layout size="very-small" align="top">
+							<control id="org.ametys.plugins.forms.insert.Fieldset"/>
+							<control id="org.ametys.plugins.forms.insert.InputSubmit"/>
+							<control id="org.ametys.plugins.forms.insert.InputReset"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
@@ -70,22 +134,57 @@
 		<tab label="plugin.forms:RIBBON_TABS_TAB_FORM_EXT_LABEL" id="org.ametys.web.content.FormsExternalTab" contextualColor="5" contextualGroup="FORM" contextualLabel="plugin.forms:RIBBON_TABS_TAB_FORM_GROUP_LABEL">
 			<groups>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_EXT_GROUP_PROPERTIES_LABEL" icon="">
-					<large/>
-					<medium>
+					<large>
 						<layout size="small" align="middle">
 							<control id="org.ametys.plugins.forms.external.URL"/>
 							<control id="org.ametys.plugins.forms.OpenInNewWindow"/>
 						</layout>
+						<control id="org.ametys.plugins.forms.Layout"/>
+						<control id="org.ametys.plugins.forms.FormConvertToCMS"/>
+						<control id="org.ametys.plugins.forms.FormRemove"/>
+					</large>
+					<medium>
 						<layout size="small" align="middle">
+							<control id="org.ametys.plugins.forms.external.URL"/>
+							<control id="org.ametys.plugins.forms.OpenInNewWindow"/>
+						</layout>
+						<layout size="small" align="top">
 							<control id="org.ametys.plugins.forms.Layout"/>
 							<control id="org.ametys.plugins.forms.FormConvertToCMS"/>
 							<control id="org.ametys.plugins.forms.FormRemove"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="small" align="middle">
+							<control id="org.ametys.plugins.forms.external.URL"/>
+							<control id="org.ametys.plugins.forms.OpenInNewWindow"/>
+						</layout>
+						<layout size="very-small" align="top">
+							<control id="org.ametys.plugins.forms.Layout"/>
+							<control id="org.ametys.plugins.forms.FormConvertToCMS"/>
+							<control id="org.ametys.plugins.forms.FormRemove"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_EXT_GROUP_INSERT_LABEL" icon="">
-					<large/>
+					<large>
+						<control id="org.ametys.plugins.forms.insert.InputText"/>
+						<control id="org.ametys.plugins.forms.insert.Textarea"/>
+						<control id="org.ametys.plugins.forms.insert.Select"/>
+						<control id="org.ametys.plugins.forms.insert.InputCheckbox"/>
+						<control id="org.ametys.plugins.forms.insert.InputRadio"/>
+						<control id="org.ametys.plugins.forms.insert.InputPassword"/>
+						<layout size="small" align="top">
+							<control id="org.ametys.plugins.forms.insert.InputFile"/>
+							<control id="org.ametys.plugins.forms.insert.InputHidden"/>
+							<control id="org.ametys.plugins.forms.insert.Captcha"/>
+						</layout>
+						<layout size="small" align="top">
+							<control id="org.ametys.plugins.forms.insert.Fieldset"/>
+							<control id="org.ametys.plugins.forms.insert.InputSubmit"/>
+							<control id="org.ametys.plugins.forms.insert.InputReset"/>
+						</layout>
+					</large>
 					<medium>
 						<control id="org.ametys.plugins.forms.insert.InputText"/>
 						<control id="org.ametys.plugins.forms.insert.Textarea"/>
@@ -98,6 +197,7 @@
 						<layout size="small" align="top">
 							<control id="org.ametys.plugins.forms.insert.InputFile"/>
 							<control id="org.ametys.plugins.forms.insert.InputHidden"/>
+							<control id="org.ametys.plugins.forms.insert.Captcha"/>
 						</layout>
 						<layout size="small" align="top">
 							<control id="org.ametys.plugins.forms.insert.Fieldset"/>
@@ -105,7 +205,28 @@
 							<control id="org.ametys.plugins.forms.insert.InputReset"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="small" align="top">
+							<control id="org.ametys.plugins.forms.insert.InputText"/>
+							<control id="org.ametys.plugins.forms.insert.Textarea"/>
+							<control id="org.ametys.plugins.forms.insert.Select"/>
+						</layout>
+						<layout size="very-small" align="top">
+							<control id="org.ametys.plugins.forms.insert.InputCheckbox"/>
+							<control id="org.ametys.plugins.forms.insert.InputRadio"/>
+							<control id="org.ametys.plugins.forms.insert.InputPassword"/>
+						</layout>
+						<layout size="very-small" align="top">
+							<control id="org.ametys.plugins.forms.insert.InputFile"/>
+							<control id="org.ametys.plugins.forms.insert.InputHidden"/>
+							<control id="org.ametys.plugins.forms.insert.Captcha"/>
+						</layout>
+						<layout size="very-small" align="top">
+							<control id="org.ametys.plugins.forms.insert.Fieldset"/>
+							<control id="org.ametys.plugins.forms.insert.InputSubmit"/>
+							<control id="org.ametys.plugins.forms.insert.InputReset"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
@@ -124,7 +245,16 @@
 							<control id="org.ametys.plugins.forms.InputWidth"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputID"/>
+							<control id="org.ametys.plugins.forms.InputLabel"/>
+						</layout>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputValue"/>
+							<control id="org.ametys.plugins.forms.InputWidth"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_INPUT_TEXT_RULES_LABEL" icon="">
 					<large/>
@@ -140,7 +270,18 @@
 							<control id="org.ametys.plugins.forms.RegExp" colspan="2"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMandatory"/>
+							<control id="org.ametys.plugins.forms.InputPasswordConfirmation"/>
+						</layout>
+						<layout size="very-small" align="top" cols="2">
+							<control id="org.ametys.plugins.forms.RegExpType" colspan="2"/>
+							<control id="org.ametys.plugins.forms.InputMin"/>
+							<control id="org.ametys.plugins.forms.InputMax"/>
+							<control id="org.ametys.plugins.forms.RegExp" colspan="2"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_INPUT_TEXT_CONTROL_LABEL" icon="">
 					<large/>
@@ -151,7 +292,13 @@
 							<control id="org.ametys.plugins.forms.InputMoveDown"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.plugins.forms.InputRemove"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMoveUp"/>
+							<control id="org.ametys.plugins.forms.InputMoveDown"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
@@ -171,7 +318,17 @@
 							<control id="org.ametys.plugins.forms.InputHeight"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="very-small" align="top">
+							<control id="org.ametys.plugins.forms.InputLabel"/>
+							<control id="org.ametys.plugins.forms.TextareaValue"/>
+						</layout>
+						<layout size="very-small" align="middle" cols="2">
+							<control id="org.ametys.plugins.forms.InputID" colspan="2"/>
+							<control id="org.ametys.plugins.forms.InputWidth"/>
+							<control id="org.ametys.plugins.forms.InputHeight"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_TEXTAREA_RULES_LABEL" icon="">
 					<large/>
@@ -190,9 +347,14 @@
 							<control id="org.ametys.plugins.forms.InputMoveUp"/>
 							<control id="org.ametys.plugins.forms.InputMoveDown"/>
 						</layout>
-
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.plugins.forms.InputRemove"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMoveUp"/>
+							<control id="org.ametys.plugins.forms.InputMoveDown"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
@@ -212,7 +374,17 @@
 							<control id="org.ametys.plugins.forms.InputHeight"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputID"/>
+							<control id="org.ametys.plugins.forms.InputLabel"/>
+						</layout>		
+						<control id="org.ametys.plugins.forms.SelectValue"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputWidth"/>
+							<control id="org.ametys.plugins.forms.InputHeight"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_SELECT_RULES_LABEL" icon="">
 					<large/>
@@ -232,9 +404,14 @@
 							<control id="org.ametys.plugins.forms.InputMoveUp"/>
 							<control id="org.ametys.plugins.forms.InputMoveDown"/>
 						</layout>
-
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.plugins.forms.InputRemove"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMoveUp"/>
+							<control id="org.ametys.plugins.forms.InputMoveDown"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
@@ -250,7 +427,13 @@
 							<control id="org.ametys.plugins.forms.InputID"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="very-small" align="top">
+							<control id="org.ametys.plugins.forms.InputLabel"/>
+							<control id="org.ametys.plugins.forms.InputValue"/>
+							<control id="org.ametys.plugins.forms.InputID"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_INPUT_CHECKBOX_RULES_LABEL" icon="">
 					<large/>
@@ -270,9 +453,14 @@
 							<control id="org.ametys.plugins.forms.InputMoveUp"/>
 							<control id="org.ametys.plugins.forms.InputMoveDown"/>
 						</layout>
-
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.plugins.forms.InputRemove"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMoveUp"/>
+							<control id="org.ametys.plugins.forms.InputMoveDown"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
@@ -288,7 +476,13 @@
 							<control id="org.ametys.plugins.forms.InputValue"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="very-small" align="top">
+							<control id="org.ametys.plugins.forms.RadioInputID"/>
+							<control id="org.ametys.plugins.forms.InputLabel"/>
+							<control id="org.ametys.plugins.forms.InputValue"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_INPUT_RADIO_RULES_LABEL" icon="">
 					<large/>
@@ -303,15 +497,19 @@
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_INPUT_RADIO_CONTROL_LABEL" icon="">
 					<large/>
 					<medium>
-						<control id="org.ametys.plugins.forms.insert.InputRadio"/>
 						<control id="org.ametys.plugins.forms.InputRemove"/>
 						<layout size="small" align="middle">
 							<control id="org.ametys.plugins.forms.InputMoveUp"/>
 							<control id="org.ametys.plugins.forms.InputMoveDown"/>
 						</layout>
-
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.plugins.forms.InputRemove"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMoveUp"/>
+							<control id="org.ametys.plugins.forms.InputMoveDown"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
@@ -329,7 +527,15 @@
 							<control id="org.ametys.plugins.forms.InputWidth"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputID"/>
+							<control id="org.ametys.plugins.forms.InputLabel"/>
+						</layout>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputWidth"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_INPUT_PASSWORD_RULES_LABEL" icon="">
 					<large/>
@@ -344,7 +550,17 @@
 							<control id="org.ametys.plugins.forms.RegExp" colspan="2"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMandatory"/>
+							<control id="org.ametys.plugins.forms.InputPasswordConfirmation"/>
+						</layout>
+						<layout size="very-small" align="middle" cols="2">
+							<control id="org.ametys.plugins.forms.InputMin"/>
+							<control id="org.ametys.plugins.forms.InputMax"/>
+							<control id="org.ametys.plugins.forms.RegExp" colspan="2"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_INPUT_PASSWORD_CONTROL_LABEL" icon="">
 					<large/>
@@ -354,9 +570,14 @@
 							<control id="org.ametys.plugins.forms.InputMoveUp"/>
 							<control id="org.ametys.plugins.forms.InputMoveDown"/>
 						</layout>
-
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.plugins.forms.InputRemove"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMoveUp"/>
+							<control id="org.ametys.plugins.forms.InputMoveDown"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
@@ -374,7 +595,15 @@
 							<control id="org.ametys.plugins.forms.InputWidth"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputID"/>
+							<control id="org.ametys.plugins.forms.InputLabel"/>
+						</layout>
+						<layout size="small" align="middle">
+							<control id="org.ametys.plugins.forms.InputWidth"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_INPUT_FILE_RULES_LABEL" icon="">
 					<large/>
@@ -395,9 +624,14 @@
 							<control id="org.ametys.plugins.forms.InputMoveUp"/>
 							<control id="org.ametys.plugins.forms.InputMoveDown"/>
 						</layout>
-
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.plugins.forms.InputRemove"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMoveUp"/>
+							<control id="org.ametys.plugins.forms.InputMoveDown"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
@@ -412,7 +646,12 @@
 							<control id="org.ametys.plugins.forms.InputValue"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="small" align="middle">
+							<control id="org.ametys.plugins.forms.InputID"/>
+							<control id="org.ametys.plugins.forms.InputValue"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_INPUT_HIDDEN_CONTROL_LABEL" icon="">
 					<large/>
@@ -422,9 +661,14 @@
 							<control id="org.ametys.plugins.forms.InputMoveUp"/>
 							<control id="org.ametys.plugins.forms.InputMoveDown"/>
 						</layout>
-
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.plugins.forms.InputRemove"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMoveUp"/>
+							<control id="org.ametys.plugins.forms.InputMoveDown"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
@@ -450,9 +694,14 @@
 							<control id="org.ametys.plugins.forms.InputMoveUp"/>
 							<control id="org.ametys.plugins.forms.InputMoveDown"/>
 						</layout>
-
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.plugins.forms.InputRemove"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMoveUp"/>
+							<control id="org.ametys.plugins.forms.InputMoveDown"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
@@ -467,7 +716,12 @@
 							<control id="org.ametys.plugins.forms.InputWidth"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputSubmitResetValue"/>
+							<control id="org.ametys.plugins.forms.InputWidth"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_INPUT_SUBMIT_CONTROL_LABEL" icon="">
 					<large/>
@@ -477,9 +731,14 @@
 							<control id="org.ametys.plugins.forms.InputMoveUp"/>
 							<control id="org.ametys.plugins.forms.InputMoveDown"/>
 						</layout>
-
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.plugins.forms.InputRemove"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMoveUp"/>
+							<control id="org.ametys.plugins.forms.InputMoveDown"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
@@ -494,7 +753,12 @@
 							<control id="org.ametys.plugins.forms.InputWidth"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputSubmitResetValue"/>
+							<control id="org.ametys.plugins.forms.InputWidth"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.forms:RIBBON_TABS_TAB_FORM_INPUT_RESET_CONTROL_LABEL" icon="">
 					<large/>
@@ -504,9 +768,14 @@
 							<control id="org.ametys.plugins.forms.InputMoveUp"/>
 							<control id="org.ametys.plugins.forms.InputMoveDown"/>
 						</layout>
-
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.plugins.forms.InputRemove"/>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.forms.InputMoveUp"/>
+							<control id="org.ametys.plugins.forms.InputMoveDown"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
Index: main/plugin-forms/plugin.xml
===================================================================
--- main/plugin-forms/plugin.xml	(revision 7129)
+++ main/plugin-forms/plugin.xml	(working copy)
@@ -710,6 +710,7 @@
 					<param name="default-description" i18n="true">PLUGINS_FORMS_FORMS_EDITOR_LABEL_DESCRIPTION</param>
 					<param name="name">form-label-text</param>
 					<param name="width">190</param>
+					<param name="width-very-small">100</param>
 					<param name="label-width">70</param>
 				</action> 
 				<right>Runtime_Rights_Forms_Edit</right>
@@ -730,6 +731,7 @@
 					<param name="default-description" i18n="true">PLUGINS_FORMS_FORMS_EDITOR_ID_DESCRIPTION</param>
 					<param name="name">form-id-text</param>
 					<param name="width">190</param>
+					<param name="width-very-small">100</param>
 					<param name="label-width">70</param>
 				</action> 
 				<right>Runtime_Rights_Forms_Edit</right>
@@ -750,6 +752,7 @@
 					<param name="default-description" i18n="true">PLUGINS_FORMS_FORMS_EDITOR_RADIOID_DESCRIPTION</param>
 					<param name="name">form-id-text</param>
 					<param name="width">190</param>
+					<param name="width-very-small">100</param>
 					<param name="label-width">70</param>
 				</action> 
 				<right>Runtime_Rights_Forms_Edit</right>
@@ -770,6 +773,7 @@
 					<param name="default-description" i18n="true">PLUGINS_FORMS_FORMS_EDITOR_VALUE_DESCRIPTION</param>
 					<param name="name">form-value-text</param>
 					<param name="width">190</param>
+					<param name="width-very-small">100</param>
 					<param name="label-width">70</param>
 				</action> 
 				<right>Runtime_Rights_Forms_Edit</right>
@@ -793,6 +797,7 @@
 					<param name="name">form-value-textarea</param>
 					<param name="label-width">70</param>
 					<param name="width">190</param>
+					<param name="width-very-small">100</param>
 					<param name="height">38</param>
 				</action> 
 				<right>Runtime_Rights_Forms_Edit</right>
@@ -1061,6 +1066,7 @@
 					<param name="default-description" i18n="true">PLUGINS_FORMS_FORMS_EDITOR_INPUTMIN_DESCRIPTION</param>
 					<param name="name">form-input-min</param>
 					<param name="width">60</param>
+					<param name="width-very-small">45</param>
 					<param name="label-width">40</param>
 				</action> 
 				<right>Runtime_Rights_Forms_Edit</right>
@@ -1083,6 +1089,7 @@
 					<param name="default-description" i18n="true">PLUGINS_FORMS_FORMS_EDITOR_INPUTMAX_DESCRIPTION</param>
 					<param name="name">form-input-max</param>
 					<param name="width">60</param>
+					<param name="width-very-small">45</param>
 					<param name="label-width">40</param>
 				</action> 
 				<right>Runtime_Rights_Forms_Edit</right>
@@ -1105,6 +1112,7 @@
 					<param name="default-description" i18n="true">PLUGINS_FORMS_FORMS_EDITOR_REGEXP_DESCRIPTION</param>
 					<param name="name">form-input-max</param>
 					<param name="width">100</param>
+					<param name="width-very-small">70</param>
 					<param name="label-width">125</param>
 				</action> 
 				<right>Runtime_Rights_Forms_Edit</right>
@@ -1121,6 +1129,7 @@
 					<param name="action">org.ametys.forms.ApplyRegexpType</param>
 					<param name="selection-listener">org.ametys.forms.RegexpTypeListener</param>
 					<param name="width">185</param>
+					<param name="width-very-small">155</param>
 					<param name="label-width">40</param>
 					<param name="label" i18n="true">PLUGINS_FORMS_FORMS_EDITOR_REGEXPTYPE_LABEL</param>
 					<param name="default-description" i18n="true">PLUGINS_FORMS_FORMS_EDITOR_REGEXPTYPE_DESCRIPTION</param>
#P Ametys Plugin Newsletter
Index: main/plugin-newsletter/cms-ribbon.xml
===================================================================
--- main/plugin-newsletter/cms-ribbon.xml	(revision 7129)
+++ main/plugin-newsletter/cms-ribbon.xml	(working copy)
@@ -28,14 +28,28 @@
 					<small></small>
 				</group>
 				<group label="plugin.newsletter:RIBBON_TABS_TAB_NEWSLETTER_GROUP_CATEGORIES_LABEL" icon="">
-					<large/>
-					<medium>
+					<large>
 						<control id="org.ametys.newsletter.category.Add"/>
 						<control id="org.ametys.newsletter.category.Edit"/>
 						<control id="org.ametys.newsletter.category.Delete"/>
 						<control id="org.ametys.newsletter.templatesmenu"/>
+					</large>
+					<medium>
+						<control id="org.ametys.newsletter.category.Add"/>
+						<layout size="small">
+							<control id="org.ametys.newsletter.category.Edit"/>
+							<control id="org.ametys.newsletter.category.Delete"/>
+							<control id="org.ametys.newsletter.templatesmenu"/>
+						</layout>
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.newsletter.category.Add"/>
+						<layout size="very-small">
+							<control id="org.ametys.newsletter.category.Edit"/>
+							<control id="org.ametys.newsletter.category.Delete"/>
+							<control id="org.ametys.newsletter.templatesmenu"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.newsletter:RIBBON_TABS_TAB_NEWSLETTER_GROUP_SUBSCRIBERS_LABEL" icon="">
 					<large/>
@@ -49,15 +63,29 @@
 		</tab>
 		<tab label="plugin.newsletter:RIBBON_TABS_TAB_NEWSLETTER_CONTENT_LABEL" id="org.ametys.newsletter.content.Tab" contextualColor="6" contextualGroup="N" contextualLabel="plugin.newsletter:RIBBON_TABS_TAB_NEWSLETTER_LABEL">
 			<groups>
-				<group label="plugin.newsletter:RIBBON_TABS_TAB_CONTENT_GROUPS_GROUP_TOOL_LABEL" icon="">
-					<large></large>
-					<medium>
+				<group label="plugin.newsletter:RIBBON_TABS_TAB_CONTENT_GROUPS_GROUP_TOOL_LABEL" icon="" priority="-10">
+					<large>
 						<control id="org.ametys.cms.content.Open"/>
 						<control id="org.ametys.cms.Details"/>
 						<control id="org.ametys.cms.userinterface.History"/>
 						<control id="org.ametys.cms.ContentConsistencyTest"/>
+					</large>
+					<medium>
+						<control id="org.ametys.cms.content.Open"/>
+						<layout size="small">
+							<control id="org.ametys.cms.Details"/>
+							<control id="org.ametys.cms.userinterface.History"/>
+							<control id="org.ametys.cms.ContentConsistencyTest"/>
+						</layout>
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.cms.content.Open"/>
+						<layout size="very-small">
+							<control id="org.ametys.cms.Details"/>
+							<control id="org.ametys.cms.userinterface.History"/>
+							<control id="org.ametys.cms.ContentConsistencyTest"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.newsletter:RIBBON_TABS_TAB_CONTENT_GROUPS_GROUP_ACTION_LABEL" icon="">
 					<large></large>
@@ -68,14 +96,28 @@
 					<small/>
 				</group>
 				<group label="plugin.newsletter:RIBBON_TABS_TAB_CONTENT_GROUPS_GROUP_WORKFLOW_LABEL" icon="">
-					<large></large>
-					<medium>
+					<large>
 						<control id="org.ametys.newsletter.workflow.Draft"/>
 						<control id="org.ametys.newsletter.workflow.Proposed"/>
 						<control id="org.ametys.newsletter.workflow.Validated"/>
 						<control id="org.ametys.web.content.Delete"/>
+					</large>
+					<medium>
+						<control id="org.ametys.newsletter.workflow.Draft"/>
+						<layout size="small">
+							<control id="org.ametys.newsletter.workflow.Proposed"/>
+							<control id="org.ametys.newsletter.workflow.Validated"/>
+							<control id="org.ametys.web.content.Delete"/>
+						</layout>
 					</medium>
-					<small/>
+					<small>
+						<control id="org.ametys.newsletter.workflow.Draft"/>
+						<layout size="very-small">
+							<control id="org.ametys.newsletter.workflow.Proposed"/>
+							<control id="org.ametys.newsletter.workflow.Validated"/>
+							<control id="org.ametys.web.content.Delete"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
#P Ametys Plugin DataInclusion
Index: main/plugin-datainclusion/cms-ribbon.xml
===================================================================
--- main/plugin-datainclusion/cms-ribbon.xml	(revision 7129)
+++ main/plugin-datainclusion/cms-ribbon.xml	(working copy)
@@ -21,7 +21,11 @@
 		<tab id="org.ametys.datainclusion.DataInclusionTab" contextualColor="5" contextualGroup="Q" label="plugin.datainclusion:RIBBON_TABS_TAB_DATAINCLUSION_LABEL" contextualLabel="plugin.datainclusion:RIBBON_TABS_TAB_DATAINCLUSION_GROUP_LABEL">
             <groups>
                 <group label="plugin.datainclusion:RIBBON_TABS_TAB_DATAINCLUSION_GROUP_DATASOURCES_LABEL" icon="">
-                    <large/>
+                    <large>
+                        <control id="org.ametys.datainclusion.AddDataSource"/>
+                        <control id="org.ametys.datainclusion.EditDataSource"/>
+                        <control id="org.ametys.datainclusion.DeleteDataSource"/>
+                    </large>
                     <medium>
                         <control id="org.ametys.datainclusion.AddDataSource"/>
                         <layout size="small">
@@ -29,10 +33,20 @@
                             <control id="org.ametys.datainclusion.DeleteDataSource"/>
                         </layout>
                     </medium>
-                    <small/>
+                    <small>
+                        <control id="org.ametys.datainclusion.AddDataSource"/>
+                        <layout size="very-small">
+                            <control id="org.ametys.datainclusion.EditDataSource"/>
+                            <control id="org.ametys.datainclusion.DeleteDataSource"/>
+                        </layout>
+                    </small>
                 </group>
                 <group label="plugin.datainclusion:RIBBON_TABS_TAB_DATAINCLUSION_GROUP_QUERIES_LABEL" icon="">
-                    <large/>
+                    <large>
+                        <control id="org.ametys.datainclusion.AddQuery"/>
+                        <control id="org.ametys.datainclusion.EditQuery"/>
+                        <control id="org.ametys.datainclusion.DeleteQuery"/>
+                    </large>
                     <medium>
                         <control id="org.ametys.datainclusion.AddQuery"/>
                         <layout size="small">
@@ -40,7 +54,13 @@
                             <control id="org.ametys.datainclusion.DeleteQuery"/>
                         </layout>
                     </medium>
-                    <small/>
+                    <small>
+                        <control id="org.ametys.datainclusion.AddQuery"/>
+                        <layout size="very-small">
+                            <control id="org.ametys.datainclusion.EditQuery"/>
+                            <control id="org.ametys.datainclusion.DeleteQuery"/>
+                        </layout>
+                    </small>
                 </group>
             </groups>
         </tab>
#P Ametys Plugin InlineMedia
Index: main/plugin-inlinemedia/cms-ribbon.xml
===================================================================
--- main/plugin-inlinemedia/cms-ribbon.xml	(revision 7129)
+++ main/plugin-inlinemedia/cms-ribbon.xml	(working copy)
@@ -27,7 +27,11 @@
 							<control id="org.ametys.plugins.inlinemedia.flash.AltText"/>
 						</layout>
 					</medium>
-					<small/>
+					<small>
+						<layout size="very-small" align="middle">
+							<control id="org.ametys.plugins.inlinemedia.flash.AltText"/>
+						</layout>
+					</small>
 				</group>
 				<group label="plugin.inlinemedia:RIBBON_TABS_TAB_FLASH_GROUPS_GROUP_SIZE_LABEL" icon="">
 					<large/>
@@ -46,7 +50,13 @@
 						<control id="org.ametys.plugins.inlinemedia.flash.FlashNoFloat"/>
 						<control id="org.ametys.plugins.inlinemedia.flash.FlashFloatRight"/>
 					</medium>
-					<small/>
+					<small>
+						<layout size="small" align="top">
+							<control id="org.ametys.plugins.inlinemedia.flash.FlashFloatLeft"/>
+							<control id="org.ametys.plugins.inlinemedia.flash.FlashNoFloat"/>
+							<control id="org.ametys.plugins.inlinemedia.flash.FlashFloatRight"/>
+						</layout>
+					</small>
 				</group>
 			</groups>
 		</tab>
Index: main/plugin-inlinemedia/plugin.xml
===================================================================
--- main/plugin-inlinemedia/plugin.xml	(revision 7129)
+++ main/plugin-inlinemedia/plugin.xml	(working copy)
@@ -358,6 +358,7 @@
 					<param name="default-description" i18n="true">PLUGINS_INLINEMEDIA_EDITOR_FLASH_EDITION_ALT_TEXT_DESCRIPTION</param>
 					<param name="name">flash-alt-text</param>
 					<param name="width">190</param>
+					<param name="width-very-small">100</param>
 					<param name="label-width">70</param>
 				</action> 
 				<right>Runtime_Rights_InlineMedia_Insert_Flash</right>