Ticket #4574: 4574.diff

django/contrib/admin/static/admin/js/calendar.js

@@ -45 +45 @@
         }
         return days;
     },
-    draw: function(month, year, div_id, callback) { // month = 1-12, year = 1-9999
+    draw: function(month, year, div_id, callback, selected) { // month = 1-12, year = 1-9999
         var today = new Date();
         var todayDay = today.getDate();
         var todayMonth = today.getMonth()+1;
         var todayYear = today.getFullYear();
         var todayClass = '';
-
+        var is_selected_month = false; 
+        if (typeof selected != 'undefined') { 
+            is_selected_month = (selected.getFullYear() == year && (selected.getMonth()+1) == month); 
+        }
         month = parseInt(month);
         year = parseInt(year);
         var calDiv = document.getElementById(div_id);
@@ -74 +77 @@
         for (var i = 0; i < startingPos; i++) {
             var _cell = quickElement('td', tableRow, ' ');
             _cell.style.backgroundColor = '#f3f3f3';
+            _cell.className = "nonday";
         }
 
         // Draw days of month
@@ -82 +86 @@
             if (i%7 == 0 && currentDay != 1) {
                 tableRow = quickElement('tr', tableBody);
             }
+            todayClass='';
             if ((currentDay==todayDay) && (month==todayMonth) && (year==todayYear)) {
                 todayClass='today';
-            } else {
-                todayClass='';
             }
+            if (is_selected_month && currentDay == selected.getDate()) { 
+                if (todayclass != '') todayclass += " "; 
+                todayclass += "selected"; /* e.g: class="today selected" */
+            } 
             var cell = quickElement('td', tableRow, '', 'class', todayClass);
 
             quickElement('a', cell, currentDay, 'href', 'javascript:void(' + callback + '('+year+','+month+','+currentDay+'));');
@@ -97 +104 @@
         while (tableRow.childNodes.length < 7) {
             var _cell = quickElement('td', tableRow, ' ');
             _cell.style.backgroundColor = '#f3f3f3';
+            _cell.className = "nonday";
         }
 
         calDiv.appendChild(calTable);
@@ -104 +112 @@
 }
 
 // Calendar -- A calendar instance
-function Calendar(div_id, callback) {
+function Calendar(div_id, callback, selected) {
     // div_id (string) is the ID of the element in which the calendar will
     //     be displayed
     // callback (string) is the name of a JavaScript function that will be
@@ -115 +123 @@
     this.today = new Date();
     this.currentMonth = this.today.getMonth() + 1;
     this.currentYear = this.today.getFullYear();
+    if (typeof selected == 'undefined') { 
+            this.selected = this.today; 
+        } 
+        else { 
+            this.selected = selected; 
+        } 
 }
 Calendar.prototype = {
     drawCurrent: function() {
-        CalendarNamespace.draw(this.currentMonth, this.currentYear, this.div_id, this.callback);
+        CalendarNamespace.draw(this.currentMonth, this.currentYear, this.div_id, this.callback, this.selected);
     },
     drawDate: function(month, year) {
         this.currentMonth = month;