Scene widgets

* Scene widgets (early preview)

Author: sergejey

js/scripts.js

@@ -53,7 +53,7 @@ function simple_hash(s) {
 
 function inIframe () {
     try {
-        return window.self !== window.top;
+        return (window.location !== window.parent.location);
     } catch (e) {
         return true;
     }

languages/default.php

@@ -1406,6 +1406,8 @@
     'THEME_LIGHT' => 'Light',
     'DATA_SOURCE' => 'Data source',
     'WIDGET' => 'Widget',
+    'WIDGETS' => 'Widgets',
+    'ADD_WIDGET' => 'Add widget',
     'PANE' => 'Pane',
     'COLUMNS' => 'Columns',
     'SIZE' => 'Size',

lib/module.class.php

@@ -582,23 +582,25 @@ public function getSubModules()
     public function redirect($url)
     {
         global $session;
-        global $db;
 
-        $url = $this->makeRealURL($url);
+        $new_url = $this->makeRealURL($url);
+        if (isset($this->owner) && $this->owner->name=='panel' && preg_match('/nf\.php/',$new_url)) {
+            $new_url = str_replace('nf.php','admin.php',$new_url);
+        }
 
         $session->save();
 
         if ($_GET['part_load']) {
             $res = array();
             $res['CONTENT'] = '';
             $res['NEED_RELOAD'] = 1;
-            $res['REDIRECT'] = $url;
+            $res['REDIRECT'] = $new_url;
             echo json_encode($res);
             exit;
         }
 
         if (!headers_sent()) {
-            header("Location: $url\n\n");
+            header("Location: $new_url\n\n");
         } else {
             print "Headers already sent in $filename on line $linenum<br>\n" . "Cannot redirect instead\n";
         }
@@ -711,7 +713,6 @@ public function parseLinks($result)
             global $PHP_SELF;
             $_SERVER['PHP_SELF'] = $PHP_SELF;
         }
-
         $param_str = '';
 
         if ($md != $this->name) {