Repository: ignite Updated Branches: refs/heads/master 023e2deee -> 308411678
IGNITE-9511 Web Console: Updated styling for modal windows. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30841167 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30841167 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30841167 Branch: refs/heads/master Commit: 30841167846e26a6bc253917d6c0d8812db6d87d Parents: 023e2de Author: Alexander Kalinin <[email protected]> Authored: Wed Sep 12 15:31:52 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Sep 12 15:31:52 2018 +0700 ---------------------------------------------------------------------- modules/web-console/frontend/app/app.js | 4 +- .../activities-user-dialog.controller.js | 8 ++- .../activities-user-dialog.tpl.pug | 28 ++++------ .../connected-clusters-dialog/template.tpl.pug | 7 +-- .../input-dialog/input-dialog.tpl.pug | 6 +-- .../modal-import-models/template.tpl.pug | 14 ++--- .../modal-preview-project/template.pug | 4 +- .../app/components/page-configure/style.scss | 7 ++- .../frontend/app/data/getting-started.json | 56 ++++++++++---------- .../app/modules/agent/AgentManager.service.js | 6 +++ .../agent/components/cluster-login/template.pug | 9 ++-- .../frontend/app/modules/demo/Demo.module.js | 17 +----- .../getting-started/GettingStarted.provider.js | 16 +++--- .../app/modules/nodes/nodes-dialog.tpl.pug | 9 ++-- .../frontend/public/stylesheets/style.scss | 13 +++++ .../frontend/views/sql/paragraph-rate.tpl.pug | 41 +++++++++----- .../views/templates/agent-download.tpl.pug | 11 ++-- .../views/templates/batch-confirm.tpl.pug | 4 +- .../frontend/views/templates/confirm.tpl.pug | 5 +- .../frontend/views/templates/demo-info.tpl.pug | 14 ++--- .../views/templates/getting-started.tpl.pug | 31 ++++++----- .../frontend/views/templates/message.tpl.pug | 12 +++-- 22 files changed, 182 insertions(+), 140 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/app.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js index e422e33..4a049d4 100644 --- a/modules/web-console/frontend/app/app.js +++ b/modules/web-console/frontend/app/app.js @@ -71,7 +71,6 @@ import igniteUiAceDocker from './directives/ui-ace-docker/ui-ace-docker.directiv import igniteUiAceTabs from './directives/ui-ace-tabs.directive'; import igniteRetainSelection from './directives/retain-selection.directive'; import btnIgniteLink from './directives/btn-ignite-link'; -import exposeInput from './components/expose-ignite-form-field-control'; // Services. import ChartColors from './services/ChartColors.service'; @@ -148,6 +147,7 @@ import progressLine from './components/progress-line'; import formField from './components/form-field'; import igniteChart from './components/ignite-chart'; import igniteChartSelector from './components/ignite-chart-series-selector'; +import igniteStatus from './components/ignite-status'; import pageProfile from './components/page-profile'; import pagePasswordChanged from './components/page-password-changed'; @@ -245,7 +245,6 @@ export default angular.module('ignite-console', [ connectedClustersDialog.name, igniteListOfRegisteredUsers.name, pageProfile.name, - exposeInput.name, pageLanding.name, pagePasswordChanged.name, pagePasswordReset.name, @@ -258,6 +257,7 @@ export default angular.module('ignite-console', [ passwordVisibility.name, igniteChart.name, igniteChartSelector.name, + igniteStatus.name, progressLine.name, formField.name ]) http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js index 078f725..fb9d15a 100644 --- a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js +++ b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.controller.js @@ -22,6 +22,12 @@ export default class ActivitiesCtrl { const $ctrl = this; $ctrl.user = user; - $ctrl.data = _.map(user.activitiesDetail, (amount, action) => ({ action, amount })); + $ctrl.data = _.map(user.activitiesDetail, (amount, action) => ({action, amount})); + + $ctrl.columnDefs = [ + { displayName: 'Description', field: 'action', enableFiltering: false, cellFilter: 'translate'}, + { displayName: 'Action', field: 'action', enableFiltering: false}, + { displayName: 'Visited', field: 'amount', enableFiltering: false} + ]; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug index 33d5f62..ffc72f1 100644 --- a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug +++ b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug @@ -18,25 +18,17 @@ .modal-dialog .modal-content .modal-header - h4.modal-title - i.fa.fa-info-circle - | Activity details: {{ ctrl.user.userName }} + h4.modal-title Activity details: {{ ctrl.user.userName }} button.close(type='button' aria-label='Close' ng-click='$hide()') svg(ignite-icon='cross') - .modal-body.modal-body-with-scroll(id='activities-user-dialog') + .modal-body.modal-body-with-scroll .panel--ignite - table.table--ignite(scrollable-container='#activities-user-dialog' st-table='displayedRows' st-safe-src='ctrl.data') - thead - th(st-sort='action | translate') Description - th(st-sort='action') Action - th(st-sort='amount') Visited - tbody - tr(ng-repeat='row in displayedRows') - td - .text-overflow {{ row.action | translate }} - td - .text-overflow {{ row.action }} - td.text-right - .text-overflow {{ row.amount }} + ignite-grid-table( + items='ctrl.data' + column-defs='ctrl.columnDefs' + grid-thin='true' + ) + .modal-footer - button.btn-ignite.btn-ignite--success(id='confirm-btn-confirm' ng-click='$hide()') Close + div + button.btn-ignite.btn-ignite--success(ng-click='$hide()') Close http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/components/connected-clusters-dialog/template.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/connected-clusters-dialog/template.tpl.pug b/modules/web-console/frontend/app/components/connected-clusters-dialog/template.tpl.pug index dd7b4fc..f2eba38 100644 --- a/modules/web-console/frontend/app/components/connected-clusters-dialog/template.tpl.pug +++ b/modules/web-console/frontend/app/components/connected-clusters-dialog/template.tpl.pug @@ -16,7 +16,7 @@ include /app/helpers/jade/mixins -.modal.modal--ignite.theme--ignite.connected-clusters-dialog(tabindex='-1' role='dialog') +.modal.modal--ignite.connected-clusters-dialog(tabindex='-1' role='dialog') .modal-dialog.modal-dialog--adjust-height form.modal-content(name='$ctrl.form' novalidate) .modal-header @@ -30,5 +30,6 @@ include /app/helpers/jade/mixins connected-clusters-list(data-options='$ctrl.clusters') .modal-footer - button.btn-ignite.btn-ignite--success(type='button' ng-click='$hide()') Ok - + div + button.btn-ignite.btn-ignite--success(type='button' ng-click='$hide()') Ok + http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/components/input-dialog/input-dialog.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/input-dialog/input-dialog.tpl.pug b/modules/web-console/frontend/app/components/input-dialog/input-dialog.tpl.pug index 60467c9..35031e2 100644 --- a/modules/web-console/frontend/app/components/input-dialog/input-dialog.tpl.pug +++ b/modules/web-console/frontend/app/components/input-dialog/input-dialog.tpl.pug @@ -16,11 +16,11 @@ include /app/helpers/jade/mixins -.modal.modal--ignite.theme--ignite(tabindex='-1' role='dialog') +.modal.modal--ignite(tabindex='-1' role='dialog') .modal-dialog form.modal-content(name='ctrl.form' novalidate) .modal-header - h4.modal-title + h4.modal-title i.fa.fa-clone span {{ ctrl.title }} button.close(type='button' aria-label='Close' ng-click='$hide()') @@ -36,7 +36,7 @@ include /app/helpers/jade/mixins required: true, placeholder: 'Enter value' })( - data-ignite-form-field-input-autofocus='true' + ignite-form-field-input-autofocus='true' ignite-on-enter='form.$valid && ctrl.confirm()' ) http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/template.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/template.tpl.pug b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/template.tpl.pug index 7c33120..8aef347 100644 --- a/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/template.tpl.pug +++ b/modules/web-console/frontend/app/components/page-configure/components/modal-import-models/template.tpl.pug @@ -29,10 +29,10 @@ mixin td-ellipses-lbl(w, lbl) #errors-container.modal-header.header button.close(type='button' ng-click='$hide()' aria-hidden='true') svg(ignite-icon="cross") - h4.modal-title() + h4.modal-title() span(ng-if='!importDomain.demo') Import domain models from database span(ng-if='importDomain.demo') Import domain models from demo database - .modal-body.theme--ignite + .modal-body modal-import-models-step-indicator( steps='$ctrl.actions' current-step='importDomain.action' @@ -74,19 +74,21 @@ mixin td-ellipses-lbl(w, lbl) label: 'JDBC driver:', model: 'selectedPreset.jdbcDriverClass', name: '"jdbcDriverClass"', - enabled: true, required: true, tip: 'Fully qualified class name of JDBC driver that will be used to connect to database' }) .pc-form-grid-col-60 - +form-field__text--autofocus({ + +form-field__text({ label: 'JDBC URL:', model: 'selectedPreset.jdbcUrl', name: '"jdbcUrl"', required: true, placeholder: 'JDBC URL', tip: 'JDBC URL for connecting to database<br>Refer to your database documentation for details' - }) + })( + ignite-form-field-input-autofocus='true' + ) + .pc-form-grid-col-30 +form-field__text({ label: 'User:', @@ -98,7 +100,7 @@ mixin td-ellipses-lbl(w, lbl) +form-field__password({ label: 'Password:', model: 'selectedPreset.password', - name: '"jdbcPassword"', + name: '"jdbcPassword"', tip: 'Password for connecting to database<br>Note, password would not be saved in preferences for security reasons' })( ignite-on-enter='importDomainNext()' http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/components/page-configure/components/modal-preview-project/template.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/components/modal-preview-project/template.pug b/modules/web-console/frontend/app/components/page-configure/components/modal-preview-project/template.pug index 6917cb4..c015400 100644 --- a/modules/web-console/frontend/app/components/page-configure/components/modal-preview-project/template.pug +++ b/modules/web-console/frontend/app/components/page-configure/components/modal-preview-project/template.pug @@ -16,11 +16,11 @@ include /app/helpers/jade/mixins -.modal.modal--ignite.theme--ignite.center.modal-preview-project-structure(tabindex='-1' role='dialog') +.modal.modal--ignite.center.modal-preview-project-structure(tabindex='-1' role='dialog') .modal-dialog .modal-content .modal-header - h4.modal-title + h4.modal-title svg(ignite-icon="structure") span See Project Structure button.close(type='button' aria-label='Close' ng-click='$ctrl.onHide()') http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/components/page-configure/style.scss ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure/style.scss b/modules/web-console/frontend/app/components/page-configure/style.scss index be19e8a..851eddf 100644 --- a/modules/web-console/frontend/app/components/page-configure/style.scss +++ b/modules/web-console/frontend/app/components/page-configure/style.scss @@ -103,6 +103,11 @@ page-configure { margin-left: 10px !important; } } + + .form-field__label.required:after { + content: '*'; + margin-left: 0.25em; + } } .pc-form-group { @@ -307,4 +312,4 @@ list-editable .pc-form-group__text-title { align-items: center; background: white; z-index: 2; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/data/getting-started.json ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/data/getting-started.json b/modules/web-console/frontend/app/data/getting-started.json index 1802b55..58ca367 100644 --- a/modules/web-console/frontend/app/data/getting-started.json +++ b/modules/web-console/frontend/app/data/getting-started.json @@ -2,11 +2,11 @@ { "title": "With Apache Ignite Web Console You Can", "message": [ - "<div class='col-xs-4'>", - " <img src='/images/ignite-puzzle.png' width='80%' class='getting-started-puzzle' />", + "<div class='col-40 align-center'>", + " <img src='/images/ignite-puzzle.png' width='170px' class='getting-started-puzzle' />", "</div>", - "<div class='col-xs-8'>", - " <ul>", + "<div class='col-60'>", + " <ul class='align-top'>", " <li>Generate cluster configuration</li>", " <li>Import domain model from database</li>", " <li>Configure all needed caches</li>", @@ -20,11 +20,11 @@ { "title": "Quick cluster configuration", "message": [ - "<div class='col-xs-7'>", + "<div class='col-60'>", " <img src='/images/cluster-quick.png' width='100%' />", "</div>", - "<div class='col-xs-5'>", - " <ul>", + "<div class='col-40'>", + " <ul class='align-top'>", " <li>Quick configuration of cluster and it's caches</li>", " </ul>", "</div>" @@ -33,11 +33,11 @@ { "title": "Clusters", "message": [ - "<div class='col-xs-7'>", + "<div class='col-60'>", " <img src='/images/cluster.png' width='100%' />", "</div>", - "<div class='col-xs-5'>", - " <ul>", + "<div class='col-40'>", + " <ul class='align-top'>", " <li>Configure cluster properties</li>", " </ul>", "</div>" @@ -46,11 +46,11 @@ { "title": "Domain Model", "message": [ - "<div class='col-xs-7'>", + "<div class='col-60'>", " <img src='/images/domains.png' width='100%' />", "</div>", - "<div class='col-xs-5'>", - " <ul>", + "<div class='col-40'>", + " <ul class='align-top'>", " <li>Import database schemas</li>", " <li>Try in <span class='getting-started-demo'>Demo</span> mode</li>", " </ul>", @@ -60,11 +60,11 @@ { "title": "Caches", "message": [ - "<div class='col-xs-7'>", + "<div class='col-60'>", " <img src='/images/cache.png' width='100%' />", "</div>", - "<div class='col-xs-5'>", - " <ul>", + "<div class='col-40'>", + " <ul class='align-top'>", " <li>Configure memory settings</li>", " </ul>", "</div>" @@ -73,11 +73,11 @@ { "title": "In-memory File System", "message": [ - "<div class='col-xs-7'>", + "<div class='col-60'>", " <img src='/images/igfs.png' width='100%' />", "</div>", - "<div class='col-xs-5'>", - " <ul>", + "<div class='col-40'>", + " <ul class='align-top'>", " <li>Configure IGFS properties</li>", " </ul>", "</div>" @@ -86,11 +86,11 @@ { "title": "Preview configuration result", "message": [ - "<div class='col-xs-7'>", + "<div class='col-60'>", " <img src='/images/preview.png' width='100%' />", "</div>", - "<div class='col-xs-5'>", - " <ul>", + "<div class='col-40'>", + " <ul class='align-top'>", " <li>Preview configured project files</li>", " <li>Download configured project files</li>", " </ul>", @@ -100,11 +100,11 @@ { "title": "SQL Queries", "message": [ - "<div class='col-xs-7'>", + "<div class='col-60'>", " <img src='/images/query-table.png' width='100%' />", "</div>", - "<div class='col-xs-5'>", - " <ul>", + "<div class='col-40'>", + " <ul class='align-top'>", " <li>Execute SQL Queries</li>", " <li>View Execution Paln</li>", " <li>View In-Memory Schema</li>", @@ -116,11 +116,11 @@ { "title": "Multicluster support", "message": [ - "<div class='col-xs-7'>", + "<div class='col-60'>", " <img src='/images/multicluster.png' width='100%' />", "</div>", - "<div class='col-xs-5'>", - " <ul>", + "<div class='col-40'>", + " <ul class='align-top'>", " <li>Execute queries on different clusters</li>", " </ul>", "</div>" http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/modules/agent/AgentManager.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js index e06a7a7..22079c1 100644 --- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js +++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js @@ -22,6 +22,7 @@ import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import 'rxjs/add/operator/first'; import 'rxjs/add/operator/partition'; import 'rxjs/add/operator/takeUntil'; +import 'rxjs/add/operator/pluck'; import AgentModal from './AgentModal.service'; // @ts-ignore @@ -167,6 +168,11 @@ export default class AgentManager { .distinctUntilChanged(({ cluster }) => prevCluster === cluster) .do(({ cluster }) => prevCluster = cluster); + this.clusterIsActive$ = this.connectionSbj + .map(({ cluster }) => cluster) + .filter((cluster) => Boolean(cluster)) + .pluck('active'); + if (!this.isDemoMode()) { this.connectionSbj.subscribe({ next: ({cluster}) => { http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug b/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug index c6bc474..d8a3af7 100644 --- a/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug +++ b/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug @@ -16,14 +16,13 @@ include /app/helpers/jade/mixins -.modal.modal--ignite.theme--ignite(tabindex='-1' role='dialog') +.modal.modal--ignite(tabindex='-1' role='dialog') .modal-dialog -var form = '$ctrl.form' form.modal-content(name=form novalidate ng-submit='$ctrl.login()') .modal-header h4.modal-title - i.icon-confirm span Cluster Authentication button.close(type='button' aria-label='Close' ng-click='$ctrl.onHide()') svg(ignite-icon="cross") @@ -53,5 +52,7 @@ include /app/helpers/jade/mixins autocomplete='node-password' ) .modal-footer - button#btn-cancel.btn-ignite.btn-ignite--link-success(type='button' ng-click='$ctrl.onHide()') Cancel - button#btn-login.btn-ignite.btn-ignite--success Login + div + button#btn-cancel.btn-ignite.btn-ignite--link-success(type='button' ng-click='$ctrl.onHide()') Cancel + button#btn-login.btn-ignite.btn-ignite--success Login + http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/modules/demo/Demo.module.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/demo/Demo.module.js b/modules/web-console/frontend/app/modules/demo/Demo.module.js index 8cefcd5..96d409f 100644 --- a/modules/web-console/frontend/app/modules/demo/Demo.module.js +++ b/modules/web-console/frontend/app/modules/demo/Demo.module.js @@ -140,27 +140,14 @@ angular backdrop: 'static' }); + scope.downloadAgentHref = '/api/v1/downloads/agent'; + scope.close = () => { dialog.hide(); closePromise && closePromise.resolve(); }; - scope.downloadAgent = () => { - const lnk = document.createElement('a'); - - lnk.setAttribute('href', '/api/v1/agent/downloads/agent'); - lnk.setAttribute('target', '_self'); - lnk.setAttribute('download', null); - lnk.style.display = 'none'; - - document.body.appendChild(lnk); - - lnk.click(); - - document.body.removeChild(lnk); - }; - return { show: () => { closePromise = $q.defer(); http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/modules/getting-started/GettingStarted.provider.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/getting-started/GettingStarted.provider.js b/modules/web-console/frontend/app/modules/getting-started/GettingStarted.provider.js index 2608bd2..09b65f4 100644 --- a/modules/web-console/frontend/app/modules/getting-started/GettingStarted.provider.js +++ b/modules/web-console/frontend/app/modules/getting-started/GettingStarted.provider.js @@ -54,11 +54,15 @@ angular const scope = $root.$new(); scope.ui = { - showGettingStarted: false + dontShowGettingStarted: false }; function _fillPage() { - scope.title = _model[_page].title; + if (_page === 0) + scope.title = `${_model[_page].title}`; + else + scope.title = `${_page}. ${_model[_page].title}`; + scope.message = _model[_page].message.join(' '); } @@ -82,7 +86,7 @@ angular scope.close = () => { try { - localStorage.showGettingStarted = scope.ui.showGettingStarted; + localStorage.showGettingStarted = !scope.ui.dontShowGettingStarted; } catch (ignore) { // No-op. @@ -94,14 +98,14 @@ angular return { tryShow: (force) => { try { - scope.ui.showGettingStarted = _.isNil(localStorage.showGettingStarted) - || localStorage.showGettingStarted === 'true'; + scope.ui.dontShowGettingStarted = !(_.isNil(localStorage.showGettingStarted) + || localStorage.showGettingStarted === 'true'); } catch (ignore) { // No-op. } - if (force || scope.ui.showGettingStarted) { + if (force || !scope.ui.dontShowGettingStarted) { _page = 0; _fillPage(); http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug b/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug index 22f3b1d..2e4589a 100644 --- a/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug +++ b/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. -.modal.modal--ignite.theme--ignite.ignite-nodes-dialog(tabindex='-1' role='dialog') +.modal.modal--ignite.ignite-nodes-dialog(tabindex='-1' role='dialog') .modal-dialog.modal-dialog--adjust-height form.modal-content .modal-header @@ -34,8 +34,9 @@ .grid.ui-grid--ignite(ui-grid='$ctrl.gridOptions' ui-grid-resize-columns ui-grid-selection ui-grid-pinning ui-grid-hovering) .modal-footer - button.pull-left.btn-ignite(disabled) + div grid-item-selected(class='pull-left' grid-api='$ctrl.gridApi') - button.btn-ignite.btn-ignite--link-success(id='confirm-btn-close' ng-click='$cancel()') Cancel - button.btn-ignite.btn-ignite--success(id='confirm-btn-confirm' ng-click='$ok($ctrl.selected)' ng-disabled='$ctrl.selected.length === 0') Select node + div + button.btn-ignite.btn-ignite--link-success(id='confirm-btn-close' ng-click='$cancel()') Cancel + button.btn-ignite.btn-ignite--success(id='confirm-btn-confirm' ng-click='$ok($ctrl.selected)' ng-disabled='$ctrl.selected.length === 0') Select node http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/public/stylesheets/style.scss b/modules/web-console/frontend/public/stylesheets/style.scss index 1088706..a00a585 100644 --- a/modules/web-console/frontend/public/stylesheets/style.scss +++ b/modules/web-console/frontend/public/stylesheets/style.scss @@ -1752,7 +1752,20 @@ treecontrol.tree-classic { } .getting-started { + min-height: 240px; margin: 15px 15px 300px; + + ul { + line-height: 20px; + } + + [class*="col-"] { + align-self: flex-start !important; + } + + .align-center { + justify-content: center !important; + } } .getting-started-demo { http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/views/sql/paragraph-rate.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/sql/paragraph-rate.tpl.pug b/modules/web-console/frontend/views/sql/paragraph-rate.tpl.pug index 2933a3e..bd65208 100644 --- a/modules/web-console/frontend/views/sql/paragraph-rate.tpl.pug +++ b/modules/web-console/frontend/views/sql/paragraph-rate.tpl.pug @@ -14,18 +14,33 @@ See the License for the specific language governing permissions and limitations under the License. -.popover.settings(tabindex='-1' style='width: 200px') - .arrow - h3.popover-title(style='color: black') Refresh rate - button.close(id='paragraph-rate-close' ng-click='$hide()') × +.popover.settings.refresh-rate(tabindex='-1') + h3.popover-title Refresh rate + button.close(ng-click='$hide()') + svg(ignite-icon='cross') .popover-content - form(name='popoverForm' novalidate) - .form-group(style='padding: 5px') - .col-sm-4 - input.form-control(id='paragraph-rate' ng-init='value = paragraph.rate.value' ng-model='value' type='number' min='1' required ignite-auto-focus) - .col-sm-8(style='padding-left: 5px') - button.form-control.select-toggle(id='paragraph-unit' ng-init='unit = paragraph.rate.unit' ng-model='unit' required placeholder='Time unit' bs-select bs-options='item.value as item.label for item in timeUnit' tabindex='0') - .form-actions(style='margin-top: 30px; padding: 5px') - button.btn.btn-primary(id='paragraph-rate-start' ng-disabled='popoverForm.$invalid' ng-click='startRefresh(paragraph, value, unit); $hide()') Start - button.btn.btn-primary.btn-default(id='paragraph-rate-stop' ng-click='stopRefresh(paragraph); $hide()' ng-disabled='!paragraph.rate.installed') Stop + form.theme--ignite(name='popoverForm' novalidate ng-init='refreshRate = {}') + .form-field.form-field__text.ignite-form-field + .form-field__control + input(ng-init='refreshRate.value = paragraph.rate.value' ng-model='refreshRate.value' type='number' min='1' required ignite-auto-focus) + .form-field__control + button.select-toggle(ng-init='refreshRate.unit = paragraph.rate.unit' ng-model='refreshRate.unit' required placeholder='Time unit' bs-select bs-options='item.value as item.label for item in timeUnit' tabindex='0') + .form-field.form-field__text.ignite-form-field + .actions + button.btn-ignite.btn-ignite--primary( + ng-disabled='popoverForm.$invalid' + ng-click='startRefresh(paragraph, refreshRate.value, refreshRate.unit); $hide()' + ng-hide='paragraph.rate.installed' + ) Start + + button.btn-ignite.btn-ignite--primary( + ng-disabled='popoverForm.$invalid || (refreshRate.unit === paragraph.rate.unit && refreshRate.value === paragraph.rate.value)' + ng-click='startRefresh(paragraph, refreshRate.value, refreshRate.unit); $hide()' + ng-hide='!paragraph.rate.installed' + ) Start new + + button.btn-ignite.btn-ignite--primary( + ng-click='stopRefresh(paragraph); $hide()' + ng-hide='!paragraph.rate.installed' + ) Stop http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/views/templates/agent-download.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/templates/agent-download.tpl.pug b/modules/web-console/frontend/views/templates/agent-download.tpl.pug index 4da9fad..e6f95d1 100644 --- a/modules/web-console/frontend/views/templates/agent-download.tpl.pug +++ b/modules/web-console/frontend/views/templates/agent-download.tpl.pug @@ -16,12 +16,11 @@ include /app/helpers/jade/mixins -.modal.modal--ignite.theme--ignite.center(tabindex='-1' role='dialog') +.modal.modal--ignite.center(tabindex='-1' role='dialog') .modal-dialog(ng-switch='ctrl.status') .modal-content(ng-switch-when='agentMissing') .modal-header.header h4.modal-title - i.fa.fa-download span Connection to Ignite Web Agent is not established .modal-body.agent-download p Please download and run #[a(href='/api/v1/downloads/agent' target='_self') ignite-web-agent] to use this functionality: @@ -45,8 +44,9 @@ include /app/helpers/jade/mixins ) .modal-footer - button.btn-ignite.btn-ignite--link-success(ng-click='ctrl.back()') {{::ctrl.backText}} - a.btn-ignite.btn-ignite--success(href='/api/v1/downloads/agent' target='_self') Download agent + div + button.btn-ignite.btn-ignite--link-success(ng-click='ctrl.back()') {{::ctrl.backText}} + a.btn-ignite.btn-ignite--success(href='/api/v1/downloads/agent' target='_self') Download agent .modal-content(ng-switch-when='nodeMissing') .modal-header.header @@ -65,4 +65,5 @@ include /app/helpers/jade/mixins li Refer to #[b README.txt] in the ignite-web-agent folder for more information. .modal-footer - button.btn-ignite.btn-ignite--link-success(ng-click='ctrl.back()') {{::ctrl.backText}} + div + button.btn-ignite.btn-ignite--link-success(ng-click='ctrl.back()') {{::ctrl.backText}} http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/views/templates/batch-confirm.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/templates/batch-confirm.tpl.pug b/modules/web-console/frontend/views/templates/batch-confirm.tpl.pug index ad8741b..a10be03 100644 --- a/modules/web-console/frontend/views/templates/batch-confirm.tpl.pug +++ b/modules/web-console/frontend/views/templates/batch-confirm.tpl.pug @@ -14,11 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. -.modal.modal--ignite.theme--ignite(tabindex='-1' role='dialog') +.modal.modal--ignite(tabindex='-1' role='dialog') .modal-dialog .modal-content .modal-header - h4.modal-title + h4.modal-title svg(ignite-icon='attention') | Confirmation button.close(type='button' aria-label='Close' ng-click='cancel()') http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/views/templates/confirm.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/templates/confirm.tpl.pug b/modules/web-console/frontend/views/templates/confirm.tpl.pug index d0e40dd..7ca7161 100644 --- a/modules/web-console/frontend/views/templates/confirm.tpl.pug +++ b/modules/web-console/frontend/views/templates/confirm.tpl.pug @@ -14,12 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. -.modal.modal--ignite.theme--ignite(tabindex='-1' role='dialog') +.modal.modal--ignite(tabindex='-1' role='dialog') .modal-dialog.modal-dialog--adjust-height .modal-content .modal-header - h4.modal-title - i.icon-confirm + h4.modal-title span Confirmation button.close(type='button' aria-label='Close' ng-click='confirmCancel()') svg(ignite-icon="cross") http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/views/templates/demo-info.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/templates/demo-info.tpl.pug b/modules/web-console/frontend/views/templates/demo-info.tpl.pug index 62642b3..a5668cb 100644 --- a/modules/web-console/frontend/views/templates/demo-info.tpl.pug +++ b/modules/web-console/frontend/views/templates/demo-info.tpl.pug @@ -14,13 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. -.modal.center(role='dialog') +.modal.modal--ignite.center(role='dialog') .modal-dialog .modal-content #errors-container.modal-header.header - button.close(ng-click='close()' aria-hidden='true') × + button.close(ng-click='close()' aria-hidden='true') + svg(ignite-icon="cross") h4.modal-title - i.fa.fa-info-circle + svg(ignite-icon="attention") | {{title}} .modal-body div(ng-bind-html='message') @@ -32,7 +33,7 @@ | How To Start Demo ul li - a(ng-click='downloadAgent()') #[b Download] + a(ng-href='{{downloadAgentHref}}' target='_self') #[b Download] | and unzip ignite-web-agent archive li #[b Run] shell file ignite-web-agent.{sh|bat} div(ng-show='hasAgents') @@ -43,5 +44,6 @@ li Web Agent is already started li Close dialog and try Web Console .modal-footer - button.btn.btn-default(ng-class='hasAgents ? "btn-primary" : "btn-default"' ng-click='close()') Close - a.btn.btn-primary(ng-hide='hasAgents' href='/api/v1/downloads/agent' target='_self') Download agent + div + a.btn-ignite.btn-ignite--link-success(ng-hide='hasAgents' ng-href='{{downloadAgentHref}}' target='_self') Download agent + button.btn-ignite.btn-ignite--success(ng-class='hasAgents ? "btn-primary" : "btn-default"' ng-click='close()') Close http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/views/templates/getting-started.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/templates/getting-started.tpl.pug b/modules/web-console/frontend/views/templates/getting-started.tpl.pug index 3a89035..8b0a03c 100644 --- a/modules/web-console/frontend/views/templates/getting-started.tpl.pug +++ b/modules/web-console/frontend/views/templates/getting-started.tpl.pug @@ -14,21 +14,26 @@ See the License for the specific language governing permissions and limitations under the License. -.modal.center(role='dialog') +include /app/helpers/jade/mixins + +.modal.modal--ignite.theme--ignite.center(role='dialog') .modal-dialog .modal-content #errors-container.modal-header.header - button.close(ng-click='close()' aria-hidden='true') × - h4.modal-title - i.fa.fa-book + button.close(ng-click='close()' aria-hidden='true') + svg(ignite-icon="cross") + h4.modal-title | {{title}} - .getting-started - .col-xs-12(ng-bind-html='message') + .modal-body + .getting-started.row(ng-bind-html='message') .modal-footer - .checkbox - label - input(type='checkbox' ng-model='ui.showGettingStarted') - | Show getting started on next login - a.btn.btn-primary(ng-disabled='isFirst()' ng-click='!isFirst() && prev()') Prev - a.btn.btn-primary(ng-disabled='isLast()' ng-click='!isLast() && next()') Next - a.btn.btn-primary(ng-click='close()') Close + div + +form-field__checkbox({ + label: 'Do not show this window again', + model: 'ui.dontShowGettingStarted', + name: '"dontShowGettingStarted"' + }) + div + a.btn-ignite.btn-ignite--link-success(ng-disabled='isFirst()' ng-click='!isFirst() && prev()') Prev + a.btn-ignite.btn-ignite--link-success(ng-disabled='isLast()' ng-click='!isLast() && next()') Next + a.btn-ignite.btn-ignite--success(ng-click='close()') Close http://git-wip-us.apache.org/repos/asf/ignite/blob/30841167/modules/web-console/frontend/views/templates/message.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/templates/message.tpl.pug b/modules/web-console/frontend/views/templates/message.tpl.pug index 3cdb3c8..13cc7e5 100644 --- a/modules/web-console/frontend/views/templates/message.tpl.pug +++ b/modules/web-console/frontend/views/templates/message.tpl.pug @@ -14,16 +14,18 @@ See the License for the specific language governing permissions and limitations under the License. -.modal(tabindex='-1' role='dialog') +.modal.modal--ignite.center(tabindex='-1' role='dialog') .modal-dialog .modal-content .modal-header - button.close(ng-click='$hide()' aria-hidden='true') × + button.close(ng-click='$hide()' aria-hidden='true') + svg(ignite-icon="cross") h4.modal-title - i.fa.fa-info-circle + svg(ignite-icon="attention") | {{title}} .modal-body(ng-show='content' style='overflow: auto; max-height: 300px;') p(ng-bind-html='content.join("<br/>")' style='text-align: left; white-space: nowrap;') .modal-footer - .pull-left(ng-show='meta') {{meta}} - button.btn.btn-primary(id='confirm-btn-confirm' ng-click='$hide()') Ok + div(ng-show='meta') {{meta}} + div + button#confirm-btn-confirm.btn-ignite.btn-ignite--success(ng-click='$hide()') Ok
