Review and integrate open95b into master #118

charlesh88 · 2015-09-17T17:05:09Z

See notes and comments in #95 for context of changes. Note that this branch incorporates most of the mobile changes from Shivam, but doesn't include mobile plot gestures (zoom, pan, etc.). Many other frontend tasks, such as styling Sarah Hale's work on hideable treeview and inspection, should wait until this branch is integrated into master.

Author checklist:

Changes address original issue? Y
Unit tests included and/or updated with changes? N/A
Command line build passes? N/A
Expect to pass code review? Y

Reduce number of digest cycles triggered by mct-resize; only trigger a new digest cycle when size actually changes. #19.

open #95 Moved styles from initialization.scss to user-environ/_layout; forms.scss, items.scss, tree.scss includes moved into main.scss; Removed forms.css, items.css, tree.css, Removed initialization.scss, tree.scss

open #95 IN-PROGRESS!; Mostly buttons and menus classes (s-btn and s-menu); Removed unused templates and .css files; Normalized some button containers;

…add themes structure open #95 New themes bundle files, .scss and directories; Moved constants definitions (mainly colors) from commonUI/.../_constants to individual themes _constants files; tweaks to mixins files; changed pathways to font and images in commonUI/.../_constants;

open #95 Splitter styles updated; Tree styles updated;

open #95 Grid items;

open #95 Mostly about the overlay and forms; Buttons, menus, selects tweaks continued; Initial check and tweaks in mobile;

open #95 Refactored btnSubtle and containerSubtle mixins to simplify;

open #95 Menus sanded and normalized;

open #95 Search, plots; Minor tweaks to add shdw to items and buttons;

open #95 Shadow and color normalization: fixed-position, tabular; Updated paint bucket and icon-box in symbols font; Custom checkboxes now use inset shdw;

open #95 Fixed grid icon hover color; Various color normalization;

open #95 Limits, plots, etc.; Misc sanding and shimming; Updated symbols font to replace missing Info symbol;

Conflicts: platform/commonUI/edit/src/actions/RemoveAction.js

Supports integration of changes for mobile, #95

open #95 Branch open95b now replaces open95; Fix to status indicator to only display when title length > 0;

Use ng-show instead of ng-if to suppress the 'Select One' option after user has chosen something in a select box; the latter appears to be incompatible with Angular 1.4.x. #113

open #95 vista #65 scss and html mods for VISTA-related elements; (cherry picked from commit 6ef3987)

open #95 vista #65 Style mods for selects; (cherry picked from commit 8b2c4c6)

open #95 vista #65 (cherry picked from commit 98c5334)

open #95b View switcher and plot control buttons now made small when object is in a frame context in a Layout;

open #95b Also removed unused COMPILE.scss file;

larkin · 2015-09-22T20:58:50Z

@VWoeltjen with mobile merged, this should be clear for review & integrate.

charlesh88 · 2015-09-22T21:26:59Z

Woo hoo! Now we just need to get open95b reviewed and merged. Thanks!

