Added about page to standard installation

content/1-home/page.md

@@ -1,7 +1,6 @@
 ---
 Title: Home
-TitleContent: Your website works!
 ---
 [image photo.jpg Example rounded]
 
-[edit - You can edit this page]. The help gives you more information about how to create small web pages, blogs and wikis. [Learn more](https://datenstrom.se/yellow/help/).
+[edit - You can edit this page in a web browser] or use a text editor. [Get help](https://datenstrom.se/yellow/help/).

content/9-about/page.md

@@ -0,0 +1,10 @@
+---
+Title: About
+---
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut 
+labore et dolore magna pizza. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris 
+nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit 
+esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt 
+in culpa qui officia deserunt mollit anim id est laborum.
+
+[Made with Datenstrom Yellow](https://datenstrom.se/yellow/).

system/extensions/install.php

@@ -2,7 +2,7 @@
 // Install extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/install
 
 class YellowInstall {
-    const VERSION = "0.8.54";
+    const VERSION = "0.8.55";
     const PRIORITY = "1";
     public $yellow;                 // access to API
     
@@ -42,9 +42,10 @@ class YellowInstall {
                 if ($status=="install") $status = $this->updateExtension($extension)==200 ? "ok" : "error";
                 if ($status=="ok") $status = $this->updateUser($email, $password, $author, $language)==200 ? "ok" : "error";
                 if ($status=="ok") $status = $this->updateContent($language, "installHome", "/")==200 ? "ok" : "error";
+                if ($status=="ok") $status = $this->updateContent($language, "installAbout", "/about/")==200 ? "ok" : "error";
                 if ($status=="ok") $status = $this->updateContent($language, "installDefault", "/shared/page-new-default")==200 ? "ok" : "error";
-                if ($status=="ok") $status = $this->updateContent($language, "installBlog", "/shared/page-new-blog")==200 ? "ok" : "error";
                 if ($status=="ok") $status = $this->updateContent($language, "installWiki", "/shared/page-new-wiki")==200 ? "ok" : "error";
+                if ($status=="ok") $status = $this->updateContent($language, "installBlog", "/shared/page-new-blog")==200 ? "ok" : "error";
                 if ($status=="ok") $status = $this->updateContent($language, "coreError404", "/shared/page-error-404")==200 ? "ok" : "error";
                 if ($status=="ok") $status = $this->updateSettings($language)==200 ? "ok" : "error";
                 if ($status=="ok") $status = $this->removeInstall()==200 ? "done" : "error";
@@ -190,12 +191,9 @@ class YellowInstall {
         $fileName = $this->yellow->lookup->findFileFromLocation($location);
         $fileData = str_replace("\r\n", "\n", $this->yellow->toolbox->readFile($fileName));
         if (!empty($fileData) && $language!="en") {
-            $settingsOld = "Title: ".$this->yellow->language->getText("{$name}Title", "en")."\n";
-            $settingsNew = "Title: ".$this->yellow->language->getText("{$name}Title", $language)."\n";
-            $fileData = str_replace($settingsOld, $settingsNew, $fileData);
-            $settingsOld = "TitleContent: ".$this->yellow->language->getText("{$name}TitleContent", "en")."\n";
-            $settingsNew = "TitleContent: ".$this->yellow->language->getText("{$name}TitleContent", $language)."\n";
-            $fileData = str_replace($settingsOld, $settingsNew, $fileData);
+            $titleOld = "Title: ".$this->yellow->language->getText("{$name}Title", "en")."\n";
+            $titleNew = "Title: ".$this->yellow->language->getText("{$name}Title", $language)."\n";
+            $fileData = str_replace($titleOld, $titleNew, $fileData);
             $textOld = str_replace("\\n", "\n", $this->yellow->language->getText("{$name}Text", "en"));
             $textNew = str_replace("\\n", "\n", $this->yellow->language->getText("{$name}Text", $language));
             $fileData = str_replace($textOld, $textNew, $fileData);
@@ -364,38 +362,24 @@ class YellowInstall {
         $rawData .= "<p><label for=\"author\">".$this->yellow->language->getText("editSignupName")."</label><br /><input class=\"form-control\" type=\"text\" maxlength=\"64\" name=\"author\" id=\"author\" value=\"\"></p>\n";
         $rawData .= "<p><label for=\"email\">".$this->yellow->language->getText("editSignupEmail")."</label><br /><input class=\"form-control\" type=\"text\" maxlength=\"64\" name=\"email\" id=\"email\" value=\"\"></p>\n";
         $rawData .= "<p><label for=\"password\">".$this->yellow->language->getText("editSignupPassword")."</label><br /><input class=\"form-control\" type=\"password\" maxlength=\"64\" name=\"password\" id=\"password\" value=\"\"></p>\n";
-        if (count($languages)>1) {
-            $rawData .= "<p>";
-            foreach ($languages as $language) {
-                $checked = $language==$this->yellow->language->language ? " checked=\"checked\"" : "";
-                $rawData .= "<label for=\"${language}-language\"><input type=\"radio\" name=\"language\" id=\"${language}-language\" value=\"$language\"$checked> ".$this->yellow->language->getTextHtml("languageDescription", $language)."</label><br />";
-            }
-            $rawData .= "</p>\n";
+        $rawData .= "<p>".$this->yellow->language->getText("installLanguage")."</p>\n<p>";
+        foreach ($languages as $language) {
+            $checked = $language==$this->yellow->language->language ? " checked=\"checked\"" : "";
+            $rawData .= "<label for=\"${language}-language\"><input type=\"radio\" name=\"language\" id=\"${language}-language\" value=\"$language\"$checked> ".$this->yellow->language->getTextHtml("languageDescription", $language)."</label><br />";
         }
-        if (count($this->getExtensionsInstall())>1) {
-            $rawData .= "<p>".$this->yellow->language->getText("installExtension")."<p>";
-            foreach ($this->getExtensionsInstall() as $extension) {
-                $checked = $extension=="website" ? " checked=\"checked\"" : "";
-                $rawData .= "<label for=\"${extension}-extension\"><input type=\"radio\" name=\"extension\" id=\"${extension}-extension\" value=\"$extension\"$checked> ".$this->yellow->language->getTextHtml("installExtension".ucfirst($extension))."</label><br />";
-            }
-            $rawData .= "</p>\n";
+        $rawData .= "</p>\n";
+        $rawData .= "<p>".$this->yellow->language->getText("installExtension")."</p>\n<p>";
+        foreach (array("website", "wiki", "blog") as $extension) {
+            $checked = $extension=="website" ? " checked=\"checked\"" : "";
+            $rawData .= "<label for=\"${extension}-extension\"><input type=\"radio\" name=\"extension\" id=\"${extension}-extension\" value=\"$extension\"$checked> ".$this->yellow->language->getTextHtml("installExtension".ucfirst($extension))."</label><br />";
         }
+        $rawData .= "</p>\n";
         $rawData .= "<input class=\"btn\" type=\"submit\" value=\"".$this->yellow->language->getText("editOkButton")."\" />\n";
         $rawData .= "<input type=\"hidden\" name=\"status\" value=\"install\" />\n";
         $rawData .= "</form>\n";
         return $rawData;
     }
     
-    // Return extensions for install page
-    public function getExtensionsInstall() {
-        $extensions = array("website");
-        $path = $this->yellow->system->get("coreExtensionDirectory");
-        foreach ($this->yellow->toolbox->getDirectoryEntries($path, "/^.*\.zip$/", true, false, false) as $entry) {
-            if (preg_match("/^install-(.*?)\./", $entry, $matches) && $matches[1]!="language") array_push($extensions, $matches[1]);
-        }
-        return $extensions;
-    }
-    
     // Return extensions required
     public function getExtensionsRequired($fileData) {
         $extensions = array();
@@ -420,7 +404,7 @@ class YellowInstall {
         return array_slice($extensions, 0, 3);
     }
     
-    // Check if already installed
+    // Check if website already installed
     public function isAlreadyInstalled() {
         return $this->yellow->system->get("updateCurrentRelease")!=0;
     }

system/extensions/update-current.ini

@@ -65,18 +65,19 @@ media/images/photo.jpg: photo.jpg, create, optional
 media/thumbnails/photo-100x40.jpg: photo-100x40.jpg, create, optional
 
 Extension: Install
-Version: 0.8.54
+Version: 0.8.55
 Description: Install a brand new, shiny website.
 HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/install
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/install.zip
-Published: 2021-08-16 08:47:55
+Published: 2021-08-16 17:03:56
 Developer: Datenstrom
 Status: unlisted
 system/extensions/install.php: install.php, create
 system/extensions/install-language.zip: @base/zip/language.zip, create
-system/extensions/install-blog.zip: @base/zip/blog.zip, create
 system/extensions/install-wiki.zip: @base/zip/wiki.zip, create
-content/1-home/page.md: page.md, create
+system/extensions/install-blog.zip: @base/zip/blog.zip, create
+content/1-home/page.md: 1-home-page.md, create
+content/9-about/page.md: 9-about-page.md, create
 media/downloads/yellow.pdf: yellow.pdf, create
 
 Extension: Markdown