Index: main/plugin-forms/i18n/messages_fr.xml
===================================================================
--- main/plugin-forms/i18n/messages_fr.xml	(revision 17455)
+++ main/plugin-forms/i18n/messages_fr.xml	(working copy)
@@ -33,6 +33,15 @@
     <message key="PLUGINS_FORMS_UI_NO_FORMS_TOOLTIP">Aucun des contenus sélectionnés ne contient de formulaire.</message>
     <message key="PLUGINS_FORMS_UI_NAME">Nom</message>
     
+    <message key="PLUGINS_SHOW_OR_EXPORT_FORMS_LABEL">Données de formulaire</message>
+    <message key="PLUGINS_SHOW_OR_EXPORT_FORMS_DESCRIPTION">Visualisation et export des données du formulaire</message>
+    
+    <message key="PLUGINS_SHOW_FORMS_UI_LABEL">Visualiser les données</message>
+    <message key="PLUGINS_SHOW_FORMS_UI_DESCRIPTION">Visualiser les données d'un des formulaires des contenus sélectionnés</message>
+    
+    <message key="UITOOL_FORM_RESULTS_LABEL">Formulaire</message>
+    <message key="UITOOL_FORM_RESULTS_DESCRIPTION">Outil de visualisation des données des formulaires</message>
+    
 	<message key="PLUGINS_FORMS_FORMS_EDITOR_OPENINNEWWINDOW_LABEL">Soumettre dans une nouvelle fenêtre</message>	
 	<message key="PLUGINS_FORMS_FORMS_EDITOR_OPENINNEWWINDOW_DESCRIPTION">Lorsque le visiteur soumet le formulaire une nouvelle fenêtre s'ouvre avec le message de remerciement ou les erreurs le cas échéant. Il peut ensuite fermer cette fenêtre et continuer sa navigation.</message>	
 	<message key="PLUGINS_FORMS_FORMS_EDITOR_EXTERNAL_URL_LABEL">URL</message>	
@@ -263,13 +272,16 @@
 	<message key="PLUGINS_FORMS_FORMS_RENDER_ERRORS_1">Le formulaire contient </message>
 	<message key="PLUGINS_FORMS_FORMS_RENDER_ERRORS_2"> erreur(s).\nVeuillez la (ou les) corriger avant de recommencer.\n\nEn laissant votre curseur au dessus des champs mis en évidence, vous obtiendrez des messages explicatifs.</message>
     
-    <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_TITLE">Exporter les données d'un formulaire au format Excel</message>
-    <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_BUTTON_OK">Exporter</message>
+    <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_TITLE">Exporter/Visualiser les données d'un formulaire au format Excel</message>
+    <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_BUTTON_OK">OK</message>
     <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_BUTTON_CANCEL">Annuler</message>
     <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_FORM_LIST_ERROR">Une erreur est survenue en récupérant la liste des formulaires.</message>
     <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_CAPTION">Sélection du formulaire</message>
     <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_NORESULT">Aucun formulaire n'a été trouvé dans les contenus sélectionnés.</message>
-    <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_NO_FORM_SELECTED">Vous devez sélectionner un formulaire à exporter.</message>
+    <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_NO_FORM_SELECTED">Vous devez sélectionner un formulaire à exporter/visualiser.</message>
+    
+    <message key="PLUGINS_FORMS_CHOOSE_SHOW_FORM_ERROR">Une erreur est survenue lors de la récupération des données du formulaire.</message>
+    <message key="PLUGINS_FORMS_CHOOSE_SHOW_FORM_SUBMISSION_DATE">Date et heure de soumission</message>
     
     <message key="PLUGINS_FORMS_EXPORT_COLUMN_ID">ID</message>
     <message key="PLUGINS_FORMS_EXPORT_COLUMN_DATE">Date de soumission</message>
Index: main/plugin-forms/i18n/messages_en.xml
===================================================================
--- main/plugin-forms/i18n/messages_en.xml	(revision 17455)
+++ main/plugin-forms/i18n/messages_en.xml	(working copy)
@@ -33,6 +33,15 @@
     <message key="PLUGINS_FORMS_UI_NO_FORMS_TOOLTIP">None of the selected contents contains a form.</message>
     <message key="PLUGINS_FORMS_UI_NAME">Name</message>
     
