mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-11-01 11:31:06 +00:00
Some fixes in titles and bread crumbs.
This commit is contained in:
@@ -164,7 +164,7 @@ class CategoryController extends Controller
|
|||||||
$journals = new LengthAwarePaginator($set, $count, 50, $page);
|
$journals = new LengthAwarePaginator($set, $count, 50, $page);
|
||||||
$journals->setPath('categories/show/' . $category->id . '/' . $date);
|
$journals->setPath('categories/show/' . $category->id . '/' . $date);
|
||||||
|
|
||||||
return view('categories.show_with_date', compact('category', 'journals', 'hideCategory', 'subTitle'));
|
return view('categories.show_with_date', compact('category', 'journals', 'hideCategory', 'subTitle','carbon'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -154,6 +154,19 @@ Breadcrumbs::register(
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Breadcrumbs::register(
|
||||||
|
'categories.show.date', function (Generator $breadcrumbs, Category $category, Carbon $date) {
|
||||||
|
|
||||||
|
// get current period preference.
|
||||||
|
$range = Preferences::get('viewRange', '1M')->data;
|
||||||
|
|
||||||
|
$breadcrumbs->parent('categories.index');
|
||||||
|
$breadcrumbs->push(e($category->name), route('categories.show', [$category->id]));
|
||||||
|
$breadcrumbs->push(Navigation::periodShow($date, $range), route('categories.show.date', [$category->id, $date->format('Y-m-d')]));
|
||||||
|
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
Breadcrumbs::register(
|
Breadcrumbs::register(
|
||||||
'categories.noCategory', function (Generator $breadcrumbs, $subTitle) {
|
'categories.noCategory', function (Generator $breadcrumbs, $subTitle) {
|
||||||
$breadcrumbs->parent('categories.index');
|
$breadcrumbs->parent('categories.index');
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
{% extends "./layout/default.twig" %}
|
{% extends "./layout/default.twig" %}
|
||||||
|
|
||||||
{% block breadcrumbs %}
|
{% block breadcrumbs %}
|
||||||
{{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, category) }}
|
{{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, category, carbon) }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-6 col-md-6 col-sm-12">
|
<div class="col-lg-6 col-md-6 col-sm-12">
|
||||||
<div class="box">
|
<div class="box">
|
||||||
|
|||||||
Reference in New Issue
Block a user