use ABSOLUTE_URI_STUDIP as URL for core plugins and move assets, re #796

lib/classes/ModulesNotification.class.php

@@ -55,7 +55,8 @@ class ModulesNotification
                 $this->registered_notification_modules[$id]['icon'] = Icon::create('news');
             }
             if (!is_object($this->registered_notification_modules[$id]['icon'])) {
-                $this->registered_notification_modules[$id]['icon'] = Icon::create($this->registered_notification_modules[$id]['icon']);
+                $icon = $module->getPluginURL() . '/' . $this->registered_notification_modules[$id]['icon'];
+                $this->registered_notification_modules[$id]['icon'] = Icon::create($icon);
             }
         }
         $this->registered_notification_modules[-1] =

public/plugins_packages/core/Blubber/Blubber.class.php

@@ -14,6 +14,14 @@
  */
 class Blubber extends StudIPPlugin implements StandardPlugin
 {
+    /**
+     * Plugin URL for CorePlugins is ABSOLUTE_URI_STUDIP.
+     */
+    public function getPluginURL()
+    {
+        return $GLOBALS['ABSOLUTE_URI_STUDIP'];
+    }
+
     /**
      * Returns a navigation for the tab displayed in the course.
      * @param string $course_id of the course

public/plugins_packages/core/Forum/CoreForum.class.php

@@ -31,17 +31,11 @@ NotificationCenter::addObserver('ForumActivity', 'deleteEntry', 'ForumBeforeDele
 class CoreForum extends StudipPlugin implements ForumModule
 {
     /**
-     * This method dispatches all actions.
-     *
-     * @param string $unconsumed_path  part of the dispatch path that was not consumed
+     * Plugin URL for CorePlugins is ABSOLUTE_URI_STUDIP.
      */
-    public function perform($unconsumed_path)
+    public function getPluginURL()
     {
-        // Add JS and StyleSheet to header
-        $this->addScript('javascript/forum.js');
-        $this->addStylesheet('stylesheets/forum.scss');
-
-        parent::perform($unconsumed_path);
+        return $GLOBALS['ABSOLUTE_URI_STUDIP'];
     }
 
     /* interface method */

public/plugins_packages/core/Forum/controllers/forum_controller.php

@@ -46,13 +46,6 @@ class ForumController extends StudipController {
         PageLayout::setHelpKeyword('Basis.Forum');
         PageLayout::setTitle(Context::getHeaderLine() .' - '. _('Forum'));
 
-        $this->AVAILABLE_DESIGNS = ['web20', 'studip'];
-        if ($GLOBALS['CANONICAL_RELATIVE_PATH_STUDIP'] && $GLOBALS['CANONICAL_RELATIVE_PATH_STUDIP'] != '/') {
-            $this->picturepath = $GLOBALS['CANONICAL_RELATIVE_PATH_STUDIP'] .'/'. $this->dispatcher->trails_root . '/img';
-        } else {
-            $this->picturepath = '/'. $this->dispatcher->trails_root . '/img';
-        }
-
         // the default for displaying timestamps
         $this->time_format_string = "%a %d. %B %Y, %H:%M";
         $this->time_format_string_short = "%d.%m.%Y, %H:%M";

public/plugins_packages/core/Forum/views/area/add.php

 <tr data-area-id="<?= $entry['topic_id'] ?>" <?= (ForumPerm::has('sort_area', $seminar_id)) ? 'class="movable"' : '' ?>>
     <td class="icon">
     <? if (ForumPerm::has('sort_area', $seminar_id)) : ?>
-        <img src="<?= $picturepath ?>/anfasser_48.png" class="handle js">
+        <?= Assets::img('anfasser_48.png', ['class' => 'handle js']) ?>
     <? endif ?>
 
         <a href="<?= $controller->link_for("index/index/{$entry['topic_id']}#{$entry['topic_id']}") ?>">

public/plugins_packages/core/Forum/views/index/_post.php

@@ -195,12 +195,12 @@
 
                     <!-- Online-Status -->
                     <? $status = ForumHelpers::getOnlineStatus($post['user_id']) ?>
-                    <? if ($status == 'available') : ?>
-                        <img src="<?= $picturepath ?>/community.png" title="<?= _('Online') ?>">
-                    <? elseif ($status == 'away') : ?>
-                        <?= Icon::create('community', 'inactive', ['title' => _('Abwesend')])->asImg() ?>
-                    <? elseif ($status == 'offline') : ?>
-                        <?= Icon::create('community', 'info', ['title' => _('Offline')])->asImg() ?>
+                    <? if ($status === 'available') : ?>
+                        <?= Icon::create('community', Icon::ROLE_STATUS_GREEN, ['title' => _('Online')]) ?>
+                    <? elseif ($status === 'away') : ?>
+                        <?= Icon::create('community', Icon::ROLE_INACTIVE, ['title' => _('Abwesend')]) ?>
+                    <? elseif ($status === 'offline') : ?>
+                        <?= Icon::create('community', Icon::ROLE_INFO, ['title' => _('Offline')]) ?>
                     <? endif ?>
 
                     <a href="<?= URLHelper::getLink('dispatch.php/profile', ['username' => get_username($post['user_id'])])?>">

resources/assets/javascripts/init.js

@@ -29,6 +29,7 @@ import Files from './lib/files.js';
 import FilesDashboard from './lib/files_dashboard.js';
 import Folders from './lib/folders.js';
 import Forms from './lib/forms.js';
+import Forum from './lib/forum.js';
 import Fullscreen from './lib/fullscreen.js';
 import GlobalSearch from './lib/global_search.js';
 import HeaderMagic from './lib/header_magic.js';
@@ -114,6 +115,7 @@ window.STUDIP = _.assign(window.STUDIP || {}, {
     FilesDashboard,
     Folders,
     Forms,
+    Forum,
     Fullscreen,
     Gettext,
     GlobalSearch,

public/plugins_packages/core/Forum/javascript/forum.js → resources/assets/javascripts/lib/forum.js

-/*global window, $, jQuery, document, _ */
-/* ------------------------------------------------------------------------
- * the global STUDIP namespace
- * ------------------------------------------------------------------------ */
-var STUDIP = STUDIP || {};
-
-STUDIP.Forum = {
+const Forum = {
     confirmDialog: null,
     current_area_id: null,
     current_category_id: null,
@@ -890,3 +884,5 @@ jQuery.fn.serializeObject = function() {
     });
     return o;
 };
+
+export default Forum;

resources/assets/stylesheets/studip.scss

@@ -18,6 +18,7 @@
 @import "scss/courseware";
 @import "scss/dates";
 @import "scss/files";
+@import "scss/forum";
 @import "scss/fullscreen";
 @import "scss/progress_indicator.scss";
 @import "scss/my_courses";