Dev: added more menuitems to the sidemenu.

The previous Survey properties menu is fully implemented into the new survey edit sidebar.

application/controllers/admin/expressions.php

@@ -49,16 +49,18 @@ function index()
                 $aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
                 if(Yii::app()->request->getQuery('gid')!='')
                 {
-                    $aData['questiongroupbar']['closebutton']['url'] = 'admin/questiongroups/sa/view/surveyid/'.$aData['surveyid'].'/gid/'.sanitize_int(Yii::app()->request->getQuery('gid'));
+                    $aData['questiongroupbar']['closebutton']['url'] = $this->getController()->createUrl('admin/questiongroups/sa/view/',['surveyid'=> $surveyid, 'gid'=> sanitize_int(Yii::app()->request->getQuery('gid'))]);
                 }
                 else
                 {
-                    $aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/view/surveyid/'.$aData['surveyid'];
+                    $aData['surveybar']['closebutton']['url'] =  $this->getController()->createUrl('/admin/survey/sa/view/',['surveyid'=> $surveyid]);
                 }
 
                 if(Yii::app()->request->getQuery('qid')!='')
                    {
-                    $aData['questiongroupbar']['closebutton']['url'] = 'admin/questions/sa/view/surveyid/'.$aData['surveyid'].'/gid/'.sanitize_int(Yii::app()->request->getQuery('gid')).'/qid/'.sanitize_int(Yii::app()->request->getQuery('qid'));
+                    $aData['questiongroupbar']['closebutton']['url'] = $this->getController()->createUrl(
+                        'admin/questiongroups/sa/view/',
+                        ['surveyid'=> $surveyid, 'gid'=> sanitize_int(Yii::app()->request->getQuery('gid')), 'qid'=> sanitize_int(Yii::app()->request->getQuery('qid'))]);
                     $aData['gid'] = sanitize_int(Yii::app()->request->getQuery('gid'));
                 }
             }

application/controllers/admin/surveyadmin.php

@@ -492,27 +492,7 @@ public function getAjaxMenuArray($surveyid){
         $survey    = Survey::model()->findByPk($iSurveyID);
         $baselang  = $survey->language;
         $menus = $survey->getSurveyMenus(); 
-        $propArray = array(
-                    'menuEntries' => [
-                        [
-                            'active' => false,
-                            'icon' => 'fa fa-list',
-                            'name' => gT('Overview'),
-                            'link' => $this->getController()->createUrl("admin/survey/sa/view", ['surveyid' => $surveyid])
-                        ],
-                        [
-                            'active' => false,
-                            'icon' => 'fa fa-cogs',
-                            'name' => gT('General Settings'),
-                            'link' => $this->getController()->createUrl("admin/survey/sa/surveygeneralsettings",['surveyid' => $surveyid])
-                        ],
-                        [
-                            'active' => false,
-                            'icon' => 'fa fa-language',
-                            'name' => gT('Language'),
-                            'link' => $this->getController()->createUrl("admin/survey/sa/editlanguagesettings",['surveyid' => $surveyid])
-                        ],
-                    ]);
+
         return Yii::app()->getController()->renderPartial(
             '/admin/super/_renderJson',
             array(
@@ -521,16 +501,7 @@ public function getAjaxMenuArray($surveyid){
                     'settings' => array(
                         'extrasettings' => false,
                         'parseHTML' => false,
-                    ),
-                    // 'debug' => [
-                    //     $iSurveyID,
-                    //     $survey,
-                    //     $baselang,
-                    //     $setting_entry,
-                    //     $lastquestion,
-                    //     $setting_entry,
-                    //     $lastquestiongroup
-                    // ]
+                    )
                 ]
             ),
             false,
@@ -1925,7 +1896,6 @@ private function _registerScriptFiles()
         App()->getClientScript()->registerPackage('jquery-json');
         App()->clientScript->registerPackage('bootstrap-switch');
         App()->getClientScript()->registerPackage('jquery-datatable');
-        App()->clientScript->defaultScriptFilePosition=CClientScript::POS_END;
         App()->clientScript->registerPackage('adminpanel');
 
     }

application/models/Survey.php

