Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v1.17] Update module resources path #39

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@

class Module extends ContentContainerModule
{
/**
* @inheritdoc
*/
public $resourcesPath = 'resources';

public static function onSpaceMenuInit($event)
{
/** @var Space $space */
Expand Down
23 changes: 9 additions & 14 deletions Assets.php → assets/Assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,21 @@
* @license https://www.humhub.com/licences
*/

namespace humhub\modules\notes;
namespace humhub\modules\notes\assets;

use yii\web\AssetBundle;

class Assets extends AssetBundle
{

/**
* @inheritdoc
*/
public $sourcePath = '@notes/resources';

/**
* @inheritdoc
*/
public $css = [
'notes.css',
];


public $publishOptions = [
'forceCopy' => true
];

public function init()
{
$this->sourcePath = dirname(__FILE__) . '/resources';
parent::init();
}

}
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

0.13.0 (Unreleased)
--------------------
- Fix #39: Update module resources path

0.12.1 (Unreleased)
--------------------
- Fix #38: Initialize module content class
Expand Down
4 changes: 2 additions & 2 deletions module.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"name": "Etherpad Notes",
"description": "Integrates the common Etherpad online editor in spaces.",
"keywords": ["etherpad", "notes"],
"version": "0.12.1",
"version": "0.13.0",
"humhub": {
"minVersion": "1.14"
"minVersion": "1.17"
},
"homepage": "https://github.com/humhub-contrib/notes",
"screenshots": ["resources/screen1.jpg", "resources/screen2.jpg"]
Expand Down
2 changes: 1 addition & 1 deletion widgets/views/entry.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

use humhub\modules\notes\Assets;
use humhub\modules\notes\assets\Assets;
use humhub\widgets\Button;
use yii\helpers\Html;

Expand Down