Author: jonesde
Date: Fri Mar 9 14:45:06 2007
New Revision: 516594
URL:
http://svn.apache.org/viewvc?view=rev&rev=516594Log:
A few cleanups and fixed the stuff related to using cms instead of control for the ControlServlet name
Modified:
ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl
ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl
ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml
Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl?view=diff&rev=516594&r1=516593&r2=516594==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/cms/HtmlHead.ftl Fri Mar 9 14:45:06 2007
@@ -16,7 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${(decoratedContent.subcontent.title.render)?default("CMS Site Generic Title (Set subcontent 'title' on your content!)")}</title>
<link rel="shortcut icon" href="/images/ofbiz.ico" />
@@ -30,4 +29,3 @@
<meta name="description" content="${(decoratedContent.subcontent.metaDescription.render)?default("")}"/>
<meta name="keywords" content="${(decoratedContent.subcontent.metaKeywords.render)?default("")}"/>
-
Modified: ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl?view=diff&rev=516594&r1=516593&r2=516594==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl (original)
+++ ofbiz/trunk/specialpurpose/cmssite/template/cms/MainDecorator.ftl Fri Mar 9 14:45:06 2007
@@ -21,7 +21,7 @@
<html xmlns="
http://www.w3.org/1999/xhtml">
<head>
-${thisContent.subcontent.htmlHead.render}
+${thisContent.subcontent.htmlHead}
</head>
<body>
Modified: ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml?view=diff&rev=516594&r1=516593&r2=516594==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml Fri Mar 9 14:45:06 2007
@@ -55,7 +55,7 @@
</init-param>
<init-param>
<param-name>allowedPaths</param-name>
- <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
+ <param-value>/cms:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
</init-param>
<init-param>
<param-name>errorCode</param-name>
@@ -63,7 +63,7 @@
</init-param>
<init-param>
<param-name>redirectPath</param-name>
- <param-value>/control/main</param-value>
+ <param-value>/cms/main</param-value>
</init-param>
</filter>
<filter-mapping>