Skip to content

Commit

Permalink
Fixed issue #11501: Profile dialog not properly styled - now merged w…
Browse files Browse the repository at this point in the history 
…ith user preferences
  • Loading branch information
@c-schmitz
c-schmitz committed Jul 27, 2016
1 parent d87c5fe commit 7302159
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 28 deletions.
22 changes: 19 additions & 3 deletions application/controllers/admin/useraction.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -676,9 +676,22 @@ public function personalsettings()
'dateformat' => Yii::app()->request->getPost('dateformat'),
'htmleditormode' => Yii::app()->request->getPost('htmleditormode'),
'questionselectormode' => Yii::app()->request->getPost('questionselectormode'),
'templateeditormode' => Yii::app()->request->getPost('templateeditormode')
'templateeditormode' => Yii::app()->request->getPost('templateeditormode'),
'full_name'=> Yii::app()->request->getPost('fullname'),
'email'=> Yii::app()->request->getPost('email')
);

$sPassword=Yii::app()->request->getPost('password');
if (Yii::app()->request->getPost('password')!='')
{
if (Yii::app()->request->getPost('password')==Yii::app()->request->getPost('repeatpassword'))
{
$aData['password']=hash( "sha256",Yii::app()->request->getPost('password'));
}
else
{
Yii::app()->setFlashMessage(gT("Your new password was not saved because the passwords did not match."),'error');
}
}
$uresult = User::model()->updateByPk(Yii::app()->session['loginID'], $aData);

if (Yii::app()->request->getPost('lang')=='auto')
Expand All @@ -697,7 +710,7 @@ public function personalsettings()
Yii::app()->session['questionselectormode'] = Yii::app()->request->getPost('questionselectormode');
Yii::app()->session['templateeditormode'] = Yii::app()->request->getPost('templateeditormode');
Yii::app()->session['dateformat'] = Yii::app()->request->getPost('dateformat');
Yii::app()->session['flashmessage'] = gT("Your personal settings were successfully saved.");
Yii::app()->setFlashMessage(gT("Your personal settings were successfully saved."));
if (Yii::app()->request->getPost("saveandclose")) {
$this->getController()->redirect(array("admin/survey/sa/index"));
}
Expand All @@ -709,6 +722,9 @@ public function personalsettings()
// Get user lang
$user = User::model()->findByPk(Yii::app()->session['loginID']);
$aData['sSavedLanguage'] = $user->lang;
$aData['sUsername'] = $user->users_name;
$aData['sFullname'] = $user->full_name;
$aData['sEmailAdress'] = $user->email;

$aData['fullpagebar']['savebutton']['form'] = 'personalsettings';
$aData['fullpagebar']['saveandclosebutton']['form'] = 'personalsettings';
Expand Down
27 changes: 3 additions & 24 deletions application/views/admin/super/adminmenu.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

<!-- Surveys menus -->
<li class="dropdown-split-left">
<a style="" href="<?php echo $this->createUrl("admin/survey/sa/listsurveys"); ?>">
<a style="" href="<?php echo $this->createUrl("admin/survey/sa/listsurveys"); ?>"><span class="icon-list" ></span>
<?php eT("Surveys");?>
</a>
</li>
Expand Down Expand Up @@ -150,29 +150,8 @@
</li>
<?php endforeach; ?>

<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" ><?php echo Yii::app()->session['user'];?> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">

<!-- Edit your profile -->
<li>
<a href="<?php echo $this->createUrl("/admin/user/sa/modifyuser/uid/".Yii::app()->user->getId()); ?>"><?php eT("Edit your profile");?></a>
</li>

<!-- Edit your personal preferences -->
<li>
<a href="<?php echo $this->createUrl("/admin/user/sa/personalsettings"); ?>"><?php eT("Edit your personal preferences");?></a>
</li>

<li class="divider"></li>

<!-- Logout -->
<li>
<a href="<?php echo $this->createUrl("admin/authentication/sa/logout"); ?>">
<?php eT("Logout");?>
</a>
</li>
</ul>
<li>
<a href="<?php echo $this->createUrl("/admin/user/sa/personalsettings"); ?>" role="button" ><span class="icon-user" ></span> <?php echo Yii::app()->session['user'];?> </a>
</li>
</ul>
</div><!-- /.nav-collapse -->
Expand Down
37 changes: 36 additions & 1 deletion application/views/admin/user/personalsettings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,45 @@
?>

<div class="container-fluid welcome full-page-wrapper">
<?php echo CHtml::form($this->createUrl("/admin/user/sa/personalsettings"), 'post', array('class' => 'form44 form-horizontal', 'id'=>'personalsettings','autocomplete'=>"off")); ?>
<h3 class="pagetitle"><?php eT("Your profile"); ?></h3>
<div class="form-group">
<?php echo CHtml::label(gT("User name:"), 'lang', array('class'=>"col-sm-2 control-label")); ?>
<div class="col-sm-3">
<?php echo CHtml::textField('username', $sUsername,array('class'=>'form-control','readonly'=>'readonly')); ?>
</div>
<div class="col-sm-3">
<span class='annotation'><?php eT("The user name cannot be changed."); ?></span>
</div>
</div>
<div class="form-group">
<?php echo CHtml::label(gT("Email:"), 'lang', array('class'=>"col-sm-2 control-label")); ?>
<div class="col-sm-3">
<?php echo CHtml::emailField('email', $sEmailAdress,array('class'=>'form-control','maxlength'=>254)); ?>
</div>
</div>
<div class="form-group">
<?php echo CHtml::label(gT("Full name:"), 'lang', array('class'=>"col-sm-2 control-label")); ?>
<div class="col-sm-3">
<?php echo CHtml::textField('fullname', $sFullname ,array('class'=>'form-control','maxlength'=>50)); ?>
</div>
</div>
<div class="form-group">
<?php echo CHtml::label(gT("Password:"), 'lang', array('class'=>"col-sm-2 control-label")); ?>
<div class="col-sm-3">
<?php echo CHtml::passwordField('password', '',array('class'=>'form-control','autocomplete'=>"off",'placeholder'=>html_entity_decode("&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;"))); ?>
</div>
</div>
<div class="form-group">
<?php echo CHtml::label(gT("Repeat password:"), 'lang', array('class'=>"col-sm-2 control-label")); ?>
<div class="col-sm-3">
<?php echo CHtml::passwordField('repeatpassword', '',array('class'=>'form-control','autocomplete'=>"off",'placeholder'=>html_entity_decode("&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;&#9679;"))); ?>
</div>
</div>
<!-- form -->
<h3 class="pagetitle"><?php eT("Your personal settings"); ?></h3>

<!-- form -->
<?php echo CHtml::form($this->createUrl("/admin/user/sa/personalsettings"), 'post', array('class' => 'form44 form-horizontal', 'id'=>'personalsettings')); ?>

<!-- Interface language -->
<div class="form-group">
Expand Down

0 comments on commit 7302159

Please sign in to comment.