You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/07/26 10:53:23 UTC
[07/19] ignite git commit: Web Console: Fixed UI for header menu.
Web Console: Fixed UI for header menu.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0d2992c5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0d2992c5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0d2992c5
Branch: refs/heads/ignite-5578
Commit: 0d2992c502d54f14b71afbc98529770f49f32345
Parents: 03f02d3
Author: Andrey Novikov <an...@gridgain.com>
Authored: Mon Jul 24 14:30:05 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Mon Jul 24 14:30:05 2017 +0700
----------------------------------------------------------------------
.../components/web-console-header/style.scss | 6 +--
.../states/configuration/clusters/memory.pug | 8 ++--
.../frontend/app/primitives/panel/index.scss | 2 +-
.../frontend/views/includes/header-left.pug | 41 ++++++++++----------
4 files changed, 29 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2992c5/modules/web-console/frontend/app/components/web-console-header/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-header/style.scss b/modules/web-console/frontend/app/components/web-console-header/style.scss
index 376edd9..5cc2355 100644
--- a/modules/web-console/frontend/app/components/web-console-header/style.scss
+++ b/modules/web-console/frontend/app/components/web-console-header/style.scss
@@ -18,7 +18,7 @@
web-console-header {
@import "./../../../public/stylesheets/variables.scss";
- $nav-item-margin: 42px;
+ $nav-item-margin: 40px;
$bottom-border-width: 4px;
display: block;
@@ -51,7 +51,7 @@ web-console-header {
}
&.wch-slot-left {
- margin-left: 105px;
+ margin-left: 80px;
}
&.wch-slot-right {
@@ -73,7 +73,7 @@ web-console-header {
}
.wch-nav-item,
- a.wch-nav-item {
+ .wch-nav-item > a {
cursor: pointer;
white-space: nowrap;
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2992c5/modules/web-console/frontend/app/modules/states/configuration/clusters/memory.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/memory.pug b/modules/web-console/frontend/app/modules/states/configuration/clusters/memory.pug
index 0ba1ab4..a09fedd 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/memory.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/memory.pug
@@ -58,12 +58,12 @@ include /app/helpers/jade/mixins
| Memory policies configuration
.group-content
.details-row
- +text('Default region name:', model + '.defaultMemoryPolicyName', '"defaultMemoryPolicyName"',
- 'false', 'default', 'Name of the memory policy that defines the default memory region')
+ +text('Default memory policy name:', model + '.defaultMemoryPolicyName', '"defaultMemoryPolicyName"',
+ 'false', 'default', 'Name of a memory policy to be used as default one')
.details-row(ng-hide='(' + model + '.defaultMemoryPolicyName || "default") !== "default"')
- +number('Default region size:', model + '.defaultMemoryPolicySize', '"defaultMemoryPolicySize"',
+ +number('Default memory policy size:', model + '.defaultMemoryPolicySize', '"defaultMemoryPolicySize"',
'true', '0.8 * totalMemoryAvailable', '10485760',
- 'Size of the memory policy that defines the default memory region')
+ 'Specify desired size of default memory policy without having to use more verbose syntax of MemoryPolicyConfiguration elements')
.details-row(ng-init='memoryPoliciesTbl={type: "memoryPolicies", model: "memoryPolicies", focusId: "name", ui: "memory-policies-table"}')
+ignite-form-group()
ignite-form-field-label
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2992c5/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 38d18dd..56cecfe 100644
--- a/modules/web-console/frontend/app/primitives/panel/index.scss
+++ b/modules/web-console/frontend/app/primitives/panel/index.scss
@@ -31,7 +31,7 @@
padding: 22px 20px;
background-color: initial;
- border-bottom: 1px solid $panel-default-border;
+ border-bottom: 1px solid $ignite-brand-primary;
&:hover {
text-decoration: none;
http://git-wip-us.apache.org/repos/asf/ignite/blob/0d2992c5/modules/web-console/frontend/views/includes/header-left.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/includes/header-left.pug b/modules/web-console/frontend/views/includes/header-left.pug
index e9db53b..6b7fe6a 100644
--- a/modules/web-console/frontend/views/includes/header-left.pug
+++ b/modules/web-console/frontend/views/includes/header-left.pug
@@ -14,15 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-a.wch-nav-item(
- ui-sref='base.configuration.tabs'
- ui-sref-active='active'
-)
- | Configure
+.wch-nav-item
+ a(ui-sref='base.configuration.tabs' ui-sref-active='active')
+ | Configure
.wch-nav-item(ng-controller='notebookController')
- div(ng-if='IgniteDemoMode' ui-sref='base.sql.demo' ng-class='{active: $state.includes("base.sql")}')
- span Queries
+ a(ng-if='IgniteDemoMode' ui-sref='base.sql.demo' ui-sref-active='active')
+ | Queries
div(ng-if='!IgniteDemoMode')
div(ng-if='!notebooks.length' ng-class='{active: $state.includes("base.sql")}')
@@ -41,16 +39,19 @@ a.wch-nav-item(
span Queries
span.caret
-.wch-nav-item(ignite-navbar)
- div(ng-click='$event.stopPropagation()'
- ng-class='{active: $state.includes("base.monitoring")}'
- ng-repeat='item in navbar.items'
- bs-dropdown='item.children'
- data-placement='bottom-left'
- data-trigger='hover focus'
- data-container='self'
- aria-haspopup='true'
- aria-expanded='false'
- )
- span {{::item.text}}
- span.caret
+.wch-content(ignite-navbar)
+ .wch-nav-item(ng-repeat='item in navbar.items')
+ div(ng-if='item.children' ng-click='$event.stopPropagation()'
+ ng-class='{active: $state.includes(item.sref)}'
+ bs-dropdown='item.children'
+ data-placement='bottom-left'
+ data-trigger='hover focus'
+ data-container='self'
+ aria-haspopup='true'
+ aria-expanded='false'
+ )
+ span {{::item.text}}
+ span.caret
+
+ a(ng-if='!item.children' ui-sref='{{item.sref}}' ui-sref-active='active')
+ | {{::item.text}}
\ No newline at end of file