Update of /cvsroot/wtf-tracker/wtf/static
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17860/static
Modified Files:
general.css tracking.js
Log Message:
Changes to support the addition of feature request 1618513: vacation scheduler and OOO calendar
Index: general.css
===================================================================
RCS file: /cvsroot/wtf-tracker/wtf/static/general.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** general.css 3 Dec 2006 23:03:44 -0000 1.13
--- general.css 2 Jan 2007 23:13:29 -0000 1.14
***************
*** 63,73 ****
div#nav_bar {
position: absolute;
! top: 10px;
right: 5px;
text-align: right;
}
div#nav_bar p.nav_bar {
! margin: 2px 2px 8px 2px;
}
--- 63,74 ----
div#nav_bar {
position: absolute;
! top: 5px;
right: 5px;
text-align: right;
+ width: 550px;
}
div#nav_bar p.nav_bar {
! margin: 0px 0px 6px 0px;
}
***************
*** 81,84 ****
--- 82,90 ----
}
+ div#nav_bar p.nav_bar a {
+ line-height: 0.26in;
+ white-space: nowrap;
+ }
+
/* required hack for Mozilla on Linux to make "Administrate Users" page */
/* link menu's <sup> text fit */
Index: tracking.js
===================================================================
RCS file: /cvsroot/wtf-tracker/wtf/static/tracking.js,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tracking.js 21 Dec 2006 16:36:04 -0000 1.12
--- tracking.js 2 Jan 2007 23:13:29 -0000 1.13
***************
*** 607,612 ****
function copyLastData(trackingForm) {
if ( trackingChange && ! confirm(
! 'Are you sure you want to copy last data?\n' +
! 'You will loose any changes you have made.'
) ) return;
--- 607,612 ----
function copyLastData(trackingForm) {
if ( trackingChange && ! confirm(
! "Are you sure you want to copy last data?\n" +
! "You will loose any changes you have made."
) ) return;
***************
*** 619,624 ****
if (
( trackingChange && confirm(
! 'Are you sure you want to reset this data?\n' +
! 'You will loose any changes you have made.'
) ) ||
( trackingForm.copy_last_data_done == "on" && ! trackingChange )
--- 619,624 ----
if (
( trackingChange && confirm(
! "Are you sure you want to reset this data?\n" +
! "You will loose any changes you have made."
) ) ||
( trackingForm.copy_last_data_done == "on" && ! trackingChange )
***************
*** 626,631 ****
skipSubmitTrackingForm = true;
trackingForm.reset();
! //window.location.reload(false);
! window.location.href = '/wtf/view/input/tracking?display_date=' + trackingForm.display_date.value;
}
}
--- 626,675 ----
skipSubmitTrackingForm = true;
trackingForm.reset();
! window.location.href = urlPath + "?display_date=" + trackingForm.display_date.value;
! }
! }
!
! function validateVacation( dateStart, dateEnd ) {
! dateStart = Date.parse( dateStart.replace( /-/g, "/" ) );
! dateEnd = Date.parse( dateEnd.replace( /-/g, "/" ) );
!
! if ( isNaN(dateStart) || isNaN(dateEnd) ) {
! alert(
! "The date values you submitted do not appear to be valid.\n" +
! "Please re-enter the date range and try again."
! );
! return false;
! }
!
! dateStart = new Date(dateStart);
! dateEnd = new Date(dateEnd);
! var today = new Date();
!
! if ( dateStart > dateEnd ) {
! alert(
! "It appears that you have entered a start date that occures\n" +
! "before the end date. Please change your date range and retry."
! );
! return false;
! }
!
! if ( dateStart < today ) {
! alert(
! "You cannot schedule vacation days that occure in the past.\n" +
! "Please re-enter a date range that occures in the future."
! );
! return false;
! }
!
! return true;
! }
!
! function deleteVacation( startDate, endDate, urlPath ) {
! if ( confirm(
! "Are you sure you want to delete your vacation\n" +
! "time from " + startDate + " through " + endDate + "?"
! ) ) {
! document.location.href = urlPath +
! "?date_start=" + startDate + "&date_end=" + endDate + "&action=delete";
}
}
|
