From 98117308f20712473d4f2150f28a702699d32726 Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Fri, 1 Jun 2012 20:50:29 +0000 Subject: [PATCH] More file-system cleanup --- e107_admin/fileinspector.php | 2 +- e107_admin/header.php | 21 +- e107_admin/image.php | 33 +-- e107_files/iepngfix.htc.php | 195 ------------------ e107_files/sleight_img.gif | Bin 49 -> 0 bytes e107_files/sleight_js.php | 70 ------- e107_themes/templates/header_default.php | 19 -- {e107_files => e107_web/css}/e107.css | 0 {e107_files => e107_web}/utilities/dbgen.php | 0 .../utilities/passcalc.php | 0 .../utilities/passconv.php | 0 .../utilities/pluginxmlgen.php | 0 .../utilities/resetcore.php | 0 {e107_files => e107_web}/utilities/style.css | 0 14 files changed, 23 insertions(+), 317 deletions(-) delete mode 100644 e107_files/iepngfix.htc.php delete mode 100644 e107_files/sleight_img.gif delete mode 100644 e107_files/sleight_js.php rename {e107_files => e107_web/css}/e107.css (100%) rename {e107_files => e107_web}/utilities/dbgen.php (100%) rename {e107_files => e107_web}/utilities/passcalc.php (100%) rename {e107_files => e107_web}/utilities/passconv.php (100%) rename {e107_files => e107_web}/utilities/pluginxmlgen.php (100%) rename {e107_files => e107_web}/utilities/resetcore.php (100%) rename {e107_files => e107_web}/utilities/style.css (100%) diff --git a/e107_admin/fileinspector.php b/e107_admin/fileinspector.php index 6af9a2ad8..e580a6cfd 100644 --- a/e107_admin/fileinspector.php +++ b/e107_admin/fileinspector.php @@ -1056,7 +1056,7 @@ class file_inspector { echo "\n"; } if (!isset($no_core_css) || !$no_core_css) { - echo "\n"; + echo "\n"; } } diff --git a/e107_admin/header.php b/e107_admin/header.php index 1281fd240..27a428be0 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -158,7 +158,7 @@ $e_js = e107::getJs(); if (!isset($no_core_css) || !$no_core_css) { //echo "\n"; - $e_js->otherCSS('{e_FILE}e107.css'); + $e_js->otherCSS('{e_WEB_CSS}e107.css'); } // Register Plugin specific CSS @@ -232,25 +232,6 @@ echo "\n\n"; $e_js->renderJs('inline_css', false, 'css', false); echo "\n\n"; -//iepngfix - IE6 only -if ((isset($pref['enable_png_image_fix']) && $pref['enable_png_image_fix'] == true) || (isset($sleight) && $sleight == true)) -{ - /* - * The only problem is that the browser is REALLY, - * REALLY slow when it has to render more elements - * try e.g. "div, img, td, input" (or just *) instead only img rule - * However I hope this will force IE6 user to hate it :) - */ - echo "\n"; -} - - // // Unobtrusive JS via CSS, prevent 3rd party code overload // diff --git a/e107_admin/image.php b/e107_admin/image.php index 65c505bb1..1e684c7c5 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -1746,19 +1746,28 @@ if (isset($_POST['check_avatar_sizes'])) ".$frm->text('im_path', $pref['im_path'])."
".IMALAN_6."
- + "; - - - ".IMALAN_34." - - -
- ".$frm->checkbox('enable_png_image_fix', 1, ($pref['enable_png_image_fix']))." -
".IMALAN_35."
-
- - + // Removed as IE6 should no longer be supported. A 3rd-party plugin can be made for this functionality if really needed. + /* + + + $text .= " + + ".IMALAN_34." + + +
+ ".$frm->checkbox('enable_png_image_fix', 1, ($pref['enable_png_image_fix']))." +
".IMALAN_35."
+
+ + "; + + */ + + + $text .= " ".IMALAN_36." diff --git a/e107_files/iepngfix.htc.php b/e107_files/iepngfix.htc.php deleted file mode 100644 index 7589c9ec5..000000000 --- a/e107_files/iepngfix.htc.php +++ /dev/null @@ -1,195 +0,0 @@ - - - - diff --git a/e107_files/sleight_img.gif b/e107_files/sleight_img.gif deleted file mode 100644 index c5b2954ac69d09d5d0dbc814c4360db32333a26a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 xcmZ?wbhEHbWMp7un8*ME|NsC0_5C4`q4<-9k%57UK?fuXl4oFI3Snfh1^_dV3GM&@ diff --git a/e107_files/sleight_js.php b/e107_files/sleight_js.php deleted file mode 100644 index ff515965e..000000000 --- a/e107_files/sleight_js.php +++ /dev/null @@ -1,70 +0,0 @@ - -if (navigator.platform == "Win32" && navigator.appName == "Microsoft Internet Explorer" && window.attachEvent) { - window.attachEvent("onload", fnLoadPngs); -} - -function fnLoadPngs() { - var rslt = navigator.appVersion.match(/MSIE (\d+\.\d+)/, ''); - var itsAllGood = (rslt != null && Number(rslt[1]) >= 5.5 && Number(rslt[1]) < 7); - - for (var i = document.images.length - 1, img = null; (img = document.images[i]); i--) { - if (itsAllGood && img.src.match(/\.png$/i) != null) { - fnFixPng(img); - img.attachEvent("onpropertychange", fnPropertyChanged); - } - } - - var nl = document.getElementsByTagName("input"); - for (var i = nl.length - 1, e = null; (e = nl[i]); i--) { - if (e.type == 'image') { - if (e.src.match(/\.png$/i) != null) { - fnFixPng(e); - e.attachEvent("onpropertychange", fnPropertyChanged); - } - } - } -} - -function fnPropertyChanged() { - if (window.event.propertyName == "src") { - var el = window.event.srcElement; - if (!el.src.match(/sleight_img\.gif$/i)) { - el.filters.item(0).src = el.src; - el.src = "sleight_img.gif"; - } - } -} - -function fnFixPng(img) { - var src = img.src; - img.style.width = img.width + "px"; - img.style.height = img.height + "px"; - img.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + src + "', sizingMethod='scale')" - img.src = "sleight_img.gif"; -} \ No newline at end of file diff --git a/e107_themes/templates/header_default.php b/e107_themes/templates/header_default.php index 4f7447e09..433fa1883 100644 --- a/e107_themes/templates/header_default.php +++ b/e107_themes/templates/header_default.php @@ -299,25 +299,6 @@ echo "\n\n"; $e_js->renderJs('inline_css', false, 'css', false); echo "\n\n"; -//IEpngfix - visible by IE6 only -// FIXME - disable this style block via JS for all GOOD browsers. -if($e_pref->get('enable_png_image_fix') || (isset($sleight) && $sleight == true)) // FIXME - KILL this GLOBAL! -{ - /* - * The only problem is that the browser is REALLY, - * REALLY slow when it has to render more elements - * try e.g. "div, img, td, input" (or just *) instead only img rule - * However I hope it'll force IE6 users to switch to a modern browser... - */ - echo "\n"; -} - // // Style for unobtrusive JS, prevent 3rd party code overload // diff --git a/e107_files/e107.css b/e107_web/css/e107.css similarity index 100% rename from e107_files/e107.css rename to e107_web/css/e107.css diff --git a/e107_files/utilities/dbgen.php b/e107_web/utilities/dbgen.php similarity index 100% rename from e107_files/utilities/dbgen.php rename to e107_web/utilities/dbgen.php diff --git a/e107_files/utilities/passcalc.php b/e107_web/utilities/passcalc.php similarity index 100% rename from e107_files/utilities/passcalc.php rename to e107_web/utilities/passcalc.php diff --git a/e107_files/utilities/passconv.php b/e107_web/utilities/passconv.php similarity index 100% rename from e107_files/utilities/passconv.php rename to e107_web/utilities/passconv.php diff --git a/e107_files/utilities/pluginxmlgen.php b/e107_web/utilities/pluginxmlgen.php similarity index 100% rename from e107_files/utilities/pluginxmlgen.php rename to e107_web/utilities/pluginxmlgen.php diff --git a/e107_files/utilities/resetcore.php b/e107_web/utilities/resetcore.php similarity index 100% rename from e107_files/utilities/resetcore.php rename to e107_web/utilities/resetcore.php diff --git a/e107_files/utilities/style.css b/e107_web/utilities/style.css similarity index 100% rename from e107_files/utilities/style.css rename to e107_web/utilities/style.css