markseu 1 år sedan
förälder
incheckning
91a17fccfa

+ 14 - 14
system/extensions/update-available.ini

@@ -74,14 +74,14 @@ Status: available
 system/workers/breadcrumb.php: breadcrumb.php, create, update
 
 Extension: Bundle
-Version: 0.9.4
+Version: 0.9.5
 Description: Bundle website files.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-bundle/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-bundle
 DocumentationLanguage: en, de, sv
-Published: 2024-04-24 15:54:14
+Published: 2024-04-25 13:08:21
 Status: available
 system/workers/bundle.php: bundle.php, create, update
 
@@ -97,14 +97,14 @@ Status: available
 system/workers/catalan.php: catalan.php, create, update
 
 Extension: Check
-Version: 0.9.1
+Version: 0.9.4
 Description: Find broken links.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-check/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-check
 DocumentationLanguage: en, de, sv
-Published: 2024-04-05 00:28:36
+Published: 2024-04-25 13:13:07
 Status: available
 system/workers/check.php: check.php, create, update
 
@@ -148,14 +148,14 @@ system/themes/copenhagen.css: copenhagen.css, create, update, careful
 system/themes/copenhagen.png: copenhagen.png, create
 
 Extension: Core
-Version: 0.9.7
+Version: 0.9.8
 Description: Core functionality of your website.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-core/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-core
 DocumentationLanguage: en, de, sv
-Published: 2024-04-24 17:43:59
+Published: 2024-04-25 13:05:12
 Status: available
 system/workers/core.php: core.php, create, update
 system/extensions/core.php: coreupdate.txt, update
@@ -261,14 +261,14 @@ Status: available
 system/workers/english.php: english.php, create, update
 
 Extension: Feed
-Version: 0.9.1
+Version: 0.9.2
 Description: Feed with recent changes.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-feed/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-feed
 DocumentationLanguage: en, de, sv
-Published: 2024-04-05 00:13:02
+Published: 2024-04-25 13:08:57
 Status: available
 system/workers/feed.php: feed.php, create, update
 system/layouts/feed.html: feed.html, create, update, careful
@@ -304,14 +304,14 @@ system/workers/gallery-default-skin.svg: gallery-default-skin.svg, create, updat
 system/workers/gallery-preloader.gif: gallery-preloader.gif, create, update
 
 Extension: Generate
-Version: 0.9.3
+Version: 0.9.4
 Description: Generate a static website.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-generate/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-generate
 DocumentationLanguage: en, de, sv
-Published: 2024-04-10 10:19:17
+Published: 2024-04-25 13:12:00
 Status: available
 system/workers/generate.php: generate.php, create, update
 
@@ -637,14 +637,14 @@ Status: available
 system/workers/russian.php: russian.php, create, update
 
 Extension: Search
-Version: 0.9.1
+Version: 0.9.2
 Description: Full-text search.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-search/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-search
 DocumentationLanguage: en, de, sv
-Published: 2024-04-05 00:13:37
+Published: 2024-04-25 13:09:04
 Status: available
 system/workers/search.php: search.php, create, update
 system/layouts/search.html: search.html, create, update, careful
@@ -663,14 +663,14 @@ Status: available
 system/workers/serve.php: serve.php, create, update
 
 Extension: Sitemap
-Version: 0.9.1
+Version: 0.9.2
 Description: Sitemap with all pages.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-sitemap/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-sitemap
 DocumentationLanguage: en, de, sv
-Published: 2024-04-05 00:13:12
+Published: 2024-04-25 13:09:09
 Status: available
 system/workers/sitemap.php: sitemap.php, create, update
 system/layouts/sitemap.html: sitemap.html, create, update, careful

+ 4 - 4
system/extensions/yellow-extension.ini

@@ -1,14 +1,14 @@
 # Datenstrom Yellow extension settings
 
 Extension: Core
-Version: 0.9.7
+Version: 0.9.8
 Description: Core functionality of your website.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-core/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-core
 DocumentationLanguage: en, de, sv
-Published: 2024-04-24 17:43:59
+Published: 2024-04-25 13:05:12
 Status: available
 system/workers/core.php: core.php, create, update
 system/extensions/core.php: coreupdate.txt, update
@@ -36,14 +36,14 @@ system/workers/edit-stack.svg: edit-stack.svg, create, update
 content/shared/page-new-default.md: page-new-default.md, create, optional
 
 Extension: Generate
-Version: 0.9.3
+Version: 0.9.4
 Description: Generate a static website.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-generate/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-generate
 DocumentationLanguage: en, de, sv
-Published: 2024-04-10 10:19:17
+Published: 2024-04-25 13:12:00
 Status: available
 system/workers/generate.php: generate.php, create, update
 

+ 6 - 6
system/workers/core.php

@@ -2,7 +2,7 @@
 // Core extension, https://github.com/annaesvensson/yellow-core
 
 class YellowCore {
-    const VERSION = "0.9.7";
+    const VERSION = "0.9.8";
     const RELEASE = "0.9";
     public $content;        // content files
     public $media;          // media files
@@ -379,9 +379,9 @@ class YellowContent {
         return $found ? $page : null;
     }
     
-    // Return page collection with all pages
-    public function index($showInvisible = false, $multiLanguage = false) {
-        $rootLocation = $multiLanguage ? "" : $this->getRootLocation($this->yellow->page->location);
+    // Return page collection with pages of the website
+    public function index($showInvisible = false) {
+        $rootLocation = $this->getRootLocation($this->yellow->page->location);
         return $this->getChildrenRecursive($rootLocation, $showInvisible);
     }
     
@@ -559,8 +559,8 @@ class YellowMedia {
         return $found ? $file : null;
     }
     
-    // Return page collection with all media files
-    public function index($showInvisible = false, $multiPass = false) {
+    // Return page collection with media files
+    public function index($showInvisible = false) {
         return $this->getChildrenRecursive("", $showInvisible);
     }
     

+ 4 - 4
system/workers/generate.php

@@ -2,7 +2,7 @@
 // Generate extension, https://github.com/annaesvensson/yellow-generate
 
 class YellowGenerate {
-    const VERSION = "0.9.3";
+    const VERSION = "0.9.4";
     public $yellow;                       // access to API
     public $files;                        // number of files
     public $errors;                       // number of errors
@@ -373,13 +373,13 @@ class YellowGenerate {
     }
 
     // Return content locations
-    public function getContentLocations($includeAll = false) {
+    public function getContentLocations() {
         $locations = array();
         $staticUrl = $this->yellow->system->get("generateStaticUrl");
         list($scheme, $address, $base) = $this->yellow->lookup->getUrlInformation($staticUrl);
         $this->yellow->page->setRequestInformation($scheme, $address, $base, "", "", false);
-        foreach ($this->yellow->content->index(true, true) as $page) {
-            if (preg_match("/exclude/i", $page->get("generate")) && !$includeAll) continue;
+        foreach ($this->yellow->content->getChildrenRecursive("", true) as $page) {
+            if (preg_match("/exclude/i", $page->get("generate"))) continue;
             if ($page->get("status")=="private" || $page->get("status")=="draft") continue;
             array_push($locations, $page->location);
         }