From e4af4b9983574b80458e42f05123962f6eb8a2dd Mon Sep 17 00:00:00 2001
From: Jaden Diefenbaugh <blakcap@users.noreply.github.com>
Date: Mon, 13 Mar 2017 16:55:29 +0100
Subject: [PATCH] move to document view

---
 .../reports/app/directives/view/layout.js     | 22 ++++++---
 .../app/directives/view/panelContent.js       | 30 ++----------
 .../reports/app/directives/view/plotItem.js   |  1 +
 .../reports/app/directives/view/textItem.js   | 48 ++++++++-----------
 4 files changed, 39 insertions(+), 62 deletions(-)

diff --git a/beat/web/reports/static/reports/app/directives/view/layout.js b/beat/web/reports/static/reports/app/directives/view/layout.js
index fe1d3750f..69ce17a76 100644
--- a/beat/web/reports/static/reports/app/directives/view/layout.js
+++ b/beat/web/reports/static/reports/app/directives/view/layout.js
@@ -35,15 +35,23 @@ angular.module('reportApp').directive("groupsLayout", ['GroupsService', function
 			scope.groups = GroupsService.groups;
 		},
 		template: `
-<div id='groupsLayout' class='panel-group'>
-	<div
-		group-panel-content
-		class='panel panel-default'
-		ng-repeat='group in groups'
-		group='group'
-		>
+<div class='panel panel-default'>
+<div id="content-layout-heading" class="panel-heading" role="tab">
+	<h4 class="panel-title">
+		Content
+	</h4>
+</div>
+<div id='content-layout-body' class='panel-body'>
+	<div id='groupsLayout' class='panel-group'>
+		<div
+			group-panel-content
+			ng-repeat='group in groups'
+			group='group'
+			>
+		</div>
 	</div>
 </div>
+</div>
 `
 	};
 }]);
diff --git a/beat/web/reports/static/reports/app/directives/view/panelContent.js b/beat/web/reports/static/reports/app/directives/view/panelContent.js
index 89158ec44..8fb5f28c1 100644
--- a/beat/web/reports/static/reports/app/directives/view/panelContent.js
+++ b/beat/web/reports/static/reports/app/directives/view/panelContent.js
@@ -33,32 +33,10 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
 		link: function(scope){
 		},
 		template: `
-<div id="{{group.name}}-heading" class="panel-heading" role="tab">
-	<h4 class="panel-title">
-		<a
-			role="button"
-			data-toggle="collapse"
-			data-parent="#{{group.name}}-heading"
-			href="#collapse-{{group.name}}"
-			aria-expanded="true"
-			aria-controls="collapse-{{group.name}}">
-			{{ group.name }}
-		</a>
-	</h4>
-</div>
-<div id="collapse-{{group.name}}"
-	class="panel-collapse collapse in"
-	role="tabpanel"
-	aria-labelledby="{{group.name}}-heading">
-	<div class="panel-body panel-group">
-		<!--<div group-panel-experiments group='group' class='panel panel-default'></div>!-->
-		<div
-			ng-if='group.experiments.length > 0'
-			group-panel-items
-			group='group'
-			>
-		</div>
-	</div>
+<div
+	ng-if='group.experiments.length > 0'
+	group-panel-items
+	group='group'>
 </div>
 `
 	};
diff --git a/beat/web/reports/static/reports/app/directives/view/plotItem.js b/beat/web/reports/static/reports/app/directives/view/plotItem.js
index 78570e388..2e155ad7f 100644
--- a/beat/web/reports/static/reports/app/directives/view/plotItem.js
+++ b/beat/web/reports/static/reports/app/directives/view/plotItem.js
@@ -47,6 +47,7 @@ angular.module('reportApp')
 			href="#collapse-{{domId}}"
 			aria-expanded="true"
 			aria-controls="collapse-{{domId}}">
+			&nbsp;
 		</a>
 	</h4>
 </div>
diff --git a/beat/web/reports/static/reports/app/directives/view/textItem.js b/beat/web/reports/static/reports/app/directives/view/textItem.js
index 113cc4b2f..49c0316f2 100644
--- a/beat/web/reports/static/reports/app/directives/view/textItem.js
+++ b/beat/web/reports/static/reports/app/directives/view/textItem.js
@@ -64,36 +64,26 @@ angular.module('reportApp')
 			scope.compileContent();
 		},
 		template: `
-<div id="{{domId}}-heading" class="panel-heading" role="tab">
-	<h4 class="panel-title">
-		<a
-			class=''
-			role="button"
-			data-toggle="collapse"
-			data-parent="#{{domId}}-heading"
-			href="#collapse-{{domId}}"
-			aria-expanded="true"
-			aria-controls="collapse-{{domId}}">
-		</a>
-		<div class="btn-group" role="group" role='tab'>
-			<!-- dont show split view, just toggle between html/rst view !-->
-			<button class='btn btn-default' ng-click='isViewingSrc.val = !isViewingSrc.val'>
-				Toggle View
-			</button>
+<div class='panel-body'>
+	<div class='row'>
+		<div class='col-sm-12'>
+			<div class="btn-group" role="group" role='tab'>
+				<!-- dont show split view, just toggle between html/rst view !-->
+				<button class='btn btn-default' ng-click='isViewingSrc.val = !isViewingSrc.val'>
+					Toggle Source View
+				</button>
+			</div>
 		</div>
-	</h4>
-</div>
-<div id="collapse-{{domId}}"
-	class="panel-collapse collapse in"
-	role="tabpanel"
-	aria-labelledby="{{domId}}-heading">
-	<div class='panel-body'>
-		<div ng-if='!isViewingSrc.val' class='row'>
-			<div ng-bind-html='trustAsHtml(compiledContent.val)'></div>
-		</div>
-		<div ng-if='isViewingSrc.val'>
-			<i>Readonly view</i>
-			<ui-codemirror ng-model='item.content' ui-codemirror-opts='srccmOptions'></ui-codemirror>
+	</div>
+	<div class='row' style='margin-top: 5px;'>
+		<div class='col-sm-12'>
+			<div ng-if='!isViewingSrc.val' class='row'>
+				<div ng-bind-html='trustAsHtml(compiledContent.val)'></div>
+			</div>
+			<div ng-if='isViewingSrc.val'>
+				<i>Readonly view</i>
+				<ui-codemirror ng-model='item.content' ui-codemirror-opts='srccmOptions'></ui-codemirror>
+			</div>
 		</div>
 	</div>
 </div>
-- 
GitLab