@kitconcept/volto-light-theme 1.0.0-rc.13 → 1.0.0-rc.15

package/.github/workflows/acceptance.yml

@@ -4,7 +4,7 @@ on: [push]
 env:
   ADDON_NAME: "@kitconcept/volto-light-theme"
   ADDON_PATH: "volto-light-theme"
-  VOLTO_VERSION: "17.0.0-alpha.23"
+  VOLTO_VERSION: "17.0.0-alpha.24"
 
 jobs:
 

package/.github/workflows/deploy.yml

@@ -11,7 +11,7 @@ on:
 env:
   ENVIRONMENT: "light-theme.kitconcept.io"
   IMAGE_NAME: "ghcr.io/kitconcept/voltolighttheme-frontend"
-  VOLTO_VERSION: "17.0.0-alpha.23"
+  VOLTO_VERSION: "17.0.0-alpha.24"
 
 jobs:
   meta:

package/CHANGELOG.md

@@ -8,6 +8,30 @@
 
 <!-- towncrier release notes start -->
 
+## 1.0.0-rc.15 (2023-08-09)
+
+### Bugfix
+
+- Update the recommended version of volto-separator-block to 4.0.0. @davisagli [#211](https://github.com/kitconcept/volto-light-theme/pull/211)
+- ToC block fixes (remove most fields from the block, add default styling
+  schema, fix width in edit mode). @davisagli [#212](https://github.com/kitconcept/volto-light-theme/pull/212)
+- Hide unnecessary Search block fields. @danalvrz [#213](https://github.com/kitconcept/volto-light-theme/pull/213)
+- Upgrade to Volto 17-0.0-alpha.24. @davisagli [#214](https://github.com/kitconcept/volto-light-theme/pull/214)
+
+
+## 1.0.0-rc.14 (2023-08-08)
+
+### Feature
+
+- Hide change note field. @davisagli [#206](https://github.com/kitconcept/volto-light-theme/pull/206)
+
+### Bugfix
+
+- Remove external link icon from ICS download button event content type @iRohitSingh [#201](https://github.com/kitconcept/volto-light-theme/pull/201)
+- Fix teaser right align is not aligned to right side of page @iFlameing. [#202](https://github.com/kitconcept/volto-light-theme/pull/202)
+- Add missing german translations @steffenri [#205](https://github.com/kitconcept/volto-light-theme/pull/205)
+
+
 ## 1.0.0-rc.13 (2023-08-03)
 
 ### Bugfix

package/Makefile

@@ -22,7 +22,7 @@ RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
 PLONE_VERSION=6
-VOLTO_VERSION=17.0.0-alpha.23
+VOLTO_VERSION=17.0.0-alpha.24
 
 ADDON_NAME='@kitconcept/volto-light-theme'
 ADDON_PATH='volto-light-theme'

package/README.md

@@ -126,7 +126,7 @@ It is recommended that your project or policy add-on `package.json` include the
     "@kitconcept/volto-heading-block": "2.2.0",
     "@kitconcept/volto-introduction-block": "1.0.0",
     "@kitconcept/volto-light-theme": "1.0.0",
-    "@kitconcept/volto-separator-block": "3.2.0",
+    "@kitconcept/volto-separator-block": "4.0.0",
   }
 ```
 

package/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@plone/volto/babel');

package/locales/de/LC_MESSAGES/volto.po

@@ -37,35 +37,25 @@ msgstr ""
 msgid "Browse the site, drop an image, or type an URL"
 msgstr "Bild auswählen, hochladen oder URL angeben"
 
-#: components/Blocks/Slider/schema
-# defaultMessage: Button text
-msgid "Button text"
-msgstr ""
-
 #: components/Widgets/AlignWidget
 # defaultMessage: Center
 msgid "Center"
-msgstr ""
+msgstr "Mittig"
 
 #: components/Navigation/Navigation
 # defaultMessage: Close menu
 msgid "Close menu"
-msgstr ""
+msgstr "Menü schließen"
 
 #: components/Theme/EventView
 # defaultMessage: Contact
 msgid "Contact"
-msgstr ""
-
-#: components/Blocks/Slider/DefaultBody
-# defaultMessage: Continue reading
-msgid "Continue reading"
-msgstr "mehr erfahren"
+msgstr "Kontakt"
 
 #: components/Footer/Footer
 # defaultMessage: Copyright
 msgid "Copyright"
-msgstr ""
+msgstr "Urheberrechte"
 
 #: components/Blocks/Image/schema
 # defaultMessage: Description
@@ -82,26 +72,16 @@ msgstr ""
 msgid "End"
 msgstr "ende"
 
-#: components/Blocks/Slider/schema
-# defaultMessage: Flag align
-msgid "Flag align"
-msgstr "Flagge Ausrichtung"
-
 #: components/Widgets/AlignWidget
 # defaultMessage: Full
 msgid "Full"
-msgstr ""
+msgstr "Volle Breite"
 
 #: components/Footer/Footer
 # defaultMessage: GNU GPL license
 msgid "GNU GPL license"
 msgstr ""
 
-#: components/Blocks/Slider/schema
-# defaultMessage: Hide Button
-msgid "Hide Button"
-msgstr ""
-
 #: components/Breadcrumbs/Breadcrumbs
 # defaultMessage: Home
 msgid "Home"
@@ -120,7 +100,7 @@ msgstr "Bild"
 #: components/Widgets/AlignWidget
 # defaultMessage: Left
 msgid "Left"
-msgstr ""
+msgstr "Links"
 
 #: components/Theme/EventView
 # defaultMessage: Location
@@ -130,7 +110,7 @@ msgstr "Veranstaltungsort"
 #: components/Anontools/Anontools
 # defaultMessage: Log in
 msgid "Log in"
-msgstr ""
+msgstr "Anmelden"
 
 #: components/Blocks/Listing/ListingBody
 # defaultMessage: Next Page
@@ -140,7 +120,7 @@ msgstr "Nächste Seite"
 #: components/Theme/EventView
 # defaultMessage: No date
 msgid "No date"
-msgstr ""
+msgstr "Kein Datum"
 
 #: components/Blocks/Image/ImageSidebar
 # defaultMessage: No image selected
@@ -155,17 +135,12 @@ msgstr "Keine Elemente im Ordner gefunden."
 #: components/Navigation/Navigation
 # defaultMessage: Open menu
 msgid "Open menu"
-msgstr ""
+msgstr "Menü öffnen"
 
 #: components/Theme/EventView
 # defaultMessage: Phone
 msgid "Phone"
-msgstr ""
-
-#: components/Blocks/Slider/DefaultBody
-# defaultMessage: Please choose an existing content as source for this element
-msgid "Please choose an existing content as source for this element"
-msgstr "Bitte wählen Sie einen bestehenden Inhalt als Quelle für dieses Element"
+msgstr "Telefon"
 
 #: components/Footer/Footer
 # defaultMessage: Plone Foundation
@@ -201,7 +176,7 @@ msgstr "Vorherige Seite"
 #: components/Header/Header
 # defaultMessage: Register
 msgid "Register"
-msgstr ""
+msgstr "Registrieren"
 
 #: components/Blocks/Listing/ListingBody
 # defaultMessage: Result
@@ -211,19 +186,19 @@ msgstr "Ergebnis"
 #: components/Widgets/AlignWidget
 # defaultMessage: Right
 msgid "Right"
-msgstr ""
+msgstr "Rechts"
 
 #: components/Blocks/Search/components/SearchInput
 #: components/Blocks/Search/TopSideFacets
 #: components/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"
-msgstr ""
+msgstr "Suche"
 
 #: components/SearchWidget/SearchWidget
 # defaultMessage: Search Site
 msgid "Search Site"
-msgstr ""
+msgstr "Seite durchsuchen"
 
 #: components/Blocks/Search/components/SearchDetails
 # defaultMessage: Search results
@@ -233,12 +208,12 @@ msgstr "Ergebnisse"
 #: components/Blocks/Search/components/SearchDetails
 # defaultMessage: Searched for
 msgid "Searched for"
-msgstr ""
+msgstr "Gesucht für"
 
 #: components/Logo/Logo
 # defaultMessage: Site
 msgid "Site"
-msgstr ""
+msgstr "Seite"
 
 #: components/Header/Header
 #: index
@@ -249,12 +224,7 @@ msgstr "Übersicht"
 #: components/Blocks/Search/TopSideFacets
 # defaultMessage: Sorting
 msgid "Sorting"
-msgstr ""
-
-#: components/Blocks/Slider/DefaultBody
-# defaultMessage: Source
-msgid "Source"
-msgstr "Quelle"
+msgstr "Sortierung"
 
 #: components/Theme/EventView
 # defaultMessage: Start
@@ -279,12 +249,12 @@ msgstr "Bild hochladen"
 #: components/Theme/EventView
 # defaultMessage: Website
 msgid "Website"
-msgstr ""
+msgstr "Webseite"
 
 #: components/Widgets/AlignWidget
 # defaultMessage: Wide
 msgid "Wide"
-msgstr ""
+msgstr "Breit"
 
 #: components/Blocks/Image/ImageSidebar
 # defaultMessage: Clear image
@@ -301,11 +271,6 @@ msgstr ""
 msgid "loading"
 msgstr "laden"
 
-#: components/Blocks/Slider/DefaultBody
-# defaultMessage: More info
-msgid "moreInfo"
-msgstr "mehr Information"
-
 #: components/Blocks/Listing/ListingBody
 # defaultMessage: of
 msgid "of"

package/locales/en/LC_MESSAGES/volto.po

@@ -31,11 +31,6 @@ msgstr ""
 msgid "Browse the site, drop an image, or type an URL"
 msgstr ""
 
-#: components/Blocks/Slider/schema
-# defaultMessage: Button text
-msgid "Button text"
-msgstr ""
-
 #: components/Widgets/AlignWidget
 # defaultMessage: Center
 msgid "Center"
@@ -51,11 +46,6 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: components/Blocks/Slider/DefaultBody
-# defaultMessage: Continue reading
-msgid "Continue reading"
-msgstr ""
-
 #: components/Footer/Footer
 # defaultMessage: Copyright
 msgid "Copyright"
@@ -76,11 +66,6 @@ msgstr ""
 msgid "End"
 msgstr ""
 
-#: components/Blocks/Slider/schema
-# defaultMessage: Flag align
-msgid "Flag align"
-msgstr ""
-
 #: components/Widgets/AlignWidget
 # defaultMessage: Full
 msgid "Full"
@@ -91,11 +76,6 @@ msgstr ""
 msgid "GNU GPL license"
 msgstr ""
 
-#: components/Blocks/Slider/schema
-# defaultMessage: Hide Button
-msgid "Hide Button"
-msgstr ""
-
 #: components/Breadcrumbs/Breadcrumbs
 # defaultMessage: Home
 msgid "Home"
@@ -156,11 +136,6 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
-#: components/Blocks/Slider/DefaultBody
-# defaultMessage: Please choose an existing content as source for this element
-msgid "Please choose an existing content as source for this element"
-msgstr ""
-
 #: components/Footer/Footer
 # defaultMessage: Plone Foundation
 msgid "Plone Foundation"
@@ -245,11 +220,6 @@ msgstr ""
 msgid "Sorting"
 msgstr ""
 
-#: components/Blocks/Slider/DefaultBody
-# defaultMessage: Source
-msgid "Source"
-msgstr ""
-
 #: components/Theme/EventView
 # defaultMessage: Start
 msgid "Start"
@@ -295,11 +265,6 @@ msgstr ""
 msgid "loading"
 msgstr ""
 
-#: components/Blocks/Slider/DefaultBody
-# defaultMessage: More info
-msgid "moreInfo"
-msgstr ""
-
 #: components/Blocks/Listing/ListingBody
 # defaultMessage: of
 msgid "of"

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2023-08-03T17:53:05.646Z\n"
+"POT-Creation-Date: 2023-08-08T18:05:10.206Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -33,11 +33,6 @@ msgstr ""
 msgid "Browse the site, drop an image, or type an URL"
 msgstr ""
 
-#: components/Blocks/Slider/schema
-# defaultMessage: Button text
-msgid "Button text"
-msgstr ""
-
 #: components/Widgets/AlignWidget
 # defaultMessage: Center
 msgid "Center"
@@ -53,11 +48,6 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: components/Blocks/Slider/DefaultBody
-# defaultMessage: Continue reading
-msgid "Continue reading"
-msgstr ""
-
 #: components/Footer/Footer
 # defaultMessage: Copyright
 msgid "Copyright"
@@ -78,11 +68,6 @@ msgstr ""
 msgid "End"
 msgstr ""
 
-#: components/Blocks/Slider/schema
-# defaultMessage: Flag align
-msgid "Flag align"
-msgstr ""
-
 #: components/Widgets/AlignWidget
 # defaultMessage: Full
 msgid "Full"
@@ -93,11 +78,6 @@ msgstr ""
 msgid "GNU GPL license"
 msgstr ""
 
-#: components/Blocks/Slider/schema
-# defaultMessage: Hide Button
-msgid "Hide Button"
-msgstr ""
-
 #: components/Breadcrumbs/Breadcrumbs
 # defaultMessage: Home
 msgid "Home"
@@ -158,11 +138,6 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
-#: components/Blocks/Slider/DefaultBody
-# defaultMessage: Please choose an existing content as source for this element
-msgid "Please choose an existing content as source for this element"
-msgstr ""
-
 #: components/Footer/Footer
 # defaultMessage: Plone Foundation
 msgid "Plone Foundation"
@@ -247,11 +222,6 @@ msgstr ""
 msgid "Sorting"
 msgstr ""
 
-#: components/Blocks/Slider/DefaultBody
-# defaultMessage: Source
-msgid "Source"
-msgstr ""
-
 #: components/Theme/EventView
 # defaultMessage: Start
 msgid "Start"
@@ -297,11 +267,6 @@ msgstr ""
 msgid "loading"
 msgstr ""
 
-#: components/Blocks/Slider/DefaultBody
-# defaultMessage: More info
-msgid "moreInfo"
-msgstr ""
-
 #: components/Blocks/Listing/ListingBody
 # defaultMessage: of
 msgid "of"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitconcept/volto-light-theme",
-  "version": "1.0.0-rc.13",
+  "version": "1.0.0-rc.15",
   "description": "Volto Light Theme by kitconcept",
   "main": "src/index.js",
   "repository": {
@@ -66,8 +66,8 @@
     "@kitconcept/volto-dsgvo-banner": "^1.3.0",
     "@kitconcept/volto-heading-block": "^2.2.0",
     "@kitconcept/volto-introduction-block": "^1.0.0",
-    "@kitconcept/volto-separator-block": "^3.2.2",
+    "@kitconcept/volto-separator-block": "^4.0.0",
     "@kitconcept/volto-slider-block": "^4.2.0",
-    "@plone/volto": "^17.0.0-alpha.23"
+    "@plone/volto": "^17.0.0-alpha.24"
   }
 }

package/src/components/Blocks/Search/TopSideFacets.jsx

@@ -81,35 +81,37 @@ const TopSideFacets = (props) => {
                     total={totalItems}
                     as="h5"
                   />
-                  <div className="sort-on-wrapper">
-                    <span className="sort-label">
-                      {intl.formatMessage(messages.sort)}
-                    </span>
-                    <SortOn
-                      data={data}
-                      querystring={querystring}
-                      isEditMode={isEditMode}
-                      sortOn={sortOn}
-                      sortOrder={sortOrder}
-                      setSortOn={(sortOn) => {
-                        flushSync(() => {
-                          setSortOn(sortOn);
-                          onTriggerSearch(searchedText || '', facets, sortOn);
-                        });
-                      }}
-                      setSortOrder={(sortOrder) => {
-                        flushSync(() => {
-                          setSortOrder(sortOrder);
-                          onTriggerSearch(
-                            searchedText || '',
-                            facets,
-                            sortOn,
-                            sortOrder,
-                          );
-                        });
-                      }}
-                    />
-                  </div>
+                  {data.sortOnOptions && data.sortOnOptions.length > 0 && (
+                    <div className="sort-on-wrapper">
+                      <span className="sort-label">
+                        {intl.formatMessage(messages.sort)}
+                      </span>
+                      <SortOn
+                        data={data}
+                        querystring={querystring}
+                        isEditMode={isEditMode}
+                        sortOn={sortOn}
+                        sortOrder={sortOrder}
+                        setSortOn={(sortOn) => {
+                          flushSync(() => {
+                            setSortOn(sortOn);
+                            onTriggerSearch(searchedText || '', facets, sortOn);
+                          });
+                        }}
+                        setSortOrder={(sortOrder) => {
+                          flushSync(() => {
+                            setSortOrder(sortOrder);
+                            onTriggerSearch(
+                              searchedText || '',
+                              facets,
+                              sortOn,
+                              sortOrder,
+                            );
+                          });
+                        }}
+                      />
+                    </div>
+                  )}
                 </div>
               </div>
             )}

package/src/components/Blocks/Search/schema.js

@@ -0,0 +1,6 @@
+export const searchBlockSchemaEnhancer = ({ schema, formData, intl }) => {
+  schema.properties.showSortOn.default = true;
+  schema.fieldsets = schema.fieldsets.filter((item) => item.id !== 'views');
+
+  return schema;
+};

package/src/components/Blocks/Toc/schema.js

@@ -1,7 +1,9 @@
 export const tocBlockSchemaEnhancer = ({ formData, schema, intl }) => {
+  schema.fieldsets[0].fields = ['title'];
   schema.properties.levels.choices = [
     ['h2', 'h2'],
     ['h3', 'h3'],
   ];
+  schema.properties.levels.default = ['h2', 'h3'];
   return schema;
 };

package/src/index.js

@@ -20,6 +20,8 @@ import { ImageBlockDataAdapter } from './components/Blocks/Image/adapter';
 
 import { AccordionSchemaEnhancer } from './components/Blocks/Accordion/schema';
 
+import { searchBlockSchemaEnhancer } from './components/Blocks/Search/schema';
+
 import gridSVG from './icons/block_icn_grid.svg';
 import accordionSVG from './icons/block_icn_accordion.svg';
 import EventView from './components/Theme/EventView';
@@ -264,14 +266,18 @@ const applyConfig = (config) => {
     schemaEnhancer: defaultStylingSchema,
   };
 
-  config.blocks.blocksConfig.search.variations = [
-    {
-      id: 'facetsTopSide',
-      title: 'Facets on top',
-      view: TopSideFacets,
-      isDefault: true,
-    },
-  ];
+  config.blocks.blocksConfig.search = {
+    ...config.blocks.blocksConfig.search,
+    schemaEnhancer: searchBlockSchemaEnhancer,
+    variations: [
+      {
+        id: 'facetsTopSide',
+        title: 'Facets on top',
+        view: TopSideFacets,
+        isDefault: true,
+      },
+    ],
+  };
 
   config.blocks.blocksConfig.__button = {
     ...config.blocks.blocksConfig.__button,
@@ -296,7 +302,9 @@ const applyConfig = (config) => {
   // TOC Block
   config.blocks.blocksConfig.toc = {
     ...config.blocks.blocksConfig.toc,
-    schemaEnhancer: tocBlockSchemaEnhancer,
+    schemaEnhancer: composeSchema(tocBlockSchemaEnhancer, defaultStylingSchema),
+    // remove horizontal variation
+    variations: [config.blocks.blocksConfig.toc.variations[0]],
   };
 
   return config;

package/src/theme/_content.scss

@@ -117,6 +117,9 @@
 
       .event-button {
         padding-top: 50px;
+        a:after {
+          display: none !important;
+        }
         .button.event-btn {
           padding: 8px 20px;
           border: 1px solid #000;
@@ -233,3 +236,8 @@
     white-space: nowrap;
   }
 }
+
+// hide some fields from edit & add forms
+.field-wrapper-changeNote {
+  display: none;
+}

package/src/theme/_layout.scss

@@ -266,12 +266,14 @@ footer {
   .block.heading .heading-wrapper,
   .block-editor-listing .items,
   .block-editor-listing .listing.message,
+  .block-editor-search .listing-item,
+  .block-editor-search .search-input-resultscount-sort,
   .block-editor-separator.has--align--full .block.separator,
   .block-editor-separator .block.separator.has--align--full,
   .block.teaser.has--align--center,
   .block-editor-teaser .teaser-item.default,
   .block-editor-slateTable .block.table,
-  .block-editor-toc {
+  .block-editor-toc .table-of-contents {
     @include default-container-width();
     @include adjustMarginsToEditContainer($default-container-width);
   }

package/src/theme/blocks/_search.scss

@@ -6,6 +6,11 @@
       .card-container > img {
         width: 100% !important;
       }
+
+      .listing-item:last-child {
+        padding-bottom: 0;
+        border-bottom: none;
+      }
     }
     .items {
       padding: 0 !important;
@@ -23,6 +28,10 @@
         color: $black;
         @include text-heading-h2();
       }
+      &:last-child {
+        padding-bottom: 40px;
+        border-bottom: 1px solid $black;
+      }
 
       &:not(.grid) {
         img {
@@ -240,3 +249,13 @@
     }
   }
 }
+
+// Hidden fields
+.inline.field {
+  &.field-wrapper-showSearchInput,
+  &.field-wrapper-showSearchButton,
+  &.field-wrapper-showTotalResults,
+  &.field-wrapper-showSortOn {
+    display: none;
+  }
+}

package/src/theme/blocks/_teaser.scss

@@ -58,6 +58,7 @@
       flex-direction: row-reverse;
 
       .image-wrapper {
+        margin-right: 0px;
         margin-left: 20px;
 
         @media only screen and (max-width: $largest-mobile-screen) {