Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed issue #11089: When side-menu is closed, the side-body shifts fr…
…om right to left at page load
  • Loading branch information
olleharstedt committed May 3, 2016
1 parent 1f5bb95 commit e89c54b
Show file tree
Hide file tree
Showing 70 changed files with 215 additions and 145 deletions.
4 changes: 2 additions & 2 deletions application/controllers/admin/assessments.php
Expand Up @@ -110,8 +110,8 @@ private function _showAssessments($iSurveyID, $action)

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

$urls['output'] = ' <div class="side-body">
<h3>'.gT("Assessments").'</h3>';
$urls['output'] = renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false, null, true);
$urls['output'] .= '<h3>'.gT("Assessments").'</h3>';

if ($surveyinfo['assessments']!='Y')
{
Expand Down
12 changes: 6 additions & 6 deletions application/controllers/admin/surveypermission.php
Expand Up @@ -51,7 +51,7 @@ public function index($iSurveyID)
App()->getClientScript()->registerPackage('jquery-tablesorter');
$this->registerScriptFile( 'ADMIN_SCRIPT_PATH', 'surveypermissions.js');

$surveysecurity = '<div class="side-body" id="edit-permissions">';
$surveysecurity = renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false, 'edit-permissions', true);
$surveysecurity .="<h3>".gT("Survey permissions")."</h3>\n";
$surveysecurity .= '<div class="row"><div class="col-lg-12 content-right">';
$result2 = Permission::model()->getUserDetails($iSurveyID);
Expand Down Expand Up @@ -268,7 +268,7 @@ function addusergroup($surveyid)
if($action == "addusergroupsurveysecurity")
{
//////////////////
$addsummary = '<div class="side-body" id="edit-permissions">';
$addsummary = renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false, 'edit-permissions', true);
$addsummary .= '<div class="row"><div class="col-lg-12 content-right">';

$result = Survey::model()->findAll('sid = :surveyid AND owner_id = :owner_id',array(':surveyid' => $surveyid, ':owner_id' => Yii::app()->session['loginID']));
Expand Down Expand Up @@ -377,7 +377,7 @@ function adduser($surveyid)
if($action == "addsurveysecurity")
{

$addsummary = '<div class="side-body" id="edit-permissions">';
$addsummary = renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false, 'edit-permissions', true);
$addsummary .= '<div class="row"><div class="col-lg-12 content-right">';


Expand Down Expand Up @@ -481,7 +481,7 @@ function set($surveyid)

if( Permission::model()->hasSurveyPermission($surveyid, 'surveysecurity', 'update') )
{
$usersummary = '<div class="side-body" id="edit-permissions">';
$usersummary = renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false, 'edit-permissions', true);

App()->getClientScript()->registerPackage('jquery-tablesorter');
$this->registerScriptFile( 'ADMIN_SCRIPT_PATH', 'surveypermissions.js');
Expand Down Expand Up @@ -611,7 +611,7 @@ function delete($surveyid)
if($action == "delsurveysecurity")
{

$addsummary = '<div class="side-body" id="edit-permissions">';
$addsummary = renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false, 'edit-permissions', true);
$addsummary .= '<div class="row"><div class="col-lg-12 content-right">';
$addsummary .= "<div class=\"jumbotron message-box\">\n";
$addsummary .= "<h2>".gT("Deleting User")."</h2>\n";
Expand Down Expand Up @@ -678,7 +678,7 @@ function surveyright($surveyid)
if ($action == "surveyrights" && Permission::model()->hasSurveyPermission($surveyid, 'surveysecurity', 'update'))
{

$addsummary = '<div class="side-body" id="edit-permissions">';
$addsummary = renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false, 'edit-permissions', true);
$addsummary .= '<div class="row"><div class="col-lg-12 content-right">';

$addsummary .= "<div class=\"jumbotron message-box\">\n";
Expand Down
2 changes: 0 additions & 2 deletions application/controllers/admin/tokens.php
Expand Up @@ -1208,9 +1208,7 @@ function deletetokenattributes($iSurveyId)
$cancel=Yii::app()->request->getPost('cancel','');
$tokenfields = getAttributeFieldNames($iSurveyId);
$sAttributeToDelete=Yii::app()->request->getPost('deleteattribute','');
tracevar($sAttributeToDelete);
if(!in_array($sAttributeToDelete,$tokenfields)) $sAttributeToDelete=false;
tracevar($sAttributeToDelete);
if ($cancel=='cancel')
{
Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl("/admin/tokens/sa/managetokenattributes/surveyid/$iSurveyId"));
Expand Down
56 changes: 56 additions & 0 deletions application/helpers/frontend_helper.php
Expand Up @@ -2340,3 +2340,59 @@ function getMove()
}
return $move;
}

/**
* Side-body width is different depending on
* if side-menu is opened or closed.
*
* @param string $sideMenuBehaviour - Either 'adaptive', 'alwaysClosed' or 'alwaysOpen'
* @param boolean $sideMenustate - false for closed side-menu
* @param string $id - Id of div element
* @param boolean $returnString - If true, does not echo but returns string instead
* @return string
*/
function renderBeginSidebody($sideMenuBehaviour, $sideMenustate = true, $id = null, $returnString = false)
{
$classes = array();
$classes[] = 'side-body';

if ($sideMenuBehaviour == 'adaptive' || $sideMenuBehaviour == '')
{
// Adaptive and closed, as in edit question
if (!$sideMenustate)
{
$classes[] = 'side-body-margin';
}
}
elseif ($sideMenuBehaviour == 'alwaysClosed')
{
$classes[] = 'side-body-margin';
}
elseif ($sideMenuBehaviour == 'alwaysOpen')
{
}
else
{
throw new InvalidArgumentException("Unknown value for sideMenuBehaviour: $sideMenuBehaviour");
}

$html = "<div class='";
$html .= implode(' ', $classes);
$html .= "' ";

if ($id !== null)
{
$html .= " id='$id'";
}

$html .= ">";

if ($returnString)
{
return $html;
}
else
{
echo $html;
}
}
2 changes: 1 addition & 1 deletion application/views/admin/conditions/conditionshead_view.php
@@ -1,4 +1,4 @@
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<h3><?php eT("Conditions designer");?>:</h3>
<div class="row">
<div class="col-lg-12 content-right">
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/dataentry/caption_view.php
@@ -1,7 +1,7 @@
<!--
dataentry/caption_view.php
-->
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<h3><?php eT("Data entry"); ?></h3>
<div class="row">
<div class="col-lg-12 content-right">
Expand Down
@@ -1,4 +1,4 @@
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<h3>
<?php eT("Data entry"); ?> -
<?php
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/dataentry/import.php
@@ -1,7 +1,7 @@
<?php
App()->getClientScript()->registerCssFile(Yii::app()->getBaseUrl() . '/styles/configure.css');
?>
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<h3><?php eT("Import responses from a deactivated survey table"); ?></h3>
<div class="row">
<div class="col-lg-12 content-right">
Expand Down
8 changes: 5 additions & 3 deletions application/views/admin/dataentry/iteratesurvey.php
@@ -1,4 +1,5 @@
<div class='header ui-widget-header'><?php eT("Iterate survey");?></div>
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), true); ?>
<h3><?php eT("Iterate survey");?></h3>

<?php if($success) {?>
<p style='width:100%;'>
Expand All @@ -13,7 +14,8 @@
<li><?php eT("Reset all your tokens to the 'not used' state");?></li>
</ol><br />
<?php echo CHtml::form(array("admin/dataentry/sa/iteratesurvey/unfinalizeanswers/true/surveyid/".$surveyid), 'post');?>
<input type='submit' onclick="return confirm('<?php eT("Are you really sure you want to *delete* some incomplete answers and reset the completed state of both answers and tokens?","js");?>')" value='<?php eT("Reset answers and token completed state");?>' />
<input class='btn btn-danger' type='submit' onclick="return confirm('<?php eT("Are you really sure you want to *delete* some incomplete answers and reset the completed state of both answers and tokens?","js");?>')" value='<?php eT("Reset answers and token completed state");?>' />
</form>
</div>
<?php }?>
<?php }?>
</div>
4 changes: 2 additions & 2 deletions application/views/admin/dataentry/vvimport.php
@@ -1,4 +1,4 @@
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<?php if($tableExists):?>
<h3><?php eT("Import a VV survey file"); ?></h3>
<?php endif;?>
Expand Down Expand Up @@ -73,4 +73,4 @@

<?php } ?>

</div></div></div>
</div></div></div>
Expand Up @@ -27,7 +27,7 @@
});
</script>

<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<h3><?php eT("Edit email templates"); ?></h3>

<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/export/exportresults_view.php
Expand Up @@ -9,7 +9,7 @@
var sMsgColumnCount = '<?php eT("%s of %s columns selected",'js'); ?>';
</script>

<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<h3>
<?php eT("Export results");?>
<?php
Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/export/spss_view.php
@@ -1,4 +1,4 @@
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<h3><?php eT("Export result data to SPSS");?></h3>
<div class="row">
<div class="col-lg-12 content-right">
Expand Down Expand Up @@ -49,4 +49,4 @@
<p>


</div></div></div>
</div></div></div>
2 changes: 1 addition & 1 deletion application/views/admin/export/statistics_user_view.php
Expand Up @@ -8,7 +8,7 @@
<!-- Javascript variables -->
<?php $this->renderPartial('/admin/export/statistics_subviews/_statistics_view_scripts', array('sStatisticsLanguage'=>$sStatisticsLanguage, 'surveyid'=>$surveyid, 'showtextinline'=>$showtextinline)) ; ?>

