From 8d384c7c5cea293f263ba0d5db01f3a5af974bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 5 Sep 2018 14:39:58 +0200
Subject: [PATCH] Fix some styling issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 css/icons.scss                          | 2 +-
 css/style.scss                          | 1 -
 img/calendar-dark.svg                   | 1 +
 js/controller/BoardController.js        | 8 ++++++++
 templates/part.board.headerControls.php | 4 ++--
 templates/part.board.mainView.php       | 4 ++--
 templates/part.card.activity.html       | 9 ++++++---
 templates/part.card.php                 | 2 +-
 templates/part.navigation.php           | 4 ++--
 9 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 img/calendar-dark.svg

diff --git a/css/icons.scss b/css/icons.scss
index c4a7791fb..1e8b25048 100644
--- a/css/icons.scss
+++ b/css/icons.scss
@@ -38,7 +38,7 @@
 }
 
 .icon-badge {
-  background-image: url('../../../core/img/places/calendar-dark.svg');
+  background-image: url('../img/calendar-dark.svg');
 }
 
 .icon-toggle-compact-collapsed {
diff --git a/css/style.scss b/css/style.scss
index 1a57ab7de..4f0e03b1e 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -1258,7 +1258,6 @@ input.input-inline {
 
 	.tab {
 		height: 100%;
-		overflow: scroll;
 	}
 }
 
diff --git a/img/calendar-dark.svg b/img/calendar-dark.svg
new file mode 100644
index 000000000..4ea05fefe
--- /dev/null
+++ b/img/calendar-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" version="1.1" height="32" viewbox="0 0 32 32"><path fill="#000" d="m8 2c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm16 0c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-13 4v2c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1.875a3.993 3.993 0 0 0 -3 3.875v16c0 2.216 1.784 4 4 4h20c2.216 0 4-1.784 4-4v-16a3.993 3.993 0 0 0 -3 -3.875v1.875c0 1.662-1.338 3-3 3s-3-1.338-3-3v-2zm-4.906 10h19.812a0.09 0.09 0 0 1 0.094 0.094v9.812a0.09 0.09 0 0 1 -0.094 0.094h-19.812a0.09 0.09 0 0 1 -0.094 -0.094v-9.812a0.09 0.09 0 0 1 0.094 -0.094z"/></svg>
diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js
index 34a0c4d64..722c34d56 100644
--- a/js/controller/BoardController.js
+++ b/js/controller/BoardController.js
@@ -434,6 +434,14 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 		};
 	};
 
