v5.0.4

CHANGELOG.md

@@ -1,11 +1,18 @@
 # Solspace Calendar Changelog
 
-## 5.0.4 - Unreleased
+## 5.0.4 - 2024-05-09
+
+### Added
+- Added favicons to the demo templates.
 
 ### Changed
 - Updated the `nesbot/carbon` dependency to include `^3.0.0"`.
 - Updated Calendar to support Carbon 3.x.
 
+### Fixed
+- Fixed a bug where reoccurring events were not returning when using batch calls.
+- Fixed a number of breadcrumbs throughout Calendar control panel pages.
+
 ## 5.0.3 - 2024-04-08
 
 ### Changed

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "solspace/craft-calendar",
   "description": "The most reliable and powerful event management plugin for Craft.",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "type": "craft-plugin",
   "authors": [
     {

packages/plugin/src/codepack/assets/favicon/site.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

packages/plugin/src/codepack/templates/layouts/_layout.html

@@ -10,6 +10,10 @@
     <link href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" rel="stylesheet">
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
     <link rel="stylesheet" href="{{ siteUrl }}assets/demo/css/main.css">
+    <link rel="apple-touch-icon" sizes="180x180" href="/assets/demo/favicon/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/assets/demo/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/assets/demo/favicon/favicon-16x16.png">
+    <link rel="manifest" href="/assets/demo/favicon/site.webmanifest">
     {% block headerCss %}{% endblock %}
 </head>
 

packages/plugin/src/templates/calendars/_edit.html

@@ -3,10 +3,13 @@
 
 {% set selectedSubnavItem = "calendars" %}
 {% set saveShortcutRedirect = 'calendar/calendars/{handle}' %}
+{% set calendarName = calendar.name ? calendar.name : "Create New" %}
+{% set calendarHandle = calendar.handle ? calendar.handle : "new" %}
 
 {% set crumbs = [
-    { label: craft.calendar.name, url: url('calendar') },
-    { label: "Calendars"|t('calendar'), url: url('calendar/calendars') },
+    { label: craft.calendar.name, url: url("calendar") },
+    { label: "Calendars"|t("calendar"), url: url("calendar/calendars") },
+    { label: calendarName, url: url("calendar/calendars/" ~ calendarHandle) },
 ] %}
 
 {% set fullPageForm = true %}

packages/plugin/src/templates/calendars/index.html

@@ -3,6 +3,11 @@
 {% set selectedSubnavItem = "calendars" %}
 {% set title = "Calendars"|t('calendar') %}
 
+{% set crumbs = [
+    { label: craft.calendar.name, url: url("calendar") },
+    { label: "Calendars"|t("calendar"), url: url("calendar/calendars") },
+] %}
+
 {% set content %}
     <div id="nocalendars"{% if calendars %} class="hidden"{% endif %}>
         <p>{{ "No calendars exist yet."|t('calendar') }}</p>

packages/plugin/src/templates/events/_edit.html

@@ -5,10 +5,11 @@
 {% set selectedSubnavItem = 'events' %}
 {% set saveShortcutRedirect = continueEditingUrl %}
 
-{% set crumbs = [
-    { label: craft.calendar.name, url: url('calendar') },
-    { label: "Events"|t('calendar'), url: url('calendar/events') },
-] %}
+{% set crumbs = crumbs|default([
+    { label: craft.calendar.name, url: url("calendar") },
+    { label: "Events"|t("calendar"), url: url("calendar/events") },
+    { label: calendar.name, url: url('calendar/events') },
+]) %}
 
 {% js %}
     var calendarTimeInterval = {{ craft.calendar.settings.timeInterval }};

packages/plugin/src/templates/events/_index.html

@@ -3,7 +3,12 @@
 {% set title = "Events"|t('calendar') %}
 {% set selectedSubnavItem = 'events' %}
 
+{% set crumbs = [
+    { label: craft.calendar.name, url: url("calendar") },
+    { label: "Events"|t("calendar"), url: url("calendar/events") },
+] %}
+
 {% do view.registerTranslations('calendar', [
     'New Event',
     'New {calendar} Event',
-]) %}
+]) %}

packages/plugin/src/templates/layouts/_eventLayout.html

@@ -1,2 +1,2 @@
 {% extends "_layouts/elementindex" %}
-{% set elementType = 'Solspace\\Calendar\\Elements\\Event' %}
+{% set elementType = 'Solspace\\Calendar\\Elements\\Event' %}

packages/plugin/src/templates/layouts/_settings.html

@@ -4,7 +4,6 @@
 {% set fullPageForm = true %}
 
 {% set navItems = {
-'hd': { heading: "Settings"|t('calendar') },
 'general': { title: "General Settings"|t('calendar') },
 'events': { title: "Event Settings"|t('calendar') },
 'guest-access': { title: "Guest Access"|t('calendar') },

packages/plugin/src/templates/view/calendar.html

@@ -4,6 +4,12 @@
 {% set selectedSubnavItem = currentView %}
 {% set title = currentView|ucfirst|t('calendar') %}
 
+{% set crumbs = [
+    { label: craft.calendar.name, url: url("calendar") },
+    { label: "Events"|t("calendar"), url: url("calendar/events") },
+    { label: title, url: url("calendar/view/" ~ selectedSubnavItem) },
+] %}
+
 {% block content %}
 
     {% set showBanner = craft.calendar.showDemoTemplateBanner %}