+    <message key="PLUGINS_SHOW_OR_EXPORT_FORMS_LABEL">Forms data</message>
+    <message key="PLUGINS_SHOW_OR_EXPORT_FORMS_DESCRIPTION">Show and export form data</message>
+    
+    <message key="PLUGINS_SHOW_FORMS_UI_LABEL">Show form data</message>
+    <message key="PLUGINS_SHOW_FORMS_UI_DESCRIPTION">Show the user data of a form contained in one of the selected contents</message>
+    
+    <message key="UITOOL_FORM_RESULTS_LABEL">Form</message>
+    <message key="UITOOL_FORM_RESULTS_DESCRIPTION">Tool to show form data</message>
+    
 	<message key="PLUGINS_FORMS_FORMS_EDITOR_OPENINNEWWINDOW_LABEL">Submit in a new window</message>	
 	<message key="PLUGINS_FORMS_FORMS_EDITOR_OPENINNEWWINDOW_DESCRIPTION">When the visitor sumbits the form, a new window opens with the thank message or the errors depending on the case. He can then close this window to continue.</message>
 	<message key="PLUGINS_FORMS_FORMS_EDITOR_EXTERNAL_URL_LABEL">URL</message>	
@@ -263,13 +272,15 @@
 	<message key="PLUGINS_FORMS_FORMS_RENDER_ERRORS_1">The form has </message>
 	<message key="PLUGINS_FORMS_FORMS_RENDER_ERRORS_2"> error(s).\nPlease correct it (them) before proceeding.\n\nYou can let the cursor over a highlighted field to see an explaination.</message>
     
-    <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_TITLE">Export the form data as an excel spreadsheet</message>
-    <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_BUTTON_OK">Export</message>
+    <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_TITLE">Export/Show the form data as an excel spreadsheet</message>
+    <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_BUTTON_OK">OK</message>
     <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_BUTTON_CANCEL">Cancel</message>
     <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_FORM_LIST_ERROR">An error occured while getting the form list.</message>
     <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_CAPTION">Form selection</message>
     <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_NORESULT">No form was found in the selected contents.</message>
-    <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_NO_FORM_SELECTED">You must select a form to export.</message>
+    <message key="PLUGINS_FORMS_CHOOSE_FORM_DIALOG_NO_FORM_SELECTED">You must select a form to export/show.</message>
+    <message key="PLUGINS_FORMS_CHOOSE_SHOW_FORM_ERROR">An error occured while getting form data.</message>
+    <message key="PLUGINS_FORMS_CHOOSE_SHOW_FORM_SUBMISSION_DATE">Submission datetime</message>
     
     <message key="PLUGINS_FORMS_EXPORT_COLUMN_ID">ID</message>
     <message key="PLUGINS_FORMS_EXPORT_COLUMN_DATE">Submission date</message>
