itizawa 5 anni fa
parent
commit
dd8423e26b

+ 9 - 10
src/client/js/components/Navbar/GrowiNavbar.jsx

@@ -11,7 +11,7 @@ class GrowiNavbar extends React.Component {
 
   render() {
     const { appContainer } = this.props;
-    const appTitle = appContainer.config.crowi.title;
+    const { crowi } = appContainer.config;
 
     return (
       <nav className="navbar grw-navbar navbar-expand navbar-dark sticky-top mb-0 px-0">
@@ -34,7 +34,7 @@ class GrowiNavbar extends React.Component {
           <li id="grw-navbar-toggler" className="nav-item"></li>
         </ul>
         <div className="grw-app-title d-none d-md-block">
-          {appTitle}
+          {crowi.title}
         </div>
         {/*
 
@@ -54,16 +54,15 @@ class GrowiNavbar extends React.Component {
         <li id="login-user" class="nav-item"><a class="nav-link" href="/login">Login</a></li>
       {% endif %}
 
-      {% if getConfig('crowi', 'app:confidential') %}
-        <li class="nav-item confidential text-light">
-          <i class="icon-info d-md-none" data-toggle="tooltip" title="{{ getConfig('crowi', 'app:confidential') }}"></i>
-          <span class="d-none d-md-inline">
-            {{ getConfig('crowi', 'app:confidential') }}
-          </span>
-        </li>
-      {% endif %}
     </ul> */}
 
+
+        <li className="nav-item confidential text-light">
+          <i className="icon-info d-md-none" data-toggle="tooltip" title={crowi.confidential} />
+          <span className="d-none d-md-inline">
+            {crowi.confidential}
+          </span>
+        </li>
       </nav>
     );
   }

+ 1 - 0
src/server/models/config.js

@@ -182,6 +182,7 @@ module.exports = function(crowi) {
       crowi: {
         title: crowi.appService.getAppTitle(),
         url: crowi.appService.getSiteUrl(),
+        confidential: crowi.appService.getAppConfidential(),
       },
       upload: {
         image: crowi.fileUploadService.getIsUploadable(),

+ 4 - 0
src/server/service/app.js

@@ -39,6 +39,10 @@ class AppService {
     return -(this.configManager.getConfig('crowi', 'app:timezone') || 9) * 60;
   }
 
+  getAppConfidential() {
+    return this.configManager.getConfig('crowi', 'app:confidential');
+  }
+
   /**
    * Execute only once for installing application
    */