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

Merge branch 'master' into feature-631/remember-side-menu-state

Browse Source
This commit is contained in:
Julius Härtl
2018-11-22 20:01:00 +01:00
committed by GitHub
parent ef36103c47 3374f6c908
commit c65a9151ab
7 changed files with 296 additions and 1202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
css/style.scss
View File

@@ -1288,10 +1288,16 @@ input.input-inline {
.board-detail__deleted-list__item { .board-detail__deleted-list__item {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between;
* { * {
flex-basis: 20%; flex-basis: 44px;
}
.title {
flex-grow: 2;
}
.live-relative-timestamp {
flex-grow: 1;
} }
} }

1439
js/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
js/package.json
View File

@@ -29,7 +29,7 @@
"css-loader": "^1.0.1", "css-loader": "^1.0.1",
"karma": "^3.1.1", "karma": "^3.1.1",
"mini-css-extract-plugin": "^0.4.4", "mini-css-extract-plugin": "^0.4.4",
"node-sass": "^4.10.0", "uglifyjs-webpack-plugin": "^2.0.1",
"webpack": "^4.25.1", "webpack": "^4.25.1",
"webpack-cli": "^3.1.2", "webpack-cli": "^3.1.2",
"webpack-merge": "^4.1.4" "webpack-merge": "^4.1.4"

2
l10n/fr.js
View File

@@ -114,6 +114,8 @@ OC.L10N.register(
"Share board" : "Partager le tableau", "Share board" : "Partager le tableau",
"Actions" : "Actions", "Actions" : "Actions",
"Drop your files here to upload it to the card" : "Déposez vos fichiers ici pour les téléverser sur la carte", "Drop your files here to upload it to the card" : "Déposez vos fichiers ici pour les téléverser sur la carte",
"Assign card to me" : "Assignez-moi la carte",
"Unassign card from me" : "Retirez-moi la carte",
"Archive card" : "Archiver la carte", "Archive card" : "Archiver la carte",
"Unarchive card" : "Ne plus archiver la carte", "Unarchive card" : "Ne plus archiver la carte",
"Delete card" : "Supprimer la carte", "Delete card" : "Supprimer la carte",

2
l10n/fr.json
View File

@@ -112,6 +112,8 @@
"Share board" : "Partager le tableau", "Share board" : "Partager le tableau",
"Actions" : "Actions", "Actions" : "Actions",
"Drop your files here to upload it to the card" : "Déposez vos fichiers ici pour les téléverser sur la carte", "Drop your files here to upload it to the card" : "Déposez vos fichiers ici pour les téléverser sur la carte",
"Assign card to me" : "Assignez-moi la carte",
"Unassign card from me" : "Retirez-moi la carte",
"Archive card" : "Archiver la carte", "Archive card" : "Archiver la carte",
"Unarchive card" : "Ne plus archiver la carte", "Unarchive card" : "Ne plus archiver la carte",
"Delete card" : "Supprimer la carte", "Delete card" : "Supprimer la carte",

13
templates/part.board.sidebarView.php
View File

@@ -127,11 +127,9 @@
<ul class='board-detail__deleted-list'> <ul class='board-detail__deleted-list'>
<li class='board-detail__deleted-list__item' ng-repeat="deletedStack in stackservice.deleted"> <li class='board-detail__deleted-list__item' ng-repeat="deletedStack in stackservice.deleted">
<span class="icon icon-deck"></span> <span class="icon icon-deck"></span>
<span>{{deletedStack.title}}</span> <span class="title">{{deletedStack.title}}</span>
<span>{{deletedStack.deletedAt | relativeDateFilter }}</span> <span class="live-relative-timestamp" data-timestamp="{{ deletedStack.deletedAt*1000 }}">{{deletedStack.deletedAt | relativeDateFilter }}</span>
<a ng-click="stackUndoDelete(deletedStack)"> <a ng-click="stackUndoDelete(deletedStack)"><span class="icon icon-history"></span></a>
<span class="icon icon-history"></span>
</a>
</li> </li>
</ul> </ul>
@@ -140,9 +138,8 @@
<ul class='board-detail__deleted-list'> <ul class='board-detail__deleted-list'>
<li class='board-detail__deleted-list__item' ng-repeat="deletedCard in cardservice.deleted"> <li class='board-detail__deleted-list__item' ng-repeat="deletedCard in cardservice.deleted">
<span class="icon icon-deck"></span> <span class="icon icon-deck"></span>
<span>{{deletedCard.title}}</span> <span class="title">{{deletedCard.title}} ({{stackservice.tryAllThenDeleted(deletedCard.stackId).title}})</span>
<span>{{stackservice.tryAllThenDeleted(deletedCard.stackId).title}}</span> <span class="live-relative-timestamp" data-timestamp="{{ deletedCard.deletedAt*1000 }}">{{deletedCard.deletedAt | relativeDateFilter }}</span>
<span>{{deletedCard.deletedAt | relativeDateFilter }}</span>
<a ng-click="cardOrCardAndStackUndoDelete(deletedCard)"> <a ng-click="cardOrCardAndStackUndoDelete(deletedCard)">
<span class="icon icon-history"></span> <span class="icon icon-history"></span>
</a> </a>