Merge pull request #2481 from githubjeka/global-modal

Fix todo in Global modal

protected/humhub/docs/CHANGELOG.md

@@ -11,6 +11,7 @@ HumHub Change Log
 - Fix #2219: Overlapping summary mail content
 - Fix: Wall entry layout link/text overflow
 - Fix: Stream - Do not surpress if only particual contents are displayed
+- Fix: GlobalModal extends base Modal widget and GlobalModal::$backdrop is false by default (githubjeka)
 
 1.2.0-beta.4 (March 28, 2017)
 --------------------------------

protected/humhub/widgets/GlobalModal.php

@@ -16,15 +16,17 @@ namespace humhub\widgets;
  * @author Luke
  * @since 1.1
  */
-class GlobalModal extends \yii\base\Widget
+class GlobalModal extends Modal
 {
+    /**
+     * @var string this id need to js scripts
+     */
+    public $id = 'globalModal';
 
     /**
      * @inheritdoc
+     * It's false because it's often used for serious work, for example html forms,
+     * accidental closing of which can lead to loss of user data.
      */
-    public function run()
-    {
-        return $this->render('globalModal');
-    }
-
+    public $backdrop = false;
 }

protected/humhub/widgets/views/globalModal.php

@@ -1,10 +0,0 @@
-<?php //Todo: use base Modal widget ?>
-<div class="modal" id="globalModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-body">
-                <?= \humhub\widgets\LoaderWidget::widget(); ?>
-            </div>
-        </div>
-    </div>
-</div>