svn commit: [corporate_portal_templates_v2] r683 - in /branches/JAHIA-5-0-SP-BRANCH/src/jsp: folder.jsp links.jsp people.jsp project.jsp

Tue, 29 May 2007 06:10:15 -0700 

Author: dpillot
Date: Tue May 29 15:10:01 2007
New Revision: 683

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D683&repname=
=3Dcorporate_portal_templates_v2
Log:
TEMPLATES-227

Modified:
    branches/JAHIA-5-0-SP-BRANCH/src/jsp/folder.jsp
    branches/JAHIA-5-0-SP-BRANCH/src/jsp/links.jsp
    branches/JAHIA-5-0-SP-BRANCH/src/jsp/people.jsp
    branches/JAHIA-5-0-SP-BRANCH/src/jsp/project.jsp

Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/folder.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/folder.jsp&rev=3D683&repname=3Dcorporate_portal_templates_v2
=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=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/folder.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/folder.jsp Tue May 29 15:10:01 2007
@@ -17,7 +17,9 @@
 --%><%@ taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
 <%@ include file=3D"common/top_declarations.inc"%>
 <jesi:template  aclGroup=3D"true">
-
+<%
+isFullScreen=3Dtrue;
+ %>
 <%@ include file=3D"common/top.inc"%>
 <%
 // missing buttons
@@ -27,17 +29,18 @@
 =

 %>
 <jesi:fragment   aclGroup=3D"true">
-<div class=3D"full2">
+<div class=3D"full2" style=3D"margin-left:10px;margin-top:30px;">
+<content:currentPagePath maxchar=3D"40" separator=3D" / "/>
 <jsp:include page=3D"common/pagetitle.jsp" flush=3D"true"/>
 =

-<div style=3D"float: left;margin: 10px 10px 10px 10px;width: 20%;border:1p=
x solid black;">
+<div style=3D"float: left;margin: 10px 10px 10px 0;width: 20%;/*border:1px=
 solid black;*/">
 =

 <%
     if (jData.gui().getContentHomePage().getID() !=3D jData.page().getID()=
){
         %><a href=3D"<%=3DjData.params().composePageUrl(jData.page().getPa=
rentID())%>" class=3D"leftmenu"><img src=3D"<%=3DcontextURL%>/img/files/dir=
.gif" border=3D"0" alt=3D"[folder]" width=3D"16" height=3D"16" align=3D"abs=
middle"/>&#160;[..]</a><br/><%
     }
 =

-    jData.containers().declareField( "linkDir", ResourceBundleMarker.drawM=
arker(resBundleID, "Link","link"), FieldTypes.PAGE, "" );
+    jData.containers().declareField( "linkDir", ResourceBundleMarker.drawM=
arker(resBundleID, "Link","link"), FieldTypes.PAGE, "<pageonly [Directories=
 Files]>" );
     Vector linkFields =3D new Vector();
     linkFields.add( "linkDir" );
     int startLevel =3D jData.gui().getContentHomePage().getID() =3D=3D jDa=
ta.page().getID() ? 1 : jData.gui().getLevel();

Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/links.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/links.jsp&rev=3D683&repname=3Dcorporate_portal_templates_v2
=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=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/links.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/links.jsp Tue May 29 15:10:01 2007
@@ -17,7 +17,9 @@
 --%><%@ taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
 <%@ include file=3D"common/top_declarations.inc"%>
 <jesi:template  aclGroup=3D"true">
-
+<%
+isFullScreen=3Dtrue;
+ %>
 <%@ include file=3D"common/top.inc"%>
 <%
 // missing buttons
@@ -27,16 +29,17 @@
 =

 %>
 <jesi:fragment   aclGroup=3D"true">
-<div class=3D"full2">
+<div class=3D"full2" style=3D"margin-left:10px;margin-top:30px;">
+<content:currentPagePath maxchar=3D"40" separator=3D" / "/>
 <jsp:include page=3D"common/pagetitle.jsp" flush=3D"true"/>
-<div style=3D"float: left;margin: 10px 10px 10px 10px;width: 20%;border:1p=
x solid black;">
+<div style=3D"float: left;margin: 10px 10px 10px 10px;width: 20%;/*border:=
1px solid black;*/">
 =

 <%
     if (jData.gui().getContentHomePage().getID() !=3D jData.page().getID()=
){
         %><a href=3D"<%=3DjData.params().composePageUrl(jData.page().getPa=
rentID())%>" class=3D"leftmenu"><img src=3D"<%=3DcontextURL%>/img/files/dir=
.gif" border=3D"0" alt=3D"[folder]" width=3D"16" height=3D"16" align=3D"abs=
middle"/>&#160;[..]</a><br/><%
     }
 =

