From 69d74265216d34deb53f8e43fa90f3cadbe226a4 Mon Sep 17 00:00:00 2001 From: vargenau Date: Thu, 13 Jan 2011 14:34:22 +0000 Subject: [PATCH] Remove support for Opera 6 and 7 git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@7830 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- themes/Crao/templates/head.tmpl | 7 ------- themes/Crao/templates/htmldump.tmpl | 7 ------- themes/MonoBook/Makefile | 4 ++-- themes/MonoBook/Opera6Fixes-min.css | 1 - themes/MonoBook/Opera6Fixes.css | 18 ------------------ themes/MonoBook/Opera7Fixes-min.css | 1 - themes/MonoBook/Opera7Fixes.css | 15 --------------- themes/MonoBook/rtl.css | 8 -------- themes/MonoBook/wikibits-min.js | 2 +- themes/MonoBook/wikibits.js | 7 +------ themes/Sidebar/templates/htmldump.tmpl | 7 ------- themes/default/templates/head.tmpl | 7 ------- themes/default/templates/htmldump.tmpl | 7 ------- themes/wikilens/templates/head.tmpl | 7 ------- 14 files changed, 4 insertions(+), 94 deletions(-) delete mode 100644 themes/MonoBook/Opera6Fixes-min.css delete mode 100644 themes/MonoBook/Opera6Fixes.css delete mode 100644 themes/MonoBook/Opera7Fixes-min.css delete mode 100644 themes/MonoBook/Opera7Fixes.css diff --git a/themes/Crao/templates/head.tmpl b/themes/Crao/templates/head.tmpl index e9ba0bd14..92a39c37a 100644 --- a/themes/Crao/templates/head.tmpl +++ b/themes/Crao/templates/head.tmpl @@ -18,13 +18,6 @@ - \n", CHARSET); - " href="" /> diff --git a/themes/MonoBook/Makefile b/themes/MonoBook/Makefile index f70497be5..3d57f536c 100644 --- a/themes/MonoBook/Makefile +++ b/themes/MonoBook/Makefile @@ -6,8 +6,8 @@ # CSS_SRC = IE50Fixes.css IE70Fixes.css KHTMLFixes.css commonPrint.css rtl.css \ - IE55Fixes.css IEFixes.css Opera6Fixes.css main.css wikiprintable.css \ - IE60Fixes.css IEMacFixes.css Opera7Fixes.css monobook.css wikistandard.css + IE55Fixes.css IEFixes.css main.css wikiprintable.css \ + IE60Fixes.css IEMacFixes.css monobook.css wikistandard.css MAIN = wikibits JS_MAIN = wikibits.js # JS_REST = IEFixes.js diff --git a/themes/MonoBook/Opera6Fixes-min.css b/themes/MonoBook/Opera6Fixes-min.css deleted file mode 100644 index 1f54b9449..000000000 --- a/themes/MonoBook/Opera6Fixes-min.css +++ /dev/null @@ -1 +0,0 @@ -#column-one{position:relative;max-width:11.7em;}#p-personal{width:45em;margin-left:8.6em;right:0;}#bodyContent a.external{background:url(external.png) center right no-repeat;padding-right:13px;} \ No newline at end of file diff --git a/themes/MonoBook/Opera6Fixes.css b/themes/MonoBook/Opera6Fixes.css deleted file mode 100644 index 03d922e84..000000000 --- a/themes/MonoBook/Opera6Fixes.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * $Id$ - */ - -/* opera 6 fixes */ -#column-one { - position: relative; - max-width: 11.7em; -} -#p-personal { - width: 45em; - margin-left: 8.6em; - right: 0; -} -#bodyContent a.external { - background: url(external.png) center right no-repeat; - padding-right: 13px; -} diff --git a/themes/MonoBook/Opera7Fixes-min.css b/themes/MonoBook/Opera7Fixes-min.css deleted file mode 100644 index 68f1cffab..000000000 --- a/themes/MonoBook/Opera7Fixes-min.css +++ /dev/null @@ -1 +0,0 @@ -#p-cactions{margin-top:.1em;}#p-cactions li a{top:2px;}#bodyContent a.external{background:url(external.png) center right no-repeat;padding-right:13px;} \ No newline at end of file diff --git a/themes/MonoBook/Opera7Fixes.css b/themes/MonoBook/Opera7Fixes.css deleted file mode 100644 index a5e3aa0bb..000000000 --- a/themes/MonoBook/Opera7Fixes.css +++ /dev/null @@ -1,15 +0,0 @@ -/** - * $Id$ - */ - -/* small tweaks for opera seven */ -#p-cactions { - margin-top: 0.1em; -} -#p-cactions li a { - top: 2px; -} -#bodyContent a.external { - background: url(external.png) center right no-repeat; - padding-right: 13px; -} diff --git a/themes/MonoBook/rtl.css b/themes/MonoBook/rtl.css index 5e3ecc1d3..55e42c117 100644 --- a/themes/MonoBook/rtl.css +++ b/themes/MonoBook/rtl.css @@ -11,9 +11,6 @@ Works mostly ok nicely on Safari 1.2.1; fine in Mozilla. Safari bugs (1.2.1): * Tabs are still appearing in left-to-right order. (Try after localizing) -Opera bugs (7.23 linux): -* Some bits of ltr text (sidebar box titles) have forward and backward versions overlapping each other - IE/mac bugs: * The thing barfs on Hebrew and Arabic anyway, so no point testing. @@ -24,11 +21,6 @@ IE6 bug: Missing features due to lack of support: * external link icons, icon next to user name -To test: -* Opera6 -* IE 5.0 -* etc - */ body, body * { diff --git a/themes/MonoBook/wikibits-min.js b/themes/MonoBook/wikibits-min.js index 5eca1fb6a..a34bf36a1 100644 --- a/themes/MonoBook/wikibits-min.js +++ b/themes/MonoBook/wikibits-min.js @@ -1 +1 @@ -var noOverwrite=false;var alertText;var clientPC=navigator.userAgent.toLowerCase();var is_gecko=((clientPC.indexOf("gecko")!=-1)&&(clientPC.indexOf("spoofer")==-1)&&(clientPC.indexOf("khtml")==-1)&&(clientPC.indexOf("netscape/7.0")==-1));var is_safari=((clientPC.indexOf("AppleWebKit")!=-1)&&(clientPC.indexOf("spoofer")==-1));var is_khtml=(navigator.vendor=="KDE"||(document.childNodes&&!document.all&&!navigator.taintEnabled));if(clientPC.indexOf("opera")!=-1){var is_opera=true;var is_opera_preseven=(window.opera&&!document.childNodes);var is_opera_seven=(window.opera&&document.childNodes)}function onloadhook(){if(!(document.getElementById&&document.getElementsByTagName)){return}histrowinit();unhidetzbutton();tabbedprefs()}if(window.addEventListener){window.addEventListener("load",onloadhook,false)}else{if(window.attachEvent){window.attachEvent("onload",onloadhook)}}function addcss(a){if(is_opera_preseven){document.write('')}else{if(is_opera_seven){document.write('')}else{if(is_khtml){document.write('')}}}return}if(window.top!=window){window.top.location=window.location}function toggleVisibility(b,e,a){var c=document.getElementById(b);var d=document.getElementById(e);var f=document.getElementById(a);if(c.style.display=="none"){c.style.display="block";d.style.display="none";f.style.display="inline"}else{c.style.display="none";d.style.display="inline";f.style.display="none"}}function histrowinit(){hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i=0)?"-":"+")+((b<10)?"0":"")+b+((a<10)?"0":"")+a;if(h!=d){var e=f.split("$1");document.write(e[0]+"UTC"+d+e[1])}}function unhidetzbutton(){tzb=document.getElementById("guesstimezonebutton");if(tzb){tzb.style.display="inline"}}function fetchTimezone(){var c=new Date();var e=c.getTimezoneOffset();var b=Math.floor(Math.abs(e)/60);var a=Math.abs(e)%60;var d=((e>=0)?"-":"")+((b<10)?"0":"")+b+":"+((a<10)?"0":"")+a;return d}function guessTimezone(a){document.preferences.wpHourDiff.value=fetchTimezone()}function showTocToggle(a,b){if(document.getElementById){document.writeln('['+b+"]")}}function toggleToc(){var c=document.getElementById("tocinside");var b=document.getElementById("showlink");var a=document.getElementById("hidelink");if(c.style.display=="none"){c.style.display=tocWas;a.style.display="";b.style.display="none"}else{tocWas=c.style.display;c.style.display="none";a.style.display="none";b.style.display=""}}function addButton(f,a,c,b,e){a=escapeQuotes(a);c=escapeQuotes(c);b=escapeQuotes(b);e=escapeQuotes(e);var g="";if(!document.selection&&!is_gecko){var d=new RegExp("\\\\n","g");c=c.replace(d,"");b=b.replace(d,"");g="onMouseover=\"if(!noOverwrite){document.infoform.infobox.value='"+c+e+b+"'};\""}document.write('");document.write(''+a+'");document.write("");return}function addInfobox(d,c){alertText=c;var a=navigator.userAgent.toLowerCase();var b=new RegExp("\\\\n","g");alertText=alertText.replace(b,"\n");if(!document.selection&&!is_gecko){d=escapeQuotesHTML(d);document.write("
')}}function escapeQuotes(b){var a=new RegExp("'","g");b=b.replace(a,"\\'");a=new RegExp('"',"g");b=b.replace(a,""");a=new RegExp("\\n","g");b=b.replace(a,"\\n");return b}function escapeQuotesHTML(b){var a=new RegExp('"',"g");b=b.replace(a,""");return b}function insertTags(j,a,b){var l=document.editform.wpTextbox1;if(document.selection&&!is_gecko){var m=document.selection.createRange().text;if(!m){m=b}l.focus();if(m.charAt(m.length-1)==" "){m=m.substring(0,m.length-1);document.selection.createRange().text=j+m+a+" "}else{document.selection.createRange().text=j+m+a}}else{if(l.selectionStart||l.selectionStart=="0"){var k=l.selectionStart;var c=l.selectionEnd;var e=l.scrollTop;var d=(l.value).substring(k,c);if(!d){d=b}if(d.charAt(d.length-1)==" "){subst=j+d.substring(0,(d.length-1))+a+" "}else{subst=j+d+a}l.value=l.value.substring(0,k)+subst+l.value.substring(c,l.value.length);l.focus();var o=k+(j.length+d.length+a.length);l.selectionStart=o;l.selectionEnd=o;l.scrollTop=e}else{var h=alertText;var g=new RegExp("\\$1","g");var f=new RegExp("\\$2","g");h=h.replace(g,b);h=h.replace(f,j+b+a);var n;if(b){n=prompt(h)}else{n=""}if(!n){n=b}n=j+n+a;document.infoform.infobox.value=n;if(!is_safari){l.focus()}noOverwrite=true}}if(l.createTextRange){l.caretPos=document.selection.createRange().duplicate()}}; \ No newline at end of file +var noOverwrite=false;var alertText;var clientPC=navigator.userAgent.toLowerCase();var is_gecko=((clientPC.indexOf("gecko")!=-1)&&(clientPC.indexOf("spoofer")==-1)&&(clientPC.indexOf("khtml")==-1)&&(clientPC.indexOf("netscape/7.0")==-1));var is_safari=((clientPC.indexOf("AppleWebKit")!=-1)&&(clientPC.indexOf("spoofer")==-1));var is_khtml=(navigator.vendor=="KDE"||(document.childNodes&&!document.all&&!navigator.taintEnabled));if(clientPC.indexOf("opera")!=-1){var is_opera=true;var is_opera_seven=(window.opera&&document.childNodes)}function onloadhook(){if(!(document.getElementById&&document.getElementsByTagName)){return}histrowinit();unhidetzbutton();tabbedprefs()}if(window.addEventListener){window.addEventListener("load",onloadhook,false)}else{if(window.attachEvent){window.attachEvent("onload",onloadhook)}}function addcss(a){if(is_khtml){document.write('')}return}if(window.top!=window){window.top.location=window.location}function toggleVisibility(b,e,a){var c=document.getElementById(b);var d=document.getElementById(e);var f=document.getElementById(a);if(c.style.display=="none"){c.style.display="block";d.style.display="none";f.style.display="inline"}else{c.style.display="none";d.style.display="inline";f.style.display="none"}}function histrowinit(){hf=document.getElementById("pagehistory");if(!hf){return}lis=hf.getElementsByTagName("LI");for(i=0;i=0)?"-":"+")+((b<10)?"0":"")+b+((a<10)?"0":"")+a;if(h!=d){var e=f.split("$1");document.write(e[0]+"UTC"+d+e[1])}}function unhidetzbutton(){tzb=document.getElementById("guesstimezonebutton");if(tzb){tzb.style.display="inline"}}function fetchTimezone(){var c=new Date();var e=c.getTimezoneOffset();var b=Math.floor(Math.abs(e)/60);var a=Math.abs(e)%60;var d=((e>=0)?"-":"")+((b<10)?"0":"")+b+":"+((a<10)?"0":"")+a;return d}function guessTimezone(a){document.preferences.wpHourDiff.value=fetchTimezone()}function showTocToggle(a,b){if(document.getElementById){document.writeln('['+b+"]")}}function toggleToc(){var c=document.getElementById("tocinside");var b=document.getElementById("showlink");var a=document.getElementById("hidelink");if(c.style.display=="none"){c.style.display=tocWas;a.style.display="";b.style.display="none"}else{tocWas=c.style.display;c.style.display="none";a.style.display="none";b.style.display=""}}function addButton(f,a,c,b,e){a=escapeQuotes(a);c=escapeQuotes(c);b=escapeQuotes(b);e=escapeQuotes(e);var g="";if(!document.selection&&!is_gecko){var d=new RegExp("\\\\n","g");c=c.replace(d,"");b=b.replace(d,"");g="onMouseover=\"if(!noOverwrite){document.infoform.infobox.value='"+c+e+b+"'};\""}document.write('");document.write(''+a+'");document.write("");return}function addInfobox(d,c){alertText=c;var a=navigator.userAgent.toLowerCase();var b=new RegExp("\\\\n","g");alertText=alertText.replace(b,"\n");if(!document.selection&&!is_gecko){d=escapeQuotesHTML(d);document.write("
')}}function escapeQuotes(b){var a=new RegExp("'","g");b=b.replace(a,"\\'");a=new RegExp('"',"g");b=b.replace(a,""");a=new RegExp("\\n","g");b=b.replace(a,"\\n");return b}function escapeQuotesHTML(b){var a=new RegExp('"',"g");b=b.replace(a,""");return b}function insertTags(j,a,b){var l=document.editform.wpTextbox1;if(document.selection&&!is_gecko){var m=document.selection.createRange().text;if(!m){m=b}l.focus();if(m.charAt(m.length-1)==" "){m=m.substring(0,m.length-1);document.selection.createRange().text=j+m+a+" "}else{document.selection.createRange().text=j+m+a}}else{if(l.selectionStart||l.selectionStart=="0"){var k=l.selectionStart;var c=l.selectionEnd;var e=l.scrollTop;var d=(l.value).substring(k,c);if(!d){d=b}if(d.charAt(d.length-1)==" "){subst=j+d.substring(0,(d.length-1))+a+" "}else{subst=j+d+a}l.value=l.value.substring(0,k)+subst+l.value.substring(c,l.value.length);l.focus();var o=k+(j.length+d.length+a.length);l.selectionStart=o;l.selectionEnd=o;l.scrollTop=e}else{var h=alertText;var g=new RegExp("\\$1","g");var f=new RegExp("\\$2","g");h=h.replace(g,b);h=h.replace(f,j+b+a);var n;if(b){n=prompt(h)}else{n=""}if(!n){n=b}n=j+n+a;document.infoform.infobox.value=n;if(!is_safari){l.focus()}noOverwrite=true}}if(l.createTextRange){l.caretPos=document.selection.createRange().duplicate()}}; \ No newline at end of file diff --git a/themes/MonoBook/wikibits.js b/themes/MonoBook/wikibits.js index bbe51b36c..95ea163cd 100644 --- a/themes/MonoBook/wikibits.js +++ b/themes/MonoBook/wikibits.js @@ -10,7 +10,6 @@ var is_safari = ((clientPC.indexOf('AppleWebKit')!=-1) && (clientPC.indexOf('spo var is_khtml = (navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled )); if (clientPC.indexOf('opera')!=-1) { var is_opera = true; - var is_opera_preseven = (window.opera && !document.childNodes); var is_opera_seven = (window.opera && document.childNodes); } @@ -28,11 +27,7 @@ else if (window.attachEvent) window.attachEvent("onload",onloadhook); // document.write special stylesheet links function addcss ( stylepath ) { - if (is_opera_preseven) { - document.write(''); - } else if (is_opera_seven) { - document.write(''); - } else if (is_khtml) { + if (is_khtml) { document.write(''); } return; diff --git a/themes/Sidebar/templates/htmldump.tmpl b/themes/Sidebar/templates/htmldump.tmpl index 7c6fc596a..8ff70ee53 100644 --- a/themes/Sidebar/templates/htmldump.tmpl +++ b/themes/Sidebar/templates/htmldump.tmpl @@ -11,13 +11,6 @@ - " href="" /> diff --git a/themes/default/templates/head.tmpl b/themes/default/templates/head.tmpl index 8071d62e6..d6e664d9a 100644 --- a/themes/default/templates/head.tmpl +++ b/themes/default/templates/head.tmpl @@ -24,13 +24,6 @@ - - " href="" /> diff --git a/themes/wikilens/templates/head.tmpl b/themes/wikilens/templates/head.tmpl index 33e77b83a..093ae018a 100644 --- a/themes/wikilens/templates/head.tmpl +++ b/themes/wikilens/templates/head.tmpl @@ -18,13 +18,6 @@ - " href="