<div class="side-body" id="statisticsview">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false, 'statisticsview'); ?>
<h3>
<span class="glyphicon glyphicon-stats"></span> &nbsp;&nbsp;&nbsp;
<?php eT("Statistics"); ?>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/export/statistics_view.php
Expand Up @@ -8,7 +8,7 @@
<!-- Javascript variables -->
<?php $this->renderPartial('/admin/export/statistics_subviews/_statistics_view_scripts', array('sStatisticsLanguage'=>$sStatisticsLanguage, 'surveyid'=>$surveyid, 'showtextinline'=>$showtextinline)) ; ?>

<div class="side-body" id="statisticsview">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false, 'statisticsview'); ?>
<h3>
<span class="glyphicon glyphicon-stats"></span> &nbsp;&nbsp;&nbsp;
<?php eT("Statistics"); ?>
Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/export/vv_view.php
@@ -1,4 +1,4 @@
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<h3><?php eT("Export a VV survey file");?></h3>
<div class="row">
<div class="col-lg-12 content-right">
Expand Down Expand Up @@ -36,4 +36,4 @@
<?php echo CHtml::hiddenField('subaction','export'); ?>
</p>
<form>
</div></div></div>
</div></div></div>
Expand Up @@ -3,7 +3,7 @@
?>

<?php if(!$fullPage):?>
<div class="side-body" id="edit-survey-text-element">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false, 'edit-survey-text-element'); ?>
<?php endif;?>
<h3><?php eT("Edit survey settings");?></h3>

Expand Down
5 changes: 3 additions & 2 deletions application/views/admin/quotas/editquota_view.php
@@ -1,4 +1,5 @@
<div class="side-body col-lg-8">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<div class='col-lg-8'>
<div class="row">
<div class="col-lg-12 content-right">
<h3>
Expand Down Expand Up @@ -73,4 +74,4 @@
<input type="hidden" name="quota_id" value="<?php echo $quotainfo['id'];?>" />
</form>

</div></div></div>
</div></div></div></div>
2 changes: 1 addition & 1 deletion application/views/admin/quotas/newanswer_view.php
@@ -1,4 +1,4 @@
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<div class="row">
<div class="col-lg-12 content-right">
<h3>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/quotas/newanswertwo_view.php
@@ -1,4 +1,4 @@
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<div class="row">
<div class="col-lg-12 content-right">
<h3>
Expand Down
5 changes: 3 additions & 2 deletions application/views/admin/quotas/newquota_view.php
@@ -1,4 +1,5 @@
<div class="side-body col-lg-8">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<div class='col-lg-8'>
<div class="row">
<div class="col-lg-12 content-right">
<h3>
Expand Down Expand Up @@ -101,4 +102,4 @@
</form>
</div>
</div>
</div></div>
</div></div></div>
2 changes: 1 addition & 1 deletion application/views/admin/quotas/viewquotas_view.php
@@ -1,4 +1,4 @@
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<div class="row">
<div class="col-lg-12 content-right">
<h3>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/responses/browseidheader_view.php
@@ -1,4 +1,4 @@
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<h3><?php echo sprintf(gT("View response ID %d"), $id); ?></h3>
<div class="row">
<div class="col-lg-12 content-right">
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/responses/browseindex_view.php
Expand Up @@ -3,7 +3,7 @@
* Response Summary view
*/
?>
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), true); ?>
<h3><?php eT("Response summary"); ?></h3>
<div class="row">
<div class="col-lg-12 content-right">
Expand Down
@@ -1,4 +1,4 @@
<div class='side-body'>
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), false); ?>
<h3><?php echo eT('Time statistics'); ?></h3>
<script type='text/javascript'>
var strdeleteconfirm='<?php echo eT('Do you really want to delete this response?', 'js'); ?>';
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/responses/listResponses_view.php
Expand Up @@ -54,7 +54,7 @@
<?php } ?>
</script>

<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), true); ?>
<h3><?php eT('Survey responses'); ?></h3>
<div class="row">
<div id="displayResponsesContainer" class="content-right" style="overflow-x: scroll; padding-bottom: 2em">
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/saved/savedlist_view.php
@@ -1,4 +1,4 @@
<div class="side-body">
<?php renderBeginSidebody(getGlobalSetting('sideMenuBehaviour'), true); ?>
<h3>
<span style='font-weight:bold;'><?php eT('Saved responses'); ?></span>
<?php echo $sSurveyName . ' ' . sprintf(gT('ID: %s'), $iSurveyId); ?>
Expand Down
13 changes: 1 addition & 12 deletions application/views/admin/super/sidebody.php
@@ -1,14 +1,3 @@
<div
class='side-body'

<?php if (isset($id)): ?>
id="<?php echo $id; ?>"
<?php endif; ?>

<?php if ($sideMenuBehaviour == 'adaptive' || $sideMenuBehaviour == ''): ?>
<?php elseif ($sideMenuBehaviour == 'alwaysClosed'): ?>
<?php elseif ($sideMenuBehaviour == 'alwaysOpen'): ?>
<?php endif; ?>
>
<?php renderBeginSidebody($sideMenuBehaviour); ?>
<?php echo $content; ?>
</div>

0 comments on commit e89c54b

Please sign in to comment.