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/12/15 14:10:05 UTC
[35/50] [abbrv] ignite git commit: IGNITE-7199 Web console: several
minor improvements.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e08d19cb/modules/web-console/frontend/public/images/icons/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/images/icons/index.js b/modules/web-console/frontend/public/images/icons/index.js
index 2d0f649..48d9227 100644
--- a/modules/web-console/frontend/public/images/icons/index.js
+++ b/modules/web-console/frontend/public/images/icons/index.js
@@ -26,5 +26,7 @@ export search from './search.svg';
export refresh from './refresh.svg';
export sort from './sort.svg';
export info from './info.svg';
-export connectedClusters from './connectedClusters.svg';
+export checkmark from './checkmark.svg';
+export alert from './alert.svg';
export attention from './attention.svg';
+export connectedClusters from './connectedClusters.svg';
http://git-wip-us.apache.org/repos/asf/ignite/blob/e08d19cb/modules/web-console/frontend/public/images/icons/sort.svg
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/images/icons/sort.svg b/modules/web-console/frontend/public/images/icons/sort.svg
index 7e4bb52..8195c79 100644
--- a/modules/web-console/frontend/public/images/icons/sort.svg
+++ b/modules/web-console/frontend/public/images/icons/sort.svg
@@ -1 +1 @@
-<svg id="drag-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="currentColor" d="M 4,6.9 H 6.3 V 4.6 H 4 Z m 4.6,0 h 2.3 V 4.6 H 8.6 Z M 4,11.4 H 6.3 V 9.1 H 4 Z m 4.6,0 h 2.3 V 9.1 H 8.6 Z M 4,16 H 6.3 V 13.7 H 4 Z m 4.6,0 h 2.3 V 13.7 H 8.6 Z M 4,2.3 H 6.3 V 0 H 4 Z m 4.6,0 h 2.3 V 0 H 8.6 Z"/></svg>
\ No newline at end of file
+<svg id="drag-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="currentColor" d="M 4,6.9 H 6.3 V 4.6 H 4 Z m 4.6,0 h 2.3 V 4.6 H 8.6 Z M 4,11.4 H 6.3 V 9.1 H 4 Z m 4.6,0 h 2.3 V 9.1 H 8.6 Z M 4,16 H 6.3 V 13.7 H 4 Z m 4.6,0 h 2.3 V 13.7 H 8.6 Z M 4,2.3 H 6.3 V 0 H 4 Z m 4.6,0 h 2.3 V 0 H 8.6 Z"/></svg>
http://git-wip-us.apache.org/repos/asf/ignite/blob/e08d19cb/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 6b7fe6a..42d4dcb 100644
--- a/modules/web-console/frontend/views/includes/header-left.pug
+++ b/modules/web-console/frontend/views/includes/header-left.pug
@@ -18,7 +18,7 @@
a(ui-sref='base.configuration.tabs' ui-sref-active='active')
| Configure
-.wch-nav-item(ng-controller='notebookController')
+.wch-nav-item(ng-if='!$root.user.becomeUsed' ng-controller='notebookController')
a(ng-if='IgniteDemoMode' ui-sref='base.sql.demo' ui-sref-active='active')
| Queries
@@ -41,7 +41,7 @@
.wch-content(ignite-navbar)
.wch-nav-item(ng-repeat='item in navbar.items')
- div(ng-if='item.children' ng-click='$event.stopPropagation()'
+ div(ng-if='$root.user.becomeUsed ? item.canBecomed : item.children' ng-click='$event.stopPropagation()'
ng-class='{active: $state.includes(item.sref)}'
bs-dropdown='item.children'
data-placement='bottom-left'
@@ -53,5 +53,5 @@
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
+ a(ng-if='$root.user.becomeUsed ? item.canBecomed : !item.children' ui-sref='{{item.sref}}' ui-sref-active='active')
+ | {{::item.text}}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e08d19cb/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
index 56fd102..b223f2e 100644
--- a/modules/web-console/frontend/views/includes/header-right.pug
+++ b/modules/web-console/frontend/views/includes/header-right.pug
@@ -14,12 +14,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-.wch-demo-toggle(ng-controller='demoController')
+.wch-demo-toggle(ng-if='!$root.user.becomeUsed' ng-controller='demoController')
button.btn-ignite.btn-ignite--success(
ng-if='!IgniteDemoMode'
ng-click='startDemo()'
) Start Demo
+web-console-header-extension
+
.wch-nav-item(ignite-userbar)
div(
ng-class='{active: $state.includes("base.settings")}'
http://git-wip-us.apache.org/repos/asf/ignite/blob/e08d19cb/modules/web-console/frontend/views/settings/profile.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/settings/profile.tpl.pug b/modules/web-console/frontend/views/settings/profile.tpl.pug
index 54c8105..0dc35e4 100644
--- a/modules/web-console/frontend/views/settings/profile.tpl.pug
+++ b/modules/web-console/frontend/views/settings/profile.tpl.pug
@@ -17,6 +17,9 @@
mixin lbl(txt)
label.col-sm-2.required.labelFormField #{txt}
+mixin lbl-not-required(txt)
+ label.col-sm-2.labelFormField #{txt}
+
.row(ng-controller='profileController')
.docs-content
.docs-header
@@ -36,7 +39,11 @@ mixin lbl(txt)
.details-row
+lbl('Email:')
.col-xs-5.col-sm-4
- input#profile-email.form-control(ignite-on-enter-focus-move='profile-company' type='email' ng-model='user.email' placeholder='Input email' required)
+ input#profile-email.form-control(ignite-on-enter-focus-move='profile-phone' type='email' ng-model='user.email' placeholder='Input email' required)
+ .details-row
+ +lbl-not-required('Phone:')
+ .col-xs-5.col-sm-4
+ input#profile-phone.form-control(ignite-on-enter-focus-move='profile-company' type='tel' ng-model='user.phone' placeholder='Input phone')
.details-row
+lbl('Company:')
.col-xs-5.col-sm-4