cmailleux 2005/09/28 15:23:00 CEST
Modified files:
core/src/webapp/jsp/jahia/administration manage_production.jsp
Log:
Correct creation of regexp for ie and opera
Call the right resource for labelling
Revision Changes Path
1.2 +34 -34
jahia/core/src/webapp/jsp/jahia/administration/manage_production.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/manage_production.jsp.diff?r1=1.1&r2=1.2&f=h
Index: manage_production.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/manage_production.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manage_production.jsp 2 Sep 2005 10:26:23 -0000 1.1
+++ manage_production.jsp 28 Sep 2005 13:23:00 -0000 1.2
@@ -12,7 +12,7 @@
padding: 2px;
background-color: lightyellow;
visibility: hidden;
-z-index: 100;
+z-index: 1000;
font-size : 8pt;
/*Remove below line to remove shadow. Below line should always appear last
within this CSS*/
filter: progid:DXImageTransform.Microsoft.Shadow(color=gray,direction=135);
@@ -95,7 +95,7 @@
}
function validateForm(){
var form = document.mainForm;
- var regexp = /[\w:\/\*\?-,#]+/ig;
+ var regexp = new RegExp("[\\w:\\/\\*\\?-,#]","ig");
if(!form.targetSite.value.match(regexp)) {
alert('<jahia:adminResourceBundle
resourceName="org.jahia.admin.productionManager.form.error.required.targetSite"/>');
return false;
@@ -186,8 +186,8 @@
form.profiles.value=profilesConcat;
}
-var contentHelpCron1 = 'For those unfamiliar with "cron", this means being
able to create a firing schedule such as: "At 8:00am every Monday through
Friday" or "At 1:30am every last Friday of the month".<br>'+
-'A "Cron-Expression" is a string comprised of 6 or 7 fields separated by
white space. The 6 mandatory and 1 optional fields are as follows:<br>'+
+var contentHelpCron1 = 'For those unfamiliar with \"cron\", this means being
able to create a firing schedule such as: \"At 8:00am every Monday through
Friday\" or \"At 1:30am every last Friday of the month\".<br>'+
+'A \"Cron-Expression\" is a string comprised of 6 or 7 fields separated by
white space. The 6 mandatory and 1 optional fields are as follows:<br>'+
'<pre>'+
'Field Name Allowed Values Allowed Special Characters<br>'+
'Seconds 0-59 , - * /<br>'+
@@ -198,47 +198,47 @@
'Day-of-Week 1-7 or SUN-SAT , - * ? / L C #<br>'+
'Year (Optional) empty, 1970-2099 , - * /<br>'+
'</pre>'+
-'The \'*\' character is used to specify all values. For example, "*" in the
minute field means "every minute".<br>'+
+'The \'*\' character is used to specify all values. For example, \"*\" in
the minute field means \"every minute\".<br>'+
'The \'?\' character is allowed for the day-of-month and day-of-week fields.
It is used to specify \'no specific value\'. This is useful when you need to
specify something in one of the two fileds, but not the other. See the examples
below for clarification.<br>'+
-'The \'-\' character is used to specify ranges For example "10-12" in the
hour field means "the hours 10, 11 and 12".<br>'+
-'The \',\' character is used to specify additional values. For example
"MON,WED,FRI" in the day-of-week field means "the days Monday, Wednesday, and
Friday".<br>'+
-'The \'/\' character is used to specify increments. For example "0/15" in
the seconds field means "the seconds 0, 15, 30, and 45". And "5/15" in the
seconds field means "the seconds 5, 20, 35, and 50". You can also specify \'/\'
after the \'*\' character - in this case \'*\' is equivalent to having \'0\'
before the \'/\'.<br>'+
-'The \'L\' character is allowed for the day-of-month and day-of-week fields.
This character is short-hand for "last", but it has different meaning in each
of the two fields. For example, the value "L" in the day-of-month field means
"the last day of the month" - day 31 for January, day 28 for February on
non-leap years. If used in the day-of-week field by itself, it simply means "7"
or "SAT". But if used in the day-of-week field after another value, it means
"the last xxx day of the month" - for example "6L" means "the last friday of
the month". When using the \'L\' option, it is important not to specify lists,
or ranges of values, as you\'ll get confusing results.<br>'+
-'The \'W\' character is allowed for the day-of-month field. This character
is used to specify the weekday (Monday-Friday) nearest the given day. As an
example, if you were to specify "15W" as the value for the day-of-month field,
the meaning is: "the nearest weekday to the 15th of the month". So if the 15th
is a Saturday, the trigger will fire on Friday the 14th. If the 15th is a
Sunday, the trigger will fire on Monday the 16th. If the 15th is a Tuesday,
then it will fire on Tuesday the 15th. However if you specify "1W" as the value
for day-of-month, and the 1st is a Saturday, the trigger will fire on Monday
the 3rd, as it will not \'jump\' over the boundary of a month\'s days. The
\'W\' character can only be specified when the day-of-month is a single day,
not a range or list of days.<br>'+
-'The \'L\' and \'W\' characters can also be combined for the day-of-month
expression to yield \'LW\', which translates to "last weekday of the
month".<br>'+
-'The \'#\' character is allowed for the day-of-week field. This character is
used to specify "the nth" XXX day of the month. For example, the value of "6#3"
in the day-of-week field means the third Friday of the month (day 6 = Friday
and "#3" = the 3rd one in the month). Other examples: "2#1" = the first Monday
of the month and "4#5" = the fifth Wednesday of the month. Note that if you
specify "#5" and there is not 5 of the given day-of-week in the month, then no
firing will occur that month.<br>'+
-'The \'C\' character is allowed for the day-of-month and day-of-week fields.
This character is short-hand for "calendar". This means values are calculated
against the associated calendar, if any. If no calendar is associated, then it
is equivalent to having an all-inclusive calendar. A value of "5C" in the
day-of-month field means "the first day included by the calendar on or after
the 5th". A value of "1C" in the day-of-week field means "the first day
included by the calendar on or after sunday".<br>'+
+'The \'-\' character is used to specify ranges For example \"10-12\" in the
hour field means \"the hours 10, 11 and 12\".<br>'+
+'The \',\' character is used to specify additional values. For example
\"MON,WED,FRI\" in the day-of-week field means \"the days Monday, Wednesday,
and Friday\".<br>'+
+'The \'/\' character is used to specify increments. For example \"0/15\" in
the seconds field means \"the seconds 0, 15, 30, and 45\". And \"5/15\" in the
seconds field means \"the seconds 5, 20, 35, and 50\". You can also specify
\'/\' after the \'*\' character - in this case \'*\' is equivalent to having
\'0\' before the \'/\'.<br>'+
+'The \'L\' character is allowed for the day-of-month and day-of-week fields.
This character is short-hand for \"last\", but it has different meaning in each
of the two fields. For example, the value \"L\" in the day-of-month field means
\"the last day of the month\" - day 31 for January, day 28 for February on
non-leap years. If used in the day-of-week field by itself, it simply means
\"7\" or \"SAT\". But if used in the day-of-week field after another value, it
means \"the last xxx day of the month\" - for example \"6L\" means \"the last
friday of the month\". When using the \'L\' option, it is important not to
specify lists, or ranges of values, as you\'ll get confusing results.<br>'+
+'The \'W\' character is allowed for the day-of-month field. This character
is used to specify the weekday (Monday-Friday) nearest the given day. As an
example, if you were to specify \"15W\" as the value for the day-of-month
field, the meaning is: \"the nearest weekday to the 15th of the month\". So if
the 15th is a Saturday, the trigger will fire on Friday the 14th. If the 15th
is a Sunday, the trigger will fire on Monday the 16th. If the 15th is a
Tuesday, then it will fire on Tuesday the 15th. However if you specify \"1W\"
as the value for day-of-month, and the 1st is a Saturday, the trigger will fire
on Monday the 3rd, as it will not \'jump\' over the boundary of a month\'s
days. The \'W\' character can only be specified when the day-of-month is a
single day, not a range or list of days.<br>'+
+'The \'L\' and \'W\' characters can also be combined for the day-of-month
expression to yield \'LW\', which translates to \"last weekday of the
month\".<br>'+
+'The \'#\' character is allowed for the day-of-week field. This character is
used to specify \"the nth\" XXX day of the month. For example, the value of
\"6#3\" in the day-of-week field means the third Friday of the month (day 6 =
Friday and \"#3\" = the 3rd one in the month). Other examples: \"2#1\" = the
first Monday of the month and \"4#5\" = the fifth Wednesday of the month. Note
that if you specify \"#5\" and there is not 5 of the given day-of-week in the
month, then no firing will occur that month.<br>'+
+'The \'C\' character is allowed for the day-of-month and day-of-week fields.
This character is short-hand for \"calendar\". This means values are calculated
against the associated calendar, if any. If no calendar is associated, then it
is equivalent to having an all-inclusive calendar. A value of \"5C\" in the
day-of-month field means \"the first day included by the calendar on or after
the 5th\". A value of \"1C\" in the day-of-week field means \"the first day
included by the calendar on or after sunday\".<br>'+
'The legal characters and the names of months and days of the week are not
case sensitive.<br>';
+
var contentHelpCron2 = 'Here are some full examples:<br>'+
'Expression Meaning<br>'+
-'"0 0 12 * * ?" Fire at 12pm (noon) every day<br>'+
-'"0 15 10 ? * *" Fire at 10:15am every day<br>'+
-'"0 15 10 * * ?" Fire at 10:15am every day<br>'+
-'"0 15 10 * * ? *" Fire at 10:15am every day<br>'+
-'"0 15 10 * * ? 2005" Fire at 10:15am every day during the
year 2005<br>'+
-'"0 * 14 * * ?" Fire every minute starting at 2pm and ending at
2:59pm, every day<br>'+
-'"0 0/5 14 * * ?" Fire every 5 minutes starting at 2pm and ending
at 2:55pm, every day<br>'+
-'"0 0/5 14,18 * * ?" Fire every 5 minutes starting at 2pm
and ending at 2:55pm, AND fire every 5 minutes starting at 6pm and ending at
6:55pm, every day<br>'+
-'"0 0-5 14 * * ?" Fire every minute starting at 2pm and ending at
2:05pm, every day<br>'+
-'"0 10,44 14 ? 3 WED" Fire at 2:10pm and at 2:44pm every
Wednesday in the month of March.<br>'+
-'"0 15 10 ? * MON-FRI" Fire at 10:15am every Monday, Tuesday,
Wednesday, Thursday and Friday<br>'+
-'"0 15 10 15 * ?" Fire at 10:15am on the 15th day of every
month<br>'+
-'"0 15 10 L * ?" Fire at 10:15am on the last day of every
month<br>'+
-'"0 15 10 ? * 6L" Fire at 10:15am on the last Friday of every
month<br>'+
-'"0 15 10 ? * 6L" Fire at 10:15am on the last Friday of every
month<br>'+
-'"0 15 10 ? * 6L 2002-2005" Fire at 10:15am on every last friday of
every month during the years 2002, 2003, 2004 and 2005<br>'+
-'"0 15 10 ? * 6#3" Fire at 10:15am on the third Friday of every
month<br>'+
-'</pre>'+ ///
+'\"0 0 12 * * ?\" Fire at 12pm (noon) every day<br>'+
+'\"0 15 10 ? * *\" Fire at 10:15am every day<br>'+
+'\"0 15 10 * * ?\" Fire at 10:15am every day<br>'+
+'\"0 15 10 * * ? *\" Fire at 10:15am every day<br>'+
+'\"0 15 10 * * ? 2005\" Fire at 10:15am every day during the
year 2005<br>'+
+'\"0 * 14 * * ?\" Fire every minute starting at 2pm and ending at
2:59pm, every day<br>'+
+'\"0 0/5 14 * * ?\" Fire every 5 minutes starting at 2pm and ending
at 2:55pm, every day<br>'+
+'\"0 0/5 14,18 * * ?\" Fire every 5 minutes starting at 2pm
and ending at 2:55pm, AND fire every 5 minutes starting at 6pm and ending at
6:55pm, every day<br>'+
+'\"0 0-5 14 * * ?\" Fire every minute starting at 2pm and ending at
2:05pm, every day<br>'+
+'\"0 10,44 14 ? 3 WED\" Fire at 2:10pm and at 2:44pm every
Wednesday in the month of March.<br>'+
+'\"0 15 10 ? * MON-FRI\" Fire at 10:15am every Monday, Tuesday,
Wednesday, Thursday and Friday<br>'+
+'\"0 15 10 15 * ?\" Fire at 10:15am on the 15th day of every
month<br>'+
+'\"0 15 10 L * ?\" Fire at 10:15am on the last day of every
month<br>'+
+'\"0 15 10 ? * 6L\" Fire at 10:15am on the last Friday of every
month<br>'+
+'\"0 15 10 ? * 6L\" Fire at 10:15am on the last Friday of every
month<br>'+
+'\"0 15 10 ? * 6L 2002-2005\" Fire at 10:15am on every last
friday of every month during the years 2002, 2003, 2004 and 2005<br>'+
+'\"0 15 10 ? * 6#3\" Fire at 10:15am on the third Friday of
every month<br>'+
'Pay attention to the effects of \'?\' and \'*\' in the day-of-week and
day-of-month fields!<br>'+
'NOTES:<br>'+
' * Support for the features described for the \'C\' character is not
complete.<br>'+
' * Support for specifying both a day-of-week and a day-of-month value is
not complete (you\'ll need to use the \'?\' character in on of these
fields).<br>'+
-' * Be careful when setting fire times between mid-night and 1:00 AM -
"daylight savings" can cause a skip or a repeat depending on whether the time
moves back or jumps forward.<br>';
+' * Be careful when setting fire times between mid-night and 1:00 AM -
\"daylight savings\" can cause a skip or a repeat depending on whether the time
moves back or jumps forward.<br>';
//-->
</script>
<tr>
- <td align="right" class="text" colspan="2"><b><% if ( currentSite!= null
){%><jahia:adminResourceBundle
resourceName="org.jahia.admin.site.label"/> <%=currentSite.getServerName()%> <%}%>:: <jahia:adminResourceBundle
resourceName="org.jahia.admin.manageLanguages.label"/> ::</b> </td>
+ <td align="right" class="text" colspan="2"><b><% if ( currentSite!= null
){%><jahia:adminResourceBundle
resourceName="org.jahia.admin.site.label"/> <%=currentSite.getServerName()%> <%}%>:: <jahia:adminResourceBundle
resourceName="org.jahia.admin.productionManager.label"/> ::</b> </td>
</tr>
</table>
<br>
@@ -259,7 +259,7 @@
<table border="0" cellpadding="0" width="90%">
<tbody>
<tr>
-<td align="left" nowrap> <font class="text"> <b><jahia:adminResourceBundle
resourceName="org.jahia.admin.productionManager.configuredSite.label"/> :</b><br>
+<td align="left" nowrap> <font class="text"> <b><jahia:adminResourceBundle
resourceName="org.jahia.admin.productionManager.configuredSite.label"/> :</b></font><br>
</td>
</tr>
<tr>
