You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/08/31 11:01:49 UTC
ignite git commit: IGNITE-843 Minor fix for summary screen tabs.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 6aa74be0b -> 44906e5d3
IGNITE-843 Minor fix for summary screen tabs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/44906e5d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/44906e5d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/44906e5d
Branch: refs/heads/ignite-843
Commit: 44906e5d37bdf8fa049f6797762f68816fcdca98
Parents: 6aa74be
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Aug 31 16:02:14 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Aug 31 16:02:14 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 15 ++++++++---
.../js/routes/generator/generator-properties.js | 2 +-
.../src/main/js/routes/public.js | 5 ----
.../src/main/js/routes/summary.js | 5 ++++
.../js/views/configuration/summary-tabs.jade | 23 +++++++++++++++++
.../main/js/views/configuration/summary.jade | 14 +++++------
.../src/main/js/views/templates/tab.jade | 26 --------------------
7 files changed, 47 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/44906e5d/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index db9741a..12ba14a 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -1158,10 +1158,17 @@ label.required:after {
padding-right: 10px
}
-// Summary page
-#cfgResult textarea {
- font-family: monospace;
- font-size: 12px;
+.summary-tabs {
+ margin-top: 0.65em;
+}
+
+.summary-tab {
+ img {
+ margin-right: 5px;
+ height: 16px;
+ width: 16px;
+ float: left;
+ }
}
input[type="number"]::-webkit-outer-spin-button,
http://git-wip-us.apache.org/repos/asf/ignite/blob/44906e5d/modules/control-center-web/src/main/js/routes/generator/generator-properties.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-properties.js b/modules/control-center-web/src/main/js/routes/generator/generator-properties.js
index b427c53..3eeedfb 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-properties.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-properties.js
@@ -32,7 +32,7 @@ $generatorProperties = {};
* @returns {string} Generated content.
*/
$generatorProperties.dataSourcesProperties = function (cluster) {
- var res = exports.builder();
+ var res = $generatorCommon.builder();
var datasources = [];
http://git-wip-us.apache.org/repos/asf/ignite/blob/44906e5d/modules/control-center-web/src/main/js/routes/public.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/public.js b/modules/control-center-web/src/main/js/routes/public.js
index cd3822a..3d2ed54 100644
--- a/modules/control-center-web/src/main/js/routes/public.js
+++ b/modules/control-center-web/src/main/js/routes/public.js
@@ -33,11 +33,6 @@ router.get('/popover', function (req, res) {
res.render('templates/popover', {});
});
-// GET dynamic tabs template.
-router.get('/tab', function (req, res) {
- res.render('templates/tab', {});
-});
-
// GET confirmation dialog.
router.get('/confirm', function (req, res) {
res.render('templates/confirm', {});
http://git-wip-us.apache.org/repos/asf/ignite/blob/44906e5d/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 9da9a5d..c1b102f 100644
--- a/modules/control-center-web/src/main/js/routes/summary.js
+++ b/modules/control-center-web/src/main/js/routes/summary.js
@@ -24,6 +24,11 @@ var $generatorJava = require('./generator/generator-java');
var $generatorDocker = require('./generator/generator-docker');
var $generatorProperties = require('./generator/generator-properties');
+// GET template for summary tabs.
+router.get('/summary-tabs', function (req, res) {
+ res.render('configuration/summary-tabs', {});
+});
+
/* GET summary page. */
router.get('/', function (req, res) {
res.render('configuration/summary');
http://git-wip-us.apache.org/repos/asf/ignite/blob/44906e5d/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
new file mode 100644
index 0000000..a28e5a7
--- /dev/null
+++ b/modules/control-center-web/src/main/js/views/configuration/summary-tabs.jade
@@ -0,0 +1,23 @@
+//-
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ul.nav(ng-class='$navClass', role='tablist')
+ li(role='presentation' ng-repeat='$pane in $panes track by $index' ng-class='[ $isActive($pane, $index) ? $activeClass : "", $pane.disabled ? "disabled" : "" ]')
+ a.summary-tab(ng-switch='$pane.title' role='tab' data-toggle='tab' ng-click='!$pane.disabled && $setActive($pane.name || $index)' data-index='{{ $index }}' aria-controls='$pane.title') {{$pane.title}}
+ img(ng-switch-when='XML' src='/images/xml.png')
+ img(ng-switch-when='Java' src='/images/java.png')
+ img(ng-switch-when='Dockerfile' src='/images/docker.png')
+.tab-content(ng-transclude)
http://git-wip-us.apache.org/repos/asf/ignite/blob/44906e5d/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 404e1cf..1efb413 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,17 +60,17 @@ block content
a(bs-collapse-toggle) Server
button.btn.btn-primary.pull-right(type='submit' style='margin-top: -5px') Download
.panel-collapse(role='tabpanel' bs-collapse-target)
- div(ng-show='selectedItem' bs-tabs style='margin-top: 0.65em')
- div(title='<img src="/images/xml.png" width="16px" height="16px"/> XML' bs-pane)
+ .summary-tabs(bs-tabs ng-show='selectedItem' template='summary/summary-tabs')
+ div(bs-pane title='XML')
div(ui-ace='{ onLoad: aceInit, mode: "xml" }' ng-model='xmlServer')
- div(title='<img src="/images/java.png" width="16px" height="16px"/> Java' bs-pane)
+ div(bs-pane title='Java')
.details-row
.col-xs-2.col-sm-2.col-md-1
label Generate:
.col-xs-4.col-sm-3.col-md-3
button.form-control(type='button' ng-model='configServer.javaClassServer' bs-select data-placeholder='{{detail.placeholder}}' bs-options='item.value as item.label for item in javaClassItems' data-sort='false')
div(ui-ace='{ onLoad: aceInit, mode: "java" }' ng-model='javaServer')
- div(title='<img src="/images/docker.png" width="16px" height="16px"/> Dockerfile' bs-pane)
+ div(bs-pane title='Dockerfile')
.details-row
p
+hard-link('https://docs.docker.com/reference/builder', 'Docker')
@@ -99,10 +99,10 @@ block content
div(ng-show='selectedItem')
.details-row(ng-repeat='field in clientFields')
+form-row-custom(['col-xs-4 col-sm-4 col-md-3'], ['col-xs-4 col-sm-4 col-md-3'], 'backupItem')
- div(bs-tabs style='margin-top: 0.65em')
- div(title='<img src="/images/xml.png" width="16px" height="16px"/> XML' bs-pane)
+ .summary-tabs(bs-tabs template='summary/summary-tabs')
+ div(bs-pane title='XML')
div(ui-ace='{ onLoad: aceInit, mode: "xml" }' ng-model='xmlClient')
- div(title='<img src="/images/java.png" width="16px" height="16px"/> Java' bs-pane)
+ div(bs-pane title='Java')
.details-row
.col-xs-2.col-sm-2.col-md-1
label Generate:
http://git-wip-us.apache.org/repos/asf/ignite/blob/44906e5d/modules/control-center-web/src/main/js/views/templates/tab.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/tab.jade b/modules/control-center-web/src/main/js/views/templates/tab.jade
deleted file mode 100644
index 6c7afc5..0000000
--- a/modules/control-center-web/src/main/js/views/templates/tab.jade
+++ /dev/null
@@ -1,26 +0,0 @@
-//-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-ul.nav(ng-class='$navClass', role='tablist')
- li(role='presentation' ng-repeat='$pane in $panes track by $index' ng-class='[ $isActive($pane, $index) ? $activeClass : "", $pane.disabled ? "disabled" : "" ]')
- a(ng-if='$index == 0' role='tab' data-toggle='tab' ng-click='!$pane.disabled && $setActive($pane.name || $index)' data-index='{{ $index }}' aria-controls='$pane.title') {{$pane.title}}
- i.fa.fa-remove(ng-click='removeTab($index)' ng-if='$index > 0' style='margin-left: 5px')
- a(ng-if='$index > 0' role='tab' data-toggle='tab' ng-click='!$pane.disabled && $setActive($pane.name || $index)' data-index='{{ $index }}' aria-controls='$pane.title') {{$pane.title}}: {{$index}}
- i.fa.fa-remove(ng-click='removeTab($index)' style='margin-left: 5px')
- li.pull-right(bs-tooltip data-title='Add new query')
- a(role='tab' data-toggle='tab' ng-click='addTab()')
- i.fa.fa-plus
-.tab-content(ng-transclude)