Merge pull request #645 from liangliangyy/dev

增加global header,footer 配置
3 years ago · 174be116c4
parent 1163fe9e64 80b8b23cd6
commit 174be116c4
5 changed files with 36 additions and 2 deletions
--- a/blog/context_processors.py
+++ b/blog/context_processors.py
@ -34,6 +34,9 @@ def seo_processor(requests):
            'ANALYTICS_CODE': setting.analyticscode,
            "BEIAN_CODE_GONGAN": setting.gongan_beiancode,
            "SHOW_GONGAN_CODE": setting.show_gongan_code,
-            "CURRENT_YEAR": timezone.now().year}
+            "CURRENT_YEAR": timezone.now().year,
+            "GLOBAL_HEADER": setting.global_header,
+            "GLOBAL_FOOTER": setting.global_footer,
+        }
        cache.set(key, value, 60 * 60 * 10)
        return value
--- a/blog/migrations/0002_blogsettings_global_footer_and_more.py
+++ b/blog/migrations/0002_blogsettings_global_footer_and_more.py
@ -0,0 +1,23 @@
+# Generated by Django 4.1.7 on 2023-03-29 06:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='blogsettings',
+            name='global_footer',
+            field=models.TextField(blank=True, default='', null=True, verbose_name='公共尾部'),
+        ),
+        migrations.AddField(
+            model_name='blogsettings',
+            name='global_header',
+            field=models.TextField(blank=True, default='', null=True, verbose_name='公共头部'),
+        ),
+    ]
--- a/blog/models.py
+++ b/blog/models.py
@ -323,6 +323,8 @@ class BlogSettings(models.Model):
    google_adsense_codes = models.TextField(
        '广告内容', max_length=2000, null=True, blank=True, default='')
    open_site_comment = models.BooleanField('是否打开网站评论功能', default=True)
+    global_header = models.TextField("公共头部", null=True, blank=True, default='')
+    global_footer = models.TextField("公共尾部", null=True, blank=True, default='')
    beiancode = models.CharField(
        '备案号',
        max_length=2000,
--- a/templates/share_layout/base.html
+++ b/templates/share_layout/base.html
@ -29,7 +29,7 @@
    <link rel='stylesheet preload' as="font" id='twentytwelve-fonts-css'
          href='{% static 'blog/fonts/fonts.css' %}'
          type='text/css' media='all'/>
-    <link rel="dns-prefetch" href="//cdn.mathjax.org" />
+    <link rel="dns-prefetch" href="//cdn.mathjax.org"/>
    {% compress css %}

        <link rel='stylesheet' id='twentytwelve-style-css' href='{% static 'blog/css/style.css' %}' type='text/css'
@ -44,6 +44,9 @@
        {% block compress_css %}
        {% endblock %}
    {% endcompress %}
+    {% if GLOBAL_HEADER %}
+        {{ GLOBAL_HEADER|safe }}
+    {% endif %}
 </head>

 <body class="home blog custom-font-enabled">
--- a/templates/share_layout/footer.html
+++ b/templates/share_layout/footer.html
@ -49,6 +49,9 @@
    {% if ANALYTICS_CODE %}
        {{ ANALYTICS_CODE| safe }}
    {% endif %}
+    {% if GLOBAL_FOOTER %}
+        {{ GLOBAL_FOOTER|safe }}
+    {% endif %}
 </footer><!-- #colophon -->