ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 14:32:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,410 Commits 989 Branches 212 Tags 191 MiB
066258ab83
Commit Graph

564 Commits

Author SHA1 Message Date
Shivam Dave
137a60f510 [Mobile] Constants 
Fixed constants to work for laptop.
 2015-07-13 10:16:52 -07:00
Dave
46d5a1431f [Mobile] Added Constants 
Rixed mis-initialized desktop
constant
 2015-07-13 09:24:01 -07:00
Dave
404d02ec23 [Mobile] Added Constants 
Re-edited constants to set min
ones for the desktop screen, that
is based on the device size.
 2015-07-13 09:17:59 -07:00
Shivam Dave
eec955317a revert back to 
4d9dc3624b
 2015-07-10 12:47:00 -07:00
Dave
67890a7298 [Mobile] Test 2015-07-10 12:38:04 -07:00
Dave
dd457f26c6 [Mobile] Device 
Added max width to tablet check.
 2015-07-10 12:32:34 -07:00
Dave
85c6bda5c9 [Mobile] Device 
Adjusted Tablet slide Constant.
 2015-07-10 12:21:13 -07:00
Dave
b7b5f87002 [Mobile] Device 
Adjusted Comp Constant.
 2015-07-10 12:16:43 -07:00
Dave
b0c5d807e7 [Mobile] Device 
Removes splits desktop
settings into 2, one
for landscape and another
for portrait.
 2015-07-10 11:51:56 -07:00
Dave
4d4776e0ef [Mobile] Device 
Removes desktop mixin settings
that do not use device width and
height.
 2015-07-10 11:40:57 -07:00
Dave
61e1aeb1d8 [Mobile] Device 
Removes desktop mixin settings
that do not use device width and
height.
 2015-07-10 11:40:14 -07:00
Dave
9caa603a65 [Mobile] Device 
Removes desktop mixin settings
that do not use device width and
height.
 2015-07-10 11:36:45 -07:00
Dave
5c99e469d5 [Mobile] Device Change 
Now instead of min-width, max-width,
... etc, uses the device-width/height.
This allows the devices to use the slide
menu while the browser on a desktop
consistently stays as desktop mode, no
matter if it is resized. As a result of this
the rwd is clear on phones/tablets, but not if
user resizes browser super small.
 2015-07-10 11:29:30 -07:00
Dave
4d9dc3624b [Mobile] Items 
Item icons disappear now on
tablets and mobile devices.
Adjusted _items.scss to adjust the
icon class display for phones and
tablets.
 2015-07-10 11:12:09 -07:00
Dave
d3ae4b729f [Mobile] More consistent 
More consistent when moving from
landscape to portrait and
vice-versa on devices. However
still encountering issue with
the browser being resized.
 2015-07-10 10:56:48 -07:00
Dave
30bed434fe [Mobile] Moved variables 
Moved variables used for amount of
side bar and slide amount into the
mobile/_constants.scss file.
 2015-07-10 09:02:46 -07:00
Dave
3e4ae4d38d [Mobile] 
Reverted changes to original controller file.
 2015-07-09 15:38:53 -07:00
Dave
7414275a85 [Mobile] 
Reverted changes to original scss file.
 2015-07-09 15:37:03 -07:00
Dave
fcb0033864 [Mobile] 
Reverted changes to css file.
 2015-07-09 15:32:41 -07:00
Dave
f079471a18 [Mobile] 
Reverted changes to scss file.
 2015-07-09 15:31:35 -07:00
Dave
1fb1174c0a [Mobile] Clean-Up 
Removed unused scss constant
.
 2015-07-09 15:19:29 -07:00
Dave
635e1eda69 [Mobile] Clean-Up 
Removed unused menu button and
cleaned up treeCl to be treeClass.
 2015-07-09 15:14:36 -07:00
Dave
40d53f941f [Mobile] TreeMenuController 
Removed the TreeMenuController.js file
and from the bundle. What this achieves
is already done in BrowseController.js
 2015-07-09 14:46:36 -07:00
Dave
684a0e88a2 [Mobile] Constants 
Added constants to the
mobile one with device
height.
 2015-07-09 14:26:02 -07:00
Dave
30a4f15330 [Mobile] Adjusted 
Adjusted the _layout.scss to
have a function that makes
something disappear on phone
and tablet.
 2015-07-09 14:11:51 -07:00
Dave
dfd08000f1 [Mobile] Adjust 
Adjusted the tablet amount
that the slide occurs.
 2015-07-09 13:42:07 -07:00
