Commit f14b2a8e authored by Maxime Chaillet's avatar Maxime Chaillet

add glyph in the tab titles.

parent e439e6e1
......@@ -26,10 +26,10 @@
<!-- Optional theme -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
<!-- <link rel="stylesheet" href="https://npmcdn.com/react-bootstrap-table/dist/react-bootstrap-table.min.css"> -->
<link rel="stylesheet" href="https://npmcdn.com/react-bootstrap-table/dist/react-bootstrap-table.min.css">
<!-- icons for the editor-->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<!--<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">-->
<title>ESRF Portal</title>
</head>
......
......@@ -10,7 +10,7 @@ class ListMenu extends React.Component {
let path = "/investigation/" + investigationId + "/events/";
return (
<div style={{borderBottom: "solid 1px", borderBottomColor: "#EDEDED"}}>
<div style={{borderBottom: "solid 1px", borderBottomColor: "#EDEDED", marginBottom: "10px"}}>
<Nav bsStyle="pills">
<NavItem eventKey={1} href={path + "new"}>
<Glyphicon glyph="glyphicon-plus" /> <span style={{ color: "#808080" }} >New event </span>
......
......@@ -3,7 +3,7 @@ import axios from "axios"
import PropTypes from 'prop-types'
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { Grid, Row, Col, Tabs, Tab } from 'react-bootstrap';
import { Grid, Row, Col, Tabs, Tab, Glyphicon } from 'react-bootstrap';
import DatasetTable from "../../components/Dataset/DatasetTable.js"
import { getDatasetsByInvestigationId } from '../../api/icat/icat.js'
import { parseQueryParameters } from '../../helpers/URLParser.js'
......@@ -144,22 +144,23 @@ class InvestigationContainer extends Component {
return <Loading></Loading>
}
// let perspective = this.getActivePerspective();
return (< div style={{ marginLeft: "10px" ,marginTop: "70px" }}>
return (< div style={{ marginLeft: "10px", marginTop: "70px" }}>
{/*<InvestigationContainerMenu onSearch={this.onSearch} datasets={this.state.datasets} investigationId={this.state.investigationId} perspective={perspective} ></InvestigationContainerMenu>
{this.renderPerspective(perspective)} */}
<Tabs defaultActiveKey={1} id="uncontrolled-tab-example" mountOnEnter={true} animation={false}>
<Tab eventKey={1} title="Dataset List">
<Tab eventKey={1} title={<div> <Glyphicon glyph="list" /> <span style={{ marginLeft: "2px" }}> Dataset List </span></div>}>
<DatasetTable removeDatasetById={this.props.removeDatasetById} addDatasetById={this.props.addDatasetById} sessionId={this.props.user.sessionId} datasets={this.state.filtered} fetching={this.state.fetching}></DatasetTable>
</Tab>
<Tab eventKey={2} title="Browse Files">
<Tab eventKey={2} title={<div> <Glyphicon glyph="folder-open" /> <span style={{ marginLeft: "5px" }}> Browse Files </span> </div>}>
<InvestigationFileTree sessionId={this.props.user.sessionId} username={this.props.user.username} datasets={this.state.filtered} fetching={this.state.fetching}></InvestigationFileTree>
</Tab>
<Tab eventKey={3} title="Logbook">
<Tab eventKey={3} title={<div> <Glyphicon glyph="comment" /><span style={{ marginLeft: "2px" }}> Logbook </span></div>}>
<EventContainer investigationId={this.state.investigationId} />
</Tab>
</Tabs>
</div >);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment