From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Thu, 22 Apr 2004 09:28:54 +0000 (+0000)
Subject: * logo url specified in the xhtml src, uses $wgLogo
X-Git-Tag: 1.3.0beta1~334
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=b0ac86dcb040dbe14627badd78b34833cfd7c634;p=lhc%2Fweb%2Fwiklou.git

* logo url specified in the xhtml src, uses $wgLogo
* png fix js reactivated, needs to check for activex though
---

diff --git a/images/magnify-clip.png b/images/magnify-clip.png
index 4304142885..9c7f3376c5 100644
Binary files a/images/magnify-clip.png and b/images/magnify-clip.png differ
diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index e4050a872f..1588207688 100644
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -64,7 +64,7 @@
 			global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgOut;
 			global $wgScript, $wgStyleSheetPath, $wgLanguageCode, $wgUseNewInterlanguage;
 			global $wgMimeType, $wgOutputEncoding, $wgUseDatabaseMessages, $wgRequest;
-			global $wgDisableCounters;
+			global $wgDisableCounters, $wgLogo;
 			
 			extract( $wgRequest->getValues( 'oldid', 'diff' ) );
 
@@ -101,6 +101,7 @@
 			*/
 			$tpl->setRef( "searchaction", &$wgScript );
 			$tpl->setRef( "stylepath", &$wgStyleSheetPath );
+			$tpl->setRef( "logopath", &$wgLogo );
 			$tpl->setRef( "lang", &$wgLanguageCode );
 			$tpl->set( "langname", $wgLang->getLanguageName( $wgLanguageCode ) );
 			$tpl->setRef( "username", &$this->username );
diff --git a/stylesheets/IEFixes.js b/stylesheets/IEFixes.js
index 952280e6d8..b83a4d1c03 100644
--- a/stylesheets/IEFixes.js
+++ b/stylesheets/IEFixes.js
@@ -5,8 +5,7 @@ else var version = 0;
 
 window.attachEvent("onload", hookit);
 function hookit() {
-    // replaced by special indexed logo for now
-    //fixalpha();
+    fixalpha();
     if(version == 6) {
         var wrapper = document.getElementById('tawrapper');
         if (!wrapper) relativeforfloats();
diff --git a/stylesheets/monobook/main.css b/stylesheets/monobook/main.css
index 4230a11f63..205f80f127 100644
--- a/stylesheets/monobook/main.css
+++ b/stylesheets/monobook/main.css
@@ -661,7 +661,6 @@ div.townBox dl dd {
     display: block;
     height: 155px;
     width: 135px;
-    background: url(wiki.png) no-repeat;
     background-repeat: no-repeat;
     text-decoration: none;
 }
@@ -952,11 +951,6 @@ head:first-child+body #portal-footer li {
 * html #portal-column-content {
     display: inline;
 }
-/* only indexed png transparency */
-* html #portlet-logo a,
-* html #portlet-logo a:hover {
-    background: url(wiki-indexed.png) no-repeat;
-}
 
 /* float/negative margin brokenness */
 * html #bodyContent pre,
diff --git a/templates/xhtml_slim.pt b/templates/xhtml_slim.pt
index b87edcea9e..cc92bf31ab 100644
--- a/templates/xhtml_slim.pt
+++ b/templates/xhtml_slim.pt
@@ -80,7 +80,7 @@
         </div>
         <!--<esi:include src="staticLogoNaviSearch"/> same for all pages, contains quite a few messages that are worth caching -->
         <div class="portlet" id="portlet-logo">
-          <a href="${nav_urls/mainpage/href}" i18n:attributes="title string:mainpage"></a>
+          <a style="background: url(${logopath}) no-repeat;" href="${nav_urls/mainpage/href}" i18n:attributes="title string:mainpage"></a>
         </div>
         <div class="portlet" id="portlet-navigation">
           <h5 i18n:translate="string:navigation">Navigation</h5>