diff --git a/README-de.md b/README-de.md index fd892fb..f87b7e5 100644 --- a/README-de.md +++ b/README-de.md @@ -16,7 +16,6 @@ Die folgenden Erweiterungen sind in der Standardinstallation enthalten: * [Image](https://github.com/annaesvensson/yellow-image/tree/main/README-de.md) - Bilder in unterschiedlichen Größen hinzufügen. Entwickelt von Anna Svensson. * [Install](https://github.com/annaesvensson/yellow-install/tree/main/README-de.md) - Eine brandneue Webseite installieren. Entwickelt von Anna Svensson. * [Markdown](https://github.com/annaesvensson/yellow-markdown/tree/main/README-de.md) - Textformatierung für Menschen. Entwickelt von Anna Svensson. -* [Meta](https://github.com/annaesvensson/yellow-meta/tree/main/README-de.md) - Metadaten für Menschen und Maschinen. Entwickelt von Anna Svensson. * [Serve](https://github.com/annaesvensson/yellow-serve/tree/main/README-de.md) - Eingebauter Webserver. Entwickelt von Anna Svensson. * [Stockholm](https://github.com/annaesvensson/yellow-stockholm/tree/main/README-de.md) - Stockholm ist ein schlichtes Theme. Entworfen von Anna Svensson. * [Update](https://github.com/annaesvensson/yellow-update/tree/main/README-de.md) - Webseite auf dem neusten Stand halten. Entwickelt von Anna Svensson. diff --git a/README-sv.md b/README-sv.md index bda655e..764092b 100644 --- a/README-sv.md +++ b/README-sv.md @@ -16,10 +16,8 @@ Följande tillägg ingår i standardinstallationen: * [Image](https://github.com/annaesvensson/yellow-image/tree/main/README-sv.md) - Lägg til bilder och miniatyrbilder. Utvecklad av Anna Svensson. * [Install](https://github.com/annaesvensson/yellow-install/tree/main/README-sv.md) - Installera en helt ny webbplats. Utvecklad av Anna Svensson. * [Markdown](https://github.com/annaesvensson/yellow-markdown/tree/main/README-sv.md) - Textformatering för människor. Utvecklad av Anna Svensson. -* [Meta](https://github.com/annaesvensson/yellow-meta/tree/main/README-sv.md) - Metadata för människor och maskiner. Utvecklad av Anna Svensson. * [Serve](https://github.com/annaesvensson/yellow-serve/tree/main/README-sv.md) - Inbyggd webbserver. Utvecklad av Anna Svensson. * [Stockholm](https://github.com/annaesvensson/yellow-stockholm/tree/main/README-sv.md) - Stockholm är ett rent tema. Designad av Anna Svensson. * [Update](https://github.com/annaesvensson/yellow-update/tree/main/README-sv.md) - Håll din webbplats uppdaterad. Utvecklad av Anna Svensson. - Har du några frågor? [Få hjälp](https://datenstrom.se/sv/yellow/help/). diff --git a/README.md b/README.md index 40a3489..d08c405 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ The following extensions are included in the standard installation: * [Image](https://github.com/annaesvensson/yellow-image) - Add images and thumbnails. Developed by Anna Svensson. * [Install](https://github.com/annaesvensson/yellow-install) - Install a brand new website. Developed by Anna Svensson. * [Markdown](https://github.com/annaesvensson/yellow-markdown) - Text formatting for humans. Developed by Anna Svensson. -* [Meta](https://github.com/annaesvensson/yellow-meta) - Meta data for humans and machines. Developed by Anna Svensson. * [Serve](https://github.com/annaesvensson/yellow-serve) - Built-in web server. Developed by Anna Svensson. * [Stockholm](https://github.com/annaesvensson/yellow-stockholm) - Stockholm is a clean theme. Designed by Anna Svensson. * [Update](https://github.com/annaesvensson/yellow-update) - Keep your website up to date. Developed by Anna Svensson. diff --git a/system/extensions/meta.php b/system/extensions/meta.php deleted file mode 100644 index b1590c3..0000000 --- a/system/extensions/meta.php +++ /dev/null @@ -1,65 +0,0 @@ -yellow = $yellow; - $this->yellow->system->setDefault("metaDefaultImage", "favicon"); - } - - // Handle page extra data - public function onParsePageExtra($page, $name) { - $output = null; - if ($name=="header" && !$page->isError()) { - list($imageUrl, $imageAlt) = $this->getImageInformation($page); - $locale = $this->yellow->language->getText("languageLocale", $page->get("language")); - $output .= "getUrl().$this->yellow->toolbox->getLocationArguments())."\" />\n"; - $output .= "\n"; - $output .= "\n"; - $output .= "getHtml("title")."\" />\n"; - $output .= "getHtml("sitename")."\" />\n"; - $output .= "getHtml("description")."\" />\n"; - $output .= "\n"; - $output .= "\n"; - } - return $output; - } - - // Handle page output data - public function onParsePageOutput($page, $text) { - $output = null; - if ($text && preg_match("/^(.*?)(.*)$/s", $text, $matches)) { - $output = $matches[1]."".$matches[3]; - } - return $output; - } - - // Return image information for page - public function getImageInformation($page) { - if ($page->isExisting("image")) { - $name = $page->get("image"); - $alt = $page->isExisting("imageAlt") ? $page->get("imageAlt") : $page->get("title"); - } elseif (preg_match("/\[image(\s.*?)\]/", $page->getContentRaw(), $matches)) { - list($name, $alt) = $this->yellow->toolbox->getTextArguments(trim($matches[1])); - if (is_string_empty($alt)) $alt = $page->get("title"); - } else { - $name = $this->yellow->system->get("metaDefaultImage"); - $alt = $page->isExisting("imageAlt") ? $page->get("imageAlt") : $page->get("title"); - } - if (!preg_match("/^\w+:/", $name)) { - $location = $name!="favicon" ? $this->yellow->system->get("coreImageLocation").$name : - $this->yellow->system->get("coreThemeLocation").$this->yellow->lookup->normaliseName($page->get("theme")).".png"; - $url = $this->yellow->lookup->normaliseUrl( - $this->yellow->system->get("coreServerScheme"), - $this->yellow->system->get("coreServerAddress"), - $this->yellow->system->get("coreServerBase"), $location); - } else { - $url = $this->yellow->lookup->normaliseUrl("", "", "", $name); - } - return array($url, $alt); - } -} diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini index 496886c..fa8e0e2 100755 --- a/system/extensions/update-current.ini +++ b/system/extensions/update-current.ini @@ -85,16 +85,6 @@ Developer: Anna Svensson Tag: feature system/extensions/markdown.php: markdown.php, create, update -Extension: Meta -Version: 0.8.17 -Description: Meta data for humans and machines. -DocumentationUrl: https://github.com/annaesvensson/yellow-meta -DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/main/downloads/meta.zip -Published: 2023-05-19 00:58:40 -Developer: Anna Svensson -Tag: feature -system/extensions/meta.php: meta.php, create, update - Extension: Serve Version: 0.8.24 Description: Built-in web server.