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 cd...@apache.org on 2007/03/13 18:03:09 UTC
svn commit: r517776 -
/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
Author: cdoremus
Date: Tue Mar 13 10:03:08 2007
New Revision: 517776
URL: http://svn.apache.org/viewvc?view=rev&rev=517776
Log:
Prefixed portlet:namespace tag to each JavaScript function and global variable name and references to the functions in the HTML.
Modified:
portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp?view=diff&rev=517776&r1=517775&r2=517776
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp (original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp Tue Mar 13 10:03:08 2007
@@ -21,6 +21,8 @@
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ taglib uri="http://portals.apache.org/pluto/portlet-el" prefix="portlet-el" %>
+<portlet:defineObjects/>
+
<portlet:actionURL var="formActionUrl"/>
<form name="adminForm" action="<c:out value="${formActionUrl}"/>" method="POST">
<script type="text/javascript">
@@ -30,22 +32,23 @@
<div>
<h2>Portal Pages</h2>
+ <!-- h4>Namespace: <portlet:namespace/> </h4 -->
<p>
<script type="text/javascript">
- var placedPortlets = new Array();
+ var <portlet:namespace/>placedPortlets = new Array();
<c:forEach items="${availablePages}" var="page">
- placedPortlets['<c:out value="${page.id}"/>'] = new Array();
- var i = 0;
+ <portlet:namespace/>placedPortlets['<c:out value="${page.id}"/>'] = new Array();
+ var <portlet:namespace/>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}"/>';
+ <portlet:namespace/>placedPortlets['<c:out value="${page.id}"/>'][<portlet:namespace/>i] = new Array();
+ <portlet:namespace/>placedPortlets['<c:out value="${page.id}"/>'][<portlet:namespace/>i][0] = '<c:out value="${portlet.id}"/>';
+ <portlet:namespace/>placedPortlets['<c:out value="${page.id}"/>'][<portlet:namespace/>i++][1] = '<c:out value="${portlet.portletName}"/>';
</c:forEach>
</c:forEach>
- function doSwitchPage(select) {
+ function <portlet:namespace/>doSwitchPage(select) {
var placePortletsSelect = document.forms['adminForm'].elements['placedPortlets'];
- for(var i=0;i<placePortletsSelect.options.length;i++) {
+ for(var i=0; i < placePortletsSelect.options.length;i++) {
placePortletsSelect.options[i] = null;
}
@@ -56,8 +59,8 @@
return;
}
- for(var i=0;i<placedPortlets[select.value].length;i++) {
- placePortletsSelect[i] = new Option(placedPortlets[select.value][i][1], placedPortlets[select.value][i][0]);
+ for(var i=0; i < <portlet:namespace/>placedPortlets[select.value].length;i++) {
+ placePortletsSelect[i] = new Option(<portlet:namespace/>placedPortlets[select.value][i][1], <portlet:namespace/>placedPortlets[select.value][i][0]);
}
}
@@ -67,7 +70,7 @@
- <select name="page" onChange="doSwitchPage(this)">
+ <select name="page" onChange="<portlet:namespace/>doSwitchPage(this)">
<option value="Select. . .">Select. . .</option>
<c:forEach items="${driverConfig.pages}" var="page">
<option value="<c:out value="${page.name}"/>"><c:out value="${page.name}"/></option>
@@ -87,49 +90,48 @@
<div>
<h2>Portlet Applications</h2>
<p>
- <!-- TODO: Should be namespaced! -->
<script type="text/javascript">
- var portlets = new Array();
+ var <portlet:namespace/>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. . .';
+ var <portlet:namespace/>i = 0;
+ <portlet:namespace/>portlets['<c:out value="${app.applicationId}"/>'] = new Array();
+ <portlet:namespace/>portlets['<c:out value="${app.applicationId}"/>'][<portlet:namespace/>i++] = 'Select. . .';
<c:forEach items="${app.portletApplicationDefinition.portlets}" var="portlet">
- portlets['<c:out value="${app.applicationId}"/>'][i++] = '<c:out value="${portlet.portletName}"/>';
+ <portlet:namespace/>portlets['<c:out value="${app.applicationId}"/>'][<portlet:namespace/>i++] = '<c:out value="${portlet.portletName}"/>';
</c:forEach>
</c:forEach>
- function doSwitch(select) {
+ function <portlet:namespace/>doSwitch(select) {
var portletsSelectBox = document.forms['adminForm'].elements['availablePortlets'];
- for(i = 0; i< portletsSelectBox.options.length;i++) {
+ for(var i = 0; i < portletsSelectBox.options.length;i++) {
portletsSelectBox.options[i] = null;
}
if (select.value == '-') {
document.forms['adminForm'].elements['availablePortlets'].disabled = true;
} else {
portletsSelectBox.disabled = false;
- var pList = portlets[select.value];
+ var pList = <portlet:namespace/>portlets[select.value];
for (i = 0; i < pList.length; i++) {
portletsSelectBox.options[i] = new Option(pList[i], pList[i]);
}
}
- doSwitchButton(portletsSelectBox);
+ <portlet:namespace/>doSwitchButton(portletsSelectBox);
}
- function doSwitchButton(select) {
+ function <portlet:namespace/>doSwitchButton(select) {
document.forms['adminForm'].elements['command'][1].disabled = (select.value == 'Select. . .' || select.disabled);
}
</script>
- <select name="applications" onChange="doSwitch(this)">
+ <select name="applications" onChange="<portlet:namespace/>doSwitch(this)">
<option value='-'>Select. . .</option>
<c:forEach items="${portletContainer.optionalContainerServices.portletRegistryService.registeredPortletApplications}" var="app">
<option value="<c:out value="${app.applicationId}"/>"><c:out value="${app.applicationName}"/></option>
</c:forEach>
</select>
- <select name="availablePortlets" disabled="true" onChange='doSwitchButton(this)'>
+ <select name="availablePortlets" disabled="true" onChange='<portlet:namespace/>doSwitchButton(this)'>
</select>