From: Roy R. <ru...@jb...> - 2005-11-13 02:47:27
|
User: russo Date: 05/11/12 21:47:24 Modified: core/src/main/org/jboss/portal/core/portlet/cms/admin CMSAdminPortlet.java Log: - added CSS path support for wysiwyg editor Revision Changes Path 1.21 +15 -3 jboss-portal/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminPortlet.java (In the diff below, changes in quantity of whitespace are not shown.) Index: CMSAdminPortlet.java =================================================================== RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminPortlet.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -b -r1.20 -r1.21 --- CMSAdminPortlet.java 11 Nov 2005 19:50:26 -0000 1.20 +++ CMSAdminPortlet.java 13 Nov 2005 02:47:24 -0000 1.21 @@ -30,6 +30,8 @@ import org.jboss.portal.core.command.CoreComponentResponseContext; import org.jboss.portal.server.app.ComponentInvocation; import org.jboss.portal.server.util.URLInfo; +import org.jboss.portal.theme.PortalTheme; +import org.jboss.portal.theme.ThemeLink; import org.jboss.portlet.JBossActionRequest; import org.jboss.portlet.JBossActionResponse; import org.jboss.portlet.JBossPortlet; @@ -235,11 +237,16 @@ sbUrl.append(rReq.getServerPort()); } - // TODO: get CSS path for editor. + PortalTheme theme = rReq.getTheme(); + List links = theme.getLinks(); + ThemeLink cssLink = (ThemeLink) links.get(0); + String sCSSHref = cssLink.getLink().toString(); + String sCSSURL = sCSSHref.substring(sCSSHref.indexOf("href='") + 6, sCSSHref.lastIndexOf(".css'") + 4); rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rRes, "/")); + rReq.setAttribute("css_url", sbUrl.toString() + sCSSURL); javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/create.jsp"); prd.include(rReq, rRes); } @@ -260,11 +267,16 @@ sbUrl.append(rReq.getServerPort()); } - // TODO: get CSS path for editor. + PortalTheme theme = rReq.getTheme(); + List links = theme.getLinks(); + ThemeLink cssLink = (ThemeLink) links.get(0); + String sCSSHref = cssLink.getLink().toString(); + String sCSSURL = sCSSHref.substring(sCSSHref.indexOf("href='") + 6, sCSSHref.lastIndexOf(".css'") + 4); rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rRes, "/")); + rReq.setAttribute("css_url", sbUrl.toString() + sCSSURL); Command getCommand; if(sVersion != null) @@ -716,7 +728,7 @@ String sDescription = aReq.getParameter("description"); String sLanguage = aReq.getParameter("language"); String sMakeLive = "off"; - if (aReq.getParameterValues("makelive") != null) + if(aReq.getParameterValues("makelive") != null) { sMakeLive = "on"; } |