ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Julius Haertl
2016-10-28 13:57:41 +02:00
parent 0aa3f661ac
commit 86e628ab69
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
css/style.css
View File

@@ -577,8 +577,16 @@
.colorselect .selected { .colorselect .selected {
opacity: 1.0; opacity: 1.0;
border: 1px solid #333333; border: 1px solid #333333;
width: 27px; }
height: 27px;
.labels .colorselect {
padding: 0;
clear: none;
overflow: visible;
}
.labels .colorselect .color {
width:26px;
height:26px;
} }
#boardlist { #boardlist {

7
js/controller/BoardController.js
View File

@@ -25,7 +25,9 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
$scope.sidebar = $rootScope.sidebar; $scope.sidebar = $rootScope.sidebar;
$scope.id = $stateParams.boardId; $scope.id = $stateParams.boardId;
$scope.status = {}; $scope.status = {
addCard: [],
};
$scope.newLabel = {}; $scope.newLabel = {};
$scope.status.boardtab = $stateParams.detailTab; $scope.status.boardtab = $stateParams.detailTab;
@@ -79,7 +81,6 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
}; };
$scope.checkCanEdit = function () { $scope.checkCanEdit = function () {
return !$scope.archived; return !$scope.archived;
}; };
// filter cards here, as ng-sortable will not work nicely with html-inline filters // filter cards here, as ng-sortable will not work nicely with html-inline filters
@@ -117,7 +118,6 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
$scope.statusservice.setError('Error occured', error); $scope.statusservice.setError('Error occured', error);
}); });
BoardService.searchUsers('%25'); BoardService.searchUsers('%25');
$scope.searchForUser = function (search) { $scope.searchForUser = function (search) {
@@ -144,7 +144,6 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
'type': 'plain' 'type': 'plain'
}; };
CardService.create(newCard).then(function (data) { CardService.create(newCard).then(function (data) {
// FIXME: called here reorders
$scope.stackservice.addCard(data); $scope.stackservice.addCard(data);
$scope.newCard.title = ""; $scope.newCard.title = "";
}); });

7
js/public/app.js
View File

@@ -119,7 +119,9 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
$scope.sidebar = $rootScope.sidebar; $scope.sidebar = $rootScope.sidebar;
$scope.id = $stateParams.boardId; $scope.id = $stateParams.boardId;
$scope.status = {}; $scope.status = {
addCard: [],
};
$scope.newLabel = {}; $scope.newLabel = {};
$scope.status.boardtab = $stateParams.detailTab; $scope.status.boardtab = $stateParams.detailTab;
@@ -173,7 +175,6 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
}; };
$scope.checkCanEdit = function () { $scope.checkCanEdit = function () {
return !$scope.archived; return !$scope.archived;
}; };
// filter cards here, as ng-sortable will not work nicely with html-inline filters // filter cards here, as ng-sortable will not work nicely with html-inline filters
@@ -211,7 +212,6 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
$scope.statusservice.setError('Error occured', error); $scope.statusservice.setError('Error occured', error);
}); });
BoardService.searchUsers('%25'); BoardService.searchUsers('%25');
$scope.searchForUser = function (search) { $scope.searchForUser = function (search) {
@@ -238,7 +238,6 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
'type': 'plain' 'type': 'plain'
}; };
CardService.create(newCard).then(function (data) { CardService.create(newCard).then(function (data) {
// FIXME: called here reorders
$scope.stackservice.addCard(data); $scope.stackservice.addCard(data);
$scope.newCard.title = ""; $scope.newCard.title = "";
}); });

2
lib/CardArchivedException.php
View File

@@ -21,7 +21,7 @@
* *
*/ */
namespace OCA\Deck\Service; namespace OCA\Deck;
class CardArchivedException extends \Exception { class CardArchivedException extends \Exception {
/** /**

1
lib/Service/CardService.php
View File

@@ -28,6 +28,7 @@ namespace OCA\Deck\Service;
use \OCA\Deck\Db\Card; use \OCA\Deck\Db\Card;
use \OCA\Deck\Db\CardMapper; use \OCA\Deck\Db\CardMapper;
use \OCA\Deck\CardArchivedException;
class CardService { class CardService {

7
templates/part.board.mainView.php
View File

@@ -100,13 +100,14 @@
<div class="card create" <div class="card create"
style="background-color:#{{ boardservice.getCurrent().color }};" ng-if="checkCanEdit() && filter!=='archive'"> style="background-color:#{{ boardservice.getCurrent().color }};" ng-if="checkCanEdit() && filter!=='archive'">
<form ng-submit="createCard(s.id, newCard.title)"> <form ng-submit="createCard(s.id, newCard.title)">
<h3 ng-if="s.status.addCard"> <h3 ng-if="status.addCard[s.id]">
<input type="text" autofocus-on-insert <input type="text" autofocus-on-insert
ng-model="newCard.title" ng-model="newCard.title"
ng-blur="s.status.addCard=false" required/> ng-blur="status.addCard[s.id]=false"
required/>
</h3> </h3>
</form> </form>
<div ng-if="!s.status.addCard" ng-click="s.status.addCard=!s.status.addCard"> <div ng-if="!status.addCard[s.id]" ng-click="status.addCard[s.id]=true">
<i class="icon icon-add{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i> <i class="icon icon-add{{ boardservice.getCurrent().color | iconWhiteFilter }}"></i>
</div> </div>
</div> </div>