Merge pull request #336 from humhub/enh/159-rename-global-space-page-…

…snippet

Renaming page and snippet to global and space types

docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.10.5 (Unreleased)
+----------------------
+- Enh #336: Renaming page and snippet to global and space types
+
 1.10.4 (June 19, 2024)
 ----------------------
 - Fix #328: Missing Iframe attributes in snippet

models/CustomContentContainer.php

@@ -229,7 +229,9 @@ public function getContentName()
             return $target->contentName;
         }
 
-        return PageType::getContentName($this->getPageType());
+        $containerClass = $this instanceof ContainerPage || $this instanceof ContainerSnippet ? Space::class : null;
+
+        return PageType::getContentName($this->getPageType(), $containerClass);
     }
 
     private function getRulesByContentType()

models/PageType.php

@@ -1,33 +1,27 @@
 <?php
 
-
 namespace humhub\modules\custom_pages\models;
 
-
+use humhub\modules\content\components\ContentContainerActiveRecord;
+use humhub\modules\space\models\Space;
 use Yii;
 
 abstract class PageType
 {
-    const Page = 'page';
-    const Snippet = 'snippet';
-
-    public static function getLabel($type)
-    {
-        switch ($type) {
-            case static::Page:
-                return Yii::t('CustomPagesModule.models_Page', 'page');
-            case static::Snippet:
-                return Yii::t('CustomPagesModule.models_ContainerSnippet', 'snippet');
-        }
-    }
+    public const Page = 'page';
+    public const Snippet = 'snippet';
 
-    public static function getContentName($type)
+    public static function getContentName($type, ?string $containerClass = null)
     {
         switch ($type) {
             case static::Page:
-                return Yii::t('CustomPagesModule.models_Page', 'Page');
+                return $containerClass === Space::class
+                    ? Yii::t('CustomPagesModule.base', 'Space Page')
+                    : Yii::t('CustomPagesModule.base', 'Global Page');
             case static::Snippet:
-                return Yii::t('CustomPagesModule.models_ContainerSnippet', 'Snippet');
+                return $containerClass === Space::class
+                    ? Yii::t('CustomPagesModule.base', 'Space Widget')
+                    : Yii::t('CustomPagesModule.base', 'Global Widget');
         }
     }
-}
+}

module.json

@@ -3,7 +3,7 @@
     "name": "Custom Pages",
     "description": "Create custom pages and widgets and share them with your users. Take advantage of a wide range of editing options, including HTML and Markdown.",
     "keywords": ["pages", "custom", "iframe", "markdown", "link", "navigation", "spaces"],
-    "version": "1.10.4",
+    "version": "1.10.5",
     "homepage": "https://github.com/humhub/custom-pages",
     "humhub": {
         "minVersion": "1.14"