applying patch to version 1.15.0

10 files changed, 86 insertions, 7 deletions

diff --git a/skins/common/block.js b/skins/common/block.js
index 6f7be0cd..90211efa 100644
--- a/skins/common/block.js
+++ b/skins/common/block.js
@@ -31,6 +31,7 @@ function updateBlockOptions() {
 	var addy = target.value;
 	var isEmpty = addy.match(/^\s*$/);
 	var isIp = addy.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|:(:[0-9A-Fa-f]{1,4}){1,7}|[0-9A-Fa-f]{1,4}(:{1,2}[0-9A-Fa-f]{1,4}|::$){1,7})(\/\d+)?$/);
+	var isIpRange = isIp && addy.match(/\/\d+$/);
 
 	var anonymousRow = document.getElementById('wpAnonOnlyRow');
 	if( anonymousRow ) {
@@ -51,4 +52,9 @@ function updateBlockOptions() {
 	if( hideuserRow ) {
 		hideuserRow.style.display = isIp && !isEmpty ? 'none' : '';
 	}
+
+	var watchuserRow = document.getElementById('wpEnableWatchUser');
+	if( watchuserRow ) {
+		watchuserRow.style.display = isIpRange && !isEmpty ? 'none' : '';
+	}
 }
diff --git a/skins/common/changepassword.js b/skins/common/changepassword.js
new file mode 100644
index 00000000..1e3e2069
--- /dev/null
+++ b/skins/common/changepassword.js
@@ -0,0 +1,16 @@
+
+function onNameChange() {
+	if ( wgUserName != document.getElementById('wpName').value ) {
+		document.getElementById('wpPassword').disabled = true;
+		document.getElementById('wpComment').disabled = false;
+	} else {
+		document.getElementById('wpPassword').disabled = false;
+		document.getElementById('wpComment').disabled = true;
+	}
+}
+
+function onNameChangeHook() {
+	document.getElementById( 'wpName' ).onblur = onNameChange;
+}
+
+addOnloadHook( onNameChangeHook );
diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css
index 2723bbef..2329d233 100644
--- a/skins/common/cologneblue.css
+++ b/skins/common/cologneblue.css
@@ -1,6 +1,11 @@
 body { margin: 0px; padding: 0px; color: black; }
 #specialform { display: inline; }
 #content { top: 0; margin: 0; padding: 0; }
+#mw-data-after-content {
+ font-family: Verdana, Arial, sans-serif;
+ color: black;
+ font-size: 8pt;
+}
 #topbar { padding: 0px; }
 #powersearch {
   background: #DDEEFF; border-style: solid; border-width: 1px; padding: 2px;
diff --git a/skins/common/common_rtl.css b/skins/common/common_rtl.css
index 11fc995b..4f075ae3 100644
--- a/skins/common/common_rtl.css
+++ b/skins/common/common_rtl.css
@@ -46,3 +46,9 @@ table.filehistory th {
 html > body div#article ul {
 	display: table;
 }
+
+/* feed links */
+a.feedlink {
+	background: none !important;
+	padding-left: 0 !important;
+}
diff --git a/skins/common/history.js b/skins/common/history.js
index 57e61849..6a84b997 100644
--- a/skins/common/history.js
+++ b/skins/common/history.js
@@ -27,7 +27,13 @@ function diffcheck() {
 				}
 				if (oli) { // it's the second checked radio
 					if (inputs[1].checked) {
-						oli.className = "selected";
+						if ( (typeof oli.className) != 'undefined') {
+							oli.classNameOriginal = oli.className.replace( 'selected', '' );
+						} else {
+							oli.classNameOriginal = '';
+						}
+						
+						oli.className = "selected "+oli.classNameOriginal;
 						return false;
 					}
 				} else if (inputs[0].checked) {
@@ -42,7 +48,13 @@ function diffcheck() {
 				if (dli) {
 					inputs[1].style.visibility = 'hidden';
 				}
-				lis[i].className = "selected";
+				if ( (typeof lis[i].className) != 'undefined') {
+					lis[i].classNameOriginal = lis[i].className.replace( 'selected', '' );
+				} else {
+					lis[i].classNameOriginal = '';
+				}
+						
+				lis[i].className = "selected "+lis[i].classNameOriginal;
 				oli = lis[i];
 			}  else { // no radio is checked in this row
 				if (!oli) {
@@ -55,7 +67,7 @@ function diffcheck() {
 				} else {
 					inputs[1].style.visibility = 'visible';
 				}
-				lis[i].className = "";
+				lis[i].className = lis[i].classNameOriginal;
 			}
 		}
 	}
