update favicon

media/favicons/favicon.svg

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">  <image id="image0" width="32" height="32" x="0" y="0"
-    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJN
-AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAE
-kUlEQVRYw+2WW4id5RWGn3f9/+zxEJpUTI2CRk1M4lSUXKSxVfBUUCQeZiiJBhQVKepFEaRQelFz
-ofSiglftRXshKooJJMFD2qrxrK0gqOAhMqQXNaJRx4mjVTP7+761evH9e5qQnYiIF9KszYZ/f4e1
-11rv+671w2E7bP/vpkNtlsl1NMs2kndefUK4rwEWSNphNrrNltzr32kA6e1xRsa2UibX/d7Df2MS
-EUEgJD4luKBdvun177QCacfEbaC7AIhAEhD1osxzlB+Nnr71k28TgB1sI3aMt5SyQaWgksELlAzu
-yB1Ktsbjzm9bgfZgG3l2drnM5hG1TqImH0AHBMDFg/P+xuUrSsmXgk4U7EY83p617fVvBEF57ZLT
-IrhP0o8j4n1Jy4OACJDAA6yDIYTMbvTZvVsY6T0i4lykDqEAGRBvgC5rV/7t34cMIL18HtaMzEd8
-FNAjINwxMyKingqmkIrguK4o9/T37r21He3tNtmREYDif25Vf0ZEIWKsXf305FAOpBd+ysjZz0Hp
-ryPnHimhkpBnIveh5Ica2cntT55a2K7avshzf4E83+Gp/GqkbZ43L0dGyVAykRLKGXKClIicIKdG
-4c8AlH+cO7wC5cWf/RNYErBQc8tBBDeX/t77m97oHyVdXLPkCU9+a9trznCP59UdryipQymI2Fcx
-gLSuOeelTUNJGDkdDWEm+8TdAZlMWyKnR5pmZA85jziBVYyvNTHh/bJ9APkckSSaqCQ1GRGOEO6B
-jLXAgQH4s6uw8185c9/FmUdP0vzL3o385Fk7RBohuj8HIgIF84ArkVDHkblGpaqP6MgYgwokHf+1
-KthPhn8dO02myUCdc+/qbAOAanbhNVv4exAvSVpA8AsiFiNVYdRonmkueetCAH9sGbZm8tABlG3L
-V+P+sszwCPbrBx26qt6nMVvdXPrOzv3uP7bsdmADCNXTv0asIOIFWzN5b3l4Cc0V/xoeQGw+CW97
-x0TkKcM0J6suZPeatYfvMeyUaDVDfxab2EXevHieWfzAxt99P209+QGT1lMJ+naIMTyQ6Z0o5UzD
-0wGtuGxcBDrClPu/bNxT5AQlQe7juU/0ZyEnoqQZw5dElBlbsxOb2IVvPvG3hr8JOgJAJf2OnKEk
-ovTHlDt5p7TCwv+siV3DK+Abj3818JW1oYnwOZIPkJhxWEpPU+34B92dRWuRNgJXRts83Ey8V9c3
-LfIIqj5V/dV+Hn276sPRA2ZBeWDhzylppQZUK5VsA1mbaSbEqXKbbsZ373Mx39I9LW7WdkE9eOwK
-eRHFa2uug6QjtHpzfWBfs0jzK+EdqakS8sEo5jMvcaradrpZ/+H+VUv9bI1BcLffN/+HiGlKuSNK
-VOlKcyOl8/fq0ABQbwv5yy8Mjg7qR5Xyn3uUpU07Oq31U0Nw8z+E+0WASdpQExj0VXWKccBQOKG4
-CYa8D6SvPg01WuqlbI+SkRcn/FHP/VPa67/8WNfsGSrb9vr/PG74DYoyRckoon7ru0OdC+5ESa9R
-fFVz3RevHKwFEH86sDDxl1EOZX7PURy2w/a9tP8CpkF2PbXP4bEAAAAldEVYdGRhdGU6Y3JlYXRl
-ADIwMjEtMTItMDNUMDk6MDk6MTMrMDA6MDClbbBWAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIxLTEy
-LTAzVDA5OjA5OjEzKzAwOjAw1DAI6gAAAABJRU5ErkJggg==" />
-</svg>

media/favicons/manifest.webmanifest

@@ -1,5 +0,0 @@
-{
-  "icons": [
-    { "src": "/favicon.svg", "type": "image/svg+xml", "sizes": "32x32" }
-  ]
-}

