[portal-commits] JBoss Portal SVN: r6584 - in trunk/core-admin/src: main/org/jboss/portal/core/admin/ui/portlet and 1 other directories.

Author: thomas.heute(a)jboss.com Date: 2007-03-07 16:40:41 -0500 (Wed, 07 Mar 2007) New Revision: 6584 Modified: trunk/core-admin/src/bin/portal-admin-war/style.css trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletContentEditorPortlet.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml Log: - PortletContentEditorPortlet displaying instances in a paged table Modified: trunk/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-07 19:19:00 UTC (rev 6583) +++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-07 21:40:41 UTC (rev 6584) @@ -86,11 +86,6 @@ /* Style a table for form layout */ .admin-ui table.form { - border-spacing: 10px 4px; - margin-left: -10px; - margin-right: -10px; - margin-top: -4px; - margin-bottom: -4px; } .admin-ui table.form td.label { Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletContentEditorPortlet.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletContentEditorPortlet.java 2007-03-07 19:19:00 UTC (rev 6583) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletContentEditorPortlet.java 2007-03-07 21:40:41 UTC (rev 6584) @@ -67,10 +67,15 @@ if (req.getPortletMode().equals(EDIT_CONTENT)) { String uri = req.getParameter("uri"); + String from = req.getParameter("from"); if (uri != null) { resp.setRenderParameter("uri", uri); } + if (from != null) + { + resp.setRenderParameter("from", from); + } } } @@ -79,68 +84,95 @@ if (req.getPortletMode().equals(EDIT_CONTENT)) { String selectedURI = req.getParameter("uri"); - + String selectedFrom = req.getParameter("from"); + int pagination = 10; + int from = 0; + if (selectedFrom != null) + { + from = new Integer(selectedFrom).intValue(); + } + // - PortletURL actionURL = resp.createActionURL(); - actionURL.setParameter("meta_action", "select"); - - // resp.setContentType("text/html"); PrintWriter writer = resp.getWriter(); // load insances this user has access to. List available_instances = (List)instanceContainer.getDefinitions(); - Instance selectedInstance = null; - writer.print("<form action=\""); - writer.print(actionURL); - writer.print("\" method=\"post\">\n"); - writer.println("<select name=\"uri\"size=\"20\">\n"); - for (int i = 0; i < available_instances.size(); i++) + + writer.println("<script>"); + writer.println("function togglediv(nr) {"); + writer.println(" if (document.getElementById)"); + writer.println(" {"); + writer.println(" vista = (document.getElementById(nr).style.display == 'none') ? 'block' : 'none';"); + writer.println(" document.getElementById(nr).style.display = vista;"); + writer.println(" }"); + writer.println("}"); + writer.println("</script>"); + + + writer.println("<br /><br /><table id=\"instancesTable2\">"); + writer.println("<thead class=\"portlet-section-header\">"); + writer.println(" <tr>"); + writer.println(" <th>Portlet instances</th>"); + writer.println(" </tr>"); + writer.println("</thead>"); + writer.println("<tbody>"); + for (int i = from; i < Math.min(available_instances.size(), from + pagination); i++) { Instance instance = (Instance)available_instances.get(i); - // - writer.print("<option value=\""); - writer.print(instance.getId()); - writer.print("\""); + PortletURL actionURL = resp.createActionURL(); + actionURL.setParameter("meta_action", "select"); + actionURL.setParameter("uri", instance.getId()); + actionURL.setParameter("from", "" + from); - // - if (instance.getId().equals(selectedURI)) + String trClass = instance.getId().equals(selectedURI) ? "portlet-section-selected" : (i % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate"); + + writer.println(" <tr class=\" " + trClass + "\">"); + writer.println(" <td>"); + writer.println(" <a onmouseout=\"togglediv('menu"+ i + "');\" onmouseover=\"togglediv('menu"+ i + "');\" href=\"" + actionURL + "\">"); + writer.println(instance.getId()); + writer.println("</a>"); + writer.println(" </td>"); + writer.println(" </tr>"); + } + writer.println(" </tbody>"); + writer.println(" </table>"); + writer.println(" <ul class=\"pagination\">"); + for (int i=0; i<available_instances.size(); i += pagination) + { + String liClass = i == from ? "selected" : ""; + PortletURL renderURL = resp.createRenderURL(); + if (selectedURI != null) { - selectedInstance = instance; - writer.print(" selected=\"selected\""); + renderURL.setParameter("uri", selectedURI); } - - // - writer.print(">"); - writer.print(instance.getId()); - writer.println("</option>\n"); + renderURL.setParameter("from", "" + i); + writer.println(" <li class=\"" + liClass + "\">"); + writer.println(" <a href=\"" + renderURL + "\">" + i + "</a>"); + writer.println(" </li>"); } - writer.println("</select>"); - writer.println("<input name=\"select\" value=\"Select\" type=\"submit\"/>"); - writer.print("</form>"); + writer.println(" </ul>"); - // - if (selectedInstance != null) + for (int i = from; i < Math.min(available_instances.size(), from + pagination); i++) { - writer.print("<div class=\"portlet-font\" style=\"float:left\">"); - writer.print("<div><span class=\"portlet-form-field-label\">Portlet instance:</span>" + selectedURI + "</div>"); + Instance instance = (Instance)available_instances.get(i); + + writer.print("<div style=\"display:none;\" id=\"menu" + i + "\">"); try { - Portlet portlet = selectedInstance.getPortlet(); - if (portlet != null) - { - MetaInfo metaInfo = portlet.getInfo().getMeta(); - writer.print("<div><span class=\"portlet-form-field-label\">Portlet name:</span>" + metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() + "</div>"); - writer.print("<div><span class=\"portlet-form-field-label\">Portlet description:</span>" + metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() + "</div>"); - writer.print("<div><span class=\"portlet-form-field-label\">Portlet title:</span>" + metaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() + "</div>"); - writer.print("<div><span class=\"portlet-form-field-label\">Portlet keywords:</span>" + metaInfo.getMetaValue(MetaInfo.KEYWORDS).getDefaultString() + "</div>"); - } + Portlet portlet = instance.getPortlet(); + MetaInfo metaInfo = portlet.getInfo().getMeta(); + writer.print("<div><span class=\"portlet-form-field-label\">Portlet name:</span>" + metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() + "</div>"); + writer.print("<div><span class=\"portlet-form-field-label\">Portlet description:</span>" + metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() + "</div>"); + writer.print("<div><span class=\"portlet-form-field-label\">Portlet title:</span>" + metaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() + "</div>"); + writer.print("<div><span class=\"portlet-form-field-label\">Portlet keywords:</span>" + metaInfo.getMetaValue(MetaInfo.KEYWORDS).getDefaultString() + "</div>"); } catch (PortletInvokerException e) { e.printStackTrace(); } + writer.print("</div>"); } // Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-03-07 19:19:00 UTC (rev 6583) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-03-07 21:40:41 UTC (rev 6584) @@ -64,9 +64,7 @@ <table class="form"> <tr> <td class="label"> - <h:outputLabel for="windowName"> - <h:outputText value="Window Name: " styleClass="portlet-form-field-label"/> - </h:outputLabel> + <span class="portlet-form-field-label">Window Name:</span> </td> <td class="widget"> <h:inputText id="windowName" value="#{assignWindowsAction.windowName}" styleClass="portlet-form-input-field"/> @@ -75,7 +73,7 @@ </tr> <tr> <td class="label"> - <span class="portlet-form-field-label label">Content type:</span> + <span class="portlet-form-field-label">Content type:</span> </td> <td class="widget"> <h:selectOneMenu @@ -88,18 +86,13 @@ <h:message for="instanceId" errorClass="portlet-msg-error"/> </td> </tr> - <tr> - <td class="label"> - <span class="portlet-form-field-label label">Portlet content:</span> - </td> - <td class="widget"> - </td> - </tr> </table> </div> </h:form> - - <div> + <br /> + <span class="portlet-form-field-label">Portlet content:</span> + <br /> + <div align="left"> <jbp:portlet instanceId="#{portalobjectmgr.selectedContentEditorInstance}" actionListener="#{portalobjectmgr.processEvent}"