From portal-commits at lists.jboss.org Tue Mar 20 07:16:55 2007
Content-Type: multipart/mixed; boundary="===============8984904969502491762=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r6772 -
 trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor.
Date: Tue, 20 Mar 2007 07:16:55 -0400
Message-ID: <E1HTcKl-0005OJ-MN@committer01.frg.pub.inap.atl.jboss.com>

--===============8984904969502491762==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2007-03-20 07:16:55 -0400 (Tue, 20 Mar 2007)
New Revision: 6772

Modified:
   trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.=
jsp
Log:
fix cms content editor on safari because JSP url where generated using <p:p=
ortletURL/> which was causing extra space in the HREF attribute of link and=
 causing issues.

Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/edito=
r/main.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main=
.jsp	2007-03-20 10:11:40 UTC (rev 6771)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main=
.jsp	2007-03-20 11:16:55 UTC (rev 6772)
@@ -5,6 +5,7 @@
 <%@ page import=3D"java.text.SimpleDateFormat" %>
 <%@ page import=3D"java.util.List" %>
 <%@ page import=3D"java.util.StringTokenizer" %>
+<%@ page import=3D"javax.portlet.PortletURL" %>
 <%@ page language=3D"java" extends=3D"org.jboss.portal.core.servlet.jsp.Po=
rtalJsp" %>
 <%@ taglib uri=3D"/WEB-INF/portal-lib.tld" prefix=3D"n" %>
 <%@ taglib uri=3D"http://java.sun.com/portlet" prefix=3D"portlet" %>
@@ -17,13 +18,13 @@
    List folders =3D (List)request.getAttribute("folders");
    List files =3D (List)request.getAttribute("files");
    String uri =3D (String)renderRequest.getParameter("uri");
+   PortletURL url =3D renderResponse.createRenderURL();
+   url.setParameter("op", CMSAdminConstants.OP_MAIN);
+   url.setParameter("path", "/");
 %>
 =

 <!-- Currently browsing -->
-Browsing: <a href=3D"<portlet:renderURL>
-<portlet:param name=3D"op" value=3D"<%=3D CMSAdminConstants.OP_MAIN %>"/>
-<portlet:param name=3D"path" value=3D"/"/>
-        </portlet:renderURL>">Home</a>
+Browsing: <a href=3D"<%=3D url %>">Home</a>
 <%
    StringTokenizer parser =3D new StringTokenizer(sCurrPath, "/");
    String sPathBuilder =3D "";
@@ -33,13 +34,9 @@
       sPathBuilder +=3D "/" + sPathChunk;
       if (parser.hasMoreTokens())
       {
+         url.setParameter("path", sPathBuilder);
 %>
->&nbsp;<a href=3D"
-<portlet:renderURL>
-   <portlet:param name=3D"op" value=3D"<%=3D CMSAdminConstants.OP_MAIN %>"=
/>
-   <portlet:param name=3D"path" value=3D"<%=3D sPathBuilder %>"/>
-</portlet:renderURL>
-"><%=3D sPathChunk %>
+>&nbsp;<a href=3D"<%=3D url %>"><%=3D sPathChunk %>
 </a>
 <%
 }
@@ -72,15 +69,13 @@
       for (int i =3D 0; i < folders.size(); i++)
       {
          Folder folder =3D (Folder)folders.get(i);
+         url.setParameter("path", folder.getBasePath());
 %>
 <tr onmouseover=3D"this.className=3D'portlet-section-alternate';" onmouseo=
ut=3D"this.className=3D'portlet-section-body';">
    <td><img
       src=3D"<%=3D renderRequest.getContextPath() + CMSAdminConstants.DEFA=
ULT_IMAGES_PATH%>/folder.gif"
       alt=3D"${n:i18n("CMS_FOLDER")}"
-      border=3D"0">&nbsp;<a href=3D"<portlet:renderURL>
-          <portlet:param name=3D"op" value=3D"<%=3D CMSAdminConstants.OP_M=
AIN %>"/>
-          <portlet:param name=3D"path" value=3D"<%=3D folder.getBasePath()=
 %>"/>
-        </portlet:renderURL>"><%=3D
+      border=3D"0">&nbsp;<a href=3D"<%=3D url %>"><%=3D
    folder.getBasePath().substring(folder.getBasePath().lastIndexOf("/") + =
1, folder.getBasePath().length()) %>
    </a>
    </td>
@@ -88,14 +83,17 @@
 <%
       }
    }
-%>
-<%
    if (files.size() > 0)
    {
       for (int j =3D 0; j < files.size(); j++)
       {
          File file =3D (File)files.get(j);
 =

+         PortletURL metaURL =3D renderResponse.createActionURL();
+         metaURL.setParameter("uri", file.getBasePath());
+         metaURL.setParameter("path", sCurrPath);
+         metaURL.setParameter("meta_action", "select");
+
          if ((uri!=3Dnull) && (uri.equals(file.getBasePath())))
          {
             out.println("<tr class=3D\"portlet-section-selected\">");
@@ -105,13 +103,10 @@
             out.println("<tr onmouseover=3D\"this.className=3D'portlet-sec=
tion-alternate';\" onmouseout=3D\"this.className=3D'portlet-section-body';\=
">");
          }
 %>
+<tr>
    <td><img src=3D"<%=3D renderRequest.getContextPath() + CMSAdminConstant=
s.DEFAULT_IMAGES_PATH%>/file.gif"
             alt=3D"${n:i18n("CMS_FILE")}"
-            border=3D"0">&nbsp;<a href=3D"<portlet:actionURL>
-          <portlet:param name=3D"uri" value=3D"<%=3D file.getBasePath() %>=
"/>
-          <portlet:param name=3D"path" value=3D"<%=3D sCurrPath %>"/>
-          <portlet:param name=3D"meta_action" value=3D"select"/>
-        </portlet:actionURL>"><%=3D
+            border=3D"0">&nbsp;<a href=3D"<%=3D metaURL %>"><%=3D
    file.getBasePath().substring(file.getBasePath().lastIndexOf("/") + 1, f=
ile.getBasePath().length()) %>
    </a>
    </td>


--===============8984904969502491762==--