seahub/base/context_processors.py

@@ -20,8 +20,7 @@ import seaserv
 from seahub.settings import SEAFILE_VERSION, SITE_DESCRIPTION, \
     MAX_FILE_NAME, LOGO_PATH, BRANDING_CSS, LOGO_WIDTH, LOGO_HEIGHT,\
     SHOW_REPO_DOWNLOAD_BUTTON, SITE_ROOT, ENABLE_GUEST_INVITATION, \
-    FAVICON_PATH, FAVICON_SVG_PATH, APPLE_TOUCH_ICON_PATH, \
-    MANIFEST_WEBMANIFEST_PATH, THUMBNAIL_SIZE_FOR_ORIGINAL, \
+    FAVICON_PATH, APPLE_TOUCH_ICON_PATH, THUMBNAIL_SIZE_FOR_ORIGINAL, \
     MEDIA_ROOT, SHOW_LOGOUT_ICON, CUSTOM_LOGO_PATH, CUSTOM_FAVICON_PATH, \
     ENABLE_SEAFILE_DOCS, LOGIN_BG_IMAGE_PATH, \
     CUSTOM_LOGIN_BG_PATH, ENABLE_SHARE_LINK_REPORT_ABUSE, \
@@ -109,9 +108,7 @@ def base(request):
         'branding_css': BRANDING_CSS,
         'enable_branding_css': config.ENABLE_BRANDING_CSS,
         'favicon_path': favicon_path,
-        'favicon_svg_path': FAVICON_SVG_PATH,
         'apple_touch_icon_path': APPLE_TOUCH_ICON_PATH,
-        'manifest_webmanifest_path': MANIFEST_WEBMANIFEST_PATH,
         'login_bg_path': login_bg_path,
         'logo_path': logo_path,
         'logo_width': LOGO_WIDTH,

seahub/settings.py

@@ -564,10 +564,8 @@ LOGIN_BG_IMAGE_PATH = 'img/login-bg.jpg'
 
 # Path to the favicon file (relative to the media path)
 # tip: use a different name when modify it.
-FAVICON_PATH = 'favicons/favicon.ico'
-FAVICON_SVG_PATH = 'favicons/favicon.svg'
-APPLE_TOUCH_ICON_PATH = 'favicons/favicon.svg'
-MANIFEST_WEBMANIFEST_PATH = 'favicons/manifest.webmanifest'
+FAVICON_PATH = 'favicons/favicon.png'
+APPLE_TOUCH_ICON_PATH = 'favicons/favicon.png'
 
 # Path to the Logo Imagefile (relative to the media path)
 LOGO_PATH = 'img/seafile-logo.png'

seahub/templates/base.html

@@ -12,9 +12,7 @@
 {% endblock %}
 <meta http-equiv="x-ua-compatible" content="ie=edge" />
 <link rel="icon" href="{{ MEDIA_URL }}{% if filetype == 'dtable' %}{{ dtable_favicon_path }}{% else %}{{ favicon_path }}{% endif %}" type="image/x-icon">
-<link rel="icon" href="{{ MEDIA_URL }}{{ favicon_svg_path }}" type="image/svg+xml">
 <link rel="apple-touch-icon" href="{{ MEDIA_URL }}{{ apple_touch_icon_path }}">
-<link rel="manifest" href="{{ MEDIA_URL }}{{ manifest_webmanifest_path }}">
 {% block extra_base_style %}
 <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}"/>
 {% endblock %}

seahub/templates/base_for_react.html

@@ -14,9 +14,7 @@
 {% block extra_ogp_tags %}{% endblock %}
 <meta http-equiv="x-ua-compatible" content="ie=edge" />
 <link rel="icon" href="{{ MEDIA_URL }}{% if filetype == 'dtable' %}{{ dtable_favicon_path }}{% else %}{{ favicon_path }}{% endif %}" type="image/x-icon">
-<link rel="icon" href="{{ MEDIA_URL }}{{ favicon_svg_path }}" type="image/svg+xml">
 <link rel="apple-touch-icon" href="{{ MEDIA_URL }}{{ apple_touch_icon_path }}">
-<link rel="manifest" href="{{ MEDIA_URL }}{{ manifest_webmanifest_path }}">
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}fontawesome/css/fontawesome-all.min.css" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/sf_font3/iconfont.css" />
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/seafile-ui.css" />