Henry
9a06325533
Merge branch 'master' into open933
2016-09-12 14:39:24 -07:00
Andrew Henry
06d229ea99
Merge pull request #1133 from charbelrami/markup
...
[Frontend] Tweak markup
2016-09-07 13:16:04 -07:00
Henry
d37dd52ee1
Merge branch 'master' into open933
2016-09-06 16:43:17 -07:00
Charles Hacskaylo
2e8d021a6a
[Frontend] Improve layout of "locator"
...
Fixes #1118
Locator in Save In, Move, etc. dialog now
expands vertically to use as much vertical as
possible;
2016-08-29 14:14:51 -07:00
Charbel
44504feeb9
[Frontend] Tweak markup
2016-08-22 15:38:17 -03:00
Henry
f844495cc1
Support deltaFormat on timeSystems
2016-08-03 17:40:37 -07:00
Charles Hacskaylo
c699cb8b4b
Merge remote-tracking branch 'origin/master' into open933-c
...
# Conflicts:
# platform/commonUI/edit/res/templates/create/create-menu.html
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
# platform/commonUI/general/res/sass/_archetypes.scss
# platform/commonUI/general/res/sass/_constants.scss
# platform/commonUI/general/res/sass/_icons.scss
# platform/commonUI/general/res/sass/_main.scss
# platform/commonUI/general/res/sass/_mixins.scss
# platform/commonUI/general/res/sass/controls/_buttons.scss
# platform/commonUI/general/res/templates/controls/time-controller.html
# platform/commonUI/themes/snow/res/sass/_constants.scss
2016-08-01 17:11:37 -07:00
Victor Woeltjen
d1e1ba1c66
[Frontend] Refactor glyphs to classes
...
Squashes #1103 , fixes #1047 .
Squashed commit of the following:
commit 0e060f174dFixes #1047
commit 9f74395a79Fixes #1047
commit 7278c9534cFixes #1047
Fixed .s-status-editing and s-status-pending;
commit 4606d617d1d5bff5559436f7d5bff555e0Fixes #1047
commit b72d82baefFixes #1047
commit af36b9996dFixes #1047
<mct-form> must now include class
'validates' to display validation glyph icons;
removed 'no-validate' from markup; cleaned
up validation scss;
commit 69dc893b4bFixes #1047
Fixes and enhancements for mobile,
particularly in tree; Removed
`display: inline-block` from containerSubtle
mixin;
commit 7bca18b186Fixes #1047
.s-menu-btn > .s-menu-button;
.create-btn > .create-button;
removed unused l-btn, t-btn,
t-btns-zoom from markup
commit 5d229198b7Fixes #1047
commit 36479e2e8bFixes #1047
commit 89e4f06de9Fixes #1047
commit e65ca1cb8bFixes #1047
- Clock, timer, plots updated
commit 3e7eb98ac2Fixes #1047
- Finessing mini-tab and making able to
control per theme; s-clickable and s-toggle-icon
classes cleaned up
commit 18e08074a8Fixes #1047
- Splitter and mini-tab-icon elements
commit 44fda8d68fFixes #1047
mini-tabs, splitters and bg-splash updated;
moved position of Inspector collapse mini-tab
to allow position transition;
splitter-sm class added for Timelines;
commit 2aee8bc0d8Fixes #1047
commit 624f09777fce7591f4d2f159ce7591f642Fixes #1047
Restored no-collapse and float-right
properties;
commit 5324c8edbaFixes #1047
New font files that were missed in
last commit; updated icomoon proj
file; fixed missing char codes in
glyphs.scss;
commit a3b2628883Fixes #1047
New icons for overlay and stacked plots;
revised art and new description for
Fixed Position object;
commit 8a41c6dbc7Fixes #1047
Updated comment
commit eb293b21ebFixes #1047
Removed commented code
commit d8b1fb7781Fixes #1047
Search and removal of "glyph" definitions in bundle
and other JS files; updating tests accordingly;
commit 650fbcc921Fixes #1047
Search and removal of "glyph" definitions in bundle
and other JS files; updating tests accordingly;
commit 574b8bd5c1Fixes #1047
Fixing test cases
commit dd84177441Fixes #1047
WIP: Fixing test cases: fixed test in Timers that was expecting
glyph return;
commit 2231f8e124Fixes #1047
Fixing test cases: fixed test in Timers that was expecting
glyph return;
commit ae59ecfa97Fixes #1047
WIP: fixed line-height issue for t-item-icon class
commit d43bff1445Fixes #1047
WIP: fixed colors and style defs related to clickable
icons
commit c2db6f8805Fixes #1047
WIP: fixed colors related to changes to
btnSubtle mixin; new constants for clickable
icons
commit a4753c44d1Fixes #1047
WIP
commit 2704640b94Fixes #1047
Normalize color constant values for themes; consolidated
and cleaned up btn-related mixins; fixed hover color issues
commit 421286c7e4Fixes #1047
WIP
commit a4111f3855Fixes #1047
WIP: Timeline-related glyph refactoring; s-btn
styles and hover color fixes
commit 883f9992159d9cabb14f1a1f9d9cabb760Fixes #1047
WIP: search, toolbar buttons; mods
to flex archetypes
commit 28b663ce41Fixes #1047
Glyph refactoring WIP for toolbar buttons;
Timeline glyph refactoring continued
commit a9326f572fFixes #1047
Timeline glyph refactoring; Resource Graph icons
in swimlanes now display grayed-out version when not
added to the Resource Graph; minor color tweaks
commit d6e173780388054e56176ca2Fixes #1047
Resolved conflict in icomoon.json file
commit 88054e5e8efixes #1047
In progress: significant mods to pane collapse/expand
buttons and symbols, minor tweaks to splitter look,
limits glyph definitions
commit 7c47343f5cfixes #1047
In progress: updated font files glyphs, mostly
for pane collapse icons
commit fd00bdce54fixes #1047
In progress: search menu
commit 272b4b649efixes #1047
In progress: moved limits classes out
of _contants and into _glyphs;
timers, entanglement context menu items,
form validation, date picker.
commit 95d26e6fe7Fixes #1047
In-progress; limits
commit 26b30d96dbFixes #1047
In-progress; overlay close, search inputs,
messages and message banners,
ui-symbol removal in-progress.
commit 4e2a01ad85Fixes #1047
In-progress; .labeled added to .s-btn,
removed .s-icon-btn
commit 521db3c3feFixes #1047
In-progress; plot options, imagery buttons,
cleanups in buttons.scss, edit-action buttons,
.s-btn .no-label class added.
commit 8bb8db69e6Fixes #1047
In-progress; indicators, notifications, actions,
tests
commit 53ed0bfb22fixes #1047
In progress, really: view icons, timer/clock
commit 47dc7f2f6bfixes #1047
In progress: grid items
commit 2bd34f71befixes #1047
Context menus and associated actions,
custom checkboxes, tree item being edited
commit b561d4f60efixes #1047
In-progess: glyphs.scss now uses $vars to
allow other scss to use a var instead of string
literals;
commit 0cf4089620fixes #1047
In-progess: tree-labels, unknown objects, object
header
commit 46cae10905fixes #1047
In-progess, menus and Create menu fixes
commit fe3097707f7d69ae4652a50c7d69ae401bfixes #1047
In-progress, converting types, mods to
Create Menu template
commit 18d9f3d6b2fixes #1047
Very much In-progess: convert some controls;
commit e93a90a782fixes #1047
Very much In-progess, classes for all symbols
added to glyphs.scss; .menu cleaned up;
commit dc670b22a6fixes #1047
Very much In-progess, "icon-" selector,
browse bar buttons
commit 8b29ccf3affixes #1047
Very much In-progess, s-btn and
s-btn-menu refactoring
commit f574ffed16fixes #1047
In-progess, e900 > e904
commit bc62ee4565fixes #1047
New font files; no re-mapping yet in the app.
commit 614f0c6e9ffixes #1047
Moved all glyphs into PUA area of font, and
re-organized by category.
commit 47bd4031d5Fixes #1047
- Modified sass to point to renamed font files;
- Added new 12px symbols font files to sass;
commit 22a51d6bbbFixes #1047
- Renamed main project file;
- Added new 12px symbols project file;
commit 13ded2fd84Fixes #1047
commit aef5660dfdFixes #1047
2016-08-01 14:33:25 -07:00
Henry
c8898ac6aa
[Documentation] Updated copyright statement. Fixes #1081
2016-07-12 16:55:57 -07:00
Henry
088416905d
Added duration
2016-07-12 10:08:08 -07:00
Victor Woeltjen
fa77139077
[Code Style] Run gulp fixstyle
...
...to apply code style settings from #142 .
2016-05-19 11:29:13 -07:00
Victor Woeltjen
5e44bfc6c7
Merge branch 'master' into open671
...
Conflicts:
main.js
platform/commonUI/edit/src/policies/EditableMovePolicy.js
platform/commonUI/general/src/directives/MCTTree.js
platform/commonUI/general/src/ui/ToggleView.js
platform/core/src/actions/ActionCapability.js
platform/core/test/models/CachingModelDecoratorSpec.js
platform/core/test/services/InstantiateSpec.js
platform/features/events/bundle.js
platform/features/events/src/DomainColumn.js
platform/features/events/src/EventListController.js
platform/features/events/src/EventListPopulator.js
platform/features/events/src/RangeColumn.js
platform/features/events/src/directives/MCTDataTable.js
platform/features/events/src/policies/MessagesViewPolicy.js
platform/features/events/test/DomainColumnSpec.js
platform/features/events/test/EventListControllerSpec.js
platform/features/events/test/EventListPopulatorSpec.js
platform/features/events/test/RangeColumnSpec.js
platform/features/events/test/policies/MessagesViewPolicySpec.js
platform/features/rtevents/bundle.js
platform/features/rtevents/src/DomainColumn.js
platform/features/rtevents/src/RTEventListController.js
platform/features/rtevents/src/RangeColumn.js
platform/features/rtevents/src/directives/MCTRTDataTable.js
platform/features/rtevents/src/policies/RTMessagesViewPolicy.js
platform/features/rtevents/test/DomainColumnSpec.js
platform/features/rtevents/test/RTEventListControllerSpec.js
platform/features/rtevents/test/RangeColumnSpec.js
platform/features/rtevents/test/policies/RTMessagesViewPolicySpec.js
platform/features/rtscrolling/bundle.js
platform/features/rtscrolling/src/DomainColumn.js
platform/features/rtscrolling/src/NameColumn.js
platform/features/rtscrolling/src/RTScrollingListController.js
platform/features/rtscrolling/src/RangeColumn.js
platform/features/scrolling/src/DomainColumn.js
platform/features/scrolling/src/RangeColumn.js
platform/features/scrolling/src/ScrollingListController.js
platform/features/scrolling/src/ScrollingListPopulator.js
platform/features/scrolling/test/DomainColumnSpec.js
platform/features/scrolling/test/RangeColumnSpec.js
platform/features/scrolling/test/ScrollingListControllerSpec.js
platform/features/scrolling/test/ScrollingListPopulatorSpec.js
platform/features/table/src/directives/MCTTable.js
platform/features/table/test/controllers/TelemetryTableControllerSpec.js
platform/representation/src/gestures/DropGesture.js
platform/telemetry/src/TelemetryFormatter.js
test-main.js
2016-04-08 16:08:19 -07:00
Pete Richards
e0a2d02d23
[Control] Color input shows selected color
...
Update color input to show selected color when expanded.
2016-04-05 11:57:45 -07:00
Charles Hacskaylo
aa48044345
[Frontend] Form styling
...
#772
Added ".l-controls-under" styling to allow
channel-selector layout;
Added new hint color constants and refined
style defs;
2016-03-21 11:13:43 -07:00
Charles Hacskaylo
bdbb045005
[Frontend] Cleanups to Inspector config elements
...
open #729
In-progress!
Markup and CSS mods continued;
Config params added to PlotOptionsForm.js to
allow control-first layout per form row;
Changed titles of Inspector parts;
2016-03-10 10:31:05 -08:00
Victor Woeltjen
d6ec7e9ab8
[Build] Remove unused variables from specs
...
...to satisfy JSHint.
2016-03-04 12:56:14 -08:00
Victor Woeltjen
a1a7b2b8ce
[Build] Remove unused variables
...
...to satisfy JSHint
2016-03-04 11:41:48 -08:00
Victor Woeltjen
ac5ac8d34e
[Build] Remove boilerplate from scripts
...
No longer necessary after JSHint configuration.
2016-03-04 10:46:38 -08:00
Pete Richards
96d9f8c194
[Templates] load plot templates with require
...
Load templates with requirejs.
https://github.com/nasa/openmctweb/issues/673
2016-03-01 10:52:07 -08:00
Pete Richards
748673f99b
Merge branch 'master' into open638_rebase
2016-03-01 10:48:53 -08:00
Victor Woeltjen
7240ff4f8d
[Templates] Update mct-control spec
...
...to reflect usage of templateLinker, to support including
templates via RequireJS text plugin
2016-02-26 16:22:55 -08:00
Victor Woeltjen
596735352a
[Templates] Simplify MCTToolbar
...
Use mct-form as a basis; simply change the template.
2016-02-26 15:17:31 -08:00
Victor Woeltjen
2d03e3e6d4
[Templates] Remove unused template path calculation
2016-02-26 15:03:45 -08:00
Victor Woeltjen
5c3d8508a2
[Templates] Use templateLinker for forms
...
...for compatibility with both template and templateUrl
2016-02-26 15:01:40 -08:00
Victor Woeltjen
741d4476e6
[Templates] Use text plugin for toolbar
2016-02-26 13:12:35 -08:00
Victor Woeltjen
bf1fa0ac4c
[Templates] Include templates using text plugin
...
Resolves #673
2016-02-26 13:07:50 -08:00
Pete Richards
fcdf89a4ee
Merge branch 'master' into open638_rebase
2016-02-23 10:56:13 -08:00
Henry
24c750b41e
[Plot] Fixed jsLint, removed onchange
...
Removed ngChange from mct-control
Removed ng-change
2016-02-09 21:19:47 -08:00
Henry
ab1c79f25d
[Plot] Switched to $watchCollection on form model
2016-02-09 20:52:47 -08:00
Henry
be031285b9
Added form-level change event
2016-02-08 17:46:21 -08:00
Victor Woeltjen
0a5097a945
Merge pull request #642 from nasa/open460
...
[Build] Move to npm-based build
2016-02-08 12:21:01 -08:00
Henry
abf5f22155
[Plots] #638 added onchange handling in order to synchronize forms with domain object model.
...
Fixed failing test
Added tests
jslint errors
Minor refactoring of layout bundle
revert layout/bundle.json
2016-02-04 14:26:21 -08:00
Charles Hacskaylo
f2903f4030
[Frontend] Final styling on properties form in Inspector
...
open #638
Added custom radio button control and modified
PlotOptionsController / plotOptionsStructure
accordingly; spacing, borders, etc. are
all as finally intended;
2016-02-04 14:25:02 -08:00
Charles Hacskaylo
371669fbce
[Frontend] Mods in progress to form layout
...
open #638
Major progress on form-row markup and CSS when
in Inspector 'part' context; General fixes cleanups
to custom checkbox/radio CSS;
2016-02-04 14:23:29 -08:00
Charles Hacskaylo
f1b6d7f749
[Frontend] New custom radio mctControl
...
open #638
Markup and initial CSS
2016-02-04 14:23:28 -08:00
Victor Woeltjen
aebae27391
[Tests] Remove suite.json files
...
Remove obsolete suite.json files; #482
2016-02-02 09:35:50 -08:00
Victor Woeltjen
38e703a121
[Build] Fix failing test
...
Acquire reference to moment as an argument instead of
assuming global availability; this appears to be no longer
be present globally after build changes
2016-01-29 10:33:43 -08:00
Victor Woeltjen
3a4f6a7229
[Build] Update dependency references
...
...to reflect movement of third-party libraries to
bower_components.
2016-01-28 11:18:57 -08:00
Victor Woeltjen
7a160a0a98
[Build] Remove third-party libraries
2016-01-28 11:13:11 -08:00
Henry
a023b0e19c
Fixed failing MCTToolbarSpec
2016-01-14 19:22:33 -08:00
Henry
66e827de2e
Fixed Outstanding issues from merge
2016-01-14 18:51:53 -08:00
Victor Woeltjen
cec197f888
[API Refactor] Remove bundle.json files
2016-01-08 15:32:18 -08:00
Victor Woeltjen
df631ba40e
[API Refactor] Update failing specs
2016-01-08 12:58:06 -08:00
Victor Woeltjen
1443ab61e3
[API] Obey strict DI from FormController
2016-01-08 09:42:38 -08:00
Victor Woeltjen
de53247d56
[API] Convert JSON bundles to imperative form
2016-01-07 15:08:08 -08:00
Victor Woeltjen
7d4e7a0925
[Time Conductor] Allow ng-blur on mct-controls
2015-11-27 12:29:53 -08:00
Charles Hacskaylo
fd3059b380
[Frontend] Final cleanups, tweaks; Refactored s-icon-btn
...
open #208
Unit tested in both themes;
.s-icon-btn refactored slightly to focus on usage
as an icon-only element, removed overlap designations
with .s-btn in markup;
Colors normalized for theming;
Code cleanup;
2015-11-20 16:47:04 -08:00
Charles Hacskaylo
1d83516982
[Frontend] Time Controller Markup and Styling
...
open #1515
open #117
Significant re-org in menus.scss continued:
Refactored s-menu to s-menu-btn;
moved look-related style def's into .s-menu;
.menu now extends .s-menu;
2015-09-24 15:38:52 -07:00
Victor Woeltjen
dbe1875e70
[Themes] Resolve conflicts
...
Resolve conflicts in preparation for merge, nasa/openmctweb#118
2015-09-22 16:12:44 -07:00
Victor Woeltjen
acdd35cf65
[Forms] Fix select control
...
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. nasa/openmct#113
2015-09-16 12:23:26 -07:00
