ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-30 01:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nasa/open-master' into open922

Browse Source 
Merge in latest from open-master in preparation for
review/integration, for WTD-922
This commit is contained in:
Victor Woeltjen 2015-03-18 14:57:09 -07:00
commit 6721bca32a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/commonUI/edit/res/templates/edit-object.html
View File

@ -2,12 +2,13 @@
mct-object="domainObject" mct-object="domainObject"
ng-model="representation"> ng-model="representation">
</mct-representation> </mct-representation>
<div class="holder edit-area outline abs"> <div class="holder edit-area outline abs"
ng-controller="SplitPaneController as vSplitter">
<mct-toolbar name="mctToolbar" <mct-toolbar name="mctToolbar"
structure="toolbar.structure" structure="toolbar.structure"
ng-model="toolbar.state"> ng-model="toolbar.state">
</mct-toolbar> </mct-toolbar>
<div class='split-layout vertical contents abs work-area' ng-controller="SplitPaneController as vSplitter"> <div class='split-layout vertical contents abs work-area'>
<div <div
class='abs pane left edit-main' class='abs pane left edit-main'
ng-style="{ right: (vSplitter.state()+5) + 'px'}" ng-style="{ right: (vSplitter.state()+5) + 'px'}"