Dev: use getLayoutForScreen() in templates controller

LimeSurvey · Jun 23, 2017 · 9cd8627 · 9cd8627
1 parent 5e374e8
commit 9cd8627
Showing 1 changed file with 7 additions and 30 deletions.
diff --git a/application/controllers/admin/templates.php b/application/controllers/admin/templates.php
@@ -1029,13 +1029,11 @@ protected function _initialise($templatename, $screenname, $editfile, $showsumma
         $aGlobalReplacements       = array();
         $myoutput[]                = "";
 
-        $files = $oEditedTemplate->getValidScreenFiles("view", $screenname);
+        $files       = $oEditedTemplate->getValidScreenFiles("view", $screenname);
+        $sLayoutFile = $oEditedTemplate->getLayoutForScreen($screenname);
 
         switch ($screenname)
         {
-            case 'surveylist':
-                $myoutput          = Yii::app()->twigRenderer->renderTemplateForTemplateEditor("layout_survey_list.twig", array('aSurveyInfo'=>$thissurvey), $oEditedTemplate);
-                break;
 
             case 'question':
                 $aReplacements = array(
@@ -1085,16 +1083,10 @@ protected function _initialise($templatename, $screenname, $editfile, $showsumma
                 // This is just to prevent getAllClasses to retreive .ls-hidden CSS class
                 $thissurvey['aGroups'][1]["aQuestions"][1]['templateeditor'] = true;
                 $thissurvey['aGroups'][1]["aQuestions"][2]['templateeditor'] = true;
-
-                $myoutput = Yii::app()->twigRenderer->renderTemplateForTemplateEditor("layout_main.twig",array('aSurveyInfo'=>$thissurvey), $oEditedTemplate);
-
-                break;
-
-            case 'welcome':
-                $myoutput = Yii::app()->twigRenderer->renderTemplateForTemplateEditor("layout_first_page.twig",array('aSurveyInfo'=>$thissurvey), $oEditedTemplate);
                 break;
 
             case 'register':
+                $sLayoutFile = ""; // TODO
                 $myoutput[] = templatereplace(file_get_contents("$templatedir/startpage.pstpl"), array(), $aData, 'Unspecified', false, NULL, array(), false, $oEditedTemplate);
 
                 $aData = array(
@@ -1116,24 +1108,10 @@ protected function _initialise($templatename, $screenname, $editfile, $showsumma
                 $myoutput[] = "\n";
                 break;
 
-            case 'save':
-                $myoutput = Yii::app()->twigRenderer->renderTemplateForTemplateEditor("layout_save.twig",array('aSurveyInfo'=>$thissurvey), $oEditedTemplate);
-                break;
-
-            case 'load':
-                $myoutput = Yii::app()->twigRenderer->renderTemplateForTemplateEditor("layout_load.twig",array('aSurveyInfo'=>$thissurvey), $oEditedTemplate);
-                break;
-
-            case 'clearall':
-                $myoutput = Yii::app()->twigRenderer->renderTemplateForTemplateEditor("layout_clearall.twig",array('aSurveyInfo'=>$thissurvey), $oEditedTemplate);
-                break;
-
             case 'completed':
                 $thissurvey['aCompleted']['showDefault'] = true;
                 $thissurvey['aCompleted']['aPrintAnswers']['show'] = true;
                 $thissurvey['aCompleted']['aPublicStatistics']['show'] = true;
-
-                $myoutput = Yii::app()->twigRenderer->renderTemplateForTemplateEditor("layout_submit.twig",array('aSurveyInfo'=>$thissurvey), $oEditedTemplate);
                 break;
 
             case 'assessments':
@@ -1146,11 +1124,10 @@ protected function _initialise($templatename, $screenname, $editfile, $showsumma
                 $thissurvey['aAssessments']["datas"]["subtotal"]["datas"][2]   = 3;
                 $thissurvey['aAssessments']["datas"]["subtotal_score"][1]      = 3;
                 $thissurvey['aAssessments']["datas"]["total_score"]            = 3;
-
-                $myoutput = Yii::app()->twigRenderer->renderTemplateForTemplateEditor("layout_submit.twig",array('aSurveyInfo'=>$thissurvey), $oEditedTemplate);
                 break;
 
             case 'printablesurvey':
+                $sLayoutFile = "TODO";
                 $aData['aReplacements'] = $aGlobalReplacements;
                 $questionoutput = array();
                 foreach (file("$templatedir/print_question.pstpl") as $op)
@@ -1191,6 +1168,7 @@ protected function _initialise($templatename, $screenname, $editfile, $showsumma
                 break;
 
             case 'printanswers':
+                $sLayoutFile = "TODO";
                 $myoutput[] = templatereplace(file_get_contents("$templatedir/startpage.pstpl"), array(), $aData, 'Unspecified', false, NULL, array(), false, $oEditedTemplate);
                 $myoutput[] = templatereplace(file_get_contents("$templatedir/printanswers.pstpl"), array('ANSWERTABLE' => $printoutput), $aData, 'Unspecified', false, NULL, array(), false, $oEditedTemplate);
                 $myoutput[] = templatereplace(file_get_contents("$templatedir/endpage.pstpl"), array(), $aData, 'Unspecified', false, NULL, array(), false, $oEditedTemplate);
@@ -1201,12 +1179,11 @@ protected function _initialise($templatename, $screenname, $editfile, $showsumma
             case 'error':
                 $thissurvey['aError']['title'] = gT("Error");
                 $thissurvey['aError']['message'] = gT("This is an error message example");
-
-
-                $myoutput = Yii::app()->twigRenderer->renderTemplateForTemplateEditor("layout_errors.twig",array('aSurveyInfo'=>$thissurvey), $oEditedTemplate);
                 break;
         }
 
+        $myoutput = Yii::app()->twigRenderer->renderTemplateForTemplateEditor( $sLayoutFile,array('aSurveyInfo'=>$thissurvey), $oEditedTemplate);
+
         $jsfiles =  $oEditedTemplate->getValidScreenFiles("js");
         $aCssAndJsfiles = array_merge($cssfiles,$jsfiles ) ;