projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
User management and project management build scripts updated
[osm/UI.git]
/
skyquake
/
framework
/
widgets
/
skyquake_container
/
skyquakeContainer.jsx
diff --git
a/skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx
b/skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx
index
eca9413
..
558cc62
100644
(file)
--- a/
skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx
+++ b/
skyquake/framework/widgets/skyquake_container/skyquakeContainer.jsx
@@
-1,5
+1,5
@@
/*
/*
- *
+ *
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-22,7
+22,7
@@
import SkyquakeNav from './skyquakeNav.jsx';
import EventCenter from './eventCenter.jsx';
import SkyquakeContainerActions from './skyquakeContainerActions.js'
import SkyquakeContainerStore from './skyquakeContainerStore.js';
import EventCenter from './eventCenter.jsx';
import SkyquakeContainerActions from './skyquakeContainerActions.js'
import SkyquakeContainerStore from './skyquakeContainerStore.js';
-import Breadcrumbs from 'react-breadcrumbs';
+
//
import Breadcrumbs from 'react-breadcrumbs';
import Utils from 'utils/utils.js';
import _ from 'lodash';
import Crouton from 'react-crouton';
import Utils from 'utils/utils.js';
import _ from 'lodash';
import Crouton from 'react-crouton';
@@
-83,7
+83,7
@@
export default class skyquakeContainer extends React.Component {
}
render() {
}
render() {
- const {displayNotification, notificationMessage, displayScreenLoader, ...state} = this.state;
+ const {displayNotification, notificationMessage, displayScreenLoader,
notificationType,
...state} = this.state;
var html;
if (this.matchesLoginUrl()) {
var html;
if (this.matchesLoginUrl()) {
@@
-104,7
+104,7
@@
export default class skyquakeContainer extends React.Component {
<Crouton
id={Date.now()}
message={notificationMessage}
<Crouton
id={Date.now()}
message={notificationMessage}
- type={
"error"
}
+ type={
notificationType
}
hidden={!(displayNotification && notificationMessage)}
onDismiss={SkyquakeContainerActions.hideNotification}
/>
hidden={!(displayNotification && notificationMessage)}
onDismiss={SkyquakeContainerActions.hideNotification}
/>
@@
-113,7
+113,7
@@
export default class skyquakeContainer extends React.Component {
currentPlugin={this.state.currentPlugin}
store={SkyquakeContainerStore} />
<div className="titleBar">
currentPlugin={this.state.currentPlugin}
store={SkyquakeContainerStore} />
<div className="titleBar">
- <h1>{
this.state.currentPlugin
+ tag}</h1>
+ <h1>{
(this.state.nav.name ? this.state.nav.name.replace('_', ' ').replace('-', ' ') : this.state.currentPlugin && this.state.currentPlugin.replace('_', ' ').replace('-', ' '))
+ tag}</h1>
</div>
<div className={"application " + routeName}>
{this.props.children}
</div>
<div className={"application " + routeName}>
{this.props.children}