ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-23 15:02:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
689 Commits 989 Branches 212 Tags 191 MiB
d86e27504f
Commit Graph

689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bwyu
d86e27504f Merge remote-tracking branch 'origin/open1007' into open-master 2015-03-16 10:59:29 -07:00
bwyu
8673e2045e Merge remote-tracking branch 'origin/open987' into open-master 2015-03-16 10:28:55 -07:00
bwyu
c2d7996785 Merge remote-tracking branch 'origin/open929' into open-master 2015-03-13 16:21:08 -07:00
bwyu
1e6142ad45 WTD-842: Fixing mouse click in a plot area gets interpreted as a marquee zoom with an extent of zero. 2015-03-13 15:26:08 -07:00
Victor Woeltjen
ee04814f59 Merge remote-tracking branch 'nasa/open1002' into open1015 
Merge in open1002, WTD-1015.

Conflicts:
	platform/commonUI/edit/res/templates/edit-object.html
 2015-03-12 11:32:17 -07:00
Charles Hacskaylo
e7e0c6829e [Frontend] Added "first" CSS class applied to form-row elements 
WTD-1002
WTD-1005
Made form.html add CSS class "first" to each form-row element in order to allow proper border-top styling;
 2015-03-11 15:09:48 -07:00
Charles Hacskaylo
cc181dbdc9 [Frontend] Form and form control enhancements 
WTD-1002
Added Angular hooks to allow form elements to have JSON defined CSS classes
Form element cleanups
 2015-03-10 22:36:35 -07:00
Victor Woeltjen
e781ead497 [Core] Fix relationship bug 
Fix error in relationship capability; return cached
promise for specific relationship. WTD-1007
 2015-03-10 15:05:02 -07:00
Victor Woeltjen
66eef8ccc4 [Core] Expose relationship capability 
Expose relationship capability in bundle definition,
WTD-1007.
 2015-03-10 14:58:01 -07:00
bwyu
6575291e3e Merge remote-tracking branch 'origin/open788' into open-master 2015-03-10 12:41:08 -07:00
Victor Woeltjen
d8d28d892d [Forms] Add test cases 
Add test cases for the SelectorController (used to support
dialog in WTD-987) to satisfy coverage standards.
 2015-03-10 09:32:40 -07:00
Victor Woeltjen
411deb9f4f [Forms] Wrap selector in ul 
Present selected elements in an object selector as
an unordered list, for WTD-987.
 2015-03-10 08:59:56 -07:00
Victor Woeltjen
e411e67c81 [Forms] Add placeholder spec 
Add placeholder spec for SelectorController, WTD-987.
 2015-03-10 07:40:01 -07:00
Victor Woeltjen
1efe80f12b [Forms] Hide filter in selector 
Hide filter shown in selector control, added for
WTD-987.
 2015-03-10 07:34:43 -07:00
Victor Woeltjen
26ba75f636 [Forms] Update selector controller 
Update controller for domain object selector, for WTD-987.
 2015-03-09 17:26:37 -07:00
Victor Woeltjen
66e0d2fcfa [Forms] Complete initial selector 
Complete initial implementation of the domain object
selector for WTD-987.
 2015-03-09 17:16:31 -07:00
Victor Woeltjen
4146a2ad01 [Forms] Begin adding controller for selector 
Begin implementing controller to populate the domain
object selector, added for WTD-987.
 2015-03-09 17:03:28 -07:00
Victor Woeltjen
67bb110dc8 [Forms] Update selector template 
Update selector template to request necessary information
to populate domain object selector, as shown in UI diagrams
for WTD-987.
 2015-03-09 16:54:22 -07:00
Victor Woeltjen
66c8f5fe76 [Forms] Add selector template 
Add template for domain object selector, needed
for dialogs related to WTD-987.
 2015-03-09 16:44:27 -07:00
Victor Woeltjen
bbe26cd06c [Core] Edit-wrap relationship capability 
Wrap objects retrieved via the relationship capability
with Edit mode caching etc, for WTD-1007.
 2015-03-09 15:29:25 -07:00
Victor Woeltjen
97fe378751 [Core] Test relationship capability 
Test relationship capability, WTD-1007.
 2015-03-09 15:22:23 -07:00
Victor Woeltjen
d1ea5726e2 [Core] Add 'relationship' capability 
Add a general-purpose capability for typed relationships.
Unlike composition, these do not appear in the tree, but
instead appear only in user interfaces which specifically
look for these typed relationships. WTD-1007.
 2015-03-09 15:07:33 -07:00
Charles Hacskaylo
68c3ec7194 [Frontend] Removed preferred size form section 
WTD-1002
WTD-495
 2015-03-09 11:06:20 -07:00
bwyu
b05315a140 Merge remote-tracking branch 'origin/open920' into open-master 2015-03-09 11:06:12 -07:00
Charles Hacskaylo
c640d6238b [Frontend] Markup and CSS mods to fix click area in btn-menu objects 
WTD-1002
WTD-942
Mods to markup and CSS to make click-area of menu buttons occupy full area of button
 2015-03-06 10:55:40 -08:00
Charles Hacskaylo
17566be971 Merge branch 'open-master' into open1002 2015-03-06 09:04:01 -08:00
Victor Woeltjen
7add4b5fb0 [Build] Bump version number 
Bump version number to start sprint Setebos, WTD-817.
 2015-03-06 08:29:48 -08:00
Charles Hacskaylo
df515a037e [Frontend] Set priority on Save button to always load first 
WTD-1002
WTD-832
Set priority: mandatory on save button to ensure it always loads before cancel button;
 2015-03-06 08:18:43 -08:00
