[soc2010/app-loading] merged trunkarchive/soc2010/app-loading

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/app-loading@13818 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 29 insertions, 8 deletions

diff --git a/django/contrib/admin/media/css/base.css b/django/contrib/admin/media/css/base.css
index da502f357a..9c1f71f810 100644
--- a/django/contrib/admin/media/css/base.css
+++ b/django/contrib/admin/media/css/base.css
@@ -445,6 +445,14 @@ ul.messagelist li {
     background: #ffc url(../img/admin/icon_success.gif) 5px .3em no-repeat;
 }
 
+ul.messagelist li.warning{
+    background-image: url(../img/admin/icon_alert.gif);
+}
+
+ul.messagelist li.error{
+    background-image: url(../img/admin/icon_error.gif);
+}
+
 .errornote {
     font-size: 12px !important;
     display: block;
@@ -470,6 +478,11 @@ ul.errorlist {
     background: red url(../img/admin/icon_alert.gif) 5px .3em no-repeat;
 }
 
+.errorlist li a {
+ 	color: white;
+    text-decoration: underline;
+}
+
 td ul.errorlist {
     margin: 0 !important;
     padding: 0 !important;
diff --git a/django/contrib/admin/media/css/changelists.css b/django/contrib/admin/media/css/changelists.css
index 99ff8bc0cf..282833c440 100644
--- a/django/contrib/admin/media/css/changelists.css
+++ b/django/contrib/admin/media/css/changelists.css
@@ -9,6 +9,8 @@
     width: 100%;
 }
 
+.change-list .hiddenfields { display:none; }
+
 .change-list .filtered table {
     border-right: 1px solid #ddd;
 }
@@ -21,7 +23,7 @@
     background: white url(../img/admin/changelist-bg.gif) top right repeat-y !important;
 }
 
-.change-list .filtered table, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
+.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
     margin-right: 160px !important;
     width: auto !important;
 }
diff --git a/django/contrib/admin/media/js/dateparse.js b/django/contrib/admin/media/js/dateparse.js
index e1c870e146..3cb82dea13 100644
--- a/django/contrib/admin/media/js/dateparse.js
+++ b/django/contrib/admin/media/js/dateparse.js
@@ -100,8 +100,9 @@ var dateParsePatterns = [
     {   re: /^(\d{1,2})(?:st|nd|rd|th)? (\w+)$/i, 
         handler: function(bits) {
             var d = new Date();
-            d.setDate(parseInt(bits[1], 10));
+            d.setDate(1);
             d.setMonth(parseMonth(bits[2]));
+            d.setDate(parseInt(bits[1], 10));
             return d;
         }
     },
@@ -109,9 +110,10 @@ var dateParsePatterns = [
     {   re: /^(\d{1,2})(?:st|nd|rd|th)? (\w+),? (\d{4})$/i,
         handler: function(bits) {
             var d = new Date();
-            d.setDate(parseInt(bits[1], 10));
-            d.setMonth(parseMonth(bits[2]));
+            d.setDate(1);
             d.setYear(bits[3]);
+            d.setMonth(parseMonth(bits[2]));
+            d.setDate(parseInt(bits[1], 10));
             return d;
         }
     },
@@ -119,8 +121,9 @@ var dateParsePatterns = [
     {   re: /^(\w+) (\d{1,2})(?:st|nd|rd|th)?$/i, 
         handler: function(bits) {
             var d = new Date();
-            d.setDate(parseInt(bits[2], 10));
+            d.setDate(1);
             d.setMonth(parseMonth(bits[1]));
+            d.setDate(parseInt(bits[2], 10));
             return d;
         }
     },
@@ -128,9 +131,10 @@ var dateParsePatterns = [
     {   re: /^(\w+) (\d{1,2})(?:st|nd|rd|th)?,? (\d{4})$/i,
         handler: function(bits) {
             var d = new Date();
-            d.setDate(parseInt(bits[2], 10));
-            d.setMonth(parseMonth(bits[1]));
+            d.setDate(1);
             d.setYear(bits[3]);
+            d.setMonth(parseMonth(bits[1]));
+            d.setDate(parseInt(bits[2], 10));
             return d;
         }
     },
@@ -158,9 +162,10 @@ var dateParsePatterns = [
     {   re: /(\d{1,2})\/(\d{1,2})\/(\d{4})/,
         handler: function(bits) {
             var d = new Date();
+            d.setDate(1);
             d.setYear(bits[3]);
-            d.setDate(parseInt(bits[2], 10));
             d.setMonth(parseInt(bits[1], 10) - 1); // Because months indexed from 0
+            d.setDate(parseInt(bits[2], 10));
             return d;
         }
     },
@@ -168,6 +173,7 @@ var dateParsePatterns = [
     {   re: /(\d{4})-(\d{1,2})-(\d{1,2})/,
         handler: function(bits) {
             var d = new Date();
+            d.setDate(1);
             d.setYear(parseInt(bits[1]));
             d.setMonth(parseInt(bits[2], 10) - 1);
             d.setDate(parseInt(bits[3], 10));