diff options
| -rw-r--r-- | Mailman/Defaults.py.in | 11 | ||||
| -rw-r--r-- | Mailman/HTMLFormatter.py | 6 | ||||
| -rw-r--r-- | Mailman/htmlformat.py | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index d3f49f644..63f0b0c49 100644 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -37,15 +37,16 @@ def days(d): return d * 60 * 60 * 24 # General system-wide defaults ##### -# Should image logos be used? Set this to false to disable image logos from -# "our sponsors" and just use textual links instead. Otherwise, this should -# contain the URL base path to the logo images (and must contain the trailing -# slash).. If you want to disable Mailman's logo footer altogther, hack +# Should image logos be used? Set this to 0 to disable image logos from "our +# sponsors" and just use textual links instead (this will also disable the +# shortcut "favicon"). Otherwise, this should contain the URL base path to +# the logo images (and must contain the trailing slash).. If you want to +# disable Mailman's logo footer altogther, hack # Mailman/htmlformat.py:MailmanLogo(), which also contains the hardcoded links # and image names. IMAGE_LOGOS = '/icons/' -# Set this to None to inhibit Mailman's favicon. +# The name of the Mailman favicon SHORTCUT_ICON = 'mm-icon.png' # Don't change MAILMAN_URL, unless you want to point it at one of the mirrors. diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py index 1beb73aaa..e297a92c9 100644 --- a/Mailman/HTMLFormatter.py +++ b/Mailman/HTMLFormatter.py @@ -363,8 +363,7 @@ class HTMLFormatter: listlangs = Utils.GetLanguageDescr(self.preferred_language) else: listlangs = self.GetLangSelectBox(lang).Format() - return { - '<mm-favicon>' : mm_cfg.IMAGE_LOGOS + mm_cfg.SHORTCUT_ICON, + d = { '<mm-mailman-footer>' : self.GetMailmanFooter(), '<mm-list-name>' : self.real_name, '<mm-email-user>' : self._internal_name, @@ -387,6 +386,9 @@ class HTMLFormatter: '<mm-host>' : self.host_name, '<mm-list-langs>' : listlangs, } + if mm_cfg.IMAGE_LOGOS: + d['<mm-favicon>'] = mm_cfg.IMAGE_LOGOS + mm_cfg.SHORTCUT_ICON + return d def GetAllReplacements(self, lang=None): """ diff --git a/Mailman/htmlformat.py b/Mailman/htmlformat.py index 329225f70..37765332d 100644 --- a/Mailman/htmlformat.py +++ b/Mailman/htmlformat.py @@ -310,7 +310,7 @@ class Document(Container): '<HTML>', '<HEAD>' ]) - if mm_cfg.SHORTCUT_ICON: + if mm_cfg.IMAGE_LOGOS: output.append('<LINK REL="SHORTCUT ICON" HREF="%s">' % (mm_cfg.IMAGE_LOGOS + mm_cfg.SHORTCUT_ICON)) if self.title: |