Dev Implemented example for label editor.

LimeSurvey · Dec 17, 2015 · 8bb820f · 8bb820f
1 parent b00881b
commit 8bb820f
Show file tree

Hide file tree

Showing 60 changed files with 1,146 additions and 660 deletions.
diff --git a/composer.json b/composer.json
@@ -43,7 +43,8 @@
         "bower-asset/leaflet": "0.7.3",
         "bower-asset/jquery-ace": "1.*",
         "bower-asset/jquery": "2.*",
-        "zendframework/zend-xmlrpc": "^2.5@dev"
+        "zendframework/zend-xmlrpc": "^2.5@dev",
+        "bower-asset/handsontable": "^0.20.2"
     },
     "autoload" : {
         "classmap" : [

diff --git a/composer.lock b/composer.lock
diff --git a/protected/config/packages.php b/protected/config/packages.php
@@ -166,5 +166,19 @@
         'depends' => [
             'jquery'
         ]
+    ],
+    'handsontable' => [
+        'basePath' => 'bower.handsontable',
+        'js' => [
+            'dist/handsontable.full.min.js',
+            'plugins/jqueryHandsontable.js'
+        ],
+        'css' => [
+            'dist/handsontable.full.css',
+            'plugins/bootstrap/handsontable.bootstrap.css'
+        ],
+        'depends' => [
+            'jquery'
+        ]
     ]
 ];
diff --git a/protected/controllers/AdminController.php b/protected/controllers/AdminController.php
@@ -44,7 +44,7 @@ protected function _init()
             updateCheck();
 
         //unset(Yii::app()->session['FileManagerContext']);
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "admin_core.js");
+        App()->getClientScript()->registerScriptFile(App()->getPublicUrl() . "/scripts/admin/admin_core.js");
         $this->user_id = Yii::app()->user->getId();
         if (!Yii::app()->getConfig("surveyid")) {Yii::app()->setConfig("surveyid", returnGlobal('sid'));}         //SurveyID
         if (!Yii::app()->getConfig("ugid")) {Yii::app()->setConfig("ugid", returnGlobal('ugid'));}                //Usergroup-ID
@@ -400,7 +400,7 @@ public function _showadminmenu($surveyid = false)
         }
         $aData['surveyid'] = $surveyid;
         $aData['iconsize'] = Yii::app()->getConfig('adminthemeiconsize');
-        $aData['sImageURL'] = Yii::app()->getConfig('adminimageurl');
+        $aData['sImageURL'] = App()->theme->baseUrl. '/images';
         $this->renderPartial("/admin/super/adminmenu", $aData);
 
     }
@@ -416,6 +416,6 @@ public function _loadEndScripts()
 
         unset(Yii::app()->session['metaHeader']);
 
-        return $this->renderPartial('/admin/endScripts_view', []);
+//        return $this->renderPartial('/admin/endScripts_view', []);
     }
 }
diff --git a/protected/controllers/Controller.php b/protected/controllers/Controller.php
@@ -64,8 +64,8 @@ protected function _init()
             Yii::app()->setConfig("timeadjust",$timeadjust.' hours');
         }
 
-        Yii::app()->setConfig('adminimageurl', Yii::app()->getConfig('styleurl').Yii::app()->getConfig('admintheme').'/images/');
-        Yii::app()->setConfig('adminstyleurl', Yii::app()->getConfig('styleurl').Yii::app()->getConfig('admintheme').'/');
+        Yii::app()->setConfig('adminimageurl', App()->theme->baseUrl. '/images/');
+        Yii::app()->setConfig('adminstyleurl', App()->publicUrl . '/styles/gringegreen/');
     }
 
     /**

diff --git a/protected/controllers/FilesController.php b/protected/controllers/FilesController.php
@@ -79,6 +79,7 @@ protected function getRootForSurvey($surveyId) {
         return [
             'alias' => "ls\models\Survey ({$surveyId})",
             'driver' => 'LocalFileSystem',
+            'autoload' => true,
             'path'   => $dir,
             'URL' => App()->publicUrl . $relative,
             'icon' => "{$this->getAssetsUrl()}/img/volume_icon_local.png",
@@ -106,6 +107,7 @@ protected function getRootForTemplate($template) {
             $result[] = [
                 'alias' => "ls\models\Template ({$template})",
                 'driver' => 'LocalFileSystem',
+                'autoload' => true,
                 'path' => $dir,
                 'URL' => App()->baseUrl . $url,
                 'mimeMap' => [