Merge remote-tracking branch 'origin/master' into cint

LimeSurvey · Jul 27, 2016 · aeae6a7 · aeae6a7
2 parents dc66298 + cf0c793
commit aeae6a7
Show file tree

Hide file tree

Showing 8 changed files with 124 additions and 86 deletions.
diff --git a/application/controllers/admin/useraction.php b/application/controllers/admin/useraction.php
@@ -680,7 +680,6 @@ public function personalsettings()
             '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'))

diff --git a/application/models/AdminTheme.php b/application/models/AdminTheme.php
@@ -133,12 +133,16 @@ public function registerStylesAndScripts()
         // and move the rest to the bootstrap package.
         // NB: registerAllScripts could be replaced by js definition in package. If needed: not a problem to do it
 
-        Yii::app()->getClientScript()->registerMetaTag('width=device-width, initial-scale=1.0', 'viewport'); // See: https://github.com/LimeSurvey/LimeSurvey/blob/master/application/extensions/bootstrap/components/TbApi.php#l108-l115
-        App()->bootstrap->registerAllScripts();                                                              // See : https://github.com/LimeSurvey/LimeSurvey/blob/master/application/extensions/bootstrap/components/TbApi.php#l153-l160
+        if (!Yii::app()->request->isAjaxRequest)
+        {
+            Yii::app()->getClientScript()->registerMetaTag('width=device-width, initial-scale=1.0', 'viewport'); // See: https://github.com/LimeSurvey/LimeSurvey/blob/master/application/extensions/bootstrap/components/TbApi.php#l108-l115
+            App()->bootstrap->registerAllScripts();                                                               // See : https://github.com/LimeSurvey/LimeSurvey/blob/master/application/extensions/bootstrap/components/TbApi.php#l153-l160
 
-        App()->getClientScript()->registerPackage('jqueryui');          // jqueryui
-        App()->getClientScript()->registerPackage('jquery-cookie');     // jquery-cookie
-        App()->getClientScript()->registerPackage('fontawesome');       // fontawesome      ??? TODO: check if needed
+            App()->getClientScript()->registerPackage('jqueryui');          // jqueryui
+            App()->getClientScript()->registerPackage('jquery-cookie');     // jquery-cookie
+            App()->getClientScript()->registerPackage('fontawesome');       // fontawesome      ??? TODO: check if needed
+
+        }
 
         $aCssFiles = array();
         $aJsFiles= array();

diff --git a/application/views/admin/super/adminmenu.php b/application/views/admin/super/adminmenu.php
@@ -150,8 +150,22 @@
                 </li>
             <?php endforeach; ?>
 
-            <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 class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false" ><span class="icon-user" ></span> <?php echo Yii::app()->session['user'];?> <span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li>
+                        <a href="<?php echo $this->createUrl("/admin/user/sa/personalsettings"); ?>"><?php eT("Your account");?></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>
         </ul>
     </div><!-- /.nav-collapse -->

diff --git a/application/views/admin/user/personalsettings.php b/application/views/admin/user/personalsettings.php
@@ -13,7 +13,7 @@
                 <?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>
+                <span class='text-info'><?php eT("The user name cannot be changed."); ?></span>
              </div>
         </div>
         <div class="form-group">