diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index b496a0891b..6d7af8eb93 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -103,7 +103,7 @@ .kanban-card .header .executionName {display: flex; width: 100%; float: left;} .kanban-card .header .executionName .title {padding-right: 0px; margin-right: 5px; overflow: hidden; white-space: nowrap;} .kanban-card .header .executionName > span {flex: none;} -.execInfo, .releaseInfo, .productplanInfo {margin-top: 23px;} +.execInfo, .releaseInfo, .productplanInfo {margin-top: 22px;} .label-wait {background: #EFEFEF !important; color: #838A9D;} .label-doing {background: #f8d2d2 !important; color: #e64b4c;} .label-suspended {background: #fff3d9 !important; color: #ff9800;} diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index c8d52ea25c..7afcdeb042 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -315,7 +315,7 @@ function renderKanbanItem(item, $item) if(privs.includes('sortCard')) $item.parent().addClass('sort'); if(!$title.length) { - if(privs.includes('viewCard')) $title = $('').appendTo($item).attr('href', createLink('kanban', 'viewCard', 'cardID=' + item.id, '', true)); + if(privs.includes('viewCard')) $title = $('').appendTo($item).attr('href', createLink('kanban', 'viewCard', 'cardID=' + item.id, '', true)); if(!privs.includes('viewCard')) $title = $('

').appendTo($item); } @@ -1302,10 +1302,10 @@ $(function() var columnID = $(this).closest('.kanban-col').data('id'); /* The submenu of import. */ - var importPlanLink = kanban.object.indexOf('plans') != -1 ? "
  • " + kanbanLang.importPlan + '
  • ' : ''; - var importReleaseLink = kanban.object.indexOf('releases') != -1 ? "
  • " + kanbanLang.importRelease + '
  • ' : ''; - var importExecutionLink = kanban.object.indexOf('executions') != -1 ? "
  • " + kanbanLang.importExecution + '
  • ' : ''; - var importBuildLink = kanban.object.indexOf('builds') != -1 ? "
  • " + kanbanLang.importBuild + '
  • ' : ''; + var importPlanLink = kanban.object.indexOf('plans') != -1 ? "
  • " + kanbanLang.importPlan + '
  • ' : ''; + var importReleaseLink = kanban.object.indexOf('releases') != -1 ? "
  • " + kanbanLang.importRelease + '
  • ' : ''; + var importExecutionLink = kanban.object.indexOf('executions') != -1 ? "
  • " + kanbanLang.importExecution + '
  • ' : ''; + var importBuildLink = kanban.object.indexOf('builds') != -1 ? "
  • " + kanbanLang.importBuild + '
  • ' : ''; var importSubmenu = ''; $('.import').parent().append(importSubmenu); diff --git a/module/kanban/view/importbuild.html.php b/module/kanban/view/importbuild.html.php index 993318b9e9..867663c420 100644 --- a/module/kanban/view/importbuild.html.php +++ b/module/kanban/view/importbuild.html.php @@ -22,14 +22,13 @@

    kanban->importAB . $lang->kanban->importBuild;?>

    -
    -

    kanban->selectedProject;?>

    -
    -
    -
    -

    kanban->selectedLane;?>

    -
    +
    + kanban->selectedProject;?> + + kanban->selectedLane;?> +
    +
    @@ -73,13 +72,15 @@
    - -
    + +
    noData;?>
    +
    + diff --git a/module/kanban/view/importcard.html.php b/module/kanban/view/importcard.html.php index 5a8d2c9170..8f27211467 100644 --- a/module/kanban/view/importcard.html.php +++ b/module/kanban/view/importcard.html.php @@ -22,14 +22,13 @@

    kanban->importCard;?>

    -
    -

    kanban->selectedKanban;?>

    -
    -
    -
    -

    kanban->selectedLane;?>

    -
    +
    + kanban->selectedKanban;?> + + kanban->selectedLane;?> +
    +
    @@ -71,13 +70,15 @@
    - -
    + +
    noData;?>
    +
    + diff --git a/module/kanban/view/importexecution.html.php b/module/kanban/view/importexecution.html.php index 3a250a611f..9b18b79bee 100644 --- a/module/kanban/view/importexecution.html.php +++ b/module/kanban/view/importexecution.html.php @@ -22,16 +22,15 @@

    kanban->importAB . $lang->kanban->importExecution;?>

    - systemMode == 'new'):?> -
    -

    kanban->selectedProject;?>

    -
    -
    - -
    -

    kanban->selectedLane;?>

    -
    +
    + systemMode == 'new'):?> + kanban->selectedProject;?> + + + kanban->selectedLane;?> +
    +
    @@ -79,13 +78,19 @@
    - -
    + +
    noData;?>
    +
    +systemMode == 'classic'):?> + + + + diff --git a/module/kanban/view/importplan.html.php b/module/kanban/view/importplan.html.php index cd59825421..72db45c585 100644 --- a/module/kanban/view/importplan.html.php +++ b/module/kanban/view/importplan.html.php @@ -22,14 +22,13 @@

    kanban->importAB . $lang->kanban->importPlan;?>

    -
    -

    kanban->selectedProduct;?>

    -
    -
    -
    -

    kanban->selectedLane;?>

    -
    +
    + kanban->selectedProduct;?> + + kanban->selectedLane;?> +
    +
    @@ -77,13 +76,15 @@
    - -
    + +
    noData;?>
    +
    + diff --git a/module/kanban/view/importrelease.html.php b/module/kanban/view/importrelease.html.php index 2280424d87..7497e95afe 100644 --- a/module/kanban/view/importrelease.html.php +++ b/module/kanban/view/importrelease.html.php @@ -22,14 +22,13 @@

    kanban->importAB . $lang->kanban->importRelease;?>

    -
    -

    kanban->selectedProduct;?>

    -
    -
    -
    -

    kanban->selectedLane;?>

    -
    +
    + kanban->selectedProduct;?> + + kanban->selectedLane;?> +
    +
    @@ -75,13 +74,15 @@
    - -
    + +
    noData;?>
    +
    +