Author: dpillot
Date: Thu Jun 21 18:55:05 2007
New Revision: 724
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D724&repname=
=3Dcorporate_portal_templates_v2
Log:
http://www.jahia.net/jira/browse/TEMPLATES-234: added labels and fix some g=
litches
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_en.properties
branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties
branches/JAHIA-5-0-SP-BRANCH/src/jsp/poll/form.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/poll/poll.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2.properties&re=
v=3D724&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/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2.properties Thu Jun 21 18:55:05 2007
@@ -560,7 +560,7 @@
poll.preferences =3D Preferences
poll.errorMsgIfNoValue =3D Error message if no value
poll.errorMsgIfalreadyPosted =3D Error message if the poll already posted
-
+poll.addresponses =3D Add your anwsers here
quizz.question =3D Question
quizz.isSeparator =3D This is a separator
quizz.answer =3D Answer
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_en.properties=
&rev=3D724&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/java/jahiatemplates/Corporate_portal_t=
emplates_v2_en.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_en.properties Thu Jun 21 18:55:05 2007
@@ -718,4 +718,5 @@
mySettingsaddPersonalProperties=3DTo add a personal property
mySettingsremoveProperty=3DTo remove this personal property
mySettingsnewproplabel=3Dlabel of this new property
-mySettingsnewpropvalue=3Dinitial value
\ No newline at end of file
+mySettingsnewpropvalue=3Dinitial value
+poll.addresponses=3DAdd your anwsers here
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po=
rtal_templates_v2_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_fr.properties=
&rev=3D724&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/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t=
emplates_v2_fr.properties Thu Jun 21 18:55:05 2007
@@ -629,4 +629,5 @@
mySettingsaddPersonalProperties=3DAjouter une propri=C3=A9t=C3=A9 personne=
lle
mySettingsremoveProperty=3DEffacer cette propri=C3=A9t=C3=A9 sp=C3=A9cifiq=
ue
mySettingsnewproplabel=3Dnom de la nouvelle propri=C3=A9t=C3=A9
-mySettingsnewpropvalue=3Dvaleur initiale
\ No newline at end of file
+mySettingsnewpropvalue=3Dvaleur initiale
+poll.addresponses=3DAjouter des r=C3=A9ponses ici
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/poll/form.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/poll/form.inc&rev=3D724&repname=3Dcorporate_portal_template=
s_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/poll/form.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/poll/form.inc Thu Jun 21 18:55:05 =
2007
@@ -16,15 +16,14 @@
limitations under the License.
--%>
<%
+
if (hasWriteAccess && isEditMode) {
%>
<div style=3D"background-color:#e9e9e9;border:1px solid #666666;paddin=
g:5px;">
<h2><%=3DgetResourceBundle("poll.preferences","Preferences",jData)%>
<%
if (pollPrefContainerBean !=3D null) {
- jData.gui().html().drawBeginActionMenu(pollPrefContainerBean,
- null, null, false, "",
- "jahiatemplates.Corporate_portal_templates_v2", null, out);
+ jData.gui().html().drawBeginActionMenu(pollPrefContainerBean, null=
, null, false, "", "jahiatemplates.Corporate_portal_templates_v2", null, ou=
t);
}
%></h2>
<strong><%=3DgetResourceBundle("poll.errorMsgIfNoValue","Error text if=
no value",jData)%>: </strong> <%=3DerrorMsgIfNoValue%><br/>
@@ -34,17 +33,23 @@
}
=
questionContainerList =3D jData.containers().getContainerList( "questionCo=
ntainerList" );
-ContainerListBean questionContainerListBean =3D new ContainerListBean(ques=
tionContainerList,jParams);
+//ContainerListBean questionContainerListBean =3D new ContainerListBean(qu=
estionContainerList,jParams);
+String labelquestion =3D getResourceBundle("poll.typeYourQuestionHere","Ty=
pe your question here",jData);
+String question=3D"";
+boolean isQuestionEmpty =3D true;
+boolean haveAnswers=3Dfalse;
if (questionContainerList !=3D null) {
Enumeration questionsEnum =3D questionContainerList.getContainers();
while (questionsEnum.hasMoreElements()) {
+ isQuestionEmpty =3D false;
questionContainer =3D (JahiaContainer) questionsEnum.nextElement();
ContainerBean questionContainerBean =3D new ContainerBean(question=
Container,jParams);
- String question =3D questionContainer.getFieldValue("question","");
- boolean isQuestionEmpty =3D false;
- if ("".equals(question)) {
- isQuestionEmpty =3D true;
- question =3D getResourceBundle("poll.typeYourQuestionHere","Ty=
pe your question here",jData);
+ question =3D questionContainer.getFieldValue("question","");
+
+ if ("".equals(question) || "<empty>".equals(question)) {
+ isQuestionEmpty =3D true;
+ } else {
+ isQuestionEmpty =3D false;
}
%>
<form method=3D"post" action=3D"<%=3DbypassUrl%>"
@@ -52,33 +57,44 @@
<input type=3D"hidden" name=3D"formId" value=3D"<%=3DquestionConta=
iner.getID()%>"/>
<input type=3D"hidden" name=3D"sendForm" value=3D"true"/>
<h2>
- <%=3Dquestion%>
<%
+ //logger.debug(isEditMode+" "+isQuestionEmpty+ " q:"+question);
+ if(isEditMode && isQuestionEmpty){
+ %><%=3Dlabelquestion%>
+ <% } else if(!isQuestionEmpty){
+ %><%=3Dquestion%>
+ <%
+ }
if (isEditMode) {
- jData.gui().html().drawBeginActionMenu(questionContainerBe=
an,
- null, null, false, "",
- "jahiatemplates.Corporate_portal_templates_v2", null, =
out);
+ jData.gui().html().drawBeginActionMenu(questionContainerBean,=
null, null, false, "", "jahiatemplates.Corporate_portal_templates_v2", nul=
l, out);
}
%>
</h2>
<%
if (!isQuestionEmpty) {
- JahiaContainerList answerContainerList =3D
- questionContainer.getContainerList( "answerContainerList" =
);
+ JahiaContainerList answerContainerList =3D questionContainer.g=
etContainerList( "answerContainerList" );
if (answerContainerList !=3D null) {
- ContainerListBean answerContainerListBean =3D
- new ContainerListBean(answerContainerList,jParams);
+ ContainerListBean answerContainerListBean =3D new Containe=
rListBean(answerContainerList,jParams);
logger.debug("answerContainerList has " + answerContainerL=
ist.getFullSize() + " elements");
+
if (isEditMode) {
+
+ if(answerContainerList.getFullSize()<2){
+ out.print(getResourceBundle("poll.addresponses","Add
your=
answers",jData));
+ haveAnswers=3Dfalse;
+ }
jData.gui().html().drawBeginActionMenu(answerContainer=
ListBean,
null, null, true, "",
"jahiatemplates.Corporate_portal_templates_v2", nu=
ll, out);
+
}
Enumeration answersEnum =3D answerContainerList.getContain=
ers();
while (answersEnum.hasMoreElements()) {
+
JahiaContainer answerContainer =3D (JahiaContainer) an=
swersEnum.nextElement();
ContainerBean answerContainerBean =3D new ContainerBea=
n(answerContainer,jParams);
String answer =3D answerContainer.getFieldValue("answe=
r","");
+ haveAnswers=3Dtrue;
%>
<label>
<input name=3D"answer_<%=3DquestionContainer.getID=
()%>" type=3D"radio"
@@ -104,10 +120,14 @@
}
%>
<br/>
+ <%
+ if(haveAnswers){
+ %>
<input type=3D"submit" name=3D"submit_<%=3DquestionContainer.g=
etID()%>" value=3D'<content:resourceBundle
resourceBundle=3D"jahiatemplates.Corporate_portal_template=
s_v2"
resourceName=3D"poll.submit"/>'/>
<%
+ }
}
%>
</form>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/poll/poll.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/poll/poll.jsp&rev=3D724&repname=3Dcorporate_portal_template=
s_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/poll/poll.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/poll/poll.jsp Thu Jun 21 18:55:05 =
2007
@@ -40,14 +40,14 @@
JahiaContainerList pollPrefContainerList =3D jData.containers().getContain=
erList( "pollPrefContainerList" );
String errorMsgIfNoValue =3D getResourceBundle("poll.chooseAValue","Please=
choose a value",jData);
String errorMsgIfalreadyPosted =3D getResourceBundle("poll.alreadyPostedAt=
","Sorry, but you have already posted this poll",jData);
+logger.debug(errorMsgIfNoValue+" "+errorMsgIfalreadyPosted);
ContainerBean pollPrefContainerBean =3D null;
+
if (pollPrefContainerList !=3D null) {
Enumeration pollPrefContainerEnum =3D pollPrefContainerList.getContain=
ers();
while (pollPrefContainerEnum.hasMoreElements()) {
- JahiaContainer pollPrefContainer =3D
- (JahiaContainer) pollPrefContainerEnum.nextElement();
- pollPrefContainerBean =3D
- new ContainerBean(pollPrefContainer,jParams);
+ JahiaContainer pollPrefContainer =3D (JahiaContainer) pollPrefCont=
ainerEnum.nextElement();
+ pollPrefContainerBean =3D new ContainerBean(pollPrefContainer,jPar=
ams);
errorMsgIfNoValue =3D pollPrefContainer.getFieldValue("errorMsgIfN=
oValue","");
if ("".equals(errorMsgIfNoValue)) {
errorMsgIfNoValue =3D getResourceBundle("poll.chooseAValue","P=
lease choose a value",jData);
@@ -61,7 +61,8 @@
=
String sendForm =3D request.getParameter("sendForm");
if (sendForm !=3D null) {
- %><%@ include file=3D"process.inc"%><%
+ %><%@ include file=3D"process.inc"%>
+ <%
} else {
%><%@ include file=3D"form.inc"%><%
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