Index: main/plugin-forms/resources/js/org/ametys/forms/FormsTool.i18n.js
===================================================================
--- main/plugin-forms/resources/js/org/ametys/forms/FormsTool.i18n.js	(revision 0)
+++ main/plugin-forms/resources/js/org/ametys/forms/FormsTool.i18n.js	(revision 0)
@@ -0,0 +1,208 @@
+/*
+ *  Copyright 2012 Anyware Services
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+Ext.namespace('org.ametys.forms.tool');
+
+org.ametys.forms.tool.FormsTool = function(id, pluginName) 
+{
+	org.ametys.forms.tool.FormsTool.superclass.constructor.call(this, id, pluginName);
+};
+
+Ext.extend(org.ametys.forms.tool.FormsTool, org.ametys.uitool.tool.Tool, {});
+
+org.ametys.forms.tool.FormsTool.prototype.createPanel = function ()
+{	
+	var store = new Ext.data.ArrayStore({
+	    fields: [],
+	    data: []
+	});
+	
+	this._resultGrid = new Ext.grid.GridPanel({
+		columns: [],
+		store: store,
+        autoScroll: true,
+        region: 'center'
+	});
+		
+	this._mainPanel = new Ext.Panel ({
+        layout: 'border',
+		tool: this,
+		cls: 'form-results',
+		items: [this._resultGrid]
+	});
+	
+	// Listeners
+	this._mainPanel.addListener('activate', this._onActivate, this);
+	
+	return this._mainPanel;
+}
+
+org.ametys.forms.tool.FormsTool.prototype._onActivate = function ()
+{
+	this._mainPanel.ownerCt.doLayout();
+}
+
+org.ametys.forms.tool.FormsTool.prototype.setParams = function (params)
+{
+	this.refresh(params['url']);
+}
+
+org.ametys.forms.tool.FormsTool.prototype.refresh = function (url)
+{
+	this.refreshing();
+	
+	var serverMessage = new org.ametys.servercomm.ServerMessage(
+		this._pluginName,
+		url,
+		{}, 
+		org.ametys.servercomm.ServerComm.PRIORITY_MAJOR,
+		this._showSelectedForm, 
+		this, 
+		[]
+	);
+	org.ametys.servercomm.ServerComm.getInstance().send(serverMessage);
+}
+
+org.ametys.forms.tool.FormsTool._booleanValue = function(val)
+{
+    return "&lt;img src='" + getPluginResourcesUrl(org.ametys.forms.ChooseForm._pluginName) + "/img/edition/cmp_input_checkbox_" + val + ".png' alt='" + val + "'/&gt;";
+}
+
+org.ametys.forms.tool.FormsTool._passwordValue = function(val)
+{
+    return "********";
+}
+
+org.ametys.forms.tool.FormsTool.prototype._showSelectedForm = function(response, args)
+{
+	if (org.ametys.servercomm.ServerComm.handleBadResponse("<i18n:text i18n:key='PLUGINS_FORMS_CHOOSE_SHOW_FORM_ERROR'/>", response, "org.ametys.forms.tool.FormsTool"))
+	{
+		return;
+	}
+	
+	var resourcesUrl = getPluginResourcesUrl(this._pluginName);
+	var form = response.selectSingleNode("//form");
+	var id = form.getAttribute("id");
+	var label = unescape(form.getAttribute("label"));
+	
+	var columns = [];
+	var fields = [];
+	var filefields = [];
+
+	columns.push({
+		header: "<i18n:text i18n:key='PLUGINS_FORMS_CHOOSE_SHOW_FORM_SUBMISSION_DATE'/>",
+		id: "submission-date",
+		dataIndex: "submission-date",
+		sortable: true,
+		hideable: true,
+		renderer: Ext.util.Format.dateRenderer('d/m/Y h:i'), 
+		align: "right"
+	});
+	fields.push("submission-date");
+	var columnNodes = form.selectNodes("columns/column");
+	for (var i=0; i &lt; columnNodes.length; i++)
+	{
+		var columnNode = columnNodes[i];
+		
+		var header = columnNode.getAttribute("label");
+		if (header.length == 0)
+		{
+			header = columnNode.getAttribute("field-name");
+		}
+		
+		var fieldtype = columnNode.getAttribute("type");
+		var fieldtypeImg = fieldtype.toLowerCase();
+		if (fieldtype == "TEXT" || fieldtype == "RADIO" || fieldtype == "CHECKBOX" || fieldtype == "PASSWORD" || fieldtype == "FILE" || fieldtype == "HIDDEN")
+		{
+			fieldtypeImg = "input_" + fieldtypeImg;
+		}
+		
+		if (fieldtype != "")
+		{
+			header = "&lt;img style='vertical-align:middle;' src='" + resourcesUrl + "/img/edition/" + fieldtypeImg + "_16.png'/&gt; " + header;
+		}
+		
+		var column = {
+			header: header,
+			dataIndex: columnNode.getAttribute("id"),
+			sortable: true,
+			hideable: true
+		};
+		if (fieldtype == "TEXT")
+		{
+			var valuetype = columnNode.getAttribute("regexptype");
+			if (valuetype == "int" || valuetype == "float" || valuetype == "date" || valuetype == "time" || valuetype == "datetime")
+			{
+				column.align = "right";
+			}
+		}
+		else if (fieldtype == "CHECKBOX")
+		{
+			column.renderer = org.ametys.forms.tool.FormsTool._booleanValue;
+		}
+		else if (fieldtype == "PASSWORD")
+		{
+			column.renderer = org.ametys.forms.tool.FormsTool._passwordValue;
+		}
+		else if (fieldtype == "FILE")
+		{
+			filefields.push(columnNode.getAttribute("id"));
+		}
+		columns.push(column);
+		
+		fields.push(columnNode.getAttribute("id"));
+	}
+	
+	var results = [];
+	var resultNodes = form.selectNodes("entry");
+	for (var i=0; i &lt; resultNodes.length; i++)
+	{
+		var resultNode = resultNodes[i];
+		var result = [];
+		var valueNodes = resultNode.selectNodes("value");
+		
+		result.push(resultNode.getAttribute("submission-date"));
+		for (var j=0; j &lt; valueNodes.length; j++)
+		{
+			var valueId = valueNodes[j].getAttribute("id");
+			var valueValue = valueNodes[j][org.ametys.servercomm.ServerComm.xmlTextContent];
+			if ($.inArray(valueId, filefields) >= 0)
+			{
+				result.push("&lt;a href='" + getPluginDirectUrl(this._pluginName) + "/" + context.parameters.siteName + "/download/" + id + "/" + resultNode.getAttribute("id") + "/" + valueId + "/" + valueValue + "'&gt;" + valueValue + "&lt;/a&gt;");
+			}
+			else
+			{
+				result.push(valueValue);
+			}
+		}
+		
+		results.push(result);
+	}
+	
+	var store = new Ext.data.ArrayStore({
+	    fields: fields,
+	    data: results
+	});
+	
+	var model = new Ext.grid.ColumnModel({
+        columns: columns
+	});
+	
+	this._resultGrid.reconfigure(store, model);
+	this._resultGrid.autoExpandColumn = "submission-date";
+	
+	this.upToDate();
+}
Index: main/plugin-forms/resources/js/org/ametys/forms/FormsActions.i18n.js
===================================================================
--- main/plugin-forms/resources/js/org/ametys/forms/FormsActions.i18n.js	(revision 17455)
+++ main/plugin-forms/resources/js/org/ametys/forms/FormsActions.i18n.js	(working copy)
@@ -19,26 +19,27 @@
 
 org.ametys.forms.buttons.Action = {};
 
-org.ametys.forms.buttons.Action.exportForm = function(controlId, controlConfiguration, controlPluginName)
+org.ametys.forms.buttons.Action.exportForm = function (control, configuration, index)
 {
-    var control = org.ametys.ribbon.RibbonManager.getInstance().getControls()[controlId];
-    
-    var contents = control._currentContentsId;
-    
-    org.ametys.forms.ChooseForm.act(controlId, controlConfiguration, controlPluginName, contents, org.ametys.forms.buttons.Action.selectedForm);
+    org.ametys.forms.ChooseForm.act(control, org.ametys.forms.buttons.Action.exportSelectedForm);
 }
 
-org.ametys.forms.buttons.Action.selectedForm = function(id, label)
+org.ametys.forms.buttons.Action.showForm = function(control, configuration, index)
 {
-    if (id != null)
-    {
-        var pluginName = org.ametys.forms.ChooseForm._pluginName;
-        var url = '/' + context.parameters.siteName + '/export/' + id + '/' + label + '.xls';
-        
-        window.location.href = getPluginDirectUrl(pluginName) + url;
-    }
+    org.ametys.forms.ChooseForm.act(control, org.ametys.forms.buttons.Action.showSelectedForm);
+}
+
+org.ametys.forms.buttons.Action.exportSelectedForm = function(url)
+{
+	window.location.href = getPluginDirectUrl(org.ametys.forms.ChooseForm._pluginName) + url + '.xls';
+}
+
+org.ametys.forms.buttons.Action.showSelectedForm = function(url)
+{
+	org.ametys.uitool.ToolsManager.getInstance().openTool('uitool-formresults', { url: url + '.xml' });
 }
 
+
 org.ametys.forms.ChooseForm = {};
 
 /**
@@ -61,10 +62,12 @@
 
 org.ametys.forms.ChooseForm._contentIds;
 
-org.ametys.forms.ChooseForm.act = function(id, config, pluginName, contentIds, callback)
+org.ametys.forms.ChooseForm.act = function(control, callback)
 {
+	var contentIds = control.ribbonControl._currentContentsId; 
+    
     org.ametys.forms.ChooseForm._currentForm = null;
-    org.ametys.forms.ChooseForm._pluginName = pluginName;
+    org.ametys.forms.ChooseForm._pluginName = control.ribbonControl._pluginName;
     org.ametys.forms.ChooseForm._callback = callback;
     org.ametys.forms.ChooseForm._contentIds = contentIds;
     
@@ -98,7 +101,7 @@
         }),
         hideHeaders : true,
         columns: [
-            {header: "<i18n:message i18n:key='PLUGINS_FORMS_UI_NAME'/>", width: 380, menuDisabled : true, sortable: true, dataIndex: 'displayName'}
+            {header: "<i18n:text i18n:key='PLUGINS_FORMS_UI_NAME'/>", width: 380, menuDisabled : true, sortable: true, dataIndex: 'displayName'}
         ],
         id: 'select-form-list',
         baseCls: 'select-form-list',
@@ -194,11 +197,13 @@
         }
         
         org.ametys.forms.ChooseForm._box.hide();
-        
+
         var formId = selection[0].id;
         var formLabel = selection[0].get('name');
         
-        org.ametys.forms.ChooseForm._callback(formId, formLabel);
+        var url = '/' + context.parameters.siteName + '/export/' + formId + '/' + formLabel;
+        
+        org.ametys.forms.ChooseForm._callback(url);
     }
     else
     {
Index: main/plugin-forms/resources/js/org/ametys/forms/FormsButton.js
===================================================================
--- main/plugin-forms/resources/js/org/ametys/forms/FormsButton.js	(revision 17455)
+++ main/plugin-forms/resources/js/org/ametys/forms/FormsButton.js	(working copy)
@@ -21,7 +21,7 @@
 	org.ametys.forms.buttons.FormsButton.superclass.constructor.call(this, id, configuration, pluginName);
 };
 
-Ext.extend(org.ametys.forms.buttons.FormsButton, org.ametys.ribbon.control.button.ActionButton, {});
+Ext.extend(org.ametys.forms.buttons.FormsButton, org.ametys.cms.ribbon.button.Menu, {});
 
 /**
  * @private
Index: main/plugin-forms/resources/js/org/ametys/forms/FormsToolFactory.js
===================================================================
--- main/plugin-forms/resources/js/org/ametys/forms/FormsToolFactory.js	(revision 0)
+++ main/plugin-forms/resources/js/org/ametys/forms/FormsToolFactory.js	(revision 0)
@@ -0,0 +1,73 @@
+/*
+ *  Copyright 2012 Anyware Services
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+Ext.namespace('org.ametys.forms.tool');
+
+/**
+ * Do not call this constructor. Decalred to and used by the {@see org.ametys.uitool.ToolsManager}
+ * @constructor
+ * @class The factory to creates page tools.
+ * @param {String} id The unique id of the factory
+ * @param {Map} config Options are : 'url' : the url to use to display page, with a 'path' parameter to place the page path; 'default-location' : where to place the tool; 'description' : the tooltip to display with following parameters 'siteUrl', 'siteTitle', 'lang', 'path'.
+ * @param {String} pluginName The name of the plugin where the factory was declared
+ */
+org.ametys.forms.tool.FormsToolFactory = function(id, config, pluginName) 
+{
+	org.ametys.forms.tool.FormsToolFactory.superclass.constructor.call(this, id, config, pluginName);
+};
+
+Ext.extend(org.ametys.forms.tool.FormsToolFactory, org.ametys.uitool.tool.ToolFactory, {});
+
+/**
+ * Creates a tool of type {@see org.ametys.cms.tool.content.ContentTool} or activate the existing one.
+ * There is one tool per content.
+ * @param {Map} params The params used by the factory is 'id' that is the content id. Params are transmited the the content tool.
+ * @return {Ext.org.ametys.uitool.tool.Tool} The tool to open.
+ */
+org.ametys.forms.tool.FormsToolFactory.prototype.openTool = function (params)
+{
+	var idTool = this._id + params['id'];
+	
+	if (org.ametys.uitool.ToolsManager.getInstance().getTool(idTool) == null)
+	{
+		var tool = new org.ametys.forms.tool.FormsTool(idTool, this.getPluginName());
+		tool.setConfiguration(this._config);
+		tool.setFactory(this);
+		
+		org.ametys.uitool.ToolsManager.getInstance().addUITool (tool, this._config['default-location']);
+	}
+	else
+	{
+		// Tool does already exists => Tool activation
+		tool = org.ametys.uitool.ToolsManager.getInstance().getTool(idTool);
+	}
+
+	tool.setParams(params);
+	tool.activate();
+	
+	return tool;
+}
+
+
+
+/**
+ * Destroy the tool.
+ * @param {org.ametys.uitool.tool.Tool} tool The tool to close.
+ */
+org.ametys.forms.tool.FormsToolFactory.prototype.closeTool = function (tool)
+{
+	org.ametys.uitool.ToolsManager.getInstance().removeUITool (tool);
+}
Index: main/plugin-forms/src/org/ametys/plugins/forms/data/FormsContentClientSideElement.java
===================================================================
--- main/plugin-forms/src/org/ametys/plugins/forms/data/FormsContentClientSideElement.java	(revision 17455)
+++ main/plugin-forms/src/org/ametys/plugins/forms/data/FormsContentClientSideElement.java	(working copy)
@@ -19,22 +19,24 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.commons.lang.StringUtils;
 
