diff --git a/config/sites/ep-reisen/config.yaml b/config/sites/ep-reisen/config.yaml index f6acfe2..2492f0f 100644 --- a/config/sites/ep-reisen/config.yaml +++ b/config/sites/ep-reisen/config.yaml @@ -284,9 +284,6 @@ routeEnhancers: /html: 1702 /form: 1704 /captcha: 3413 - searchbar: 1706 - searchbar-collapsed: 1707 - /snowreport: 1705 .json: 1803 .ical: 1710 sitemap.xml: 1533906435 diff --git a/config/sites/ser/config.yaml b/config/sites/ser/config.yaml index 75a1a31..1b9afff 100644 --- a/config/sites/ser/config.yaml +++ b/config/sites/ser/config.yaml @@ -87,7 +87,6 @@ routeEnhancers: map: /form: 1704 /captcha: 3413 - /snowreport: 1705 routes: - route: robots.txt diff --git a/config/sites/ski-boarderweek/config.yaml b/config/sites/ski-boarderweek/config.yaml index ac0b8cb..14dc166 100644 --- a/config/sites/ski-boarderweek/config.yaml +++ b/config/sites/ski-boarderweek/config.yaml @@ -68,7 +68,6 @@ routeEnhancers: /html: 1702 /form: 1704 /captcha: 3413 - /snowreport: 1705 sitemap.xml: 1533906435 yoast-snippetpreview.json: 1480321830 routes: diff --git a/config/sites/snowzone/config.yaml b/config/sites/snowzone/config.yaml index 65918a5..9471f7a 100644 --- a/config/sites/snowzone/config.yaml +++ b/config/sites/snowzone/config.yaml @@ -52,7 +52,6 @@ routeEnhancers: /html: 1702 /form: 1704 /captcha: 3413 - /snowreport: 1705 sitemap.xml: 1533906435 yoast-snippetpreview.json: 1480321830 routes: diff --git a/config/sites/unichamp/config.yaml b/config/sites/unichamp/config.yaml index 4a54be1..52469b7 100644 --- a/config/sites/unichamp/config.yaml +++ b/config/sites/unichamp/config.yaml @@ -52,7 +52,6 @@ routeEnhancers: /html: 1702 /form: 1704 /captcha: 3413 - /snowreport: 1705 sitemap.xml: 1533906435 yoast-snippetpreview.json: 1480321830 routes: diff --git a/packages/ep_theme/Classes/Middleware/ReferrerMiddleware.php b/packages/ep_theme/Classes/Middleware/ReferrerMiddleware.php index 489ed54..f30d5a9 100644 --- a/packages/ep_theme/Classes/Middleware/ReferrerMiddleware.php +++ b/packages/ep_theme/Classes/Middleware/ReferrerMiddleware.php @@ -13,8 +13,7 @@ use TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication; /** * Links to a form page carry the uid of the page they come from (?ref=123, e.g. the enquiry * button of a product page). Its URL is kept in the session until AddReferrerFinisher puts it - * into the submission. On static pages the parameter reaches TYPO3 with the request that loads - * the form (see the form placeholder of the static export). + * into the submission. */ class ReferrerMiddleware implements MiddlewareInterface { diff --git a/packages/ep_theme/Configuration/TypoScript/Page/Searchbar.typoscript b/packages/ep_theme/Configuration/TypoScript/Page/Searchbar.typoscript deleted file mode 100644 index d9cf1a3..0000000 --- a/packages/ep_theme/Configuration/TypoScript/Page/Searchbar.typoscript +++ /dev/null @@ -1,25 +0,0 @@ -# The search bar without the page around it, on the site root (/searchbar, /searchbar-collapsed). -# The static pages of the hybrid setup load it with htmx where the export had the bar: it is the -# same on every page of a site, and its options follow the imported products (ep:import-dates -# flushes the page cache). The form sends its fields by GET to the search page. - -tx_eptheme_searchbar = PAGE -tx_eptheme_searchbar { - typeNum = 1706 - config { - disableAllHeaderCode = 1 - disablePrefixComment = 1 - additionalHeaders.10.header = Content-Type: text/html; charset=utf-8 - additionalHeaders.20.header = X-Robots-Tag: noindex, nofollow - admPanel = 0 - debug = 0 - } - - 10 =< lib.searchBar -} - -tx_eptheme_searchbar_collapsed < tx_eptheme_searchbar -tx_eptheme_searchbar_collapsed { - typeNum = 1707 - 10 =< lib.searchBarCollapsed -} diff --git a/packages/ep_theme/Configuration/TypoScript/Page/Snowreport.typoscript b/packages/ep_theme/Configuration/TypoScript/Page/Snowreport.typoscript deleted file mode 100644 index 0b97491..0000000 --- a/packages/ep_theme/Configuration/TypoScript/Page/Snowreport.typoscript +++ /dev/null @@ -1,29 +0,0 @@ -# The snow reports of a page without the page around them (/path/snowreport). The static pages of -# the hybrid setup load this with htmx and replace the snow reports of the export with it: the -# page URL itself is a static file that never reaches TYPO3, and the snow reports are imported -# daily (ep:import-snowreport, which flushes the page cache). Each list carries -# id="snowreport-" (Templates/Snowreport/List.html) for hx-select. - -tx_eptheme_snowreport = PAGE -tx_eptheme_snowreport { - typeNum = 1705 - config { - disableAllHeaderCode = 1 - disablePrefixComment = 1 - additionalHeaders.10.header = Content-Type: text/html; charset=utf-8 - additionalHeaders.20.header = X-Robots-Tag: noindex, nofollow - admPanel = 0 - debug = 0 - } - - 10 = CONTENT - 10 { - table = tt_content - select { - where = {#CType} = 'list' AND {#list_type} = 'epproducts_snowreport_list' - orderBy = sorting - } - # Only the plugin: header and frame stay on the static page - renderObj =< tt_content.list.20.epproducts_snowreport_list - } -} diff --git a/packages/ep_theme/Resources/Private/Templates/Snowreport/List.html b/packages/ep_theme/Resources/Private/Templates/Snowreport/List.html index 6b4cf4a..06e7e4c 100644 --- a/packages/ep_theme/Resources/Private/Templates/Snowreport/List.html +++ b/packages/ep_theme/Resources/Private/Templates/Snowreport/List.html @@ -7,55 +7,48 @@ - - The id lets the static pages of the hybrid setup pick this list, with the spacing of - ep:container, out of the snow report page type (/path/snowreport), which renders every - snow report plugin of a page. - -
- -
- -
-
- {ep:icon(icon: 'flag-{snowreport.countryCode -> f:format.case(mode: \'lower\')}', class: 'w-8 h-6')} - - {snowreport.regionName} - -
-
- - -
    -
  • - Berg/Tal: {snowreport.snow_level_mountain -> v:or(alternative: '-')}/{snowreport.snow_level_valley -> v:or(alternative: '-')} cm -
    • -
  • - Qualität: {snowreport.snow_quality} -
    • -
  • - Geöffnete Lifte: {snowreport.lifts_opened}/{snowreport.lifts_total}keine Angabe -
    • -
  • - Letzter Schneefall: {f:if(condition: snowreport.last_snowfall, then: '{snowreport.last_snowfall -> f:format.date(format: \'d.m.Y\')}', else: 'keine Angabe')} -
    • -
  • - Letzte Akt.: {snowreport.last_update -> f:format.date(format: 'd.m.Y')} -
    • -
- - - Saison vom {snowreport.seasonStart -> f:format.date(format: 'd.m.Y')} bis {snowreport.seasonEnd -> f:format.date(format: 'd.m.Y')} - - -
+ +
+ +
+
+ {ep:icon(icon: 'flag-{snowreport.countryCode -> f:format.case(mode: \'lower\')}', class: 'w-8 h-6')} + + {snowreport.regionName} +
- -
- -
+
+ + +
    +
  • + Berg/Tal: {snowreport.snow_level_mountain -> v:or(alternative: '-')}/{snowreport.snow_level_valley -> v:or(alternative: '-')} cm +
    • +
  • + Qualität: {snowreport.snow_quality} +
    • +
  • + Geöffnete Lifte: {snowreport.lifts_opened}/{snowreport.lifts_total}keine Angabe +
    • +
  • + Letzter Schneefall: {f:if(condition: snowreport.last_snowfall, then: '{snowreport.last_snowfall -> f:format.date(format: \'d.m.Y\')}', else: 'keine Angabe')} +
    • +
  • + Letzte Akt.: {snowreport.last_update -> f:format.date(format: 'd.m.Y')} +
    • +
+ + + Saison vom {snowreport.seasonStart -> f:format.date(format: 'd.m.Y')} bis {snowreport.seasonEnd -> f:format.date(format: 'd.m.Y')} + + +
+
+ +
+ diff --git a/public/.htaccess b/public/.htaccess index f133c6f..cac844d 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -298,8 +298,8 @@ AddDefaultCharset utf-8 RewriteEngine On # Legacy and campaign domains, consolidated onto their current host (from TYPO3 10's - # public/.htaccess, which the static docroots carry until the vhosts point here). These have to - # stay ahead of the Force SSL block and of TYPO3's catch-all at the end of this file. + # public/.htaccess). These have to stay ahead of the Force SSL block and of TYPO3's catch-all + # at the end of this file. RewriteRule ^buchung/(.*)$ https://bpn.ep-reisen.de/$1 [R=302,L,QSA] RewriteCond %{HTTP_HOST} ^cllt\-touristik\.at$ [NC] @@ -370,11 +370,10 @@ AddDefaultCharset utf-8 # Rules to set ApplicationContext based on hostname #RewriteCond %{HTTP_HOST} ^dev\.example\.com$ #RewriteRule .? - [E=TYPO3_CONTEXT:Development] - # Test vhost (base variant in config/sites/ep-reisen); the production vhosts point here site by - # site (phase F), until then the static docroots have their own .htaccess + # Test vhost (base variant in config/sites/ep-reisen) RewriteCond %{HTTP_HOST} ^staging\.ep-reisen\.de$ RewriteRule .? - [E=TYPO3_CONTEXT:Production/Staging] - # The frontend lives on www.ep-reisen.de (static export + TYPO3 13); here it would be duplicate + # The frontend lives on www.ep-reisen.de; here it would be duplicate # content, so only the backend and the files it loads stay on this host # (original requests only: the index.php hand-over below runs through these rules again) # Logged-in backend users (be_typo_user cookie of this host) see the TYPO3 13 frontend here, to check