Просмотр исходного кода

Moved brand to separate template, made templates use db settings.

Rafał Pitoń 11 лет назад
Родитель
Сommit
ce462bdfed

+ 1 - 1
misago/templates/misago/base.html

@@ -6,7 +6,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{% block title %}{% endblock %}</title>
+    <title>{% block title %}{{ misago_settings.forum_name }}{% endblock %}</title>
     <meta name="description" content="{% block meta_description %}{% endblock %}">
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>

+ 1 - 0
misago/templates/misago/brand.html

@@ -0,0 +1 @@
+<a class="navbar-brand" href="{% url 'misago:index' %}">{{ misago_settings.forum_name }}</a>

+ 12 - 0
misago/templates/misago/index.html

@@ -1,6 +1,18 @@
 {% extends "misago/base.html" %}
 
 
+{% block title %}
+{% if misago_settings.forum_index_title %}
+{{ misago_settings.forum_index_title }}
+{% else %}
+{{ misago_settings.forum_name }}
+{% endif %}
+{% endblock title %}
+
+
+{% block meta_description %}{{ misago_settings.forum_index_meta_description }}{% endblock meta_description %}
+
+
 {% block content %}
 {% include "misago/jumbotron_indexonly.html" %}
 

+ 1 - 1
misago/templates/misago/navbar.html

@@ -9,7 +9,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="{% url 'misago:index' %}">Miasago</a>
+      {% include "misago/brand.html" %}
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->