You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by es...@apache.org on 2007/06/29 05:21:53 UTC
svn commit: r551781 - in /portals/pluto/branches/pluto-1.1.x:
pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java
pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
Author: esm
Date: Thu Jun 28 20:21:52 2007
New Revision: 551781
URL: http://svn.apache.org/viewvc?view=rev&rev=551781
Log:
[PLUTO-341]: Admin portlet now works with IE 6. Had to switch from using button elements to input elements. Also tested to work with IE 7.
Modified:
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java
portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java?view=diff&rev=551781&r1=551780&r2=551781
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/PageAdminPortlet.java Thu Jun 28 20:21:52 2007
@@ -45,10 +45,10 @@
public void processAction(ActionRequest request, ActionResponse response) {
String command = request.getParameter("command");
- if("add".equalsIgnoreCase(command)) {
+ if("Add Portlet".equalsIgnoreCase(command)) {
doAddPortlet(request);
}
- else if ("remove".equalsIgnoreCase(command)) {
+ else if ("Remove Portlet".equalsIgnoreCase(command)) {
doRemovePortlet(request);
}
}
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp?view=diff&rev=551781&r1=551780&r2=551781
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp Thu Jun 28 20:21:52 2007
@@ -35,11 +35,10 @@
var placedPortlets = new Array();
<c:forEach items="${availablePages}" var="page">
placedPortlets['<c:out value="${page.id}"/>'] = new Array();
- var i = 0;
- <c:forEach items="${page.portlets}" var="portlet">
- placedPortlets['<c:out value="${page.id}"/>'][i] = new Array();
- placedPortlets['<c:out value="${page.id}"/>'][i][0] = '<c:out value="${portlet.id}"/>';
- placedPortlets['<c:out value="${page.id}"/>'][i++][1] = '<c:out value="${portlet.portletName}"/>';
+ <c:forEach items="${page.portlets}" var="portlet" varStatus="loopStatus">
+ placedPortlets['<c:out value="${page.id}"/>'][<c:out value="${loopStatus.index}"/>] = new Array();
+ placedPortlets['<c:out value="${page.id}"/>'][<c:out value="${loopStatus.index}"/>][0] = '<c:out value="${portlet.id}"/>';
+ placedPortlets['<c:out value="${page.id}"/>'][<c:out value="${loopStatus.index}"/>][1] = '<c:out value="${portlet.portletName}"/>';
</c:forEach>
</c:forEach>
@@ -77,10 +76,9 @@
<select name="placedPortlets" size="5">
</select>
-
- <button name="command" disabled="true" value="remove">
- Remove
- </button>
+ <p>
+ <input id="removeButton" type="submit" name="command" disabled="true" value="Remove Portlet"></input>
+ </p>
</p>
</div>
@@ -92,11 +90,10 @@
<script type="text/javascript">
var portlets = new Array();
<c:forEach items="${portletContainer.optionalContainerServices.portletRegistryService.registeredPortletApplications}" var="app">
- var i = 0;
portlets['<c:out value="${app.applicationId}"/>'] = new Array();
- portlets['<c:out value="${app.applicationId}"/>'][i++] = 'Select. . .';
- <c:forEach items="${app.portletApplicationDefinition.portlets}" var="portlet">
- portlets['<c:out value="${app.applicationId}"/>'][i++] = '<c:out value="${portlet.portletName}"/>';
+ portlets['<c:out value="${app.applicationId}"/>'][0] = 'Select. . .';
+ <c:forEach items="${app.portletApplicationDefinition.portlets}" var="portlet" varStatus="loopStatus">
+ portlets['<c:out value="${app.applicationId}"/>'][<c:out value="${loopStatus.index + 1}"/>] = '<c:out value="${portlet.portletName}"/>';
</c:forEach>
</c:forEach>
@@ -133,9 +130,9 @@
</select>
- <button name="command" disabled="true" value="add">
- Add Portlet
- </button>
+ <p>
+ <input id="addButton" type="submit" name="command" disabled="true" value="Add Portlet"></input>
+ </p>
</p>
</div>
</form>