From: Pete Richards <[email protected]mailto:[email protected]>
Reply-To: nasa/openmctweb <[email protected]mailto:[email protected]>
Date: Tuesday, September 22, 2015 at 1:58 PM
To: nasa/openmctweb <[email protected]mailto:[email protected]>
Cc: "Hacskaylo, Charles F. (ARC-TI)[Stinger Ghaffarian Technologies Inc. (SGT Inc.)]" <[email protected]mailto:[email protected]>
Subject: Re: [openmctweb] Review and integrate open95b into master (#118)

@VWoeltjenhttps://github.com/VWoeltjen with mobile merged, this should be clear for review & integrate.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/118#issuecomment-142420008.

Resolve conflicts in preparation for merge, #118

VWoeltjen · 2015-09-22T23:31:28Z

example/imagery/src/ImageTelemetry.js

+                "http://www.esa.int/var/esa/storage/images/esa_multimedia/images/2014/08/comet_on_7_august_a/14721226-1-eng-GB/Comet_on_7_August_a_node_full_image_2.jpg",
+                "http://http://resources0.news.com.au/images/2014/10/26/1227102/619948-e62d0d0c-5cb3-11e4-9c68-d403f5dcc36d.jpg",
+                "http://www.esa.int/var/esa/storage/images/esa_multimedia/images/2014/08/comet_on_16_august_a/14735866-1-eng-GB/Comet_on_16_August_a_node_full_image_2.jpg",
+			  	"http://www.esa.int/var/esa/storage/images/esa_multimedia/images/2015/08/year_at_a_comet_may_2015/15549436-1-eng-GB/Year_at_a_comet_May_2015_node_full_image_2.jpg"
            ].map(function (url, index) {


@charlesh88 Were these changes piggybacked intentionally or uninentionally? If we do want to keep these I'd like to remove the one that's to a non-NASA/non-ESA maintained site (strictly due to a general paranoia about checking in URLs, particularly to code that may run in the client)

I believe these were intentional (as the Rosetta pictures are just beautiful), but the non-esa site should definitely go. It's also a malformed url-- strange if it even works.

My bad: inadvertent. I've restored the old URLs and pushed the change.

From: Victor Woeltjen [[email protected]]
Sent: Tuesday, September 22, 2015 4:31 PM
To: nasa/openmctweb
Cc: Hacskaylo, Charles F. (ARC-TI)[SGT, INC]
Subject: Re: [openmctweb] Review and integrate open95b into master (#118)

In example/imagery/src/ImageTelemetry.jshttps://github.com//pull/118#discussion_r40157688:

@@ -31,10 +31,11 @@ define(

var firstObservedTime = Date.now(), images = [

"http://www.nasa.gov/393811main_Palomar_ao_bouchez_10s_after_impact_4x3_946-710.png",

"http://www.nasa.gov/393821main_Palomar_ao_bouchez_15s_after_impact_4x3_946-710.png",

"http://www.nasa.gov/images/content/393801main_CfhtVeillet2_4x3_516-387.jpg",

"http://www.nasa.gov/images/content/392790main_1024_768_GeminiNorth_NightBeforeImpact_946-710.jpg"

"http://www.esa.int/var/esa/storage/images/esa_multimedia/images/2015/01/comet_on_16_january_2015_navcam/15205508-1-eng-GB/Comet_on_16_January_2015_NavCam.jpg",

"http://www.esa.int/var/esa/storage/images/esa_multimedia/images/2014/08/comet_on_7_august_a/14721226-1-eng-GB/Comet_on_7_August_a_node_full_image_2.jpg",

"http://http://resources0.news.com.au/images/2014/10/26/1227102/619948-e62d0d0c-5cb3-11e4-9c68-d403f5dcc36d.jpg",

"http://www.esa.int/var/esa/storage/images/esa_multimedia/images/2014/08/comet_on_16_august_a/14735866-1-eng-GB/Comet_on_16_August_a_node_full_image_2.jpg",

"http://www.esa.int/var/esa/storage/images/esa_multimedia/images/2015/08/year_at_a_comet_may_2015/15549436-1-eng-GB/Year_at_a_comet_May_2015_node_full_image_2.jpg" ].map(function (url, index) {

@charlesh88 https://github.com/charlesh88 Were these changes piggybacked intentionally or uninentionally? If we do want to keep these I'd like to remove the one that's to a non-NASA/non-ESA maintained site (strictly due to a general paranoia about checking in URLs, particularly to code that may run in the client)

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/118/files#r40157688.

VWoeltjen · 2015-09-22T23:40:28Z

Resolved conflicts and pushed to this branch in preparation to complete pull request. Will merge after clarification on changes to ImageTelemetry.js

open #95b

charlesh88 · 2015-09-23T17:01:15Z

My bad: checking those images in was inadvertent. I've restored the old URLs and pushed the change.

...to satisfy code style checker and pass build, in preparation for merge. #118

Review and integrate open95b into master

VWoeltjen · 2015-09-23T20:06:44Z

Reviewer Checklist

Changes appear to address issue? Y
Appropriate unit tests included? N/A (changes are outside scope of unit testing)
Code style and in-line documentation are appropriate? Y
Commit messages meet standards? Y
Looks fantastic? Y

charlesh88 · 2015-09-23T22:41:56Z

Awesome, and thanks!

VWoeltjen and others added 22 commits June 29, 2015 09:48

[Common UI] Reduce digest count

933927c

Reduce number of digest cycles triggered by mct-resize; only trigger a new digest cycle when size actually changes. #19.

[Frontend] IN-PROGRESS Refactoring to cleanup SASS file structure

2cbe686

open #95 Moved styles from initialization.scss to user-environ/_layout; forms.scss, items.scss, tree.scss includes moved into main.scss; Removed forms.css, items.css, tree.css, Removed initialization.scss, tree.scss

[Frontend] Significant re-factoring of CSS and markup

bb1a02c

open #95 IN-PROGRESS!; Mostly buttons and menus classes (s-btn and s-menu); Removed unused templates and .css files; Normalized some button containers;

Merge branch 'mobile' of https://github.com/nasa/openmctweb into open95

4997fc1

Merge branch 'open95' of https://github.com/nasa/openmctweb into open95

62898c9

[Frontend] IN-PROGRESS Theme changes continuing

ac41ed7

open #95 Splitter styles updated; Tree styles updated;

[Frontend] IN-PROGRESS Theme changes continuing

86deec6

open #95 Grid items;

[Frontend] IN-PROGRESS Theme changes continuing

4db48af

open #95 Mostly about the overlay and forms; Buttons, menus, selects tweaks continued; Initial check and tweaks in mobile;

[Frontend] IN-PROGRESS Theme changes continuing

32b895b

open #95 Refactored btnSubtle and containerSubtle mixins to simplify;

[Frontend] IN-PROGRESS Theme changes continuing

3792dab

open #95 Menus sanded and normalized;

[Frontend] IN-PROGRESS Theming continues

3b2454c

open #95 Search, plots; Minor tweaks to add shdw to items and buttons;

[Frontend] IN-PROGRESS Theming continues

d14c4e0

open #95 Shadow and color normalization: fixed-position, tabular; Updated paint bucket and icon-box in symbols font; Custom checkboxes now use inset shdw;

[Frontend] IN-PROGRESS Theming continues, sanding

a840b59

open #95 Fixed grid icon hover color; Various color normalization;

[Frontend] IN-PROGRESS Theme changes continuing

3e5d46a

open #95 Limits, plots, etc.; Misc sanding and shimming; Updated symbols font to replace missing Info symbol;

Merge remote-tracking branch 'github/master' into open95b

72c122e

Conflicts: platform/commonUI/edit/src/actions/RemoveAction.js

[Browse] Separate out back-arrow behavior

a3a6706

Supports integration of changes for mobile, #95

[Frontend] Themes final on open prior to VISTA integration

4f5a111

open #95 Branch open95b now replaces open95; Fix to status indicator to only display when title length > 0;

[Forms] Fix select control

acdd35c

Use ng-show instead of ng-if to suppress the 'Select One' option after user has chosen something in a select box; the latter appears to be incompatible with Angular 1.4.x. #113

[Frontend/PLATFORM] Cherry picking from platform changes in vista65

f28d2f1

open #95 vista #65 scss and html mods for VISTA-related elements; (cherry picked from commit 6ef3987)

[Frontend/PLATFORM] Cherry picking from platform changes in vista65

9fdb9f0

open #95 vista #65 Style mods for selects; (cherry picked from commit 8b2c4c6)

[Frontend] Minor color tweaks in Snow theme

9a7f435

open #95 vista #65 (cherry picked from commit 98c5334)

charlesh88 assigned VWoeltjen Sep 17, 2015

charlesh88 and others added 5 commits September 21, 2015 14:24

[Frontend] Minor tweaks to sizing of controls

c9b2f58

open #95b View switcher and plot control buttons now made small when object is in a frame context in a Layout;

[Frontend] Setting default theme for open back to espresso

54334a8

open #95b Also removed unused COMPILE.scss file;

Merge remote-tracking branch 'github-open/open113' into open-master

8611926

Merge remote-tracking branch 'github-open/open19' into open-master

2040304

Merge branch 'mobile-integration' into open-master

aba0969

[Themes] Resolve conflicts

dbe1875

Resolve conflicts in preparation for merge, #118

VWoeltjen reviewed Sep 22, 2015
View reviewed changes

[Config] Fixed image URLs in ImageTelemetry.js;

fb0861f

open #95b

[Fixed Position] Use spaces instead of tabs

056b0c8

...to satisfy code style checker and pass build, in preparation for merge. #118

VWoeltjen added a commit that referenced this pull request Sep 23, 2015

Merge pull request #118 from nasa/open95b

f3aceb1

Review and integrate open95b into master

VWoeltjen merged commit f3aceb1 into master Sep 23, 2015

charlesh88 mentioned this pull request Sep 23, 2015

Add support for multiple look-and-feel themes #95

Closed

larkin deleted the open95b branch October 9, 2015 16:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Review and integrate open95b into master #118

Review and integrate open95b into master #118

charlesh88 commented Sep 17, 2015

larkin commented Sep 22, 2015

charlesh88 commented Sep 22, 2015

VWoeltjen Sep 22, 2015

larkin Sep 23, 2015

charlesh88 Sep 23, 2015

VWoeltjen commented Sep 22, 2015

charlesh88 commented Sep 23, 2015

VWoeltjen commented Sep 23, 2015

charlesh88 commented Sep 23, 2015

Review and integrate open95b into master #118

Review and integrate open95b into master #118

Conversation

charlesh88 commented Sep 17, 2015

larkin commented Sep 22, 2015

charlesh88 commented Sep 22, 2015

VWoeltjen Sep 22, 2015

Choose a reason for hiding this comment

larkin Sep 23, 2015

Choose a reason for hiding this comment

charlesh88 Sep 23, 2015

Choose a reason for hiding this comment

VWoeltjen commented Sep 22, 2015

charlesh88 commented Sep 23, 2015

VWoeltjen commented Sep 23, 2015

Reviewer Checklist

charlesh88 commented Sep 23, 2015