Skip to content

Commit

Permalink
Dev : replaced sidebar variable by sidemenu for coherence
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisGac committed Jan 19, 2016
1 parent 04ff617 commit 5c2579f
Show file tree
Hide file tree
Showing 17 changed files with 847 additions and 851 deletions.
14 changes: 7 additions & 7 deletions application/controllers/admin/assessments.php
View file
Expand Up @@ -72,7 +72,7 @@ public function index($iSurveyID)
*/
protected function _renderWrappedTemplate($sAction = 'assessments', $aViewUrls = array(), $aData = array())
{
$aData['sidebar']['state'] = "close";
$aData['sidemenu']['state'] = "close";
$iSurveyID=$aData['surveyid'];
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
// TODO: Hide this, because submitting first form on the page means
Expand Down Expand Up @@ -111,16 +111,16 @@ private function _showAssessments($iSurveyID, $action)

Yii::app()->loadHelper('admin/htmleditor');

$urls['output'] = ' <div class="side-body">
<h3>'.gT("Assesments").'</h3>
$urls['output'] = ' <div class="side-body">
<h3>'.gT("Assesments").'</h3>
<div class="row">
<div class="col-lg-12 content-right">';
<div class="row">
<div class="col-lg-12 content-right">';
if ($surveyinfo['assessments']!='Y')
{
{

$urls['message'] = array('title' => gT("Assessments mode not activated"), 'message' => sprintf(gT("Assessment mode for this survey is not activated. You can activate it in the %s survey settings %s (tab 'Notification & data management')."),'<a href="'.$this->getController()->createUrl('admin/survey/sa/editlocalsettings/surveyid/'.$iSurveyID).'">','</a>'), 'class'=> 'warningheader');
}
}
$urls['assessments_view'][]= $aData;
$this->_renderWrappedTemplate('', $urls, $aData);
}
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/conditionsaction.php
View file
Expand Up @@ -30,7 +30,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
Yii::app()->loadHelper("database");


$aData['sidebar']['state'] = "close";
$aData['sidemenu']['state'] = "close";
$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;
Expand Down
38 changes: 19 additions & 19 deletions application/controllers/admin/dataentry.php
View file
Expand Up @@ -75,7 +75,7 @@ function vvimport()

$aData['display']['menu_bars']['browse'] = gT("Data entry");
$aData['title_bar']['title'] = gT("Data entry");
$aData['sidebar']['state'] = "close";
$aData['sidemenu']['state'] = "close";
$aData['menu']['edition'] = true;
$aData['menu']['import'] = true;
$aData['menu']['close'] = true;
Expand Down Expand Up @@ -259,20 +259,20 @@ public function import($surveyid)
$baseSchema = SurveyDynamic::model($iSurveyId)->getTableSchema();
$tables = App()->getApi()->getOldResponseTables($iSurveyId);
$compatible = array();
$coercible = array();
$coercible = array();
foreach ($tables as $table)
{
$schema = PluginDynamic::model($table)->getTableSchema();
if (PluginDynamic::model($table)->count() > 0)
{
if ($this->isCompatible($baseSchema, $schema))
{
$compatible[] = $table;
}
elseif ($this->isCompatible($baseSchema, $schema, false))
{
$coercible[] = $table;
}
if ($this->isCompatible($baseSchema, $schema))
{
$compatible[] = $table;
}
elseif ($this->isCompatible($baseSchema, $schema, false))
{
$coercible[] = $table;
}
}
}

Expand All @@ -282,9 +282,9 @@ public function import($surveyid)
'label' => gT('Source table'),
'type' => 'select',
'options' => array(
gT('Compatible') => $this->tableList($compatible),
gT('Compatible with type coercion') => $this->tableList($coercible)
)
gT('Compatible') => $this->tableList($compatible),
gT('Compatible with type coercion') => $this->tableList($coercible)
)
);


Expand All @@ -300,7 +300,7 @@ public function import($surveyid)
$aData["surveyinfo"] = $surveyinfo;
$aData['title_bar']['title'] = gT('Browse responses').': '.$surveyinfo['surveyls_title'];

