ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-1657 Fixed spontaneous scrolling on client tab switch.
Date Mon, 02 Nov 2015 08:52:27 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 c880bd94e -> 5825ff704


IGNITE-1657 Fixed spontaneous scrolling on client tab switch.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5825ff70
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5825ff70
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5825ff70

Branch: refs/heads/ignite-843-rc1
Commit: 5825ff70416d6d5aee77fb0ceda25f03fc7ed6db
Parents: c880bd9
Author: Andrey <anovikov@gridgain.com>
Authored: Mon Nov 2 15:52:17 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Mon Nov 2 15:52:17 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/summary-controller.js         |  3 ++-
 modules/control-center-web/src/main/js/routes/summary.js  | 10 ++++++----
 .../src/main/js/views/configuration/summary-tabs.jade     |  2 +-
 .../src/main/js/views/configuration/summary.jade          |  3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5825ff70/modules/control-center-web/src/main/js/controllers/summary-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/summary-controller.js b/modules/control-center-web/src/main/js/controllers/summary-controller.js
index f9d5bf0..ee3b44a 100644
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@ -82,8 +82,9 @@ consoleModule.controller('summaryController', [
 
         renderer.setHighlightGutterLine(false);
         renderer.setShowPrintMargin(false);
+        renderer.setOption('fontFamily', 'monospace');
         renderer.setOption('fontSize', '12px');
-        renderer.setOption('minLines', '3');
+        renderer.setOption('minLines', '25');
         renderer.setOption('maxLines', '25');
 
         editor.setTheme('ace/theme/chrome');

http://git-wip-us.apache.org/repos/asf/ignite/blob/5825ff70/modules/control-center-web/src/main/js/routes/summary.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/summary.js b/modules/control-center-web/src/main/js/routes/summary.js
index 412748a..a9ce2c5 100644
--- a/modules/control-center-web/src/main/js/routes/summary.js
+++ b/modules/control-center-web/src/main/js/routes/summary.js
@@ -45,6 +45,8 @@ router.post('/download', function (req, res) {
         if (!cluster)
             return res.sendStatus(404);
 
+        var clientNearConfiguration = JSON.parse(req.body.clientNearConfiguration);
+
         var JSZip = require('jszip');
 
         var zip = new JSZip();
@@ -63,10 +65,10 @@ router.post('/download', function (req, res) {
 
         var srcPath = 'src/main/java/';
 
-        zip.file('config/' + cluster.name + '.xml', $generatorXml.cluster(cluster));
-        zip.file('config/' + cluster.name + '-client' + '.xml', $generatorXml.cluster(cluster,
true));
-        zip.file(srcPath + 'ConfigurationFactory.java', $generatorJava.cluster(cluster, 'ConfigurationFactory'));
-        zip.file(srcPath + 'ClientConfigurationFactory.java', $generatorJava.cluster(cluster,
'ClientConfigurationFactory', true));
+        zip.file('config/' + cluster.name + '-server.xml', $generatorXml.cluster(cluster));
+        zip.file('config/' + cluster.name + '-client.xml', $generatorXml.cluster(cluster,
clientNearConfiguration));
+        zip.file(srcPath + 'ConfigurationFactory.java', $generatorJava.cluster(cluster, 'ServerConfigurationFactory'));
+        zip.file(srcPath + 'ClientConfigurationFactory.java', $generatorJava.cluster(cluster,
'ClientConfigurationFactory', clientNearConfiguration));
         zip.file('pom.xml', $generatorPom.pom(cluster.caches, '1.5.0').asString());
 
         zip.file('README.txt', $generatorReadme.readme().asString());

http://git-wip-us.apache.org/repos/asf/ignite/blob/5825ff70/modules/control-center-web/src/main/js/views/configuration/summary-tabs.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary-tabs.jade
b/modules/control-center-web/src/main/js/views/configuration/summary-tabs.jade
index 743207a..86d7153 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary-tabs.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary-tabs.jade
@@ -21,4 +21,4 @@ ul.nav(ng-class='$navClass', role='tablist')
             img(ng-switch-when='Java' src='/images/java.png')
             img(ng-switch-when='POJO' src='/images/java.png')
             img(ng-switch-when='Dockerfile' src='/images/docker.png')
-.tab-content(ng-transclude style='min-height: 410px')
+.tab-content(ng-transclude style='fontSize: 12px; min-height: 25em')

http://git-wip-us.apache.org/repos/asf/ignite/blob/5825ff70/modules/control-center-web/src/main/js/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index a7bffc7..51b7493 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -60,6 +60,7 @@ block content
             form.panel-tip-container(data-placement='bottom' bs-tooltip data-title='Download
configuration' method='post' action='summary/download')
                 input(type='hidden' name='_id' value='{{selectedItem._id}}')
                 input(type='hidden' name='os' value='{{os}}')
+                input(type='hidden' name='clientNearConfiguration' value='{{backupItem.nearConfiguration}}')
                 input(type='hidden' name='useConstructor' value='{{configServer.useConstructor}}')
                 input(type='hidden' name='includeKeyFields' value='{{configServer.includeKeyFields}}')
                 button.btn.btn-primary(id='download' type='submit' ng-click='$event.stopPropagation()')
Download
@@ -100,7 +101,7 @@ block content
                                 div(ui-ace='{ onLoad: aceInit, mode: "dockerfile" }' ng-model='dockerServer')
                 .panel.panel-default
                     .panel-heading(role='tab' bs-collapse-toggle)
-                        i.fa(ng-class='panelExpanded(panels, "server") ? "fa-chevron-circle-up"
: "fa-chevron-circle-down"')
+                        i.fa(ng-class='panelExpanded(panels, "client") ? "fa-chevron-circle-up"
: "fa-chevron-circle-down"')
                         label Client
                     .panel-collapse(id='client' role='tabpanel' bs-collapse-target)
                         div(ng-show='selectedItem')


Mime
View raw message