[Fusionforge-commits] FusionForge branch master updated. 0eb9d482bdbf83b0f0ebf742327ac10622f24cf9

Marc-Etienne VARGENAU vargenau at fusionforge.org
Thu Jun 19 18:16:16 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  0eb9d482bdbf83b0f0ebf742327ac10622f24cf9 (commit)
      from  af3161e6165f5c68116c4bb1f91ec488a9e2696e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0eb9d482bdbf83b0f0ebf742327ac10622f24cf9
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Thu Jun 19 18:15:51 2014 +0200

    wiki: remove IEFixes

diff --git a/src/plugins/wiki/www/TODO b/src/plugins/wiki/www/TODO
index ada0c90..325bfa1 100644
--- a/src/plugins/wiki/www/TODO
+++ b/src/plugins/wiki/www/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/src/plugins/wiki/www/lib/WikiTheme.php b/src/plugins/wiki/www/lib/WikiTheme.php
index 330db4b..bac4bb2 100644
--- a/src/plugins/wiki/www/lib/WikiTheme.php
+++ b/src/plugins/wiki/www/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/src/plugins/wiki/www/themes/Makefile.global b/src/plugins/wiki/www/themes/Makefile.global
deleted file mode 100644
index c844209..0000000
--- a/src/plugins/wiki/www/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/src/plugins/wiki/www/themes/MonoBook/IEFixes.css b/src/plugins/wiki/www/themes/MonoBook/IEFixes.css
deleted file mode 100644
index 82f47d1..0000000
--- a/src/plugins/wiki/www/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 */
- at import "null?\"\{"; 
- at import "IE60Fixes.css";
-
-voice-family: "\"}\"";
-voice-family:inherit; 
diff --git a/src/plugins/wiki/www/themes/MonoBook/IEFixes.js b/src/plugins/wiki/www/themes/MonoBook/IEFixes.js
deleted file mode 100644
index 15166a6..0000000
--- a/src/plugins/wiki/www/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/src/plugins/wiki/www/themes/MonoBook/themeinfo.php b/src/plugins/wiki/www/themes/MonoBook/themeinfo.php
index 4871e8f..11a1aa1 100644
--- a/src/plugins/wiki/www/themes/MonoBook/themeinfo.php
+++ b/src/plugins/wiki/www/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('<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
diff --git a/src/plugins/wiki/www/themes/blog/IEFixes.css b/src/plugins/wiki/www/themes/blog/IEFixes.css
deleted file mode 100644
index 88386fb..0000000
--- a/src/plugins/wiki/www/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/src/plugins/wiki/www/themes/blog/themeinfo.php b/src/plugins/wiki/www/themes/blog/themeinfo.php
index f5afea7..ea3c7e6 100644
--- a/src/plugins/wiki/www/themes/blog/themeinfo.php
+++ b/src/plugins/wiki/www/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/src/plugins/wiki/www/themes/default/IEFixes.css b/src/plugins/wiki/www/themes/default/IEFixes.css
deleted file mode 100644
index edcb058..0000000
--- a/src/plugins/wiki/www/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/src/plugins/wiki/www/themes/smaller/IEFixes.css b/src/plugins/wiki/www/themes/smaller/IEFixes.css
deleted file mode 100644
index edcb058..0000000
--- a/src/plugins/wiki/www/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%
-}

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/wiki/www/TODO                          |    7 ---
 src/plugins/wiki/www/lib/WikiTheme.php             |    6 ---
 src/plugins/wiki/www/themes/Makefile.global        |   29 ------------
 src/plugins/wiki/www/themes/MonoBook/IEFixes.css   |   11 -----
 src/plugins/wiki/www/themes/MonoBook/IEFixes.js    |   47 --------------------
 src/plugins/wiki/www/themes/MonoBook/themeinfo.php |   12 -----
 src/plugins/wiki/www/themes/blog/IEFixes.css       |    7 ---
 src/plugins/wiki/www/themes/blog/themeinfo.php     |    3 --
 src/plugins/wiki/www/themes/default/IEFixes.css    |   11 -----
 src/plugins/wiki/www/themes/smaller/IEFixes.css    |   11 -----
 10 files changed, 144 deletions(-)
 delete mode 100644 src/plugins/wiki/www/themes/Makefile.global
 delete mode 100644 src/plugins/wiki/www/themes/MonoBook/IEFixes.css
 delete mode 100644 src/plugins/wiki/www/themes/MonoBook/IEFixes.js
 delete mode 100644 src/plugins/wiki/www/themes/blog/IEFixes.css
 delete mode 100644 src/plugins/wiki/www/themes/default/IEFixes.css
 delete mode 100644 src/plugins/wiki/www/themes/smaller/IEFixes.css


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list