Bugfix weekView composer mode

joachimruhs · Nov 13, 2023 · 545d526 · 545d526
1 parent bc1a6eb
commit 545d526
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/Resources/Private/Templates/Default/NewWeek.html b/Resources/Private/Templates/Default/NewWeek.html
@@ -20,12 +20,14 @@
 		<div class="hidden" id="bookingDate">{dayTime}</div>
 
 		<f:for each="{bookobjects}" as="bookobject">
-			<div class="bookobjectTitle">{bookobject.name}</div>
+			<div class="bookobjectTitle">{bookobject.name}AA</div>
 			<div class="weekSelector">
-				<img class="previousWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/typo3conf/ext/booking/Resources/Public/Icons/actions-view-paging-previous.svg"/>
+                <f:variable name="uriImgPrev"><f:uri.image src="EXT:booking/Resources/Public/Icons/actions-view-paging-previous.svg" /></f:variable>
+				<img class="previousWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/{uriImgPrev}"/>
                 {calendarWeekLabel} 
 				{week} - {year}
-				<img class="nextWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/typo3conf/ext/booking/Resources/Public/Icons/actions-view-paging-next.svg"/>
+                <f:variable name="uriImgNext"><f:uri.image src="EXT:booking/Resources/Public/Icons/actions-view-paging-next.svg" /></f:variable>
+				<img class="nextWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/{uriImgNext}"/>
 			</div>
 			<div class="bookobjectWeek">
 			<f:for each="{weekdays}" as="weekday" iteration="iterWeekday">

diff --git a/Resources/Private/Templates/Default/Week.html b/Resources/Private/Templates/Default/Week.html
@@ -22,10 +22,12 @@
 		<f:for each="{bookobjects}" as="bookobject">
 			<div class="bookobjectTitle">{bookobject.name}</div>
 			<div class="weekSelector">
-				<img class="previousWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/typo3conf/ext/booking/Resources/Public/Icons/actions-view-paging-previous.svg"/>
+                <f:variable name="uriImgPrev"><f:uri.image src="EXT:booking/Resources/Public/Icons/actions-view-paging-previous.svg" /></f:variable>
+				<img class="previousWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/{uriImgPrev}"/>
 				{calendarWeekLabel} 
 				{week} - {year}
-				<img class="nextWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/typo3conf/ext/booking/Resources/Public/Icons/actions-view-paging-next.svg"/>
+                <f:variable name="uriImgNext"><f:uri.image src="EXT:booking/Resources/Public/Icons/actions-view-paging-next.svg" /></f:variable>
+				<img class="nextWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/{uriImgNext}"/>
 			</div>
 			<div class="bookobjectWeek">
 			<f:for each="{weekdays}" as="weekday" iteration="iterWeekday">

diff --git a/Resources/Private/Templates/Standard/NewWeek.html b/Resources/Private/Templates/Standard/NewWeek.html
@@ -22,10 +22,12 @@
 		<f:for each="{bookobjects}" as="bookobject">
 			<div class="bookobjectTitle">{bookobject.name}</div>
 			<div class="weekSelector">
-				<img class="previousWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/typo3conf/ext/booking/Resources/Public/Icons/actions-view-paging-previous.svg"/>
+                <f:variable name="uriImgPrev"><f:uri.image src="EXT:booking/Resources/Public/Icons/actions-view-paging-previous.svg" /></f:variable>
+				<img class="previousWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/{uriImgPrev}"/>
                 {calendarWeekLabel} 
 				{week} - {year}
-				<img class="nextWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/typo3conf/ext/booking/Resources/Public/Icons/actions-view-paging-next.svg"/>
+                <f:variable name="uriImgNext"><f:uri.image src="EXT:booking/Resources/Public/Icons/actions-view-paging-next.svg" /></f:variable>
+				<img class="nextWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/{uriImgNext}"/>
 			</div>
 			<div class="bookobjectWeek">
 			<f:for each="{weekdays}" as="weekday" iteration="iterWeekday">

diff --git a/Resources/Private/Templates/Standard/Week.html b/Resources/Private/Templates/Standard/Week.html
@@ -22,10 +22,12 @@
 		<f:for each="{bookobjects}" as="bookobject">
 			<div class="bookobjectTitle">{bookobject.name}</div>
 			<div class="weekSelector">
-				<img class="previousWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/typo3conf/ext/booking/Resources/Public/Icons/actions-view-paging-previous.svg"/>
+                <f:variable name="uriImgPrev"><f:uri.image src="EXT:booking/Resources/Public/Icons/actions-view-paging-previous.svg" /></f:variable>
+				<img class="previousWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/{uriImgPrev}"/>
 				{calendarWeekLabel}
                 {week} - {year}
-				<img class="nextWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/typo3conf/ext/booking/Resources/Public/Icons/actions-view-paging-next.svg"/>
+                <f:variable name="uriImgNext"><f:uri.image src="EXT:booking/Resources/Public/Icons/actions-view-paging-next.svg" /></f:variable>
+				<img class="nextWeek" bookobjectUid="{bookobject.uid}" date="{dayTime}" hour="{hour}" src="/{uriImgNext}"/>
 			</div>
 			<div class="bookobjectWeek">
 			<f:for each="{weekdays}" as="weekday" iteration="iterWeekday">

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -14,7 +14,7 @@
   'title' => 'Booking',
   'description' => 'Booking extension for FE users',
   'category' => 'plugin',
-  'version' => '2.1.4',
+  'version' => '2.1.5',
   'state' => 'beta',
   'uploadfolder' => false,
   'clearcacheonload' => false,