+	$scope.colorValue = function(color) {
+		const re = /^#([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/;
+		if (re.test(color)) {
+			return color;
+		}
+		return '';
+	};
+
 	$scope.attachmentCount = function(card) {
 		if (Array.isArray(card.attachments)) {
 			return card.attachments.filter((obj) => obj.deletedAt === 0).length;
diff --git a/templates/part.board.headerControls.php b/templates/part.board.headerControls.php
index 1a6c4e184..375cf9bb2 100644
--- a/templates/part.board.headerControls.php
+++ b/templates/part.board.headerControls.php
@@ -1,11 +1,11 @@
 <div id="stack-add" ng-if="boardservice.canEdit() && checkCanEdit()">
     <form class="ng-pristine ng-valid" ng-submit="createStack()">
-        <label for="new-stack-input" class="hidden-visually"><?php p($l->t('Add a new stack')); ?></label>
+        <label for="new-stack-input-<?php p($_['headerControlsId']); ?>" class="hidden-visually"><?php p($l->t('Add a new stack')); ?></label>
         <input type="text" class="no-close" placeholder="<?php p($l->t('Add a new stack')); ?>"
             ng-focus="status.addStack=true"
             ng-blur="status.addStack=false"
             ng-model="newStack.title" required
-            id="new-stack-input"
+            id="new-stack-input-<?php p($_['headerControlsId']); ?>"
             maxlength="100" />
         <button class="button-inline icon icon-add" ng-style="{'opacity':'{{status.addStack ? 1: 0.5}}'}" type="submit" title="<?php p($l->t('Submit')); ?>">
         	<span class="hidden-visually"><?php p($l->t('Submit')); ?></span>
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index 1bf223b6a..b7a124993 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -24,13 +24,13 @@
 	</div>
 
 	<div class="board-header-controls hidden">
-		<?php print_unescaped($this->inc('part.board.headerControls')); ?>
+		<?php print_unescaped($this->inc('part.board.headerControls', ['headerControlsId' => 'main'])); ?>
 	</div>
 	<div class="board-header-controls app-popover-menu-utils">
 		<button class="icon-more button"></button>
 		<div class="popovermenu hidden">
 			<div id="popover-controls">
-				<?php print_unescaped($this->inc('part.board.headerControls')); ?>
+				<?php print_unescaped($this->inc('part.board.headerControls', ['headerControlsId' => 'popover'])); ?>
 			</div>
 		</div>
 	</div>
diff --git a/templates/part.card.activity.html b/templates/part.card.activity.html
index e17726a65..c3c7d0408 100644
--- a/templates/part.card.activity.html
+++ b/templates/part.card.activity.html
@@ -1,5 +1,6 @@
-<ul class="activities" infinite-scroll="$ctrl.page()" infinite-scroll-container="'#app-sidebar'">
-	<li class="activity box" ng-repeat="activity in $ctrl.getData($ctrl.element.id)">
+<ul class="activities" infinite-scroll="$ctrl.page()" infinite-scroll-container="'#app-sidebar'" infinite-scroll-disabled="$ctrl.activityservice.running">
+	<li ng-if="$ctrl.loadingNewer()"><div class="icon-loading-small"></div></li>
+	<li class="activity box" ng-repeat="activity in $ctrl.getData($ctrl.element.id) track by $index">
 		<div class="activity-icon">
 			<img src="{{activity.icon}}" alt="">
 		</div>
@@ -7,6 +8,8 @@
 			 ng-bind-html="$ctrl.parseMessage(activity.subject_rich[0], activity.subject_rich[1])"></div>
 		<span class="activitytime has-tooltip live-relative-timestamp"
 			  data-timestamp="{{ activity.timestamp }}">{{ activity.timestamp/1000 | relativeDateFilter }}</span>
-		<div class="activitymessage">{{ activity.activity_id }}</div>
+		<div class="activitymessage" ng-bind-html="activity.message"></div>
 	</li>
+
+	<li ng-if="$ctrl.loading"><div class="icon-loading-small"></div></li>
 </ul>
diff --git a/templates/part.card.php b/templates/part.card.php
index 7f1104470..488fbe664 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -90,7 +90,7 @@
 
 	<div class="section-header-tabbed">
 		<ul class="tabHeaders ng-scope">
-			<li class="tabHeader selected" ng-class="{'selected': (params.tab==0 || !params.tab)}" ui-sref="{tab: 0}"><a><?php p($l->t('Description')); ?></a></li>
+			<li class="tabHeader" ng-class="{'selected': (params.tab==0 || !params.tab)}" ui-sref="{tab: 0}"><a><?php p($l->t('Description')); ?></a></li>
 			<li class="tabHeader" ng-class="{'selected': (params.tab==1)}" ui-sref="{tab: 1}"><a><?php p($l->t('Attachments')); ?></a></li>
 			<li class="tabHeader" ng-class="{'selected': (params.tab==2)}" ui-sref="{tab: 2}"><a><?php p($l->t('Activity')); ?></a></li>
 
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index bc4095863..48ec0e9b7 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -41,7 +41,7 @@
 			<div class="colorselect" ng-controller="ColorPickerController">
 				<div class="color" ng-repeat="c in ::colors" ng-style="{'background-color':'#{{ c }}'}" ng-click="b=setColor(b,c)" ng-class="{'selected': (c == b.color) }"></div>
                 <label class="colorselect-label{{ b.color | iconWhiteFilter }} color" ng-style="getCustomBackground(b.hashedColor)" ng-init="b.hashedColor='#' + b.color">
-                    <input class="color" type="color" ng-model="b.hashedColor" value="#{{b.color}}" ng-change="b=setHashedColor(b)"/>
+                    <input class="color" type="color" ng-model="b.hashedColor" ng-value="colorValue(b.color)" ng-change="b=setHashedColor(b)"/>
                 </label>
 			</div>
 		</div>
@@ -59,7 +59,7 @@
 			<div class="colorselect" ng-controller="ColorPickerController">
 				<div class="color" ng-repeat="c in ::colors" ng-style="{'background-color':'#{{ c }}'}" ng-click="selectColor(c);newBoard=setColor(newBoard,c)" ng-class="{'selected': (c == newBoard.color), 'dark': (newBoard.color | textColorFilter) === '#ffffff' }"><br /></div>
                 <label class="colorselect-label{{ newBoard.color | iconWhiteFilter }} color" ng-style="getCustomBackground(newBoard.hashedColor)" ng-init="newBoard.hashedColor='#' + newBoard.color">
-                    <input class="color" type="color" ng-model="newBoard.hashedColor" value="#{{newBoard.color}}" ng-change="newBoard=setHashedColor(newBoard)"/>
+                    <input class="color" type="color" ng-model="newBoard.hashedColor" ng-value="colorValue(newBoard.color)" ng-change="newBoard=setHashedColor(newBoard)"/>
                 </label>
 			</div>
 		</div>