[geeklog-cvs] geeklog-1.3/public_html calendar.php,1.52,1.53 calendar_event.php,1.36,1.37

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv8735

Modified Files:
	calendar.php calendar_event.php 
Log Message:
Various improvements for event handling (12am/pm, personal calendars, quick add form).


Index: calendar.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/calendar.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** calendar.php	26 Oct 2004 10:26:54 -0000	1.52
--- calendar.php	11 Dec 2004 14:54:48 -0000	1.53
***************
*** 260,269 ****
--- 260,273 ----
      $cur_hour = date ('H', time ());
      if ($cur_hour >= 12) {
+         $tpl->set_var ('am_selected', '');
          $tpl->set_var ('pm_selected', 'selected="selected"');
      } else {
          $tpl->set_var ('am_selected', 'selected="selected"');
+         $tpl->set_var ('pm_selected', '');
      }
      if ($cur_hour > 12) {
          $cur_hour = $cur_hour - 12;
+     } else if ($cur_hour == 0) {
+         $cur_hour = 12;
      }
      $tpl->set_var('hour_options', COM_getHourFormOptions ($cur_hour));

Index: calendar_event.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/calendar_event.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** calendar_event.php	10 Dec 2004 09:24:15 -0000	1.36
--- calendar_event.php	11 Dec 2004 14:54:48 -0000	1.37
***************
*** 507,512 ****
              ));
          
!     $cal_templates->set_var('lang_addevent', $LANG02[6]);
!     $cal_templates->set_var('lang_backtocalendar', $LANG02[15]);
  
      $result = DB_query($datesql);
--- 507,517 ----
              ));
          
!     $cal_templates->set_var ('lang_addevent', $LANG02[6]);
!     $cal_templates->set_var ('lang_backtocalendar', $LANG02[15]);
!     if ($mode == 'personal') {
!         $cal_templates->set_var ('calendar_mode', '&mode=personal');
!     } else {
!         $cal_templates->set_var ('calendar_mode', '');
!     }
  
      $result = DB_query($datesql);