From 20e42c950fd0b0da116b81d45adbd9778fa4ede3 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 1 May 2017 15:15:06 +0300 Subject: [PATCH] =?UTF-8?q?MCSM:=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=20ServerInfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mcserver-manager/build.gradle | 2 +- .../src/main/resources/components.js | 17 +++++++++++++++++ mcserver-manager/src/main/resources/module.js | 13 +------------ 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/mcserver-manager/build.gradle b/mcserver-manager/build.gradle index f7a5b4e..d13918c 100644 --- a/mcserver-manager/build.gradle +++ b/mcserver-manager/build.gradle @@ -1,5 +1,5 @@ group = 'asys' -version = '0.8.1-SNAPSHOT' +version = '0.8.2-SNAPSHOT' apply plugin: 'osgi' diff --git a/mcserver-manager/src/main/resources/components.js b/mcserver-manager/src/main/resources/components.js index a5ec7be..db6f44f 100644 --- a/mcserver-manager/src/main/resources/components.js +++ b/mcserver-manager/src/main/resources/components.js @@ -53,6 +53,23 @@ var NvLineChart = React.createClass({ } }); +var ServerInfo = React.createClass({ + render: function(){return( + ce('div', null, + ce('div', {className: 'pull-right'}, + ce('div', {className: 'btn-group'}, + ce(Button, {btnSize: 'xs'}, + ce('span', {className: 'glyphicon glyphicon-play'}), nbsp+'запуск'), + ce(Button, {btnSize: 'xs'}, + ce('span', {className: 'glyphicon glyphicon-stop'}), nbsp+'остановка') + ) + ), + ce('h2', {style: {'margin-top': '0px'}}, this.props.title), + this.props.children + ) + )} +}); + var ServerListItem = React.createClass({ render: function(){ return( diff --git a/mcserver-manager/src/main/resources/module.js b/mcserver-manager/src/main/resources/module.js index 5edfbf0..1a9eb15 100644 --- a/mcserver-manager/src/main/resources/module.js +++ b/mcserver-manager/src/main/resources/module.js @@ -63,18 +63,7 @@ var ContentModule = React.createClass({ element = ce('div', {className: 'row'}, ce('div', {className: 'col-md-4'}, ce(ServerList, null, serverListItems)), - ce('div', {className: 'col-md-8'}, - ce('div', {className: 'pull-right'}, - ce('div', {className: 'btn-group'}, - ce(Button, {btnSize: 'xs'}, - ce('span', {className: 'glyphicon glyphicon-play'}), nbsp+'запуск'), - ce(Button, {btnSize: 'xs'}, - ce('span', {className: 'glyphicon glyphicon-stop'}), nbsp+'остановка') - ) - ), - ce('h2', {style: {'margin-top': '0px'}}, 'Server 2 [skywars-1]'), - ce(NvLineChart) - ) + ce('div', {className: 'col-md-8'}, ce(ServerInfo, {title: 'Server 2 [skywars-1]'}, ce(NvLineChart))) ); } else if (this.state.nvScriptReady < 0) { element = ce('span', null, 'error');