Skip to content

Commit

Permalink
Debug view helper from pagination template removed. Teaser item templ…
Browse files Browse the repository at this point in the history 
…ate respects 'inheritData' settings. BE label for performances now contains date and name of event location. Extension icon added.
  • Loading branch information
@dwenzel
dwenzel committed Jan 30, 2013
1 parent a42ca27 commit b66e7fc
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 101 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2013-01-30 Dirk Wenzel <wenzel@webfox01.de>
0.3.4 - removed debug view helper from pagination template
- teaser item template changed to respect 'inheritData' settings
- BE label for performances now contains date and name of event location
- extension icon added
2013-01-29 Dirk Wenzel <wenzel@webfox01.de>
0.3.1 - pagination template changed: don't show page number when only one page is visible
- added some documentation
Expand Down
186 changes: 98 additions & 88 deletions Resources/Private/Partials/Teaser/Item.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,112 +6,122 @@
</f:comment>

<div class="ticketWrap ">

<div class="ticketImg">
<f:link.action action="show" controller="Event"
arguments="{event : teaser.event}"
pageUid="{settings.event.single.pid}">
<f:if condition="{teaser.image}">

<f:if condition="{teaser.inheritData}">

<f:then>
<f:image src="uploads/tx_t3events/{teaser.image}"
width="{settings.teaser.image.width}"
height="{settings.teaser.image.height}"
alt="{teaser.event.headline}" />
<f:comment>teaser inherits data from event</f:comment>
<f:if condition="{teaser.event.image}">
<f:then>
<f:comment>event has image</f:comment>
<f:image src="uploads/tx_t3events/{teaser.event.image}"
width="{settings.teaser.image.width}"
height="{settings.teaser.image.height}"
alt="{teaser.event.headline}" />
</f:then>
<f:else>
<f:comment>no image in event - take dummy</f:comment>
<f:image src="{settings.teaser.dummyImage}"
width="{settings.teaser.image.width}"
height="{settings.teaser.image.height}"
alt="{teaser.event.headline}" />
</f:else>
</f:if>
</f:then>
<f:else>
<f:image src="{settings.teaser.dummyImage}"
width="{settings.teaser.image.width}"
height="{settings.teaser.image.height}"
alt="{teaser.event.headline}" />
<f:comment>teaser doesn't inherit data from event</f:comment>
<f:if condition="{teaser.image}">
<f:then>
<f:comment>teaser has image</f:comment>
<f:image src="uploads/tx_t3events/{teaser.image}"
width="{settings.teaser.image.width}"
height="{settings.teaser.image.height}"
alt="{teaser.event.headline} noInherit" />
</f:then>
<f:else>
<f:comment>no image in teaser - take dummy</f:comment>
<f:image src="{settings.teaser.dummyImage}"
width="{settings.teaser.image.width}"
height="{settings.teaser.image.height}"
alt="{teaser.event.headline}" />
</f:else>
</f:if>
</f:else>
</f:if>

</f:link.action>
</div>
<div class="ticketDesc">
<f:if condition="{teaser.inheritData}=TRUE">
<f:then>

<div class="teaser-headline">
<f:link.action action="show" controller="Event"
arguments="{event: teaser.event}"
pageUid="{settings.event.single.pid}">
<h3>{teaser.event.headline}</h3>
</f:link.action>
</div>
<div class="teaser-price">
<h4>
<f:translate key="tx_t3events.label.ticketsFrom" />
<f:format.currency currencySign="€" decimalSeparator="," thousandsSeparator=".">
<ts:event.performances event="{teaser.event}" type="lowestPrice"/>
</f:format.currency>
</h4>

</div>
<div class="teaser-details">
<f:if condition="{teaser.event.performances->f:count()}>1">
<f:comment>multiple performances</f:comment>
<f:then>
<f:comment>locations list</f:comment>
<ts:event.performances event="{teaser.event}"
type="uniqueLocationsList" class="locations unique-list"
tagName="p" />

