Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8920] trunk
|
From: <var...@us...> - 2014-06-19 16:08:03
|
Revision: 8920
http://sourceforge.net/p/phpwiki/code/8920
Author: vargenau
Date: 2014-06-19 16:07:55 +0000 (Thu, 19 Jun 2014)
Log Message:
-----------
Remove IEFixes
Modified Paths:
--------------
trunk/TODO
trunk/lib/WikiTheme.php
trunk/themes/MonoBook/themeinfo.php
trunk/themes/blog/themeinfo.php
Removed Paths:
-------------
trunk/themes/Makefile.global
trunk/themes/MonoBook/IEFixes.css
trunk/themes/MonoBook/IEFixes.js
trunk/themes/blog/IEFixes.css
trunk/themes/default/IEFixes.css
trunk/themes/smaller/IEFixes.css
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/TODO 2014-06-19 16:07:55 UTC (rev 8920)
@@ -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:
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/lib/WikiTheme.php 2014-06-19 16:07:55 UTC (rev 8920)
@@ -1356,12 +1356,6 @@
$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.
*/
Deleted: trunk/themes/Makefile.global
===================================================================
--- trunk/themes/Makefile.global 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/Makefile.global 2014-06-19 16:07:55 UTC (rev 8920)
@@ -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' > $@
Deleted: trunk/themes/MonoBook/IEFixes.css
===================================================================
--- trunk/themes/MonoBook/IEFixes.css 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/MonoBook/IEFixes.css 2014-06-19 16:07:55 UTC (rev 8920)
@@ -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;
Deleted: trunk/themes/MonoBook/IEFixes.js
===================================================================
--- trunk/themes/MonoBook/IEFixes.js 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/MonoBook/IEFixes.js 2014-06-19 16:07:55 UTC (rev 8920)
@@ -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++;
- }
-}
Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/MonoBook/themeinfo.php 2014-06-19 16:07:55 UTC (rev 8920)
@@ -82,18 +82,6 @@
{
$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('<meta http-equiv="imagetoolbar" content="no" />'));
- }
$this->addMoreAttr('body', "class-ns-0", HTML::Raw('class="ns-0"'));
// CSS file defines fonts, colors and background images for this
Deleted: trunk/themes/blog/IEFixes.css
===================================================================
--- trunk/themes/blog/IEFixes.css 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/blog/IEFixes.css 2014-06-19 16:07:55 UTC (rev 8920)
@@ -1,7 +0,0 @@
-/*
-** Stylesheet filter for some b0rked browser
-*/
-
-div.actionbuttons a {
- font-size: 75%;
-}
Modified: trunk/themes/blog/themeinfo.php
===================================================================
--- trunk/themes/blog/themeinfo.php 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/blog/themeinfo.php 2014-06-19 16:07:55 UTC (rev 8920)
@@ -133,9 +133,6 @@
// 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");
Deleted: trunk/themes/default/IEFixes.css
===================================================================
--- trunk/themes/default/IEFixes.css 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/default/IEFixes.css 2014-06-19 16:07:55 UTC (rev 8920)
@@ -1,11 +0,0 @@
-/*
-** IE Fixes (5.0, 5.5, 6.0)
-*/
-
-#actionbuttons, #signin {
- font-size: 80%
-}
-
-td, .hint {
- font-size: 90%
-}
Deleted: trunk/themes/smaller/IEFixes.css
===================================================================
--- trunk/themes/smaller/IEFixes.css 2014-06-19 15:37:54 UTC (rev 8919)
+++ trunk/themes/smaller/IEFixes.css 2014-06-19 16:07:55 UTC (rev 8920)
@@ -1,11 +0,0 @@
-/*
-** IE Fixes (5.0, 5.5, 6.0)
-*/
-
-#actionbuttons, #signin {
- font-size: 80%
-}
-
-td, .hint {
- font-size: 90%
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
