DEV: added second layoutfile for question editor page /survey admin page

LimeSurvey · Jun 2, 2020 · 1feaa12 · 1feaa12
1 parent 1e5dc67
commit 1feaa12
Show file tree

Hide file tree

Showing 9 changed files with 600 additions and 5 deletions.
diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -402,6 +402,9 @@ private function _notifications()
     }
 
     /**
+     *
+     * REFACTORED in LayoutHelper
+     *
      * Survey summary
      * @param array $aData
      */
@@ -509,6 +512,12 @@ public function _showadminmenu($aData)
         return null;
     }
 
+    /**
+     * REFACTORED in LayoutHelper.php
+     *
+     * @param $aData
+     * @throws CException
+     */
     private function _titlebar($aData)
     {
         if (isset($aData['title_bar'])) {
@@ -519,6 +528,8 @@ private function _titlebar($aData)
     /**
      * Render the save/cancel bar for Organize question groups/questions
      *
+     * REFACTORED in LayoutHelper
+     *
      * @param array $aData
      *
      * @since 2014-09-30
@@ -537,6 +548,12 @@ private function _organizequestionbar($aData)
         }
     }
 
+    /**
+     * REFACTORED in LayoutHelper
+     *
+     * @param $aData
+     * @throws CException
+     */
     public function _generaltopbar($aData) {
         $aData['topBar'] = isset($aData['topBar']) ? $aData['topBar'] : [];
         $aData['topBar'] = array_merge(
@@ -553,6 +570,7 @@ public function _generaltopbar($aData) {
         Yii::app()->getClientScript()->registerPackage('admintoppanel');     
         $this->getController()->renderPartial("/admin/survey/topbar/topbar_view", $aData);
     }
+
     public function _generaltopbarAdditions($aData) {
         $aData['topBar'] = isset($aData['topBar']) ? $aData['topBar'] : [];
         $aData['topBar'] = array_merge(
@@ -877,6 +895,9 @@ function _surveybar($aData)
 
     /**
      * Show side menu for survey view
+     *
+     * REFACTORED in LayoutHelper.php
+     *
      * @param array $aData all the needed data
      */
     private function _surveysidemenu($aData)
@@ -981,6 +1002,8 @@ protected function beforeSideMenuRender(array $aData)
     }
 
     /**
+     * REFACTORED in LayoutHelper
+     *
      * listquestion groups
      * @param array $aData
      */
@@ -992,6 +1015,8 @@ private function _listquestiongroups(array $aData)
     }
 
     /**
+     * REFACTORED in LayoutHelper
+     *
      * @param $aData
      * @throws CException
      */
@@ -1031,6 +1056,8 @@ private function _listquestions($aData)
     }
 
     /**
+     * REFACTORED in LayoutHelper
+     *
      * Show survey summary
      * @param array $aData
      */