From 0c930877d13b9a95a344343474da487e87a0665c Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 20 Jan 2022 14:07:41 +0100 Subject: [PATCH] Some changes for the default theme --- .../themes/librecms/images/libreccm.svg | 803 ++++++++++++++++++ .../themes/librecms/images/librecms.svg | 722 ++++++++++++++++ .../themes/librecms/images/scientificcms.svg | 756 +++++++++++++++++ .../librecms/templates/index-page.html.ftl | 45 +- .../themes/librecms/templates/main.html.ftl | 40 +- .../src/main/scss/_custom.scss | 3 + .../StaticThemeIndexBuilder.ts | 7 +- 7 files changed, 2362 insertions(+), 14 deletions(-) create mode 100644 ccm-cms-default-theme/src/main/resources/themes/librecms/images/libreccm.svg create mode 100644 ccm-cms-default-theme/src/main/resources/themes/librecms/images/librecms.svg create mode 100644 ccm-cms-default-theme/src/main/resources/themes/librecms/images/scientificcms.svg diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/images/libreccm.svg b/ccm-cms-default-theme/src/main/resources/themes/librecms/images/libreccm.svg new file mode 100644 index 000000000..108c91fac --- /dev/null +++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/images/libreccm.svg @@ -0,0 +1,803 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/images/librecms.svg b/ccm-cms-default-theme/src/main/resources/themes/librecms/images/librecms.svg new file mode 100644 index 000000000..f73a74cb6 --- /dev/null +++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/images/librecms.svg @@ -0,0 +1,722 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/images/scientificcms.svg b/ccm-cms-default-theme/src/main/resources/themes/librecms/images/scientificcms.svg new file mode 100644 index 000000000..e7c9029bc --- /dev/null +++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/images/scientificcms.svg @@ -0,0 +1,756 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/index-page.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/index-page.html.ftl index ce20c84f9..1a68ad991 100644 --- a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/index-page.html.ftl +++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/index-page.html.ftl @@ -1,14 +1,39 @@ <#import "./main.html.ftl" as main> <@main.librecms> -

Index page

-

This theme works.

-
-
application
-
${application}
-
themeUrl
-
${themeUrl}
-
view
-
${view!""}
-
+
+
+
+

+ LibreCMS +

+

+ No index item has been defined. +

+ + Find out more + +
+
+ + <#if CmsPagesCategorizedItemModel.contentItem??> + Category has an index item + <#else> + Category has no index item + + +

Index page

+

This theme works.

+
+
application
+
${application}
+
themeUrl
+
${themeUrl}
+
view
+
${view!""}
+
+
+ \ No newline at end of file diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/main.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/main.html.ftl index cd870c2ad..0986a1b4d 100644 --- a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/main.html.ftl +++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/main.html.ftl @@ -6,10 +6,44 @@ Default Template - -
+ +
+ +
+
<#nested> -
+ \ No newline at end of file diff --git a/ccm-cms-default-theme/src/main/scss/_custom.scss b/ccm-cms-default-theme/src/main/scss/_custom.scss index e69de29bb..1f5871ef7 100644 --- a/ccm-cms-default-theme/src/main/scss/_custom.scss +++ b/ccm-cms-default-theme/src/main/scss/_custom.scss @@ -0,0 +1,3 @@ +a.navbar-brand { + max-width: 15%; +} \ No newline at end of file diff --git a/ccm-static-theme-index-builder/src/main/typescript/ccm-static-theme-index-generator/StaticThemeIndexBuilder.ts b/ccm-static-theme-index-builder/src/main/typescript/ccm-static-theme-index-generator/StaticThemeIndexBuilder.ts index 777c92c3f..69d0643a0 100644 --- a/ccm-static-theme-index-builder/src/main/typescript/ccm-static-theme-index-generator/StaticThemeIndexBuilder.ts +++ b/ccm-static-theme-index-builder/src/main/typescript/ccm-static-theme-index-generator/StaticThemeIndexBuilder.ts @@ -6,6 +6,8 @@ import * as fsPromises from "fs/promises"; import * as mime from "mime-types"; import { fileTypeFromFile, FileTypeResult } from "file-type"; +const AMBIGOUS_FILE_TYPES = ["application/xml"]; + console.log("Static Theme Builder"); if (process.argv.length < 3) { @@ -143,7 +145,10 @@ function mapFileTypeResultToMimeType( fileTypeResult: FileTypeResult | undefined ): string { if (fileTypeResult) { - if (fileTypeResult.mime) { + if ( + fileTypeResult.mime && + !AMBIGOUS_FILE_TYPES.includes(fileTypeResult.mime) + ) { return fileTypeResult.mime; } else { const result = mime.lookup(name);