Repository: ignite Updated Branches: refs/heads/ignite-843 bd3d0c341 -> fcf310174
IGNITE-843: CSS tweaks and tooltips for buttons. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fcf31017 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fcf31017 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fcf31017 Branch: refs/heads/ignite-843 Commit: fcf3101743ce018baac0ed1eb78bf9301d2e43b0 Parents: bd3d0c3 Author: Alexey Kuznetsov <[email protected]> Authored: Tue Sep 1 17:38:45 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Sep 1 17:38:45 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/public/stylesheets/style.scss | 26 ++++++++++++++++++-- .../src/main/js/views/configuration/caches.jade | 8 +++--- .../main/js/views/configuration/clusters.jade | 8 +++--- .../main/js/views/configuration/metadata.jade | 11 ++++++--- .../src/main/js/views/includes/controls.jade | 14 +++++++---- 5 files changed, 50 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fcf31017/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 29eb5e7..53c3d4c 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 @@ -706,7 +706,7 @@ div.affix.padding-top-dflt { } .group-content-empty { - color: $ignite-placeholder-color; + color: $input-color-placeholder; padding-top: 5px; position: relative; @@ -719,6 +719,10 @@ div.affix.padding-top-dflt { border-right-color: $brand-primary; } +.tooltip.bottom .tooltip-arrow { + border-bottom-color: $brand-primary; +} + .tooltip > .tooltip-inner { max-width: 400px; text-align: left; @@ -966,6 +970,14 @@ input.ng-dirty.ng-invalid, button.ng-dirty.ng-invalid { } } +.form-control-feedback { + display: inline-block; + color: $brand-primary; + right: 18px; + line-height: $input-height; + pointer-events: initial; +} + .theme-line .nav-tabs > li > a { padding: 5px 5px; color: $ignite-header-color; @@ -1168,7 +1180,7 @@ a { } .preview-content-empty { - color: $ignite-placeholder-color; + color: $input-color-placeholder; display: table; width: 100%; @@ -1231,3 +1243,13 @@ a { .theme-line .dropdown-menu { min-width: 75px; } + +.panel-tip-container { + display: inline-block; + margin: -3px -3px -3px -3px; + padding: 3px 3px 3px 3px; +} + +button.dropdown-toggle { + margin-right: 5px; +} http://git-wip-us.apache.org/repos/asf/ignite/blob/fcf31017/modules/control-center-web/src/main/js/views/configuration/caches.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade index fa5da30..d3a2e4c 100644 --- a/modules/control-center-web/src/main/js/views/configuration/caches.jade +++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade @@ -29,9 +29,11 @@ block content +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)') +main-table('Caches:', 'caches', 'cacheName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}, {{row.cacheMode | displayValue:cacheModes:"Cache mode not set"}}, {{row.atomicityMode | displayValue:atomicities:"Cache atomicity not set"}}') .padding-top-dflt(bs-affix) - button.btn.btn-primary(id='new-item' ng-click='createItem()') New - +save-remove-buttons + .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new caches') + button.btn.btn-primary(id='new-item' ng-click='createItem()') New + +save-remove-buttons('cache') //label {{ui.formTitle}} + br hr form.form-horizontal(name='ui.inputForm' ng-if='backupItem' novalidate) .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true') @@ -41,4 +43,4 @@ block content +groups('advanced', 'backupItem') +advanced-options-top .section(ng-if='ui.expanded') - +save-remove-buttons + +save-remove-buttons('cache') http://git-wip-us.apache.org/repos/asf/ignite/blob/fcf31017/modules/control-center-web/src/main/js/views/configuration/clusters.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade index cd9650a..2300dda 100644 --- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade +++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade @@ -29,9 +29,11 @@ block content +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)') +main-table('Clusters:', 'clusters', 'clusterName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}, {{row.discovery.kind | displayValue:discoveries:"Discovery not set"}}') .padding-top-dflt(bs-affix) - button.btn.btn-primary(id='new-item' ng-click='createItem()') New - +save-remove-buttons + .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new cluster') + button.btn.btn-primary(id='new-item' ng-click='createItem()') New + +save-remove-buttons('cluster') //label {{ui.formTitle}} + br hr form.form-horizontal(name='ui.inputForm' ng-if='backupItem' novalidate) .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true') @@ -41,4 +43,4 @@ block content +groups('advanced', 'backupItem') +advanced-options-top .section(ng-show='ui.expanded') - +save-remove-buttons + +save-remove-buttons('cluster') http://git-wip-us.apache.org/repos/asf/ignite/blob/fcf31017/modules/control-center-web/src/main/js/views/configuration/metadata.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade index 28ab74d..f29abca 100644 --- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade +++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade @@ -29,13 +29,16 @@ block content +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)') +main-table('Types metadata:', 'metadatas', 'metadataName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}') .padding-top-dflt(bs-affix) - button.btn.btn-primary(id='new-item' ng-click='createItem()') New - button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from database - +save-remove-buttons + .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new metadata') + button.btn.btn-primary(id='new-item' ng-click='createItem()') New + .panel-tip-container(bs-tooltip data-title='Load new metadata from database' data-placement='bottom') + button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from database + +save-remove-buttons('metadata') //label {{ui.formTitle}} + br hr form.form-horizontal(name='ui.inputForm' ng-if='backupItem' novalidate) .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true') +groups('metadata', 'backupItem') .section - +save-remove-buttons + +save-remove-buttons('metadata') http://git-wip-us.apache.org/repos/asf/ignite/blob/fcf31017/modules/control-center-web/src/main/js/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index bc349e1..730d578 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -471,13 +471,17 @@ mixin preview(preview, id) .preview-content-empty(ng-if='preview[#{preview}].allDefaults' id='#{id}') label All Defaults -mixin save-remove-buttons - button.btn.btn-primary(ng-hide='backupItem._id' ng-disabled='!formChanged(ui.inputForm)' ng-click='saveItem()') Save - .btn-group(ng-show='backupItem._id') +mixin save-remove-buttons(objectName) + -var saveTip = '"Save current ' + objectName + '"' + -var removeTip = '"Remove current ' + objectName+ '"' + + .panel-tip-container(ng-hide='backupItem._id' bs-tooltip=saveTip data-placement='bottom') + button.btn.btn-primary(ng-disabled='!formChanged(ui.inputForm)' ng-click='saveItem()' ) Save + .btn-group.panel-tip-container(ng-show='backupItem._id' data-placement='bottom' bs-tooltip=saveTip) button.btn.btn-primary(id='save-item' ng-disabled='!formChanged(ui.inputForm)' ng-click='saveItem()') Save button.btn.dropdown-toggle.btn-primary(id='save-item-dropdown' ng-disabled='!backupItem._id' data-toggle='dropdown' bs-dropdown='saveDropdown' data-placement='bottom-center') span.caret - .btn-group(ng-show='backupItem._id') - button.btn.btn-primary(id='remove-item' ng-click='removeItem()') Remove + .btn-group.panel-tip-container(ng-show='backupItem._id' data-placement='bottom' bs-tooltip=removeTip) + button.btn.btn-primary(id='remove-item' ng-click='removeItem()' ) Remove button.btn.dropdown-toggle.btn-primary(id='remove-item-dropdown' data-toggle='dropdown' bs-dropdown='removeDropdown' data-placement='bottom-center') span.caret