-    jData.containers().declareField( "linkDir", ResourceBundleMarker.drawM=
arker(resBundleID, "Link","link"), FieldTypes.PAGE, "" );
+    jData.containers().declareField( "linkDir", ResourceBundleMarker.drawM=
arker(resBundleID, "Link","link"), FieldTypes.PAGE, "<pageonly [Directories=
 Links]>" );
     Vector linkFields =3D new Vector();
     linkFields.add( "linkDir" );
     int startLevel =3D jData.gui().getContentHomePage().getID() =3D=3D jDa=
ta.page().getID() ? 1 : jData.gui().getLevel();

Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/people.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/people.jsp&rev=3D683&repname=3Dcorporate_portal_templates_v2
=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=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/people.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/people.jsp Tue May 29 15:10:01 2007
@@ -17,7 +17,9 @@
 --%><%@ taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
 <%@ include file=3D"common/top_declarations.inc"%>
 <jesi:template  aclGroup=3D"true">
-
+<%
+isFullScreen=3Dtrue;
+ %>
 <%@ include file=3D"common/top.inc"%>
 <%!
 =

@@ -54,9 +56,13 @@
 =

 %>
 <jesi:fragment   aclGroup=3D"true">
-<div class=3D"full2">
+
+<div class=3D"full2" style=3D"margin-left:10px;margin-top:30px;">
+
+<content:currentPagePath maxchar=3D"40" separator=3D" / "/>
+
 <jsp:include page=3D"common/pagetitle.jsp" flush=3D"true"/>
-<div style=3D"float: left;margin: 10px 10px 10px 10px;width: 20%;border:1p=
x solid black;">
+<div style=3D"float: left;margin: 10px 10px 10px 10px;width: 20%;/*border:=
1px solid black;*/">
 =

 <%
 =


Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/project.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/project.jsp&rev=3D683&repname=3Dcorporate_portal_templates_=
v2
=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=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/project.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/project.jsp Tue May 29 15:10:01 20=
07
@@ -17,7 +17,9 @@
 --%><%@ taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
 <%@ include file=3D"common/top_declarations.inc"%>
 <jesi:template  aclGroup=3D"true">
-
+<%
+isFullScreen=3Dtrue;
+ %>
 <%@ include file=3D"common/top.inc"%>
 <%
 // missing buttons
@@ -27,16 +29,85 @@
  String propertiesButton =3D "<img src=3D\"" + contextURL + "/img/actions/=
update.gif\" width=3D\"11\" height=3D\"11\" border=3D\"0\" alt=3D\"" + getR=
esourceBundle("properties","properties",jData) + "\" align=3D\"top\"/>";
 %>
 <jesi:fragment   aclGroup=3D"true">
-<div class=3D"full2">
+
+<div class=3D"full2" style=3D"margin-left:10px;margin-top:30px;">
+<content:currentPagePath maxchar=3D"40" separator=3D" / "/>
 <jsp:include page=3D"common/pagetitle.jsp" flush=3D"true"/>
+
+<div style=3D"float: left;margin: 10px 10px 10px 10px;padding:5px; width: =
20%;/*border:1px solid black;*/">
+<%
+    if (jData.gui().getContentHomePage().getID() !=3D jData.page().getID()=
){
+        %><a href=3D"<%=3DjData.params().composePageUrl(jData.page().getPa=
rentID())%>" class=3D"leftmenu"><img src=3D"<%=3DcontextURL%>/img/files/dir=
.gif" border=3D"0" alt=3D"[folder]" width=3D"16" height=3D"16" align=3D"abs=
middle"/>&#160;[..]</a><br/><%
+    }
+
+    jData.containers().declareField( "linkDir", ResourceBundleMarker.drawM=
arker(resBundleID, "Link","link"), FieldTypes.PAGE, "<pageonly [Directories=
 Project]>" );
