Commit Graph

4588 Commits

Author SHA1 Message Date
Victor Woeltjen
32e7f57a7c [Build] Accept future phantomjs versions 2016-09-08 13:48:53 -07:00
Victor Woeltjen
f7dfccb096 [Build] Depend on phantomjs-prebuilt 2.1.11
...due to issues installing 2.1.12 on Linux. Fixes #1176.
2016-09-08 13:41:51 -07:00
David Hudson
990c653397 Merge branch 'open967' of github.com:hudsonfoo/openmct into open967 2016-09-08 11:06:05 +09:00
David Hudson
911ece7612 [Frontend] Remove styles that are no longer necessary
Issue #1164. Based on updates from 0457f7bee8 these styles
are no longer necessary and have been removed.
2016-09-08 11:05:19 +09:00
David Hudson
222b4421e5 [Frontend] Remove styles that are no longer necessary
Based on updates from 0457f7bee8 these styles
are no longer necessary and have been removed.
2016-09-08 11:03:36 +09:00
Charles Hacskaylo
4517bd1356 [Frontend] New markup for CSS from #1166
Fixes #967
Requires new styles implemented in #1166

(cherry picked from commit 0457f7bee8)
2016-09-08 11:02:42 +09:00
David Hudson
5984ae46fc Merge branch 'master' of github.com:nasa/openmct into open967 2016-09-08 10:50:08 +09:00
Victor Woeltjen
5bde1de61b Merge pull request #1167 from nasa/open1166
Review and integrate generalized control-bar styling for views
2016-09-07 13:37:10 -07:00
Andrew Henry
06d229ea99 Merge pull request #1133 from charbelrami/markup
[Frontend] Tweak markup
2016-09-07 13:16:04 -07:00
Andrew Henry
58391de007 Merge pull request #1150 from aterribili/patch-1
Add .swp to git ignore
2016-09-05 09:58:28 -07:00
David Hudson
ceb3e8e3dd [Enhancement] Add IE, Opera, Safari support for canvas.toBlob()
This is currently being used for exporting plots to PNG/JPG.
2016-09-05 19:40:22 +09:00
David Hudson
35a331f3fd [Frontend] Fix plot image cutoff on export
The images were being cutoff due to the "top" attribute of .gl-plot
not changing when the buttons were hidden. The buttons are now
hidden by CSS class rather than ng-show, which makes updating the
.gl-plot top attribute easier.
2016-09-05 17:02:04 +09:00
David Hudson
7d13ce0626 [Licenses] Add license information for html2canvas, jsPDF, saveAs 2016-09-05 01:22:43 +09:00
David Hudson
a49eebf9f5 [Testing] Add test spec for ExportImageService 2016-09-04 23:04:46 +09:00
David Hudson
989e4e1b75 [Testing] Add jsPDF, html2canvas, and saveAs as injectible dependencies
I would prefer this be passed in via the bundle, but it continues to fail
saying "Unknown Provider". I have chosen to require them into the module
the old-fashioned way, then allow an injectible dependency to override.
2016-09-04 23:02:23 +09:00
David Hudson
9bb647e275 [Testing] Add better dependency injection and error handling 2016-09-04 19:19:14 +09:00
Alex M
3dee082141 [Edit] Add reason for redundant mocks 2016-09-03 19:02:05 +03:00
Alex M
7d52d348b2 [Edit] Fix style issues 2016-09-03 18:33:27 +03:00
Alex M
ded52b8d19 [Edit] Rename cancel() to finish() 2016-09-03 17:55:05 +03:00
Alex M
ab4ce0caba [Edit] Introduced SaveAndStopEditingAction
It replaces SaveAction in the bundle.
2016-09-03 17:55:04 +03:00
Alex M
90c13a3959 [Edit] EditorCapability continues edit on save 2016-09-03 17:55:04 +03:00
Alex M
9847c40e34 [Edit] SaveAction not navigating anymore 2016-09-03 17:55:04 +03:00
steven mirecki
e751461194 Typo corrections, I avoided making changes to words that have regional spelling differences. 2016-09-03 09:16:54 -04:00
David Hudson
a566265a72 [Testing] Add ExportImageService mock 2016-09-03 14:45:09 +09:00
David Hudson
fecf419f83 [Testing] Move ExportImageController into constructor for dependency injection 2016-09-03 14:44:33 +09:00
David Hudson
26c14d2bca [Formatting] Fix styling errors 2016-09-03 14:02:19 +09:00
David Hudson
92bfea1773 [Tests] Mock new argument in PlotController 2016-09-03 13:51:37 +09:00
David Hudson
40ad9c47a8 [Tests] Add jsPDF and html2canvas 2016-09-03 13:51:16 +09:00
David Hudson
de85f79ab6 [Enhancement] Hide export buttons during export
Buttons temporarily hide until export completes.
2016-09-02 20:41:38 +09:00
David Hudson
3736f84c12 [Frontend] Set plot export buttons to show/hide on hover
It's worth noting that I changed the .gl-plot position from relative to absolute
in an attempt to match the results to a similar requirement in MCT Table. Setting
to absolute caused no regressions as far as I could tell, but I have not attempted
browsers outside of Chrome.
2016-09-02 19:36:39 +09:00
Charles Hacskaylo
e7a7025961 [Frontend] Markup for #967
Fixes #967
WIP to be integrated with work
from hudsonfoo in PR #1164

