From 0e7a71787ff176f1a1dd94abb656f199b7720e59 Mon Sep 17 00:00:00 2001
From: Julius Haertl <jus@bitgrid.net>
Date: Sun, 31 Jul 2016 00:49:30 +0200
Subject: [PATCH] Fix sidebar and colorize header

---
 css/style.css                     | 20 ++++++++++++++++----
 js/filters/textColorFilter.js     |  4 ++--
 js/public/app.js                  |  3 ++-
 templates/main.php                |  5 +++--
 templates/part.board.mainView.php |  6 ++++--
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/css/style.css b/css/style.css
index 7f12a8db3..d536dfdc9 100644
--- a/css/style.css
+++ b/css/style.css
@@ -29,6 +29,16 @@
     cursor: pointer;
 }
 
+#app-view {
+    position: relative;
+    height: 100%;
+    white-space: nowrap;
+    overflow: none;
+    padding: 0;
+    z-index: 100;
+    width: 100%;
+}
+
 #board-status {
 	position:absolute;
 	z-index:999;
@@ -54,13 +64,15 @@
 	width: inherit;
 	color: #333333;
 	position:relative;
-	z-index:200;
-	background-color:#f7f7f7;
+	z-index:120;
+  height: 44px;
+  background-color: #eee;
 }
 #board-header h1 {
 	font-size:14pt;
 	margin: 0;
-	padding:10px;
+	padding:12px;
+  padding-left:50px;
 
 }
 #board-actions {
@@ -661,4 +673,4 @@ margin-bottom:2px; width:100%;
 
 .shareOption {
 	margin-top:4px;
-}
\ No newline at end of file
+}
diff --git a/js/filters/textColorFilter.js b/js/filters/textColorFilter.js
index 12bccd1ce..14712405b 100644
--- a/js/filters/textColorFilter.js
+++ b/js/filters/textColorFilter.js
@@ -1,4 +1,4 @@
-app.filter('lightenColorFilter', function() {
+app.filter('textColorFilter', function() {
 	return function (hex) {
 		// RGB2HLS by Garry Tan
 		// http://axonflux.com/handy-rgb-to-hsl-and-rgb-to-hsv-color-model-c
@@ -40,4 +40,4 @@ app.filter('lightenColorFilter', function() {
 		}
 
 	}
-});
\ No newline at end of file
+});
diff --git a/js/public/app.js b/js/public/app.js
index 00c8dfcb1..5bd5eb346 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -622,7 +622,7 @@ app.filter('orderObjectBy', function(){
 		return array;
 	}
 });
-app.filter('lightenColorFilter', function() {
+app.filter('textColorFilter', function() {
 	return function (hex) {
 		// RGB2HLS by Garry Tan
 		// http://axonflux.com/handy-rgb-to-hsl-and-rgb-to-hsv-color-model-c
@@ -665,6 +665,7 @@ app.filter('lightenColorFilter', function() {
 
 	}
 });
+
 // OwnCloud Click Handling
 // https://doc.owncloud.org/server/8.0/developer_manual/app/css.html
 app.directive('appNavigationEntryUtils', function () {
diff --git a/templates/main.php b/templates/main.php
index 2e34babee..9696c33b1 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -25,9 +25,10 @@ Util::addScript('deck', 'public/app');
 		<?php print_unescaped($this->inc('part.navigation')); ?>
 		<?php print_unescaped($this->inc('part.settings')); ?>
 	</div>
-	<route-loading-indicator />
-	<div id="app-content" ui-view  ng-class="{ 'details-visible': sidebar.show }" ng-if='!isRouteLoading' >
+	<div id="app-content"  ng-class="{ 'details-visible': sidebar.show }">
+  <div id="app-view" ui-view></div>
 	</div>
+	<route-loading-indicator />
 
 
 	<script type="text/ng-template" id="/boardlist.mainView.html">
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index 6836f58be..d043fd617 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -4,10 +4,11 @@
         <h2>{{ statusservice.title }}</h2>
         <p>{{ statusservice.text }}</p></div>
 </div>
-<div id="board-header">
+<div id="board-header" style="background-color: {{boardservice.getCurrent().color | lightenColorFilter}}; color: {{boardservice.getCurrent().color | textColorFilter }};">
 <h1>
     {{ boardservice.data[id].title }}
     <div id="board-actions">
+        <!--
         <div><i class="fa fa-filter"> </i> Filter</div>
         <div><i class="icon icon-search"> </i> {{ searchText }}</div>
         <div class="filter"><span class="filter-button" ng-click="status.filter.label=!status.filter.label">by label <i class="fa  fa-caret-down"> </i></span></div>
@@ -18,9 +19,10 @@
         <ul class="filter-select bubble" ng-if="status.filter.assignee">
             <li ng-repeat="label in boardservice.data[id].labels"><span style="background-color:#{{ label.color }};"> </span> {{ label.title }}</li>
         </ul>
+        //-->
 
         <div class="board-action-button"><a class="fa fa-archive" ui-sref="board.archive({ id: id })"> </a></div>
-        <div class="board-action-button"><a class="fa fa-ellipsis-h" ui-sref="board.detail({ id: id })"> </a></div>
+        <div class="board-action-button"><a class="fa fa-info" ui-sref="board.detail({ id: id })"> </a></div>
 
     </div>
 </h1>