Rework js controllers fixes #3

This commit is contained in:
Julius Haertl
2016-08-15 12:28:51 +02:00
parent e221d70efb
commit 9d4ba71a3b
11 changed files with 57 additions and 415 deletions

View File

@@ -17,7 +17,7 @@
<div class="tabsContainer">
<div id="commentsTabView" class="tab commentsTabView" ng-if="status.boardtab==0 || !status.boardtab">
<ui-select ng-model="status.addSharee" theme="bootstrap" style="width:100%;" title="Choose a user to assign" placeholder="Assign users ..." on-select="addAcl(status.addSharee)">
<ui-select ng-model="status.addSharee" theme="bootstrap" style="width:100%;" title="Choose a user to assign" placeholder="Assign users ..." on-select="aclAdd(status.addSharee)">
<ui-select-match placeholder="<?php p($l->t('Select users...')); ?>">
<span><i class="fa fa-{{$item.type}}"></i> {{ $item.participant }}</span>
</ui-select-match>
@@ -46,18 +46,18 @@
<span class="has-tooltip username">
{{ acl.participant }}</span>
<span class="shareOption">
<input type="checkbox" class="permissions checkbox" id="checkbox-permission-{{ acl.id }}-share" ng-model="acl.permissionInvite" ng-change="updateAcl(acl)" />
<input type="checkbox" class="permissions checkbox" id="checkbox-permission-{{ acl.id }}-share" ng-model="acl.permissionInvite" ng-change="aclUpdate(acl)" />
<label for="checkbox-permission-{{ acl.id }}-share"><?php p($l->t('Share')); ?></label>
</span>
<span class="shareOption">
<input type="checkbox" class="permissions checkbox" id="checkbox-permission-{{ acl.id }}-edit" ng-model="acl.permissionWrite" ng-change="updateAcl(acl)" />
<input type="checkbox" class="permissions checkbox" id="checkbox-permission-{{ acl.id }}-edit" ng-model="acl.permissionWrite" ng-change="aclUpdate(acl)" />
<label for="checkbox-permission-{{ acl.id }}-edit"><?php p($l->t('Edit')); ?></label>
</span>
<span class="shareOption">
<input type="checkbox" class="permissions checkbox" id="checkbox-permission-{{ acl.id }}-manage" ng-model="acl.permissionManage" ng-change="updateAcl(acl)" />
<input type="checkbox" class="permissions checkbox" id="checkbox-permission-{{ acl.id }}-manage" ng-model="acl.permissionManage" ng-change="aclUpdate(acl)" />
<label for="checkbox-permission-{{ acl.id }}-manage"><?php p($l->t('Manage')); ?></label>
</span>
<a class="unshare" ng-click="deleteAcl(acl)"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span class="hidden-visually"><?php p($l->t('Discard share')); ?></span></a>
<a class="unshare" ng-click="aclDelete(acl)"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span class="hidden-visually"><?php p($l->t('Discard share')); ?></span></a>
</li>
</ul>

View File

@@ -33,7 +33,7 @@
<?php p($l->t('Create new board')); ?>
</a>
<form ng-show="status.addBoard" ng-disabled="isAddingList"
class="ng-pristine ng-valid" ng-submit="createBoard()">
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">

View File

@@ -8,14 +8,14 @@
<div id="card-header">
<a class="icon-close" ui-sref="board" ng-click="sidebar.show=!sidebar.show">&nbsp;</a>
<h2>
<form ng-submit="renameCard(cardservice.getCurrent())">
<form ng-submit="cardRename(cardservice.getCurrent())">
<!-- TODO: change to textarea elastic //-->
<input class="input-inline" type="text" ng-if="status.renameCard"
<input class="input-inline" type="text" ng-if="status.cardRename"
ng-model="cardservice.getCurrent().title"
ng-blur="renameCard(cardservice.getCurrent())"
ng-blur="cardRename(cardservice.getCurrent())"
autofocus-on-insert required>
</form>
<div ng-click="status.renameCard=true" ng-show="!status.renameCard">{{
<div ng-click="status.cardRename=true" ng-show="!status.cardRename">{{
cardservice.getCurrent().title }}
</div>
</h2>
@@ -66,13 +66,13 @@
<div id="card-description">
<h3>Description</h3>
<textarea elastic ng-if="status.description"
<textarea elastic ng-if="status.cardEditDescription"
placeholder="Enter your description here ..."
ng-blur="updateCard(cardservice.getCurrent())"
ng-blur="cardUpdate(cardservice.getCurrent())"
ng-model="cardservice.getCurrent().description"
autofocus-on-insert> </textarea>
<div class="container" ng-click="editDescription()"
ng-show="!status.description" ng-animate>
<div class="container" ng-click="cardEditDescription()"
ng-show="!status.cardEditDescription" ng-animate>
<div ng-bind-html="cardservice.getCurrent().description | markdown"
id="markdown"></div>
<div class="placeholder"

View File

@@ -19,7 +19,7 @@
<ul>
<li><button class="icon-share svg" title="share"></button></li>
<li><button class="icon-rename svg" title="rename" ng-click="b.status.edit=true"></button></li>
<li><button class="icon-delete svg" title="delete" ng-click="deleteBoard(b)"></button></li>
<li><button class="icon-delete svg" title="delete" ng-click="boardDelete(b)"></button></li>
</ul>
</div>
<div class="app-navigation-entry-deleted" ng-show="false">
@@ -28,7 +28,7 @@
</div>
<div class="app-navigation-entry-edit" ng-show="b.status.edit">
<form ng-disabled="isAddingList" class="ng-pristine ng-valid" ng-submit="updateBoard(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">
<input type="submit" value="" class="action icon-checkmark svg">
<div class="colorselect">
@@ -44,12 +44,11 @@
<?php p($l->t('Create a new board')); ?>
</a>
<div class="app-navigation-entry-edit" ng-if="status.addBoard">
<form ng-disabled="isAddingList" class="ng-pristine ng-valid" ng-submit="createBoard()">
<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('Board title')); ?>" autofocus-on-insert ng-model="newBoard.title">
<input type="submit" value="" class="action icon-checkmark svg">
<div class="colorselect">
<div class="color" ng-repeat="c in colors" style="background-color:#{{ c }};" ng-click="selectColor(c)" n:w
g-class="{'selected': (c == newBoard.color) }"><br /></div>
<div class="color" ng-repeat="c in colors" style="background-color:#{{ c }};" ng-click="selectColor(c)" ng-class="{'selected': (c == newBoard.color) }"><br /></div>
</div>
</form>
</div>

View File

@@ -4,8 +4,8 @@
data-apps-slide-toggle="#app-settings-content"
></button>
</div>
<div id="app-settings-content">
<?php p($l->t('We will provide some options here!')); ?>
<!--<div id="app-settings-content">
<?php p($l->t('There will be some options here!')); ?>
<br />
</div>
</div>//-->
</div>