Author: julien(a)jboss.com Date: 2007-06-25 19:40:29 -0400 (Mon, 25 Jun 2007) New Revision: 7541 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp Log: improved a bit usability of widgets and clear content selection on content type change Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-06-25 22:51:04 UTC (rev 7540) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-06-25 23:40:29 UTC (rev 7541) @@ -106,7 +106,7 @@ public Page page; /** . */ - public ContentType selectedContentType; + private ContentType selectedContentType; /** . */ public DynamicMap assignedWindows = new DynamicMap(); @@ -141,6 +141,19 @@ return types; } + public ContentType getSelectedContentType() + { + return selectedContentType; + } + + public void setSelectedContentType(ContentType selectedContentType) + { + this.selectedContentType = selectedContentType; + this.selectedContentURI = null; + this.selectedContentParameters = null; + this.selectedRenderParameters = new HashMap(); + } + public String getSelectedEditorPortletId() { if (selectedContentType != null) Modified: trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp 2007-06-25 22:51:04 UTC (rev 7540) +++ trunk/widget/src/resources/widget-war/WEB-INF/jsp/edit.jsp 2007-06-25 23:40:29 UTC (rev 7541) @@ -8,6 +8,7 @@ <%@ page import="org.jboss.portal.widget.google.provider.GGQuery" %> <%@ page import="org.jboss.portal.widget.google.type.EnumType" %> <%@ page import="javax.portlet.PortletURL" %> +<%@ page import="org.jboss.portal.common.util.IteratorStatus" %> <%@ page language="java"%> <%@ taglib uri="http://java.sun.com/portlet" prefix="p" %> <%@ page isELIgnored="false" %> @@ -65,8 +66,46 @@ <input type="submit" value="Search Gadgets" class="portlet-form-button"/> </form> +<p> +<table style="width:100%;border:1px solid" cellspacing="0" cellpadding="0"> + <% + for (IteratorStatus i = new IteratorStatus(result.getWidgetIterator()); i.hasNext();) + { + GGWidget widget = (GGWidget)i.next(); + boolean selected = selWidget != null && selWidget.getId().equals(widget.getId()); + PortletURL selectURL = renderResponse.createActionURL(); + + // Set parameters for selection + selectURL.setParameter("content.action.select", "content.action.select"); + selectURL.setParameter("content.uri", widget.getId()); + + // Set default parametrization state + for (Iterator j = widget.getPreferencesInfo().getPreferencesInfo().iterator(); j.hasNext();) + { + GGPreferenceInfo prefInfo = (GGPreferenceInfo)j.next(); + String paramName = "content.param." + prefInfo.getName(); + String defaultValue = prefInfo.getDefaultValue() != null ? prefInfo.getDefaultValue() : ""; + selectURL.setParameter(paramName, defaultValue); + } + + // Propagage search nav state + selectURL.setParameter("cat", catTerm); + selectURL.setParameter("query", queryTerm); + + // + String rowClass = selected ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate"); + %> + <tr class="<%= rowClass %>"> + <td><a href="<%= selectURL %>"><%= widget.getTitle().getDefaultString() %></a></td> + </tr> + <% + } + %> +</table> +</p> + <% - if (selWidget != null) + if (selWidget != null && !selWidget.getPreferencesInfo().getPreferencesInfo().isEmpty()) { PortletURL selectURL = renderResponse.createActionURL(); @@ -78,7 +117,6 @@ selectURL.setParameter("cat", catTerm); selectURL.setParameter("query", queryTerm); %> -<p>You have selected the widget <%= selWidget.getTitle().getDefaultString() %></p> <p> <form action="<%= selectURL %>" method="post"> <% @@ -157,36 +195,6 @@ <% } %> - -<ul> - <% - for (Iterator i = result.getWidgetIterator(); i.hasNext();) - { - GGWidget widget = (GGWidget)i.next(); - PortletURL selectURL = renderResponse.createActionURL(); - - // Set parameters for selection - selectURL.setParameter("content.action.select", "content.action.select"); - selectURL.setParameter("content.uri", widget.getId()); - - // Set default parametrization state - for (Iterator j = widget.getPreferencesInfo().getPreferencesInfo().iterator();j.hasNext();) - { - GGPreferenceInfo prefInfo = (GGPreferenceInfo)j.next(); - String paramName = "content.param." + prefInfo.getName(); - String defaultValue = prefInfo.getDefaultValue() != null ? prefInfo.getDefaultValue() : ""; - selectURL.setParameter(paramName, defaultValue); - } - - // Propagage search nav state - selectURL.setParameter("cat", catTerm); - selectURL.setParameter("query", queryTerm); - %> - <li><a href="<%= selectURL %>"><%= widget.getTitle().getDefaultString() %></a></li> - <% - } - %> -</ul> - + </div> \ No newline at end of file