Compare commits

...

42 Commits

Author SHA1 Message Date
687f4b8d65 [Frontend] Significant mods to fluid-layouts
- Restructure code to make better use of mixins;
- Added .fl-mobile-only selector;
- Simplified layout logic for column/row/wrap styles;
2018-06-05 17:47:09 -07:00
6eb3ffcbd6 Merge latest 'master' into fluid-layouts
# Conflicts:
#	platform/commonUI/edit/res/templates/elements.html
2018-06-04 13:26:00 -07:00
721b966b0c fix failing test 2018-05-25 13:15:31 -07:00
1fc64e54b5 merge with master and fix coflicts 2018-05-25 13:11:27 -07:00
ec682d5734 [Frontend] Added new 12px grippy glyph
- Font files and CSS updates for Elements pool sorting styling;
2018-05-22 17:16:02 -07:00
6b8da63697 [Frontend] Added new 12px list view glyph
- Font files and CSS updates;
2018-05-22 16:30:39 -07:00
6040bafba8 [Frontend] Tweaks to Elements pool reordering styles
- "reorder-actor" added/removed from parent tree item;
- Refined styling for drag in process in list;
2018-05-22 16:12:35 -07:00
cb9ae92e69 stacked plots reload on composition change 2018-05-22 13:53:12 -07:00
d14c2cf62e add reorder-actor class to draggable item in elements pool when selected and remove class when dropped 2018-05-22 11:39:39 -07:00
03663488b9 [Frontend] Styles for reordering in Elements pool
- Changed class "dragging" to "reordering";
- Visual styling WIP;
- TODO: style "reorder-actor" when implemented;
2018-05-22 11:20:39 -07:00
34ccf45351 [Frontend] Allow editor to set mins dimensions for fluid layout
- Cleanups in CSS;
- Mod to LayoutController.js to use minWidth and minHeight;
2018-05-22 10:48:14 -07:00
dff7e3d8a2 Merge branch 'fluid-layouts' of https://github.com/nasa/openmct into fluid-layouts 2018-05-21 16:07:29 -07:00
5435e9d88b [Frontend] Added fl-mobile-best-fit 2018-05-21 16:05:38 -07:00
8c22ce23bf add maxHeight and maxWidth to layout frames 2018-05-21 13:39:51 -07:00
4b827e2c13 add ability to rearrange composition using drag gestures 2018-05-21 12:11:04 -07:00
25588c87d1 fix conflict 2018-05-21 10:17:26 -07:00
73a8f71740 merge latest to local 2018-05-21 10:15:54 -07:00
04f333f99b working drag and switch, need to mutate 2018-05-18 08:55:30 -07:00
5f592099fb [Frontend] More CSS tweaks
- WIP!
- Added .fl-phone-best-fit
2018-05-17 15:19:13 -07:00
9a9db2ddd9 [Frontend] Added .drag-vertical
- For use in Elements pool;
- Applied in elements.html;
2018-05-17 14:56:38 -07:00
5ae0e97e03 [Frontend] More CSS tweaks
- WIP!
2018-05-17 14:56:38 -07:00
62ccbd87ba [Frontend] Grid holder and class prefixing
- WIP!
- Edit grid-holder set to position: absolute
- Added "fl-" prefix to fluid layout class names;
2018-05-17 14:56:38 -07:00
4ce2b471d7 [Frontend] Add Advanced CSS property to Display Layouts
- WIP!
- Add property to bundle;
- Add CSS for column, row and fit-all classes;
2018-05-17 14:56:38 -07:00
202ca2e553 fixes issue #1999 - Use Object name as default export filename (#2001)
* fixes issue #1999
add dynamic name(object name) to exportAsCSV filename

