Yuki Takei 6 лет назад
Родитель
Сommit
ffe2212776

+ 9 - 2
src/client/js/components/Admin/Import/GrowiZipImportForm.jsx

@@ -145,9 +145,15 @@ class GrowiImportForm extends React.Component {
                   );
                   );
                 })}
                 })}
             </tbody>
             </tbody>
-          </table>
+
+        <div className="row">
+          <div className="col-xs-12 text-center">
+            <div className="well well-sm small">
+              <ul>
+                <li>{t('importer_management.growi_settings.overwrite_documents')}</li>
+              </ul>
         </div>
         </div>
-        <div className="col-xs-12 text-center">
+
           <button type="submit" className="btn btn-primary mx-1" disabled={!this.validateForm()}>
           <button type="submit" className="btn btn-primary mx-1" disabled={!this.validateForm()}>
             { t('importer_management.import') }
             { t('importer_management.import') }
           </button>
           </button>
@@ -155,6 +161,7 @@ class GrowiImportForm extends React.Component {
             { t('importer_management.growi_settings.discard') }
             { t('importer_management.growi_settings.discard') }
           </button>
           </button>
         </div>
         </div>
+        </div>
       </form>
       </form>
     );
     );
   }
   }

+ 4 - 13
src/client/js/components/Admin/Import/GrowiZipImportSection.jsx

@@ -3,12 +3,13 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import { withTranslation } from 'react-i18next';
 import * as toastr from 'toastr';
 import * as toastr from 'toastr';
 
 
-import GrowiZipUploadForm from './GrowiZipUploadForm';
-import GrowiZipImportForm from './GrowiZipImportForm';
 import { createSubscribedElement } from '../../UnstatedUtils';
 import { createSubscribedElement } from '../../UnstatedUtils';
 import AppContainer from '../../../services/AppContainer';
 import AppContainer from '../../../services/AppContainer';
 // import { toastSuccess, toastError } from '../../../util/apiNotification';
 // import { toastSuccess, toastError } from '../../../util/apiNotification';
 
 
+import GrowiZipUploadForm from './GrowiZipUploadForm';
+import GrowiZipImportForm from './GrowiZipImportForm';
+
 class GrowiZipImportSection extends React.Component {
 class GrowiZipImportSection extends React.Component {
 
 
   constructor(props) {
   constructor(props) {
@@ -72,17 +73,7 @@ class GrowiZipImportSection extends React.Component {
 
 
     return (
     return (
       <Fragment>
       <Fragment>
-        <legend>{t('importer_management.import_form_growi')}</legend>
-
-        <div className="alert alert-warning">
-          <i className="icon-exclamation"></i> { t('importer_management.beta_warning') }
-        </div>
-
-        <div className="well well-sm small">
-          <ul>
-            <li>{t('importer_management.growi_settings.overwrite_documents')}</li>
-          </ul>
-        </div>
+        <h2>{t('importer_management.import_form_growi')}</h2>
 
 
         {this.state.fileName ? (
         {this.state.fileName ? (
           <Fragment>
           <Fragment>

+ 1 - 1
src/client/js/components/Admin/Import/GrowiZipUploadForm.jsx

@@ -51,7 +51,7 @@ class GrowiZipUploadForm extends React.Component {
     return (
     return (
       <form className="form-horizontal" onSubmit={this.uploadZipFile}>
       <form className="form-horizontal" onSubmit={this.uploadZipFile}>
         <fieldset>
         <fieldset>
-          <div className="form-group d-flex align-items-center">
+          <div className="form-group">
             <label htmlFor="file" className="col-xs-3 control-label">{t('importer_management.growi_settings.zip_file')}</label>
             <label htmlFor="file" className="col-xs-3 control-label">{t('importer_management.growi_settings.zip_file')}</label>
             <div className="col-xs-6">
             <div className="col-xs-6">
               <input
               <input