Add support for menu bars in Survey_Common_Action::_renderWrappedTemp…

…late(). Implement it in emailtemplates. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11796 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Dec 28, 2011 · 17c93af · 17c93af
1 parent f1890ba
commit 17c93af
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 16 deletions.
diff --git a/application/controllers/admin/assessments.php b/application/controllers/admin/assessments.php
@@ -181,6 +181,8 @@ function _renderWrappedTemplate($aViewUrls = array(), $aData = array())
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'assessments.js');
         $this->getController()->_js_admin_includes(Yii::app()->getConfig('generalscripts') . 'jquery/jquery.tablesorter.min.js');
 
+        $aData['display']['menu_bars'] = false;
+
         parent::_renderWrappedTemplate('', $aViewUrls, $aData);
     }
 

diff --git a/application/controllers/admin/authentication.php b/application/controllers/admin/authentication.php
@@ -398,6 +398,7 @@ private function _getAuthenticationFailedErrorMessage()
      */
     function _renderWrappedTemplate($aViewUrls = array(), $aData = array())
     {
+        $aData['display']['menu_bars'] = false;
         parent::_renderWrappedTemplate('authentication', $aViewUrls, $aData);
     }
 

diff --git a/application/controllers/admin/emailtemplates.php b/application/controllers/admin/emailtemplates.php
@@ -52,7 +52,7 @@ function edit($surveyid)
         $clang = $this->getController()->lang;
         $surveyid = sanitize_int($surveyid);
         $css_admin_includes[] = Yii::app()->getConfig('styleurl')."admin/default/superfish.css";
-        Yii::app()->setConfig("css_admin_includes", $css_admin_includes);       
+        Yii::app()->setConfig("css_admin_includes", $css_admin_includes);
 
         Yii::app()->loadHelper('admin.htmleditor');
         Yii::app()->loadHelper('surveytranslator');
@@ -75,16 +75,16 @@ function edit($surveyid)
         $data['bplangs'] = array();
         $data['defaulttexts'] = array();
         foreach ($grplangs as $key => $grouplang)
-        {            
+        {
             $data['bplangs'][$key] = new limesurvey_lang(array($grouplang));
             $data['attrib'][$key] = Surveys_languagesettings::model()->find('surveyls_survey_id = :ssid AND surveyls_language = :ls', array(':ssid' => $surveyid, ':ls' => $grouplang));
             $data['defaulttexts'][$key] = aTemplateDefaultTexts($data['bplangs'][$key]);
         }
         $data['clang'] = $clang;
         $data['surveyid'] = $surveyid;
         $data['ishtml'] = $ishtml;
-        $data['grplangs'] = $grplangs;  
-        $this->_renderHtml($data,$surveyid);
+        $data['grplangs'] = $grplangs;
+        $this->_renderWrappedTemplate('emailtemplates_view', $data);
     }
 
     /**
@@ -115,7 +115,7 @@ function update($surveyid, $action)
                         'email_admin_notification' => $_POST['email_admin_notification_'.$langname],
                         'email_admin_responses_subj' => $_POST['email_admin_responses_subj_'.$langname],
                         'email_admin_responses' => $_POST['email_admin_responses_'.$langname]
-                        );                
+                        );
                 $usquery = Surveys_languagesettings::model()->updateAll($attributes,'surveyls_survey_id = :ssid AND surveyls_language = :sl', array(':ssid' => $surveyid, ':sl' => $langname));
                 if ($usquery <= 0)
                     die("Error updating<br />".$usquery."<br /><br />");
@@ -126,19 +126,19 @@ function update($surveyid, $action)
     }
 
 
-    private function _renderHtml($data,$surveyid)
-    {
-        $clang = $this->getController()->lang;
+    /**
+     * Renders template(s) wrapped in header and footer
+     *
+     * @param string|array $aViewUrls View url(s)
+     * @param array $aData Data to be passed on. Optional.
+     */
+    function _renderWrappedTemplate($aViewUrls = array(), $aData = array())
+	{
+        $this->getController()->_js_admin_includes(Yii::app()->getConfig('adminscripts') . 'emailtemplates.js');
 
-        $this->controller->_getAdminHeader();
-        $this->controller->_showadminmenu($surveyid);
-        $this->_surveybar($surveyid);
-        $this->_surveysummary($surveyid, "editemailtemplates");
-        $this->_js_admin_includes(Yii::app()->baseUrl . '/scripts/admin/emailtemplates.js');
+        $aData['display']['menu_bars']['surveysummary'] = 'editemailtemplates';
 
-        $this->getController()->render('/admin/emailtemplates/emailtemplates_view', $data);
-        $this->getController()->_loadEndScripts();
-        $this->getController()->_getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"));
+        parent::_renderWrappedTemplate('emailtemplates', $aViewUrls, $aData);
     }
 
 }
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -73,6 +73,7 @@ public function run($sa = '')
     function _renderWrappedTemplate($aViewUrls = array(), $aData = array())
     {
         $aData['imageurl'] = Yii::app()->getConfig('imageurl');
+        $aData['display']['menu_bars'] = false;
         parent::_renderWrappedTemplate('token', $aViewUrls, $aData);
     }
 

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -53,6 +53,7 @@ protected function route($sa, array $get_vars)
      */
     function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $aData = array())
     {
+        // Gather the data
         $aData['clang'] = $clang = $this->getController()->lang;
         $aViewUrls = (array) $aViewUrls;
         $sViewPath = '/admin/';
@@ -62,8 +63,33 @@ function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $aData = ar
             $sViewPath .= $sAction . '/';
         }
 
+        // Header
         $this->getController()->_getAdminHeader();
 
+        // Menu bars
+        if (!isset($aData['display']['menu_bars']) || $aData['display']['menu_bars'] !== false)
+        {
+            $this->getController()->_showadminmenu(!empty($aData['surveyid']) ? $aData['surveyid'] : null);
+
+            if (!empty($aData['surveyid']))
+            {
+                $this->_surveybar($aData['surveyid'], !empty($aData['gid']) ? $aData['gid'] : null);
+
+                if (!empty($aData['display']['menu_bars']['surveysummary']))
+                {
+                    $this->_surveysummary($aData['surveyid'], $aData['display']['menu_bars']['surveysummary']);
+                }
+
+                if (!empty($aData['gid']))
+                {
+                    $this->_questiongroupbar($aData['surveyid'], $aData['gid'], !empty($aData['qid']) ? $aData['qid'] : null, $aData['display']['menu_bars']['gid_action']);
+                }
+            }
+        }
+
+        unset($aData['display']);
+
+        // Load views
         foreach ($aViewUrls as $sViewKey => $viewUrl)
         {
             if (empty($sViewKey) || is_numeric($sViewKey))
@@ -74,6 +100,7 @@ function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $aData = ar
             {
                 switch ($sViewKey)
                 {
+                    // Message
                     case 'message' :
                         if (empty($viewUrl['class']))
                         {
@@ -84,13 +111,16 @@ function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $aData = ar
                             $this->getController()->_showMessageBox($viewUrl['title'], $viewUrl['message'], $viewUrl['class']);
                         }
                         break;
+
+                     // Output
                     case 'output' :
                         echo $viewUrl;
                         break;
                 }
             }
         }
 
+        // Footer
         $this->getController()->_getAdminFooter('http://docs.limesurvey.org', $clang->gT('LimeSurvey online manual'));
     }