* make requested changes
2018-05-17 14:56:38 -07:00
e1397258e5 [Copyright] Update copyright year across platform code references
Fixes #2034.
2018-05-17 14:56:38 -07:00
935386ef6e [TimeConductor] Fixes Issue #925 (#2020)
* [TimeConductor] Fixes Issue #925`
- Pressing enter in date field will update bounds properly in Safari
2018-05-17 14:56:37 -07:00
e1c1a25d66 [Timer] Fix regression in timer visual indication and add tests 2018-05-17 14:56:37 -07:00
b8248aabfb fix: check if stats is present before reseting zoom (#2029) 2018-05-17 14:56:37 -07:00
7d32ea468f [Frontend] Added .drag-vertical
- For use in Elements pool;
- Applied in elements.html;
2018-05-17 14:50:19 -07:00
73ad8aa74f [Frontend] More CSS tweaks
- WIP!
2018-05-17 14:31:06 -07:00
6448269d5c [Frontend] Grid holder and class prefixing
- WIP!
- Edit grid-holder set to position: absolute
- Added "fl-" prefix to fluid layout class names;
2018-05-17 11:20:10 -07:00
00b8104023 [Frontend] Add Advanced CSS property to Display Layouts
- WIP!
- Add property to bundle;
- Add CSS for column, row and fit-all classes;
2018-05-16 16:43:01 -07:00
18c1056800 [Frontend] Mods to imagery CSS
Fixes #2008
- Reduced size of image thumbnails;
- Changed min-heights of image and thumbnail
holders for .mobile.phone
2018-05-11 08:37:15 -07:00
853d21bb32 remove couchdb and reinstall localStorage 2018-05-10 14:43:23 -07:00
f265c3e495 Add touch functionality to mct-drag
it allows users to use the splitter in mobile
and include appropriate tests
2018-05-10 14:32:07 -07:00
336d58d45a [Frontend] Various
Fixes #2008
- Always show Timeline zoom controls;
- Prevent inline editing of object names in the main view when in
mobile;
2018-05-09 12:17:30 -07:00
c22659432d fixes multiple issues related to 2008
context menu firing too often - fixed by setting a isDragging flag
Add and Remove respective classes on mobile orientation change by using mathMedia
Close tree pane when navigating in mobile portrait only
2018-05-07 12:07:18 -07:00
5126e6b842 [Frontend] Significant mobile fixes for panes and viewport
Fixes #2008
Fixes #1770
Fixes #1928
- Left and right panes now positioning properly in mobile;
- Fixed body overflow problem for #2008 "viewport" issue;
2018-05-04 18:10:06 -07:00
e02e47f2a0 [Frontend] Hide TC ticks when on mobile
Fixes #2008
- Added class `mobile-hide` to <conductor-axis>
2018-05-04 18:10:06 -07:00
8a51e8ca48 [Frontend] Remove data visualization element in TC
Fixes #2008
- Note: this element holds the TOI indicator!
2018-05-04 18:10:06 -07:00
a60996abd4 [Frontend] Fix to Time Conductor for Safari
Fixes #2008
- CSS mod for gradient blockers in TC
2018-05-04 18:10:06 -07:00
2b58500508 [Frontend] Viewport metatag updated
Fixes #2008
- Added shrink-to-fit=no;
2018-05-04 18:10:06 -07:00
4 changed files with 85 additions and 46 deletions

2
app.js
View File

@ -78,7 +78,7 @@
app.use(express['static'](options.directory)); app.use(express['static'](options.directory));
// Finally, open the HTTP server and log the instance to the console // Finally, open the HTTP server and log the instance to the console
app.listen(options.port, function() { app.listen(options.port, '0.0.0.0', function() {
console.log('Open MCT application running at localhost:' + options.port) console.log('Open MCT application running at localhost:' + options.port)
}); });
}()); }());

View File

