From 5fd8ff003b2cb5661aa9006733ebf0cc9e139840 Mon Sep 17 00:00:00 2001 From: Ryan Fletcher Date: Tue, 21 Aug 2018 13:25:48 -0400 Subject: [PATCH 1/5] editable inline card titles Signed-off-by: Ryan Fletcher --- js/controller/BoardController.js | 4 ++-- templates/part.board.mainView.php | 23 ++++++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js index aa82d15f3..5a899e771 100644 --- a/js/controller/BoardController.js +++ b/js/controller/BoardController.js @@ -125,7 +125,7 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St $scope.filterData('-lastModified', $scope.searchText); } else { $scope.filterData('order', $scope.searchText); - } + } }; $scope.checkCanEdit = function () { return !BoardService.getCurrent().archived; @@ -136,7 +136,7 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St if ($scope.stacks === undefined) { return; } - angular.copy(StackService.getData(), $scope.stacks); + angular.copy(StackService.getData(), $scope.stacks); $scope.stacks = $filter('orderBy')($scope.stacks, 'order'); angular.forEach($scope.stacks, function (value, key) { var cards = $filter('cardSearchFilter')(value.cards, text); diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php index 26447c9c2..e89fea373 100644 --- a/templates/part.board.mainView.php +++ b/templates/part.board.mainView.php @@ -43,13 +43,16 @@
-

- {{ s.title }} +

+ {{ s.title }} +
-
+ @@ -66,8 +69,18 @@

t('Drop your files here to upload it to the card')); ?>

-
-

{{ cardservice.get(c.id).title }}

+
+

+ {{cardservice.get(c.id).title}} + +
+ +
+

  • From 7c6d36fde1b4e2b20c499a472a3f01e454e0b76a Mon Sep 17 00:00:00 2001 From: Ryan Fletcher Date: Thu, 23 Aug 2018 09:11:17 -0400 Subject: [PATCH 2/5] Added class input-inline Signed-off-by: Ryan Fletcher --- templates/part.board.mainView.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php index e89fea373..64ab97fb1 100644 --- a/templates/part.board.mainView.php +++ b/templates/part.board.mainView.php @@ -76,7 +76,7 @@ ng-click="c.status.editCard=true">{{cardservice.get(c.id).title}}
    -
    From 1949dae8d45d721a72d64ca78a4044d5593429a1 Mon Sep 17 00:00:00 2001 From: Ryan Fletcher Date: Thu, 23 Aug 2018 16:41:16 -0400 Subject: [PATCH 3/5] attempt at solving css "jumps" on inline edits. Signed-off-by: Ryan Fletcher --- css/style.scss | 6 ++++++ templates/part.board.mainView.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/css/style.scss b/css/style.scss index a7f6e627a..e6588807b 100644 --- a/css/style.scss +++ b/css/style.scss @@ -5,6 +5,7 @@ * @author Artem Anufrij * @author Marin Treselj * @author Oskar Kurz + * @author Ryan Fletcher * * @license GNU AGPL version 3 or any later version * @@ -417,6 +418,11 @@ input.input-inline { overflow: hidden; position: relative; padding: 5px; + + input { + min-height: 0px; + width: auto; + } } .card-assigned-users { diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php index 64ab97fb1..83d261dad 100644 --- a/templates/part.board.mainView.php +++ b/templates/part.board.mainView.php @@ -77,7 +77,7 @@
    From f1ebe01e5e679242ab9a86b7fd0ae833620a9a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 24 Aug 2018 14:00:02 +0200 Subject: [PATCH 4/5] Fix inline input sizing for card title edit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/style.scss | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/css/style.scss b/css/style.scss index e6588807b..54ea444e7 100644 --- a/css/style.scss +++ b/css/style.scss @@ -418,11 +418,6 @@ input.input-inline { overflow: hidden; position: relative; padding: 5px; - - input { - min-height: 0px; - width: auto; - } } .card-assigned-users { @@ -519,6 +514,17 @@ input.input-inline { margin: 0 5px; overflow: hidden; text-overflow: ellipsis; + + span { + padding: 6px 0; + padding-top: 7px; + display: block; + } + + input { + width: 100%; + margin: 0; + } } .labels { From d17d0ec16f3bdd1cff15f44270f0b0d127413cf8 Mon Sep 17 00:00:00 2001 From: Ryan Fletcher Date: Fri, 24 Aug 2018 08:39:43 -0400 Subject: [PATCH 5/5] removing whitespaces Signed-off-by: Ryan Fletcher --- js/controller/BoardController.js | 4 ++-- templates/part.board.mainView.php | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js index 5a899e771..aa82d15f3 100644 --- a/js/controller/BoardController.js +++ b/js/controller/BoardController.js @@ -125,7 +125,7 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St $scope.filterData('-lastModified', $scope.searchText); } else { $scope.filterData('order', $scope.searchText); - } + } }; $scope.checkCanEdit = function () { return !BoardService.getCurrent().archived; @@ -136,7 +136,7 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St if ($scope.stacks === undefined) { return; } - angular.copy(StackService.getData(), $scope.stacks); + angular.copy(StackService.getData(), $scope.stacks); $scope.stacks = $filter('orderBy')($scope.stacks, 'order'); angular.forEach($scope.stacks, function (value, key) { var cards = $filter('cardSearchFilter')(value.cards, text); diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php index 83d261dad..14f4ff148 100644 --- a/templates/part.board.mainView.php +++ b/templates/part.board.mainView.php @@ -43,16 +43,16 @@
    -

    +

    {{ s.title }} + ng-show="!s.status.editStack" + ng-click="s.status.editStack=true">{{ s.title }}
    -
    + @@ -69,7 +69,7 @@

    t('Drop your files here to upload it to the card')); ?>

    -
    +

    -

    +