$aData['sidebar']['state'] = "close";
$aData['sidemenu']['state'] = "close";
$aData['menu']['edition'] = true;
$aData['menu']['import'] = true;
$aData['menu']['close'] = true;
Expand Down Expand Up @@ -342,7 +342,7 @@ public function import($surveyid)
}
}
$imported = 0;
$sourceResponses = new CDataProviderIterator(new CActiveDataProvider($sourceTable), 500);
$sourceResponses = new CDataProviderIterator(new CActiveDataProvider($sourceTable), 500);
foreach ($sourceResponses as $sourceResponse)
{
$iOldID=$sourceResponse->id;
Expand Down Expand Up @@ -1346,7 +1346,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
$aDataentryoutput .= "</form>\n";

$aViewUrls['output'] = $aDataentryoutput;
$aData['sidebar']['state'] = "close";
$aData['sidemenu']['state'] = "close";
$aData['menu']['edition'] = true;
$aData['menu']['save'] = true;
$aData['menu']['close'] = true;
Expand Down Expand Up @@ -1385,7 +1385,7 @@ public function delete()
Yii::app()->loadHelper('database');
$delresult = dbExecuteAssoc($delquery) or safeDie ("Couldn't delete record $id<br />\n");

$aData['sidebar']['state'] = "close";
$aData['sidemenu']['state'] = "close";
$aData['menu']['edition'] = true;
$aData['menu']['close'] = true;

Expand Down Expand Up @@ -1900,7 +1900,7 @@ public function insert()

$aData['dataentrymsgs'] = $aDataentrymsgs;

$aData['sidebar']['state'] = "close";
$aData['sidemenu']['state'] = "close";

$this->_renderWrappedTemplate('dataentry', 'insert', $aData);
}
Expand Down Expand Up @@ -2339,7 +2339,7 @@ public function view($surveyid, $lang=NULL)

$aViewUrls[] = 'active_html_view';

$aData['sidebar']['state'] = "close";
$aData['sidemenu']['state'] = "close";
$aData['menu']['edition'] = true;
$aData['menu']['save'] = true;
$aData['menu']['close'] = true;
Expand Down
10 changes: 5 additions & 5 deletions application/controllers/admin/emailtemplates.php
View file
Expand Up @@ -69,12 +69,12 @@ function index($iSurveyId)
$aData['defaulttexts'][$key] = templateDefaultTexts($aData['bplangs'][$key],$sEscapeMode);
}

$aData['sidebar']['state'] = "close";
$surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")";
$aData['sidemenu']['state'] = "close";
$surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")";

$aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
$aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/view/surveyid/'.$iSurveyId;
$aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
$aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/view/surveyid/'.$iSurveyId;

$aData['surveyid'] = $iSurveyId;
$aData['ishtml'] = $ishtml;
Expand Down
8 changes: 4 additions & 4 deletions application/controllers/admin/export.php
View file
Expand Up @@ -248,7 +248,7 @@ public function exportresults()
$data['aLanguages'] = $aLanguages; // Pass available exports
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;

$data['sidebar']['state'] = "close";
$data['sidemenu']['state'] = "close";
$data['menu']['edition'] = true;
$data['menu']['export'] = true;
$data['menu']['close'] = true;
Expand Down Expand Up @@ -322,7 +322,7 @@ public function exportresults()
else
{
$sFilter='';
}
}

viewHelper::disableHtmlLogging();
$resultsService->exportSurvey($iSurveyID, $explang, $sExportType, $options, $sFilter);
Expand Down Expand Up @@ -419,7 +419,7 @@ public function exportspss()
$data["surveyinfo"] = $surveyinfo;
$data['title_bar']['title'] = gT('Browse responses').': '.$surveyinfo['surveyls_title'];

$data['sidebar']['state'] = "close";
$data['sidemenu']['state'] = "close";
$data['menu']['edition'] = true;
$data['menu']['close'] = true;

Expand Down Expand Up @@ -674,7 +674,7 @@ public function vvexport()
$aData["surveyinfo"] = $surveyinfo;
$aData['title_bar']['title'] = gT('Browse responses').': '.$surveyinfo['surveyls_title'];

