Mercurial > moin-mfact

changeset 19:676d8cdde643

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More tricks to make it work fine in msie5
author Radomir Dopieralski <devel@sheep.art.pl>
date Thu, 05 Jun 2008 12:49:10 +0200
parents 4d2c10526d1e
children cdc005195f44
files mfact.py mfact/css/msie.css
diffstat 2 files changed, 4 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/mfact.py	Thu Jun 05 12:28:55 2008 +0200
+++ b/mfact.py	Thu Jun 05 12:49:10 2008 +0200
@@ -150,53 +150,6 @@
             ]
         return u'\n'.join(html)
 
-    def html_stylesheets(self, d):
-        """ Assemble html head stylesheet links
-
-        @param d: parameter dictionary
-        @rtype: string
-        @return: stylesheets links
-        """
-        link = '<link rel="stylesheet" type="text/css" charset="%s" media="%s" href="%s">'
-
-        # Check mode
-        if d.get('print_mode'):
-            media = d.get('media', 'print')
-            stylesheets = getattr(self, 'stylesheets_' + media)
-        else:
-            stylesheets = self.stylesheets
-        usercss = self.request.user.valid and self.request.user.css_url
-
-        # Create stylesheets links
-        html = []
-        prefix = self.cfg.url_prefix_static
-        csshref = '%s/%s/css' % (prefix, self.name)
-        for media, basename in stylesheets:
-            href = '%s/%s.css' % (csshref, basename)
-            html.append(link % (self.stylesheetsCharset, media, href))
-
-            # Don't add user css url if it matches one of ours
-            if usercss and usercss == href:
-                usercss = None
-
-        # admin configurable additional css (farm or wiki level)
-        for media, csshref in self.request.cfg.stylesheets:
-            html.append(link % (self.stylesheetsCharset, media, csshref))
-
-        csshref = '%s/%s/css/msie.css' % (prefix, self.name)
-        html.append("""
-<!-- css only for MSIE browsers -->
-<!--[if IE lte 7]>
-   %s
-<![endif]-->
-""" % link % (self.stylesheetsCharset, 'all', csshref))
-
-        # Add user css url (assuming that user css uses same charset)
-        if usercss and usercss.lower() != "none":
-            html.append(link % (self.stylesheetsCharset, 'all', usercss))
-
-        return '\n'.join(html)
-
     def editbar(self, d, **keywords):
         if not self.shouldShowEditbar(d['page']):
             return u''
--- a/mfact/css/msie.css	Thu Jun 05 12:28:55 2008 +0200
+++ b/mfact/css/msie.css	Thu Jun 05 12:49:10 2008 +0200
@@ -5,7 +5,7 @@
 
 ul#navibar {
     background-image: none;
-    filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod='crop', src='http://moin.sheep.art.pl/static/mfact/menu_bar.png');
+    filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod='crop', src='http://moin.sheep.art.pl/static/mfact/menu_bar.png');
 }
 
 /* The ALphaImageLoader makes links inactive, we need to bring them up. */
@@ -15,12 +15,13 @@
 
 div#content {
     background-image: none;
-    filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled='true', sizingMethod='scale', src='http://moin.sheep.art.pl/static/mfact/content_background.png');
+    filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled='true', sizingMethod='scale', src='http://moin.sheep.art.pl/static/mfact/content_background.png');
 }
 
 div#footer {
     background-image: none;
-    filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled='true', sizingMethod='crop', src='http://moin.sheep.art.pl/static/mfact/content_background_bottom.png');
+    filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled='true', sizingMethod='crop', src='http://moin.sheep.art.pl/static/mfact/content_background_bottom.png');
+    height: 1px; /* Needed for HasLayout. */
 }
 
 /* Alternate method of centering that works well in msie 5 */