Merge branch 'open1363' into open-master

This commit is contained in:
Victor Woeltjen
2015-06-29 16:27:10 -07:00
7 changed files with 409 additions and 23 deletions

View File

@@ -22,10 +22,9 @@
<div content="jquery-wrapper" class="abs holder-all browse-mode">
<mct-include key="'topbar-browse'"></mct-include>
<div class="holder browse-area s-browse-area abs" ng-controller="BrowseController">
<div class='split-layout vertical contents abs'
ng-controller="SplitPaneController as splitter">
<mct-split-pane class='contents abs' anchor='left'>
<div class='split-pane-component treeview pane'
ng-style="{ width: splitter.state() + 'px'}">
style="min-width: 150px; max-width: 800px; width: 25%;">
<mct-representation key="'create-button'" mct-object="navigatedObject">
</mct-representation>
<div class='holder tree-holder abs'>
@@ -35,18 +34,14 @@
</mct-representation>
</div>
</div>
<div class="splitter"
ng-style="{ left: splitter.state() + 'px'}"
mct-drag-down="splitter.startMove()"
mct-drag="splitter.move(delta[0])"></div>
<div class='split-pane-component items pane'
ng-style="{ left: (splitter.state()+4) + 'px', right: '0px' }">
<mct-splitter></mct-splitter>
<div class='split-pane-component items pane'>
<div class='holder abs' id='content-area'>
<mct-representation mct-object="navigatedObject" key="'browse-object'">
</mct-representation>
</div>
</div>
</div>
</mct-split-pane>
</div>
<mct-include key="'bottombar'"></mct-include>
</div>
</div>