From f0ca6fdfdbe3cfac9a0f1e57fb70aa58cb5c37fb Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 17 Mar 2016 15:10:42 -0700 Subject: [PATCH 1/5] [Frontend] Added tooltips #750 Added tooltips to Timeline header elements; --- .../timeline/res/templates/timeline.html | 37 +++++-------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/platform/features/timeline/res/templates/timeline.html b/platform/features/timeline/res/templates/timeline.html index 3f8acf1073..b144c8805c 100644 --- a/platform/features/timeline/res/templates/timeline.html +++ b/platform/features/timeline/res/templates/timeline.html @@ -26,20 +26,17 @@ + class="abs horizontal split-pane-component l-timeline-pane l-pane-l t-pane-v">
-
+
- é - è + é + è Title
@@ -54,9 +51,7 @@
-
+
@@ -102,12 +97,10 @@ + class="abs split-pane-component l-timeline-pane l-pane-r t-pane-v"> -
+
-
+
@@ -175,12 +164,9 @@ mct-drag-up="handle.finish()"> -
- -
@@ -188,11 +174,8 @@
-
- -
-
-
Date: Thu, 17 Mar 2016 16:21:04 -0700 Subject: [PATCH 2/5] [Frontend] Adding tooltips #750 --- .../timeline/res/templates/tabular-swimlane-cols-tree.html | 6 ++++-- platform/features/timeline/res/templates/timeline.html | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html index 94c20d2ace..99606ec0c6 100644 --- a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html +++ b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html @@ -29,9 +29,11 @@ }">
+ ng-click="ngModel.toggleGraph()" + title="Click to enable or disable inclusion in Resource Graphing"> + ng-show="ngModel.graph()" + > é diff --git a/platform/features/timeline/res/templates/timeline.html b/platform/features/timeline/res/templates/timeline.html index b144c8805c..4c1eb91868 100644 --- a/platform/features/timeline/res/templates/timeline.html +++ b/platform/features/timeline/res/templates/timeline.html @@ -35,8 +35,8 @@
- é - è + é + è Title
From 90c82f6ef2898753d6252181b8183adb32ed94ae Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 21 Mar 2016 10:08:59 -0700 Subject: [PATCH 3/5] [Frontend] Timeline tooltip and field input tweaks #750 Refined tooltip for Resource Graphing; Increased size of Activity Link input field; --- platform/features/timeline/bundle.js | 3 ++- platform/features/timeline/res/templates/timeline.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/features/timeline/bundle.js b/platform/features/timeline/bundle.js index f298cb887e..5ccb7bc0e4 100644 --- a/platform/features/timeline/bundle.js +++ b/platform/features/timeline/bundle.js @@ -324,7 +324,8 @@ define([ "dialog": { "control": "textfield", "name": "Link", - "pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$" + "pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$", + "cssclass": "l-input-lg" }, "property": "link" }, diff --git a/platform/features/timeline/res/templates/timeline.html b/platform/features/timeline/res/templates/timeline.html index 4c1eb91868..88903a7011 100644 --- a/platform/features/timeline/res/templates/timeline.html +++ b/platform/features/timeline/res/templates/timeline.html @@ -35,7 +35,7 @@
- é + é è Title
From aa48044345c8e4e07f64c731807da49f701e67d7 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 21 Mar 2016 11:13:43 -0700 Subject: [PATCH 4/5] [Frontend] Form styling #772 Added ".l-controls-under" styling to allow channel-selector layout; Added new hint color constants and refined style defs; --- platform/commonUI/general/res/sass/forms/_elems.scss | 12 +++++++++--- .../commonUI/general/res/sass/overlay/_overlay.scss | 4 +--- .../themes/espresso/res/sass/_constants.scss | 2 ++ .../commonUI/themes/snow/res/sass/_constants.scss | 2 ++ platform/features/timeline/bundle.js | 3 ++- platform/forms/res/templates/form.html | 2 +- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss index cabf4287d5..210407aaf1 100644 --- a/platform/commonUI/general/res/sass/forms/_elems.scss +++ b/platform/commonUI/general/res/sass/forms/_elems.scss @@ -87,9 +87,7 @@ } } - .field-hints { - color: darken($colorBodyFg, 20%); - } + .hint, .field-hints { color: $colorFieldHint; } .selector-list { // Used in create overlay to display tree view @@ -130,6 +128,14 @@ } } +.l-controls-under.l-flex-row { + // Change to use column layout + @include flex-direction(column); + .flex-elem { + margin-bottom: $interiorMarginLg; + } +} + .no-validate { .form .form-row >.label { padding-right: 0; diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index bfacefa951..279f738e37 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -65,9 +65,7 @@ margin-bottom: $interiorMargin; } - .hint { - color: pushBack($colorOvrFg, 20%); - } + .hint, .field-hints { color: $colorFieldHintOverlay !important; } .abs.top-bar { height: $ovrTopBarH; diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 9c201db6df..729a813a12 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -77,6 +77,7 @@ $colorInputBg: rgba(#000, 0.1); $colorInputFg: pullForward($colorBodyFg, 20%); $colorFormText: rgba(#fff, 0.5); $colorInputIcon: pushBack($colorBodyFg, 15%); +$colorFieldHint: pullForward($colorBodyFg, 20%); // Inspector $colorInspectorBg: pullForward($colorBodyBg, 3%); @@ -125,6 +126,7 @@ $colorOvrBg: pullForward($colorBodyBg, 10%); $colorOvrFg: pullForward($colorBodyFg, 30%); $colorOvrBtnBg: pullForward($colorOvrBg, 20%); $colorOvrBtnFg: #fff; +$colorFieldHintOverlay: pullForward($colorOvrBg, 30%); // Items $colorItemBg: lighten($colorBodyBg, 5%); diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 9206b3632b..0d8430a7ec 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -77,6 +77,7 @@ $colorInputBg: $colorGenBg; $colorInputFg: $colorBodyFg; $colorFormText: pushBack($colorBodyFg, 10%); $colorInputIcon: pushBack($colorBodyFg, 25%); +$colorFieldHint: pullForward($colorBodyFg, 40%); // Inspector $colorInspectorBg: pullForward($colorBodyBg, 5%); @@ -125,6 +126,7 @@ $colorOvrBg: $colorBodyBg; $colorOvrFg: $colorBodyFg; $colorOvrBtnBg: pullForward($colorOvrBg, 40%); $colorOvrBtnFg: #fff; +$colorFieldHintOverlay: pullForward($colorOvrBg, 40%); // Items $colorItemBg: #ddd; diff --git a/platform/features/timeline/bundle.js b/platform/features/timeline/bundle.js index 5ccb7bc0e4..0e5275b054 100644 --- a/platform/features/timeline/bundle.js +++ b/platform/features/timeline/bundle.js @@ -312,7 +312,8 @@ define([ "dialog": { "control": "selector", "name": "Modes", - "type": "mode" + "type": "mode", + "layout": "controls-under" }, "property": "modes" }, diff --git a/platform/forms/res/templates/form.html b/platform/forms/res/templates/form.html index 60046824a8..2f8b266e08 100644 --- a/platform/forms/res/templates/form.html +++ b/platform/forms/res/templates/form.html @@ -33,7 +33,7 @@ invalid: mctFormInner.$dirty && !mctFormInner.$valid, first: $index < 1, 'l-controls-first': row.layout === 'control-first', - 'l-input-sm': row.inputsize === 'sm' + 'l-controls-under': row.layout === 'controls-under' }">
{{row.name}} From 4c5217d646fdc194c85b6f93a197d0aebeb9cd4c Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Thu, 24 Mar 2016 13:20:49 -0700 Subject: [PATCH 5/5] [Style] Standardize indentation --- .../timeline/res/templates/tabular-swimlane-cols-tree.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html index 99606ec0c6..e5ca69e15c 100644 --- a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html +++ b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html @@ -30,10 +30,10 @@
+ title="Click to enable or disable inclusion in Resource Graphing"> + > é