Skip to content

Firefly III: a personal finances manager

Fix menu's en buttons.

James Coledf28aa44e48c
diff --git a/resources/views/accounts/show.blade.php b/resources/views/accounts/show.blade.php
index 52d874bdc0..0a0bf63a2b 100644
--- a/resources/views/accounts/show.blade.php
+++ b/resources/views/accounts/show.blade.php
@@ -28,7 +28,11 @@
</h3>
</div>
<div class="col text-end">
- <div class="dropdown">
+ <div class="btn-group">
+ <a href="{{ route('transactions.create', ['withdrawal']) }}?source={{ $account->id }}" class="btn btn-sm btn-outline-success">
+ <span class="bi bi-plus-circle"></span> {{ __('firefly.create_new_transaction') }}
+ </a>
+ <div class="btn-group">
<button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="card_header_menu" data-bs-toggle="dropdown" aria-expanded="false">
<span class="bi bi-list"></span>
</button>
@@ -42,6 +46,7 @@
</li>
</ul>
</div>
+ </div>
</div>
</div>
diff --git a/resources/views/components/elements/card-footer-with-menu.blade.php b/resources/views/components/elements/card-footer-with-menu.blade.php
index 2f7150cb5d..3e43f66614 100644
--- a/resources/views/components/elements/card-footer-with-menu.blade.php
+++ b/resources/views/components/elements/card-footer-with-menu.blade.php
@@ -1,6 +1,10 @@
<div class="card-footer">
<div class="col text-end">
- <div class="dropdown">
+ <div class="btn-group">
+ <a href="{{ $route }}" class="btn btn-sm btn-outline-success">
+ <span class="bi bi-plus-circle"></span> {{ $linkTitle }}
+ </a>
+ <div class="btn-group">
<button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="card_footer_menu" data-bs-toggle="dropdown" aria-expanded="false">
<span class="bi bi-list"></span>
</button>
@@ -8,5 +12,6 @@
<li><a class="dropdown-item" href="{{ $route }}"><span class="bi bi-plus-circle"></span> {{ $linkTitle }}</a></li>
</ul>
</div>
+ </div>
</div>
</div>
diff --git a/resources/views/components/elements/card-header-with-menu.blade.php b/resources/views/components/elements/card-header-with-menu.blade.php
index 80df8775ac..c92c7122ec 100644
--- a/resources/views/components/elements/card-header-with-menu.blade.php
+++ b/resources/views/components/elements/card-header-with-menu.blade.php
@@ -4,17 +4,23 @@
<h3 class="card-title">{{ $cardTitle }}</h3>
</div>
@if('' !== $route)
- <div class="col text-end">
- <div class="dropdown">
+ <div class="col text-end" role="group">
+ <div class="btn-group">
+ <a href="{{ $route }}" class="btn btn-sm btn-outline-success">
+ <span class="bi bi-plus-circle"></span> {{ $linkTitle }}
+ </a>
+
+ <div class="btn-group">
<button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="card_header_menu" data-bs-toggle="dropdown" aria-expanded="false">
<span class="bi bi-list"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="card_header_menu">
- <li><a class="dropdown-item" href="{{ $route }}"><span
- class="bi bi-plus-circle"></span> {{ $linkTitle }}
+ <li><a class="dropdown-item" href="{{ $route }}">
+ <span class="bi bi-plus-circle"></span> {{ $linkTitle }}
</a></li>
</ul>
</div>
+ </div>
</div>
@endif
</div>
diff --git a/resources/views/rules/index.blade.php b/resources/views/rules/index.blade.php
index 3effbb8716..a5d1341e73 100644
--- a/resources/views/rules/index.blade.php
+++ b/resources/views/rules/index.blade.php
@@ -22,7 +22,11 @@
</h3>
</div>
<div class="col text-end">
- <div class="dropdown">
+ <div class="btn-group">
+ <a href="{{ route('rules.create', $ruleGroup->id) }}?_from={{ urlencode($FF3_FROM) }}" class="btn btn-sm btn-outline-success">
+ <span class="bi bi-plus-circle"></span> {{ __('firefly.new_rule') }}
+ </a>
+ <div class="btn-group">
<button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="card_header_{{ $ruleGroup->id }}" data-bs-toggle="dropdown" aria-expanded="false">
<span class="bi bi-list"></span>
</button>
@@ -47,6 +51,7 @@
@endif
</ul>
</div>
+ </div>
</div>
</div>
</div>
diff --git a/resources/views/tags/show.blade.php b/resources/views/tags/show.blade.php
index d6a2a2f3f3..543fcfd1aa 100644
--- a/resources/views/tags/show.blade.php
+++ b/resources/views/tags/show.blade.php
@@ -9,15 +9,12 @@
<div class="box-tools text-end">
<div class="btn-group">
- <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
- class="bi bi-list"></span></button>
- <ul class="dropdown-menu" role="menu">
- <li><a href="{{ route('tags.edit',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><span
- class="bi bi-pencil"></span> {{ trans('firefly.edit_tag',['tag' => $tag->tag]) }}
- </a></li>
- <li><a href="{{ route('tags.delete',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><span
- class="bi bi-trash"></span> {{ trans('firefly.delete_tag',['tag' => $tag->tag]) }}
- </a></li>
+ <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="card_header_meta" data-bs-toggle="dropdown" aria-expanded="false">
+ <span class="bi bi-list"></span>
+ </button>
+ <ul class="dropdown-menu" aria-labelledby="card_header_meta">
+ <li><a class="dropdown-item" href="{{ route('tags.edit',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ trans('firefly.edit_tag',['tag' => $tag->tag]) }}</a></li>
+ <li><a class="dropdown-item" href="{{ route('tags.delete',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ trans('firefly.delete_tag',['tag' => $tag->tag]) }}</a></li>
</ul>
</div>
</div>
@@ -183,15 +180,12 @@
<h3 class="card-title">{{ __('firefly.location') }}</h3>
<div class="box-tools text-end">
<div class="btn-group">
- <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
- class="bi bi-list"></span></button>
- <ul class="dropdown-menu" role="menu">
- <li><a href="{{ route('tags.edit',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><span
- class="bi bi-pencil"></span> {{ trans('firefly.edit_tag',['tag' => $tag->tag]) }}
- </a></li>
- <li><a href="{{ route('tags.delete',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><span
- class="bi bi-trash"></span> {{ trans('firefly.delete_tag',['tag' => $tag->tag]) }}
- </a></li>
+ <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="card_header_meta" data-bs-toggle="dropdown" aria-expanded="false">
+ <span class="bi bi-list"></span>
+ </button>
+ <ul class="dropdown-menu" aria-labelledby="card_header_meta">
+ <li><a class="dropdown-item" href="{{ route('tags.edit',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ trans('firefly.edit_tag',['tag' => $tag->tag]) }}</a></li>
+ <li><a class="dropdown-item" href="{{ route('tags.delete',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ trans('firefly.delete_tag',['tag' => $tag->tag]) }}</a></li>
</ul>
</div>
</div>
@@ -240,15 +234,12 @@
<div class="box-tools text-end">
<div class="btn-group">
- <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
- class="bi bi-list"></span></button>
- <ul class="dropdown-menu" role="menu">
- <li><a href="{{ route('tags.edit',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><span
- class="bi bi-pencil"></span> {{ trans('firefly.edit_tag',['tag' => $tag->tag]) }}
- </a></li>
- <li><a href="{{ route('tags.delete',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><span
- class="bi bi-trash"></span> {{ trans('firefly.delete_tag',['tag' => $tag->tag]) }}
- </a></li>
+ <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="card_header_meta" data-bs-toggle="dropdown" aria-expanded="false">
+ <span class="bi bi-list"></span>
+ </button>
+ <ul class="dropdown-menu" aria-labelledby="card_header_meta">
+ <li><a class="dropdown-item" href="{{ route('tags.edit',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-pencil"></span> {{ trans('firefly.edit_tag',['tag' => $tag->tag]) }}</a></li>
+ <li><a class="dropdown-item" href="{{ route('tags.delete',$tag->id) }}?_from={{ urlencode($FF3_FROM) }}"><span class="bi bi-trash"></span> {{ trans('firefly.delete_tag',['tag' => $tag->tag]) }}</a></li>
</ul>
</div>
</div>