Author: pvollenweider
Date: Fri Oct 19 11:19:00 2007
New Revision: 1261
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1261&repname=
=3Dcorporate_portal_templates
Log:
Keep only following templates
- Home
- Simple
- Double
- FAQ
- Form Generator
Keep only following boxes:
- News
- Files
- Links
- Text
- Portlets
Other templates and boxes will be downloadable separately.
Removed:
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/blog.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/blog_css.xml
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/blog_listing.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/blog_listing_rss_2_0.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/blog_rss_2_0.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/categories.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/directories.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/document_detail.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/document_listing.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/folder.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/guestbook.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/html_file_clipping.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_addcomment_form.=
inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_categories.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_declarations.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_definitions.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_entries.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_entry.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_filters.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_list.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_listing_filters.=
inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_searchbox.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_view_comments.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_view_pingurl.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/blog_view_trackbacks.=
inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_newslast5.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_newslast5_cached.=
inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/categories.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/categories_list.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/container_revisions_l=
isting.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/doc.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/folderDocumentBox.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/folder_tree.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/groupsContainer.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/guestbook.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/html_file_clipping.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/layout.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/layout_fullscreen.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/layout_process.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/layout_standard.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/metadataapi.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/multivalues.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/page_categories_list.=
inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/people.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/people_detail.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/people_list.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/project.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/project_categories.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/skills.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/sources.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/types.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/usersContainer.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/layout.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/links.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/metadata_dates.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/metadata_users.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/metadataapi.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/news_detail.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/news_list.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/people.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/project.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/user_ldap_search.jsp
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/declarations.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/templates.xml
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/box.jsp&rev=3D1261&repname=3Dcorporate_portal_=
templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/include/box.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box.jsp Fri Oct 19 11=
:19:00 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.
--%><%@ page language=3D"java" %>
<%@ include file=3D"declarations.inc"%>
@@ -79,9 +79,6 @@
<bean:define id=3D"webapps" value=3D'<%=3DResourceBun=
dleMarker.getValue(ResourceBundleMarker.drawMarker(resBundleID,"webapps",""=
),jParams.getLocale())%>'/>
<bean:define id=3D"news" value=3D'<%=3DResourceBun=
dleMarker.getValue(ResourceBundleMarker.drawMarker(resBundleID,"news",""),j=
Params.getLocale())%>'/>
<bean:define id=3D"freeText" value=3D'<%=3DResourceBun=
dleMarker.getValue(ResourceBundleMarker.drawMarker(resBundleID,"freeText","=
"),jParams.getLocale())%>'/>
- <bean:define id=3D"newslast5" value=3D'<%=3DResourceBu=
ndleMarker.getValue(ResourceBundleMarker.drawMarker(resBundleID,"newslast5"=
,""),jParams.getLocale())%>'/>
- <bean:define id=3D"usersContainer"
value=3D'<%=3DResourceBundleMarker=
.getValue(ResourceBundleMarker.drawMarker(resBundleID,"usersContainer",""),=
jParams.getLocale())%>'/>
- <bean:define id=3D"groupsContainer"
value=3D'<%=3DResourceBundleMarke=
r.getValue(ResourceBundleMarker.drawMarker(resBundleID,"groupsContainer",""=
),jParams.getLocale())%>'/>
<bean:define id=3D"boxTypeRealValue" value=3D'<%=3DRes=
ourceBundleMarker.getValue((String) boxTypeValue,jParams.getLocale())%>'/>
<c:choose>
<c:when test=3D"${boxTypeRealValue =3D=3D files}">
@@ -96,15 +93,6 @@
<c:when test=3D"${boxTypeRealValue =3D=3D news}">
<%@ include file=3D"box_news.inc"%>
</c:when>
- <c:when test=3D"${boxTypeRealValue =3D=3D newslast=
5}">
- <%@ include file=3D"box_newslast5.inc"%>
- </c:when>
- <c:when test=3D"${boxTypeRealValue =3D=3D usersCon=
tainer}">
- <%@ include file=3D"usersContainer.inc"%>
- </c:when>
- <c:when test=3D"${boxTypeRealValue =3D=3D groupsCo=
ntainer}">
- <%@ include file=3D"groupsContainer.inc"%>
- </c:when>
<c:otherwise>
<%@ include file=3D"box_text.inc"%>
</c:otherwise>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/declarations.inc&rev=3D1261&repname=3Dcorporat=
e_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/include/declarations.inc (ori=
ginal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/declarations.inc Fri =
Oct 19 11:19:00 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.
--%><%@ page import=3D"java.lang.*"%>
<%@ page import=3D"java.net.*"%>
@@ -84,15 +84,15 @@
jParams.setOperationMode(savedOperationMode);
jParams.setCacheStatus(savedCacheStatus);
String languageCode =3D jParams.getLocale().toString();
- =
+
boolean advSearchLicenseEnabled =3D LicenseActionChecker.isAuthorizedB=
yLicense("org.jahia.engines.search.advancedSearch", 0);
- =
+
=
//variables necessary for chat.inc
String chatstatus=3D(String) session.getAttribute("chatstatus");
if(chatstatus=3D=3Dnull) chatstatus=3D"false";
=
- =
+
=
// usefull buttons
=
@@ -164,7 +164,7 @@
} // toEmotion
=
//String boxTypes[] =3D {"files", "links", "news", "newsLink", "freeText",=
"webapps"};
-String boxTypes[] =3D {"files", "usersContainer", "groupsContainer", "link=
s", "news", "newslast5", "freeText", "webapps"};
+String boxTypes[] =3D {"files", "links", "news", "freeText", "webapps"};
=
String boxTitleTypes[] =3D {"greyBackground", "transparent","coloredBorder=
","greyBorder","coloredBackground"};
String boxContentTypes[] =3D {"greyBorder","transparent","coloredBorder","=
coloredBackground","greyBackground"};
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/templates.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/templates.xml&rev=3D1261&repname=3Dcorporate_portal_te=
mplates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/templates.xml (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/templates.xml Fri Oct 19 11:1=
9:00 2007
@@ -11,93 +11,21 @@
<parameter name=3D"filename">simple.jsp</parameter>
<parameter name=3D"display-name">Simple</parameter>
</template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Double</parameter>
- <parameter name=3D"filename">double.jsp</parameter>
- <parameter name=3D"display-name">Double</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Portal</parameter>
- <parameter name=3D"filename">layout.jsp</parameter>
- <parameter name=3D"display-name">Portal</parameter>
- </template>
- <!-- experimental
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">PersonalHome</parameter>
- <parameter name=3D"filename">layout2.jsp</parameter>
- <parameter name=3D"display-name">PersonalHome</parameter>
- </template>
- -->
<template browsable=3D"1" visible=3D"1" homepage=3D"1">
<parameter name=3D"name">Home</parameter>
<parameter name=3D"filename">home.jsp</parameter>
<parameter name=3D"display-name">Home</parameter>
</template>
<template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Directories Main</parameter>
- <parameter name=3D"filename">directories.jsp</parameter>
- <parameter name=3D"display-name">Directories Main</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Directories Files</parameter>
- <parameter name=3D"filename">folder.jsp</parameter>
- <parameter name=3D"display-name">Directories Files</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Directories Links</parameter>
- <parameter name=3D"filename">links.jsp</parameter>
- <parameter name=3D"display-name">Directories Links</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Directories People</parameter>
- <parameter name=3D"filename">people.jsp</parameter>
- <parameter name=3D"display-name">Directories People</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Directories Project</parameter>
- <parameter name=3D"filename">project.jsp</parameter>
- <parameter name=3D"display-name">Directories Project</parameter>
+ <parameter name=3D"name">Double</parameter>
+ <parameter name=3D"filename">double.jsp</parameter>
+ <parameter name=3D"display-name">Double</parameter>
</template>
<template browsable=3D"1" visible=3D"1">
<parameter name=3D"name">Faq</parameter>
<parameter name=3D"filename">faq.jsp</parameter>
<parameter name=3D"display-name">Faq</parameter>
</template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Document listing</parameter>
- <parameter name=3D"filename">document_listing.jsp</parameter>
- <parameter name=3D"display-name">Document Listing</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Document detail</parameter>
- <parameter name=3D"filename">document_detail.jsp</parameter>
- <parameter name=3D"display-name">Document Detail</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Categories browsing</parameter>
- <parameter name=3D"filename">categories.jsp</parameter>
- <parameter name=3D"display-name">Categories browsing</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">HTML file clipping</parameter>
- <parameter name=3D"filename">html_file_clipping.jsp</parameter>
- <parameter name=3D"display-name">HTML file clipping</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Blog</parameter>
- <parameter name=3D"filename">blog.jsp</parameter>
- <parameter name=3D"display-name">Blog</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Blog listing</parameter>
- <parameter name=3D"filename">blog_listing.jsp</parameter>
- <parameter name=3D"display-name">Blog listing</parameter>
- </template>
- <template browsable=3D"1" visible=3D"1">
- <parameter name=3D"name">Metadata Api</parameter>
- <parameter name=3D"filename">metadataapi.jsp</parameter>
- <parameter name=3D"display-name">Metadata api</parameter>
- </template>
<template browsable=3D"1" visible=3D"1">
<parameter name=3D"name">Simple form generator</parameter>
<parameter
name=3D"filename">simple_form_generator.jsp</parameter>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
