Update of 
/var/cvs/contributions/CMSContainer_Modules/subsite/src/webapp/editors/subsite
In directory 
james.mmbase.org:/tmp/cvs-serv32534/subsite/src/webapp/editors/subsite

Modified Files:
      Tag: b1_4
        personalpages.jsp 
Log Message:
CMSC-635 - Subsite updates. Added TreeItems to Subsite and PPage.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/subsite/src/webapp/editors/subsite
See also: http://www.mmbase.org/jira/browse/CMSC-635


Index: personalpages.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- personalpages.jsp   25 Feb 2008 16:26:16 -0000      1.2.2.1
+++ personalpages.jsp   26 Feb 2008 17:04:50 -0000      1.2.2.2
@@ -3,6 +3,14 @@
 <[EMAIL PROTECTED] import="com.finalist.cmsc.repository.ContentElementUtil,
                  com.finalist.cmsc.repository.RepositoryUtil,
                  java.util.ArrayList"%>
+<[EMAIL PROTECTED] import="org.mmbase.bridge.Cloud" %>
+<[EMAIL PROTECTED] import="org.mmbase.bridge.Node" %>
+<[EMAIL PROTECTED] import="org.mmbase.bridge.NodeList" %>
+<[EMAIL PROTECTED] import="org.mmbase.bridge.util.SearchUtil" %>
+<[EMAIL PROTECTED] import="org.mmbase.remotepublishing.*" %>
+<[EMAIL PROTECTED] import="com.finalist.cmsc.subsite.util.SubSiteUtil" %>
+<[EMAIL PROTECTED] import="com.finalist.cmsc.services.publish.Publish"%>
+<[EMAIL PROTECTED] import="org.mmbase.bridge.BridgeException"%>
 <mm:content type="text/html" encoding="UTF-8" expires="0">
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
 <html:html xhtml="true">
@@ -114,7 +122,7 @@
 
 <mm:list referid="results" jspvar="node" max="${resultsPerPage}">
    <mm:field name="personalpage.number" id="number">
-          <mm:node number="${number}">
+          <mm:node number="${number}" jspvar="ppNode">
                   <tr <mm:even inverse="true">class="swap"</mm:even>>
                   <td style="white-space: nowrap;">
                   
@@ -127,12 +135,21 @@
                       title="<fmt:message key="pp.content.delete" />"><img 
src="../gfx/icons/delete.png" width="16" height="16"
                                                                       
title="<fmt:message key="pp.content.delete" />"
                                                                       
alt="<fmt:message key="pp.content.delete" />"/></a>
-         <a href="<cmsc:contenturl number="${nodenumber}"/>" 
+<%
+          int remoteNumber = Publish.getRemoteNumber(ppNode);
+      String appPath = "/content/" + remoteNumber;
+      if (remoteNumber == -1) { 
+         appPath = ""; 
+       }
+      request.setAttribute("appPath", appPath);
+%>
+         <c:if test="${not empty appPath}">
+            <a href="<%=Publish.getRemoteUrl(appPath)%>" 
             title="<fmt:message key="pp.content.preview" />" 
target="_blank"><img src="../gfx/icons/preview.png" width="16" height="16"
                                                              
title="<fmt:message key="pp.content.preview" />"
                                                              alt="<fmt:message 
key="pp.content.preview" />"/></a>
-         
-                                                                      
+         </c:if>
+                  <% request.removeAttribute("appPath"); %>              
                   </mm:field>
                   </td>
                   <td>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to