Skip to content

Commit

Permalink
#351: solved project form layout issue
Browse files Browse the repository at this point in the history
  • Loading branch information
yaxue1123 committed Dec 9, 2024
1 parent ced921a commit c6a023e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
2 changes: 0 additions & 2 deletions src/components/Project/Community/CommunityTags.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class Community extends React.Component {
<Form>
{
canUpdate &&
<Container>
<Row>
<Col xs={4}>
<Form.Group className="mb-3" controlId="communityAgencySelect">
Expand Down Expand Up @@ -92,7 +91,6 @@ class Community extends React.Component {
</Button>
</Col>
</Row>
</Container>
}
<div className="ms-1">
<ul className="input-tag__tags">
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Form/InputTag.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class InputTag extends React.Component {
render() {
const { name, label, tags, disabled } = this.props;
return (
!disabled ? <div className="form-group">
!disabled ? <div className="form-group mt-5">
<label htmlFor={name}>{label}</label>
<div className="input-tag form-control">
<ul className="input-tag__tags">
Expand Down
34 changes: 18 additions & 16 deletions src/pages/ProjectForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -649,31 +649,31 @@ class ProjectForm extends Form {
<div className="d-flex flex-row justify-content-end">
<button
type="button"
className="btn btn-sm btn-outline-success mr-2 my-3"
className="btn btn-sm btn-outline-success me-2 my-3"
onClick={() => window.open(
`${portalData.jiraLinks.projectPermissionRequest}?${urlSuffix}`,
"_blank")
}
>
<i className="fa fa-sign-in mr-2"></i>
<i className="fa fa-sign-in me-2"></i>
Request Permissions
</button>
<button
type="button"
className="btn btn-sm btn-outline-success mr-2 my-3"
className="btn btn-sm btn-outline-success me-2 my-3"
onClick={() => window.open(
`${portalData.jiraLinks.storageRequest}?${urlSuffix}`,
"_blank")
}
>
<i className="fa fa-sign-in mr-2"></i>
<i className="fa fa-sign-in me-2"></i>
Request Storage
</button>
<Link to="/experiments#projects">
<button
className="btn btn-sm btn-outline-primary my-3"
>
<i className="fa fa-sign-in mr-2"></i>
<i className="fa fa-sign-in me-2"></i>
Back to Project List
</button>
</Link>
Expand All @@ -683,7 +683,7 @@ class ProjectForm extends Form {
<button
className="btn btn-sm btn-outline-primary my-3"
>
<i className="fa fa-sign-in mr-2"></i>
<i className="fa fa-sign-in me-2"></i>
Back to Project List
</button>
</Link>
Expand All @@ -696,7 +696,7 @@ class ProjectForm extends Form {
role="alert"
>
<span>
<i className="fa fa-exclamation-triangle mr-2"></i>
<i className="fa fa-exclamation-triangle me-2"></i>
This project is expired and no operations are allowed. Please submit a ticket to renew the project.
</span>
<button
Expand All @@ -707,7 +707,7 @@ class ProjectForm extends Form {
"_blank")
}
>
<i className="fa fa-sign-in mr-2"></i>
<i className="fa fa-sign-in me-2"></i>
Renew Project
</button>
</div>
Expand All @@ -720,7 +720,7 @@ class ProjectForm extends Form {
role="alert"
>
<div>
<i className="fa fa-exclamation-triangle mr-2"></i>
<i className="fa fa-exclamation-triangle me-2"></i>
This project is going to expire in a month on {utcToLocalTimeParser(data.expired)}.
{
canUpdate ? <span> Please submit a ticket to renew the project.</span> :
Expand All @@ -736,17 +736,19 @@ class ProjectForm extends Form {
"_blank")
}
>
<i className="fa fa-sign-in mr-2"></i>
<i className="fa fa-sign-in me-2"></i>
Renew Project
</button> : <div></div>
}
</div>
}
<div className="row mt-4">
<SideNav
items={SideNavItems}
handleChange={this.handleSideNavChange}
/>
<div className="col-3">
<SideNav
items={SideNavItems}
handleChange={this.handleSideNavChange}
/>
</div>
<div
className={`${activeIndex === 0 ? "col-9" : "d-none"}`}
>
Expand All @@ -763,9 +765,9 @@ class ProjectForm extends Form {
portalData.helperText.privacyPreferencesDescription
)
}
{
{/* {
this.renderInputTag("topics", "Project Topics", topics, canUpdate)
}
} */}
</form>
<ProjectBasicInfoTable
project={data}
Expand Down

0 comments on commit c6a023e

Please sign in to comment.