Merge pull request #2839 from Leantime/dashboard-widget-fix

Dashboard widget fix
Leantime · Dec 16, 2024 · f2f0337 · f2f0337
2 parents b7e9f11 + 5dc63ad
commit f2f0337
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php b/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php
@@ -179,7 +179,8 @@
         </x-global::actions.dropdown>
     @endif --}}
 
-    @if(isset($taskToggle) && $taskToggle === true)
+    @if (isset($taskToggle) && $taskToggle === true)
+
         <div class="" style="float:right; margin-left:5px;">
             <x-global::forms.checkbox labelText="Show Tasks" labelPosition="right" name="showTasks" value="true"
                 :checked="($tpl->get('showTasks') === 'true')" id="taskTypeToggle" class="toggle" onchange="jQuery('#ticketSearch').submit();" />

diff --git a/app/Domain/Widgets/Templates/partials/myToDos.blade.php b/app/Domain/Widgets/Templates/partials/myToDos.blade.php
@@ -23,10 +23,13 @@ class="btn btn-primary"
                        onclick="jQuery('#ticket_new').toggle('fast', function() { jQuery(this).find('input[name=headline]').focus(); });">
                         <i class="fa fa-plus"></i> Add To-Do
                     </a>
-                    <div class="btn-group left">
-                        <button class="btn btn-link dropdown-toggle f-right" type="button" data-toggle="dropdown">{!! __("links.group_by") !!}: {{ __('groupByLabel.'.$groupBy) }}</button>
-                        <ul class="dropdown-menu">
-                            <li><span class="radio">
+                    <div class="flex align-center justify-end">
+                        <x-global::actions.dropdown contentRole="ghost">
+                            <x-slot name="labelText">
+                                {!! __("links.group_by") !!}: {{ __('groupByLabel.'.$groupBy) }}
+                            </x-slot>
+                            <x-slot name="menu">
+                                <li><span>
                                     <input type="radio" name="groupBy"
                                            @if($groupBy == "time") checked='checked' @endif
                                            value="time" id="groupByDate"
@@ -39,7 +42,7 @@ class="btn btn-primary"
                                         />
                                     <label for="groupByDate">{!! __("label.dates") !!}</label></span></li>
                             <li>
-                                <span class="radio">
+                                <span>
                                     <input type="radio"
                                            name="groupBy"
                                            @if($groupBy == "project") checked='checked' @endif
@@ -55,7 +58,7 @@ class="btn btn-primary"
                                 </span>
                             </li>
                             <li>
-                                <span class="radio">
+                                <span>
                                     <input type="radio"
                                            name="groupBy"
                                            @if($groupBy == "priority") checked='checked' @endif
@@ -70,18 +73,14 @@ class="btn btn-primary"
                                     <label for="groupByPriority">{!! __("label.priority") !!}</label>
                                 </span>
                             </li>
-
-                        </ul>
-                    </div>
-                    <div class="btn-group left ">
-                        <button class="btn btn-link dropdown-toggle f-right" type="button" data-toggle="dropdown">
-                            {!! __("links.filter") !!}
-                            @if($projectFilter != '')
-                                <span class='badge badge-primary'>1</span>
-                            @endif
-                        </button>
-                        <ul class="dropdown-menu">
-                            <li
+                            </x-slot>
+                        </x-global::actions.dropdown>
+                        <x-global::actions.dropdown contentRole="ghost">
+                            <x-slot name="labelText">
+                                {!! __("links.filter") !!}
+                            </x-slot>
+                            <x-slot name="menu">
+                                <li
                                 @if($projectFilter == '')
                                     class='active'
                                 @endif
@@ -113,8 +112,8 @@ class='active'
                                         >{{ $project['name'] }}</a></li>
                                 @endforeach
                             @endif
-
-                        </ul>
+                            </x-slot>
+                        </x-global::actions.dropdown>
                     </div>
 
                     @dispatchEvent("afterTodoWidgetGroupByDropdown")
@@ -219,7 +218,7 @@ class="w-full"
                                 @foreach ($ticketGroup['tickets'] as $row)
 
                                     <li class="ui-state-default" id="ticket_{{ $row['id'] }}" >
-                                        <div class="ticketBox fixed priority-border-{{ $row['priority'] }}" data-val="{{ $row['id'] }}">
+                                        <div class="ticketBox priority-border-{{ $row['priority'] }}" data-val="{{ $row['id'] }}">
                                             <div class="row">
                                                 <div class="col-md-8 titleContainer">
                                                     <small>{{ $row['projectName'] }}</small><br />