Sync doc meta layout with Enterprise edition

gui/app/pods/document/index/template.hbs

@@ -70,6 +70,17 @@
 	</Layout::Grid::Sidebar>
 
 	<Layout::Grid::Content>
+		{{document/version-picker
+			roles=roles
+			pages=pages
+			space=folder
+			spaces=folders
+			document=document
+			versions=versions
+			permissions=permissions
+			contributionStatus=contributionStatus
+			approvalStatus=approvalStatus}}
+
 		{{document/document-meta
 			tab=tab
 			roles=roles
@@ -82,22 +93,6 @@
 			contributionStatus=contributionStatus
 			approvalStatus=approvalStatus}}
 
-		{{#if contributionStatus}}
-			<div class="document-meta">
-				<div class="label-workflow-status">
-					{{contributionStatus}}
-				</div>
-			</div>
-		{{else}}
-			{{#if approvalStatus}}
-				<div class="document-meta">
-					<div class="label-workflow-status">
-						{{approvalStatus}}
-					</div>
-				</div>
-			{{/if}}
-		{{/if}}
-
 		<Ui::UiSpacer @size="300" />
 
 		<div class="document-meta {{if permissions.documentEdit "cursor-pointer"}}" {{action "onEditMeta"}}>

gui/app/styles/core/view/document/meta.scss

@@ -138,9 +138,9 @@
 		@extend .no-select;
 		display: block;
 		margin: 0;
-		font-size: 1.1rem;
+		font-size: 0.9rem;
 		font-weight: 400;
-		color: map-get($yellow-shades, 700);
+		color: map-get($gray-shades, 700);
 	}
 
 	> .document-heading {

gui/app/templates/components/document/document-meta.hbs

@@ -26,6 +26,18 @@
 		</div>
 	{{/if}}
 
+	{{#if contributionStatus}}
+		<div class="label-workflow-status">
+			{{contributionStatus}}
+		</div>
+	{{else}}
+		{{#if approvalStatus}}
+			<div class="label-workflow-status">
+				{{approvalStatus}}
+			</div>
+		{{/if}}
+	{{/if}}
+
 	{{#if document.template}}
 		<div class="label-template">
 			Template

gui/app/templates/components/document/document-toolbar.hbs

@@ -50,7 +50,7 @@
 			{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false}}
 				<ul class="menu">
 					{{#if showActivity}}
-						{{#link-to "document.activity" class="item"}}Activity summary{{/link-to}}
+						{{#link-to "document.activity" class="item"}}Activity{{/link-to}}
 					{{/if}}
 					{{#if showRevisions}}
 						{{#link-to "document.revisions" class="item"}}Revisions{{/link-to}}