diff --git a/content/00-welcome/00-setup-your-website.yaml b/content/00-welcome/00-setup-your-website.yaml index 4e77138..f61188b 100644 --- a/content/00-welcome/00-setup-your-website.yaml +++ b/content/00-welcome/00-setup-your-website.yaml @@ -1,14 +1,14 @@ meta: title: 'Setup Your Website' description: 'Typemill provides detailed settings, and you have access to nearly all settings in the author panel. Learn the basics in this short video:' - heroimage: media/live/1528492471.svg + heroimage: media/live/jack-ward-wbs1qewclne-unsplash.jpeg heroimagealt: null owner: trendschau author: 'Sebastian Schürmanns' allowedrole: null alloweduser: null manualdate: null - modified: '2021-09-02' + modified: '2021-08-01' created: '2021-05-27' time: 21-02-24 navtitle: 'setup your website' diff --git a/content/00-welcome/03-get-help.yaml b/content/00-welcome/03-get-help.yaml index 0b0ea3c..f079925 100644 --- a/content/00-welcome/03-get-help.yaml +++ b/content/00-welcome/03-get-help.yaml @@ -5,14 +5,14 @@ meta: heroimagealt: null owner: null author: 'Sebastian Schürmanns' + allowedrole: null + alloweduser: null manualdate: null modified: '2021-06-13' created: null time: null navtitle: '' - hide: true - allowedrole: null - alloweduser: null + hide: false seo: heroimage: media/live/bildschirmfoto-zu-2019-08-30-20-46-29.png heroimagealt: Alt-Text diff --git a/system/Controllers/PageController.php b/system/Controllers/PageController.php index 83f6e32..1c508ff 100644 --- a/system/Controllers/PageController.php +++ b/system/Controllers/PageController.php @@ -162,7 +162,7 @@ class PageController extends Controller $item = Folder::getItemForUrl($structure, $urlRel, $uri->getBasePath()); # if the item is a folder and if that folder is not hidden - if($item && isset($item->hide) && !$item->hide) + if($item && $item->elementType == 'folder' && isset($item->hide) && !$item->hide) { # use the navigation instead of the structure so that hidden elements are erased $item = Folder::getItemForUrl($navigation, $urlRel, $uri->getBaseUrl(), NULL, $home); @@ -396,7 +396,7 @@ class PageController extends Controller $extended = false; } } - + # cache structure $cache->updateCache('cache', 'structure.txt', 'lastCache.txt', $structure); @@ -415,7 +415,9 @@ class PageController extends Controller } # load and return the cached structure, because might be manipulated with navigation.... - return $this->getCachedStructure($cache); + $structure = $this->getCachedStructure($cache); + + return $structure; } # creates a file that holds all hide flags and navigation titles diff --git a/system/author/js/vue-shared.js b/system/author/js/vue-shared.js index bfaae98..75fcaed 100644 --- a/system/author/js/vue-shared.js +++ b/system/author/js/vue-shared.js @@ -522,6 +522,9 @@ Vue.component('component-image', { ' :value="value"' + '@input="update($event, name)">' + '' + + '
' + + '' + + '
' + '' + '

{{ description|translate }}

' + '
{{ errors[name] }}
' + @@ -539,12 +542,21 @@ Vue.component('component-image', { imgpreview: false, showmedialib: false, load: false, + quality: false, } }, mounted: function(){ if(this.value !== null && this.value !== '') { this.imgpreview = myaxios.defaults.baseURL + '/' + this.value; + if(this.value.indexOf("media/live") > -1 ) + { + this.quality = 'live'; + } + else if(this.value.indexOf("media/original") > -1) + { + this.quality = 'original'; + } } }, methods: { @@ -567,6 +579,29 @@ Vue.component('component-image', { this.imgpreview = false; this.update(''); }, + getQualityLabel: function() + { + if(this.quality == 'live') + { + return 'switch quality to: original'; + } + return 'switch quality to: resized'; + }, + switchQuality: function() + { + if(this.quality == 'live') + { + var newUrl = this.value.replace("media/live", "media/original"); + this.update(newUrl); + this.quality = 'original'; + } + else + { + var newUrl = this.value.replace("media/original", "media/live"); + this.update(newUrl); + this.quality = 'live'; + } + }, openmedialib: function() { this.showmedialib = true; diff --git a/themes/cyanine/home/landingpageIntro.twig b/themes/cyanine/home/landingpageIntro.twig index a25c84b..12874f6 100644 --- a/themes/cyanine/home/landingpageIntro.twig +++ b/themes/cyanine/home/landingpageIntro.twig @@ -1,6 +1,6 @@
-
+