From c5288bbef578c1b18551e24dcab0402c8afb8175 Mon Sep 17 00:00:00 2001 From: Thomas Low Date: Tue, 15 Oct 2024 12:35:53 +0200 Subject: [PATCH] Update demo theme for Typo3 v11 and v12 without fixing many issues. --- Configuration/TCA/Overrides/sys_template.php | 3 + .../0000_lib.dynamicContent.typoscript | 23 +++ ...{0010_config.ts => 0010_config.typoscript} | 19 ++- ...mainnav.ts => 0020_lib.mainnav.typoscript} | 0 ...melink.ts => 0030_lib.homelink.typoscript} | 0 ...ernav.ts => 0040_lib.footernav.typoscript} | 0 .../{2000_page.ts => 2000_page.typoscript} | 8 +- ...page.meta.ts => 2010_page.meta.typoscript} | 0 Configuration/TypoScript/constants.txt | 8 - Configuration/TypoScript/constants.typoscript | 15 ++ Configuration/TypoScript/setup.txt | 3 - Configuration/TypoScript/setup.typoscript | 11 ++ .../{TSconfig/Page.txt => page.tsconfig} | 0 .../{TSconfig/User.txt => user.tsconfig} | 2 +- Resources/Private/Layouts/DefaultLayout.html | 4 + Resources/Private/Partials/Header.html | 10 +- Resources/Public/Css/main.css | 16 +- Resources/Public/Css/styles.css | 160 ++++++++++-------- Resources/Public/JavaScript/main.js | 38 ++--- Resources/Public/PluginTemplates/basket.tmpl | 42 ----- .../PluginTemplates/basketGoToButton.tmpl | 14 -- .../Public/PluginTemplates/collection.tmpl | 21 --- .../Public/PluginTemplates/listview.tmpl | 58 ------- .../Public/PluginTemplates/metadata.tmpl | 16 -- .../Public/PluginTemplates/metadataTitle.tmpl | 16 -- .../Public/PluginTemplates/navigation.tmpl | 64 ------- .../Public/PluginTemplates/pageview.tmpl | 20 --- Resources/Public/PluginTemplates/search.tmpl | 29 ---- .../PluginTemplates/searchFacetOnly.tmpl | 15 -- Resources/Public/PluginTemplates/toc.tmpl | 20 --- Resources/Public/PluginTemplates/toolbox.tmpl | 20 --- composer.json | 9 +- ext_emconf.php | 27 ++- ext_localconf.php | 26 ++- ext_tables.php | 4 +- 35 files changed, 231 insertions(+), 490 deletions(-) create mode 100644 Configuration/TCA/Overrides/sys_template.php create mode 100644 Configuration/TypoScript/Library/0000_lib.dynamicContent.typoscript rename Configuration/TypoScript/Library/{0010_config.ts => 0010_config.typoscript} (51%) rename Configuration/TypoScript/Library/{0020_lib.mainnav.ts => 0020_lib.mainnav.typoscript} (100%) rename Configuration/TypoScript/Library/{0030_lib.homelink.ts => 0030_lib.homelink.typoscript} (100%) rename Configuration/TypoScript/Library/{0040_lib.footernav.ts => 0040_lib.footernav.typoscript} (100%) rename Configuration/TypoScript/Library/{2000_page.ts => 2000_page.typoscript} (92%) rename Configuration/TypoScript/Library/{2010_page.meta.ts => 2010_page.meta.typoscript} (100%) delete mode 100644 Configuration/TypoScript/constants.txt create mode 100644 Configuration/TypoScript/constants.typoscript delete mode 100644 Configuration/TypoScript/setup.txt create mode 100644 Configuration/TypoScript/setup.typoscript rename Configuration/{TSconfig/Page.txt => page.tsconfig} (100%) rename Configuration/{TSconfig/User.txt => user.tsconfig} (58%) delete mode 100644 Resources/Public/PluginTemplates/basket.tmpl delete mode 100644 Resources/Public/PluginTemplates/basketGoToButton.tmpl delete mode 100644 Resources/Public/PluginTemplates/collection.tmpl delete mode 100644 Resources/Public/PluginTemplates/listview.tmpl delete mode 100644 Resources/Public/PluginTemplates/metadata.tmpl delete mode 100644 Resources/Public/PluginTemplates/metadataTitle.tmpl delete mode 100644 Resources/Public/PluginTemplates/navigation.tmpl delete mode 100644 Resources/Public/PluginTemplates/pageview.tmpl delete mode 100644 Resources/Public/PluginTemplates/search.tmpl delete mode 100644 Resources/Public/PluginTemplates/searchFacetOnly.tmpl delete mode 100644 Resources/Public/PluginTemplates/toc.tmpl delete mode 100644 Resources/Public/PluginTemplates/toolbox.tmpl diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php new file mode 100644 index 000000000..e547d4b40 --- /dev/null +++ b/Configuration/TCA/Overrides/sys_template.php @@ -0,0 +1,3 @@ + - - - -resDir = EXT:presentation_package - -## Default-Werte fuer meta-tags -defaultDescription = Das ist meine erste Distribution \ No newline at end of file diff --git a/Configuration/TypoScript/constants.typoscript b/Configuration/TypoScript/constants.typoscript new file mode 100644 index 000000000..37f6d874d --- /dev/null +++ b/Configuration/TypoScript/constants.typoscript @@ -0,0 +1,15 @@ +@import 'EXT:fluid_styled_content/Configuration/TypoScript/constants.typoscript' + +# prefix of this extension +resDir = EXT:presentation_package + +## Default-Werte fuer meta-tags +defaultDescription = Das ist meine erste Distribution + +# configure page id (pid) of tenant folder +plugin.tx_dlf { + persistence { + # cat=plugin.tx_dlf/100/a; type=int+; label=Default storage PID + storagePid = 2 + } +} \ No newline at end of file diff --git a/Configuration/TypoScript/setup.txt b/Configuration/TypoScript/setup.txt deleted file mode 100644 index 454fee393..000000000 --- a/Configuration/TypoScript/setup.txt +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript new file mode 100644 index 000000000..0f8929678 --- /dev/null +++ b/Configuration/TypoScript/setup.typoscript @@ -0,0 +1,11 @@ +# Import the default setup of EXT:fluid_styled_content +@import 'EXT:fluid_styled_content/Configuration/TypoScript/setup.typoscript' + +# Import the default CSS of EXT:fluid_styled_content +@import 'EXT:fluid_styled_content/Configuration/TypoScript/Styling/setup.typoscript' + +# Import kitodo-presentation typoscript +@import 'EXT:dlf/Configuration/TypoScript/setup.typoscript' + +# Import typoscript files sorted by filename +@import 'EXT:presentation_package/Configuration/TypoScript/Library/*.typoscript' \ No newline at end of file diff --git a/Configuration/TSconfig/Page.txt b/Configuration/page.tsconfig similarity index 100% rename from Configuration/TSconfig/Page.txt rename to Configuration/page.tsconfig diff --git a/Configuration/TSconfig/User.txt b/Configuration/user.tsconfig similarity index 58% rename from Configuration/TSconfig/User.txt rename to Configuration/user.tsconfig index ecc1ab52f..e8ba66413 100644 --- a/Configuration/TSconfig/User.txt +++ b/Configuration/user.tsconfig @@ -1,2 +1,2 @@ options.pageTree.showPageIdWithTitle = 1 -options.clearCache.system = 1 \ No newline at end of file +options.clearCache.all = 1 \ No newline at end of file diff --git a/Resources/Private/Layouts/DefaultLayout.html b/Resources/Private/Layouts/DefaultLayout.html index fda8a77fa..384c71ca3 100644 --- a/Resources/Private/Layouts/DefaultLayout.html +++ b/Resources/Private/Layouts/DefaultLayout.html @@ -1,4 +1,8 @@ + + const EXT_PRESENTATION_PACKAGE_RESOURCE_PATH = "{f:uri.resource(path:'EXT:presentation_package/Resources/Public')}"; + + diff --git a/Resources/Private/Partials/Header.html b/Resources/Private/Partials/Header.html index 9a39ab785..fdfd8fba6 100644 --- a/Resources/Private/Partials/Header.html +++ b/Resources/Private/Partials/Header.html @@ -2,16 +2,16 @@
- + DEMO
@@ -19,10 +19,6 @@ {contentBasket} - - - -
diff --git a/Resources/Public/Css/main.css b/Resources/Public/Css/main.css index 0bb61cfe1..54714cad7 100644 --- a/Resources/Public/Css/main.css +++ b/Resources/Public/Css/main.css @@ -1,21 +1,21 @@ -.tx-dlf-listview-list ol { +.tx-dlf-abstracts ol { display: none; } -.tx-dlf-listview-list li .show-volumes a.show-volumes-expand { +.tx-dlf-abstracts li .show-volumes a.show-volumes-expand { background: url(../Images/icon-arrow-down.svg) no-repeat left center #999; } -.tx-dlf-listview-list li .show-volumes a.show-volumes-expand:hover { +.tx-dlf-abstracts li .show-volumes a.show-volumes-expand:hover { background: url(../Images/icon-arrow-down.svg) no-repeat left center #005182; } -.tx-dlf-listview-list li .show-volumes a.show-volumes-expand.down { +.tx-dlf-abstracts li .show-volumes a.show-volumes-expand.down { background: url(../Images/icon-arrow-up.svg) no-repeat left center #0071bc; } -.tx-dlf-listview-list li .show-volumes a.show-volumes-expand.down:hover { +.tx-dlf-abstracts li .show-volumes a.show-volumes-expand.down:hover { background: url(../Images/icon-arrow-up.svg) no-repeat left center #005182; } @@ -80,7 +80,7 @@ li.tx-dlf-navigation-pageselect label { } .tx-dlf-listview img { - display: none; + display: block; } .show-volumes { @@ -281,6 +281,10 @@ div#tx-dlf-fulltextselection { } +#tx-dlf-map { + height: 1000px; +} + #ov_map { max-height: 200px; } diff --git a/Resources/Public/Css/styles.css b/Resources/Public/Css/styles.css index df7e27dd8..dfb76e1a7 100644 --- a/Resources/Public/Css/styles.css +++ b/Resources/Public/Css/styles.css @@ -319,7 +319,7 @@ collection-list tx-dlf-search-query ----------------------------------------------------------------------*/ -.tx-dlf-search { +div.frame:has(> .tx-dlf-search-form) { background-color: #f3f3f3; padding: 30px; border-radius: 3px; @@ -327,6 +327,7 @@ tx-dlf-search-query -moz-box-shadow: 0px 3px 0px 0px rgba(0,0,0,0.2); box-shadow: 0px 3px 0px 0px rgba(0,0,0,0.2); margin: 15px 15px 0 15px; + text-align: center; } .tx-dlf-search-form { @@ -335,7 +336,7 @@ tx-dlf-search-query } #tx-dlf-search-suggest { - display: inline-block; + display: none; } #tx-dlf-search-query { @@ -477,24 +478,28 @@ listview text-align: right; } -ol.tx-dlf-listview-list { +ol.tx-dlf-abstracts { list-style-type: decimal; list-style-position: inside; } -.tx-dlf-listview-list li { +.tx-dlf-abstracts li { border-top: 1px solid #d8d8d8; padding: 15px; position: relative; } -.tx-dlf-listview-list li .add-to-cart { +.tx-dlf-abstracts li > a { + display: flex; +} + +.tx-dlf-abstracts li .add-to-cart { position: absolute; top: 15px; right: 30px; } -.tx-dlf-listview-list li .add-to-cart a { +.tx-dlf-abstracts li .add-to-cart a { display: inline-block; background: url(../Images/icon-labelstar.svg) no-repeat left center #0071bc; color: #fff; @@ -504,17 +509,17 @@ ol.tx-dlf-listview-list { font-weight: 800; } -.tx-dlf-listview-list li .add-to-cart a:hover { +.tx-dlf-abstracts li .add-to-cart a:hover { background: url(../Images/icon-labelstar.svg) no-repeat left center #005182; } -.tx-dlf-listview-list li .show-volumes { +.tx-dlf-abstracts li .show-volumes { position: absolute; top: 56px; right: 30px; } -.tx-dlf-listview-list li .show-volumes a { +.tx-dlf-abstracts li .show-volumes a { display: inline-block; color: #fff; border-radius: 3px; @@ -523,23 +528,23 @@ ol.tx-dlf-listview-list { font-weight: 400; } -/*.tx-dlf-listview-list li .show-volumes a.show-volumes-expand {*/ +/*.tx-dlf-abstracts li .show-volumes a.show-volumes-expand {*/ /*background: url(../Images/icon-arrow-up.svg) no-repeat left center #999;*/ /*}*/ -/*.tx-dlf-listview-list li .show-volumes a.show-volumes-expand:hover {*/ +/*.tx-dlf-abstracts li .show-volumes a.show-volumes-expand:hover {*/ /*background: url(../Images/icon-arrow-up.svg) no-repeat left center #005182;*/ /*}*/ -/*.tx-dlf-listview-list li .show-volumes a.show-volumes-minimize {*/ +/*.tx-dlf-abstracts li .show-volumes a.show-volumes-minimize {*/ /*background: url(../Images/icon-arrow-down.svg) no-repeat left center #0071bc;*/ /*}*/ -/*.tx-dlf-listview-list li .show-volumes a.show-volumes-minimize:hover {*/ +/*.tx-dlf-abstracts li .show-volumes a.show-volumes-minimize:hover {*/ /*background: url(../Images/icon-arrow-down.svg) no-repeat left center #005182;*/ /*}*/ -.tx-dlf-listview-list dl { +.tx-dlf-abstracts dl { padding: 0 30px; margin-top: -20px; width: 60%; @@ -560,7 +565,7 @@ dt.tx-dlf-metadata-place, dt.tx-dlf-metadata-type, dt.tx-dlf-metadata-year, dt.tx-dlf-metadata-author, -.tx-dlf-listview-list li ol li dt { +.tx-dlf-abstracts li ol li dt { float: left; padding-right: 15px; } @@ -569,51 +574,51 @@ dd.tx-dlf-metadata-place, dd.tx-dlf-metadata-type, dd.tx-dlf-metadata-year, dd.tx-dlf-metadata-author, -.tx-dlf-listview-list li ol li dd { +.tx-dlf-abstracts li ol li dd { font-weight: 800; } -.tx-dlf-listview-list .tx-dlf-listview-thumbnail { +.tx-dlf-abstracts .tx-dlf-listview-thumbnail { display: block; } -.tx-dlf-listview-list .tx-dlf-listview-thumbnail img { +.tx-dlf-abstracts .tx-dlf-listview-thumbnail img { width: 60px; height: auto; margin: -15px 0 30px 30px; } -.tx-dlf-listview-list li ol { +.tx-dlf-abstracts li ol { list-style-type: lower-latin; list-style-position: inside; margin-top: 15px; background-color: #f2fbff; } -.tx-dlf-listview-list li ol li { +.tx-dlf-abstracts li ol li { border-top: 1px solid #d8d8d8; display: table; width: 100%; padding: 0; } -.tx-dlf-listview-list li ol li dl { +.tx-dlf-abstracts li ol li dl { padding: 15px 0; display: table-cell; vertical-align: top; } -.tx-dlf-listview-list li ol li dd.tx-dlf-metadata-title { +.tx-dlf-abstracts li ol li dd.tx-dlf-metadata-title { font-size: 16px; } -.tx-dlf-listview-list li ol li .tx-dlf-listview-thumbnail { +.tx-dlf-abstracts li ol li .tx-dlf-listview-thumbnail { display: table-cell; vertical-align: top; width: 10%; } -.tx-dlf-listview-list li ol li .add-to-cart { +.tx-dlf-abstracts li ol li .add-to-cart { position: relative; top: 0; right: 0; @@ -624,7 +629,7 @@ dd.tx-dlf-metadata-author, vertical-align: top; } -.tx-dlf-listview-list li ol li .add-to-cart a { +.tx-dlf-abstracts li ol li .add-to-cart a { display: inline-block; background: url(../Images/icon-labelstar.svg) no-repeat left center #66acd8; color: #fff; @@ -634,18 +639,18 @@ dd.tx-dlf-metadata-author, font-weight: 800; } -.tx-dlf-listview-list li ol li .add-to-cart a:hover { +.tx-dlf-abstracts li ol li .add-to-cart a:hover { background: url(../Images/icon-labelstar.svg) no-repeat left center #005182; } -.tx-dlf-listview-list li ol li .tx-dlf-listview-thumbnail img { +.tx-dlf-abstracts li ol li .tx-dlf-listview-thumbnail img { width: 60px; height: auto; padding: 15px; margin: 0; } -.tx-dlf-search-facets { +.tx-dlf-search-facets:has(ul) { background-color: #fff; border-radius: 3px; webkit-box-shadow: 0px 3px 0px 0px rgba(0,0,0,0.2); @@ -662,6 +667,10 @@ dd.tx-dlf-metadata-author, font-size: 20px; } +.tx-dlf-search-facets ul li { + list-style: none; +} + /*---------------------------------------------------------------------- detail-view ----------------------------------------------------------------------*/ @@ -694,12 +703,16 @@ detail-view vertical-align: top; } -.tx-dlf-navigation li { +.detail-view-nav .frame > div { display: inline; list-style-type: none; } -.tx-dlf-navigation li span { +.detail-view-nav li.pages { + display: inline-block; +} + +.detail-view-nav .frame > div span { border-radius: 3px; padding: 5px; line-height: 0; @@ -709,11 +722,12 @@ detail-view display: inline-block; } -.tx-dlf-navigation li a, +.detail-view-nav .frame > div a, .tx-dlf-pageview div a { border-radius: 3px; padding: 5px; - line-height: 0; + line-height: 2em; + vertical-align: middle; font-size: 16px; color: #ccc; background: #0071bc; @@ -721,11 +735,11 @@ detail-view cursor: pointer; } -.tx-dlf-navigation li a:hover { +.detail-view-nav .frame > div a:hover { background: #005182; } -.tx-dlf-navigation li img { +.detail-view-nav .frame > div img { width: 30px; height: auto; } @@ -750,7 +764,7 @@ detail-view z-index: 3; } -.detail-view-itemdetails { +.detail-view-itemdetails, .detail-view-itemoptions > div { display: table-cell; vertical-align: top; width: 50%; @@ -965,8 +979,8 @@ detail-view calendar + listview ----------------------------------------------------------------------*/ -.tx-dlf-newspaper-calendar .meta-header, -.tx-dlf-newspaper-years .meta-header { +.tx-dlf-calendar .meta-header, +.tx-dlf-calendar-years .meta-header { background-color: #fff; border-radius: 3px; webkit-box-shadow: 0px 3px 0px 0px rgba(0,0,0,0.2); @@ -995,31 +1009,31 @@ calendar + listview box-shadow: 0px 3px 0px 0px rgba(0,0,0,0.2); } -table.month { +div.month { width: 100%; border-spacing: 0; } -table.month caption { +div.month caption { border-bottom: 3px solid #999; padding-bottom: 15px; } -table.month tr:first-child { +div.month tr:first-child { background: #d8d8d8; width: 100%; } -table.month th { +div.month th { padding: 5px 0; } -table.month td { +div.month td { padding: 2px; color: #999; } -table.month h4 { +div.month h4 { background: #F2FBFF; border: 1px solid #F2FBFF; border-radius: 3px; @@ -1032,7 +1046,7 @@ table.month h4 { transition: all 0.3s ease-in-out; } -table.month h4:hover { +div.month h4:hover { background: #005182; color: #fff; border: 1px solid #005182; @@ -1044,9 +1058,9 @@ table.month h4:hover { vertical-align: middle; } -.tx-dlf-newspaper-calendar .meta-header .year, -.tx-dlf-newspaper-calendar .meta-header .meta-hint-year, -.tx-dlf-newspaper-years .meta-hint-year { +.tx-dlf-calendar .meta-header .year, +.tx-dlf-calendar .meta-header .meta-hint-year, +.tx-dlf-calendar-years .meta-hint-year { padding-top: 5px; color: #999; } @@ -1075,7 +1089,7 @@ table.month h4:hover { background: #005182; } -.tx-dlf-newspaper-calendar .list-view { +.tx-dlf-calendar .list-view { margin: 15px 15px 0 15px; background-color: #fff; padding: 15px 30px; @@ -1085,24 +1099,24 @@ table.month h4:hover { box-shadow: 0px 3px 0px 0px rgba(0,0,0,0.2); } -.tx-dlf-newspaper-calendar .list-view li { +.tx-dlf-calendar .list-view li { border-top: 1px solid #d8d8d8; padding: 15px 0; list-style-type: none; } -.tx-dlf-newspaper-calendar .list-view li:first-child { +.tx-dlf-calendar .list-view li:first-child { border-top: 0; } -.tx-dlf-newspaper-calendar .list-view a { +.tx-dlf-calendar .list-view a { font-weight: 800; font-size: 20px; padding-bottom: 5px; display: block; } -.tx-dlf-newspaper-years .year-view ul { +.tx-dlf-calendar-years .year-view ul { display: grid; grid-template-columns: 1fr 1fr 1fr 1fr; grid-gap: 15px; @@ -1110,7 +1124,7 @@ table.month h4:hover { padding: 15px 15px 0 15px; } -.tx-dlf-newspaper-years .year-view li { +.tx-dlf-calendar-years .year-view li { display: inline-block; list-style-type: none; background-color: #fff; @@ -1123,7 +1137,7 @@ table.month h4:hover { box-shadow: 0px 3px 0px 0px rgba(0,0,0,0.2); } -.tx-dlf-newspaper-years .year-view li a { +.tx-dlf-calendar-years .year-view li a { font-weight: 800; font-size: 20px; padding-bottom: 5px; @@ -1134,7 +1148,7 @@ table.month h4:hover { basket ----------------------------------------------------------------------*/ -.tx-dlf-basket { +div.frame:has(.tx-dlf-basket-list) { background-color: #fff; border-radius: 3px; webkit-box-shadow: 0px 3px 0px 0px rgba(0,0,0,0.2); @@ -1255,7 +1269,7 @@ max 1600px .tx-dlf-collection-list, .calendar-items, - .tx-dlf-newspaper-years .year-view ul { + .tx-dlf-calendar-years .year-view ul { grid-template-columns: 1fr 1fr 1fr; } @@ -1287,7 +1301,7 @@ max 1024px .tx-dlf-collection-list, .calendar-items, - .tx-dlf-newspaper-years .year-view ul { + .tx-dlf-calendar-years .year-view ul { grid-template-columns: 1fr 1fr; } @@ -1466,7 +1480,7 @@ max 700px .tx-dlf-collection-list, .calendar-items, - .tx-dlf-newspaper-years .year-view ul { + .tx-dlf-calendar-years .year-view ul { grid-template-columns: 1fr; } @@ -1536,41 +1550,41 @@ max 700px text-align: center; } - .tx-dlf-listview-list dl { + .tx-dlf-abstracts dl { width: 80%; } - .tx-dlf-listview-list li .add-to-cart { + .tx-dlf-abstracts li .add-to-cart { position: relative; margin-top: 15px; top: 0; left: 0; } - .tx-dlf-listview-list li .show-volumes { + .tx-dlf-abstracts li .show-volumes { position: relative; margin-top: 5px; top: 0; left: 0; } - .tx-dlf-listview-list li ol li { + .tx-dlf-abstracts li ol li { display: block; width: 100%; } - .tx-dlf-listview-list li ol li .tx-dlf-listview-thumbnail { + .tx-dlf-abstracts li ol li .tx-dlf-listview-thumbnail { display: block; width: auto; } - .tx-dlf-listview-list li ol li dl { + .tx-dlf-abstracts li ol li dl { padding: 15px; display: block; vertical-align: top; } - .tx-dlf-listview-list li ol li .add-to-cart { + .tx-dlf-abstracts li ol li .add-to-cart { left: 0; padding: 0 15px 15px 15px; margin: 0; @@ -1584,7 +1598,7 @@ max 700px dt.tx-dlf-metadata-type, dt.tx-dlf-metadata-year, dt.tx-dlf-metadata-author, - .tx-dlf-listview-list li ol li dt { + .tx-dlf-abstracts li ol li dt { float: none; padding-right: 0; } @@ -1637,8 +1651,8 @@ max 700px width: 25px; } - .tx-dlf-newspaper-calendar .meta-header, - .tx-dlf-newspaper-years .meta-header { + .tx-dlf-calendar .meta-header, + .tx-dlf-calendar-years .meta-header { display: block; } @@ -1658,17 +1672,17 @@ max 700px padding: 15px; } - .tx-dlf-newspaper-calendar .list-view { + .tx-dlf-calendar .list-view { padding: 15px; } - .tx-dlf-newspaper-calendar .list-view li { + .tx-dlf-calendar .list-view li { padding: 5px 0; } - .tx-dlf-newspaper-calendar .meta-header .year, - .tx-dlf-newspaper-calendar .meta-header .meta-hint-year, - .tx-dlf-newspaper-years .meta-hint-year { + .tx-dlf-calendar .meta-header .year, + .tx-dlf-calendar .meta-header .meta-hint-year, + .tx-dlf-calendar-years .meta-hint-year { padding-bottom: 15px; } diff --git a/Resources/Public/JavaScript/main.js b/Resources/Public/JavaScript/main.js index 87d46423d..4a1850206 100644 --- a/Resources/Public/JavaScript/main.js +++ b/Resources/Public/JavaScript/main.js @@ -21,9 +21,9 @@ $('#tx-dlf-search-query').keypress(function () { }); -$(".tx-dlf-listview-list ol").hide(); +$(".tx-dlf-abstracts ol").hide(); -$(".tx-dlf-listview-list ol").hide(); +$(".tx-dlf-abstracts ol").hide(); $(".tx-dlf-search-numHits").hide(); @@ -103,59 +103,59 @@ $(".tx-dlf-navigation-rotate-left a").click(function () { $('.tx-dlf-navigation-double a, .tx-dlf-navigation-double span') .text("") - .append('Show double pages'); + .append('Show double pages'); $('.tx-dlf-navigation-double-plus a, .tx-dlf-navigation-double-plus span') .text("") - .append('Adjust recto/verso'); + .append('Adjust recto/verso'); $('.tx-dlf-navigation-zoom-in a, .tx-dlf-navigation-zoom-in span') .text("") - .append('Zoom In'); + .append('Zoom In'); $('.tx-dlf-navigation-zoom-out a, .tx-dlf-navigation-zoom-out span') .text("") - .append('Zoom Out'); + .append('Zoom Out'); $('.tx-dlf-navigation-rotate-left a, .tx-dlf-navigation-rotate-left span') .text("") - .append('Rotate Left'); + .append('Rotate Left'); $('.tx-dlf-navigation-rotate-right a, .tx-dlf-navigation-rotate-right span') .text("") - .append('Rotate Right'); + .append('Rotate Right'); $('.tx-dlf-navigation-first a, .tx-dlf-navigation-first span') .text("") - .append('First Page'); + .append('First Page'); $('.tx-dlf-navigation-prev a, .tx-dlf-navigation-prev span') .text("") - .append('Back 5 Pages'); + .append('Back 5 Pages'); $('.tx-dlf-navigation-back a, .tx-dlf-navigation-back span') .text("") - .append('Previous Page'); + .append('Previous Page'); $('.tx-dlf-navigation-next a, .tx-dlf-navigation-next span') .text("") - .append('Next Page'); + .append('Next Page'); $('.tx-dlf-navigation-fwd a, .tx-dlf-navigation-fwd span') .text("") - .append('Forward 5 Pages'); + .append('Forward 5 Pages'); $('.tx-dlf-navigation-last a, .tx-dlf-navigation-last span') .text("") - .append('Last Page'); + .append('Last Page'); $('.tx-dlf-navigation-listview a, .tx-dlf-navigation-listview span') .text("") - .append('Zurück zur Liste'); + .append('Zurück zur Liste'); $('.tx-dlf-navigation-listview a, .tx-dlf-navigation-listview span') .text("") - .append('Last Page'); + .append('Last Page'); if ($('.tx-dlf-navigation-edit').length) { @@ -181,15 +181,15 @@ if ($('.tx-dlf-navigation-magnifier').length) { $('.tx-dlf-navigation-edit a, .tx-dlf-navigation-edit span') .text("") - .append('Ausschnitt auswählen'); + .append('Ausschnitt auswählen'); $('.tx-dlf-navigation-editRemove a, .tx-dlf-navigation-editRemove span') .text("") - .append('Ausschnitt entfernen'); + .append('Ausschnitt entfernen'); $('.tx-dlf-navigation-magnifier a, .tx-dlf-navigation-magnifier span') .text("") - .append('Lupe'); + .append('Lupe'); $('div.tx-dlf-navigation-edit').hide(); diff --git a/Resources/Public/PluginTemplates/basket.tmpl b/Resources/Public/PluginTemplates/basket.tmpl deleted file mode 100644 index 491f4629a..000000000 --- a/Resources/Public/PluginTemplates/basket.tmpl +++ /dev/null @@ -1,42 +0,0 @@ - - -

###LISTTITLE###

-

###COUNT###

-
-
    - -
  1. -
    -
    - ###BASKETDATA### -
    -
    -
    ###CONTROLS###
    -
    -
    -
    2. - -
-
-
- ###REMOVEACTION### -
-
- ###MAILACTION### -
-
- ###PRINTACTION### -
-
-
-###JS### -
###BASKET###
- \ No newline at end of file diff --git a/Resources/Public/PluginTemplates/basketGoToButton.tmpl b/Resources/Public/PluginTemplates/basketGoToButton.tmpl deleted file mode 100644 index 5f58aa4b9..000000000 --- a/Resources/Public/PluginTemplates/basketGoToButton.tmpl +++ /dev/null @@ -1,14 +0,0 @@ - - -
- ###BASKET### -
- \ No newline at end of file diff --git a/Resources/Public/PluginTemplates/collection.tmpl b/Resources/Public/PluginTemplates/collection.tmpl deleted file mode 100644 index 9a67250e2..000000000 --- a/Resources/Public/PluginTemplates/collection.tmpl +++ /dev/null @@ -1,21 +0,0 @@ - - -
    - -
  • -
    ###THUMBNAIL###
    -

    ###TITLE### ###FEED###

    - ###DESCRIPTION### -

    (###COUNT_TITLES###/###COUNT_VOLUMES###)

    -
    • - -
- \ No newline at end of file diff --git a/Resources/Public/PluginTemplates/listview.tmpl b/Resources/Public/PluginTemplates/listview.tmpl deleted file mode 100644 index 0ed16cc06..000000000 --- a/Resources/Public/PluginTemplates/listview.tmpl +++ /dev/null @@ -1,58 +0,0 @@ - - - -
-

###LISTTITLE###

- - ###SORTING### - -
- -
-

###COUNT###

-

###PAGEBROWSER###

-
- - -
    - -
  1. - -
    - ###METADATA### -
    -
    ###PREVIEW###
    - -
      - -
    1. -
      - -
      - ###SUBMETADATA### -
      -
      ###SUBPREVIEW###
      -
      2. -
      ###SUBBASKETBUTTON###
      - -
    - -
    ###BASKETBUTTON###
    -
    - Details einblenden -
    -
    2. - -
- \ No newline at end of file diff --git a/Resources/Public/PluginTemplates/metadata.tmpl b/Resources/Public/PluginTemplates/metadata.tmpl deleted file mode 100644 index 57216ecc9..000000000 --- a/Resources/Public/PluginTemplates/metadata.tmpl +++ /dev/null @@ -1,16 +0,0 @@ - - - -
- ###METADATA### -
- - \ No newline at end of file diff --git a/Resources/Public/PluginTemplates/metadataTitle.tmpl b/Resources/Public/PluginTemplates/metadataTitle.tmpl deleted file mode 100644 index 0fcefa84d..000000000 --- a/Resources/Public/PluginTemplates/metadataTitle.tmpl +++ /dev/null @@ -1,16 +0,0 @@ - - - -
- ###METADATA### -
- - \ No newline at end of file diff --git a/Resources/Public/PluginTemplates/navigation.tmpl b/Resources/Public/PluginTemplates/navigation.tmpl deleted file mode 100644 index 2029f2a55..000000000 --- a/Resources/Public/PluginTemplates/navigation.tmpl +++ /dev/null @@ -1,64 +0,0 @@ - - -
-
    -
  • - ###DOUBLEPAGE### -
    • -
  • - ###DOUBLEPAGE+1### -
    • -
  • - ###ZOOM_IN### -
    • -
  • - ###ZOOM_OUT### -
    • -
  • - ###ROTATE_LEFT### -
    • -
  • - ###ROTATE_RIGHT### -
    • - - - -
  • - ###FIRST### -
    • -
  • - ###PREVIOUS### -
    • -
  • - ###BACK### -
    • -
  • - ###PAGESELECT### -
    • -
  • - ###NEXT### -
    • -
  • - ###FORWARD### -
    • -
  • - ###LAST### -
    • - - - - - -
-
- diff --git a/Resources/Public/PluginTemplates/pageview.tmpl b/Resources/Public/PluginTemplates/pageview.tmpl deleted file mode 100644 index 0f01f0408..000000000 --- a/Resources/Public/PluginTemplates/pageview.tmpl +++ /dev/null @@ -1,20 +0,0 @@ - - -
-
-
-
-
###EDITBUTTON###
-
###EDITREMOVE###
-
###MAGNIFIER###
-
###BASKETBUTTON###
-###VIEWER_JS### - \ No newline at end of file diff --git a/Resources/Public/PluginTemplates/search.tmpl b/Resources/Public/PluginTemplates/search.tmpl deleted file mode 100644 index f8e31de2a..000000000 --- a/Resources/Public/PluginTemplates/search.tmpl +++ /dev/null @@ -1,29 +0,0 @@ - - -
-
- ###FULLTEXTSWITCH### -
- - - - ###LOGICAL_PAGE### - - -
- ###FIELD_DOC### - ###FIELD_COLL### - ###ADDITIONAL_INPUTS### - - - -
- \ No newline at end of file diff --git a/Resources/Public/PluginTemplates/searchFacetOnly.tmpl b/Resources/Public/PluginTemplates/searchFacetOnly.tmpl deleted file mode 100644 index 41908ddd0..000000000 --- a/Resources/Public/PluginTemplates/searchFacetOnly.tmpl +++ /dev/null @@ -1,15 +0,0 @@ - - -
-

Ergebnisse filtern

- ###FACETS_MENU### -
- \ No newline at end of file diff --git a/Resources/Public/PluginTemplates/toc.tmpl b/Resources/Public/PluginTemplates/toc.tmpl deleted file mode 100644 index 85dcee4c9..000000000 --- a/Resources/Public/PluginTemplates/toc.tmpl +++ /dev/null @@ -1,20 +0,0 @@ - - - - -
-
- - - ###TOCMENU### -
-
- \ No newline at end of file diff --git a/Resources/Public/PluginTemplates/toolbox.tmpl b/Resources/Public/PluginTemplates/toolbox.tmpl deleted file mode 100644 index c6497b64f..000000000 --- a/Resources/Public/PluginTemplates/toolbox.tmpl +++ /dev/null @@ -1,20 +0,0 @@ - - -
- - -
    - -
  • ###TOOL###
    • - -
-
- \ No newline at end of file diff --git a/composer.json b/composer.json index 370faf565..bf97b6acb 100644 --- a/composer.json +++ b/composer.json @@ -7,9 +7,14 @@ "keywords": ["TYPO3 CMS"], "version": "1.0.0", "require": { - "typo3/cms": "^8.7", - "solarium/solarium": "^4.0" + "typo3/cms-core": "^11.5|^12.4", + "solarium/solarium": "5.2 - 6.3" }, "autoload": { + }, + "extra": { + "typo3/cms": { + "extension-key": "presentation_package" + } } } \ No newline at end of file diff --git a/ext_emconf.php b/ext_emconf.php index b131dfa59..9f69f9518 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -1,26 +1,21 @@ 'Kitodo Presentation Package', +$EM_CONF[$_EXTKEY] = [ + 'title' => 'Kitodo.Presentation Demo Theme', 'description' => '', 'category' => 'distribution', 'author' => 'Christopher Timm', 'author_email' => 'timm@effective-webwork.de', 'state' => 'stable', - 'internal' => '', 'uploadfolder' => '0', 'createDirs' => '', - 'clearCacheOnLoad' => 0, + 'clearCacheOnLoad' => false, 'version' => '7.6.2', - 'constraints' => array( - 'depends' => array( - 'typo3' => '7.6.2-8.9.99', - 'fluid_styled_content' => '', - ), - 'conflicts' => array( - 'css_styled_content' => '', - ), - 'suggests' => array( - ), - ), -); \ No newline at end of file + 'constraints' => [ + 'depends' => [ + 'typo3' => '10.4.0-12.4.99', + ], + 'conflicts' => [], + 'suggests' => [], + ], +]; \ No newline at end of file diff --git a/ext_localconf.php b/ext_localconf.php index f44ac86ff..3beea1f6a 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -1,11 +1,23 @@ ' -); -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig( - '' -); \ No newline at end of file +use TYPO3\CMS\Core\Information\Typo3Version; +use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; +use TYPO3\CMS\Core\Utility\GeneralUtility; + +$versionInformation = GeneralUtility::makeInstance(Typo3Version::class); + +// Only include page.tsconfig if TYPO3 version is below 12 so that it is not imported twice. +if ($versionInformation->getMajorVersion() < 12) { + ExtensionManagementUtility::addPageTSConfig(' + @import "EXT:presentation_package/Configuration/page.tsconfig" + '); +} +// Only include user.tsconfig if TYPO3 version is below 13 so that it is not imported twice. +if ($versionInformation->getMajorVersion() < 13) { + ExtensionManagementUtility::addUserTSConfig(' + @import "EXT:presentation_package/Configuration/user.tsconfig" + '); +} \ No newline at end of file diff --git a/ext_tables.php b/ext_tables.php index 13f39b4b0..b1c51d048 100644 --- a/ext_tables.php +++ b/ext_tables.php @@ -1,6 +1,6 @@