- [DEV-137] fixed js calendar (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5767 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 8 insertions, 4 deletions

diff --git a/frontends/php/include/js.inc.php b/frontends/php/include/js.inc.php
index 559c6e64..d0741e3a 100644
--- a/frontends/php/include/js.inc.php
+++ b/frontends/php/include/js.inc.php
@@ -187,7 +187,7 @@ function simple_js_redirect($url,$timeout=null){
 	echo '</script>';
 }
 
-function	play_sound($filename){
+function play_sound($filename){
 
 	echo '<script language="javascript" type="text/javascript">
 	
@@ -202,7 +202,7 @@ function	play_sound($filename){
 }
 
 
-function	SetFocus($frm_name, $fld_name){
+function SetFocus($frm_name, $fld_name){
 	echo '<script language="javascript" type="text/javascript">
 	<!--
 		document.forms["'.$frm_name.'"].elements["'.$fld_name.'"].focus();
@@ -210,7 +210,7 @@ function	SetFocus($frm_name, $fld_name){
 	</script>';
 }
 
-function	Alert($msg){
+function Alert($msg){
 	echo '<script language="javascript" type="text/javascript">
 	<!--
 		alert("'.$msg.'");
diff --git a/frontends/php/js/calendar.js b/frontends/php/js/calendar.js
index ab1fa0ec..d47e4d1d 100644
--- a/frontends/php/js/calendar.js
+++ b/frontends/php/js/calendar.js
@@ -525,7 +525,11 @@ createDaysTab: function(){
 	table.appendChild(tbody);
 	
 	var cur_month = this.cdt.getMonth();
-	var prev_days = this.cdt.getDay();
+	
+// make 0 - monday, not sunday(as default)
+	var prev_days = this.cdt.getDay() - 1;
+	if(prev_days < 0) prev_days = 6;
+	
 	if(prev_days > 0){
 		this.cdt.setTime(this.cdt.getTime() - (prev_days*86400000));
 	}