diff --git a/application/controllers/admin/assessments.php b/application/controllers/admin/assessments.php index 1cfc6316b4e..73f92d6ee0b 100644 --- a/application/controllers/admin/assessments.php +++ b/application/controllers/admin/assessments.php @@ -72,7 +72,7 @@ public function index($iSurveyID) */ protected function _renderWrappedTemplate($sAction = 'assessments', $aViewUrls = array(), $aData = array()) { - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $iSurveyID=$aData['surveyid']; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; // TODO: Hide this, because submitting first form on the page means diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php index dcdeeb7426d..2f955aa1a66 100644 --- a/application/controllers/admin/conditionsaction.php +++ b/application/controllers/admin/conditionsaction.php @@ -30,7 +30,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null) Yii::app()->loadHelper("database"); - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; $aData['questionbar']['closebutton']['url'] = 'admin/questions/sa/view/surveyid/'.$iSurveyID.'/gid/'.$gid.'/qid/'.$qid; diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php index 52c309e2cb9..f2b535fd2d4 100644 --- a/application/controllers/admin/dataentry.php +++ b/application/controllers/admin/dataentry.php @@ -75,7 +75,7 @@ function vvimport() $aData['display']['menu_bars']['browse'] = gT("Data entry"); $aData['title_bar']['title'] = gT("Data entry"); - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData['menu']['edition'] = true; $aData['menu']['import'] = true; $aData['menu']['close'] = true; @@ -300,7 +300,7 @@ public function import($surveyid) $aData["surveyinfo"] = $surveyinfo; $aData['title_bar']['title'] = gT('Browse responses').': '.$surveyinfo['surveyls_title']; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData['menu']['edition'] = true; $aData['menu']['import'] = true; $aData['menu']['close'] = true; @@ -1346,7 +1346,7 @@ public function editdata($subaction, $id, $surveyid, $language='') $aDataentryoutput .= "\n"; $aViewUrls['output'] = $aDataentryoutput; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData['menu']['edition'] = true; $aData['menu']['save'] = true; $aData['menu']['close'] = true; @@ -1385,7 +1385,7 @@ public function delete() Yii::app()->loadHelper('database'); $delresult = dbExecuteAssoc($delquery) or safeDie ("Couldn't delete record $id
\n"); - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData['menu']['edition'] = true; $aData['menu']['close'] = true; @@ -1900,7 +1900,7 @@ public function insert() $aData['dataentrymsgs'] = $aDataentrymsgs; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $this->_renderWrappedTemplate('dataentry', 'insert', $aData); } @@ -2339,7 +2339,7 @@ public function view($surveyid, $lang=NULL) $aViewUrls[] = 'active_html_view'; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData['menu']['edition'] = true; $aData['menu']['save'] = true; $aData['menu']['close'] = true; diff --git a/application/controllers/admin/emailtemplates.php b/application/controllers/admin/emailtemplates.php index 813ab4dcb2b..dffd01ba6d4 100644 --- a/application/controllers/admin/emailtemplates.php +++ b/application/controllers/admin/emailtemplates.php @@ -69,7 +69,7 @@ function index($iSurveyId) $aData['defaulttexts'][$key] = templateDefaultTexts($aData['bplangs'][$key],$sEscapeMode); } - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php index 2d2c8785650..9b2ccb39187 100644 --- a/application/controllers/admin/export.php +++ b/application/controllers/admin/export.php @@ -674,7 +674,7 @@ public function vvexport() $aData["surveyinfo"] = $surveyinfo; $aData['title_bar']['title'] = gT('Browse responses').': '.$surveyinfo['surveyls_title']; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData['menu']['edition'] = true; $aData['menu']['export'] = true; $aData['menu']['close'] = true; diff --git a/application/controllers/admin/expressions.php b/application/controllers/admin/expressions.php index 6c7aa4553c6..1db0d1e6f25 100644 --- a/application/controllers/admin/expressions.php +++ b/application/controllers/admin/expressions.php @@ -43,7 +43,7 @@ function index() if(isset($iSurveyID)) { - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; if(Yii::app()->request->getQuery('gid')!='') diff --git a/application/controllers/admin/questiongroups.php b/application/controllers/admin/questiongroups.php index b1b3c042071..b16f49de784 100644 --- a/application/controllers/admin/questiongroups.php +++ b/application/controllers/admin/questiongroups.php @@ -85,7 +85,7 @@ function import() $aData['aImportResults'] = $aImportResults; $aData['sExtension'] = $sExtension; //$aData['display']['menu_bars']['surveysummary'] = 'importgroup'; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; @@ -106,7 +106,7 @@ function importView($surveyid) $aData['action'] = $aData['display']['menu_bars']['gid_action'] = 'addgroup'; $aData['display']['menu_bars']['surveysummary'] = 'addgroup'; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData['sidemenu']['questiongroups'] = true; $aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/listquestiongroups/surveyid/'.$surveyid; @@ -155,7 +155,7 @@ function add($surveyid) $aData['grplangs'] = $grplangs; $aData['baselang'] = $baselang; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; $aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/listquestiongroups/surveyid/'.$surveyid; @@ -429,7 +429,7 @@ public function edit($surveyid, $gid) $aData['tabtitles'] = $aTabTitles; $aData['aBaseLanguage'] = $aBaseLanguage; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; diff --git a/application/controllers/admin/quotas.php b/application/controllers/admin/quotas.php index 2167cd2ed63..a6a7463cbfb 100644 --- a/application/controllers/admin/quotas.php +++ b/application/controllers/admin/quotas.php @@ -93,7 +93,7 @@ function index($iSurveyId, $quickreport = false) $aData['surveyid'] = $iSurveyID = $surveyid = sanitize_int($iSurveyId); - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; @@ -383,7 +383,7 @@ function editquota($iSurveyId) $aViewUrls[] = 'editquota_view'; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; @@ -444,7 +444,7 @@ function new_answer($iSurveyId, $sSubAction = 'new_answer') $aViewUrls[] = 'newanswertwo_view'; } - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; $aData['surveybar']['savebutton']['form'] = 'frmeditgroup'; @@ -463,7 +463,7 @@ function newquota($iSurveyId) $aData['langs'] = $aData['aLangs']; $aData['baselang'] = $aData['sBaseLang']; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; $aData['surveybar']['savebutton']['form'] = 'frmeditgroup'; diff --git a/application/controllers/admin/responses.php b/application/controllers/admin/responses.php index 1d4e7eaaa6b..044a174300b 100644 --- a/application/controllers/admin/responses.php +++ b/application/controllers/admin/responses.php @@ -289,7 +289,7 @@ public function view($iSurveyID, $iId, $sBrowseLang = '') } $aViewUrls[] = 'browseidfooter_view'; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData['menu']['edition'] = true; $aData['menu']['view'] = true; $aData['menu']['close'] = true; diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php index 307dafb99d7..d0ec1951575 100644 --- a/application/controllers/admin/statistics.php +++ b/application/controllers/admin/statistics.php @@ -743,7 +743,7 @@ protected function _renderWrappedTemplate($sAction = 'export', $aViewUrls = arra $aData['menu']['edition'] = true; $aData['menu']['stats'] = true; $aData['menu']['close'] = true; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $iSurveyId = $aData['surveyid']; $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; $aData["surveyinfo"] = $surveyinfo; diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php index aa4a49f1dd0..993d215fed6 100644 --- a/application/controllers/admin/surveyadmin.php +++ b/application/controllers/admin/surveyadmin.php @@ -209,7 +209,7 @@ function editsurveysettings($iSurveyID) $tempData = $aData; $aData['data'] = $tempData; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; @@ -612,7 +612,7 @@ public function activate($iSurveyID) $iSurveyID = (int) $iSurveyID; $aData = array(); - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData['aSurveysettings'] = getSurveyInfo($iSurveyID); $aData['surveyid'] = $iSurveyID; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; @@ -921,10 +921,10 @@ public function delete($iSurveyID) { $aData = $aViewUrls = array(); $aData['surveyid'] = $iSurveyID = (int) $iSurveyID; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; if (Permission::model()->hasSurveyPermission($iSurveyID, 'survey', 'delete')) @@ -1056,7 +1056,7 @@ public function editlocalsettings($iSurveyID) - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; diff --git a/application/controllers/admin/surveypermission.php b/application/controllers/admin/surveypermission.php index bc52f72085e..b30befc08e5 100644 --- a/application/controllers/admin/surveypermission.php +++ b/application/controllers/admin/surveypermission.php @@ -35,7 +35,7 @@ function index($surveyid) if(Permission::model()->hasSurveyPermission($surveyid,'surveysecurity','read')) { - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; //$aData['surveybar']['savebutton']['form'] = 'frmeditgroup'; @@ -208,7 +208,7 @@ function index($surveyid) } - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; @@ -327,7 +327,7 @@ function addusergroup($surveyid) $aViewUrls['output'] = $addsummary; } - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($surveyid)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyid.")"; @@ -412,7 +412,7 @@ function adduser($surveyid) $aViewUrls['output'] = $addsummary; } - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($surveyid)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyid.")"; //$aData['surveybar']['savebutton']['form'] = 'frmeditgroup'; @@ -550,7 +550,7 @@ function set($surveyid) $this->getController()->error('Access denied'); } - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($surveyid)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyid.")"; $aData['surveybar']['savebutton']['form'] = 'frmeditgroup'; @@ -620,7 +620,7 @@ function delete($surveyid) $aViewUrls['output'] = $addsummary; } - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($surveyid)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyid.")"; //$aData['surveybar']['savebutton']['form'] = 'frmeditgroup'; @@ -731,7 +731,7 @@ function surveyright($surveyid) { $this->getController()->error('Access denied'); } - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($surveyid)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyid.")"; diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php index df0bf0205c4..a08ddc0c83b 100644 --- a/application/controllers/admin/tokens.php +++ b/application/controllers/admin/tokens.php @@ -769,7 +769,7 @@ function addnew($iSurveyId) $aData['thissurvey'] = getSurveyInfo($iSurveyId); $aData['surveyid'] = $iSurveyId; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $this->_renderWrappedTemplate('token', array( 'addtokenpost'), $aData); } @@ -861,7 +861,7 @@ function edit($iSurveyId, $iTokenId) $token->$k = $v; $token->save(); - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $this->_renderWrappedTemplate('token', array( 'message' => array( 'title' => gT("Success"), 'message' => gT("The token entry was successfully updated.") . "