+    Vector linkFields =3D new Vector();
+    linkFields.add( "linkDir" );
+    int startLevel =3D jData.gui().getContentHomePage().getID() =3D=3D jDa=
ta.page().getID() ? 1 : jData.gui().getLevel();
+    jData.containers().declareContainer( "linkContainer", "Left Menu", lin=
kFields );
+    JahiaContainerList linkContainerList =3D jData.containers().getAbsolut=
eContainerList( "linkContainer", jData.gui().getLevelID( startLevel ) );
+    if (linkContainerList !=3D null) {
+        Enumeration myContainerList =3D linkContainerList.getContainers();
+        while (myContainerList.hasMoreElements()) {
+            JahiaContainer myContainer =3D (JahiaContainer) myContainerLis=
t.nextElement();
+            JahiaPage myLink =3D (JahiaPage) myContainer.getFieldObject( "=
linkDir" );
+            if (myLink!=3D null){
+                String folder =3D "folder";
+                String target =3D "";
+                String templateName =3D myLink.getPageTemplate().getName();
+                if (myLink.getPageType() !=3D 0){
+                    folder =3D "shortcut";
+                } else if (templateName.equals("Directories Files")){
+                    folder =3D "folder_files";
+                } else if (templateName.equals("Directories Links")){
+                    folder =3D "folder_link";
+                } else if (templateName.equals("Directories People")){
+                    folder =3D "folder_people";
+                } else if (templateName.equals("Directories Project")){
+                    folder =3D "folder_project";
+                }
+                if (myLink.getPageType() =3D=3D 2){
+                    target =3D " target=3D\"_new\"";
+                }
+
+
+                %>
+                    <img src=3D"<content:contextURL/>/images/pix.gif" widt=
h=3D"164" height=3D"2" alt=3D""/><br/>
+                    <a href=3D"<%=3DmyLink.getURL(jData.params())%>" class=
=3D"leftmenu"<%=3Dtarget%>><img src=3D"<%=3DcontextURL%>/img/<%=3Dfolder%>.=
gif" border=3D"0" alt=3D"[<%=3Dfolder%>]" width=3D"16" height=3D"16" align=
=3D"absmiddle"/>&#160;<%=3DmyLink.getTitle()%></a>
+                    <%
+                    if ( ! jData.gui().html().drawUpdateContainerLauncher(=
 myContainer ).equals("")) {
+                        %><a href=3D"javascript:<%=3DjData.gui().html().dr=
awUpdateContainerLauncher( myContainer )%>"><%=3DupdateButton%></a>&#160;<a
+                             href=3D"javascript:<%=3DjData.gui().html().dr=
awDeleteContainerLauncher( myContainer )%>"><%=3DdeleteButton%></a><%
+                    }
+                    %>
+                    <br/>
+                <%
+            }
+        }
+        if (!jData.gui().html().drawAddContainerLauncher( linkContainerLis=
t ).equals("")) {
+            %>
+            <br/><a class=3D"horizontaleline" href=3D"javascript:<%=3DjDat=
a.gui().html().drawAddContainerLauncher( linkContainerList )%>"><%=3DaddBut=
ton%>&#160;<content:resourceBundle resourceBundle=3D"jahiatemplates.Corpora=
te_portal_templates" resourceName=3D"addFolder"/></a><br/>
+            <%
+        }
+        if (!jData.gui().html().drawContainerListPropertiesLauncher( linkC=
ontainerList ).equals("")) {
+            %><a href=3D"javascript:<%=3DjData.gui().html().drawContainerL=
istPropertiesLauncher( linkContainerList )%>"><%=3DupdateButton%>&#160;<con=
tent:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templ=
ates" resourceName=3D"sortAndProperties"/></a><br/><%
+        }
+    }
+%>
+<br/>
+
+
+
+
+
 <%
 //PROJECT CATEGORIES
 if (jData.gui().isEditMode()){
-    // we display the left div only if we are in edit mode
-    %>
-<div style=3D"float: left;margin: 10px 10px 10px 10px;padding:5px; width: =
20%;border:1px solid black;">
+
+%>
+
 <b><content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_port=
al_templates_v2" resourceName=3D"allCategories"/></b><br/><%
-}
+
 JahiaContainerList projectCategoriesContainerList =3D jData.containers().g=
etAbsoluteContainerList( "projectCategoriesContainer", jData.gui().getLevel=
ID( 1 ) );
 Enumeration projectCategoriesEnumeration =3D projectCategoriesContainerLis=
t.getContainers();
 =

@@ -62,14 +133,10 @@
 }
 if (! jData.gui().html().drawContainerListPropertiesLauncher( projectCateg=
oriesContainerList ).equals("")){
     %><a href=3D"javascript:<%=3D jData.gui().html().drawContainerListProp=
ertiesLauncher( projectCategoriesContainerList )%>"><%=3DpropertiesButton%>=
&#160;<content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_po=
rtal_templates_v2" resourceName=3D"sortAndProperties"/></a><%
-}
-
-//END PROJECT CATEGORIES
-if (jData.gui().isEditMode()){
+       }
+}//END PROJECT CATEGORIES
 %>
 </div>
-<%}%>
-
 <div style=3D"display:block;float:left;width:70%;border-color: gray;border=
-width: 0px 0px 0px 1px;border-style: none none none dotted;padding: 10px;">
         <!-- une box de texte -->
         <jsp:include page=3D"common/main_content.jsp" flush=3D"true">

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to