ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-24 23:36:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

In-progress checkin - NOT WORKING RIGHT YET!

Browse Source
This commit is contained in:
Charles Hacskaylo 2015-03-05 16:02:33 -08:00
parent 1304084f7a
commit 433cdf8b1c
5 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/browse/res/templates/browse.html
View File

@ -4,7 +4,7 @@
<div class='split-layout vertical contents abs' <div class='split-layout vertical contents abs'
ng-controller="SplitPaneController as splitter"> ng-controller="SplitPaneController as splitter">
<div class='split-pane-component treeview pane' <div class='split-pane-component treeview pane'
ng-style="{ width: splitter.state() + 'px'}"> ng-style="{ width: (splitter.state() - 8) + 'px'}">
<mct-representation key="'create-button'" mct-object="navigatedObject"> <mct-representation key="'create-button'" mct-object="navigatedObject">
</mct-representation> </mct-representation>
<div class='holder tree-holder abs'> <div class='holder tree-holder abs'>

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

@ -7,8 +7,11 @@
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'> <div class='split-layout vertical contents abs work-area' ng-controller="SplitPaneController as vSplitter">
<div class='abs pane left edit-main'> <div
class='abs pane left edit-main'
ng-style="{ right: (vSplitter.state(200) - 8) + 'px'}"
>
<div class='holder abs object-holder'> <div class='holder abs object-holder'>
<mct-representation key="representation.selected.key" <mct-representation key="representation.selected.key"
toolbar="toolbar" toolbar="toolbar"
@ -16,21 +19,51 @@
</mct-representation> </mct-representation>
</div> </div>
</div> </div>
<div class="splitter"></div>
<div class='abs pane right edit-objects menus-to-left'> <!-- MAIN VERTICAL SPLITTER -->
<div class='holder abs split-layout horizontal'> <div
<div class="abs pane top accordion" ng-controller="ToggleController as toggle"> class="splitter"
<mct-container key="accordion" title="Library"> ng-style="{ right: (Splitter.state()-8) + 'px'}"
<mct-representation key="'tree'" alias="foo1" mct-object="context.getRoot()"> mct-drag-down="vSplitter.startMove()"
</mct-representation> mct-drag="vSplitter.move(-delta[0], 300, 500)"
</mct-container> ></div>
<div
class='abs pane right edit-objects menus-to-left'
ng-style="{ width: vSplitter.state() + 'px', right: '0px'}"
>
<div
class='holder abs split-layout horizontal'
ng-controller="SplitPaneController as hSplitter"
>
<div
class="abs pane top accordion"
ng-style="{ bottom: (hSplitter.state(400) + 8) + 'px', top: '0px' }"
ng-controller="ToggleController as toggle"
>
<mct-container key="accordion" title="Library">
<mct-representation key="'tree'" alias="foo1" mct-object="context.getRoot()">
</mct-representation>
</mct-container>
</div> </div>
<div class="splitter"></div> <!-- HORZ SPLITTER -->
<div class="abs pane bottom accordion" ng-controller="ToggleController as toggle"> <div
<mct-container key="accordion" title="Elements"> class="splitter"
<mct-representation key="'edit-elements'" mct-object="domainObject"> ng-style="{ bottom: hSplitter.state() + 'px', top: 'auto' }"
</mct-representation> mct-drag-down="hSplitter.startMove()"
</mct-container> mct-drag="hSplitter.move(-delta[1], 120, 1000)"
>
</div>
<div
class="abs pane bottom accordion"
ng-style="{ bottom: '0px', height: (hSplitter.state()) + 'px'}"
ng-controller="ToggleController as toggle"
>
<mct-container key="accordion" title="Elements">
<mct-representation key="'edit-elements'" mct-object="domainObject">
</mct-representation>
</mct-container>
</div> </div>
</div> </div>
</div> </div>

6
platform/commonUI/general/res/css/theme-espresso.css
View File

@ -2725,12 +2725,10 @@ input[type="text"] {
bottom: 0; } bottom: 0; }
/* line 45, ../sass/helpers/_splitter.scss */ /* line 45, ../sass/helpers/_splitter.scss */
.split-layout.vertical .pane.left { .split-layout.vertical .pane.left {
right: auto; right: auto; }
width: 84%; }
/* line 49, ../sass/helpers/_splitter.scss */ /* line 49, ../sass/helpers/_splitter.scss */
.split-layout.vertical .pane.right { .split-layout.vertical .pane.right {
left: auto; left: auto; }
width: 15%; }
/* line 54, ../sass/helpers/_splitter.scss */ /* line 54, ../sass/helpers/_splitter.scss */
.split-layout.vertical > .splitter { .split-layout.vertical > .splitter {
bottom: 0; bottom: 0;

1
platform/commonUI/general/res/sass/forms/_selects.scss
View File

@ -26,6 +26,5 @@
pointer-events: none; pointer-events: none;
position: absolute; position: absolute;
right: $interiorMargin; top: 0; right: $interiorMargin; top: 0;
// z-index: 2;
} }
} }

4
platform/commonUI/general/res/sass/helpers/_splitter.scss
View File

@ -44,11 +44,11 @@
bottom: 0; bottom: 0;
&.left { &.left {
right: auto; right: auto;
width: $splitL - 1%; // width: $splitL - 1%; // Controlled by splitter
} }
&.right { &.right {
left: auto; left: auto;
width: 100% - $splitL; // width: 100% - $splitL; // Controlled by splitter
} }
} }
>.splitter { >.splitter {