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

Added message `Create an ...` into Component.

Yuto Iwata 7 лет назад
Родитель
Сommit
406e722a02
2 измененных файлов с 51 добавлено и 49 удалено
  1. 51 44
      src/client/js/components/InstallerForm.js
  2. 0 5
      src/server/views/installer.html

+ 51 - 44
src/client/js/components/InstallerForm.js

@@ -11,59 +11,66 @@ class InstallerForm extends React.Component {
 
 
   render() {
   render() {
     return (
     return (
-      <form role="form" action="/installer/createAdmin" method="post" id="register-form">
-        <div className="input-group" id="input-group-username">
-          <span className="input-group-addon"><i className="icon-user"></i></span>
-          <input type="text" className="form-control" placeholder={ this.props.t('User ID') }
-            name="registerForm[username]" defaultValue={this.props.userName} required />
-        </div>
-        <p className="help-block">
-          <span id="help-block-username"></span>
+      <div>
+        <p className="alert alert-success">
+          <strong>{ this.props.t('installer.create_initial_account') }</strong><br />
+          <small>{ this.props.t('installer.initial_account_will_be_administrator_automatically') }</small>
         </p>
         </p>
 
 
-        <div className="input-group">
-          <span className="input-group-addon"><i className="icon-tag"></i></span>
-          <input type="text" className="form-control" placeholder={ this.props.t('Name') } name="registerForm[name]" defaultValue={ this.props.name } required />
-        </div>
-
-        <div className="input-group">
-          <span className="input-group-addon"><i className="icon-envelope"></i></span>
-          <input type="email" className="form-control" placeholder={ this.props.t('Email') } name="registerForm[email]" defaultValue={ this.props.email } required />
-        </div>
+        <form role="form" action="/installer/createAdmin" method="post" id="register-form">
+          <div className="input-group" id="input-group-username">
+            <span className="input-group-addon"><i className="icon-user"></i></span>
+            <input type="text" className="form-control" placeholder={ this.props.t('User ID') }
+              name="registerForm[username]" defaultValue={this.props.userName} required />
+          </div>
+          <p className="help-block">
+            <span id="help-block-username"></span>
+          </p>
 
 
-        <div className="input-group">
-          <span className="input-group-addon"><i className="icon-lock"></i></span>
-          <input type="password" className="form-control" placeholder={ this.props.t('Password') } name="registerForm[password]" required />
-        </div>
+          <div className="input-group">
+            <span className="input-group-addon"><i className="icon-tag"></i></span>
+            <input type="text" className="form-control" placeholder={ this.props.t('Name') } name="registerForm[name]" defaultValue={ this.props.name } required />
+          </div>
 
 
-        <input type="hidden" name="_csrf" value={ this.props.csrf } />
+          <div className="input-group">
+            <span className="input-group-addon"><i className="icon-envelope"></i></span>
+            <input type="email" className="form-control" placeholder={ this.props.t('Email') } name="registerForm[email]" defaultValue={ this.props.email } required />
+          </div>
 
 
-        <div className="input-group m-t-20 m-b-20 mx-auto">
-          <div className="radio radio-primary radio-inline">
-            <input type="radio" id="radioLangEn" name="registerForm[app:globalLang]" value="en-US"
-                   defaultChecked={ true } onClick={() => this.changeLanguage('en-US')} />
-            <label htmlFor="radioLangEn">{ this.props.t('English') }</label>
+          <div className="input-group">
+            <span className="input-group-addon"><i className="icon-lock"></i></span>
+            <input type="password" className="form-control" placeholder={ this.props.t('Password') } name="registerForm[password]" required />
           </div>
           </div>
-          <div className="radio radio-primary radio-inline">
-            <input type="radio" id="radioLangJa" name="registerForm[app:globalLang]" value="ja"
-                   defaultChecked={ false } onClick={() => this.changeLanguage('ja')} />
-            <label htmlFor="radioLangJa">{ this.props.t('Japanese') }</label>
+
+          <input type="hidden" name="_csrf" value={ this.props.csrf } />
+
+          <div className="input-group m-t-20 m-b-20 mx-auto">
+            <div className="radio radio-primary radio-inline">
+              <input type="radio" id="radioLangEn" name="registerForm[app:globalLang]" value="en-US"
+                     defaultChecked={ true } onClick={() => this.changeLanguage('en-US')} />
+              <label htmlFor="radioLangEn">{ this.props.t('English') }</label>
+            </div>
+            <div className="radio radio-primary radio-inline">
+              <input type="radio" id="radioLangJa" name="registerForm[app:globalLang]" value="ja"
+                     defaultChecked={ false } onClick={() => this.changeLanguage('ja')} />
+              <label htmlFor="radioLangJa">{ this.props.t('Japanese') }</label>
+            </div>
           </div>
           </div>
-        </div>
 
 
-        <div className="input-group m-t-30 m-b-20 d-flex justify-content-center">
-          <button type="submit" className="fcbtn btn btn-success btn-1b btn-register">
-            <span className="btn-label"><i className="icon-user-follow"></i></span>
-            { this.props.t('Create') }
-          </button>
-        </div>
+          <div className="input-group m-t-30 m-b-20 d-flex justify-content-center">
+            <button type="submit" className="fcbtn btn btn-success btn-1b btn-register">
+              <span className="btn-label"><i className="icon-user-follow"></i></span>
+              { this.props.t('Create') }
+            </button>
+          </div>
 
 
-        <div className="input-group m-t-30 d-flex justify-content-center">
-          <a href="https://growi.org" className="link-growi-org">
-            <span className="growi">GROWI</span>.<span className="org">ORG</span>
-          </a>
-        </div>
-      </form>
+          <div className="input-group m-t-30 d-flex justify-content-center">
+            <a href="https://growi.org" className="link-growi-org">
+              <span className="growi">GROWI</span>.<span className="org">ORG</span>
+            </a>
+          </div>
+        </form>
+      </div>
     );
     );
   }
   }
 }
 }

+ 0 - 5
src/server/views/installer.html

@@ -45,11 +45,6 @@
     </div>
     </div>
 
 
     <div class="login-dialog p-t-10 p-b-10 col-sm-offset-4 col-sm-4" id="login-dialog">
     <div class="login-dialog p-t-10 p-b-10 col-sm-offset-4 col-sm-4" id="login-dialog">
-      <p class="alert alert-success">
-        <strong>{{ t('installer.create_initial_account') }}</strong><br>
-        <small>{{ t('installer.initial_account_will_be_administrator_automatically') }}</small>
-      </p>
-
       <div id='installer-form'
       <div id='installer-form'
         data-user-name="{{ req.body.registerForm.username }}"
         data-user-name="{{ req.body.registerForm.username }}"
         data-name="{{ googleName|default(req.body.registerForm.name) }}"
         data-name="{{ googleName|default(req.body.registerForm.name) }}"