Dave
82c8d26264 [Mobile] 
Now does not display
the icon for the slide menu
on desktops.
 2015-07-09 11:16:41 -07:00
Dave
bd236e1cb1 [Mobile] Icon 
Added menu/hamburger icon.
 2015-07-09 11:06:25 -07:00
Dave
e47a36e799 [Mobile] Simplified 
treeSlide now uses one line that
sets it to true or false simply
like a switch. So not matter what
it will either slide or not.
 2015-07-09 10:55:52 -07:00
Dave
30efec0090 [Mobile] Angular 
Replaced document usage with
angular calls that change the ternary
op to flip the slide.
 2015-07-09 10:53:03 -07:00
Dave
b9371ea03d [Mobile] Moved Button 
Button moved to the Browse.html
and BrowseController handles the
tree slide.
 2015-07-09 10:28:45 -07:00
Dave
7974f33781 [Mobile] Phone 
Adjusted to differentiate
phones and tablets.
 2015-07-08 16:28:40 -07:00
Dave
cdcaedc8dd [Mobile] Added transistions 
Transistions added, however still using
document.getElementById.
 2015-07-08 15:57:08 -07:00
Dave
07ef4dfe8a [Mobile] Menu Slide 
Menu slides, but not transition
css slides out on click. Currently
uses document, which needs to be
replaced with angular version using
 and/or  and/or
ng-class and/or ng-click.
 2015-07-08 14:27:59 -07:00
Dave
342be0822f [Mobile] Gen css 2015-07-08 12:17:19 -07:00
Dave
5c56484889 [Mobile] Main scss added 
Added the mobile files as imports
to the main scss files that
generate as css files.
 2015-07-08 12:14:40 -07:00
Dave
2b4162c0be [Mobile] Reorganize 
Reorganized the sass files. To incorporate, new
mobile directory, which holds all the mobile
sass code.
 2015-07-08 12:11:48 -07:00
Dave
3704d64560 [Mobile] Push to show current 2015-07-08 11:08:31 -07:00
Dave
24fae72492 [Mobile] Left tree 
Attempt to resize left
tree menu when changing device.
Currently does not move the splitter
bar.
 2015-07-07 16:46:32 -07:00
Dave
79fb6eabd9 [Mobile] Menu Button 
Menu button added to the
bundle and as a file modelled
after the action button.
 2015-07-07 16:28:34 -07:00
Dave
1ddb00c8d6 [Mobile] Resize 
Resized the height of each
item in grid based on new
tablet/phone widths.
 2015-07-07 14:01:57 -07:00
Dave
8a0b77ec5c [Mobile] Folder View 
Folder representation now
will be a list.
 2015-07-07 13:02:40 -07:00
Shivam Dave
2fc447e16f [Mobile] Comments 
Added comments and reverted the
grid back to normal.
 2015-07-07 10:15:25 -07:00
Shivam Dave
d828bf59f9 [Mobile] Constants/Etc 
Added constants for media queries.
in _constants.scss. Also, now on tablet,
zoom is disabled.
 2015-07-07 09:58:22 -07:00
Shivam Dave
d8806f14aa [Mobile] Set viewport 
Viewport has been set in
index.html. Then what was
implemented prior to this
(rem-display and browser-manage)
was commented out.
 2015-07-07 09:08:16 -07:00
Shivam Dave
0c6a9ca857 [Mobile] Styles 
Added new style to set the width
of the tree.
 2015-07-06 13:15:38 -07:00
Victor Woeltjen
1c4cca3f91 Merge branch 'open1392b' into open-master 2015-06-29 16:30:48 -07:00
Victor Woeltjen
ef77ca91e7 Merge branch 'open1363' into open-master 2015-06-29 16:27:10 -07:00
Victor Woeltjen
970698c77b Merge remote-tracking branch 'nasa/open1392' into open1392b 
Conflicts:
	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
 2015-06-29 16:09:01 -07:00
Charles Hacskaylo
a7c90f2476 [Frontend] platform-specific changes to CSS, fonts and markup 
WTD-1392
WTD-1360
WTD-1394
New minus symbol added to font;
Updated folder symbols art;
CSS tweaked for reset button (WTD-1394) and direction sign;
Font project file updated;
(cherry picked from commit f6c7d8e)
 2015-06-29 14:39:46 -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
Victor Woeltjen
66f8ee7194 [Common UI] Fix min/max bounds of mct-split-pane 
WTD-1363. Use correct dimension (width or height)
when determining maximum splitter position.
 2015-06-29 11:54:40 -07:00
