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

add to display correct sitename and path

Knaito163 8 лет назад
Родитель
Сommit
78eba1fa33

+ 2 - 2
lib/util/swigFunctions.js

@@ -120,11 +120,11 @@ module.exports = function(crowi, app, req, locals) {
     return Config.theme(config);
     return Config.theme(config);
   }
   }
 
 
-  locals.customTitle = function() {
+  locals.customTitle = function(path) {
     var config = crowi.getConfig();
     var config = crowi.getConfig();
     var title = Config.customTitle(config);
     var title = Config.customTitle(config);
     var app_title = config.crowi['app:title'] ? config.crowi['app:title'] : 'Crowi';
     var app_title = config.crowi['app:title'] ? config.crowi['app:title'] : 'Crowi';
-    var custom_title = title.replace('{{sitename}}', app_title);
+    var custom_title = title.replace('{{sitename}}', app_title).replace('{{path}}', path);
     return custom_title;
     return custom_title;
   }
   }
 
 

+ 1 - 0
lib/views/layout-crowi/base/layout.html

@@ -1,5 +1,6 @@
 {% extends '../../layout/layout.html' %}
 {% extends '../../layout/layout.html' %}
 
 
+{% block html_title %}{{ customTitle(path) }}{% endblock %}
 
 
 {% block layout_main %}
 {% block layout_main %}
 <div class="container-fluid">
 <div class="container-fluid">

+ 1 - 0
lib/views/layout-growi/base/layout.html

@@ -1,5 +1,6 @@
 {% extends '../../layout/layout.html' %}
 {% extends '../../layout/layout.html' %}
 
 
+{% block html_title %}{{ customTitle(path) }}{% endblock %}
 
 
 {% block layout_main %}
 {% block layout_main %}
 <div class="container-fluid">
 <div class="container-fluid">

+ 1 - 1
lib/views/layout/layout.html

@@ -4,7 +4,7 @@
 <head>
 <head>
   <meta charset="utf-8">
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <title>{% block html_title %}{{ path|path2name }} · {{ path }}{% endblock %} {{ config.crowi['app:title']|default('Crowi') }}</title>
+  <title>{% block html_title %}{{ path|path2name }} · {{ path }} {{ config.crowi['app:title']|default('Crowi') }}{% endblock %}</title>
   <meta name="description" content="">
   <meta name="description" content="">
   <meta name="author" content="">
   <meta name="author" content="">