jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

use dropdown for entity actions on detail pages (#801)

Browse Source
This commit is contained in:
Kevin Papst
2019-05-21 23:21:26 +02:00
committed by GitHub
parent ec174a38a9
commit 871b2e52c7
12 changed files with 52 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/plugins/KimaiAPILink.js
View File

@@ -29,7 +29,7 @@ export default class KimaiAPILink extends KimaiClickHandlerReducedInTableRow {
const self = this;
document.addEventListener('click', function(event) {
let target = event.target;
while (!target.matches('body')) {
while (target !== null && !target.matches('body')) {
if (target.classList.contains(self.selector)) {
const attributes = target.dataset;

2
assets/js/plugins/KimaiClickHandlerReducedInTableRow.js
View File

@@ -25,7 +25,7 @@ export default class KimaiClickHandlerReducedInTableRow extends KimaiPlugin {
// we don't want the table row event to be processed - so we intercept it
let target = event.target;
if (event.currentTarget.matches('tr')) {
while (!target.matches('body')) {
while (target !== null && !target.matches('body')) {
if (target.matches('a') || target.matches ('button')) {
return;
}

2
assets/js/plugins/KimaiToolbarAction.js
View File

@@ -26,7 +26,7 @@ export default class KimaiToolbarAction extends KimaiPlugin {
const self = this;
document.addEventListener('click', function(event) {
let target = event.target;
while (!target.matches('body')) {
while (target !== null && !target.matches('body')) {
if (target.classList.contains(self.selector)) {
const form = document.querySelector('div.toolbar form.navbar-form');
if (form === null) {

21
assets/sass/datatable-extensions.scss
View File

@@ -5,6 +5,19 @@
* file that was distributed with this source code.
*/
span.label-activity,
span.label-project,
span.label-customer {
display: inline-block;
.dot {
height: 10px;
width: 10px;
background-color: $gray-lte;
border-radius: 50%;
display: inline-block;
}
}
table.dataTable {
/* action column */
.actions {
@@ -39,14 +52,6 @@ table.dataTable {
span.label-activity,
span.label-project,
span.label-customer {
display: inline-block;
.dot {
height: 10px;
width: 10px;
background-color: $gray-lte;
border-radius: 50%;
display: inline-block;
}
a {
color: unset;
padding-bottom: 2px;