Refactor inline styles

humhub · Sep 12, 2024 · 7e07454 · 7e07454
1 parent 7a47431
commit 7e07454
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 47 deletions.
diff --git a/assets/Assets.php b/assets/Assets.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link https://www.humhub.org/
+ * @copyright Copyright (c) HumHub GmbH & Co. KG
+ * @license https://www.humhub.com/licences
+ */
 
 namespace humhub\modules\custom_pages\assets;
 
@@ -29,13 +34,10 @@ class Assets extends AssetBundle
             'custom-pages.css',
             'loader.gif',
             'module_image.png',
-        ]
+        ],
     ];
 
     public $css = [
-        'custom-pages.css'
+        'css/custom-pages.css',
     ];
-
-    public $js = [];
-
 }
diff --git a/assets/InlineStyleAssets.php b/assets/InlineStyleAssets.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @link https://www.humhub.org/
+ * @copyright Copyright (c) HumHub GmbH & Co. KG
+ * @license https://www.humhub.com/licences
+ */
+
+namespace humhub\modules\custom_pages\assets;
+
+use humhub\components\assets\AssetBundle;
+
+class InlineStyleAssets extends AssetBundle
+{
+    /**
+     * @inheritdoc
+     */
+    public $sourcePath = '@custom_pages/resources';
+
+    /**
+     * @inheritdoc
+     */
+    public $css = [
+        'css/inline.css',
+    ];
+}
diff --git a/resources/custom-pages.css → resources/css/custom-pages.css b/resources/custom-pages.css → resources/css/custom-pages.css
diff --git a/resources/css/inline.css b/resources/css/inline.css
@@ -0,0 +1,7 @@
+.custom-pages-page a, .panel .panel-body p a {
+    color: var(--link);
+}
+.custom-pages-page a:hover, .panel .panel-body p a:hover {
+    color: var(--link);
+    text-decoration: underline;
+}
diff --git a/views/container/markdown.php b/views/container/markdown.php
@@ -1,17 +1,25 @@
 <?php
+/**
+ * @link https://www.humhub.org/
+ * @copyright Copyright (c) HumHub GmbH & Co. KG
+ * @license https://www.humhub.com/licences
+ */
 
 use humhub\modules\content\widgets\richtext\RichText;
+use humhub\modules\custom_pages\assets\InlineStyleAssets;
+use humhub\modules\custom_pages\models\Page;
 use humhub\modules\custom_pages\modules\template\widgets\PageConfigurationButton;
-use humhub\modules\custom_pages\widgets\CustomPageInlineStyle;
+use humhub\modules\ui\view\components\View;
 use yii\helpers\Html;
 
-/** @var $page \humhub\modules\custom_pages\models\Page */
+/* @var $this View */
+/* @var $page Page */
+/* @var $md string */
 
 $cssClass = ($page->hasAttribute('cssClass') && !empty($page->cssClass)) ? $page->cssClass : 'custom-pages-page';
-?>
-
-<?= CustomPageInlineStyle::widget() ?>
 
+InlineStyleAssets::register($this);
+?>
 <?= PageConfigurationButton::widget() ?>
 <div class="panel panel-default <?= Html::encode($cssClass) ?>">
     <div class="panel-body">

diff --git a/views/global/html.php b/views/global/html.php
@@ -1,16 +1,23 @@
 <?php
+/**
+ * @link https://www.humhub.org/
+ * @copyright Copyright (c) HumHub GmbH & Co. KG
+ * @license https://www.humhub.com/licences
+ */
 
-use humhub\modules\custom_pages\widgets\CustomPageInlineStyle;
+use humhub\modules\custom_pages\assets\InlineStyleAssets;
+use humhub\modules\custom_pages\models\Page;
+use humhub\modules\ui\view\components\View;
 use yii\helpers\Html;
 
-/** @var $page \humhub\modules\custom_pages\models\Page */
-/** @var $html string */
+/* @var $this View */
+/* @var $page Page */
+/* @var $html string */
 
 $cssClass = ($page->hasAttribute('cssClass') && !empty($page->cssClass)) ? $page->cssClass : 'custom-pages-page';
-?>
-
-<?= CustomPageInlineStyle::widget() ?>
 
+InlineStyleAssets::register($this);
+?>
 <div class="container <?= Html::encode($cssClass) ?>">
     <div class="row">
         <div class="col-md-12">

diff --git a/views/global/markdown.php b/views/global/markdown.php
@@ -1,18 +1,24 @@
 <?php
+/**
+ * @link https://www.humhub.org/
+ * @copyright Copyright (c) HumHub GmbH & Co. KG
+ * @license https://www.humhub.com/licences
+ */
 
 use humhub\libs\Html;
 use humhub\modules\content\widgets\richtext\RichText;
+use humhub\modules\custom_pages\assets\InlineStyleAssets;
 use humhub\modules\custom_pages\models\Page;
 use humhub\modules\custom_pages\modules\template\widgets\PageConfigurationButton;
-use humhub\modules\custom_pages\widgets\CustomPageInlineStyle;
+use humhub\modules\ui\view\components\View;
 
+/* @var $this View */
 /* @var $page Page */
 
 $cssClass = ($page->hasAttribute('cssClass') && !empty($page->cssClass)) ? $page->cssClass : 'custom-pages-page';
-?>
-
-<?= CustomPageInlineStyle::widget() ?>
 
+InlineStyleAssets::register($this);
+?>
 <?php if ($page->hasTarget(Page::NAV_CLASS_ACCOUNTNAV)): ?>
     <div class="panel panel-default <?= Html::encode($cssClass) ?>">
         <div class="panel-body">

diff --git a/widgets/CustomPageInlineStyle.php b/widgets/CustomPageInlineStyle.php
diff --git a/widgets/views/inline-style.php b/widgets/views/inline-style.php