Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tooltip re-alignment #443

Merged
merged 2 commits into from
Nov 6, 2019
Merged

tooltip re-alignment #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c988fea
tooltip re-alignment
ddelpiano Nov 4, 2019
8e7b35c
Merge branch 'development' into feature/441
Robbie1977 Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 63 additions & 49 deletions components/interface/FocusTerm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import React, { Component } from 'react';
import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
import Menu from 'geppetto-client/js/components/interface/menu/Menu';
import Tooltip from '@material-ui/core/Tooltip';
import {
createMuiTheme,
MuiThemeProvider
} from "@material-ui/core/styles";

var GEPPETTO = require('geppetto');
var Rnd = require('react-rnd').default;
Expand All @@ -15,6 +20,7 @@ export default class FocusTerm extends React.Component {

this.focusTermConfiguration = require('../configuration/focusTermConfiguration.js').focusTermConfiguration;
this.labels = require('../configuration/focusTermConfiguration.js').subMenusGrouping;
this.theme = createMuiTheme({ overrides: { MuiTooltip: { tooltip: { fontSize: "12px" } } } });

this.clearAll = this.clearAll.bind(this);
this.menuHandler = this.menuHandler.bind(this);
Expand Down Expand Up @@ -476,55 +482,63 @@ export default class FocusTerm extends React.Component {

<div className="focusTermRight">
<div className="focusTermDivR">
<i className="fa fa-eraser arrowsStyle tooltipLink"
onClick={() => {
this.clearAll();
}}>
<span className="tooltipBox"> Clear all </span>
</i>
<i className="fa fa-search arrowsStyle tooltipLink"
onClick={() => {
this.props.UIUpdateManager("spotlightVisible");
}}>
<span className="tooltipBox"> Search </span>
</i>
<i className="fa fa-quora arrowsStyle tooltipLink"
onClick={() => {
this.props.UIUpdateManager("queryBuilderVisible");
}}>
<span className="tooltipBox"> Open query results </span>
</i>
<i className="fa fa-list arrowsStyle tooltipLink"
onClick={() => {
this.props.UIUpdateManager("controlPanelVisible");
}}>
<span className="tooltipBox"> Open the control panel </span>
</i>
{ window.history.state !== null && window.history.state.b !== undefined && window.history.state.b !== ""
? <i className="fa fa-chevron-left arrowsStyle tooltipLink"
onClick={() => {
if (window.vfbUpdatingHistory == false) {
window.history.back();
}
}}>
<span className="tooltipBox"> {tooltipPrevious} </span>
</i>
: <i className="fa fa-chevron-left arrowsStyle isDisabled" />
}
{ window.history.state !== null && window.history.state.f !== undefined && window.history.state.f !== ""
? <i className="fa fa-chevron-right arrowsStyle tooltipLink"
onClick={() => {
if (window.vfbUpdatingHistory == false) {
window.history.forward();
}
}}>
<span className="tooltipBox"> {tooltipNext} </span>
</i>
: <i className="fa fa-chevron-right arrowsStyle isDisabled" />
}
<Menu
configuration={this.focusTermConfiguration}
menuHandler={this.menuHandler} />
<MuiThemeProvider theme={this.theme}>
<Tooltip placement="top-end"
title="Clear all">
<i className="fa fa-eraser arrowsStyle"
onClick={() => {
this.clearAll();
}} />
</Tooltip>
<Tooltip placement="top-end"
title="Search">
<i className="fa fa-search arrowsStyle"
onClick={() => {
this.props.UIUpdateManager("spotlightVisible");
}} />
</Tooltip>
<Tooltip placement="top-end"
title="Open query results">
<i className="fa fa-quora arrowsStyle"
onClick={() => {
this.props.UIUpdateManager("queryBuilderVisible");
}} />
</Tooltip>
<Tooltip placement="top-end"
title="Open the control panel">
<i className="fa fa-list arrowsStyle"
onClick={() => {
this.props.UIUpdateManager("controlPanelVisible");
}} />
</Tooltip>
{ window.history.state !== null && window.history.state.b !== undefined && window.history.state.b !== ""
? <Tooltip placement="top-end"
title={tooltipPrevious}>
<i className="fa fa-chevron-left arrowsStyle"
onClick={() => {
if (window.vfbUpdatingHistory == false) {
window.history.back();
}
}} />
</Tooltip>
: <i className="fa fa-chevron-left arrowsStyle isDisabled" />
}
{ window.history.state !== null && window.history.state.f !== undefined && window.history.state.f !== ""
? <Tooltip placement="top-end"
title={tooltipNext}>
<i className="fa fa-chevron-right arrowsStyle"
onClick={() => {
if (window.vfbUpdatingHistory == false) {
window.history.forward();
}
}} />
</Tooltip>
: <i className="fa fa-chevron-right arrowsStyle isDisabled" />
}
<Menu
configuration={this.focusTermConfiguration}
menuHandler={this.menuHandler} />
</MuiThemeProvider>
</div>
</div>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion components/interface/VFBTermInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import ReactDOM from 'react-dom';
import Slider from "react-slick";
import Collapsible from 'react-collapsible';
import HTMLViewer from 'geppetto-client/js/components/interface/htmlViewer/HTMLViewer';
import ButtonBarComponent from 'geppetto-client/js/components/widgets/popup/ButtonBarComponent';

var $ = require('jquery');
var GEPPETTO = require('geppetto');
var anchorme = require('anchorme');
var Type = require('geppetto-client/js/geppettoModel/model/Type');
var ButtonBarComponent = require('geppetto-client/js/components/widgets/popup/ButtonBarComponent');

require('../../css/VFBTermInfo.less');
require('geppetto-client/js/components/widgets/popup/Popup.less');
Expand Down