Merge in open-master, resolve conflicts

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

@@ -21,14 +21,12 @@
 -->
 <span>
     <div class="object-browse-bar bar abs">
-
         <div class="items-select left abs">
             <mct-representation key="'object-header'" mct-object="domainObject">
             </mct-representation>
         </div>
 
-        <div class="view-controls sort-controls btn-bar right abs">
-
+        <div class="btn-bar right abs">
             <mct-representation key="'action-group'"
                                 mct-object="domainObject"
                                 parameters="{ category: 'view-control' }">
@@ -39,7 +37,6 @@
                                 ng-model="representation">
             </mct-representation>
         </div>
-
     </div>
 
     <div class='object-holder abs vscroll'>

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

@@ -20,9 +20,11 @@
  at runtime from the About dialog for additional information.
 -->
 <div class='object-header'>
-    <span class='type-icon icon ui-symbol'>{{type.getGlyph()}}</span>
-    <span ng-if="parameters.mode" class='action'>{{parameters.mode}}</span>
-    <span class='type'>{{type.getName()}}</span>
-    <span class='title'>{{model.name}}</span>
-    <a id='actions-menu' class='ui-symbol invoke-menu' onclick="alert('Not yet functional. This will display a dropdown menu of options for this object.');">v</a>
+	<span class="label s-label">
+	    <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>
+	    <span class='title-label'>{{model.name}}</span>
+		<!--a id='actions-menu' class='ui-symbol context-available' onclick="alert('Not yet functional. This will display a dropdown menu of options for this object.');">v</a-->
+	</span>
 </div>

platform/commonUI/browse/res/templates/create/create-button.html

@@ -21,7 +21,7 @@
 -->
 <div class="menu-element wrapper" ng-controller="ClickAwayController as createController">
     <div class="btn btn-menu create-btn major" ng-click="createController.toggle()">
-        <span class='ui-symbol major' href=''>+</span> Create<!--span class='ui-symbol invoke-menu'>v</span-->
+        <span class='ui-symbol' href=''>+</span> Create
     </div>
     <div class="menu dropdown super-menu" ng-show="createController.isActive()">
         <mct-representation mct-object="domainObject" key="'create-menu'">

platform/commonUI/browse/src/creation/CreationService.js

@@ -77,7 +77,19 @@ define(
                         return undefined;
                     }
 
-                    return parentPersistence.persist();
+                    return parentPersistence.persist().then(function () {
+                        // Locate and return new Object in context of parent.
+                        return parent
+                            .useCapability('composition')
+                            .then(function (children) {
+                                var i;
+                                for (i = 0; i < children.length; i += 1) {
+                                    if (children[i].getId() === id) {
+                                        return children[i];
+                                    }
+                                }
+                            });
+                    });
                 });
             }
 
@@ -126,4 +138,4 @@ define(
 
         return CreationService;
     }
-);
+);

platform/commonUI/browse/test/creation/CreationServiceSpec.js

@@ -34,8 +34,10 @@ define(
                 mockQ,
                 mockLog,
                 mockParentObject,
+                mockNewObject,
                 mockMutationCapability,
                 mockPersistenceCapability,
+                mockCompositionCapability,
                 mockCapabilities,
                 creationService;
 
@@ -69,6 +71,10 @@ define(
                     "parentObject",
                     [ "getId", "getCapability", "useCapability" ]
                 );
+                mockNewObject = jasmine.createSpyObj(
+                    "newObject",
+                    [ "getId" ]
+                );
                 mockMutationCapability = jasmine.createSpyObj(
                     "mutation",
                     [ "invoke" ]
@@ -77,9 +83,14 @@ define(
                     "persistence",
                     [ "persist", "getSpace" ]
                 );
+                mockCompositionCapability = jasmine.createSpyObj(
+                    "composition",
+                    ["invoke"]
+                );
                 mockCapabilities = {
                     mutation: mockMutationCapability,
-                    persistence: mockPersistenceCapability
+                    persistence: mockPersistenceCapability,
+                    composition: mockCompositionCapability
                 };
 
                 mockPersistenceService.createObject.andReturn(
@@ -93,8 +104,15 @@ define(
                     return mockCapabilities[key].invoke(value);
                 });
 
+                mockPersistenceCapability.persist.andReturn(
+                    mockPromise(true)
+                );
+
                 mockMutationCapability.invoke.andReturn(mockPromise(true));
                 mockPersistenceCapability.getSpace.andReturn("testSpace");
+                mockCompositionCapability.invoke.andReturn(
+                    mockPromise([mockNewObject])
+                );
 
                 creationService = new CreationService(
                     mockPersistenceService,