@ -56,7 +56,7 @@ define(
// declared as a method but as a property which happens to // declared as a method but as a property which happens to
// be a function. // be a function.
if (agentService.isPhone() && agentService.isPortrait()) { if (agentService.isPhone() && agentService.isPortrait()) {
// On phones, trees should collapse in portrait mode // On phones, πs should collapse in portrait mode
// when something is navigated-to. // when something is navigated-to.
self.state = false; self.state = false;
} }

View File

@ -175,12 +175,19 @@ body.desktop .frame {
} }
} }
.holder-object:not(.s-status-editing) {
.l-layout { /**************************************************************** FLUID LAYOUTS */
/*
fl-column: obey min-height, but use min-width: auto;
fl-row: obey min-width, but use min-height: auto;
fl-wrap: uses both min-width and min-height;
fl-mobile-best-fit: fl-column or fl-row depending on orientation
*/
@mixin flStyles() {
&.fl-column, &.fl-column,
&.fl-row, &.fl-row,
&.fl-wrap,
&.fl-phone-best-fit,
&.fl-mobile-best-fit { &.fl-mobile-best-fit {
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -191,6 +198,9 @@ body.desktop .frame {
flex: 1 1 auto; flex: 1 1 auto;
width: auto !important; width: auto !important;
height: auto !important; height: auto !important;
top: auto !important;
left: auto !important;
position: relative;
&.t-object-type-summary-widget { &.t-object-type-summary-widget {
&.no-frame.t-frame-outer > .t-rep-frame { &.no-frame.t-frame-outer > .t-rep-frame {
&.contents { &.contents {
@ -202,29 +212,38 @@ body.desktop .frame {
} }
} }
} }
&.fl-column {
flex-direction: column;
padding-right: $interiorMargin;
}
&.fl-row {
flex-direction: row;
padding-bottom: $interiorMargin;
}
&.fl-wrap { &.fl-wrap {
align-content: flex-start;
align-items: flex-start;
flex-wrap: wrap; flex-wrap: wrap;
} }
}
@mixin flColumn() {
flex-direction: column !important;
&:not(.fl-wrap) > .frame { min-width: auto !important; }
padding-right: $interiorMargin;
}
@mixin flRow() {
flex-direction: row !important;
&:not(.fl-wrap) > .frame { min-height: auto !important; }
padding-bottom: $interiorMargin;
}
.holder-object:not(.s-status-editing) {
// Browsing only
.l-layout:not(.fl-mobile-only) {
@include flStyles();
&.fl-column { @include flColumn(); }
&.fl-row { @include flRow(); }
} }
} }
.holder-object { .holder-object {
.l-layout { // Editing AND browsing
.l-layout:not(.fl-mobile-only) {
&.fl-column, &.fl-column,
&.fl-row, &.fl-row,
&.fl-wrap,
&.fl-phone-best-fit,
&.fl-mobile-best-fit { &.fl-mobile-best-fit {
> .frame { > .frame {
top: auto !important; top: auto !important;
@ -236,14 +255,20 @@ body.desktop .frame {
} }
body.mobile { body.mobile {
.l-layout.fl-mobile-only {
@include flStyles();
}
.l-layout.fl-mobile-best-fit { .l-layout.fl-mobile-best-fit {
flex-wrap: wrap !important;
padding: 0 !important; padding: 0 !important;
} }
&.portrait .l-layout.fl-mobile-best-fit { &.landscape .l-layout {
flex-direction: column !important; &.fl-mobile-best-fit {
@include flRow();
}
}
&.portrait .l-layout {
&.fl-mobile-best-fit {
@include flColumn();
} }
&.landscape .l-layout.fl-mobile-best-fit {
flex-direction: row !important;
} }
} }

View File

@ -49,6 +49,20 @@ define(
if (DeviceMatchers[key](agentService)) { if (DeviceMatchers[key](agentService)) {
body.addClass(key); body.addClass(key);
} }
if ((index === (array.length - 1)) && agentService.isMobile()) {
var mediaQuery = window.matchMedia('(orientation: landscape)');
mediaQuery.addListener(function (event) {
if (event.matches) {
body.removeClass('portrait');
body.addClass('landscape');
} else {
body.removeClass('landscape');
body.addClass('portrait');
}
});
}
}); });
if (agentService.isMobile()) { if (agentService.isMobile()) {