Commit Graph

426 Commits

Author SHA1 Message Date
Charles Hacskaylo
5a991076ea [Frontend] CSS and markup tweaks to enable flex layout
open #93
Layout frame and imagery markup modified;
2015-08-31 12:34:34 -07:00
Shivam Dave
def5e17bb8 [Mobile] Merge
Merged open73 into mobile. Search bar is currently
covering the create button slightly.
2015-08-26 14:07:52 -07:00
Charles Hacskaylo
e96d3e3738 [Mobile] IN PROGRESS: Significant redo of object-header
open #74
Added .bar .l-flex using display: flex in object header;
2015-08-24 12:22:08 -07:00
Victor Woeltjen
6aaa887e65 [Imagery] Start off with empty timestamp
Show nothing in the timestamp area when there is no
data yet available for image telemetry, WTD-1170.
2015-08-24 09:39:42 -07:00
Pete Richards
3a050cc5b8 [Style] space after operator 2015-08-24 09:03:31 -07:00
Charles Hacskaylo
ee608cc4a4 [Mobile] IN PROGRESS: General fixes, spurred by mobile, for object-header
open #74
Attempting to layout using flex - not working;
See http://jsfiddle.net/charlesh88/cpf9zjts/9/ for working example;
New _flex.scss added;
This commit is changed elements that are mostly solid;
2015-08-21 15:09:23 -07:00
Victor Woeltjen
7fe866060b [Code Style] Use prototypes in forms bundle
WTD-1482.
2015-08-14 13:44:08 -07:00
Victor Woeltjen
6302eee17e [Code Style] Use prototypes in Scrolling List bundle
WTD-1482.
2015-08-13 12:35:48 -07:00
Victor Woeltjen
820c15d74c [Code Style] Use prototypes in Plot bundle
WTD-1482.
2015-08-13 12:12:15 -07:00
Victor Woeltjen
aefad6fdd3 [Code Style] Continue refactor of Plot bundle
Continue refactoring Plot bundle to use prototypes,
WTD-1482
2015-08-13 10:26:04 -07:00
Victor Woeltjen
18bc7d3637 [Code Style] Begin using prototypes in Plot bundle
WTD-1482
2015-08-12 14:49:03 -07:00
Victor Woeltjen
175490e1f7 [Code Style] Use prototypes in Web Page bundle
WTD-1482
2015-08-12 14:32:05 -07:00
Victor Woeltjen
ed53808556 [Code Style] Use prototypes in Layout bundle
WTD-1482
2015-08-12 13:45:48 -07:00
Victor Woeltjen
a9e2d48036 [Code Style] Use prototypes in Imagery bundle
WTD-1482
2015-08-12 09:57:05 -07:00
Victor Woeltjen
d701567b70 [Code Style] Use prototypes for Events bundle
WTD-1482
2015-08-11 16:01:16 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs
WTD-1482.
2015-08-07 12:13:15 -07:00
Victor Woeltjen
eaaa1a19ca [JSDoc] Remove obsolete module references
WTD-1482
2015-08-07 11:55:38 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations
Bulk-add JSDoc annotations, WTD-1482.
2015-08-07 11:44:54 -07:00
Victor Woeltjen
2ca3c6ea93 [Layout] Use consistent whitespace
Use consistent whitespace in array literals, WTD-1424.
2015-08-04 10:00:44 -07:00
Victor Woeltjen
a4c704a5a2 [Layout] Ensure minimum frame size
Ensure default frame size in a layout is not small,
even if the grid size for the layout is very small.
WTD-1424.
2015-08-03 12:18:49 -07:00
Victor Woeltjen
deed95d8d1 [Plot] Don't allocate charts for empty plots
Don't allocate WebGL charts for empty plots, WTD-1444.
2015-07-17 09:13:20 -07:00
Victor Woeltjen
e400f211c4 Merge remote-tracking branch 'nasa/open1404' into open1427
Merge in preparation for review/integration, WTD-1427

Conflicts:
	platform/commonUI/general/res/templates/containers/accordion.html
