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

Merge pull request #2201 from weseek/support/adjust-width-for-alert

Support/adjust width for alert
Yuki Takei 5 лет назад
Родитель
Сommit
762f3f0562
2 измененных файлов с 5 добавлено и 4 удалено
  1. 4 1
      src/client/js/nologin.jsx
  2. 1 3
      src/server/views/login.html

+ 4 - 1
src/client/js/nologin.jsx

@@ -6,6 +6,7 @@ import { I18nextProvider } from 'react-i18next';
 import i18nFactory from './util/i18n';
 import i18nFactory from './util/i18n';
 
 
 import NoLoginContainer from './services/NoLoginContainer';
 import NoLoginContainer from './services/NoLoginContainer';
+import AppContainer from './services/AppContainer';
 
 
 import InstallerForm from './components/InstallerForm';
 import InstallerForm from './components/InstallerForm';
 import LoginForm from './components/LoginForm';
 import LoginForm from './components/LoginForm';
@@ -31,6 +32,8 @@ if (installerFormElem) {
 const loginFormElem = document.getElementById('login-form');
 const loginFormElem = document.getElementById('login-form');
 if (loginFormElem) {
 if (loginFormElem) {
   const noLoginContainer = new NoLoginContainer();
   const noLoginContainer = new NoLoginContainer();
+  const appContainer = new AppContainer();
+  appContainer.init();
 
 
   const username = loginFormElem.dataset.username;
   const username = loginFormElem.dataset.username;
   const name = loginFormElem.dataset.name;
   const name = loginFormElem.dataset.name;
@@ -52,7 +55,7 @@ if (loginFormElem) {
 
 
   ReactDOM.render(
   ReactDOM.render(
     <I18nextProvider i18n={i18n}>
     <I18nextProvider i18n={i18n}>
-      <Provider inject={[noLoginContainer]}>
+      <Provider inject={[noLoginContainer, appContainer]}>
         <LoginForm
         <LoginForm
           username={username}
           username={username}
           name={name}
           name={name}

+ 1 - 3
src/server/views/login.html

@@ -32,8 +32,7 @@
         <div class="logo mb-3">{% include 'widget/logo.html' %}</div>
         <div class="logo mb-3">{% include 'widget/logo.html' %}</div>
         <h1>{{ appService.getAppTitle() }}</h1>
         <h1>{{ appService.getAppTitle() }}</h1>
 
 
-        <div class="row">
-          <div class="login-form-errors col-12">
+          <div class="login-form-errors px-3">
             {% if isLdapSetupFailed() %}
             {% if isLdapSetupFailed() %}
             <div class="alert alert-warning small">
             <div class="alert alert-warning small">
               <strong><i class="icon-fw icon-info"></i>LDAP is enabled but the configuration has something wrong.</strong>
               <strong><i class="icon-fw icon-info"></i>LDAP is enabled but the configuration has something wrong.</strong>
@@ -102,7 +101,6 @@
             </div>
             </div>
             {% endif %}
             {% endif %}
           </div>
           </div>
-        </div>
       </div>
       </div>
 
 
       {% set registrationMode = getConfig('crowi', 'security:registrationMode') %}
       {% set registrationMode = getConfig('crowi', 'security:registrationMode') %}