#ignite-843 Backport sql from ignite-1121
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9101d1f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9101d1f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9101d1f3 Branch: refs/heads/ignite-1121 Commit: 9101d1f366cb779d654f9e6dd31711c48748f807 Parents: f4e3a14 Author: Andrey <anovi...@gridgain.com> Authored: Thu Jul 23 18:10:55 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Jul 23 18:10:55 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/summary-controller.js | 6 ++ .../src/main/js/public/stylesheets/style.less | 39 +++++++++- .../src/main/js/routes/public.js | 4 +- .../main/js/views/configuration/summary.jade | 80 ++++++++++---------- .../src/main/js/views/includes/header.jade | 2 +- .../src/main/js/views/templates/layout.jade | 2 +- 6 files changed, 85 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9101d1f3/modules/web-control-center/src/main/js/controllers/summary-controller.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/src/main/js/controllers/summary-controller.js b/modules/web-control-center/src/main/js/controllers/summary-controller.js index 1291683..531dc83 100644 --- a/modules/web-control-center/src/main/js/controllers/summary-controller.js +++ b/modules/web-control-center/src/main/js/controllers/summary-controller.js @@ -52,6 +52,12 @@ controlCenterModule.controller('summaryController', ['$scope', '$http', '$common editor.setReadOnly(true); editor.setOption("highlightActiveLine", false); + var renderer = editor.renderer; + + renderer.setHighlightGutterLine(false); + renderer.setShowPrintMargin(false); + renderer.setOption('fontSize', '14px'); + editor.setTheme('ace/theme/chrome'); }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9101d1f3/modules/web-control-center/src/main/js/public/stylesheets/style.less ---------------------------------------------------------------------- diff --git a/modules/web-control-center/src/main/js/public/stylesheets/style.less b/modules/web-control-center/src/main/js/public/stylesheets/style.less index 850fc20..515371c 100644 --- a/modules/web-control-center/src/main/js/public/stylesheets/style.less +++ b/modules/web-control-center/src/main/js/public/stylesheets/style.less @@ -594,7 +594,7 @@ h1.ignite-logo { } .greedy { - min-height: 200px; + min-height: 100%; height: ~"calc(100vh - 290px)"; } @@ -814,6 +814,27 @@ button .caret, .btn .caret { } } +.theme-line table.sql-results { + [class*="col-"] { + padding-left: 0 !important; + padding-right: 0 !important; + } + + td { + padding: 3px 6px; + } + + > thead > tr > td { + padding: 3px 0; + } + + thead > tr > th { + padding: 3px 6px; + + line-height: @input-height; + } +} + .panel-title a { font-size: 14px; } @@ -1062,7 +1083,7 @@ input.ng-dirty.ng-invalid, button.ng-dirty.ng-invalid { margin-top: 10px; } -.configBox .nav > li > a { +.nav-tabs > li > a { padding: 5px 5px; } @@ -1175,7 +1196,19 @@ a { } .ace_editor, #ace_document { + margin: 0.65em 0 0 0; + width: 100%; height: 400px; -} + .ace_gutter { + background: transparent !important; + border: 1px #ddd; + border-right-style: solid; + } + + .ace_gutter-cell, .ace_folding-enabled > .ace_gutter-cell { + padding-left: 0.65em; + padding-right: 0.9em; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9101d1f3/modules/web-control-center/src/main/js/routes/public.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/src/main/js/routes/public.js b/modules/web-control-center/src/main/js/routes/public.js index 290ba90..b3cb983 100644 --- a/modules/web-control-center/src/main/js/routes/public.js +++ b/modules/web-control-center/src/main/js/routes/public.js @@ -24,7 +24,7 @@ router.get('/select', function (req, res) { res.render('templates/select', {}); }); -// GET tabs template. +// GET dynamic tabs template. router.get('/tab', function (req, res) { res.render('templates/tab', {}); }); @@ -34,7 +34,7 @@ router.get('/confirm', function (req, res) { res.render('templates/confirm', {}); }); -// GET save as dialog. +// GET copy dialog. router.get('/copy', function (req, res) { res.render('templates/copy', {}); }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9101d1f3/modules/web-control-center/src/main/js/views/configuration/summary.jade ---------------------------------------------------------------------- diff --git a/modules/web-control-center/src/main/js/views/configuration/summary.jade b/modules/web-control-center/src/main/js/views/configuration/summary.jade index 6f2f6d8..0370ef4 100644 --- a/modules/web-control-center/src/main/js/views/configuration/summary.jade +++ b/modules/web-control-center/src/main/js/views/configuration/summary.jade @@ -63,33 +63,32 @@ 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) - .panel-body - .configBox(ng-show='selectedItem' bs-tabs) - div(title='<img src="/images/xml.png" width="16px" height="16px"/> XML' bs-pane) - .configBox(ui-ace='{ onLoad: aceInit, mode: "xml" }' ng-model='xmlServer' style='margin: 0.65em 0;') - div(title='<img src="/images/java.png" width="16px" height="16px"/> Java' bs-pane) - .settings-row - .col-sm-1 - label Generate: - .col-sm-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') - .configBox(ui-ace='{ onLoad: aceInit, mode: "java" }' ng-model='javaServer') - div(title='<img src="/images/docker.png" width="16px" height="16px"/> Dockerfile' bs-pane) - .settings-row - p - +hard-link('https://docs.docker.com/reference/builder', 'Docker') - | file is a text file with instructions to create Docker image.<br/> - | To build image you have to store following Docker file with your Ignite XML configuration to the same directory.<br> - | Also you could use predefined - +hard-link('https://ignite.incubator.apache.org/download.html#docker', 'Apache Ignite docker image') - | . For more information about using Ignite with Docker please read - +hard-link('http://apacheignite.readme.io/docs/docker-deployment', 'documentation') - |. - .col-sm-2 - label(for='os') Operation System: - .col-sm-4 - input#os.form-control(type='text', ng-model='configServer.os' placeholder='debian:8' data-min-length="0" data-html="1" data-auto-select="true" data-animation="am-flip-x" bs-typeahead bs-options='os for os in oss') - div(ui-ace='{ onLoad: aceInit, mode: "dockerfile" }' ng-model='dockerServer') + 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) + div(ui-ace='{ onLoad: aceInit, mode: "xml" }' ng-model='xmlServer') + div(title='<img src="/images/java.png" width="16px" height="16px"/> Java' bs-pane) + .details-row + .col-sm-1 + label Generate: + .col-sm-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) + .details-row + p + +hard-link('https://docs.docker.com/reference/builder', 'Docker') + | file is a text file with instructions to create Docker image.<br/> + | To build image you have to store following Docker file with your Ignite XML configuration to the same directory.<br> + | Also you could use predefined + +hard-link('https://ignite.incubator.apache.org/download.html#docker', 'Apache Ignite docker image') + | . For more information about using Ignite with Docker please read + +hard-link('http://apacheignite.readme.io/docs/docker-deployment', 'documentation') + |. + .col-sm-2 + label(for='os') Operation System: + .col-sm-4 + input#os.form-control(type='text', ng-model='configServer.os' placeholder='debian:8' data-min-length="0" data-html="1" data-auto-select="true" data-animation="am-flip-x" bs-typeahead bs-options='os for os in oss') + div(ui-ace='{ onLoad: aceInit, mode: "dockerfile" }' ng-model='dockerServer') .padding-dflt(bs-collapse data-start-collapsed='false') .panel.panel-default form.panel-heading(role='tab' method='post' action='summary/download') @@ -101,17 +100,16 @@ block content a(bs-collapse-toggle) Client button.btn.btn-primary.pull-right(type='submit' style='margin-top: -5px') Download .panel-collapse(role="tabpanel" bs-collapse-target) - .panel-body - div(ng-show='selectedItem') - .settings-row(ng-repeat='field in clientFields') - +form-row-custom(['col-sm-3'], ['col-sm-3']) - .configBox(bs-tabs) - div(title='<img src="/images/xml.png" width="16px" height="16px"/> XML' bs-pane) - .configBox(ui-ace='{ onLoad: aceInit, mode: "xml" }' ng-model='xmlClient' style='margin: 0.65em 0;') - div(title='<img src="/images/java.png" width="16px" height="16px"/> Java' bs-pane) - .settings-row - .col-sm-1 - label Generate: - .col-sm-4 - button.form-control(type='button' ng-model='backupItem.javaClassClient' 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='javaClient') + div(ng-show='selectedItem') + .details-row(ng-repeat='field in clientFields') + +form-row-custom(['col-sm-3'], ['col-sm-3']) + div(bs-tabs style='margin-top: 0.65em') + div(title='<img src="/images/xml.png" width="16px" height="16px"/> XML' bs-pane) + div(ui-ace='{ onLoad: aceInit, mode: "xml" }' ng-model='xmlClient') + div(title='<img src="/images/java.png" width="16px" height="16px"/> Java' bs-pane) + .details-row + .col-sm-1 + label Generate: + .col-sm-4 + button.form-control(type='button' ng-model='backupItem.javaClassClient' 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='javaClient') http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9101d1f3/modules/web-control-center/src/main/js/views/includes/header.jade ---------------------------------------------------------------------- diff --git a/modules/web-control-center/src/main/js/views/includes/header.jade b/modules/web-control-center/src/main/js/views/includes/header.jade index ab2d31e..bfd5275 100644 --- a/modules/web-control-center/src/main/js/views/includes/header.jade +++ b/modules/web-control-center/src/main/js/views/includes/header.jade @@ -29,7 +29,7 @@ header.header(id='header') ul.nav.navbar-nav(ng-controller='activeLink' ng-show='user') +header-item('/configuration', '/configuration/clusters', 'Configuration') //+header-item('/monitoring', '/monitoring', 'Monitoring') - //+header-item('/sql', '/sql', 'SQL') + +header-item('/sql', '/sql', 'SQL') //+header-item('/deploy', '/deploy', 'Deploy') ul.nav.navbar-nav.pull-right li(ng-if='user') http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9101d1f3/modules/web-control-center/src/main/js/views/templates/layout.jade ---------------------------------------------------------------------- diff --git a/modules/web-control-center/src/main/js/views/templates/layout.jade b/modules/web-control-center/src/main/js/views/templates/layout.jade index a4191ae..8fbcd7e 100644 --- a/modules/web-control-center/src/main/js/views/templates/layout.jade +++ b/modules/web-control-center/src/main/js/views/templates/layout.jade @@ -49,7 +49,7 @@ html(ng-app='ignite-web-control-center', ng-init='user = #{JSON.stringify(user)} script(src='/common-module.js') script(src='/data-structures.js') - body.theme-line.body-overlap + body.theme-line.body-overlap.greedy .wrapper include ../includes/header
