Author: dpillot
Date: Thu Jun 21 16:04:49 2007
New Revision: 723
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D723&repname=
=3Dcorporate_portal_templates_v2
Log:
http://www.jahia.net/jira/browse/TEMPLATES-232: added license checks on cat=
egories and added main content+ fix weird misc
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/page_categories_list.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/doc/detail.jsp&rev=3D723&repname=3Dcorporate_portal_templat=
es_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/doc/detail.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/detail.jsp Thu Jun 21 16:04:49=
2007
@@ -24,6 +24,7 @@
</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;">
<%!
+public String id=3D"main_1";
public String getPath (JahiaPage link, JahiaData jData)
throws JahiaException
{
@@ -154,17 +155,107 @@
<td class=3D"EPMetaDataTitle">:</td>
<td class=3D"EPMetaDataValue"><%=3DlastContributor%></td>
</tr>
- <tr>
- <td class=3D"EPMetaDataTitle">
- <content:resourceBundle resourceBundle=3D"jahiatem=
plates.Corporate_portal_templates_v2"
- resourceName=3D"doc.docListCatLabel"/></td>
- <td class=3D"EPMetaDataTitle">:</td>
- <td><%@ include file=3D"page_categories_list.inc"%></t=
d></tr></table></td>
- </tr>
- </table>
+ <%
+ if(LicenseActionChecker.isAuthorizedByLicense("org.jahia.a=
ctions.server.admin.categories.ManageCategories",0)){
+ %>
+ <%@ include file=3D"page_categories_list.inc"%>
+ <%
+ }
+ %>
+ </table></td>
+ </tr></table>
</jahiaHtml:actionMenu>
<%
}%>
+<content:declareContainerList name=3D'<%=3D"contentContainer" + id%>'
+ titleKey=3D"contentContainer"
+ title=3D"Content Container"
+ bundleKey=3D"<%=3DresBundleID%>"
+>
+ <content:declareContainer>
+ <content:declareField name=3D'<%=3D"subTitle" + id%>'
+ title=3D"Title"
+ titleKey=3D"title"
+ bundleKey=3D"<%=3DresBundleID%>"
+ type=3D"SmallText"
+ />
+ <content:declareField name=3D'<%=3D"mainContent" + id%>'
+ title=3D"Content"
+ titleKey=3D"content"
+ bundleKey=3D"<%=3DresBundleID%>"
+ type=3D"BigText"
+ />
+ <content:declareField name=3D'<%=3D"picture" + id%>'
+ title=3D"Image"
+ titleKey=3D"image"
+ bundleKey=3D"<%=3DresBundleID%>"
+ type=3D"File"
+ />
+ <content:declareField name=3D'<%=3D"align" + id%>'
+ title=3D"Image align"
+ titleKey=3D"imageAlign"
+ bundleKey=3D"<%=3DresBundleID%>"
+ type=3D"SharedSmallText"
+ value=3D"<jahia_multivalue[left:right]>left"
+ />
+ </content:declareContainer>
+</content:declareContainerList>
+
+<%int descSize =3D jData.containers().getContainerList("contentContainer" =
+ id).getFullSize();
+
+int descBorderSize =3D 1;
+boolean editMode =3D jData.gui().isEditMode();
+if ((descSize > 0) || (editMode)){%>
+
+<table width=3D"100%" border=3D"0" cellspacing=3D"2" cellpadding=3D"0">
+<tr><td <%if (editMode){%>class=3D"boxEPbordercolor1"<%}%>>
+
+<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"2">
+<content:containerList name=3D'<%=3D"contentContainer" + id%>' id=3D"conte=
ntContainerList">
+ <tr><td>
+
+ <table width=3D"100%" border=3D"0">
+ <content:container id=3D"contentContainer">
+ <tr><td>
+ <jahiaHtml:actionMenu name=3D"contentContainer" namePostFix=3D=
"" resourceBundle=3D"jahiatemplates.Corporate_portal_templates">
+ <content:containerDiffHighlight id=3D"contentContainerHighLigh=
t" name=3D"contentContainer"/>
+ <content:textField name=3D'<%=3D"subTitle" + id%>'
defaultValue=3D"" di=
ffActive=3D"true" display=3D"false" valueId=3D"subTitle"/>
+ <logic:notEmpty name=3D"subTitle">
+ <h3><content:textField name=3D'<%=3D"subTitle" + id%>' def=
aultValue=3D"" diffActive=3D"true"/></h3>
+ </logic:notEmpty>
+ <div class=3D"justify">
+ <logic:present name=3D"contentContainer" property=3D'<%=3D=
"field(picture" + id + ")"%>'>
+ <bean:define id=3D"picture" name=3D"contentContainer" =
property=3D'<%=3D"field(picture" + id + ").object"%>'/>
+ <logic:present name=3D"picture">
+ <logic:equal name=3D"picture" property=3D"image" v=
alue=3D"true">
+ <content:textField name=3D'<%=3D"align" + id%>' di=
splay=3D"false" id=3D"align" defaultValue=3D""/>
+ <img src=3D"<bean:write name=3D'picture' prope=
rty=3D'downloadUrl'/>" border=3D"0" alt=3D"<bean:write name=3D'picture' pr=
operty=3D'fileFieldTitle' filter=3D'false'/>" <logic:present name=3D"align"=
>align=3D"<bean:write name=3D"align"/></logic:present>"/>
+ </logic:equal>
+ </logic:present>
+ </logic:present>
+ <content:bigTextField name=3D'<%=3D"mainContent" + id%>' d=
efaultValue=3D"" diffActive=3D"true"/>
+ </div>
+ <br/>
+ <logic:present name=3D"contentContainerHighLight">
+ </fieldset>
+ </logic:present>
+ </jahiaHtml:actionMenu>
+ </td></tr>
+ </content:container>
+ </table>
+
<%@ include file=3D"container_revisions_listing.inc"%>
+ </td></tr>
+</content:containerList>
+</table>
+<%if (editMode){%><br/><%}%>
+<content:containerList name=3D'<%=3D"contentContainer" + id%>'>
+
+<content:addContainerURL id=3D"addContentContainerUrl" display=3D"none"/>
+<logic:present name=3D"addContentContainerUrl">
+ <a href=3D"<bean:write name=3D'addContentContainerUrl'/>"><img src=3D'=
<content:contextURL/>/img/add.gif' border=3D"0" alt=3D""> <%=3DResourc=
eBundle.getBundle("jahiatemplates.Corporate_portal_templates_v2",jData.para=
ms().getLocale()).getString("addText")%></a>
+</logic:present>
+
+</content:containerList></td></tr></table><%}%>
<% } %>
=
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/page_categories_list.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/doc/page_categories_list.inc&rev=3D723&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/doc/page_categories_list.inc (orig=
inal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/doc/page_categories_list.inc Thu J=
un 21 16:04:49 2007
@@ -1,18 +1,18 @@
<%--
Copyright 2002-2006 Jahia Ltd
=
-Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L), =
-Version 1.0 (the "License"), or (at your option) any later version; you ma=
y =
-not use this file except in compliance with the License. You should have =
-received a copy of the License along with this program; if not, you may ob=
tain =
-a copy of the License at =
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
=
http://www.jahia.org/license/
=
-Unless required by applicable law or agreed to in writing, software =
-distributed under the License is distributed on an "AS IS" BASIS, =
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
-See the License for the specific language governing permissions and =
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
limitations under the License.
--%><%
=
@@ -23,6 +23,12 @@
=
if (! category.isEmpty()) {
%>
+ <tr>
+ <td class=3D"EPMetaDataTitle">
+ <content:resourceBundle resourceBundle=3D"jahiatem=
plates.Corporate_portal_templates_v2"
+ resourceName=3D"doc.docListCatLabel"/></td>
+ <td class=3D"EPMetaDataTitle">:</td>
+ <td>
<table border=3D"0" width=3D"100%" cellspacing=3D"0" cellpadding=3D"0">
<%
=
@@ -49,9 +55,17 @@
</tr>
<%
}
+
}
- } catch (Exception e) {}
+ } catch (Exception e) {
+ logger.debug(e);
+ }
}
- %></table><%
+
+ %></table>
+ </td></tr>
+
+
+ <%
}
%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
