[Mobile] Merge

Fix Conflicts.

platform/commonUI/browse/res/templates/browse-object.html

@@ -25,8 +25,8 @@
             <mct-representation key="'object-header'" mct-object="domainObject">
             </mct-representation>
         </div>
-
-        <div class="btn-bar right abs">
+        <!-- For now, on mobile the button bar is hidden-->
+        <div class="btn-bar right abs mobile-hide">
             <mct-representation key="'action-group'"
                                 mct-object="domainObject"
                                 parameters="{ category: 'view-control' }">

platform/commonUI/browse/res/templates/browse.html

@@ -19,30 +19,33 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div content="jquery-wrapper" class="abs holder-all browse-mode">
+
+<div content="jquery-wrapper" class="abs holder-all browse-mode" ng-controller="BrowseController">
     <mct-include key="'topbar-browse'"></mct-include>
-    <div class="holder browse-area s-browse-area abs" ng-controller="BrowseController">
+    <div class="holder browse-area s-browse-area abs browse-wrapper" ng-class="treeClass ? 'browse-showtree' : 'browse-hidetree'">
         <mct-split-pane class='contents abs' anchor='left'>
-            <div
-                class='split-pane-component treeview pane left'
-                >
-                <mct-representation key="'create-button'" mct-object="navigatedObject">
-                </mct-representation>
-                <div class='holder tree-holder abs'>
+            <div class='split-pane-component treeview pane mobile-pane left-menu desktop-browse'>
+                <div class='holder tree-holder abs mobile-tree-holder'>
                     <mct-representation key="'tree'"
                                         mct-object="domainObject"
                                         ng-model="treeModel">
                     </mct-representation>
                 </div>
-            </div>
-            <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 key="'create-button'" mct-object="navigatedObject">
                     </mct-representation>
-                </div>
             </div>
+
+            <mct-splitter class="mobile-hide"></mct-splitter>
+                    <div class='split-pane-component items pane mobile-pane right-repr'>
+                        <div class='holder abs' id='content-area'>
+                            <mct-representation mct-object="navigatedObject" key="'browse-object'">
+                            </mct-representation>
+                        </div>
+                    <div class="left s-very-subtle key-properties ui-symbol mobile-menu-icon button-pos" 
+                        ng-click="treeSlide()">m</div>                        
+                    </div>   
         </mct-split-pane>
     </div>
     <mct-include key="'bottombar'"></mct-include>
 </div>
+

platform/commonUI/browse/res/templates/browse/object-header.html

@@ -19,8 +19,9 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class='object-header'>
+<div class='object-header object-header-mobile'>
     <span class="label s-label">
+        <mct-representation key="'back-arrow'" mct-object='domainObject'></mct-representation>
         <span class='type-icon icon ui-symbol'>{{type.getGlyph()}}</span>
         <span ng-if="parameters.mode" class='action'>{{parameters.mode}}</span>
         <span class='type-name'>{{type.getName()}}</span>