Skip to content

Commit

Permalink
fixed goal board selector
Browse files Browse the repository at this point in the history
  • Loading branch information
muhtasimhafiz committed Sep 27, 2024
1 parent 8b4e681 commit 8256484
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 48 deletions.
21 changes: 2 additions & 19 deletions app/Domain/Goalcanvas/Templates/dashboard.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,27 +53,10 @@
<h5>{{ session('currentProjectClient') . ' // ' . session('currentProjectName') }}</h5>

<h1>{{ __('headline.goal.dashboardboard') }} //
@if (count($allCanvas) > 0)
<x-global::actions.dropdown label-text='All Goal Groups' contentRole="accent" position="bottom">
<x-slot:menu>
@if ($login::userIsAtLeast($roles::$editor))
<x-global::actions.dropdown.item variant="link" href="#/goalcanvas/bigRock">
{!! __('links.icon.create_new_board') !!}
</x-global::actions.dropdown.item>
<x-global::actions.dropdown.item variant="border" />
@endif
@foreach ($allCanvas as $canvasRow)
<x-global::actions.dropdown.item variant="link"
href="{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow['id'] }}">
{{ $tpl->escape($canvasRow['title']) }}
</x-global::actions.dropdown.item>
@endforeach
</x-slot:menu>
</x-global::actions.dropdown>
@endif
@include('goalcanvas::partials.goalBoard')
</h1>
</div>
</div><!--pageheader-->
</div>

<div class="maincontent">

Expand Down
18 changes: 18 additions & 0 deletions app/Domain/Goalcanvas/Templates/partials/goalBoard.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@if (count($allCanvas) > 0)
<x-global::actions.dropdown label-text='All Goal Groups' contentRole="ghost" class="header-title-dropdown" position="bottom">
<x-slot:menu>
@if ($login::userIsAtLeast($roles::$editor))
<x-global::actions.dropdown.item variant="link" href="#/goalcanvas/bigRock">
{!! __('links.icon.create_new_board') !!}
</x-global::actions.dropdown.item>
<x-global::actions.dropdown.item variant="border" />
@endif
@foreach ($allCanvas as $canvasRow)
<x-global::actions.dropdown.item variant="link"
href="{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow['id'] }}">
{{ $tpl->escape($canvasRow['title']) }}
</x-global::actions.dropdown.item>
@endforeach
</x-slot:menu>
</x-global::actions.dropdown>
@endif
31 changes: 2 additions & 29 deletions app/Domain/Goalcanvas/Templates/showCanvas.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,34 +92,7 @@ class="delete">
</span>
@endif
<h1>{{ __('headline.goal.board') }} //
@if (count($allCanvas) > 0)
<span class="dropdown dropdownWrapper">
@php
$labelText = $canvasTitle . '&nbsp;<i class="fa fa-caret-down"></i>';
@endphp

<x-global::actions.dropdown :labelText="html_entity_decode($labelText)" class="header-title-dropdown" align="start"
contentRole="menu">
<x-slot:menu>
@if ($login::userIsAtLeast($roles::$editor))
<x-global::actions.dropdown.item href="#/goalcanvas/bigRock">
{!! __('links.icon.create_new_bigrock') !!}
</x-global::actions.dropdown.item>
@endif

<li class="border"></li>

@foreach ($allCanvas as $canvasRow)
<x-global::actions.dropdown.item
href="{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow['id'] }}">
{{ $canvasRow['title'] }}
</x-global::actions.dropdown.item>
@endforeach
</x-slot:menu>
</x-global::actions.dropdown>

</span>
@endif
@include('goalcanvas::partials.goalBoard')
</h1>
</div>
</div>
Expand Down Expand Up @@ -151,7 +124,7 @@ class="delete">
$filterStatus = $filter['status'] ?? 'all';
$filterRelates = $filter['relates'] ?? 'all';
@endphp
<x-global::actions.dropdown class="btn dropdown-toggle" align="start" contentRole="menu">
<x-global::actions.dropdown class="btn dropdown-toggle" align="start" contentRole="ghost">
<!-- Dropdown Trigger -->
<x-slot:labelText>
@if ($filter['status'] == 'all')
Expand Down

0 comments on commit 8256484

Please sign in to comment.