Author: jkoster
Date: 2010-02-02 14:18:55 +0100 (Tue, 02 Feb 2010)
New Revision: 40785
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/stylesheet.xml
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout/newsletter/newsletter_advanced.jsp
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout_plain/newsletter/newsletter_advanced.jsp
Log:
CMSC-1565 - Please use proper JSTL methods. Fixed some translations too.
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/stylesheet.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/stylesheet.xml
2010-02-02 13:13:52 UTC (rev 40784)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/stylesheet.xml
2010-02-02 13:18:55 UTC (rev 40785)
@@ -63,8 +63,8 @@
</field>
<field name="text">
<gui>
- <guiname xml:lang="nl">Text</guiname>
- <guiname xml:lang="en">Tekst</guiname>
+ <guiname xml:lang="nl">Tekst</guiname>
+ <guiname xml:lang="en">Text</guiname>
<guiname xml:lang="zh">文本</guiname>
</gui>
<editor>
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout/newsletter/newsletter_advanced.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout/newsletter/newsletter_advanced.jsp
2010-02-02 13:13:52 UTC (rev 40784)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout/newsletter/newsletter_advanced.jsp
2010-02-02 13:18:55 UTC (rev 40785)
@@ -13,10 +13,10 @@
<link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl.css'/>" media="screen,projection,print" />
<link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/2column.css'/>" media="screen,projection,print" />
<c:forEach var="style" items="${stylesheet}">
- <c:if test="${style.resource eq ''}">
+ <c:if test="${empty style.resource}">
<link rel="stylesheet" type="text/css"
href="/servlet/StylesheetServlet?text=${style.text}" media="${style.media}" />
</c:if>
- <c:if test="${style.resource ne '' }">
+ <c:if test="${not empty style.resource}">
<link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/${style.resource}'/>" media="${style.media}" />
</c:if>
</c:forEach>
@@ -28,24 +28,22 @@
<cmscf:editresources />
</head>
-
<body>
- <%...@include file="includes/top.jsp" %>
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td valign="top" width="75%"><cmsc:insert-portlet
layoutid="column1_1" /></td>
- <td rowspan="3" width="25%"><cmsc:insert-portlet
layoutid="column2_1" /></td>
- </tr>
- <tr>
- <td valign="top" width="75%"><cmsc:insert-portlet
layoutid="column1_2" /></td>
- </tr>
- <tr>
- <td valign="top" width="75%"><cmsc:insert-portlet
layoutid="column1_3" /></td>
- </tr>
+ <%...@include file="includes/top.jsp" %>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td valign="top" width="75%"><cmsc:insert-portlet
layoutid="column1_1" /></td>
+ <td rowspan="3" width="25%"><cmsc:insert-portlet layoutid="column2_1"
/></td>
+ </tr>
+ <tr>
+ <td valign="top" width="75%"><cmsc:insert-portlet
layoutid="column1_2" /></td>
+ </tr>
+ <tr>
+ <td valign="top" width="75%"><cmsc:insert-portlet
layoutid="column1_3" /></td>
+ </tr>
+ <%...@include file="includes/footer.jsp"%>
- <%...@include file="includes/footer.jsp"%>
-
</body>
</cmsc:screen>
</html>
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout_plain/newsletter/newsletter_advanced.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout_plain/newsletter/newsletter_advanced.jsp
2010-02-02 13:13:52 UTC (rev 40784)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout_plain/newsletter/newsletter_advanced.jsp
2010-02-02 13:18:55 UTC (rev 40785)
@@ -13,10 +13,10 @@
<link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl.css'/>" media="screen,projection,print" />
<link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/2column.css'/>" media="screen,projection,print" />
<c:forEach var="style" items="${stylesheet}">
- <c:if test="${style.resource eq ''}">
+ <c:if test="${empty style.resource}">
<link rel="stylesheet" type="text/css"
href="/servlet/StylesheetServlet?text=${style.text}" media="${style.media}" />
</c:if>
- <c:if test="${style.resource ne '' }">
+ <c:if test="${not empty style.resource}">
<link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/${style.resource}'/>" media="${style.media}" />
</c:if>
</c:forEach>
@@ -28,10 +28,9 @@
<cmscf:editresources />
</head>
-
<body>
- <%...@include file="includes/top.jsp" %>
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <%...@include file="includes/top.jsp" %>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td valign="top" width="75%"><cmsc:insert-portlet
layoutid="column1_1" /></td>
<td rowspan="3" width="25%"><cmsc:insert-portlet
layoutid="column2_1" /></td>
@@ -43,9 +42,8 @@
<td valign="top" width="75%"><cmsc:insert-portlet
layoutid="column1_3" /></td>
</tr>
+ <%...@include file="includes/footer.jsp"%>
- <%...@include file="includes/footer.jsp"%>
-
</body>
</cmsc:screen>
</html>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
