Merge pull request #24 from GreenMeteor/dev

Merge dev & master
GreenMeteor · Aug 30, 2018 · 68bf47a · 68bf47a
2 parents 96094eb + 214eed5
commit 68bf47a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/assets/Assets.php → Assets.php b/assets/Assets.php → Assets.php
@@ -14,7 +14,7 @@ class Assets extends AssetBundle
 
     public function init()
     {
-        $this->sourcePath = dirname(__FILE__) . '/../resources';
+        $this->sourcePath = dirname(__FILE__) . '/resources';
         parent::init();
     }
 }
diff --git a/Module.php b/Module.php
@@ -4,11 +4,12 @@
 
 use Yii;
 use yii\helpers\Url;
-use humhub\components\Module;
 
-class Module extends Module
+class Module extends \humhub\components\Module
 {
 
+    public $resourcesPath = 'resources';
+
     /**
      * @inheritdoc
      */

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## [HumHub](https://www.humhub.org/en) Discord Module
 
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/GreenMeteor/humhub-discordapp-module/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/GreenMeteor/humhub-discordapp-module/?branch=master) [![Build Status](https://scrutinizer-ci.com/g/GreenMeteor/humhub-discordapp-module/badges/build.png?b=master)](https://scrutinizer-ci.com/g/GreenMeteor/humhub-discordapp-module/build-status/master) [![CLA assistant](https://cla-assistant.io/readme/badge/GreenMeteor/humhub-discordapp-module)](https://cla-assistant.io/GreenMeteor/humhub-discordapp-module)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/GreenMeteor/humhub-discordapp-module/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/GreenMeteor/humhub-discordapp-module/?branch=master) [![CLA assistant](https://cla-assistant.io/readme/badge/GreenMeteor/humhub-discordapp-module)](https://cla-assistant.io/GreenMeteor/humhub-discordapp-module)
 
 Adds a sidebar widget to the Dashboard.
 

diff --git a/docs/CHANGELOGS.md b/docs/CHANGELOGS.md
@@ -1,7 +1,10 @@
 # Changelogs
 
 ### Discord App Module v1.2.6 [Stable] (TBA)
+- Chg: className() to class
 - Chg: Class cleaning
+- Chg: Moved images to resources
+- Chg: Update to coding standards
 
 ### Discord App Module v1.2.5 [Stable] (Aug 8, 2018)
 - Chg: Object class to BaseObject class

diff --git a/widgets/DiscordappFrame.php b/widgets/DiscordappFrame.php
@@ -3,9 +3,7 @@
 namespace humhub\modules\discordapp\widgets;
 
 use Yii;
-use yii\helpers\Url;
-use humhub\libs\Html;
-use humhub\components\Widget;
+use yii\base\Widget;
 
 /**
  *

diff --git a/widgets/views/discordappframe.php b/widgets/views/discordappframe.php
@@ -1,11 +1,9 @@
 <?php
 
-use yii\helpers\Url;
 use humhub\libs\Html;
-use humhub\models\Setting;
 use humhub\widgets\PanelMenu;
 
-\humhub\modules\discordapp\assets\Assets::register($this);
+\humhub\modules\discordapp\Assets::register($this);
 ?>
 
 <div class="panel panel-default panel-discordapp" id="panel-discordapp">