Victor Woeltjen
f5919e6e5a [Build] Remove SNAPSHOT status 
Remove SNAPSHOT status from version number to close
out sprint Rhea, WTD-817.
 2015-03-06 08:12:44 -08:00
Charles Hacskaylo
feda668e18 [Frontend] Applied split pane functionality to edit mode 
WTD-1002
SplitPaneController added to edit-object.html;
CSS modded to remove positioning that is now under splitter control;
 2015-03-06 08:11:27 -08:00
Charles Hacskaylo
433cdf8b1c In-progress checkin - NOT WORKING RIGHT YET! 2015-03-05 16:02:33 -08:00
Charles Hacskaylo
1304084f7a [Frontend Bug] Fixed CSS for selects to correct Firefox display problem 
WTD-954
 2015-03-05 12:43:48 -08:00
Victor Woeltjen
5ab2ceb333 Merge branch 'open940b' into open929 
Merge in Fixed Position updates to reconcile conflicts
related to generalization of selection mechanism, WTD-929.

Conflicts:
	platform/features/layout/src/FixedController.js
	platform/features/layout/test/FixedControllerSpec.js
 2015-03-04 15:09:46 -08:00
Victor Woeltjen
93debb4abe Merge branch 'open-master' into open940b 
Merge in latest from open-master into topic branch for
WTD-940, merge of fixed position look-and-feel updates.

Conflicts:
	platform/features/layout/src/FixedController.js
	platform/features/layout/src/elements/ElementFactory.js
 2015-03-04 14:52:01 -08:00
Victor Woeltjen
4f89911739 [CSS] Update compiled CSS files 
Rewrote some history as part of merge for WTD-940 to
remove non-open-source history; compiled CSS files did
not merge correctly in this process, so bringing over
compiled files from the original branch to replace these.
 2015-03-04 14:49:02 -08:00
Victor Woeltjen
73eabe938a [Fixed Position] Wrap mct-include is div 
Wrap mct-include in a div which gets position/style information
to position elements in a fixed position view; part of
recommended updates for WTD-894.
 2015-03-04 14:46:28 -08:00
Victor Woeltjen
ee59056625 [Fixed Layout] Update tests 
Update tests to reflect changes from WTD-894.
 2015-03-04 14:46:16 -08:00
Charles Hacskaylo
679e56d231 [Frontend] Tweaks and minor mods 
WTD-894
Changed image CSS from contain to cover
Modded default colors for text and telemetry elements to visibility;
Moved click handler position in menu-button.html for better clickability;

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
 2015-03-04 14:45:24 -08:00
Charles Hacskaylo
7c7f1c3dbc [Bug fix] Removed temp dev styling and fixed width issues with telemtry elements in Fixed Position view 2015-03-04 14:43:55 -08:00
Charles Hacskaylo
448b535de0 [Frontend] Markup and CSS mods to clean up form elements display 
WTD-610
CSS and markup mods principally focused on selects, checkboxes and composite controls;
Cleaned up positioning and formatting in .l-result area of query form bottom;
Removed display of view type when only a single view available for an object in switcher.html

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	vista/query/res/templates/channel-query.html
	vista/query/res/templates/channel-selector.html
	vista/query/res/templates/evr-query.html
 2015-03-04 14:43:21 -08:00
Charles Hacskaylo
9c001fabd9 [Frontend] Form element style and markup fixes 
WTD-610
Fixed markup in select.html;
Rebuilt associated CSS in _selects.scss;
Still to-do: checkbox valign and spacing

Conflicts:
	platform/commonUI/general/res/css/forms.css
	platform/commonUI/general/res/css/items.css
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/css/tree.css
 2015-03-04 14:41:50 -08:00
bwyu
e6fae358d9 Merge remote-tracking branch 'origin/open883' into open-master 2015-03-04 11:09:00 -08:00
bwyu
cbc02d6ec8 Merge remote-tracking branch 'origin/open882' into open-master 2015-03-04 10:08:34 -08:00
Victor Woeltjen
3ce1064c4e [Fixed Position] Expose view proxy 
Expose view proxy as selection state from the Fixed Position
controller, to make Add button available under generalized
selection mechanism, WTD-929.
 2015-03-03 18:52:13 -08:00
Victor Woeltjen
6364296967 [Fixed Position] Remove obsolete script 
Remove obsolete script for selection management in
Fixed Position view; this has been generalized to
become part of Edit mode. WTD-929.
 2015-03-03 18:48:53 -08:00
Victor Woeltjen
948b661fe7 [Fixed Position] Update specs 
Update specs to reflect usage of generalized selection
mechanism, WTD-929.
 2015-03-03 18:47:44 -08:00
Victor Woeltjen
d7e962e4b1 [Edit] Update tests 
Update tests for Edit mode bundle to include the
general-purpose selection API, WTD-929.
 2015-03-03 18:43:26 -08:00
Victor Woeltjen
ea37c636ee [Fixed Position] Use updated selection mechanism 
Use updated, more general approach to handling selections.
WTD-929.
 2015-03-03 18:35:28 -08:00
Victor Woeltjen
bc69f19012 [Edit] Utilize EditToolbarSelection 
Utilize newer, more general-purpose selector from the
representer responsible for binding selection scope to
toolbar. WTD-929.
 2015-03-03 18:34:03 -08:00
Victor Woeltjen
6c97815efb [Edit] Add Selection class 
Add class to handle selection, which will be synchronized
to the toolbar. WTD-929.
 2015-03-03 18:31:34 -08:00