Skip to content
This repository has been archived by the owner on Mar 15, 2022. It is now read-only.

fix typo #20

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix typo #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions front/src/js/components/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var NotificationSystem = require('react-notification-system');
var Spinner = require('react-spinkit');

var HeaderSidebar = require('./HeaderSidebar');
var RegistClusterModal = require('./RegistClusterModal');
var RegisterClusterModal = require('./RegisterClusterModal');

var AppStore = require('../stores/AppStore');
var UserStore = require('../stores/UserStore');
Expand All @@ -18,11 +18,11 @@ var App = React.createClass({
AppStore.removeAlertListener(this.onAlertHandle);
},
render: function() {
var registClusterModalView;
var registerClusterModalView;
var me = UserStore.getMe();

if (!AUTH_ENABLED || me.role === 'RELUMIN_ADMIN') {
registClusterModalView = (<RegistClusterModal />);
registerClusterModalView = (<RegisterClusterModal />);
}
return (
<div>
Expand All @@ -32,7 +32,7 @@ var App = React.createClass({
<RouteHandler/>
</div>
</div>
{registClusterModalView}
{registerClusterModalView}
<NotificationSystem ref="notificationSystem" />
<div className="global-loading">
<Spinner spinnerName='three-bounce' ref="spinner" />
Expand Down
12 changes: 6 additions & 6 deletions front/src/js/components/ClusterSettingDelete.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ var ClusterSettingDelete = React.createClass({
<div className="cluster-setting-delete-components">
<div className="panel panel-default">
<div className="panel-heading clearfix">
Unregist cluster
Unregister cluster
</div>
<div className="panel-body">
<button className="btn btn-danger" data-toggle="modal" data-target=".unregist-cluster-modal">Unregist cluster.</button>
<button className="btn btn-danger" data-toggle="modal" data-target=".unregister-cluster-modal">Unregister cluster.</button>
</div>
</div>
<div className="modal unregist-cluster-modal" ref="unregist-cluster-modal">
<div className="modal unregister-cluster-modal" ref="unregister-cluster-modal">
<div className="modal-dialog">
<div className="modal-content">
<div className="modal-header">
<button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 className="modal-title">Unregist this cluster</h4>
<h4 className="modal-title">Unregister this cluster</h4>
</div>
<div className="modal-body">
Are you sure ?
Expand Down Expand Up @@ -61,7 +61,7 @@ var ClusterSettingDelete = React.createClass({
_this.hideModal();
}
Utils.showAlert({
message: 'Unregisted successfully',
message: 'Unregistered successfully',
level: 'success'
});
},
Expand All @@ -75,7 +75,7 @@ var ClusterSettingDelete = React.createClass({
);
},
hideModal: function() {
$(React.findDOMNode(this.refs['unregist-cluster-modal'])).modal('hide');
$(React.findDOMNode(this.refs['unregister-cluster-modal'])).modal('hide');
}
});

Expand Down
8 changes: 4 additions & 4 deletions front/src/js/components/HeaderSidebar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ var HeaderSidebar = React.createClass({
);
}

var registAndCreateClusterMenuView;
var registerAndCreateClusterMenuView;
if (!AUTH_ENABLED || me.role === 'RELUMIN_ADMIN') {
registAndCreateClusterMenuView = [
(<li key="regist-cluster"><a href="#" data-toggle="modal" data-target=".regist-cluster-modal-components">Regist cluster</a></li>),
registerAndCreateClusterMenuView = [
(<li key="register-cluster"><a href="#" data-toggle="modal" data-target=".register-cluster-modal-components">Register cluster</a></li>),
(<li key="create-cluster"><a href="#/create-cluster">Create cluster</a></li>)
];
}
Expand Down Expand Up @@ -86,7 +86,7 @@ var HeaderSidebar = React.createClass({
{clusterNames}
</ul>
<ul className="nav navbar-nav navbar-right dis-iframe">
{registAndCreateClusterMenuView}
{registerAndCreateClusterMenuView}
<li><a href="#/users">Users</a></li>
{loginDropDownView}
</ul>
Expand Down
6 changes: 3 additions & 3 deletions .../src/js/components/RegistClusterModal.jsx → ...rc/js/components/RegisterClusterModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ var RegisterClusterModal = React.createClass({
},
render: function() {
return (
<div className="modal regist-cluster-modal-components" ref="modal">
<div className="modal register-cluster-modal-components" ref="modal">
<div className="modal-dialog">
<div className="modal-content">
<div className="modal-header">
<button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 className="modal-title">Regist cluster</h4>
<h4 className="modal-title">Register cluster</h4>
</div>
<div className="modal-body">
<div className={this.getClasses('clusterName')}>
Expand Down Expand Up @@ -83,7 +83,7 @@ var RegisterClusterModal = React.createClass({
_this.closeModal();
}
Utils.showAlert({
message: 'Registed successfully',
message: 'Registered successfully',
level: 'success'
});
},
Expand Down
270 changes: 138 additions & 132 deletions src/main/resources/static/js/app.js
View file
Open in desktop

Large diffs are not rendered by default.