Merge pull request #2715 from Leantime/fix-add-todo-and-submenu-ticke…

…t-kanban-and-list Fix add todo and submenu in Ticket Kanban and List view
Leantime · Sep 26, 2024 · 4a902c2 · 4a902c2
2 parents b92d258 + d584ae5
commit 4a902c2
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 17 deletions.
diff --git a/app/Domain/Tickets/Templates/showKanban.blade.php b/app/Domain/Tickets/Templates/showKanban.blade.php
@@ -65,7 +65,11 @@
  <?php foreach ($tpl->get('allKanbanColumns') as $key => $statusRow) { ?>
  <div class="column">
 
- <h4 class="widgettitle title-primary title-border-<?php echo $statusRow['class']; ?>">
+ <h4 class="flex justify-between items-center widgettitle title-primary title-border-<?php echo $statusRow['class']; ?>">
+ <div>
+ <strong class="count">0</strong>
+ <?php $tpl->e($statusRow['name']); ?>
+ </div>
 
  <?php if ($login::userIsAtLeast($roles::$manager)) { ?>
  <!-- Determine Label Text for the Dropdown -->
@@ -74,8 +78,7 @@
  @endphp
 
  <!-- Context Menu Component -->
- <x-global::content.context-menu :label-text="$labelText" contentRole="link" position="bottom"
- align="start">
+ <x-global::content.context-menu :label-text="$labelText" contentRole="link" position="bottom" align="end">
  <!-- Dropdown Items -->
  <x-global::actions.dropdown.item
  href="#/setting/editBoxLabel?module=ticketlabels&label={{ $key }}"
@@ -90,9 +93,6 @@ class="editLabelModal">
 
  <?php } ?>
 
- <strong class="count">0</strong>
- <?php $tpl->e($statusRow['name']); ?>
-
  </h4>
 
  <div class="">
@@ -109,7 +109,6 @@ class="editLabelModal">
  name="headline" 
  placeholder="Enter To-Do Title" 
  title="{!! $tpl->__('label.headline') !!}" 
- variant="title"
  />
 
  <input type="hidden" name="milestone" value="{!! $searchCriteria['milestone'] !!}" />
@@ -126,6 +125,7 @@ class="editLabelModal">
  <x-global::forms.button 
  tag="a"
  class="btn btn-default"
+ content-role="secondary"
  href="javascript:void(0);" 
  onclick="jQuery('#ticket_new_{!! $key !!}, #ticket_new_link_{!! $key !!}').toggle('fast');"
  >

diff --git a/app/Domain/Tickets/Templates/showList.blade.php b/app/Domain/Tickets/Templates/showList.blade.php
@@ -61,19 +61,31 @@
  <form action="" method="post">
  <x-global::forms.text-input 
  type="text" 
- name="headline" 
- placeholder="{{ __('input.placeholders.create_task') }}" 
- autofocus 
- class="w-full" 
+ name="headline"
+ id="headlineInput"
+ placeholder="Enter To-Do Title" 
+ title="{!! $tpl->__('label.headline') !!}"
+ autofocus
+ variant="fullWidth"
  />
  <input type="hidden" name="sprint" value="<?=$currentSprint?>" />
  <input type="hidden" name="quickadd" value="1"/>
  <x-global::forms.button 
- type="submit"
- class="mb-m"
- name="saveTicket"
- style="vertical-align: top;">
- {{ __('buttons.save') }}
+ type="submit"
+ class="mb-m"
+ name="saveTicket"
+ style="vertical-align: top;">
+ {{ __('buttons.save') }}
+ </x-global::forms.button>
+
+ <x-global::forms.button 
+ tag="a"
+ class="btn btn-default"
+ content-role="secondary"
+ href="javascript:void(0);" 
+ onclick="cancelTask();"
+ >
+ {!! $tpl->__('links.cancel') !!}
  </x-global::forms.button>
  </form>
 
@@ -182,5 +194,9 @@ class="mb-m"
 
  });
 
+ function cancelTask() {
+ document.getElementById('headlineInput').value = ''; 
+ }
+
 </script>
 @endsection
diff --git a/app/Views/Templates/components/content/context-menu.blade.php b/app/Views/Templates/components/content/context-menu.blade.php
@@ -1,4 +1,4 @@
-<x-global::actions.dropdown label-text="<i class='fa fa-ellipsis-v' aria-hidden='true'></i>" contentRole="link" position="bottom" align="start">
+<x-global::actions.dropdown label-text="<i class='fa fa-ellipsis-v' aria-hidden='true'></i>" contentRole="link" position="bottom" :align="$align ?? 'start'">
  <x-slot:menu>
  {{ $slot }}
  </x-slot:menu>