+import org.ametys.cms.clientsideelement.StaticMenu;
 import org.ametys.cms.repository.Content;
 import org.ametys.plugins.forms.Form;
 import org.ametys.plugins.forms.FormsException;
 import org.ametys.plugins.forms.jcr.FormPropertiesManager;
 import org.ametys.plugins.repository.AmetysObjectResolver;
-import org.ametys.runtime.ui.impl.StaticContextualClientSideElement;
 import org.ametys.runtime.util.I18nizableText;
 
 /**
  * This element creates a content button permitting to export the form data.
  */
-public class FormsContentClientSideElement extends StaticContextualClientSideElement
+public class FormsContentClientSideElement extends StaticMenu
 {
     
     /** The form properties manager. */
@@ -52,6 +54,12 @@
     }
     
     @Override
+    public void configure(Configuration configuration) throws ConfigurationException
+    {
+        super.configure(configuration);
+    }
+    
+    @Override
     public Map<String, I18nizableText> getCurrentParameters(Map<String, Object> parameters)
     {
         Map<String, I18nizableText> results = new HashMap<String, I18nizableText>();
Index: main/plugin-forms/plugin.xml
===================================================================
--- main/plugin-forms/plugin.xml	(revision 17455)
+++ main/plugin-forms/plugin.xml	(working copy)
@@ -1285,30 +1285,59 @@
 	
     <feature name="forms.ui.export">
         <extensions>
-            <extension id="org.ametys.forms.ExportForm"
+            <extension id="org.ametys.forms.ShowAndExportForm"
                        point="org.ametys.cms.workspace.ribbon.RibbonControlsManager"
                        class="org.ametys.plugins.forms.data.FormsContentClientSideElement">
-                <action class="org.ametys.forms.buttons.FormsButton">
-                    <param name="action">org.ametys.forms.buttons.Action.exportForm</param>
-                    
-                    <param name="label" i18n="true">PLUGINS_FORMS_UI_LABEL</param>
-                    <param name="default-description" i18n="true">PLUGINS_FORMS_UI_DESCRIPTION</param>
-                    
-                    <param name="description" i18n="true">PLUGINS_FORMS_UI_DESCRIPTION</param>
-                    
+				<action class="org.ametys.forms.buttons.FormsButton">
+					<param name="label" i18n="true">PLUGINS_SHOW_OR_EXPORT_FORMS_LABEL</param>
+					<param name="default-description" i18n="true">PLUGINS_SHOW_OR_EXPORT_FORMS_DESCRIPTION</param>
+                    <param name="description" i18n="true">PLUGINS_SHOW_OR_EXPORT_FORMS_DESCRIPTION</param>
+					
                     <param name="tooltip" i18n="true">PLUGINS_FORMS_UI_TOOLTIP</param>
                     <param name="no-forms-tooltip" i18n="true">PLUGINS_FORMS_UI_NO_FORMS_TOOLTIP</param>
                     
-                    <param name="icon-small" file="true">img/forms_16.png</param>
-                    <param name="icon-medium" file="true">img/forms_32.png</param>
-                    <param name="icon-large" file="true">img/forms_50.png</param>
-                </action>
+					<param name="icon-small" file="true">img/forms_16.png</param>
+					<param name="icon-medium" file="true">img/forms_32.png</param>
+					<param name="icon-large" file="true">img/forms_48.png</param>
+				</action> 
                 <right>Runtime_Rights_Forms_Export</right>
-                <scripts>
-                    <file>js/org/ametys/forms/FormsButton.js</file>
+				<menu-item id="org.ametys.forms.ExportForm">
+					<param name="action">org.ametys.forms.buttons.Action.exportForm</param>
+
+					<param name="label" i18n="true">PLUGINS_FORMS_UI_LABEL</param>
+					<param name="description" i18n="true">PLUGINS_FORMS_UI_DESCRIPTION</param>
+					<param name="iconSmall" file="true">img/forms_16.png</param>
+				</menu-item>
+				<menu-item id="org.ametys.forms.ShowForm">
+					<param name="action">org.ametys.forms.buttons.Action.showForm</param>
+
+					<param name="label" i18n="true">PLUGINS_SHOW_FORMS_UI_LABEL</param>
+					<param name="description" i18n="true">PLUGINS_SHOW_FORMS_UI_DESCRIPTION</param>
+					<param name="iconSmall" file="true">img/forms_16.png</param>
+				</menu-item>
+				<scripts>
+					<file>js/org/ametys/forms/FormsButton.js</file>
                     <file>js/org/ametys/forms/FormsActions.i18n.js</file>
-                </scripts>
-            </extension>
+				</scripts>
+			</extension>
+			
+    		<extension id="org.ametys.forms.FormsToolFactory"
+    				   point="org.ametys.cms.workspace.uitool.UIToolsFactoriesManager"
+    				   class="org.ametys.runtime.ui.impl.StaticContextualClientSideElement">
+				<action class="org.ametys.forms.tool.FormsToolFactory">
+					<param name="role">uitool-formresults</param>
+					<param name="title" i18n="true">UITOOL_FORM_RESULTS_LABEL</param>
+					<param name="description" i18n="true">UITOOL_FORM_RESULTS_DESCRIPTION</param>
+					<param name="icon-small" file="true">img/forms_16.png</param>
+					<param name="icon-medium" file="true">img/forms_32.png</param>
+					<param name="icon-large" file="true">img/forms_48.png</param>
+					<param name="default-location"></param>
+				</action>
+				<scripts>
+					<file>js/org/ametys/forms/FormsTool.i18n.js</file>
+					<file>js/org/ametys/forms/FormsToolFactory.js</file>
+				</scripts>
+    		</extension>
         </extensions>
     </feature>
         
Index: ivy.xml
===================================================================
--- ivy.xml	(revision 17455)
+++ ivy.xml	(working copy)
@@ -15,7 +15,7 @@
    limitations under the License.
    -->
 <ivy-module version="1.0">
-  <info organisation="org.ametys.plugins" module="forms" branch="1.4.x">
+  <info organisation="org.ametys.plugins" module="forms" branch="1.5.x">
     <license url="http://www.apache.org/licenses/LICENSE-2.0" name="ASL2"/>
     <description homepage="http://www.ametys.org/">
 Ametys plugin providing forms creation.
@@ -40,7 +40,7 @@
     <dependency org="org.ametys.tools" name="tools" rev="latest.integration" conf="deliver->default"/>
     <dependency org="atlassian" name="clover" rev="2.6.3" conf="deliver->default"/>
     
-  	<dependency org="org.ametys.web" name="web" branch="3.4.x" rev="latest.integration" conf="default->default;runtime->runtime;resources->resources"/>
+  	<dependency org="org.ametys.web" name="web" branch="3.5.x" rev="latest.integration" conf="default->default;runtime->runtime;resources->resources"/>
   	<dependency org="jquery" name="jquery-ui" rev="1.8.16" conf="runtime->default"/>
 
     <!-- test configuration -->