Author: xlawrence
Date: Wed Jan 23 17:33:30 2008
New Revision: 71
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D71&repname=3D=
corporate_portal_templates_v3
Log:
Added FAQ template
Added:
trunk/src/jsp/common/faq/
trunk/src/jsp/common/faq/faqDefinitions.jspf
trunk/src/jsp/common/faq/faqDisplay.jsp
trunk/src/jsp/faq.jsp
Modified:
trunk/src/java/jahiatemplates/default_v3_lang.properties
trunk/src/java/jahiatemplates/default_v3_lang_en.properties
trunk/src/java/jahiatemplates/default_v3_lang_fr.properties
trunk/src/jsp/common/box/box.jsp
trunk/src/jsp/templates.xml
Modified: trunk/src/java/jahiatemplates/default_v3_lang.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/default_v3_lang.properties&rev=3D71&repname=3Dcorporate_portal_tem=
plates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/java/jahiatemplates/default_v3_lang.properties (original)
+++ trunk/src/java/jahiatemplates/default_v3_lang.properties Wed Jan 23 17:=
33:30 2008
@@ -575,4 +575,20 @@
yourHere =3D You are here
boxNameList =3D Name of common box
yes =3D Yes
-#**************** General ressources (end) ****************
\ No newline at end of file
+#**************** General ressources (end) ****************
+
+#**************** FAQ ******************
+faq.list =3D List of categories
+faq.qa.list =3D List of questions/answers
+faq.title =3D Title
+faq.question =3D Question
+faq.answer =3D Answer
+
+add.faqs =3D Add a category
+update.faqs =3D Settings
+update.faq =3D Update
+Supprimer.faq =3D Delete
+add.qas =3D Add a question/answer
+update.qas =3D Settings
+update.qa =3D Update
+Supprimer.qa =3D Delete
Modified: trunk/src/java/jahiatemplates/default_v3_lang_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/default_v3_lang_en.properties&rev=3D71&repname=3Dcorporate_portal_=
templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/java/jahiatemplates/default_v3_lang_en.properties (original)
+++ trunk/src/java/jahiatemplates/default_v3_lang_en.properties Wed Jan 23 =
17:33:30 2008
@@ -573,4 +573,20 @@
yourHere =3D You are here
boxNameList =3D Name of common box
yes =3D Yes
-#**************** General ressources (end) ****************
\ No newline at end of file
+#**************** General ressources (end) ****************
+
+#**************** FAQ ******************
+faq.list =3D List of categories
+faq.qa.list =3D List of questions/answers
+faq.title =3D Title
+faq.question =3D Question
+faq.answer =3D Answer
+
+add.faqs =3D Add a category
+update.faqs =3D Settings
+update.faq =3D Update
+Supprimer.faq =3D Delete
+add.qas =3D Add a question/answer
+update.qas =3D Settings
+update.qa =3D Update
+Supprimer.qa =3D Delete
\ No newline at end of file
Modified: trunk/src/java/jahiatemplates/default_v3_lang_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/default_v3_lang_fr.properties&rev=3D71&repname=3Dcorporate_portal_=
templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/java/jahiatemplates/default_v3_lang_fr.properties (original)
+++ trunk/src/java/jahiatemplates/default_v3_lang_fr.properties Wed Jan 23 =
17:33:30 2008
@@ -609,4 +609,20 @@
update.groupQueries =3D Options
update.groupQuery =3D Modifier la requ=C3=AAte de groupe
delete.groupQuery =3D Supprimer la requ=C3=AAte de groupe
-#************* Box container (end) *************
\ No newline at end of file
+#************* Box container (end) *************
+
+#**************** FAQ ******************
+faq.list =3D Liste de cat=C3=A9gories
+faq.qa.list =3D Liste de questions/r=C3=A9ponses
+faq.title =3D Titre
+faq.question =3D Question
+faq.answer =3D R=C3=A9ponse
+
+add.faqs =3D Ajouter une cat=C3=A9gorie
+update.faqs =3D Options
+update.faq =3D Modifier
+Supprimer.faq =3D Supprimer
+add.qas =3D Ajouter une question/r=C3=A9ponse
+update.qas =3D Options
+update.qa =3D Modifier
+Supprimer.qa =3D Supprimer
\ No newline at end of file
Modified: trunk/src/jsp/common/box/box.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
box/box.jsp&rev=3D71&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/common/box/box.jsp (original)
+++ trunk/src/jsp/common/box/box.jsp Wed Jan 23 17:33:30 2008
@@ -1,3 +1,4 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
<%--
Copyright 2002-2008 Jahia Ltd
=
Added: trunk/src/jsp/common/faq/faqDefinitions.jspf
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
common/faq/faqDefinitions.jspf&rev=3D71&repname=3Dcorporate_portal_template=
s_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/common/faq/faqDefinitions.jspf (added)
+++ trunk/src/jsp/common/faq/faqDefinitions.jspf Wed Jan 23 17:33:30 2008
@@ -0,0 +1,51 @@
+<%--
+Copyright 2002-2008 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 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
+limitations under the License.
+--%>
+<%@ include file=3D"../declarations.jspf" %>
+<content:declareContainerList name=3D"faqContainerList"
+ title=3D"FAQ"
+ titleKey=3D"faq.list"
+ bundleKey=3D"DEFAULT_V3_LANG">
+ <content:declareContainer>
+ <content:declareField name=3D"faqTitle"
+ title=3D"Title"
+ type=3D"SmallText"
+ titleKey=3D"faq.title"
+ bundleKey=3D"DEFAULT_V3_LANG"
+ />
+ <content:declareContainerList name=3D"qaContainerList"
+ title=3D"Questions/answers"
+ titleKey=3D"faq.qa.list"
+ bundleKey=3D"DEFAULT_V3_LANG"
+ >
+ <content:declareContainer>
+ <content:declareField name=3D"question"
+ title=3D"Question"
+ type=3D"SmallText"
+ titleKey=3D"faq.question"
+ bundleKey=3D"DEFAULT_V3_LANG"
+ />
+ <content:declareField name=3D"answer"
+ title=3D"Answer"
+ type=3D"BigText"
+ titleKey=3D"faq.answer"
+ bundleKey=3D"DEFAULT_V3_LANG"
+ />
+ </content:declareContainer>
+ </content:declareContainerList>
+ </content:declareContainer>
+</content:declareContainerList>
\ No newline at end of file
Added: trunk/src/jsp/common/faq/faqDisplay.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
common/faq/faqDisplay.jsp&rev=3D71&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/common/faq/faqDisplay.jsp (added)
+++ trunk/src/jsp/common/faq/faqDisplay.jsp Wed Jan 23 17:33:30 2008
@@ -0,0 +1,91 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
+<%--
+Copyright 2002-2008 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 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
+limitations under the License.
+--%>
+<%@ include file=3D"faqDefinitions.jspf" %>
+
+<content:containerList name=3D"faqContainerList" id=3D"faqContainerList">
+ <jahiaHtml:actionMenu name=3D"faqContainerList"
+ namePostFix=3D".faqs"
+ resourceBundle=3D"jahiatemplates.default_v3_lang=
">
+ <content:container id=3D"faqContainer" cacheKey=3D"faqContainerQ">
+ <h2>
+ <content:textField name=3D"faqTitle" diffActive=3D"true"/>
+ <jahiaHtml:actionMenu name=3D"faqContainer"
+ namePostFix=3D".faq"
+ resourceBundle=3D"jahiatemplates.def=
ault_v3_lang"
+ useFieldSet=3D"false">
+ </jahiaHtml:actionMenu>
+ </h2>
+ <content:containerList name=3D"qaContainerList" id=3D"qaContai=
nerList">
+ <ul>
+ <content:container id=3D"qaContainer" cacheKey=3D"qaCo=
ntainerQ">
+ <li>
+ <a href=3D"#<bean:write name=3D'qaContainer' p=
roperty=3D'id'/>" class=3D"bold">
+ <content:textField name=3D"question" diffA=
ctive=3D"true"/>
+ </a>
+ <jahiaHtml:actionMenu name=3D"qaContainer"
+ namePostFix=3D".qa"
+ resourceBundle=3D"jahiat=
emplates.default_v3_lang"
+ useFieldSet=3D"false">
+ </jahiaHtml:actionMenu>
+ </li>
+ </content:container>
+ <logic:equal name=3D"qaContainerList" property=3D"acti=
onURIsEmpty" value=3D"false">
+ <li>
+ <jahiaHtml:actionMenu name=3D"qaContainerList"=
namePostFix=3D".qas"
+ resourceBundle=3D"jahiat=
emplates.default_v3_lang"
+ useFieldSet=3D"false" la=
belKey=3D"add.qas">
+ </jahiaHtml:actionMenu>
+ </li>
+ </logic:equal>
+ </ul>
+ </content:containerList>
+ </content:container>
+
+ <content:addContainerURL id=3D"addfaqContainerListURL" display=3D"=
false"/>
+ <logic:present name=3D"addfaqContainerListURL">
+ <br/>
+ <a class=3D"horizontaleline" href=3D"<bean:write name=3D'addfa=
qContainerListURL'/>">
+ <content:resourceBundle
+ resourceBundle=3D"jahiatemplates.default_v3_lang"
+ resourceName=3D"addCategory"/>
+ </a>
+ </logic:present>
+ </jahiaHtml:actionMenu>
+</content:containerList>
+
+<content:containerList name=3D"faqContainerList" id=3D"faqContainerList">
+ <content:container id=3D"faqContainer" cacheKey=3D"faqContainerQA">
+ <h2>
+ <content:textField name=3D"faqTitle" diffActive=3D"true"/>
+ </h2>
+ <content:containerList name=3D"qaContainerList" id=3D"qaContainerL=
ist" parentContainerName=3D"faqContainer">
+ <ul>
+ <content:container id=3D"qaContainer" cacheKey=3D"qaContai=
nerQA">
+ <li>
+ <a name=3D"<bean:write name=3D'qaContainer' proper=
ty=3D'id'/>" class=3D"bold">
+ <content:textField name=3D"question" diffActiv=
e=3D"true"/>
+ </a><br/>
+ <content:bigTextField name=3D"answer" diffActive=
=3D"true"/>
+ <br/>
+ </li>
+ </content:container>
+ </ul>
+ </content:containerList>
+ </content:container>
+</content:containerList>
Added: trunk/src/jsp/faq.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
faq.jsp&rev=3D71&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/faq.jsp (added)
+++ trunk/src/jsp/faq.jsp Wed Jan 23 17:33:30 2008
@@ -0,0 +1,50 @@
+<%@ page language=3D"java" contentType=3D"text/html; UTF-8" %>
+<%--
+Copyright 2002-2008 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 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
+limitations under the License.
+--%>
+<%@ include file=3D"common/declarations.jspf" %>
+<%@ include file=3D"common/header.jspf" %>
+
+<div id=3D"main">
+ <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_lang"
+ kind=3D"topTabs"/>
+ <div id=3D"column-left">
+ <%@ include file=3D"common/page_image.jspf" %>
+
+ <!-- left navigation menu (start) -->
+ <jahia-components:navMenu bundleKey=3D"jahiatemplates.default_v3_l=
ang"
+ kind=3D"sideMenu" startLevel=3D"2"/>
+ <!-- left navigation menu (end) -->
+
+ <!-- left box (start) -->
+ <jahiaHtml:include page=3D"common/box/box.jsp">
+ <jahiaHtml:param name=3D"name" value=3D"left_box_list"/>
+ <jahiaHtml:param name=3D"id" value=3D"1"/>
+ </jahiaHtml:include>
+ <!-- left box (end) -->
+ </div>
+ <div id=3D"column-main">
+ <div id=3D"pagePath">
+ <jahia-components:currentPagePath maxchar=3D"40"/>
+ </div>
+
+ <jahiaHtml:include page=3D"common/faq/faqDisplay.jsp"/>
+ </div>
+
+ <div id=3D"main-bottom"></div>
+</div>
+<%@ include file=3D"common/footer.jspf" %>
\ No newline at end of file
Modified: trunk/src/jsp/templates.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/templat=
es.xml&rev=3D71&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/templates.xml (original)
+++ trunk/src/jsp/templates.xml Wed Jan 23 17:33:30 2008
@@ -15,6 +15,7 @@
<template name=3D"Simple" display-name=3D"Simple" filename=3D"simp=
le.jsp"/>
<template name=3D"Double" display-name=3D"Double" filename=3D"doub=
le.jsp"/>
<template name=3D"Home" display-name=3D"Home" filename=3D"home.jsp=
"/>
+ <template name=3D"FAQ" display-name=3D"FAQ" filename=3D"faq.jsp"/>
<template name=3D"Layoutmanager" display-name=3D"Layout manager" f=
ilename=3D"layoutmanager.jsp"/>
<template name=3D"Fullscreenbox" display-name=3D"Full Screen Box" =
filename=3D"fullscreenbox.jsp"/>
</templates>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
