[Vtigercrm-developers] [vtiger-commits] r3871 - in /vtigercrm/branches/4.2/modules/Calendar: calendar_month.php config_default.pinc minical.php

[vtiger-commits at vtiger.fosslabs.com]

Author: mfedyk
Date: Tue Feb 21 16:34:22 2006
New Revision: 3871

Log:
move columns for sunday and week number to the right. By briand, fixes #10

Modified:
    vtigercrm/branches/4.2/modules/Calendar/calendar_month.php
    vtigercrm/branches/4.2/modules/Calendar/config_default.pinc
    vtigercrm/branches/4.2/modules/Calendar/minical.php

Modified: vtigercrm/branches/4.2/modules/Calendar/calendar_month.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Calendar/calendar_month.php (original)
+++ vtigercrm/branches/4.2/modules/Calendar/calendar_month.php Tue Feb 21 16:34:22 2006
@@ -134,7 +134,6 @@
 	echo "<tr><td>\n";
 		echo "<table border=\"0\" cellpadding=\"1\" cellspacing=\"1\" width=\"100%\" align=\"center\">\n";
 	echo "<tr>\n";
-	echo "<th class=\"weekday\">". $mod_strings['LBL_WEEK'] ."</th>\n";
 
 for ( $i = $current_user->weekstart;$i<=6;$i++ ) 
 { 
@@ -146,6 +145,7 @@
   echo "<th class=\"weekday\">". $mod_strings['LBL_DAY'.$i] ."</th>\n";
 }
 
+	echo "<th class=\"weekday\">". $mod_strings['LBL_WEEK'] ."</th>\n";
 echo "</tr>\n";
 
 $ts = mktime(12,0,0,$m,1,$y);
@@ -192,7 +192,6 @@
    		echo "<tr>\n";
    		$w0 =  (( 1 + Date("w",mktime(12,0,0,1,1, Date("Y",$ts) ) )) % 7) > 3;
    		$wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) );
-  		echo " <td align=\"right\" class=\"week\"> ". $wn ."&nbsp;</td>\n";
  	}
 
 // check for overlapping days
@@ -345,6 +344,7 @@
  		if ( $wd == ($l->user->weekstart+6)%7   ) 
 		{
    			# end week
+  			echo " <td align=\"right\" class=\"week\"> ". $wn ."&nbsp;</td>\n";
    			echo "</tr>\n";
    			if ( ($xm > $m) || ($xy > $y)  ) 
 			{

Modified: vtigercrm/branches/4.2/modules/Calendar/config_default.pinc
==============================================================================
--- vtigercrm/branches/4.2/modules/Calendar/config_default.pinc (original)
+++ vtigercrm/branches/4.2/modules/Calendar/config_default.pinc Tue Feb 21 16:34:22 2006
@@ -549,7 +549,7 @@
 # 0 = Sunday
 # 1 = Monday
 #
-$tutos[weekstart] = 1;
+$tutos[weekstart] = 0;
 #
 # Holidays
 # 0 = disable set

Modified: vtigercrm/branches/4.2/modules/Calendar/minical.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Calendar/minical.php (original)
+++ vtigercrm/branches/4.2/modules/Calendar/minical.php Tue Feb 21 16:34:22 2006
@@ -120,7 +120,6 @@
 echo "<tr><td>\n";
 echo "<table border=\"0\" cellpadding=\"2\" cellspacing=\"1\" width=\"100%\" align=\"center\">\n";
 echo "<tr>\n";
-echo "<th class=\"weekday\">". $current_module_strings['LBL_WEEK'] ."</th>\n";
 
 $WeekDayName=array('LBL_SM_SUN','LBL_SM_MON','LBL_SM_TUE','LBL_SM_WED','LBL_SM_THU','LBL_SM_FRI','LBL_SM_SAT');
  
@@ -132,6 +131,7 @@
   echo "<th class=\"weekday\">". $current_module_strings[$WeekDayName[$i]] ."</th>\n";
 }
 
+echo "<th class=\"weekday\">". $current_module_strings['LBL_WEEK'] ."</th>\n";
 echo "</tr>\n";
 
 $ts = mktime(12,0,0,$m,1,$y);
@@ -157,7 +157,6 @@
    echo "<tr>\n";
    $w0 =  (( 1 + Date("w",mktime(12,0,0,1,1, Date("Y",$ts) ) )) % 7) > 3;
    $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) );
-   echo " <td align=\"right\" class=\"week\">". $wn ."&nbsp;</td>\n";
  }
 
  $col = "";
@@ -263,6 +262,7 @@
 
  if ( $wd == ($l->user->weekstart+6)%7   ) {
    # end week
+   echo "<td align=\"right\" class=\"week\">". $wn ."&nbsp;</td>\n";
    echo "</tr>\n";
    if ( ($xm > $m) || ($xy > $y)  ) {
      break;