(cherry picked from commit ebadad61c6)
2016-09-02 18:19:20 +09:00
David Hudson
e38cf1e2e8 Merge branch 'master' of github.com:nasa/openmct into open967 2016-09-02 18:17:46 +09:00
Andrew Henry
7b84febfde Merge pull request #1162 from ZachMoreno/patch-1
[Documentation] Updated from OpenMCTWeb to OpenMCT
2016-09-02 09:38:54 +01:00
Charles Hacskaylo
39dcb937d5 [Frontend] CSS and markup tweaks
Fixes #1166
New control-bar height constant
Removed font-size definition in .l-view-section
2016-09-01 20:09:38 -07:00
David Hudson
3e3d3ebcf9 [Formatting] Switched to double quote across the board for consistency 2016-09-02 11:58:15 +09:00
David Hudson
e370271093 [Code Review] Updates based on code review by @VWoeltjen
Set export functions on the ExportImageService prototype. Insantiated
ExportImageService in the PlotController for better dependcy injection.
2016-09-02 11:54:38 +09:00
Charles Hacskaylo
55603b927f [Frontend] Generalized markup and CSS for control-bar
Fixes #1166
New markup and CSS
MIgrated existing tabular views to use
new styles
2016-09-01 19:37:36 -07:00
Victor Woeltjen
e35666bcc6 Merge pull request #1165 from nasa/subobjects1161
Review and integrate initial styling for selectable sub-objects
2016-09-01 12:23:37 -07:00
David Hudson
3a19890be9 [Formatting] Linting 2016-09-02 03:11:26 +09:00
Charles Hacskaylo
725f8202ed Merge remote-tracking branch 'origin/master' into subobjects1161 2016-09-01 10:56:17 -07:00
Charles Hacskaylo
ee917b0e1d [Frontend] Initial styling for selectable styling
Fixes #1161
New .s-selectable, .s-hover, .s-selected and .s-moveable classes
New supporting color constants
Markup in layouts, fixed position/panels updated
Removed old commented code
2016-09-01 10:55:07 -07:00
David Hudson
a8900f3d6d Merge branch 'master' of github.com:nasa/openmct into open967 2016-09-02 02:44:01 +09:00
David Hudson
ea8f429902 [Enhancement] Add export functionality to PlotController
Extends PlotController by adding three new scoped methods:
exportPDF, exportPNG, exportJPG.

All three methods use basically the same steps. The HTML node
of the plot is passed through html2canvas which generates a canvas.
From the canvas we export a blob, PNG, or JPG then save the file.
2016-09-02 02:41:43 +09:00
David Hudson
219301a85b [Frontend] Add export plot buttons 2016-09-02 02:32:42 +09:00
David Hudson
06a453333a [Enhancement] Pass element to plot controller
This will be used for exporting an image of the plot.
2016-09-02 02:31:34 +09:00
David Hudson
5e0975ddfa [Formatting] Remove test code 2016-09-02 02:29:26 +09:00
Zachariah Moreno
76527b310d [Documentation] Revising to uphold standard naming convention of Open MCT
🐙

# Author Checklist:

Changes appear to address issue? Y
Appropriate unit tests included? N/A - No code changes
Code style and in-line documentation are appropriate? N/A
Commit messages meet standards? Y
2016-09-01 09:23:35 -07:00
Andrew Henry
73b4385578 Merge pull request #1160 from nasa/ksp1146
[README] Add link to KSP plugin
2016-09-01 15:59:16 +01:00
Zachariah Moreno
bb3af4eff7 🐙 Updated from OpenMCTWeb to OpenMCT
minor change & please let me know if I can help with anything else
2016-08-31 15:56:57 -07:00
Victor Woeltjen
68adea7b5a Merge pull request #1159 from raoulsullivan/squashed_proxy_parameters
[proxyUrl] pass URL parameters to proxied URL
2016-08-31 09:31:01 -07:00