$aData['sidebar']['state'] = "close";
$aData['sidemenu']['state'] = "close";
$aData['menu']['edition'] = true;
$aData['menu']['export'] = true;
$aData['menu']['close'] = true;
Expand Down
36 changes: 18 additions & 18 deletions application/controllers/admin/expressions.php
View file
Expand Up @@ -12,19 +12,19 @@
*
*/
class Expressions extends Survey_Common_Action {
function index()
{
$aData=array();
function index()
{
$aData=array();
$needpermission=false;
$aData['surveyid']=$surveyid=$iSurveyID=sanitize_int(Yii::app()->request->getQuery('sid'));
$aData['sa']=$sa=sanitize_paranoid_string(Yii::app()->request->getQuery('sa','index'));

$aData['fullpagebar']['closebutton']['url'] = 'admin/';

if (($aData['sa']=='survey_logic_file' || $aData['sa']=='navigation_test') && $surveyid)
{
$needpermission=true;
}
if (($aData['sa']=='survey_logic_file' || $aData['sa']=='navigation_test') && $surveyid)
{
$needpermission=true;
}
if($needpermission && !Permission::model()->hasSurveyPermission($surveyid,'surveycontent','read'))
{
$message['title']= gT('Access denied!');
Expand All @@ -43,9 +43,9 @@ function index()

if(isset($iSurveyID))
{
$aData['sidebar']['state'] = "close";
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['sidemenu']['state'] = "close";
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$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'));
Expand All @@ -55,19 +55,19 @@ function index()
$aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/view/surveyid/'.$aData['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['gid'] = sanitize_int(Yii::app()->request->getQuery('gid'));
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['gid'] = sanitize_int(Yii::app()->request->getQuery('gid'));
}
}


//header("Content-type: text/html; charset=UTF-8"); // needed for correct UTF-8 encoding
if(isset($_GET['sa']))
$this->test($aData['sa'],$aData);
else
$this->_renderWrappedTemplate('expressions', 'test_view', $aData);
if(isset($_GET['sa']))
$this->test($aData['sa'],$aData);
else
$this->_renderWrappedTemplate('expressions', 'test_view', $aData);
}
}

Expand Down
16 changes: 8 additions & 8 deletions application/controllers/admin/questiongroups.php
View file
Expand Up @@ -85,7 +85,7 @@ function import()
$aData['aImportResults'] = $aImportResults;
$aData['sExtension'] = $sExtension;
//$aData['display']['menu_bars']['surveysummary'] = 'importgroup';
$aData['sidebar']['state'] = "close";
$aData['sidemenu']['state'] = "close";

$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
Expand All @@ -106,8 +106,8 @@ function importView($surveyid)

$aData['action'] = $aData['display']['menu_bars']['gid_action'] = 'addgroup';
$aData['display']['menu_bars']['surveysummary'] = 'addgroup';
$aData['sidebar']['state'] = "close";
$aData['sidebar']['questiongroups'] = true;
$aData['sidemenu']['state'] = "close";
$aData['sidemenu']['questiongroups'] = true;

$aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/listquestiongroups/surveyid/'.$surveyid;
$aData['surveybar']['savebutton']['form'] = true;
Expand Down Expand Up @@ -155,7 +155,7 @@ function add($surveyid)
$aData['grplangs'] = $grplangs;
$aData['baselang'] = $baselang;

$aData['sidebar']['state'] = "close";
$aData['sidemenu']['state'] = "close";
$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;
Expand Down Expand Up @@ -329,8 +329,8 @@ public function view($surveyid, $gid)
$aData['gid'] = $gid;
$aData['grow'] = $grow;

$aData['sidebar']['questiongroups'] = true;
$aData['sidebar']['group_name'] = $grow['group_name'];
$aData['sidemenu']['questiongroups'] = true;
$aData['sidemenu']['group_name'] = $grow['group_name'];
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['questiongroupbar']['buttons']['view'] = TRUE;
Expand Down Expand Up @@ -418,7 +418,7 @@ public function edit($surveyid, $gid)
}
}

$aData['sidebar']['questiongroups'] = true;
$aData['sidemenu']['questiongroups'] = true;
$aData['questiongroupbar']['savebutton']['form'] = true;
$aData['questiongroupbar']['saveandclosebutton']['form'] = true;
$aData['questiongroupbar']['closebutton']['url'] = 'admin/questiongroups/sa/view/surveyid/'.$surveyid.'/gid/'.$gid;
Expand All @@ -429,7 +429,7 @@ public function edit($surveyid, $gid)
$aData['tabtitles'] = $aTabTitles;
$aData['aBaseLanguage'] = $aBaseLanguage;

$aData['sidebar']['state'] = "close";
$aData['sidemenu']['state'] = "close";
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";

Expand Down

0 comments on commit 5c2579f

Please sign in to comment.