diff --git a/skins/common/images/feed-icon.png b/skins/common/images/feed-icon.png
new file mode 100644
index 00000000..7188fa23
--- /dev/null
+++ b/skins/common/images/feed-icon.png
diff --git a/skins/common/images/nextredirectltr.png b/skins/common/images/nextredirectltr.png
new file mode 100644
index 00000000..7d60cdcf
--- /dev/null
+++ b/skins/common/images/nextredirectltr.png
diff --git a/skins/common/images/nextredirectrtl.png b/skins/common/images/nextredirectrtl.png
new file mode 100644
index 00000000..3d5b3959
--- /dev/null
+++ b/skins/common/images/nextredirectrtl.png
diff --git a/skins/common/shared.css b/skins/common/shared.css
index bd306167..bb08c648 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -14,7 +14,7 @@ span.texhtml { font-family: serif; }
 #wikiPreview.ontop { margin-bottom: 1em; }
 
 /* Stop floats from intruding into edit area in previews */
-#toolbar, #wpTextbox1 { clear: both; }
+#editform, #toolbar, #wpTextbox1 { clear: both; }
 
 div#mw-js-message {
 	margin: 1em 5%;
@@ -253,10 +253,12 @@ td.os-suggest-result-hl {
 /*
  * Special:ListGroupRights styling
  * Special:Statistics styling 
+ * Special:Tags styling 
 */
 
 table.mw-listgrouprights-table,
-table.mw-statistics-table {
+table.mw-statistics-table,
+table.mw-tags-table {
 	border: 1px solid #ccc;
 	border-collapse: collapse;
 }
@@ -266,7 +268,8 @@ table.mw-listgrouprights-table tr  {
 }
 
 table.mw-listgrouprights-table td, table.mw-listgrouprights-table th,
-table.mw-statistics-table td, table.mw-statistics-table th {
+table.mw-statistics-table td, table.mw-statistics-table th,
+table.mw-tags-table td, table.mw-tags-table th {
 	padding: 0.5em 0.2em 0.5em 0.2em;
 	border: 1px solid #ccc;
 }
@@ -297,6 +300,19 @@ td#mw-emailuser-sender, td#mw-emailuser-recipient {
 	font-weight: bold;
 }
 
+/* Special:Prefixindex styling */
+table#mw-prefixindex-list-table,
+table#mw-prefixindex-nav-table {
+	width: 98%;
+	background-color: transparent;
+}
+td#mw-prefixindex-nav-form  {
+	font-size: smaller;
+	margin-bottom: 1em;
+	text-align: right;
+	vertical-align: top;
+}
+
 /*
  * Recreating deleted page warning
  * Reupload file warning
@@ -311,3 +327,16 @@ div.mw-warning-with-logexcerpt {
 div.mw-warning-with-logexcerpt ul li {
 	font-size: 90%;
 }
+
+/* (show/hide) revision deletion links */
+span.mw-revdelundel-link,
+strong.mw-revdelundel-link {
+	font-family: monospace;
+	font-size: smaller;
+}
+
+/* feed links */
+a.feedlink {
+	background: url("images/feed-icon.png") center left no-repeat;
+	padding-left: 16px;
+}
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 089d22d7..397dac91 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -14,6 +14,7 @@ var is_khtml = navigator.vendor == 'KDE' ||
 	( document.childNodes && !document.all && !navigator.taintEnabled );
 // For accesskeys; note that FF3+ is included here!
 var is_ff2 = /firefox\/[2-9]|minefield\/3/.test( clientPC );
+var is_ff2_ = /firefox\/2/.test( clientPC );
 // These aren't used here, but some custom scripts rely on them
 var is_ff2_win = is_ff2 && clientPC.indexOf('windows') != -1;
 var is_ff2_x11 = is_ff2 && clientPC.indexOf('x11') != -1;
@@ -91,8 +92,12 @@ if (typeof stylepath != 'undefined' && typeof skin != 'undefined') {
 		importStylesheetURI(stylepath+'/'+skin+'/Opera6Fixes.css');
 	} else if (is_opera_seven && !is_opera_95) {
 		importStylesheetURI(stylepath+'/'+skin+'/Opera7Fixes.css');
+	} else if (is_opera_95) {
+		importStylesheetURI(stylepath+'/'+skin+'/Opera9Fixes.css');
 	} else if (is_khtml) {
 		importStylesheetURI(stylepath+'/'+skin+'/KHTMLFixes.css');
+	} else if (is_ff2_) {
+		importStylesheetURI(stylepath+'/'+skin+'/FF2Fixes.css');
 	}
 }
 
@@ -807,7 +812,7 @@ function ts_parseFloat( s ) {
 	}
 
 	num = parseFloat(s.replace(/,/g, ""));
-	return (isNaN(num) ? s : num);
+	return (isNaN(num) ? 0 : num);
 }
 
 function ts_currencyToSortKey( s ) {