@@ -541,30 +541,23 @@ private function _getDefaultSurveyMenu(){
         $oDefaultMenu = Surveymenu::model()->findByPk(1);
         //Posibility to add more languages to the database is given, so it is possible to add a call by language
         //Also for peripheral menues we may add submenus someday.
+
+        $entries = [];
         $defaultMenuEntries = $oDefaultMenu->surveymenuEntries;
+        foreach($defaultMenuEntries as $menuEntry){
+            $aEntry = $menuEntry->attributes;
+            $aEntry['link'] = $aEntry['menu_link'] 
+                        ?  App()->getController()->createUrl($aEntry['menu_link'],['surveyid' => $this->sid])
+                        : App()->getController()->createUrl("admin/survey/sa/rendersidemenulink",['surveyid' => $this->sid, 'subaction' => $aEntry['name'] ]);
+            $entries[] = $aEntry;
+        }  
+
         $aResult = [
             "title" => $oDefaultMenu->title,
             "description" => $oDefaultMenu->description,
-            "entries" => [
-                [
-                    'id'=> "0",
-                    'link'=> App()->getController()->createUrl("admin/survey/sa/view",['surveyid' => $this->sid]),
-                    'menu_class'=> "",
-                    'menu_description'=> "Survey overwiew",
-                    'menu_icon'=> "list",
-                    'menu_icon_type'=> "fontawesome",
-                    'menu_id'=> "1",
-                    'menu_title'=> "Overview",
-                    'name'=> "overview",
-                    'title'=> "General overview",
-                ]
-            ]
+            "entries" => $entries
         ];
-        foreach($defaultMenuEntries as $menuEntry){
-            $aEntry = $menuEntry->attributes;
-            $aEntry['link'] = App()->getController()->createUrl("admin/survey/sa/rendersidemenulink",['surveyid' => $this->sid, 'subaction' => $aEntry['name'] ]);
-            $aResult["entries"][] = $aEntry;
-        }  
+
         return $aResult;
     }   
 

application/models/SurveymenuEntries.php

@@ -13,6 +13,7 @@
  * @property string $menu_description
  * @property string $menu_icon
  * @property string $menu_class
+ * @property string $menu_link
  * @property string $action
  * @property string $template
  * @property string $partial
@@ -50,11 +51,11 @@ public function rules()
 		return array(
 			array('changed_at', 'required'),
 			array('menu_id, priority, changed_by, created_by', 'numerical', 'integerOnly'=>true),
-			array('title, menu_title, menu_icon, menu_class, action, template, partial, permission, permissionGrade, classes, getdatamethod', 'length', 'max'=>255),
+			array('title, menu_title, menu_icon, menu_class, menu_link, action, template, partial, permission, permissionGrade, classes, getdatamethod', 'length', 'max'=>255),
 			array('description, menu_description, language, data, created_at', 'safe'),
 			// The following rule is used by search().
 			// @todo Please remove those attributes that should not be searched.
-			array('id, menu_id, priority, title, description, menu_title, menu_description, menu_icon, menu_class, action, template, partial, language, permission, permissionGrade, classes, data, getdatamethod, changed_at, changed_by, created_at, created_by', 'safe', 'on'=>'search'),
+			array('id, menu_id, priority, title, description, menu_title, menu_description, menu_icon, menu_class, menu_link, action, template, partial, language, permission, permissionGrade, classes, data, getdatamethod, changed_at, changed_by, created_at, created_by', 'safe', 'on'=>'search'),
 		);
 	}
 
@@ -85,6 +86,7 @@ public function attributeLabels()
 			'menu_description' => 'Menu Description',
 			'menu_icon' => 'Menu Icon',
 			'menu_class' => 'Menu Class',
+			'menu_link' => 'Menu link',
 			'action' => 'Action',
 			'template' => 'Template',
 			'partial' => 'Partial',
@@ -128,6 +130,7 @@ public function search()
 		$criteria->compare('menu_description',$this->menu_description,true);
 		$criteria->compare('menu_icon',$this->menu_icon,true);
 		$criteria->compare('menu_class',$this->menu_class,true);
+		$criteria->compare('menu_link',$this->menu_link,true);
 		$criteria->compare('action',$this->action,true);
 		$criteria->compare('template',$this->template,true);
 		$criteria->compare('partial',$this->partial,true);

application/views/admin/super/sidebody.php

@@ -1,3 +1,3 @@
-<div class='side-body <?php echo getSideBodyClass($sideMenuOpen); ?>'>
+<div id="vue-side-body-app" class='side-body <?php echo getSideBodyClass($sideMenuOpen); ?>'>
     <?php echo $content; ?>
 </div>