Author: raintang Date: 2010-01-04 08:11:52 +0100 (Mon, 04 Jan 2010) New Revision: 40310
Added: CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/ CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/stylesheet.xml CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/Stylesheet.java CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout/newsletter/newsletter_advanced - kopie.jsp 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 - kopie.jsp CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout_plain/newsletter/newsletter_advanced.jsp Log: CMSC-1565 Extend stylesheet feature with stylesheet data from database Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml 2010-01-04 07:02:38 UTC (rev 40309) +++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/web.xml 2010-01-04 07:11:52 UTC (rev 40310) @@ -273,7 +273,13 @@ <load-on-startup>1</load-on-startup> </servlet> - + <servlet> + <description>Returns css text</description> + <servlet-name>stylesheet</servlet-name> + <servlet-class>com.finalist.cmsc.servlet.StylesheetServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> <servlet-name>version</servlet-name> <url-pattern>/version</url-pattern> @@ -307,6 +313,11 @@ <url-pattern>/editors/repository/xml</url-pattern> </servlet-mapping> + <servlet-mapping> + <servlet-name>stylesheet</servlet-name> + <url-pattern>*.css</url-pattern> + </servlet-mapping> + <mime-mapping> <extension>html</extension> <mime-type>text/html</mime-type> Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/stylesheet.xml =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/stylesheet.xml 2010-01-04 07:02:38 UTC (rev 40309) +++ CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/stylesheet.xml 2010-01-04 07:11:52 UTC (rev 40310) @@ -61,6 +61,21 @@ <maxLength value="255"/> </datatype> </field> + <field name="text"> + <gui> + <guiname xml:lang="nl">Text</guiname> + <guiname xml:lang="en">Tekst</guiname> + <guiname xml:lang="zh">文本</guiname> + </gui> + <editor> + <positions> + <input>5</input> + </positions> + </editor> + <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes"> + <maxLength value="1024"/> + </datatype> + </field> <field name="media"> <gui> <guiname xml:lang="nl">Media</guiname> Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/Stylesheet.java =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/Stylesheet.java 2010-01-04 07:02:38 UTC (rev 40309) +++ CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/beans/om/Stylesheet.java 2010-01-04 07:11:52 UTC (rev 40310) @@ -19,6 +19,7 @@ private String title; private String description; + private String text; private String resource; private String media; private boolean overwriteable; @@ -62,4 +63,12 @@ public void setOverwriteable(boolean overwriteable) { this.overwriteable = overwriteable; } + + public void setText(String text) { + this.text = text; + } + + public String getText() { + return text; + } } Added: CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java (rev 0) +++ CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/servlet/StylesheetServlet.java 2010-01-04 07:11:52 UTC (rev 40310) @@ -0,0 +1,47 @@ +/* + * + * This software is OSI Certified Open Source Software. OSI Certified is a certification mark of the Open Source + * Initiative. + * + * The license (Mozilla version 1.0) can be read at the MMBase site. See http://www.MMBase.org/license + */ +package com.finalist.cmsc.servlet; + +import java.io.IOException; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.mmbase.servlet.BridgeServlet; + +/** + * @author + */ +...@suppresswarnings( { "serial", "unused" }) +public class StylesheetServlet extends BridgeServlet { + + @Override + public void init(ServletConfig config) throws ServletException { + super.init(config); + } + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { + doRedirect(request, response); + } + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { + doRedirect(request, response); + } + + private void doRedirect(HttpServletRequest request, HttpServletResponse response) throws IOException { + String text = null; + text = request.getParameter("text"); + + response.setContentType("text/css"); + response.getWriter().print(text); + } +} Added: CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt =================================================================== --- CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt (rev 0) +++ CMSContainer/trunk/CMSContainer/migration/migration_1.7_to_1.8.txt 2010-01-04 07:11:52 UTC (rev 40310) @@ -0,0 +1,16 @@ +MMigration document: + +Part: core +From version: 1.7 +To version: 1.8 + +Name: Extended the current stylesheet options in CMSc with dynamic stylesheets, from the database +Goal: Add a new field "text" to mm_stylesheet +Type: manual action +--- Start script --- +ALTER TABLE mm_stylesheet ADD text text default ''; +--- End script --- +Exceptions/errors/other problems and what to do: +* +* +* \ No newline at end of file Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout/newsletter/newsletter_advanced - kopie.jsp =================================================================== --- CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout/newsletter/newsletter_advanced - kopie.jsp 2010-01-04 07:02:38 UTC (rev 40309) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout/newsletter/newsletter_advanced - kopie.jsp 2010-01-04 07:11:52 UTC (rev 40310) @@ -14,7 +14,12 @@ <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}"> - <link rel="stylesheet" type="text/css" href="<cmsc:staticurl page='/${style.resource}'/>" media="${style.media}" /> + <c:if test="${style.resource eq ''}"> + <link rel="stylesheet" type="text/css" href="/servlet/StylesheetServlet?text=${style.text}" media="${style.media}" /> + </c:if> + <c:if test="${style.resource ne '' }"> + <link rel="stylesheet" type="text/css" href="<cmsc:staticurl page='/${style.resource}'/>" media="${style.media}" /> + </c:if> </c:forEach> <!--[if IE]> <link rel="stylesheet" type="text/css" href="<cmsc:staticurl page='/css/stijl_ie.css'/>" media="screen,projection,print" /> 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-01-04 07:02:38 UTC (rev 40309) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout/newsletter/newsletter_advanced.jsp 2010-01-04 07:11:52 UTC (rev 40310) @@ -13,7 +13,12 @@ <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}"> - <link rel="stylesheet" type="text/css" href="<cmsc:staticurl page='/${style.resource}'/>" media="${style.media}" /> + <c:if test="${style.resource eq ''}"> + <link rel="stylesheet" type="text/css" href="/servlet/StylesheetServlet?text=${style.text}" media="${style.media}" /> + </c:if> + <c:if test="${style.resource ne '' }"> + <link rel="stylesheet" type="text/css" href="<cmsc:staticurl page='/${style.resource}'/>" media="${style.media}" /> + </c:if> </c:forEach> <!--[if IE]> <link rel="stylesheet" type="text/css" href="<cmsc:staticurl page='/css/stijl_ie.css'/>" media="screen,projection,print" /> Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout_plain/newsletter/newsletter_advanced - kopie.jsp =================================================================== --- CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout_plain/newsletter/newsletter_advanced - kopie.jsp 2010-01-04 07:02:38 UTC (rev 40309) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout_plain/newsletter/newsletter_advanced - kopie.jsp 2010-01-04 07:11:52 UTC (rev 40310) @@ -14,7 +14,12 @@ <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}"> - <link rel="stylesheet" type="text/css" href="<cmsc:staticurl page='/${style.resource}'/>" media="${style.media}" /> + <c:if test="${style.resource eq ''}"> + <link rel="stylesheet" type="text/css" href="/servlet/StylesheetServlet?text=${style.text}" media="${style.media}" /> + </c:if> + <c:if test="${style.resource ne '' }"> + <link rel="stylesheet" type="text/css" href="<cmsc:staticurl page='/${style.resource}'/>" media="${style.media}" /> + </c:if> </c:forEach> <!--[if IE]> <link rel="stylesheet" type="text/css" href="<cmsc:staticurl page='/css/stijl_ie.css'/>" media="screen,projection,print" /> 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-01-04 07:02:38 UTC (rev 40309) +++ CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/templates/layout_plain/newsletter/newsletter_advanced.jsp 2010-01-04 07:11:52 UTC (rev 40310) @@ -13,7 +13,12 @@ <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}"> - <link rel="stylesheet" type="text/css" href="<cmsc:staticurl page='/${style.resource}'/>" media="${style.media}" /> + <c:if test="${style.resource eq ''}"> + <link rel="stylesheet" type="text/css" href="/servlet/StylesheetServlet?text=${style.text}" media="${style.media}" /> + </c:if> + <c:if test="${style.resource ne '' }"> + <link rel="stylesheet" type="text/css" href="<cmsc:staticurl page='/${style.resource}'/>" media="${style.media}" /> + </c:if> </c:forEach> <!--[if IE]> <link rel="stylesheet" type="text/css" href="<cmsc:staticurl page='/css/stijl_ie.css'/>" media="screen,projection,print" /> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs