Browse Source

set 'GROWI' for default app title

Yuki Takei 8 years ago
parent
commit
85a39e0172

+ 1 - 1
lib/util/mailer.js

@@ -81,7 +81,7 @@ module.exports = function(crowi) {
     }
 
     mailConfig.from = config.crowi['mail:from'];
-    mailConfig.subject = config.crowi['app:title'] + 'からのメール';
+    mailConfig.subject = (config.crowi['app:title'] || 'GROWI')  + 'からのメール';
 
     debug('mailer initialized');
   }

+ 1 - 1
lib/util/slack.js

@@ -206,7 +206,7 @@ module.exports = function(crowi) {
 
     var message = {
       channel: '#' + channel,
-      username: config.crowi['app:title'],
+      username: config.crowi['app:title'] || 'GROWI',
       text: this.getSlackMessageText(page.path, user, updateType),
       attachments: [attachment],
     };

+ 1 - 1
lib/util/swigFunctions.js

@@ -123,7 +123,7 @@ module.exports = function(crowi, app, req, locals) {
   locals.customTitle = function() {
     var config = crowi.getConfig();
     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'] : 'GROWI';
     var custom_title = title.replace('{{sitename}}', app_title);
     return custom_title;
   }

+ 1 - 2
lib/views/admin/app.html

@@ -38,8 +38,7 @@
         <div class="form-group">
           <label for="settingForm[app:title]" class="col-xs-3 control-label">{{ t('app_setting.Wiki name') }}</label>
           <div class="col-xs-6">
-            <input class="form-control" type="text" name="settingForm[app:title]" value="{{ settingForm['app:title'] }}">
-
+            <input class="form-control" type="text" name="settingForm[app:title]" value="{{ settingForm['app:title'] | default('') }}">
             <p class="help-block">{{ t("app_setting.wiki_change") }}</p>
           </div>
         </div>

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

@@ -4,13 +4,13 @@
 <head>
   <meta charset="utf-8">
   <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 }}{% endblock %} {{ config.crowi['app:title'] | default('GROWI') }}</title>
   <meta name="description" content="">
   <meta name="author" content="">
 
   <meta name="viewport" content="width=device-width,initial-scale=1">
 
-  <meta name="apple-mobile-web-app-title" content="{{ config.crowi['app:title']|default('Crowi') }}">
+  <meta name="apple-mobile-web-app-title" content="{{ config.crowi['app:title'] | default('GROWI') }}">
 
   {% include '../widget/favicon.html' %}
 

+ 1 - 1
lib/views/widget/page_side_content.html

@@ -2,7 +2,7 @@
 <ul class="fitted-list">
   <li class="input-group">
     <span class="input-group-addon">{{ t('Share Link') }}</span>
-    <input readonly class="copy-link form-control" type="text" value="{{ config.crowi['app:title']|default('Crowi') }} {{ path }}  {{ baseUrl }}/{{ page._id.toString() }}">
+    <input readonly class="copy-link form-control" type="text" value="{{ config.crowi['app:title'] | default('GROWI') }} {{ path }}  {{ baseUrl }}/{{ page._id.toString() }}">
   </li>
   <li class="input-group">
     <span class="input-group-addon">Markdown</span>