From bc5c0734ff5651bf01ffa54ee5abf490d8f590a6 Mon Sep 17 00:00:00 2001 From: trendschau Date: Sun, 13 Jun 2021 11:47:34 +0200 Subject: [PATCH] Version 1.4.6 finalize --- .../{02-footer.md => 00-footer.md} | 0 content/01-cyanine-theme/00-footer.yaml | 15 +++++++++++++++ ...content-elements.md => 01-content-elements.md} | 0 content/01-cyanine-theme/01-content-elements.yaml | 13 +++++++++++++ ...colors-and-fonts.md => 02-colors-and-fonts.md} | 0 content/01-cyanine-theme/02-colors-and-fonts.yaml | 13 +++++++++++++ .../{00-landingpage.md => 03-landingpage.md} | 0 content/01-cyanine-theme/03-landingpage.yaml | 13 +++++++++++++ system/Controllers/MetaApiController.php | 5 +++-- 9 files changed, 57 insertions(+), 2 deletions(-) rename content/01-cyanine-theme/{02-footer.md => 00-footer.md} (100%) create mode 100644 content/01-cyanine-theme/00-footer.yaml rename content/01-cyanine-theme/{03-content-elements.md => 01-content-elements.md} (100%) create mode 100644 content/01-cyanine-theme/01-content-elements.yaml rename content/01-cyanine-theme/{01-colors-and-fonts.md => 02-colors-and-fonts.md} (100%) create mode 100644 content/01-cyanine-theme/02-colors-and-fonts.yaml rename content/01-cyanine-theme/{00-landingpage.md => 03-landingpage.md} (100%) create mode 100644 content/01-cyanine-theme/03-landingpage.yaml diff --git a/content/01-cyanine-theme/02-footer.md b/content/01-cyanine-theme/00-footer.md similarity index 100% rename from content/01-cyanine-theme/02-footer.md rename to content/01-cyanine-theme/00-footer.md diff --git a/content/01-cyanine-theme/00-footer.yaml b/content/01-cyanine-theme/00-footer.yaml new file mode 100644 index 00000000..5944c97e --- /dev/null +++ b/content/01-cyanine-theme/00-footer.yaml @@ -0,0 +1,15 @@ +meta: + title: '3-Column Footer' + description: 'Cyanine provides a three column footer at the bottom of each page. You can use markdown for each column. Make sure that you use the correct headline-level (we suggest a headline level 3 or level 4 to keep the logical headline hierarchy in the document). You can, of course, also add link-lists or' + heroimage: null + heroimagealt: null + owner: null + author: trendschau + manualdate: '' + modified: '2021-05-18' + created: '2020-06-11' + time: 23-42-27 + navtitle: '' + hide: false + allowedrole: null + alloweduser: null diff --git a/content/01-cyanine-theme/03-content-elements.md b/content/01-cyanine-theme/01-content-elements.md similarity index 100% rename from content/01-cyanine-theme/03-content-elements.md rename to content/01-cyanine-theme/01-content-elements.md diff --git a/content/01-cyanine-theme/01-content-elements.yaml b/content/01-cyanine-theme/01-content-elements.yaml new file mode 100644 index 00000000..baedf479 --- /dev/null +++ b/content/01-cyanine-theme/01-content-elements.yaml @@ -0,0 +1,13 @@ +meta: + title: 'Content Elements' + description: "There are a lot of other settings for your content area. For example: \n" + heroimage: '' + heroimagealt: null + owner: testauthor + author: trendschau + manualdate: null + modified: '2020-06-14' + created: '2020-06-11' + time: 21-05-02 + navtitle: 'content elements' + hide: false diff --git a/content/01-cyanine-theme/01-colors-and-fonts.md b/content/01-cyanine-theme/02-colors-and-fonts.md similarity index 100% rename from content/01-cyanine-theme/01-colors-and-fonts.md rename to content/01-cyanine-theme/02-colors-and-fonts.md diff --git a/content/01-cyanine-theme/02-colors-and-fonts.yaml b/content/01-cyanine-theme/02-colors-and-fonts.yaml new file mode 100644 index 00000000..ae26f490 --- /dev/null +++ b/content/01-cyanine-theme/02-colors-and-fonts.yaml @@ -0,0 +1,13 @@ +meta: + title: 'Colors and Fonts' + description: 'First of all cyanine supports individual logos. If you want to use our logo, then please upload it in the system settings. Cyanine will automatically replace the title text with your logo. ' + heroimage: null + heroimagealt: null + owner: null + author: trendschau + manualdate: null + modified: '2020-06-14' + created: '2020-06-11' + time: 20-37-12 + navtitle: 'colors and fonts' + hide: false diff --git a/content/01-cyanine-theme/00-landingpage.md b/content/01-cyanine-theme/03-landingpage.md similarity index 100% rename from content/01-cyanine-theme/00-landingpage.md rename to content/01-cyanine-theme/03-landingpage.md diff --git a/content/01-cyanine-theme/03-landingpage.yaml b/content/01-cyanine-theme/03-landingpage.yaml new file mode 100644 index 00000000..5ba86794 --- /dev/null +++ b/content/01-cyanine-theme/03-landingpage.yaml @@ -0,0 +1,13 @@ +meta: + title: 'The Landingpage' + description: "Cyanine provides an optional landingpage with six segments: \nIntro with the content of the home page and an additional link/button.\nInfo with individual markdown content.\nTeaser with two elements. Each element has a headline, a text and a button/link.\nContrast with a headline, text-input and a" + author: trendschau + created: '2020-06-11' + time: 20-05-35 + navtitle: landingpage + modified: '2020-06-11' +seo: + seoimage: '' + seoimagealt: null + Checkbox: null + mycfiel: { } diff --git a/system/Controllers/MetaApiController.php b/system/Controllers/MetaApiController.php index a523b45b..7f5bf22d 100644 --- a/system/Controllers/MetaApiController.php +++ b/system/Controllers/MetaApiController.php @@ -229,7 +229,6 @@ public function updateArticleMeta(Request $request, Response $response, $args) } else { - if($fieldDefinition && isset($fieldDefinition['type']) && ($fieldDefinition['type'] == 'select' ) && isset($fieldDefinition['dataset']) && ($fieldDefinition['dataset'] == 'userroles' ) ) { $userroles = [null => null]; @@ -291,7 +290,9 @@ public function updateArticleMeta(Request $request, Response $response, $args) if($this->item->elementType == "file" && strlen($this->item->order) == 12) { # create file-prefix with date - $datetime = $metaInput['manualdate'] . '-' . $metaInput['time']; + $metadate = $metaInput['manualdate']; + if($metadate == ''){ $metadate = $metaPage['meta']['created']; } + $datetime = $metadate . '-' . $metaInput['time']; $datetime = implode(explode('-', $datetime)); $datetime = substr($datetime,0,12);