From 1f05b9a2b45ad5d9b44db6d4ff840cd974564bc1 Mon Sep 17 00:00:00 2001 From: vargenau Date: Thu, 19 Jun 2014 16:07:55 +0000 Subject: [PATCH] Remove IEFixes git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8920 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- TODO | 7 ------ lib/WikiTheme.php | 6 ----- themes/Makefile.global | 29 --------------------- themes/MonoBook/IEFixes.css | 11 -------- themes/MonoBook/IEFixes.js | 47 ----------------------------------- themes/MonoBook/themeinfo.php | 12 --------- themes/blog/IEFixes.css | 7 ------ themes/blog/themeinfo.php | 3 --- themes/default/IEFixes.css | 11 -------- themes/smaller/IEFixes.css | 11 -------- 10 files changed, 144 deletions(-) delete mode 100644 themes/Makefile.global delete mode 100644 themes/MonoBook/IEFixes.css delete mode 100644 themes/MonoBook/IEFixes.js delete mode 100644 themes/blog/IEFixes.css delete mode 100644 themes/default/IEFixes.css delete mode 100644 themes/smaller/IEFixes.css diff --git a/TODO b/TODO index ada0c9076..325bfa199 100644 --- a/TODO +++ b/TODO @@ -5,13 +5,6 @@ (to be tested in both Pear and ADODB) * revert of Patch 3024787 by Sébastien Le Callonnec (caused an SQL syntax error) -== Others== -* Minimizer for JS/CSS -** no "make clean" in themes -** "make clean" does not work in themes with no Javascript -** in MonoBook, IEFixes.js cannot be minimized, yuicompressor-2.4.2 gives syntax errors -* plugin Video does not work (code reverted to r7204 to make it work again) - ---- short-term TODO: diff --git a/lib/WikiTheme.php b/lib/WikiTheme.php index 330db4bfa..bac4bb2b1 100644 --- a/lib/WikiTheme.php +++ b/lib/WikiTheme.php @@ -1356,12 +1356,6 @@ else window.onload = downloadJSAtOnload;'); $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css'); $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - if (isBrowserIE()) { - $this->addMoreHeaders($this->_CSSlink(0, - $this->_findFile('IEFixes.css'), 'all')); - $this->addMoreHeaders("\n"); - } - /** * The logo image appears on every page and links to the HomePage. */ diff --git a/themes/Makefile.global b/themes/Makefile.global deleted file mode 100644 index c844209bb..000000000 --- a/themes/Makefile.global +++ /dev/null @@ -1,29 +0,0 @@ -# themes/Makefile.global -# -# minify themes, for gnu make only - -.PHONY: all css js - -THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX fusionforge - -# http://developer.yahoo.com/yui/compressor/ -YUICOMPRESSOR = java -jar ../default/yuicompressor-2.4.7.jar - -css: $(CSS_FILES) - -js: $(MAIN)-min.js $(patsubst %.js,%-min.js,$(JS_REST)) - -clean: - rm $(MAIN)-min.js $(patsubst %.js,%-min.js,$(JS_REST)) $(CSS_FILES) - -$(MAIN)-min.js : $(JS_MAIN) - $(YUICOMPRESSOR) -o $@ $(JS_MAIN) - -%-min.css : %.css - $(YUICOMPRESSOR) -o $@ $< - -%-min.js : %.js - $(YUICOMPRESSOR) -o $@ $< - -IEFixes-min.js : IEFixes.js - $(YUICOMPRESSOR) $< | sed -e's,style.floats,style.float,g' > $@ diff --git a/themes/MonoBook/IEFixes.css b/themes/MonoBook/IEFixes.css deleted file mode 100644 index 82f47d1e4..000000000 --- a/themes/MonoBook/IEFixes.css +++ /dev/null @@ -1,11 +0,0 @@ -/* -** Stylesheet filter for some b0rked browser -** Don't touch, don't add anything here (can break the filter) -** Add rules to the individual stylesheets. -*/ -/* IE6.0 */ -@import "null?\"\{"; -@import "IE60Fixes.css"; - -voice-family: "\"}\""; -voice-family:inherit; diff --git a/themes/MonoBook/IEFixes.js b/themes/MonoBook/IEFixes.js deleted file mode 100644 index 15166a61d..000000000 --- a/themes/MonoBook/IEFixes.js +++ /dev/null @@ -1,47 +0,0 @@ -// IE fix javascript -var rslt = navigator.appVersion.match(/MSIE (\d+\.\d+)/, ''); -if (rslt != null ) var version = Number(rslt[1]); -else var version = 0; - -window.attachEvent("onload", hookit); -function hookit() { - fixalpha(); - relativeforfloats(); -} - -// png alpha transparency fixes -function fixalpha(){ - // bg - if(version >= 5.5 && document.getElementById('p-logo')) { - var logoa = document.getElementById('p-logo').firstChild; - var bg = logoa.currentStyle.backgroundImage; - if (bg.match(/\.png/i) != null){ - var mypng = bg.substring(5,bg.length-2); - logoa.style.backgroundImage = "none"; - logoa.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+mypng+"', sizingMethod='crop')"; - } - } -} - -// fix ie6 disappering float bug -function relativeforfloats() { - var bc = document.getElementById('bodyContent'); - if (bc) { - var tables = bc.getElementsByTagName('table'); - var divs = bc.getElementsByTagName('div'); - } - setrelative(tables); - setrelative(divs); -} -function setrelative (nodes) { - var i = 0; - while (i < nodes.length) { - if(((nodes[i].style.float && nodes[i].style.float != ('none') || - (nodes[i].align && nodes[i].align != ('none'))) && - (!nodes[i].style.position || nodes[i].style.position != 'relative'))) - { - nodes[i].style.position = 'relative'; - } - i++; - } -} diff --git a/themes/MonoBook/themeinfo.php b/themes/MonoBook/themeinfo.php index 4871e8fdd..11a1aa144 100644 --- a/themes/MonoBook/themeinfo.php +++ b/themes/MonoBook/themeinfo.php @@ -82,18 +82,6 @@ class WikiTheme_MonoBook extends WikiTheme_Wikilens { $this->addMoreHeaders(JavaScript("var ta;\nvar skin = '" . $this->_name . "';\n")); $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("wikibits.js")))); - if (isBrowserIE()) { - $ver = browserVersion(); - if ($ver > 5.5 and $ver < 7.0) - $this->addMoreHeaders($this->_CSSlink(0, $this->_findFile('IE60Fixes.css'), 'all')); - elseif ($ver >= 7.0) - $this->addMoreHeaders($this->_CSSlink(0, $this->_findFile('IE70Fixes.css'), 'all')); - unset($ver); - $this->addMoreHeaders("\n"); - $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("IEFixes.js")))); - $this->addMoreHeaders("\n"); - $this->addMoreHeaders(HTML::Raw('')); - } $this->addMoreAttr('body', "class-ns-0", HTML::Raw('class="ns-0"')); // CSS file defines fonts, colors and background images for this diff --git a/themes/blog/IEFixes.css b/themes/blog/IEFixes.css deleted file mode 100644 index 88386fb32..000000000 --- a/themes/blog/IEFixes.css +++ /dev/null @@ -1,7 +0,0 @@ -/* -** Stylesheet filter for some b0rked browser -*/ - -div.actionbuttons a { - font-size: 75%; -} diff --git a/themes/blog/themeinfo.php b/themes/blog/themeinfo.php index f5afea7b5..ea3c7e63b 100644 --- a/themes/blog/themeinfo.php +++ b/themes/blog/themeinfo.php @@ -133,9 +133,6 @@ class WikiTheme_blog extends WikiTheme // override sidebar definitions: $this->setDefaultCSS(_("blog"), 'Kubrick.css'); - if (isBrowserIE()) { - $this->addMoreHeaders($this->_CSSlink(0, $this->_findFile('IEFixes.css'), 'all')); - } $this->addButtonAlias(_("(diff)"), "[diff]"); $this->addButtonAlias("...", "alltime"); diff --git a/themes/default/IEFixes.css b/themes/default/IEFixes.css deleted file mode 100644 index edcb058ab..000000000 --- a/themes/default/IEFixes.css +++ /dev/null @@ -1,11 +0,0 @@ -/* -** IE Fixes (5.0, 5.5, 6.0) -*/ - -#actionbuttons, #signin { - font-size: 80% -} - -td, .hint { - font-size: 90% -} diff --git a/themes/smaller/IEFixes.css b/themes/smaller/IEFixes.css deleted file mode 100644 index edcb058ab..000000000 --- a/themes/smaller/IEFixes.css +++ /dev/null @@ -1,11 +0,0 @@ -/* -** IE Fixes (5.0, 5.5, 6.0) -*/ - -#actionbuttons, #signin { - font-size: 80% -} - -td, .hint { - font-size: 90% -} -- 2.45.0