\n" @@ -870,7 +870,7 @@ function edit($iSurveyId, $iTokenId) } else { - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $this->_renderWrappedTemplate('token', array( 'message' => array( 'title' => gT("Failed"), 'message' => gT("There is already an entry with that exact token in the table. The same token cannot be used in multiple entries.") . "

\n" @@ -937,7 +937,7 @@ function addDummies($iSurveyId, $subaction = '') $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData["surveyinfo"] = $surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; $aData['sidemenu']["token_menu"]=TRUE; @@ -1093,7 +1093,7 @@ function managetokenattributes($iSurveyId) Yii::app()->loadHelper("surveytranslator"); $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData["surveyinfo"] = $surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; $aData['sidemenu']["token_menu"]=TRUE; @@ -1204,7 +1204,7 @@ function deletetokenattributes($iSurveyId) } elseif ($confirm!='confirm' && $sAttributeToDelete) { - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $this->_renderWrappedTemplate('token', array( 'message' => array( 'title' => sprintf(gT("Delete token attribute %s"),$sAttributeToDelete), 'message' => "

".gT("If you remove this attribute, you will lose all information.") . "

\n" @@ -1305,7 +1305,7 @@ function email($iSurveyId, $tokenids = null) } $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData["surveyinfo"] = $surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; $aData['sidemenu']["token_menu"]=TRUE; @@ -1640,7 +1640,7 @@ function email($iSurveyId, $tokenids = null) } else { - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $this->_renderWrappedTemplate('token', array( 'message' => array( 'title' => gT("Warning"), 'message' => gT("There were no eligible emails to send. This will be because none satisfied the criteria of:") @@ -1663,7 +1663,7 @@ function exportdialog($iSurveyId) $aData["surveyinfo"] = $surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; $aData['sidemenu']["token_menu"]=true; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData['token_bar']['exportbutton']['form']=true; $aData['token_bar']['closebutton']['url'] = 'admin/tokens/sa/index/surveyid/'.$iSurveyId; @@ -1782,7 +1782,7 @@ public function importldap($iSurveyId) $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData["surveyinfo"] = $surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; $aData['sidemenu']["token_menu"]=TRUE; @@ -2058,7 +2058,7 @@ function import($iSurveyId) $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData["surveyinfo"] = $surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; $aData['sidemenu']["token_menu"]=TRUE; @@ -2399,7 +2399,7 @@ function tokenify($iSurveyId) $aData['surveyid'] = $iSurveyId; $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData["surveyinfo"] = $surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; $aData['sidemenu']["token_menu"]=TRUE; @@ -2407,7 +2407,7 @@ function tokenify($iSurveyId) if (!Yii::app()->request->getParam('ok')) { - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $this->_renderWrappedTemplate('token', array( 'message' => array( 'title' => gT("Create tokens"), 'message' => gT("Clicking 'Yes' will generate tokens for all those in this token list that have not been issued one. Continue?") . "

