Author: jkoster
Date: 2009-05-29 10:10:13 +0200 (Fri, 29 May 2009)
New Revision: 35496
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login/login.jsp
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login/register.jsp
Log:
CMSC-1413 - Wrong include directories used in EditDefaults of register portlet
1.6/1.7; HTML not closed properly.
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login/login.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login/login.jsp
2009-05-29 08:10:10 UTC (rev 35495)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login/login.jsp
2009-05-29 08:10:13 UTC (rev 35496)
@@ -6,13 +6,13 @@
document.forms['<portlet:namespace />form'].registrationpage.value =
page;
document.forms['<portlet:namespace
/>form'].registrationpagepathuri.value = path;
}
-function selectRedirectPage(page, path) {
- document.forms['<portlet:namespace />form'].page.value = page;
- document.forms['<portlet:namespace />form'].pagepath.value = path;
-}
-function erase(field) {
- document.forms['<portlet:namespace />form'][field].value = '';
-}
+ function selectRedirectPage(page, path) {
+ document.forms['<portlet:namespace />form'].page.value = page;
+ document.forms['<portlet:namespace />form'].pagepath.value = path;
+ }
+ function erase(field) {
+ document.forms['<portlet:namespace />form'][field].value = '';
+ }
</script>
<form name="<portlet:namespace />form" method="post" target="_parent"
action="<cmsc:actionURL><cmsc:param name="action"
value="edit"/></cmsc:actionURL>">
<table class="editcontent">
@@ -57,13 +57,14 @@
<img src="<cmsc:staticurl
page='/editors/gfx/icons/erase.png'/>" alt="<fmt:message
key="edit_defaults.erase"/>"/></a>
</td>
<td>
- <mm:cloud>
- <mm:node number="${registrationpage}" notfound="skip">
- <mm:field name="path" id="registrationpagepathuri"
write="false" />
- </mm:node>
- </mm:cloud>
- <input type="hidden" name="registrationpage"
value="${registrationpage}" />
- <input type="text" name="registrationpagepathuri"
value="${registrationpagepathuri}" disabled="true" />
+ <mm:cloud>
+ <mm:node number="${registrationpage}" notfound="skip">
+ <mm:field name="path" id="registrationpagepathuri"
write="false" />
+ </mm:node>
+ </mm:cloud>
+ <input type="hidden" name="registrationpage"
value="${registrationpage}" />
+ <input type="text" name="registrationpagepathuri"
value="${registrationpagepathuri}" disabled="true" />
+ </td>
</tr>
<tr>
<td nowrap><fmt:message key="edit_defaults.login.redirect" />:</td>
@@ -75,13 +76,14 @@
<img src="<cmsc:staticurl
page='/editors/gfx/icons/erase.png'/>" alt="<fmt:message
key="edit_defaults.erase"/>"/></a>
</td>
<td>
- <mm:cloud>
- <mm:node number="${page}" notfound="skip">
- <mm:field name="path" id="pagepath" write="false" />
- </mm:node>
- </mm:cloud>
- <input type="hidden" name="page" value="${page}" />
- <input type="text" name="pagepath" value="${pagepath}"
disabled="true" />
+ <mm:cloud>
+ <mm:node number="${page}" notfound="skip">
+ <mm:field name="path" id="pagepath" write="false" />
+ </mm:node>
+ </mm:cloud>
+ <input type="hidden" name="page" value="${page}" />
+ <input type="text" name="pagepath" value="${pagepath}"
disabled="true" />
+ </td>
</tr>
<%-- Save button --%>
<c:import url="../sections/savebutton.jsp" />
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login/register.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login/register.jsp
2009-05-29 08:10:10 UTC (rev 35495)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/edit_defaults/login/register.jsp
2009-05-29 08:10:13 UTC (rev 35496)
@@ -97,17 +97,18 @@
<img src="<cmsc:staticurl
page='/editors/gfx/icons/erase.png'/>" alt="<fmt:message
key="edit_defaults.erase"/>"/></a>
</td>
<td>
- <mm:cloud>
- <mm:node number="${termsPage}" notfound="skip">
- <mm:field name="path" id="pagepath" write="false" />
- </mm:node>
- </mm:cloud>
- <input type="hidden" name="termsPage" value="${termsPage}" />
- <input type="text" name="pagepath" value="${pagepath}"
disabled="true" />
+ <mm:cloud>
+ <mm:node number="${termsPage}" notfound="skip">
+ <mm:field name="path" id="pagepath" write="false" />
+ </mm:node>
+ </mm:cloud>
+ <input type="hidden" name="termsPage" value="${termsPage}" />
+ <input type="text" name="pagepath" value="${pagepath}"
disabled="true" />
+ </td>
</tr>
<%-- Save button --%>
- <c:import url="sections/savebutton.jsp" />
+ <c:import url="../sections/savebutton.jsp" />
</table>
</form>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
