You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2017/05/12 06:29:04 UTC
ignite git commit: IGNITE-5082 Fixed UI for header and footer.
Repository: ignite
Updated Branches:
refs/heads/master 016718274 -> 63fda7fa5
IGNITE-5082 Fixed UI for header and footer.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/63fda7fa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/63fda7fa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/63fda7fa
Branch: refs/heads/master
Commit: 63fda7fa56d629e71d84024d07833fe14a562b7e
Parents: 0167182
Author: Ilya Borisov <ib...@gridgain.com>
Authored: Fri May 12 13:28:47 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Fri May 12 13:28:47 2017 +0700
----------------------------------------------------------------------
modules/web-console/frontend/app/app.js | 7 +-
.../cluster-select/cluster-select.pug | 6 +-
.../cluster-select/cluster-select.scss | 30 ++++
.../app/components/cluster-select/index.js | 1 +
.../components/web-console-footer/component.js | 23 ++++
.../app/components/web-console-footer/index.js | 23 ++++
.../components/web-console-footer/style.scss | 41 ++++++
.../components/web-console-footer/template.pug | 19 +++
.../components/web-console-header/component.js | 34 +++++
.../app/components/web-console-header/index.js | 23 ++++
.../components/web-console-header/style.scss | 136 +++++++++++++++++++
.../components/web-console-header/template.pug | 25 ++++
.../app/modules/branding/branding.provider.js | 2 +-
.../modules/branding/header-title.directive.js | 6 +-
.../branding/powered-by-apache.directive.js | 3 +-
.../frontend/app/modules/states/signin.state.js | 2 +
.../frontend/gulpfile.babel.js/paths.js | 1 +
.../frontend/public/images/ignite-logo.png | Bin 1982 -> 0 bytes
.../frontend/public/images/ignite-logo.svg | 17 +++
.../frontend/public/images/ignite-logo@2x.png | Bin 3325 -> 0 bytes
.../stylesheets/_bootstrap-variables.scss | 4 +-
.../frontend/public/stylesheets/style.scss | 76 ++---------
.../frontend/public/stylesheets/variables.scss | 2 +
modules/web-console/frontend/views/403.tpl.pug | 8 +-
modules/web-console/frontend/views/404.tpl.pug | 8 +-
modules/web-console/frontend/views/base.pug | 8 +-
modules/web-console/frontend/views/base2.pug | 8 +-
.../frontend/views/includes/header-left.pug | 64 +++++++++
.../frontend/views/includes/header-right.pug | 40 ++++++
.../frontend/views/includes/header.pug | 57 --------
modules/web-console/frontend/views/index.pug | 2 +-
.../web-console/frontend/views/reset.tpl.pug | 12 +-
.../web-console/frontend/views/signin.tpl.pug | 12 +-
33 files changed, 541 insertions(+), 159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/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 1f87196..ab32589 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -116,6 +116,8 @@ import igniteListOfRegisteredUsers from './components/list-of-registered-users';
import IgniteActivitiesUserDialog from './components/activities-user-dialog';
import clusterSelect from './components/cluster-select';
import './components/input-dialog';
+import webConsoleHeader from './components/web-console-header';
+import webConsoleFooter from './components/web-console-footer';
// Inject external modules.
import 'ignite_modules_temp/index';
@@ -173,7 +175,10 @@ angular
// Ignite configuration module.
'ignite-console.config',
// Ignite modules.
- 'ignite-console.modules'
+ 'ignite-console.modules',
+ // Components
+ webConsoleHeader.name,
+ webConsoleFooter.name
])
// Directives.
.directive(...igniteAutoFocus)
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/components/cluster-select/cluster-select.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/cluster-select/cluster-select.pug b/modules/web-console/frontend/app/components/cluster-select/cluster-select.pug
index c290838..444e567 100644
--- a/modules/web-console/frontend/app/components/cluster-select/cluster-select.pug
+++ b/modules/web-console/frontend/app/components/cluster-select/cluster-select.pug
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-ul.nav.navbar-nav(ng-if='!IgniteDemoMode' ng-switch='ctrl.clusters.length' style='padding-right: 5px')
+ul.nav(ng-switch='ctrl.clusters.length')
li.disabled(ng-switch-when='0')
a
i.icon-cluster
@@ -35,7 +35,7 @@ ul.nav.navbar-nav(ng-if='!IgniteDemoMode' ng-switch='ctrl.clusters.length' style
div(ng-click='item.click()')
i.icon-cluster.pull-left(style='margin: 0; padding-left: 10px;')
div: a {{item.name}}
-i.icon-help(ng-if='!IgniteDemoMode' bs-tooltip='' data-placement='bottom' data-html=true style='line-height: 25px'
+
+i.icon-help(bs-tooltip='' data-placement='bottom' data-html=true
data-title='Multi-Cluster Support<br/>\
<a href="https://apacheignite-tools.readme.io/docs/multi-cluster-support" target="_blank">More info</a>')
-span(ng-if='!IgniteDemoMode' style='padding-right: 20px')
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/components/cluster-select/cluster-select.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/cluster-select/cluster-select.scss b/modules/web-console/frontend/app/components/cluster-select/cluster-select.scss
new file mode 100644
index 0000000..835d9c3
--- /dev/null
+++ b/modules/web-console/frontend/app/components/cluster-select/cluster-select.scss
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ignite-cluster-select {
+ @import "./../../../public/stylesheets/variables.scss";
+
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+
+ .icon-help {
+ margin-left: 4px;
+
+ color: $text-color;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/components/cluster-select/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/cluster-select/index.js b/modules/web-console/frontend/app/components/cluster-select/index.js
index b73845e..607b0db 100644
--- a/modules/web-console/frontend/app/components/cluster-select/index.js
+++ b/modules/web-console/frontend/app/components/cluster-select/index.js
@@ -16,6 +16,7 @@
*/
import template from './cluster-select.pug';
+import './cluster-select.scss';
import controller from './cluster-select.controller';
export default [() => {
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/components/web-console-footer/component.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-footer/component.js b/modules/web-console/frontend/app/components/web-console-footer/component.js
new file mode 100644
index 0000000..40a1051
--- /dev/null
+++ b/modules/web-console/frontend/app/components/web-console-footer/component.js
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import template from './template.pug';
+import './style.scss';
+
+export default {
+ template
+};
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/components/web-console-footer/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-footer/index.js b/modules/web-console/frontend/app/components/web-console-footer/index.js
new file mode 100644
index 0000000..8796bb7
--- /dev/null
+++ b/modules/web-console/frontend/app/components/web-console-footer/index.js
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import angular from 'angular';
+import component from './component';
+
+export default angular
+ .module('ignite-console.web-console-footer', [])
+ .component('webConsoleFooter', component);
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/components/web-console-footer/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-footer/style.scss b/modules/web-console/frontend/app/components/web-console-footer/style.scss
new file mode 100644
index 0000000..0b2fa8b
--- /dev/null
+++ b/modules/web-console/frontend/app/components/web-console-footer/style.scss
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+web-console-footer {
+ display: block;
+ color: #fafafa;
+ background: linear-gradient(to bottom, #5f5e5e, #393939);
+ font-family: Roboto;
+ font-size: 12px;
+ font-weight: 300;
+ padding-top: 12px;
+ padding-bottom: 12px;
+
+ p {
+ margin-bottom: 0;
+ }
+
+ .wcf-content {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
+
+ ignite-powered-by-apache {
+ margin-left: auto;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/components/web-console-footer/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-footer/template.pug b/modules/web-console/frontend/app/components/web-console-footer/template.pug
new file mode 100644
index 0000000..be9cc6a
--- /dev/null
+++ b/modules/web-console/frontend/app/components/web-console-footer/template.pug
@@ -0,0 +1,19 @@
+//-
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+.container.wcf-content
+ ignite-footer
+ ignite-powered-by-apache
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/components/web-console-header/component.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-header/component.js b/modules/web-console/frontend/app/components/web-console-header/component.js
new file mode 100644
index 0000000..35d9be2
--- /dev/null
+++ b/modules/web-console/frontend/app/components/web-console-header/component.js
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import template from './template.pug';
+import './style.scss';
+
+export default {
+ template,
+ controller: class {
+ static $inject = ['$rootScope', 'IgniteBranding'];
+
+ constructor($rootScope, branding) {
+ Object.assign(this, {$rootScope, branding});
+ }
+ },
+ transclude: {
+ slotLeft: '?webConsoleHeaderLeft',
+ slotRight: '?webConsoleHeaderRight'
+ }
+};
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/components/web-console-header/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-header/index.js b/modules/web-console/frontend/app/components/web-console-header/index.js
new file mode 100644
index 0000000..36caa3d
--- /dev/null
+++ b/modules/web-console/frontend/app/components/web-console-header/index.js
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import angular from 'angular';
+import component from './component';
+
+export default angular
+ .module('ignite-console.web-console-header', [])
+ .component('webConsoleHeader', component);
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/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
new file mode 100644
index 0000000..5e382c8
--- /dev/null
+++ b/modules/web-console/frontend/app/components/web-console-header/style.scss
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+web-console-header {
+ @import "./../../../public/stylesheets/variables.scss";
+
+ $nav-item-margin: 42px;
+
+ display: block;
+ font-family: Roboto;
+ font-size: 16px;
+ border-bottom: 4px solid red;
+ background: white;
+
+ .wch-slot {
+ &>* {
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+ padding-top: 7px;
+ }
+
+ &.wch-slot-left {
+ margin-left: 105px;
+ }
+
+ &.wch-slot-right {
+ margin: 0 0 0 auto;
+ }
+ }
+
+ .wch-content {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ align-items: center;
+ justify-content: center;
+ min-height: 80px;
+ padding: 10px 0;
+ }
+
+ .wch-logo {
+ height: 40px;
+ }
+
+ .wch-nav-item {
+ cursor: pointer;
+ font-size: 16px;
+ white-space: nowrap;
+
+ $color-default: $text-color;
+ $color-hover: $brand-primary;
+ $color-active: $brand-primary;
+
+ &, a {
+ color: $color-default;
+ text-decoration: none;
+ }
+
+ &, ul {
+ margin: 0;
+ list-style: none;
+ -webkit-padding-start: 0;
+ }
+
+ &:hover {
+ color: $color-hover;
+ }
+
+ :focus, .active {
+ color: $color-active;
+ }
+
+ &[disabled] {
+ opacity: 0.5;
+ cursor: default;
+ }
+
+ .caret {
+ margin-left: 4px;
+ }
+
+ &:not(:last-child) {
+ margin-right: $nav-item-margin;
+ }
+ }
+
+ .wch-demo-toggle {
+ margin-right: 10px;
+
+ // When in demo mode and clusters are hidden
+ &:nth-last-child(2) {
+ margin-right: $nav-item-margin;
+ }
+
+ .btn-demo {
+ padding: 8px 10px;
+ font-size: $font-size-base;
+ line-height: 18px;
+ border-radius: 4px;
+
+ margin-right: 0;
+ }
+ }
+
+ .wch-revert-identity {
+ font-size: $font-size-base;
+ line-height: 16px;
+ padding: 4px;
+ background: $brand-warning;
+ text-align: center;
+
+ .link-info {
+ color: $brand-info;
+ }
+
+ &+.wch-revert-identity {
+ border-top: 1px solid darken($brand-warning, 15%);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/components/web-console-header/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-header/template.pug b/modules/web-console/frontend/app/components/web-console-header/template.pug
new file mode 100644
index 0000000..9e0d576
--- /dev/null
+++ b/modules/web-console/frontend/app/components/web-console-header/template.pug
@@ -0,0 +1,25 @@
+//-
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+.wch-revert-identity(ng-show='$ctrl.$rootScope.user.becomeUsed')
+ | You are currently viewing user #[strong {{$ctrl.$rootScope.user.firstName}} {{$ctrl.$rootScope.user.lastName}}] as administrator. #[a.link-info(ng-click='$ctrl.$rootScope.revertIdentity()') Revert to your identity?]
+
+.wch-content.container
+ a(ui-sref="signin")
+ img.wch-logo(ng-src="{{::$ctrl.branding.headerLogo}}")
+
+ .wch-slot.wch-slot-left(ng-transclude="slotLeft")
+ .wch-slot.wch-slot-right(ng-transclude="slotRight")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/modules/branding/branding.provider.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/branding/branding.provider.js b/modules/web-console/frontend/app/modules/branding/branding.provider.js
index 0545ff3..280325e 100644
--- a/modules/web-console/frontend/app/modules/branding/branding.provider.js
+++ b/modules/web-console/frontend/app/modules/branding/branding.provider.js
@@ -18,7 +18,7 @@
export default ['IgniteBranding', [function() {
let titleSuffix = ' – Apache Ignite Web Console';
- let headerLogo = '/images/ignite-logo.png';
+ let headerLogo = '/images/ignite-logo.svg';
let headerText = 'Management console for Apache Ignite';
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/modules/branding/header-title.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/branding/header-title.directive.js b/modules/web-console/frontend/app/modules/branding/header-title.directive.js
index d560e0a..aedd4b9 100644
--- a/modules/web-console/frontend/app/modules/branding/header-title.directive.js
+++ b/modules/web-console/frontend/app/modules/branding/header-title.directive.js
@@ -15,7 +15,11 @@
* limitations under the License.
*/
-const template = '<h1 class="title">{{::title.text}}</h1>';
+const template = `
+ <h1
+ style="margin: 0;font-size: 1.4em;"
+ >{{::title.text}}</h1>
+`;
export default ['igniteHeaderTitle', ['IgniteBranding', (branding) => {
function controller() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/modules/branding/powered-by-apache.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/branding/powered-by-apache.directive.js b/modules/web-console/frontend/app/modules/branding/powered-by-apache.directive.js
index dce7d55..e88f71f 100644
--- a/modules/web-console/frontend/app/modules/branding/powered-by-apache.directive.js
+++ b/modules/web-console/frontend/app/modules/branding/powered-by-apache.directive.js
@@ -28,8 +28,7 @@ export default ['ignitePoweredByApache', ['IgniteBranding', (branding) => {
restrict: 'E',
template,
controller,
- controllerAs: 'poweredBy',
- replace: true
+ controllerAs: 'poweredBy'
};
}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/app/modules/states/signin.state.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/signin.state.js b/modules/web-console/frontend/app/modules/states/signin.state.js
index 2625aaa..630fb65 100644
--- a/modules/web-console/frontend/app/modules/states/signin.state.js
+++ b/modules/web-console/frontend/app/modules/states/signin.state.js
@@ -37,6 +37,8 @@ angular
.catch(() => {});
}]
},
+ controllerAs: '$ctrl',
+ controller() {},
metaTags: {
}
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/gulpfile.babel.js/paths.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/gulpfile.babel.js/paths.js b/modules/web-console/frontend/gulpfile.babel.js/paths.js
index 92b354a..311865e 100644
--- a/modules/web-console/frontend/gulpfile.babel.js/paths.js
+++ b/modules/web-console/frontend/gulpfile.babel.js/paths.js
@@ -46,6 +46,7 @@ const resourcePaths = [
const resourceModulePaths = [
igniteModulesDir + '/**/images/*.png',
+ igniteModulesDir + '/**/images/*.svg',
igniteModulesDir + '/*.ico'
];
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/public/images/ignite-logo.png
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/images/ignite-logo.png b/modules/web-console/frontend/public/images/ignite-logo.png
deleted file mode 100644
index ea08d1b..0000000
Binary files a/modules/web-console/frontend/public/images/ignite-logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/public/images/ignite-logo.svg
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/images/ignite-logo.svg b/modules/web-console/frontend/public/images/ignite-logo.svg
new file mode 100644
index 0000000..be2e72f
--- /dev/null
+++ b/modules/web-console/frontend/public/images/ignite-logo.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="90" height="39" version="1.1" viewBox="0 0 90 39" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g fill-rule="evenodd">
+ <path d="m34.623 23.128c0 2.87 0.83 4.46 2.494 4.771 1.663 0.312 2.889-0.072 3.679-1.153 0.374-0.457 0.644-1.174 0.81-2.152a9.075 9.075 0 0 0 0.032 -2.9 5.796 5.796 0 0 0 -1.029 -2.556c-0.54-0.748-1.33-1.123-2.369-1.123-1.414 0-2.37 0.52-2.869 1.56-0.5 1.04-0.748 2.223-0.748 3.553m7.109 7.172v-1.06c-0.749 1.165-1.757 1.892-3.025 2.183-1.268 0.29-2.525 0.187-3.772-0.312-1.248-0.499-2.319-1.424-3.212-2.775-0.895-1.35-1.341-3.128-1.341-5.332 0-2.577 0.592-4.666 1.777-6.268 1.186-1.599 3.087-2.4 5.707-2.4 1.995 0 3.844 0.54 5.55 1.622 1.704 1.08 2.556 3.077 2.556 5.986v8.793c0 2.91-0.852 4.895-2.556 5.955a10.315 10.315 0 0 1 -5.55 1.59c-3.826 0-6.196-1.787-7.11-5.363h4.553c0.332 0.582 0.842 1.03 1.528 1.342 0.685 0.311 1.371 0.394 2.057 0.249 0.686-0.146 1.31-0.552 1.871-1.217 0.562-0.665 0.883-1.662 0.967-2.993m19.456 0.998h-2.183c-0.623 0-1.133-0.197-1.528-0.592s-0.592-0.905-0.592-1.528v-8.481c0-0.998-0.302-1.725-0.904-2.183a3.275 3.275 0 0 0 -2.027 -0.686c-0.748 0-1.414 0.229-1.996
0.686-0.582 0.458-0.872 1.185-0.872 2.183v10.601h-4.366v-9.728c0-2.827 0.737-4.718 2.213-5.675a9.675 9.675 0 0 1 4.896 -1.559c1.828 0 3.512 0.478 5.05 1.434 1.538 0.957 2.308 2.89 2.308 5.8v9.728zm1.06-15.147h4.366v15.147h-4.366zm12.402 15.147a32.414 32.414 0 0 1 -4.458 -0.063c-1.6-0.124-2.4-1.142-2.4-3.055v-16.228h2.244c0.54 0 1.018 0.208 1.435 0.623 0.414 0.416 0.623 0.915 0.623 1.497v0.586h2.557v0.872c0 0.625-0.208 1.134-0.624 1.529a2.094 2.094 0 0 1 -1.496 0.592h-0.437v9.344c0 0.708 0.415 1.06 1.247 1.06h1.31v3.243z"/>
+ <path d="m79.078 21.32h6.36c-0.082-1.122-0.373-1.954-0.872-2.494-0.54-0.582-1.309-0.873-2.307-0.873-0.915 0-1.663 0.291-2.245 0.873-0.583 0.582-0.894 1.414-0.936 2.494m7.484 4.865h3.118c-0.458 1.746-1.331 3.076-2.62 3.99-1.289 0.957-2.91 1.435-4.863 1.435-2.37 0-4.22-0.769-5.55-2.307-1.332-1.497-1.996-3.638-1.996-6.424 0-2.66 0.644-4.74 1.933-6.235 1.33-1.538 3.18-2.308 5.55-2.308 2.495 0 4.428 0.748 5.8 2.245 1.33 1.539 1.996 3.68 1.996 6.423v0.686c0 0.209-0.022 0.354-0.063 0.436h-10.789c0.042 1.29 0.353 2.245 0.936 2.869 0.54 0.666 1.35 0.998 2.432 0.998 0.707 0 1.31-0.145 1.808-0.436a0.875 0.875 0 0 0 0.344 -0.22l0.342-0.342c0.041-0.124 0.198-0.29 0.468-0.499 0.27-0.207 0.655-0.311 1.154-0.311m-61.482-17.658h2.245c0.581 0 1.08 0.208 1.496 0.623 0.415 0.417 0.624 0.915 0.624 1.497v20.651h-4.366v-22.771zm37.168 3.425h2.245c0.582 0 1.08 0.208 1.497 0.623 0.415 0.416 0.624 0.915 0.624 1.497v1.31h-4.366zm-26.818-1.739c0-0.384-0.13-0.712-0.387-0.983a1.263 1.263 0 0 0 -0.955 -0.407 1.
36 1.36 0 0 0 -1.006 0.425c-0.263 0.266-0.394 0.55-0.394 0.852 0 0.398 0.122 0.737 0.366 1.019 0.254 0.295 0.578 0.443 0.972 0.443 0.377 0 0.706-0.131 0.985-0.393 0.279-0.263 0.419-0.58 0.419-0.956zm0.693 1.966h-0.693v-0.49c-0.35 0.384-0.821 0.576-1.414 0.576a2.01 2.01 0 0 1 -1.425 -0.556c-0.418-0.391-0.627-0.89-0.627-1.496 0-0.627 0.22-1.143 0.662-1.548 0.407-0.373 0.887-0.56 1.442-0.56 0.578 0 1.032 0.2 1.362 0.598v-0.501h0.693zm4.213-1.987c0-0.384-0.136-0.708-0.407-0.973a1.359 1.359 0 0 0 -0.983 -0.396c-0.4 0-0.73 0.145-0.988 0.436a1.386 1.386 0 0 0 -0.358 0.954c0 0.338 0.105 0.634 0.313 0.885 0.256 0.309 0.615 0.464 1.077 0.464 0.385 0 0.705-0.132 0.961-0.395 0.257-0.263 0.385-0.588 0.385-0.975m0.741-0.092c0 0.62-0.194 1.133-0.58 1.54-0.393 0.417-0.898 0.625-1.514 0.625-0.569 0-1.017-0.185-1.341-0.556v1.788h-0.725v-5.309h0.694v0.477c0.178-0.185 0.377-0.325 0.597-0.418 0.22-0.094 0.46-0.141 0.724-0.141a2.18 2.18 0 0 1 1.469 0.545c0.45 0.39 0.676 0.872 0.676 1.449m4.077 0.113c0-0.
384-0.129-0.712-0.386-0.983a1.265 1.265 0 0 0 -0.956 -0.407c-0.39 0-0.727 0.142-1.005 0.425-0.264 0.266-0.395 0.55-0.395 0.852 0 0.398 0.122 0.737 0.367 1.019 0.254 0.295 0.578 0.443 0.971 0.443 0.378 0 0.706-0.131 0.985-0.393 0.28-0.263 0.42-0.58 0.42-0.956zm0.693 1.966h-0.693v-0.49c-0.35 0.384-0.822 0.576-1.414 0.576a2.012 2.012 0 0 1 -1.425 -0.556c-0.418-0.391-0.627-0.89-0.627-1.496 0-0.627 0.221-1.143 0.662-1.548 0.407-0.373 0.888-0.56 1.441-0.56 0.579 0 1.033 0.2 1.363 0.598v-0.501h0.693zm4.773-1.314c-0.237 0.462-0.504 0.804-0.804 1.026-0.336 0.25-0.746 0.374-1.229 0.374a2.066 2.066 0 0 1 -1.455 -0.583 2.01 2.01 0 0 1 -0.662 -1.53h0.031a0.4 0.4 0 0 1 -0.014 0.033c0-0.624 0.213-1.136 0.639-1.534a1.94 1.94 0 0 1 1.369 -0.545c0.49 0 0.918 0.125 1.285 0.376 0.367 0.25 0.643 0.604 0.826 1.062h-0.796c-0.272-0.48-0.705-0.72-1.3-0.72-0.374 0-0.687 0.132-0.936 0.397a1.353 1.353 0 0 0 -0.376 0.964c0 0.39 0.13 0.716 0.392 0.98 0.262 0.265 0.586 0.397 0.972 0.397 0.254 0 0.495-0.063 0.724-
0.187 0.228-0.125 0.408-0.295 0.538-0.51h0.795zm4.13 1.318h-0.716v-2.286c0-0.31-0.1-0.565-0.295-0.763-0.197-0.198-0.452-0.297-0.763-0.297-0.304 0-0.55 0.091-0.74 0.274s-0.286 0.426-0.286 0.728v2.344h-0.724v-5.31h0.724v1.662c0.277-0.277 0.625-0.416 1.044-0.416 0.46 0 0.86 0.157 1.2 0.47 0.371 0.34 0.557 0.775 0.557 1.308v2.286zm3.97-2.375a1.372 1.372 0 0 0 -0.488 -0.722 1.297 1.297 0 0 0 -0.816 -0.28c-0.38 0-0.695 0.124-0.944 0.374a1.438 1.438 0 0 0 -0.367 0.628zm0.73 0.666h-3.359c0.057 0.343 0.224 0.616 0.501 0.82 0.245 0.178 0.51 0.268 0.793 0.268 0.27 0 0.522-0.076 0.758-0.227 0.245-0.156 0.414-0.356 0.508-0.6h0.738c-0.192 0.524-0.492 0.92-0.9 1.187-0.347 0.229-0.727 0.343-1.139 0.343-0.535 0-0.994-0.192-1.376-0.576-0.405-0.41-0.607-0.916-0.607-1.517 0-0.625 0.216-1.134 0.648-1.528a1.988 1.988 0 0 1 1.383 -0.538c0.538 0 1 0.177 1.387 0.532 0.444 0.405 0.665 0.948 0.665 1.63z"/>
+ <path d="m14.941 0.14844s-16.913 6.5058-0.21875 18.049c5.98 4.135 4.9794 8.3509 4.9824 8.5059 0.945-0.975 5.7088-6.274 0.048828-12.209-5.66-5.934-7.2325-9.5967-4.8125-14.346zm-8.8359 6.4648s-13.215 8.0563-0.76172 16.07c2.403 1.553 11.088 5.9054 10.832 9.8984 0 0 5.2612-7.8044-2.4258-12.693-7.91-5.029-9.8905-10.378-7.6445-13.275zm-4.5996 15.406s-4.7235 7.1573 4.5605 8.6133c0.907 0.117 7.6331 0.81362 9.3691 3.0156 0 0-0.16105-3.801-5.623-6.043s-7.6996-2.7989-8.3066-5.5859z" fill="#f90314"/>
+ </g>
+</svg>
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/public/images/ignite-logo@2x.png
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/images/ignite-logo@2x.png b/modules/web-console/frontend/public/images/ignite-logo@2x.png
deleted file mode 100644
index 10005db..0000000
Binary files a/modules/web-console/frontend/public/images/ignite-logo@2x.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/public/stylesheets/_bootstrap-variables.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/stylesheets/_bootstrap-variables.scss b/modules/web-console/frontend/public/stylesheets/_bootstrap-variables.scss
index d6a51e3..eb6586f 100644
--- a/modules/web-console/frontend/public/stylesheets/_bootstrap-variables.scss
+++ b/modules/web-console/frontend/public/stylesheets/_bootstrap-variables.scss
@@ -32,9 +32,9 @@ $gray: lighten($gray-base, 33.5%) !default; // #555
$gray-light: lighten($gray-base, 46%) !default; // #757575
$gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
-$brand-primary: #ec1c24 !default;
+$brand-primary: #ee2b27 !default;
$brand-success: #50af51 !default;
-$brand-info: #248fb2 !default;
+$brand-info: #0067b9 !default;
$brand-warning: #f0ad4e !default;
$brand-danger: #d9534f !default;
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/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 f3dd3c9..7907e4c 100644
--- a/modules/web-console/frontend/public/stylesheets/style.scss
+++ b/modules/web-console/frontend/public/stylesheets/style.scss
@@ -37,16 +37,7 @@ hr {
outline: none;
}
-.navbar-default .navbar-brand, .navbar-default .navbar-brand:hover {
- position: absolute;
- left: 0;
- text-align: center;
-}
-.navbar-brand {
- padding: 5px 0;
- margin: 10px 0;
-}
.modal.center .modal-dialog {
position: fixed;
@@ -74,10 +65,6 @@ hr {
font-size: 22px;
}
-.theme-line .footer {
- text-align: center;
-}
-
.table.table-vertical-middle tbody > tr > td {
vertical-align: middle;
}
@@ -87,7 +74,7 @@ hr {
padding-right: 10px;
}
-ul.navbar-nav, .sidebar-nav {
+.sidebar-nav {
li.active > a {
color: $link-color;
}
@@ -266,21 +253,6 @@ ul.navbar-nav, .sidebar-nav {
font-size: 12px;
}
-.theme-line header {
- border-bottom: 8px solid $ignite-border-bottom-color;
-
- p {
- color: $ignite-header-color;
- }
-}
-
-.header .title {
- margin: 20px 0 5px 0;
- padding: 0 15px;
-
- font-size: 1.4em;
-}
-
.nav > li {
> a {
color: $navbar-default-link-color;
@@ -302,17 +274,6 @@ ul.navbar-nav, .sidebar-nav {
}
}
-.theme-line header .navbar-nav {
- a {
- line-height: 25px;
- font-size: 18px;
- }
-
- > li > a {
- padding-right: 0;
- }
-}
-
.theme-line .section-right {
padding-left: 30px;
}
@@ -330,6 +291,7 @@ ul.navbar-nav, .sidebar-nav {
body {
font-weight: 400;
+ background-color: $ignite-new-background-color;
}
h1, h2, h3, h4, h5, h6 {
@@ -337,16 +299,6 @@ h1, h2, h3, h4, h5, h6 {
margin-bottom: 10px;
}
-.container-footer {
- margin-top: 20px;
- margin-bottom: 20px;
-
- p {
- font-size: 12px;
- margin-bottom: 0;
- }
-}
-
/* Modal */
.modal {
display: block;
@@ -447,18 +399,17 @@ h1, h2, h3, h4, h5, h6 {
margin: 0;
}
-.greedy {
+body > .wrapper,
+// Nested ui-view, like on password reset state
+body > .wrapper > ui-view {
+ display: flex;
+ flex-direction: column;
min-height: 100%;
- height: #{"calc(100vh - 270px)"};
-}
+ flex: 1;
-.signin-greedy {
- height: #{"calc(100vh - 300px)"};
-}
-
-@media (min-width: 768px) {
- .navbar-nav > li > a {
- padding: 0 15px;
+ .body-container {
+ flex: 1;
+ padding-bottom: 30px;
}
}
@@ -1527,11 +1478,6 @@ input.ng-dirty.ng-invalid, button.ng-dirty.ng-invalid {
color: $ignite-header-color;
}
-.viewedUser {
- text-align: center;
- background-color: $brand-warning;
-}
-
a {
cursor: pointer;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/public/stylesheets/variables.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/stylesheets/variables.scss b/modules/web-console/frontend/public/stylesheets/variables.scss
index 8500eac..9c77436 100644
--- a/modules/web-console/frontend/public/stylesheets/variables.scss
+++ b/modules/web-console/frontend/public/stylesheets/variables.scss
@@ -24,5 +24,7 @@ $ignite-border-color: #ddd;
$ignite-darck-border-color: #aaa;
$ignite-border-bottom-color: $brand-primary;
$ignite-background-color: #fff;
+// New background color for layouts without white content box
+$ignite-new-background-color: #f9f9f9;
$ignite-header-color: #555;
$ignite-invalid-color: $brand-primary;
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/views/403.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/403.tpl.pug b/modules/web-console/frontend/views/403.tpl.pug
index 38d8bb5..7d65442 100644
--- a/modules/web-console/frontend/views/403.tpl.pug
+++ b/modules/web-console/frontend/views/403.tpl.pug
@@ -14,9 +14,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-include includes/header
+web-console-header
-.error-page
- .container
+.container.body-container
+ .error-page
h1.error-page__title 403
h2.error-page__description You are not authorized
+
+web-console-footer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/views/404.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/404.tpl.pug b/modules/web-console/frontend/views/404.tpl.pug
index 7d2fc55..c4cef12 100644
--- a/modules/web-console/frontend/views/404.tpl.pug
+++ b/modules/web-console/frontend/views/404.tpl.pug
@@ -14,9 +14,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-include includes/header
+web-console-header
-.error-page
- .container
+.container.body-container
+ .error-page
h1.error-page__title 404
h2.error-page__description Page not found
+
+web-console-footer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/views/base.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/base.pug b/modules/web-console/frontend/views/base.pug
index b05cdba..525e762 100644
--- a/modules/web-console/frontend/views/base.pug
+++ b/modules/web-console/frontend/views/base.pug
@@ -14,9 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-include ./includes/header
+web-console-header
+ web-console-header-left
+ include ./includes/header-left
+ web-console-header-right
+ include ./includes/header-right
.container.body-container
.main-content(ui-view='')
-include ./includes/footer
+web-console-footer
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/views/base2.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/base2.pug b/modules/web-console/frontend/views/base2.pug
index eacfb5b..fd2331c 100644
--- a/modules/web-console/frontend/views/base2.pug
+++ b/modules/web-console/frontend/views/base2.pug
@@ -14,9 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-include ./includes/header
+web-console-header
+ web-console-header-left
+ include ./includes/header-left
+ web-console-header-right
+ include ./includes/header-right
.container.body-container
div(ui-view='')
-include ./includes/footer
+web-console-footer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/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
new file mode 100644
index 0000000..7578705
--- /dev/null
+++ b/modules/web-console/frontend/views/includes/header-left.pug
@@ -0,0 +1,64 @@
+//-
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+.wch-nav-item(ignite-sidebar)
+ div(ng-click='$event.stopPropagation()'
+ ng-class='{active: $state.includes("base.configuration")}'
+ bs-dropdown='sidebar.items'
+ data-placement='bottom-left'
+ data-trigger='hover focus'
+ data-container='self'
+ data-animation=''
+ )
+ span Configure
+ span.caret
+
+.wch-nav-item(ng-controller='notebookController')
+ div(ng-if='IgniteDemoMode' ng-class='{active: $state.includes("base.sql")}')
+ a(ui-sref='base.sql.demo') Queries
+
+ div(ng-if='!IgniteDemoMode')
+ div(ng-if='!notebooks.length' ng-class='{active: $state.includes("base.sql")}')
+ a(ng-click='createNotebook()') Queries
+
+ div(ng-if='notebooks.length'
+ ng-click='$event.stopPropagation()'
+ ng-class='{active: $state.includes("base.sql")}'
+ bs-dropdown='notebooks'
+ data-placement='bottom-left'
+ data-trigger='hover focus'
+ data-container='self'
+ data-animation=''
+ aria-haspopup='true'
+ aria-expanded='false'
+ )
+ 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'
+ data-animation=''
+ aria-haspopup='true'
+ aria-expanded='false'
+ )
+ span {{::item.text}}
+ span.caret
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/views/includes/header-right.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/includes/header-right.pug b/modules/web-console/frontend/views/includes/header-right.pug
new file mode 100644
index 0000000..e8aeb01
--- /dev/null
+++ b/modules/web-console/frontend/views/includes/header-right.pug
@@ -0,0 +1,40 @@
+//-
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+.wch-demo-toggle(ng-controller='demoController')
+ button.btn.btn-info.btn-demo(
+ ng-if='IgniteDemoMode'
+ ng-click='closeDemo()'
+ ) Close Demo
+ button.btn.btn-info.btn-demo(
+ ng-if='!IgniteDemoMode'
+ ng-click='startDemo()'
+ ) Start Demo
+
+ignite-cluster-select.wch-nav-item(ng-if='!IgniteDemoMode')
+
+.wch-nav-item(ignite-userbar)
+ div(
+ ng-class='{active: $state.includes("base.settings")}'
+ ng-click='$event.stopPropagation()'
+ bs-dropdown='userbar.items'
+ data-placement='bottom-right'
+ data-trigger='hover focus'
+ data-container='self'
+ data-animation=''
+ )
+ span {{$root.user.firstName}} {{$root.user.lastName}}
+ span.caret
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/views/includes/header.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/includes/header.pug b/modules/web-console/frontend/views/includes/header.pug
deleted file mode 100644
index ff8692e..0000000
--- a/modules/web-console/frontend/views/includes/header.pug
+++ /dev/null
@@ -1,57 +0,0 @@
-//-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-header#header.header
- .viewedUser(ng-show='$root.user.becomeUsed')
- | Currently assuming #[strong {{$root.user.firstName}} {{$root.user.lastName}}], #[a(ng-click='$root.revertIdentity()') revert to your identity].
- table.container
- tr
- td.col-xs-3.col-sm-3.col-md-2
- ignite-header-logo
- td(ng-if='$root.user' style='padding-top: 20px')
- ul.nav.navbar-nav(ignite-sidebar ignite-navbar)
- li(ng-class='{active: $state.includes("base.configuration")}' bs-dropdown='sidebar.items' data-placement='bottom-right' data-trigger='hover focus' data-container='self' data-animation='' ng-click='$event.stopPropagation()')
- a.dropdown-toggle Configure
- span.caret
-
- ul.nav.navbar-nav(ng-if='IgniteDemoMode' ng-controller='notebookController')
- li.sql-notebooks( ng-class='{active: $state.includes("base.sql")}')
- a(ui-sref='base.sql.demo') Queries
-
- ul.nav.navbar-nav(ng-if='!IgniteDemoMode' ng-controller='notebookController')
- li.sql-notebooks(ng-if='!notebooks.length' ng-class='{active: $state.includes("base.sql")}')
- a(ng-click='createNotebook()') Queries
-
- li.sql-notebooks(ng-if='notebooks.length' ng-class='{active: $state.includes("base.sql")}' bs-dropdown='notebooks' data-placement='bottom-left' data-trigger='hover focus' data-container='self' data-animation='' ng-click='$event.stopPropagation()' aria-haspopup='true' aria-expanded='false')
- a.dropdown-toggle Queries
- span.caret
-
- ul.nav.navbar-nav
- li(ui-sref-active='active' ng-repeat='item in navbar.items' ng-class='{active: $state.includes("base.monitoring")}' bs-dropdown='item.children' data-placement='bottom-left' data-trigger='hover focus' data-container='self' data-animation='' ng-click='$event.stopPropagation()' aria-haspopup='true' aria-expanded='false')
- a.dropdown-toggle {{::item.text}}
- span.caret
-
- a.padding-left-dflt(ng-controller='demoController')
- button.btn.btn-info(ng-if='IgniteDemoMode' ng-click='closeDemo()') Close demo
- button.btn.btn-info(ng-if='!IgniteDemoMode' ng-click='startDemo()') Start demo
-
- .pull-right
- ignite-cluster-select
-
- ul.nav.navbar-nav.pull-right(ignite-userbar)
- li(bs-dropdown='userbar.items' data-placement='bottom-right' data-trigger='hover focus' data-container='self' data-animation='' ng-class='{active: $state.includes("settings")}' ng-click='$event.stopPropagation()')
- a.dropdown-toggle {{user.firstName}} {{user.lastName}}
- span.caret
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/views/index.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/index.pug b/modules/web-console/frontend/views/index.pug
index c561c3e..c68790d 100644
--- a/modules/web-console/frontend/views/index.pug
+++ b/modules/web-console/frontend/views/index.pug
@@ -29,7 +29,7 @@ html(ng-app='ignite-console' id='app' ng-strict-di)
meta(name='keywords' content='{{$meta.keywords}}')
meta(ng-repeat='(key, value) in $meta.properties' name='{{::key}}' content='{{::value}}')
- body.theme-line.body-overlap.greedy
+ body.theme-line.body-overlap
.splash.splash-max-foreground(hide-on-state-change)
.splash-wrapper
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/views/reset.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/reset.tpl.pug b/modules/web-console/frontend/views/reset.tpl.pug
index 9098105..6bc5b7b 100644
--- a/modules/web-console/frontend/views/reset.tpl.pug
+++ b/modules/web-console/frontend/views/reset.tpl.pug
@@ -14,13 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-header#header.header
- table.container
- tr
- td.col-xs-3.col-sm-3.col-md-2
- ignite-header-logo
- td
- ignite-header-title
+web-console-header
+ web-console-header-left
+ ignite-header-title
.container.body-container
.main-content(ng-controller='resetPassword')
@@ -45,4 +41,4 @@ header#header.header
.settings-row
button.btn.btn-primary(ng-disabled='resetForm.$invalid' ng-click='resetPassword(reset_info)') Reset Password
-include includes/footer
+web-console-footer
http://git-wip-us.apache.org/repos/asf/ignite/blob/63fda7fa/modules/web-console/frontend/views/signin.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/signin.tpl.pug b/modules/web-console/frontend/views/signin.tpl.pug
index a6c64a8..6f8f6ad 100644
--- a/modules/web-console/frontend/views/signin.tpl.pug
+++ b/modules/web-console/frontend/views/signin.tpl.pug
@@ -17,13 +17,9 @@
mixin lblRequired(txt)
label.col-xs-3.col-md-3.required #{txt}
-header#header.header
- table.container
- tr
- td.col-xs-3.col-sm-3.col-md-2
- ignite-header-logo
- td
- ignite-header-title
+web-console-header
+ web-console-header-left
+ ignite-header-title
.container.body-container
.main-content(ng-controller='auth')
@@ -155,7 +151,7 @@ header#header.header
span.fa.fa-chevron-right(aria-hidden='true')
span.sr-only Next
-include includes/footer
+web-console-footer
script.
$('.carousel').carousel()