Various fixes

templates/main.php

@@ -5,29 +5,27 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *  
+ *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
 
 use OCP\Util;
 
-Util::addStyle('deck', 'font-awesome');
 Util::addStyle('deck', 'style');
 Util::addStyle('deck', '../js/vendor/ng-sortable/dist/ng-sortable.min');
 Util::addStyle('deck', '../js/vendor/angular-ui-select/dist/select.min');
-//Util::addStyle('deck', '../js/vendor/ng-sortable/dist/ng-sortable.style.min');
 Util::addScript('deck', 'vendor/angular/angular.min');
 Util::addScript('deck', 'vendor/angular-route/angular-route.min');
 Util::addScript('deck', 'vendor/angular-sanitize/angular-sanitize.min');
@@ -44,20 +42,18 @@ Util::addScript('deck', 'public/app');
 
 	<div id="app-navigation" data-ng-controller="ListController">
 		<?php print_unescaped($this->inc('part.navigation')); ?>
-		<?php print_unescaped($this->inc('part.settings')); ?>
+		<?php /* print_unescaped($this->inc('part.settings'));*/ ?>
 	</div>
-	<div id="app-content"  ng-class="{ 'details-visible': sidebar.show }">
-  <div id="app-view" ui-view></div>
+	<div id="app-content" ng-class="{ 'details-visible': sidebar.show }">
+		<div id="app-view" ui-view></div>
 	</div>
-	<route-loading-indicator />
+	<route-loading-indicator></route-loading-indicator>
 
 
 	<script type="text/ng-template" id="/boardlist.mainView.html">
 		<?php print_unescaped($this->inc('part.boardlist')); ?>
 	</script>
-	<script type="text/ng-template" id="/boardlist.sidebarView.html">
-		<?php print_unescaped($this->inc('part.empty')); ?>
-	</script>
+	<script type="text/ng-template" id="/boardlist.sidebarView.html"></script>
 	<script type="text/ng-template" id="/board.sidebarView.html">
 		<?php print_unescaped($this->inc('part.board.sidebarView')); ?>
 	</script>
@@ -71,5 +67,4 @@ Util::addScript('deck', 'public/app');
 		<?php print_unescaped($this->inc('part.card')); ?>
 	</script>
 
-
 </div>

templates/part.board.mainView.php

@@ -5,7 +5,7 @@
 		<p>{{ statusservice.text }}</p></div>
 </div>
 <div id="board-header"
-	 style="background-color: {{boardservice.getCurrent().color | lightenColorFilter }}; color: {{boardservice.getCurrent().color | textColorFilter }};">
+	 style="background-color: #{{boardservice.getCurrent().color }}; color: {{boardservice.getCurrent().color | textColorFilter }};">
 	<h1>
 		{{ boardservice.data[id].title }}
 		<div id="board-actions">
@@ -30,11 +30,12 @@
 						   ng-blur="s.status.editStack=false" ng-model="s.title"
 						   ng-if="s.status.editStack" autofocus-on-insert
 						   required/>
-					<button class="icon icon-save" ng-if="s.status.editStack"
-							type="submit"></button>
+
 				</form>
 				<div class="stack-actions">
-					<button class="icon-rename"
+					<button class="icon icon-confirm" ng-if="s.status.editStack"
+							type="submit"></button>
+					<button class="icon-rename" ng-if="!s.status.editStack"
 							ng-click="s.status.editStack=true"></button>
 					<button class="icon-delete"
 							ng-click="stackservice.delete(s.id)"></button>
@@ -105,8 +106,9 @@
 							   ng-blur="s.status.addCard=false" required/>
 					</h3>
 				</form>
-				<div class="icon icon-add" ng-if="!s.status.addCard"
-					 ng-click="s.status.addCard=!s.status.addCard"></div>
+				<div ng-if="!s.status.addCard" ng-click="s.status.addCard=!s.status.addCard">
+					<i class="icon icon-add"></i>
+				</div>
 			</div>
 		</div>
 		<div class="stack" style="display: inline-block;" ng-if="checkCanEdit()">

templates/part.board.php

@@ -1,4 +1,4 @@
-
-    <?php print_unescaped($this->inc('part.board.mainView')); ?>
-    <div id="app-sidebar" class="details-view scroll-container" ng-class="{ 'details-visible': sidebar.show }" ui-view="sidebarView">
-    </div>
+<?php print_unescaped($this->inc('part.board.mainView')); ?>
+<div id="app-sidebar" class="details-view scroll-container"
+	 ng-class="{ 'details-visible': sidebar.show }" ui-view="sidebarView">
+</div>