<f:comment>dates</f:comment>
<ts:event.performances event="{teaser.event}" type="dateRange"
class="date range" tagName="p" />
</f:then>
<div class="teaser-headline">
<f:link.action action="show" controller="Event"
arguments="{event: teaser.event}"
pageUid="{settings.event.single.pid}">

<h3>
<f:if condition="{teaser.inheritData}">
<f:comment>teaser which inherit their data from event</f:comment>
<f:then>{teaser.event.headline} (from event)</f:then>

<f:comment>title from teaser</f:comment>
<f:else>{teaser.title} (from teaser)</f:else>
</f:if>
</h3>
</f:link.action>
</div>
<div class="teaser-price">
<h4>
<f:translate key="tx_t3events.label.ticketsFrom" />
<f:format.currency currencySign="€" decimalSeparator="," thousandsSeparator=".">
<ts:event.performances event="{teaser.event}" type="lowestPrice"/>
</f:format.currency>
</h4>

<f:comment>single performance</f:comment>
<f:else>
<f:comment>location</f:comment>
<ts:event.performances event="{teaser.event}"
type="uniqueLocationsList" class="locations single" tagName="p" />
</div>
<div class="teaser-details">
<f:if condition="{teaser.event.performances->f:count()}>1">
<f:comment>multiple performances</f:comment>
<f:then>
<f:comment>locations list</f:comment>
<ts:event.performances event="{teaser.event}"
type="uniqueLocationsList" class="locations unique-list"
tagName="p" />

<f:comment>date</f:comment>
<f:for each="{teaser.event.performances}" as="performance">
<p class="date single">
<f:format.date format="d.m.Y">{performance.date}</f:format.date>
</p>
</f:for>
</f:else>
</f:if>
</div>
<f:comment>dates</f:comment>
<ts:event.performances event="{teaser.event}" type="dateRange"
class="date range" tagName="p" />
</f:then>

<f:comment>single performance</f:comment>
<f:else>
<f:comment>location</f:comment>
<ts:event.performances event="{teaser.event}"
type="uniqueLocationsList" class="locations single" tagName="p" />

<div class="teaser-buttons">
<f:link.action action="show" controller="Event"
arguments="{event: teaser.event}"
pageUid="{settings.event.single.pid}"
class="button blueGradient whiteColor">
<f:translate key="tx_t3events.tickets" />
</f:link.action>
<a class="button-2" href="#">In den Kalender eintragen</a>
</div>
<f:comment>date</f:comment>
<f:for each="{teaser.event.performances}" as="performance">
<p class="date single">
<f:format.date format="d.m.Y">{performance.date}</f:format.date>
</p>
</f:for>
</f:else>
</f:if>
</div>

</f:then>
<f:else>
<div class="teaser-headline">
<f:link.action action="show" arguments="{teaser : teaser}"
pageUid="{settings.event.single.pid}">
<h3>{teaser.title}</h3>
</f:link.action>
</div>
<div class="teaser-price">
<h4>Tickets ab ###</h4>
</div>
<div class="teaser-details">
<p>
#Event Locations##{teaser.event.headline}<br /> #First Date# -
#Last Date# <br />
</p>
</div>

<div class="teaser-buttons">
<a class="button-1" href="#">Tickets</a> <a class="button-2"
href="#">In den Kalender</a>
</div>
</f:else>
</f:if>
<div class="teaser-buttons">
<f:link.action action="show" controller="Event"
arguments="{event: teaser.event}"
pageUid="{settings.event.single.pid}"
class="button blueGradient whiteColor">
<f:translate key="tx_t3events.tickets" />
</f:link.action>
<a class="button-2" href="#">In den Kalender eintragen</a>
</div>

</div>
</div>
</f:for>
1 change: 0 additions & 1 deletion Resources/Private/Templates/ViewHelpers/Widget/Paginate/Index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
<li>...</li>
</f:if>
<f:for each="{pagination.pages}" as="page">
<f:debug title="pagination">{pagination}</f:debug>
<f:if condition="{page.isCurrent}">
<f:then>
<f:if condition="{pagination.numberOfPages}>1">
Expand Down
Loading

0 comments on commit b66e7fc

Please sign in to comment.