From c9197d0186f56066e8ec0093a240c5f61de14ff0 Mon Sep 17 00:00:00 2001
From: shanshuirenjia <978987373@qq.com>
Date: Sun, 16 Dec 2018 15:11:30 +0800
Subject: [PATCH] improve new library dialog

---
 .../components/dialog/create-repo-dialog.js   | 34 ++++++++++++++-----
 frontend/src/css/modal.css                    | 18 ++++++++++
 2 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/css/modal.css

diff --git a/frontend/src/components/dialog/create-repo-dialog.js b/frontend/src/components/dialog/create-repo-dialog.js
index 8cf602f2b3..dc06871b69 100644
--- a/frontend/src/components/dialog/create-repo-dialog.js
+++ b/frontend/src/components/dialog/create-repo-dialog.js
@@ -1,8 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Button, Modal, ModalHeader, Input, ModalBody, ModalFooter, Form, FormGroup, Label } from 'reactstrap';
+import { Button, Modal, ModalHeader, Input, ModalBody, ModalFooter, Form, FormGroup, Label, FormText } from 'reactstrap';
 import { gettext } from '../../utils/constants';
 
+import '../../css/modal.css';
+
 const propTypes = {
   onCreateRepo: PropTypes.func.isRequired,
   onCreateToggle: PropTypes.func.isRequired,
@@ -18,6 +20,7 @@ class CreateRepoDialog extends React.Component {
       password1: '',
       password2: '',
       errMessage: '',
+      permission: 'rw'
     };
     this.newInput = React.createRef();
   }
@@ -39,7 +42,8 @@ class CreateRepoDialog extends React.Component {
     if (isValid) {
       let repoName = this.state.repoName.trim();
       let password = this.state.encrypt ? this.state.password1 : '';
-      let repo = this.createRepo(repoName, password);
+      let permission= this.state.permission;
+      let repo = this.createRepo(repoName, password, permission);
       this.props.onCreateRepo(repo);
     }
   } 
@@ -98,6 +102,11 @@ class CreateRepoDialog extends React.Component {
     return true;
   }
 
+  onPermissionChange = (e) => {
+    let permission = e.target.value;
+    this.setState({permission: permission});
+  }
+
   onEncrypted = (e) => {
     let isChecked = e.target.checked;
     this.setState({
@@ -106,7 +115,7 @@ class CreateRepoDialog extends React.Component {
     });
   }
 
-  createRepo = (repoName, password) => {
+  createRepo = (repoName, password, permission) => {
     let libraryType = this.props.libraryType;
     let encrypt = password ? true : false;
     let repo = null;
@@ -131,7 +140,7 @@ class CreateRepoDialog extends React.Component {
       repo = {
         repo_name: repoName,
         password: password,
-        permission: 'rw',
+        permission: permission,
       };
     }
     return repo;
@@ -139,12 +148,12 @@ class CreateRepoDialog extends React.Component {
 
   render() {
     return (
-      <Modal isOpen={true} toggle={this.toggle}>
+      <Modal isOpen={true} toggle={this.toggle} className="repo-dialog">
         <ModalHeader toggle={this.toggle}>{gettext('New Library')}</ModalHeader>
         <ModalBody>
           <Form>
             <FormGroup>
-              <Label for="fileName">{gettext('Name')}: </Label>
+              <Label for="fileName">{gettext('Name')}</Label>
               <Input 
                 onKeyPress={this.handleKeyPress} 
                 innerRef={input => {this.newInput = input;}} 
@@ -153,12 +162,21 @@ class CreateRepoDialog extends React.Component {
                 onChange={this.handleRepoNameChange}
               />
             </FormGroup>
+            {this.props.libraryType === 'group' && (
+              <FormGroup>
+                <Label for="exampleSelect">{gettext('Permission')}</Label>
+                <Input type="select" name="select" id="exampleSelect" onChange={this.onPermissionChange} value={this.state.permission}>
+                  <option value='rw'>rw</option>
+                  <option value='r'>r</option>
+                </Input>
+              </FormGroup>
+            )}
             <FormGroup check>
               <Input type="checkbox" id="encrypt" onChange={this.onEncrypted}/>
-              <Label for="encrypt">{gettext('Encrypt')}</Label>
+              <FormText className="text">{gettext('Encrypt')}</FormText>
             </FormGroup>
             <FormGroup>
-              <Label for="passwd1">{gettext('Password')} ({gettext('at least 8 characters')})</Label>
+              <Label for="passwd1">{gettext('Password')}{' '}<span className="tip">({gettext('at least 8 characters')})</span></Label>
               <Input 
                 id="passwd1" 
                 type="password"
diff --git a/frontend/src/css/modal.css b/frontend/src/css/modal.css
new file mode 100644
index 0000000000..ec59e1aabd
--- /dev/null
+++ b/frontend/src/css/modal.css
@@ -0,0 +1,18 @@
+.repo-dialog .modal-body label {
+  padding: 0.5rem 0 0.25rem;
+  font-weight: bold;
+  color: #333;
+  font-size: 0.8125rem;
+}
+
+.repo-dialog .modal-body label.form-check-label {
+  font-weight: normal;
+  padding: 0.25rem 0;
+}
+
+.repo-dialog .modal-body .tip {
+  font-weight: normal;
+  color: #808080;
+  font-size: 0.75rem;
+  margin-bottom: 1rem;
+}
\ No newline at end of file