You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/07/12 06:48:05 UTC
[05/10] ignite git commit: ignite-2.1 Improved web-console primitives.
ignite-2.1 Improved web-console primitives.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e9f194a3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e9f194a3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e9f194a3
Branch: refs/heads/ignite-2.1
Commit: e9f194a328b1704a7881f1bf1a148a3426cd1b53
Parents: 1b2f505
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Jul 11 19:16:06 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Jul 11 19:16:06 2017 +0700
----------------------------------------------------------------------
.../helpers/jade/form/form-field-checkbox.pug | 2 +-
.../helpers/jade/form/form-field-dropdown.pug | 1 -
.../frontend/app/helpers/jade/mixins.pug | 1 +
.../frontend/app/primitives/dropdown/index.scss | 4 +
.../app/primitives/form-field/index.scss | 48 +++++------
.../frontend/app/primitives/index.js | 2 +
.../frontend/app/primitives/radio/index.pug | 41 +++++++++
.../frontend/app/primitives/radio/index.scss | 78 ++++++++++++++++++
.../frontend/app/primitives/switch/index.pug | 34 --------
.../frontend/app/primitives/switch/index.scss | 87 --------------------
.../frontend/app/primitives/switcher/index.scss | 2 +-
.../frontend/app/primitives/tooltip/index.scss | 25 ++++++
.../app/primitives/typography/index.scss | 2 +-
.../app/primitives/ui-grid-settings/index.scss | 47 ++++++-----
.../frontend/app/primitives/ui-grid/index.scss | 13 ++-
.../frontend/app/services/Confirm.service.js | 2 +-
.../frontend/app/services/Messages.service.js | 3 +
17 files changed, 216 insertions(+), 176 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/helpers/jade/form/form-field-checkbox.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/helpers/jade/form/form-field-checkbox.pug b/modules/web-console/frontend/app/helpers/jade/form/form-field-checkbox.pug
index 497680b..fcd6f9d 100644
--- a/modules/web-console/frontend/app/helpers/jade/form/form-field-checkbox.pug
+++ b/modules/web-console/frontend/app/helpers/jade/form/form-field-checkbox.pug
@@ -15,7 +15,7 @@
limitations under the License.
mixin form-field-checkbox(label, model, name, disabled, required, tip)
- .checkbox
+ .checkbox(id=`{{ ${name} }}Field`)
label(id=`{{ ${name} }}Label`)
.input-tip
if block
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/helpers/jade/form/form-field-dropdown.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/helpers/jade/form/form-field-dropdown.pug b/modules/web-console/frontend/app/helpers/jade/form/form-field-dropdown.pug
index d0f95d4..117568d 100644
--- a/modules/web-console/frontend/app/helpers/jade/form/form-field-dropdown.pug
+++ b/modules/web-console/frontend/app/helpers/jade/form/form-field-dropdown.pug
@@ -25,7 +25,6 @@ mixin ignite-form-field-dropdown(label, model, name, disabled, required, multipl
data-ng-model=model
data-ng-required=required && `${required}`
- data-ng-disabled=disabled && `${disabled}` || `!${options}.length`
bs-select
bs-options=`item.value as item.label for item in ${options}`
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/helpers/jade/mixins.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/helpers/jade/mixins.pug b/modules/web-console/frontend/app/helpers/jade/mixins.pug
index fc193eb..9ccbde2 100644
--- a/modules/web-console/frontend/app/helpers/jade/mixins.pug
+++ b/modules/web-console/frontend/app/helpers/jade/mixins.pug
@@ -20,6 +20,7 @@ include ../../primitives/datepicker/index
include ../../primitives/timepicker/index
include ../../primitives/dropdown/index
include ../../primitives/tooltip/index
+include ../../primitives/radio/index
include ../../primitives/switcher/index
//- Mixin for advanced options toggle.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/primitives/dropdown/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/dropdown/index.scss b/modules/web-console/frontend/app/primitives/dropdown/index.scss
index d39306d..47a7e90 100644
--- a/modules/web-console/frontend/app/primitives/dropdown/index.scss
+++ b/modules/web-console/frontend/app/primitives/dropdown/index.scss
@@ -56,6 +56,10 @@
ul.select.dropdown-menu {
li {
+ hr {
+ display: none;
+ }
+
a {
&:before {
content: '';
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/primitives/form-field/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/form-field/index.scss b/modules/web-console/frontend/app/primitives/form-field/index.scss
index 42370b3..4bc4252 100644
--- a/modules/web-console/frontend/app/primitives/form-field/index.scss
+++ b/modules/web-console/frontend/app/primitives/form-field/index.scss
@@ -29,7 +29,7 @@
.ignite-form-field__label {
float: left;
width: 100%;
- margin: 4px 10px;
+ margin: 0 10px 4px;
color: $gray-light;
font-size: 12px;
@@ -42,35 +42,35 @@
.input-tip {
display: flex;
overflow: visible;
- }
- .tipField {
- line-height: 36px;
- }
+ & > input,
+ & > button {
+ overflow: visible;
- input,
- button {
- overflow: visible;
+ box-sizing: border-box;
+ width: 100%;
+ max-width: initial;
+ height: 36px;
+ padding: 0 10px;
+ margin-right: 0;
- box-sizing: border-box;
- width: 100%;
- max-width: initial;
- height: 36px;
- padding: 0px 10px;
- margin-right: 0;
+ border: solid 1px #c5c5c5;
+ border-radius: 4px;
+ background-color: #ffffff;
+ box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.2);
- border: solid 1px #c5c5c5;
- border-radius: 4px;
- background-color: #ffffff;
- box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.2);
+ color: $text-color;
+ line-height: 36px;
+ }
- color: $text-color;
- line-height: 36px;
+ & > input[type='number'] {
+ text-align: right;
+ }
}
- input[type='number'] {
- text-align: right;
+ .tipField {
+ line-height: 36px;
}
- }
+ }
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/primitives/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/index.js b/modules/web-console/frontend/app/primitives/index.js
index 219581c..5a2f45c 100644
--- a/modules/web-console/frontend/app/primitives/index.js
+++ b/modules/web-console/frontend/app/primitives/index.js
@@ -28,7 +28,9 @@ import './ui-grid/index.scss';
import './ui-grid-header/index.scss';
import './ui-grid-settings/index.scss';
import './page/index.scss';
+import './radio/index.scss';
import './switcher/index.scss';
import './form-field/index.scss';
import './typography/index.scss';
import './grid/index.scss';
+import './tooltip/index.scss';
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/primitives/radio/index.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/radio/index.pug b/modules/web-console/frontend/app/primitives/radio/index.pug
new file mode 100644
index 0000000..2b2223a
--- /dev/null
+++ b/modules/web-console/frontend/app/primitives/radio/index.pug
@@ -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.
+
+mixin form-field-radio(label, model, name, value, disabled, required, tip)
+ .radio--ignite.ignite-form-field
+ label(id=`{{ ${name} }}Label`)
+ .input-tip
+ if block
+ block
+ else
+ input(
+ id=`{{ ${name} }}Input`
+ name=`{{ ${name} }}`
+ type='radio'
+
+ data-ng-model=model
+ data-ng-value=value
+ data-ng-required=required && `${required}`
+ data-ng-disabled=disabled && `${disabled}`
+
+ data-ng-focus='tableReset()'
+
+ data-ignite-form-panel-field=''
+ )
+ div
+ span #{label}
+
+ +tooltip(tip, tipOpts)
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/primitives/radio/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/radio/index.scss b/modules/web-console/frontend/app/primitives/radio/index.scss
new file mode 100644
index 0000000..ff9b5b3
--- /dev/null
+++ b/modules/web-console/frontend/app/primitives/radio/index.scss
@@ -0,0 +1,78 @@
+/*
+ * 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 '../../../public/stylesheets/variables';
+
+.radio--ignite {
+ label {
+ padding-left: 20px;
+
+ line-height: 20px;
+ vertical-align: middle;
+
+ cursor: pointer;
+
+ .input-tip {
+ float: left;
+ width: 14px;
+ margin-left: -20px;
+
+ input[type="radio"] {
+ position: relative;
+ left: -20px;
+
+ & + div {
+ position: absolute;
+ top: 50%;
+
+ width: 14px;
+ height: 14px;
+ margin-top: -8px;
+
+ border-radius: 50%;
+ box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.35);
+ }
+
+ &:checked + div {
+ background-color: #0098ff;
+ box-shadow: none;
+
+ &:before {
+ content: '';
+
+ position: absolute;
+ top: 50%;
+ left: 50%;
+
+ width: 4px;
+ height: 4px;
+ margin-top: -2px;
+ margin-left: -2px;
+
+ border-radius: 50%;
+ background-color: #ffffff;
+ box-shadow: 0 1px 1px 0 rgba(12, 50, 76, 0.3);
+ }
+ }
+ }
+ }
+ }
+
+ & + .radio--ignite {
+ margin-left: 45px;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/primitives/switch/index.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/switch/index.pug b/modules/web-console/frontend/app/primitives/switch/index.pug
deleted file mode 100644
index 02b9852..0000000
--- a/modules/web-console/frontend/app/primitives/switch/index.pug
+++ /dev/null
@@ -1,34 +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.
-
-mixin form-field-switch(label, model, name, disabled, required)
- .switch--ignite
- label(id=`{{ ${name} }}Label`)
- .input-tip
- if block
- block
- else
- input(
- id=`{{ ${name} }}Input`
- name=`{{ ${name} }}`
- type='checkbox'
-
- data-ng-model=model
- data-ng-required=required && `${required}`
- data-ng-disabled=disabled && `${disabled}`
- )
- div
- span #{label}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/primitives/switch/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/switch/index.scss b/modules/web-console/frontend/app/primitives/switch/index.scss
deleted file mode 100644
index 37b2f55..0000000
--- a/modules/web-console/frontend/app/primitives/switch/index.scss
+++ /dev/null
@@ -1,87 +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.
- */
-
-@import '../../../public/stylesheets/variables';
-
-.switch--ignite {
- width: 34px;
- height: 20px;
-
- label {
- width: 34px;
- max-width: 34px !important;
- height: 100%;
- padding-left: 20px;
-
- line-height: 20px;
- vertical-align: middle;
-
- cursor: pointer;
-
- .input-tip {
- float: left;
-
- height: 100%;
- margin-left: -20px;
-
- input[type="checkbox"] {
- position: absolute;
- left: -20px;
-
- & + div {
- position: relative;
-
- width: 34px;
- height: 14px;
- margin-top: 3px;
-
- border-radius: 8px;
- background-color: #C5C5C5;
-
- &:before {
- content: '';
-
- position: absolute;
- top: -3px;
- left: 0;
-
- width: 20px;
- height: 20px;
-
- border: solid 1px #C5C5C5;
- border-radius: 50%;
- background-color: #FFF;
- }
- }
-
- &:checked + div {
- background-color: #FF8485;
-
- &:before {
- content: '';
-
- left: initial;
- right: 0;
-
- border: 0;
- background-color: #EE2B27;
- }
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/primitives/switcher/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/switcher/index.scss b/modules/web-console/frontend/app/primitives/switcher/index.scss
index cf8ed64..3e9cd49 100644
--- a/modules/web-console/frontend/app/primitives/switcher/index.scss
+++ b/modules/web-console/frontend/app/primitives/switcher/index.scss
@@ -30,7 +30,7 @@ label.switcher--ignite {
input[type="checkbox"] {
position: absolute;
opacity: 0.0;
-
+
& + div {
position: relative;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/primitives/tooltip/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/tooltip/index.scss b/modules/web-console/frontend/app/primitives/tooltip/index.scss
new file mode 100644
index 0000000..174d624
--- /dev/null
+++ b/modules/web-console/frontend/app/primitives/tooltip/index.scss
@@ -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.
+ */
+
+.tooltip {
+ font-family: Roboto;
+
+ & > .tooltip-inner {
+ padding: 12px;
+ background-color: #FFF;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/primitives/typography/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/typography/index.scss b/modules/web-console/frontend/app/primitives/typography/index.scss
index 7fee674..9baa444 100644
--- a/modules/web-console/frontend/app/primitives/typography/index.scss
+++ b/modules/web-console/frontend/app/primitives/typography/index.scss
@@ -33,4 +33,4 @@
font-size: 16px;
font-weight: normal;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/primitives/ui-grid-settings/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/ui-grid-settings/index.scss b/modules/web-console/frontend/app/primitives/ui-grid-settings/index.scss
index e5d30e6..e0cf139 100644
--- a/modules/web-console/frontend/app/primitives/ui-grid-settings/index.scss
+++ b/modules/web-console/frontend/app/primitives/ui-grid-settings/index.scss
@@ -186,30 +186,33 @@
.input-tip {
overflow: visible;
- }
- button {
- overflow: visible;
+ & > button {
+ overflow: visible;
+
+ width: auto;
+ height: $height;
+ min-width: 70px;
+ max-width: 70px;
+ padding: 0 0 0 5px;
+
+ cursor: pointer;
+ color: transparent;
+ font-size: inherit;
+ line-height: $height;
+ text-align: left;
+ text-shadow: 0 0 0 #ee2b27;
- width: auto;
- height: $height;
- min-width: 70px;
- max-width: 70px;
- padding: 0;
- padding-left: 5px;
-
- cursor: pointer;
- color: transparent;
- font-size: inherit;
- line-height: $height;
- text-align: left;
- text-shadow: 0 0 0 #ee2b27;
-
- border: none;
- box-shadow: none;
-
- &:hover, &:focus {
- text-shadow: 0 0 0 #a8110f;
+ border: none;
+ box-shadow: none;
+
+ &:hover, &:focus {
+ text-shadow: 0 0 0 #a8110f;
+ }
+
+ button {
+ color: $text-color;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/primitives/ui-grid/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/ui-grid/index.scss b/modules/web-console/frontend/app/primitives/ui-grid/index.scss
index 8e1da49..88bff69 100644
--- a/modules/web-console/frontend/app/primitives/ui-grid/index.scss
+++ b/modules/web-console/frontend/app/primitives/ui-grid/index.scss
@@ -27,7 +27,7 @@
outline: none;
}
- sup {
+ sup, sub {
color: $ignite-brand-success;
}
@@ -122,7 +122,6 @@
z-index: 1;
position: fixed;
- width: calc(100% - 40px);
width: 100px;
height: 20px;
margin-top: -20px;
@@ -314,7 +313,7 @@
.ui-grid-header,
.ui-grid-viewport {
.ui-grid-icon-cancel {
- right: 20px;
+ right: 10px;
}
.ui-grid-tree-base-row-header-buttons {
@@ -377,6 +376,12 @@
}
}
+ .ui-grid-header--subcategories {
+ .ui-grid-icon-cancel {
+ right: 20px;
+ }
+ }
+
.ui-grid-pinned-container {
.ui-grid-header {
.ui-grid-header-cell-row {
@@ -518,4 +523,4 @@
font-style: italic;
line-height: 16px;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/services/Confirm.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/services/Confirm.service.js b/modules/web-console/frontend/app/services/Confirm.service.js
index 1638d7e..2429f4a 100644
--- a/modules/web-console/frontend/app/services/Confirm.service.js
+++ b/modules/web-console/frontend/app/services/Confirm.service.js
@@ -46,7 +46,7 @@ export default ['IgniteConfirm', ['$rootScope', '$q', '$modal', '$animate', ($ro
scope.confirmCancel = () => {
_hide();
- deferred.reject('cancelled');
+ deferred.reject({cancelled: true});
};
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9f194a3/modules/web-console/frontend/app/services/Messages.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/services/Messages.service.js b/modules/web-console/frontend/app/services/Messages.service.js
index fefdae9..5e691bc 100644
--- a/modules/web-console/frontend/app/services/Messages.service.js
+++ b/modules/web-console/frontend/app/services/Messages.service.js
@@ -55,6 +55,9 @@ export default ['IgniteMessages', ['$alert', ($alert) => {
errorMessage,
hideAlert,
showError(message, err) {
+ if (message && message.cancelled)
+ return false;
+
_showMessage(message, err, 'danger', 10);
return false;