IGNITE-9511 Web Console: Fixed issues with modals.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5fcd17e7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5fcd17e7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5fcd17e7 Branch: refs/heads/ignite-7251 Commit: 5fcd17e73cf628d599c29797a4dc05629a1a92d6 Parents: 1b3742f Author: Alexander Kalinin <verba...@yandex.ru> Authored: Tue Sep 18 11:19:05 2018 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Tue Sep 18 11:19:05 2018 +0700 ---------------------------------------------------------------------- .../activities-user-dialog.tpl.pug | 2 +- .../connected-clusters-dialog/template.tpl.pug | 3 +-- .../app/components/input-dialog/input-dialog.tpl.pug | 2 +- .../components/modal-preview-project/template.pug | 2 +- .../components/user-notifications/template.tpl.pug | 2 +- .../agent/components/cluster-login/template.pug | 2 +- .../frontend/app/modules/nodes/nodes-dialog.tpl.pug | 2 +- .../frontend/app/primitives/modal/index.scss | 14 ++++++++++++-- .../frontend/app/primitives/panel/index.scss | 8 ++++++++ .../frontend/views/templates/agent-download.tpl.pug | 2 +- .../frontend/views/templates/batch-confirm.tpl.pug | 2 +- .../frontend/views/templates/confirm.tpl.pug | 2 +- .../frontend/views/templates/demo-info.tpl.pug | 2 +- .../frontend/views/templates/message.tpl.pug | 9 +++++---- 14 files changed, 36 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/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 ffc72f1..7e9d3f5 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 @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. -.modal.modal--ignite(tabindex='-1' role='dialog') +.modal.modal--ignite.theme--ignite(tabindex='-1' role='dialog') .modal-dialog .modal-content .modal-header http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/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 f2eba38..5ea83fd 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.connected-clusters-dialog(tabindex='-1' role='dialog') +.modal.modal--ignite.theme-ignite.connected-clusters-dialog(tabindex='-1' role='dialog') .modal-dialog.modal-dialog--adjust-height form.modal-content(name='$ctrl.form' novalidate) .modal-header @@ -26,7 +26,6 @@ include /app/helpers/jade/mixins svg(ignite-icon="cross") .modal-body.modal-body-with-scroll .panel--ignite - ul.tabs.tabs--blue connected-clusters-list(data-options='$ctrl.clusters') .modal-footer http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/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 35031e2..50087e9 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,7 +16,7 @@ include /app/helpers/jade/mixins -.modal.modal--ignite(tabindex='-1' role='dialog') +.modal.modal--ignite.theme--ignite(tabindex='-1' role='dialog') .modal-dialog form.modal-content(name='ctrl.form' novalidate) .modal-header http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/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 c015400..536db28 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,7 +16,7 @@ include /app/helpers/jade/mixins -.modal.modal--ignite.center.modal-preview-project-structure(tabindex='-1' role='dialog') +.modal.modal--ignite.theme--ignite.center.modal-preview-project-structure(tabindex='-1' role='dialog') .modal-dialog .modal-content .modal-header http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/modules/web-console/frontend/app/components/user-notifications/template.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/user-notifications/template.tpl.pug b/modules/web-console/frontend/app/components/user-notifications/template.tpl.pug index 10cc6ac..a680dea 100644 --- a/modules/web-console/frontend/app/components/user-notifications/template.tpl.pug +++ b/modules/web-console/frontend/app/components/user-notifications/template.tpl.pug @@ -16,7 +16,7 @@ include /app/helpers/jade/mixins -.modal.modal--ignite(tabindex='-1' role='dialog') +.modal.modal--ignite.theme--ignite(tabindex='-1' role='dialog') .modal-dialog .modal-content .modal-header http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/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 d8a3af7..19ab6f4 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,7 +16,7 @@ include /app/helpers/jade/mixins -.modal.modal--ignite(tabindex='-1' role='dialog') +.modal.modal--ignite.theme--ignite(tabindex='-1' role='dialog') .modal-dialog -var form = '$ctrl.form' http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/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 2e4589a..7bd8c7a 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 @@ -30,7 +30,7 @@ span Cache Nodes span.badge.badge--blue {{ $ctrl.data.length }} - .panel--ignite + .panel--ignite.panel--ignite__without-border .grid.ui-grid--ignite(ui-grid='$ctrl.gridOptions' ui-grid-resize-columns ui-grid-selection ui-grid-pinning ui-grid-hovering) .modal-footer http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/modules/web-console/frontend/app/primitives/modal/index.scss ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/primitives/modal/index.scss b/modules/web-console/frontend/app/primitives/modal/index.scss index bc4dadd..2be2ecd 100644 --- a/modules/web-console/frontend/app/primitives/modal/index.scss +++ b/modules/web-console/frontend/app/primitives/modal/index.scss @@ -174,12 +174,22 @@ } .modal-body { - margin: 5px 20px; - padding: 0; + padding: 5px 20px; + margin: 0; .input-tip { padding-top: 0; } + + .modal-body--inner-content { + max-height: 300px; + overflow-x: auto; + + p { + text-align: left; + white-space: nowrap; + } + } } .modal-footer { http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/modules/web-console/frontend/app/primitives/panel/index.scss ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/primitives/panel/index.scss b/modules/web-console/frontend/app/primitives/panel/index.scss index 49737ad..6afcd5c 100644 --- a/modules/web-console/frontend/app/primitives/panel/index.scss +++ b/modules/web-console/frontend/app/primitives/panel/index.scss @@ -124,3 +124,11 @@ } } } + +// Adding top border for panels in modals +.modal-body { + .panel--ignite:not(.panel--ignite__without-border) { + border-top: 1px solid #d4d4d4; + border-radius: 4px 4px 0 0 ; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/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 e6f95d1..46acfed 100644 --- a/modules/web-console/frontend/views/templates/agent-download.tpl.pug +++ b/modules/web-console/frontend/views/templates/agent-download.tpl.pug @@ -16,7 +16,7 @@ include /app/helpers/jade/mixins -.modal.modal--ignite.center(tabindex='-1' role='dialog') +.modal.modal--ignite.theme--ignite.center(tabindex='-1' role='dialog') .modal-dialog(ng-switch='ctrl.status') .modal-content(ng-switch-when='agentMissing') .modal-header.header http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/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 a10be03..874979b 100644 --- a/modules/web-console/frontend/views/templates/batch-confirm.tpl.pug +++ b/modules/web-console/frontend/views/templates/batch-confirm.tpl.pug @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. -.modal.modal--ignite(tabindex='-1' role='dialog') +.modal.modal--ignite.theme--ignite(tabindex='-1' role='dialog') .modal-dialog .modal-content .modal-header http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/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 7ca7161..581aa37 100644 --- a/modules/web-console/frontend/views/templates/confirm.tpl.pug +++ b/modules/web-console/frontend/views/templates/confirm.tpl.pug @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. -.modal.modal--ignite(tabindex='-1' role='dialog') +.modal.modal--ignite.theme--ignite(tabindex='-1' role='dialog') .modal-dialog.modal-dialog--adjust-height .modal-content .modal-header http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/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 a5668cb..eab3274 100644 --- a/modules/web-console/frontend/views/templates/demo-info.tpl.pug +++ b/modules/web-console/frontend/views/templates/demo-info.tpl.pug @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. -.modal.modal--ignite.center(role='dialog') +.modal.modal--ignite.theme--ignite.center(role='dialog') .modal-dialog .modal-content #errors-container.modal-header.header http://git-wip-us.apache.org/repos/asf/ignite/blob/5fcd17e7/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 13cc7e5..bfe4c18 100644 --- a/modules/web-console/frontend/views/templates/message.tpl.pug +++ b/modules/web-console/frontend/views/templates/message.tpl.pug @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. -.modal.modal--ignite.center(tabindex='-1' role='dialog') +.modal.modal--ignite.theme--ignite.center(tabindex='-1' role='dialog') .modal-dialog .modal-content .modal-header @@ -23,9 +23,10 @@ h4.modal-title 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-body(ng-show='content') + .modal-body--inner-content + p(ng-bind-html='content.join("<br/>")') .modal-footer div(ng-show='meta') {{meta}} div - button#confirm-btn-confirm.btn-ignite.btn-ignite--success(ng-click='$hide()') Ok + button.btn-ignite.btn-ignite--success(ng-click='$hide()') Ok