2015-07-15 13:45:37 -07:00
Charles Hacskaylo
af2ca49b23 [Frontend] Added top right resize corner
WTD-1404
WTD-1376
2015-06-30 09:27:56 -07:00
Victor Woeltjen
5f80fcabc6 [Imagery] Clear background image
Clear background image on change, WTD-1407.
2015-06-29 18:49:36 -07:00
Victor Woeltjen
397a545482 [Plot] Expand range to give margin for points
Expand range to give some margin for points near the edge,
WTD-1406.
2015-06-29 18:08:03 -07:00
Victor Woeltjen
fa8095d5bc Merge branch 'open-master' into open1317limits2
WTD-1405

Conflicts:
	platform/features/layout/res/templates/elements/telemetry.html
2015-06-29 17:30:33 -07:00
Victor Woeltjen
0b4aa730f4 Merge pull request #30 from slhale/open26
[Events] Create tests for real time version
2015-06-29 15:42:33 -07:00
Victor Woeltjen
87f982b03e Merge remote-tracking branch 'nasa/open-master' into open-master 2015-06-29 15:10:02 -07:00
Victor Woeltjen
29283e4fb5 Merge branch 'open1233' into open-master 2015-06-29 15:09:40 -07:00
larkin
cc64412d78 Merge remote-tracking branch 'origin/open1344' into open-1348 2015-06-29 14:58:27 -07:00
larkin
52cf918d08 Merge remote-tracking branch 'origin/open1317' into open-1346 2015-06-29 14:44:24 -07:00
Sarah Hale
2ab3932ce1 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 14:43:19 -07:00
Sarah Hale
f816b5018a [Events] Style
Removed unused variables. #26.
2015-06-29 13:15:56 -07:00
Victor Woeltjen
ebbac233aa Merge branch 'open1373' into open-master 2015-06-29 13:15:43 -07:00
Sarah Hale
b91b197f5b [Events] Comments
Removed todo comment. #26.
2015-06-29 13:14:51 -07:00
Sarah Hale
14694c675b [Events] All tests work
All of the tests for the RT Events are working. #26.
2015-06-29 13:13:05 -07:00
Sarah Hale
56c3e72d32 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 13:10:46 -07:00
Sarah Hale
6616dedf63 [Events] Controller test correction
Test for the RT Event List controller now
actually works. #26.
2015-06-29 13:09:15 -07:00
larkin
38ad8058e8 Merge remote-tracking branch 'origin/open1223' into open-1338
Resolve merge conflicts due to whitespace changes.
2015-06-29 12:08:16 -07:00
larkin
84345caf7d [Style] Convert tabs to spaces 2015-06-29 11:51:28 -07:00
Sarah Hale
4c6b3c7a13 [Events] Policy test correction
The view policy test for real time Messages
actually now works. #26.
2015-06-29 09:56:59 -07:00
Sarah Hale
d120c8b139 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 09:10:23 -07:00
Victor Woeltjen
762f4d59fc [Layout] Disallow folders
Disallow layouts in folders, WTD-1373.
2015-06-27 12:43:32 -07:00
Sarah Hale
4e03d7b29b [Events] RT Messages policy test
The view policy test for real time Messages
now works. #26.
2015-06-26 15:17:17 -07:00
larkin
d729cfcd3e Merge remote-tracking branch 'origin/open1329' into open1343 2015-06-26 15:13:21 -07:00
larkin
f9782f1f45 Merge remote-tracking branch 'origin/open1273' into open-1340 2015-06-26 15:03:19 -07:00
Sarah Hale
41e75d7494 [Events] EventListController test
Test for the Event List controller now works. #26.
2015-06-26 14:59:04 -07:00
Sarah Hale
95f9d783d3 [Events] Column tests working
Tests for the domain and range columns now work
for the real time event list. #26.
2015-06-26 14:23:41 -07:00
Victor Woeltjen
286ac5628b [Drag-Drop] Check for default prevented correctly
Check for defaultPrevented property instead of trying
to check nonexistent method isDefaultPrevented(); for
WTD-1354 in the context of WTD-1233.
2015-06-26 11:53:45 -07:00
Victor Woeltjen
f681d07643 Merge branch 'open-master' into open1233 2015-06-26 11:50:48 -07:00