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

Fix margin issues and eslint warnings

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2017-06-16 21:52:11 +02:00
committed by Julius Härtl
parent 9a77bd7c7c
commit b350213a01
6 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
css/style.css
View File

@@ -458,12 +458,15 @@ button.button-inline:hover {
min-height: initial; min-height: initial;
} }
.card-controls .icon-filetype-text {
margin-right: 5px;
}
.due { .due {
padding: 1px 3px; padding: 1px 3px;
border-radius: 4px; border-radius: 4px;
margin-right: 2px; margin-right: 4px;
font-size: 90%; font-size: 90%;
margin-left: 5px;
opacity: .7; opacity: .7;
} }
.due .icon { .due .icon {

3
js/controller/CardController.js
View File

@@ -20,6 +20,9 @@
* *
*/ */
/* global app */
/* global moment */
app.controller('CardController', function ($scope, $rootScope, $routeParams, $location, $stateParams, BoardService, CardService, StackService, StatusService) { app.controller('CardController', function ($scope, $rootScope, $routeParams, $location, $stateParams, BoardService, CardService, StackService, StatusService) {
$scope.sidebar = $rootScope.sidebar; $scope.sidebar = $rootScope.sidebar;
$scope.status = {}; $scope.status = {};

11
js/directive/datepicker.js
View File

@@ -20,12 +20,16 @@
* *
*/ */
/* global app */
/* gloabl t */
/* global moment */
app.directive('datepicker', function () { app.directive('datepicker', function () {
'use strict'; 'use strict';
return { return {
link: function (scope, elm, attr) { link: function (scope, elm, attr) {
return elm.datepicker({ return elm.datepicker({
dateFormat: "yy-mm-dd", dateFormat: 'yy-mm-dd',
onSelect: function(date, inst) { onSelect: function(date, inst) {
scope.setDuedate(moment(date)); scope.setDuedate(moment(date));
scope.$apply(); scope.$apply();
@@ -37,7 +41,7 @@ app.directive('datepicker', function () {
dp.css({ dp.css({
'margin-left': marginLeft 'margin-left': marginLeft
}); });
$("div.ui-datepicker:before").css({ $('div.ui-datepicker:before').css({
'left': 100 + 'px' 'left': 100 + 'px'
}); });
return $('.hasDatepicker').datepicker(); return $('.hasDatepicker').datepicker();
@@ -45,6 +49,5 @@ app.directive('datepicker', function () {
minDate: null minDate: null
}); });
} }
};
}
}); });

6
js/directive/timepicker.js
View File

@@ -20,6 +20,10 @@
* *
*/ */
/* global app */
/* global t */
/* global moment */
app.directive('timepicker', function() { app.directive('timepicker', function() {
'use strict'; 'use strict';
return { return {
@@ -27,7 +31,7 @@ app.directive('timepicker', function() {
link: function(scope, elm, attr) { link: function(scope, elm, attr) {
return elm.timepicker({ return elm.timepicker({
onSelect: function(date, inst) { onSelect: function(date, inst) {
scope.setDuedateTime(moment("2000-01-01 " + date)); scope.setDuedateTime(moment('2000-01-01 ' + date));
scope.$apply(); scope.$apply();
}, },
myPosition: 'center top', myPosition: 'center top',

8
js/filters/dateFilters.js
View File

@@ -20,6 +20,10 @@
* *
*/ */
/* global app */
/* global OC */
/* global moment */
app.filter('relativeDateFilter', function() { app.filter('relativeDateFilter', function() {
return function (timestamp) { return function (timestamp) {
return OC.Util.relativeModifiedDate(timestamp*1000); return OC.Util.relativeModifiedDate(timestamp*1000);
@@ -43,7 +47,7 @@ app.filter('parseDate', function() {
if(moment(date).isValid()) { if(moment(date).isValid()) {
return moment(date).format('YYYY-MM-DD'); return moment(date).format('YYYY-MM-DD');
} }
return ""; return '';
} }
}); });
@@ -52,6 +56,6 @@ app.filter('parseTime', function() {
if(moment(date).isValid()) { if(moment(date).isValid()) {
return moment(date).format('HH:mm'); return moment(date).format('HH:mm');
} }
return ""; return '';
} }
}); });

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

@@ -68,9 +68,10 @@
<div class="card-controls"> <div class="card-controls">
<i class="icon icon-filetype-text" ng-if="c.description" title="{{ c.description }}"></i> <i class="icon icon-filetype-text" ng-if="c.description" title="{{ c.description }}"></i>
<span class="live-relative-timestamp due" ng-if="c.duedate" <span class="due" ng-if="c.duedate" ng-class="{'overdue': c.overdue == 3, 'now': c.overdue == 2, 'next': c.overdue == 1 }">
ng-class="{'overdue': c.overdue == 3, 'now': c.overdue == 2, 'next': c.overdue == 1 }" <i class="icon icon-calendar"></i>
data-timestamp="{{ c.duedate | dateToTimestamp }}"><i class="icon icon-calendar"></i>{{ c.duedate | relativeDateFilterString }}</span> <span data-timestamp="{{ c.duedate | dateToTimestamp }}" class="live-relative-timestamp">{{ c.duedate | relativeDateFilterString }}</span>
</span>
<div class="app-popover-menu-utils" ng-if="!boardservice.isArchived()"> <div class="app-popover-menu-utils" ng-if="!boardservice.isArchived()">
<button class="button-inline card-options icon-more" ng-model="card"></button> <button class="button-inline card-options icon-more" ng-model="card"></button>
<div class="popovermenu hidden"> <div class="popovermenu hidden">