Charles Hacskaylo
485e6a9de1
[wtf] Merge open155 > github/master
...
open #155
open #186
WTF yet again getting merge conflicts when remerging open155;
2015-10-30 16:24:20 -07:00
Charles Hacskaylo
1e6731e6f2
Merge open155 > github/master
...
open155
open186
Trying a third time to resolve conflicts between open155 and master;
2015-10-30 16:20:57 -07:00
Charles Hacskaylo
5d5425db04
[Frontend] Finessing and verifying CSS
...
vista#54
Verified against fixed position and scrolling views
using SineWave generator;
font-size of glyph tweaked;
2015-10-27 11:50:16 -07:00
Charles Hacskaylo
a8856c0612
[Frontend] Platform-specific mods to limits
...
vista#54
Refactor limits into multiple classes, separating
upr/lwr from red/yellow;
Modded SineWaveLimitCapability accordingly;
Normalized upr/lwr glyphs;
(cherry picked from commit a26d71b)
2015-10-27 11:43:28 -07:00
Henry
789b640b9b
Refactored dismiss and minimize out of NotificationService and on to returned Notification type
2015-10-23 16:28:42 -07:00
Henry
e3ef68bc6f
Fixed jslint errors
2015-10-22 16:41:09 -07:00
Henry
83276d70d3
Removed MessageSeverity enum and MessageController
2015-10-22 16:29:10 -07:00
Henry
109ae3323d
Added jsdoc and moved MessageController to dialogs from notifications
2015-10-22 15:10:53 -07:00
Henry
0053989de8
renamed dialog and notification 'actions' to 'options'
2015-10-22 14:14:21 -07:00
Victor Woeltjen
dbebf08500
[Time Controller] Add test cases
...
...to verify behavior on text entry of dates.
2015-10-21 15:38:58 -07:00
Victor Woeltjen
847c356063
[Time Controller] Change color when input is invalid
...
nasa/openmctweb#181
2015-10-21 15:26:42 -07:00
Victor Woeltjen
06bcd28558
[Time Controller] Keep inputs in sync
...
Keep inputs in sync with displayed data in time controller,
without overwriting user-entered text. nasa/openmctweb#181
2015-10-21 15:22:00 -07:00
Victor Woeltjen
f88e8ebb51
[Time Controller] Update model state for text entry
2015-10-21 15:08:44 -07:00
Victor Woeltjen
6d2b2fd81e
[Time Controller] Parse user-entered timestamps
...
nasa/openmctweb#181 .
2015-10-21 14:46:12 -07:00
Victor Woeltjen
608800ae63
Merge remote-tracking branch 'github/master' into open181
...
Conflicts:
platform/commonUI/general/res/templates/controls/time-controller.html
2015-10-21 14:40:42 -07:00
Victor Woeltjen
07818b0a6d
[Time Controller] Show bounds in a text field
...
Show bounds in a text field to allow user editing; supports manual
editing of time controller bounds, nasa/openmctweb#181 .
2015-10-21 14:35:18 -07:00
Charles Hacskaylo
fb0ce1eca8
[Frontend] New .loading class
...
open #190
Removed old .loading styles previously
commented out;
2015-10-19 11:13:50 -07:00
Charles Hacskaylo
d7bd793bf3
[Frontend] New .loading class
...
open #190
CSS for revised .loading class;
Commented out/removed old .loading styles;
Theme constants for loading colors added
to theme files;
2015-10-15 16:23:42 -07:00
Henry
f08725b6a2
Fixed jshint errors
2015-10-14 16:22:11 -07:00
Henry
301b73c6c6
Banner notifications are not maximized if 'info' message
2015-10-14 16:22:10 -07:00
Henry
912e70d219
Fixed failing tests, and added stopPropagation to prevent maximizing of notifications on action click or dismiss
2015-10-14 16:22:10 -07:00
Henry
ee382be38d
Added transitions and severity classes
2015-10-14 16:22:10 -07:00
Charles Hacskaylo
34ea3ad9bb
[Frontend] Banner message animations; class renaming
...
open #163
open #170
Added transition animations to message banners;
Renamed $colorStatus* class names to map more
closely to severity constants;
2015-10-14 16:22:10 -07:00
Henry
2ba6f18c59
Making changes to implement display queue
2015-10-14 16:22:10 -07:00
Andrew Henry
c0ff6de27b
Added notification indicator
2015-10-14 16:22:10 -07:00
Henry
60dda8a7a4
Updated
2015-10-14 16:21:54 -07:00
Charles Hacskaylo
9cc0c0b06f
[Frontend] Polishing of styles for time-controller
...
open #179
open #180
Font-size normalized for time-controller and domain selector;
Layout of object-holder and time-controller fixed;
2015-10-14 10:25:05 -07:00
Pete Richards
8c29c8ed0e
Merge remote-tracking branch 'github-open/open151' into open-master
2015-10-09 13:38:20 -07:00
Henry
85300d3743
Refactored DialogService a little
2015-10-09 11:57:47 -07:00
Henry
fe3e3325e1
Merge branch 'open170' into open155
2015-10-09 11:00:09 -07:00
Henry
2b97d61d6c
Further integration work
2015-10-09 10:59:36 -07:00
Victor Woeltjen
d902943552
[Time Conductor] Satisfy JSLint
...
...in preparation to merge pull request nasa/openmctweb#162
2015-10-09 09:36:57 -07:00
Victor Woeltjen
5f7c8ccadb
Merge remote-tracking branch 'github/master' into open117b
2015-10-09 09:35:07 -07:00
Victor Woeltjen
520d17f9db
[Time Conductor] Test span constraints
...
Verify that inner and outer spans do not become zero when
user input might otherwise cause this.
2015-10-09 09:29:01 -07:00
Victor Woeltjen
7532db5f49
[Time Conductor] Add test cases
...
Add test cases to TimeRangeController; testing existing functionality
in the context of nasa/openmctweb#151
2015-10-09 07:58:10 -07:00
Victor Woeltjen
ebd8fdeee3
[Time Conductor] Enforce inner minimums on outer changes
2015-10-09 07:32:46 -07:00
Charles Hacskaylo
954fdd5906
[Frontend] Sanding/positioning and Cancel button added to Messasges dialog
...
open #159
open #170
Added Cancel button to Messages dialog in DialogService.js;
Important tweaks to layout of messages to allow
bottom-bar to align to bottom in singleton dialog view;
Revised status colors in theme's constants files;
2015-10-08 19:10:26 -07:00
Victor Woeltjen
f738f84075
[Time Conductor] Enforce minimum outer span
2015-10-08 16:02:47 -07:00
Victor Woeltjen
cc19a0acba
[Time Conductor] Enforce minimum inner span
...
nasa/openmctweb#151 .
2015-10-08 15:51:23 -07:00
Henry
8267058487
Begun integration of Notifications framework with Charles' code
2015-10-08 15:08:26 -07:00
Henry
4a913376ac
Merge branch 'open170' into open155
2015-10-08 13:57:25 -07:00
Henry
5ff3c71523
Fixed the Banner Controller which was not returning reference to controller
2015-10-08 13:56:59 -07:00
Charles Hacskaylo
0e840ae003
[Frontend] Messages major work
...
open #159
open #170
CSS, markup and JS test files initially complete;
Templates renamed for consistency;
message-type icons styled;
Added severity constant "alert";
TO-DO: check refactored CSS against mobile,
see what's broken;
2015-10-08 13:09:41 -07:00
Henry
b2cd66bd5d
Merged in charles' changes
2015-10-08 11:26:31 -07:00
Charles Hacskaylo
8ee93d9603
[Frontend] Tweaks to dialog-launch; added ui-symbols
...
open #159
open #170
2015-10-07 18:26:11 -07:00
Charles Hacskaylo
ac59df9595
[Frontend] Added type-icon to message dialogs
...
open #159
open #170
Percent complete added to progress-bar.html;
Refined overlay height;
2015-10-07 17:56:25 -07:00
Charles Hacskaylo
182eff977c
[Frontend] Dialog and overlay layout/positioning mods
...
open #159
open #170
Restructured overlay size and positioning approach
for better flexibility;
Getting new dialogs and the overlay to
play nicely in mobile context;
2015-10-07 16:36:55 -07:00
Charles Hacskaylo
ad4292f1e9
[Frontend] Mods to DialogService model and dialogs
...
open #159
open #170
Properly re-cast model.hint and added model.actionText;
Moved progressText into progress-bar.html;
Tweaks to dialog styles;
Tweaked styles for progress bar;
Normalized various dialog templates markup;
2015-10-07 11:45:08 -07:00
Charles Hacskaylo
6840e596a5
[Frontend] Adding progress-bar.html template
...
open #159
open #170
2015-10-07 10:25:47 -07:00
Charles Hacskaylo
30fd8c451e
[Frontend] Progress bar as include; progress dialog
...
open #163
open #170
Progress bar now mct-include;
Progress dialog sanded;
Dialog launcher modded;
2015-10-06 16:10:27 -07:00
