Author: knguyen
Date: Wed Sep 26 10:18:14 2007
New Revision: 18656
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18656&repname=
=3Djahia
Log:
VOD-45: enable time range selection from 0 to 24 instead of 0 to 23
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/hours_input.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/rangerule.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D18656&rep=
name=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/conf/java/JahiaEnginesResources.p=
roperties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties Wed Sep 26 10:18:14 2007
@@ -1136,6 +1136,7 @@
org.jahia.engines.timebasedpublishing.hours.21 =3D 21
org.jahia.engines.timebasedpublishing.hours.22 =3D 22
org.jahia.engines.timebasedpublishing.hours.23 =3D 23
+org.jahia.engines.timebasedpublishing.hours.24 =3D 24
org.jahia.engines.timebasedpublishing.rangerule.daysInWeek.label =3D Days =
in week
org.jahia.engines.timebasedpublishing.days.mon =3D mon
org.jahia.engines.timebasedpublishing.days.tue =3D tue
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D18656&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/conf/java/JahiaEnginesResources_e=
n.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties Wed Sep 26 10:18:14 2007
@@ -1135,6 +1135,7 @@
org.jahia.engines.timebasedpublishing.hours.21 =3D 21
org.jahia.engines.timebasedpublishing.hours.22 =3D 22
org.jahia.engines.timebasedpublishing.hours.23 =3D 23
+org.jahia.engines.timebasedpublishing.hours.24 =3D 24
org.jahia.engines.timebasedpublishing.rangerule.daysInWeek.label =3D Days =
in week
org.jahia.engines.timebasedpublishing.days.mon =3D mon
org.jahia.engines.timebasedpublishing.days.tue =3D tue
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D18656&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/conf/java/JahiaEnginesResources_f=
r.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties Wed Sep 26 10:18:14 2007
@@ -820,6 +820,7 @@
org.jahia.engines.timebasedpublishing.hours.21 =3D 21
org.jahia.engines.timebasedpublishing.hours.22 =3D 22
org.jahia.engines.timebasedpublishing.hours.23 =3D 23
+org.jahia.engines.timebasedpublishing.hours.24 =3D 24
org.jahia.engines.timebasedpublishing.hours.3 =3D 03
org.jahia.engines.timebasedpublishing.hours.4 =3D 04
org.jahia.engines.timebasedpublishing.hours.5 =3D 05
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/ti=
mebasedpublishing/hours_input.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/timebasedpublishing/hours_input.j=
sp&rev=3D18656&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/hours_input.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/hours_input.jsp Wed Sep 26 10:18:14 2007
@@ -22,12 +22,15 @@
String inputNamePrefix =3D (String)request.getAttribute("inputNamePrefix=
");
String hours =3D (String)request.getAttribute("hours");
String minutes =3D (String)request.getAttribute("minutes");
-
+ Integer hoursMax =3D (Integer)request.getAttribute("hoursMax");
+ if (hoursMax =3D=3D null){
+ hoursMax =3D new Integer(24);
+ }
%>
=
HH: <select class=3D"input" name=3D"<%=3DinputNamePrefix%>Hours">
<% =
- for ( int i=3D0; i<24; i++ ){
+ for ( int i=3D0; i<hoursMax.intValue(); i++ ){
%>
<option class=3D"input" value=3D"<%=3DString.valueOf(i)%>" <%if (Stri=
ng.valueOf(i).equals(hours)){%>selected<%}%> /><jahia:engineResourceBundle
resourceName=3D'<%=3D"org.jahia.engines.timebasedpublishing.hours."+=
String.valueOf(i)%>' defaultValue=3D"<%=3Dorg.apache.commons.lang.StringUti=
ls.leftPad(String.valueOf(i),2,'0')%>"/>
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/ti=
mebasedpublishing/rangerule.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/timebasedpublishing/rangerule.jsp=
&rev=3D18656&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/rangerule.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/rangerule.jsp Wed Sep 26 10:18:14 2007
@@ -192,6 +192,7 @@
<%
request.setAttribute("inputNamePrefix","from_"+dayBean.g=
etDay());
request.setAttribute("hours",String.valueOf(dayBean.getF=
romHours()));
+ request.setAttribute("hoursMax",new Integer(24));
request.setAttribute("minutes",String.valueOf(dayBean.ge=
tFromMinutes()));
%>
<jsp:include page=3D"hours_input.jsp" flush=3D"true" />
@@ -203,6 +204,7 @@
<%
request.setAttribute("inputNamePrefix","to_"+dayBean.get=
Day());
request.setAttribute("hours",String.valueOf(dayBean.getT=
oHours()));
+ request.setAttribute("hoursMax",new Integer(25));
request.setAttribute("minutes",String.valueOf(dayBean.ge=
tToMinutes()));
%>
<jsp:include page=3D"hours_input.jsp" flush=3D"true" />
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