Victor Woeltjen
b524dc451f [Common UI] Remove unused function 
Remove obsolete function from mct-split-pane, WTD-1363
 2015-06-29 11:27:48 -07:00
Charles Hacskaylo
c262fe814c [Frontend] Added pointer-events: none 
WTD-1363?
 2015-06-29 11:08:28 -07:00
Victor Woeltjen
12b34b5d58 Merge pull request #27 from shivamndave/open25 
Addresses #25
 2015-06-27 12:26:15 -07:00
Victor Woeltjen
a752a21bf8 Merge branch 'open-master' into open1388 2015-06-27 12:17:45 -07:00
Victor Woeltjen
8c5b497377 [Common UI] Tweak mct-split-pane 
Tweak mct-split-pane for use in timeline; particularly,
improve synchronization between views. WTD-1363.
 2015-06-27 11:59:18 -07:00
Victor Woeltjen
a0d5a1a196 [Common UI] Get split pane width from elements 
WTD-1363.
 2015-06-27 10:46:42 -07:00
Victor Woeltjen
c79b018c84 [Common UI] Remove obsolete checks 
Remove obsolete minimum/maximum checks, WTD-1363.
 2015-06-27 10:40:05 -07:00
Victor Woeltjen
a1eb15db77 [Common UI] Change min/max width handling in splitter 
In split pane, obey the min-width and max-width style properties
of first element within the pane. WTD-1363.
 2015-06-27 10:35:49 -07:00
Charles Hacskaylo
8841f25186 [Frontend] Create menu style normalized 
WTD-1392
WTD-1367
WTD-1391
Some significant reorging in _menus.scss and _constants;
Create menu normalized with context menu styles;
Bottom bar of overlay overflow set to visible to prevent button clipping;
 2015-06-26 18:38:33 -07:00
Charles Hacskaylo
e3cb9dae5a [Frontend] Bottom bar restyled 
WTD-1392
WTD-1362
Fixed font size in botttom bar;
Added font-smoothing to global.scss;
Bottom bar design restyled;
 2015-06-26 17:12:24 -07:00
Victor Woeltjen
72c812cdaa [Common UI] Enforce split pane min/max 
WTD-1363.
 2015-06-26 16:30:39 -07:00
Victor Woeltjen
39372ea9ca [Common UI] Use mct-split-pane in Browse 
WTD-1363.
 2015-06-26 16:21:20 -07:00
Victor Woeltjen
0ee76421e0 [Common UI] Add mct-splitter 
WTD-1363.
 2015-06-26 15:59:16 -07:00
Charles Hacskaylo
83be455b0b [Frontend] Added user-select: none to .btn, .l-btn class 
WTD-1392
WTD-1074
 2015-06-26 15:52:07 -07:00
Charles Hacskaylo
50bf7b7b32 [Frontend] Removed crosshair cursor from image class 
WTD-1392
WTD-1371
 2015-06-26 15:38:38 -07:00
Charles Hacskaylo
0fd1fb709b [Config] Fix for priority of New Tab button 
WTD-1392
WTD-1359
Set "Open in new tab" button to have priority "preferred";
Set fullscreen mode button to priority "default";
Tweaked full screen button tooltip text;
 2015-06-26 15:36:55 -07:00
Victor Woeltjen
243c832c25 [Common UI] Add mct-split-pane 
Add mct-split-pane directive, to simplify adding splitters.
WTD-1363.
 2015-06-26 15:32:37 -07:00
larkin
f9782f1f45 Merge remote-tracking branch 'origin/open1273' into open-1340 2015-06-26 15:03:19 -07:00
Victor Woeltjen
f8f2019dad Merge remote-tracking branch 'nasa/open1322' into open1388 2015-06-26 13:25:12 -07:00
Shivam Dave
d42abfef98 [Addressability] Comments 
Added comments to the slight change in Browse
Controller and BrowseObjectController. WTD 25.
 2015-06-26 12:58:16 -07:00
Shivam Dave
2e716bdbe3 [Addressability} Unit Test 
Completed unit tests to accomodate
for url path check prior to setting
the current . WTD 23.
 2015-06-26 12:51:25 -07:00
Victor Woeltjen
2161707954 Merge pull request #24 from shivamndave/open23 
Addresses #23
 2015-06-26 12:41:43 -07:00
