Merge pull request #371 from nextcloud/minor-fixes

Various fixes
This commit is contained in:
Julius Härtl
2018-01-08 13:44:46 +01:00
committed by GitHub
7 changed files with 22 additions and 10 deletions

View File

@@ -190,6 +190,10 @@ input.input-inline {
.crumb { .crumb {
order: 0; order: 0;
.bullet {
opacity: 1;
}
a:nth-child(2), a:nth-child(2),
a:nth-child(3) { a:nth-child(3) {
padding-left: 0; padding-left: 0;

View File

@@ -55,7 +55,11 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
}; };
$scope.$watch(function () { $scope.$watch(function () {
return BoardService.getCurrent().title; if (typeof BoardService.getCurrent() !== 'undefined') {
return BoardService.getCurrent().title;
} else {
return null;
}
}, function () { }, function () {
$scope.setPageTitle(); $scope.setPageTitle();
}); });
@@ -211,6 +215,9 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
}; };
$scope.aclTypeString = function (acl) { $scope.aclTypeString = function (acl) {
if (typeof acl === 'undefined') {
return '';
}
switch (acl.type) { switch (acl.type) {
case OC.Share.SHARE_TYPE_USER: case OC.Share.SHARE_TYPE_USER:
return 'user'; return 'user';

View File

@@ -58,6 +58,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
return false; return false;
} }
$scope.status.cardEditDescription = true; $scope.status.cardEditDescription = true;
$scope.status.edit = angular.copy(CardService.getCurrent());
return true; return true;
}; };
$scope.cardEditDescriptionChanged = function ($event) { $scope.cardEditDescriptionChanged = function ($event) {
@@ -73,7 +74,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
$scope.status.lastSave = currentTime; $scope.status.lastSave = currentTime;
var header = $('.section-header.card-description'); var header = $('.section-header.card-description');
header.find('.save-indicator.unsaved').fadeIn(500); header.find('.save-indicator.unsaved').fadeIn(500);
CardService.update(CardService.getCurrent()).then(function (data) { CardService.update($scope.status.edit).then(function (data) {
var header = $('.section-header.card-description'); var header = $('.section-header.card-description');
header.find('.save-indicator.unsaved').hide(); header.find('.save-indicator.unsaved').hide();
header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000); header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
@@ -89,7 +90,7 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
}); });
}; };
$scope.cardUpdate = function (card) { $scope.cardUpdate = function (card) {
CardService.update(CardService.getCurrent()).then(function (data) { CardService.update(card).then(function (data) {
$scope.status.cardEditDescription = false; $scope.status.cardEditDescription = false;
var header = $('.section-content.card-description'); var header = $('.section-content.card-description');
header.find('.save-indicator.unsaved').hide(); header.find('.save-indicator.unsaved').hide();

View File

@@ -14,7 +14,7 @@
<a ui-sref="list({ filter: 'archived' })"><?php p($l->t('Archived boards')); ?></a> <a ui-sref="list({ filter: 'archived' })"><?php p($l->t('Archived boards')); ?></a>
</div> </div>
<div class="crumb title"> <div class="crumb title">
<a><span class="board-bullet" ng-style="{'background-color':'#' + boardservice.getCurrent().color}"></span></a> <a class="bullet"><span class="board-bullet" ng-style="{'background-color':'#' + boardservice.getCurrent().color}"></span></a>
<a ui-sref=".({filter: ''})">{{ boardservice.getCurrent().title }}</a> <a ui-sref=".({filter: ''})">{{ boardservice.getCurrent().title }}</a>
<a ui-sref=".detail({ tab: 0 })"><span class="icon icon-share"></span></a> <a ui-sref=".detail({ tab: 0 })"><span class="icon icon-share"></span></a>
</div> </div>

View File

@@ -32,7 +32,7 @@
<div ng-click="gotoBoard(b)" ng-show="!b.status.edit">{{ b.title }}</div> <div ng-click="gotoBoard(b)" ng-show="!b.status.edit">{{ b.title }}</div>
<div class="app-navigation-entry-edit" ng-show="b.status.edit"> <div class="app-navigation-entry-edit" ng-show="b.status.edit">
<form ng-disabled="isAddingList" class="ng-pristine ng-valid" ng-submit="boardUpdate(b)"> <form ng-disabled="isAddingList" class="ng-pristine ng-valid" ng-submit="boardUpdate(b)">
<input id="newTitle" class="edit ng-valid ng-empty" type="text" autofocus-on-insert ng-model="b.title" maxlength="100" ng-model-options="{ debounce: 250 }"> <input class="edit ng-valid ng-empty" type="text" autofocus-on-insert ng-model="b.title" maxlength="100" ng-model-options="{ debounce: 250 }">
<div class="colorselect"> <div class="colorselect">
<div class="color" ng-repeat="c in ::colors" ng-style="{'background-color':'#{{ c }}'}" ng-click="b.color=c" ng-class="{'selected': (c == b.color) }"><br /></div> <div class="color" ng-repeat="c in ::colors" ng-style="{'background-color':'#{{ c }}'}" ng-click="b.color=c" ng-class="{'selected': (c == b.color) }"><br /></div>
</div> </div>
@@ -99,7 +99,7 @@
<td> <td>
<form ng-disabled="isAddingList" <form ng-disabled="isAddingList"
class="ng-pristine ng-valid" ng-submit="boardCreate()"> class="ng-pristine ng-valid" ng-submit="boardCreate()">
<input id="newTitle" class="edit ng-valid ng-empty" <input class="edit ng-valid ng-empty"
type="text" placeholder="<?php p($l->t('New board title')); ?>" type="text" placeholder="<?php p($l->t('New board title')); ?>"
autofocus-on-insert ng-model="newBoard.title" maxlength="100" ng-model-options="{ debounce: 250 }"> autofocus-on-insert ng-model="newBoard.title" maxlength="100" ng-model-options="{ debounce: 250 }">
<div class="colorselect"> <div class="colorselect">

View File

@@ -98,8 +98,8 @@
<div class="section-content card-description"> <div class="section-content card-description">
<textarea elastic ng-if="status.cardEditDescription" <textarea elastic ng-if="status.cardEditDescription"
placeholder="<?php p($l->t('Add a card description…')); ?>" placeholder="<?php p($l->t('Add a card description…')); ?>"
ng-blur="cardUpdate(cardservice.getCurrent())" ng-blur="cardUpdate(status.edit)"
ng-model="cardservice.getCurrent().description" ng-model="status.edit.description"
ng-change="cardEditDescriptionChanged()" ng-change="cardEditDescriptionChanged()"
autofocus-on-insert> </textarea> autofocus-on-insert> </textarea>
<div class="container" ng-click="cardEditDescriptionShow($event)" <div class="container" ng-click="cardEditDescriptionShow($event)"

View File

@@ -35,7 +35,7 @@
<div class="app-navigation-entry-edit"> <div class="app-navigation-entry-edit">
<form ng-disabled="isAddingList" class="ng-pristine ng-valid" ng-submit="boardUpdate(b)"> <form ng-disabled="isAddingList" class="ng-pristine ng-valid" ng-submit="boardUpdate(b)">
<input id="newTitle" class="edit ng-valid ng-empty" type="text" autofocus-on-insert ng-model="b.title" maxlength="100" ng-model-options="{ debounce: 250 }"> <input class="edit ng-valid ng-empty" type="text" autofocus-on-insert ng-model="b.title" maxlength="100" ng-model-options="{ debounce: 250 }">
<input type="submit" value="" class="action icon-checkmark svg"> <input type="submit" value="" class="action icon-checkmark svg">
</form> </form>
<div class="colorselect"> <div class="colorselect">
@@ -50,7 +50,7 @@
</a> </a>
<div class="app-navigation-entry-edit" ng-if="status.addBoard"> <div class="app-navigation-entry-edit" ng-if="status.addBoard">
<form ng-disabled="isAddingList" class="ng-pristine ng-valid" ng-submit="boardCreate()"> <form ng-disabled="isAddingList" class="ng-pristine ng-valid" ng-submit="boardCreate()">
<input id="newTitle" class="edit ng-valid ng-empty" type="text" placeholder="<?php p($l->t('New board title')); ?>" autofocus-on-insert ng-model="newBoard.title" maxlength="100" ng-model-options="{ debounce: 250 }"> <input class="edit ng-valid ng-empty" type="text" placeholder="<?php p($l->t('New board title')); ?>" autofocus-on-insert ng-model="newBoard.title" maxlength="100" ng-model-options="{ debounce: 250 }">
<input type="submit" value="" class="action icon-checkmark svg"> <input type="submit" value="" class="action icon-checkmark svg">
</form> </form>
<div class="colorselect"> <div class="colorselect">