From c21c5d2ac657b8376b101dbfaec0a09a2b65aa50 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Mon, 9 Dec 2019 21:37:24 +0800
Subject: [PATCH] [system admin] logs: bugfix & improvement for 'export excel'
 dialog (#4344)

---
 .../sysadmin-logs-export-excel-dialog.js      | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-logs-export-excel-dialog.js b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-logs-export-excel-dialog.js
index f21e1e762a..344b8f5e91 100644
--- a/frontend/src/components/dialog/sysadmin-dialog/sysadmin-logs-export-excel-dialog.js
+++ b/frontend/src/components/dialog/sysadmin-dialog/sysadmin-logs-export-excel-dialog.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Button, Modal, ModalHeader, ModalBody, ModalFooter, Input, Alert } from 'reactstrap';
+import { Button, Modal, ModalHeader, ModalBody, ModalFooter, FormGroup, Label, Input, Alert } from 'reactstrap';
 import { gettext, siteRoot } from '../../../utils/constants';
 import moment from 'moment';
 
@@ -82,20 +82,23 @@ class LogsExportExcelDialog extends React.Component {
       <Modal isOpen={true} toggle={this.props.toggle}>
         <ModalHeader toggle={this.props.toggle}>{gettext('Choose date')}</ModalHeader>
         <ModalBody>
-          {gettext('Start date')}
-          <Input
-            value={this.state.startDateStr}
-            onChange={this.handleStartChange}
-            placeholder='YYYY-mm-dd'
-            innerRef={input => {this.newInput = input;}}
-          />
-          <br/>
-          {gettext('End date')}
-          <Input
-            value={this.state.endDateStr}
-            onChange={this.handleEndChange}
-            placeholder='YYYY-mm-dd'
-          />
+          <FormGroup>
+            <Label>{gettext('Start date')}</Label>
+            <Input
+              value={this.state.startDateStr}
+              onChange={this.handleStartChange}
+              placeholder='yyyy-mm-dd'
+              innerRef={input => {this.newInput = input;}}
+            />
+          </FormGroup>
+          <FormGroup>
+            <Label>{gettext('End date')}</Label>
+            <Input
+              value={this.state.endDateStr}
+              onChange={this.handleEndChange}
+              placeholder='yyyy-mm-dd'
+            />
+          </FormGroup>
           {this.state.errMsg &&
             <Alert className="mt-2" color="danger">
               {gettext(this.state.errMsg)}
@@ -103,6 +106,7 @@ class LogsExportExcelDialog extends React.Component {
           }
         </ModalBody>
         <ModalFooter>
+          <Button color="secondary" onClick={this.props.toggle}>{gettext('Cancel')}</Button>
           <Button color="primary" onClick={this.downloadExcel}>{gettext('Submit')}</Button>
         </ModalFooter>
       </Modal>