\n" @@ -2470,7 +2470,7 @@ function kill($iSurveyId) $newtableDisplay = Yii::app()->db->tablePrefix . $newtable; if (!Yii::app()->request->getQuery('ok')) { - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $this->_renderWrappedTemplate('token', array( 'message' => array( 'title' => gT("Delete Tokens Table"), 'message' => gT("If you delete this table tokens will no longer be required to access this survey.") . "
" . gT("A backup of this table will be made if you proceed. Your system administrator will be able to access this table.") . "
\n" @@ -2489,7 +2489,7 @@ function kill($iSurveyId) //Remove any survey_links to the CPDB SurveyLink::model()->deleteLinksBySurvey($iSurveyId); - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $this->_renderWrappedTemplate('token', array( 'message' => array( 'title' => gT("Delete Tokens Table"), 'message' => '
' . gT("The tokens table has now been removed and tokens are no longer required to access this survey.") . "
" . gT("A backup of this table has been made and can be accessed by your system administrator.") . "
\n" @@ -2548,7 +2548,7 @@ function bouncesettings($iSurveyId) $aData['token_bar']['closebutton']['url'] = 'admin/tokens/sa/index/surveyid/'.$iSurveyId; $aData['token_bar']['savebutton']['form'] = true; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; @@ -2604,7 +2604,7 @@ function _handletokenform($iSurveyId, $subaction, $iTokenId="") $aData['dateformatdetails'] = getDateFormatData(Yii::app()->session['dateformat']); $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData["surveyinfo"] = $surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; $aData['sidemenu']["token_menu"]=TRUE; @@ -2635,7 +2635,7 @@ function _newtokentable($iSurveyId) if (Yii::app()->request->getPost('createtable') == "Y") // Update table, must be CRSF controlled { Token::createTable($iSurveyId); - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; LimeExpressionManager::SetDirtyFlag(); // LimeExpressionManager needs to know about the new token table $this->_renderWrappedTemplate('token', array('message' =>array( 'title' => gT("Token control"), @@ -2678,7 +2678,7 @@ function _newtokentable($iSurveyId) //Add any survey_links from the renamed table SurveyLink::model()->rebuildLinksFromTokenTable($iSurveyId); - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $this->_renderWrappedTemplate('token', array('message' => array( 'title' => gT("Import old tokens"), 'message' => gT("A token table has been created for this survey and the old tokens were imported.") . " (\"" . Yii::app()->db->tablePrefix . "tokens_$iSurveyId" . "\")

\n" @@ -2710,7 +2710,7 @@ function _newtokentable($iSurveyId) ///////////////////////////// $surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo; - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $aData["surveyinfo"] = $surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")"; $aData['sidemenu']["token_menu"]=TRUE; diff --git a/application/controllers/admin/translate.php b/application/controllers/admin/translate.php index e60d4cd6ec0..87c5b43f93a 100644 --- a/application/controllers/admin/translate.php +++ b/application/controllers/admin/translate.php @@ -82,7 +82,7 @@ public function index() //var_dump(array_keys($aViewUrls));die(); } - $aData['sidemenu']['state'] = "close"; + $aData['sidemenu']['state'] = false; $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo; $aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")"; diff --git a/application/views/admin/super/sidemenu.php b/application/views/admin/super/sidemenu.php index ced16e1af74..17a9037b97b 100644 --- a/application/views/admin/super/sidemenu.php +++ b/application/views/admin/super/sidemenu.php @@ -10,6 +10,7 @@ active=='Y'; + $sidemenu = (isset($sidemenu))?$sidemenu:array(); ?>