Shivam Dave
3de4473159 [Addressability] Re-Edit Bug 
Fixed re-edit but by implementing
what Victor said in issue #25. Adding
check on /browse/ part of url and then
changing route works WTD 23.
 2015-06-26 11:52:03 -07:00
Shivam Dave
cd70ed6f94 Merge remote-tracking branch 'upstream/master' into open23 2015-06-26 11:44:11 -07:00
Charles Hacskaylo
fce327a398 [Dev/Frontend] New symbol added to symbols font 
WTD-1322
Platform-only commit;
(cherry picked from warp1322 commit 7254013)
 2015-06-25 15:17:08 -07:00
Shivam Dave
2a347f1596 [Windowing] urlService 
Removed the urlService from the edit
and browse bundles. Added the urlService
to the general bundle. WTD 23.
 2015-06-25 14:53:52 -07:00
Sarah Hale
bf8b0bae03 Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 14:51:18 -07:00
Shivam Dave
193df4fde3 [Windowing] Excess function 
Removed extra function from
urlService. WTD 23.
 2015-06-25 14:37:01 -07:00
Shivam Dave
3d0e0af7f2 [Windowing] Remove variable 
Excess variable used for CancelAction's
ReturnToBrowse. WTD 23.
 2015-06-25 14:28:38 -07:00
Shivam Dave
5ba0f9d7a1 Merge remote-tracking branch 'upstream/master' into open23 2015-06-25 14:08:46 -07:00
Shivam Dave
3a371483ab [Windowing] urlService 
Added the urlService to the unit
tests for the cancel and save buttons
also removed unused services. WTD 23.
 2015-06-25 14:07:02 -07:00
Shivam Dave
6d28add055 [Windowing] urlService 
urlService added to the edit action
bundle.json in addition to being
implemented, however 2nd time edit
bug still occurring. Also fixed urlService
test suite. WTD 23.
 2015-06-25 13:16:15 -07:00
Victor Woeltjen
bd5ba48270 Merge remote-tracking branch 'github/master' into open-master 2015-06-25 12:05:34 -07:00
Victor Woeltjen
3df12788f9 Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 11:53:13 -07:00
Charles Hacskaylo
685e384858 [Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection 
WTD-1341
(cherry picked from commit 5151637 in warp1341)
telemetry.html now uses data-value instead of class;
Mods to effects.scss to add customKeyframes mixin;
Added default transition time to mixin trans-prop-nice in mixins.scss;
 2015-06-25 11:46:15 -07:00
larkin
abaca86290 Merge remote-tracking branch 'origin/open1291' into open-1330 2015-06-25 11:30:33 -07:00
Shivam Dave
fd6459394a [Windowing] urlService 
Changed folder location of
services and therefore urlService
to general/src/ instead of being in
browse/src/. WTD 23.
 2015-06-25 10:38:39 -07:00
Shivam Dave
93ba4ce715 [Windowing] Unit Test 
Added Unit test adjustments for
the change in urlService (addition
of a separate function for getting
the url for a location, used by browse
controller. WTD 23.
 2015-06-25 10:10:13 -07:00
Victor Woeltjen
70f5a001ee Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 10:06:18 -07:00
Sarah Hale
c6405c50df Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 10:00:21 -07:00
Victor Woeltjen
d3ff49b90b Merge remote-tracking branch 'nasa/open1319' into open1320 2015-06-25 09:59:23 -07:00
Shivam Dave
ca6f44f7b6 [Windowing] URL Fix 
The URL malformation was caused by the same
function returning the view and index path for
both the newtab window and the browse controller
window. As a result, the BrowseController now only
uses a path that excludes the view and index paths,
like before the UrlService was added. Another,
separate function uses this url for the location
and includes the view and index paths for new
tabs, in order to maintain the current view. WTD 23.
 2015-06-25 09:47:58 -07:00
Victor Woeltjen
25d3a4d8c2 Merge remote-tracking branch 'nasa/open1323' into open1324 2015-06-25 09:25:42 -07:00
Victor Woeltjen
9ac6abe78f Merge remote-tracking branch 'nasa/open980' into open1342 2015-06-25 09:07:27 -07:00
Charles Hacskaylo
9f137513d9 Merge branch 'open-master' of https://trunk.arc.nasa.gov/git/wtd into open1341 2015-06-24 19:25:27 -07:00
Charles Hacskaylo
19748ba17c [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
Re-rendered css file;
 2015-06-24 18:56:38 -07:00
Charles Hacskaylo
52a7bd1033 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:55:15 -07:00
Charles Hacskaylo
e357df2fe5 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:52:52 -07:00