From 64019a8e6a7ef0816e66a9fde2c426b3c2f33b07 Mon Sep 17 00:00:00 2001
From: markusfluer <fluer.markus@googlemail.com>
Date: Thu, 12 Oct 2017 15:29:51 +0200
Subject: [PATCH] Fixed issue: personalsettings unorganized and not well
 looking

---
 .../views/admin/user/personalsettings.php     | 270 ++++++++++--------
 1 file changed, 154 insertions(+), 116 deletions(-)

diff --git a/application/views/admin/user/personalsettings.php b/application/views/admin/user/personalsettings.php
index a327cecf953..71b08041b40 100644
--- a/application/views/admin/user/personalsettings.php
+++ b/application/views/admin/user/personalsettings.php
@@ -15,135 +15,173 @@
                 <li role="presentation" ><a href="#your-personal-menueentries" role="tab" data-toggle="tab"><?php eT("Your personal menu entries"); ?></a></li>
             </ul>
             <div class="tab-content">
+
+                <!-- TAB: Your profile settings -->
                 <div role="tabpanel" class="tab-pane fade in active" id="your-profile">
                     <div class="pagetitle h3"><?php eT("Your profile"); ?></div>
-                    <div class="form-group">
-                        <?php echo CHtml::label(gT("User name:"), 'lang', array('class'=>" control-label")); ?>
-                        <div class="">
-                            <?php echo CHtml::textField('username', $sUsername,array('class'=>'form-control','readonly'=>'readonly')); ?>
+                    <div class="container-fluid">
+                        <div class="row">
+                            <div class="col-sm-12 col-md-12">
+                                <div class="form-group">
+                                    <?php echo CHtml::label(gT("User name:"), 'lang', array('class'=>" control-label")); ?>
+                                    <div class="">
+                                        <?php echo CHtml::textField('username', $sUsername,array('class'=>'form-control','readonly'=>'readonly')); ?>
+                                    </div>
+                                    <div class="">
+                                        <span class='text-info'><?php eT("The user name cannot be changed."); ?></span>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
-                        <div class="">
-                            <span class='text-info'><?php eT("The user name cannot be changed."); ?></span>
+                        <div class="row">
+                            <hr/>
                         </div>
-                    </div>
-                    <div class="form-group">
-                        <?php echo CHtml::label(gT("Email:"), 'lang', array('class'=>" control-label")); ?>
-                        <div class="">
-                            <?php echo CHtml::emailField('email', $sEmailAdress,array('class'=>'form-control','maxlength'=>254)); ?>
+                        <div class="row">
+                            <div class="col-sm-12 col-md-6">
+                                <div class="form-group">
+                                    <?php echo CHtml::label(gT("Email:"), 'lang', array('class'=>" control-label")); ?>
+                                    <div class="">
+                                        <?php echo CHtml::emailField('email', $sEmailAdress,array('class'=>'form-control','maxlength'=>254)); ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-12 col-md-6">
+                                <div class="form-group">
+                                    <?php echo CHtml::label(gT("Full name:"), 'lang', array('class'=>" control-label")); ?>
+                                    <div class="">
+                                        <?php echo CHtml::textField('fullname', $sFullname ,array('class'=>'form-control','maxlength'=>50)); ?>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                    <div class="form-group">
-                        <?php echo CHtml::label(gT("Full name:"), 'lang', array('class'=>" control-label")); ?>
-                        <div class="">
-                            <?php echo CHtml::textField('fullname', $sFullname ,array('class'=>'form-control','maxlength'=>50)); ?>
+                        <div class="row">
+                            <hr/>
                         </div>
-                    </div>
-
-                     <div class="form-group">
-                         <?php echo CHtml::label(gT("Old password:"), 'lang', array('class'=>"col-sm-2 control-label")); ?>
-                         <div class="">
-                             <?php echo CHtml::passwordField('oldpassword', '',array('class'=>'form-control','autocomplete'=>"off",'placeholder'=>html_entity_decode(str_repeat("&#9679;",10),ENT_COMPAT,'utf-8'))); ?>
-                         </div>
-                    </div>
-
-                    <div class="form-group">
-                        <?php echo CHtml::label(gT("Password:"), 'lang', array('class'=>" control-label")); ?>
-                        <div class="">
-                            <?php echo CHtml::passwordField('password', '',array('class'=>'form-control','autocomplete'=>"off",'placeholder'=>html_entity_decode(str_repeat("&#9679;",10),ENT_COMPAT,'utf-8'))); ?>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <?php echo CHtml::label(gT("Repeat password:"), 'lang', array('class'=>" control-label")); ?>
-                        <div class="">
-                            <?php echo CHtml::passwordField('repeatpassword', '',array('class'=>'form-control','autocomplete'=>"off",'placeholder'=>html_entity_decode(str_repeat("&#9679;",10),ENT_COMPAT,'utf-8'))); ?>
+                        <div class="row">
+                            <div class="col-sm-12 col-md-6">
+                                <div class="form-group">
+                                    <?php echo CHtml::label(gT("Old password:"), 'lang', array('class'=>"control-label")); ?>
+                                    <div class="">
+                                        <?php echo CHtml::passwordField('oldpassword', '',array('class'=>'form-control','autocomplete'=>"off",'placeholder'=>html_entity_decode(str_repeat("&#9679;",10),ENT_COMPAT,'utf-8'))); ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-12 col-md-6">
+                                <div class="form-group">
+                                    <?php echo CHtml::label(gT("Password:"), 'lang', array('class'=>" control-label")); ?>
+                                    <div class="">
+                                        <?php echo CHtml::passwordField('password', '',array('class'=>'form-control','autocomplete'=>"off",'placeholder'=>html_entity_decode(str_repeat("&#9679;",10),ENT_COMPAT,'utf-8'))); ?>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <?php echo CHtml::label(gT("Repeat password:"), 'lang', array('class'=>" control-label")); ?>
+                                    <div class="">
+                                        <?php echo CHtml::passwordField('repeatpassword', '',array('class'=>'form-control','autocomplete'=>"off",'placeholder'=>html_entity_decode(str_repeat("&#9679;",10),ENT_COMPAT,'utf-8'))); ?>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
+
+                <!-- TAB: Your personal settings -->
                 <div role="tabpanel" class="tab-pane fade" id="your-personal-settings">
                     <div class="pagetitle h3"><?php eT("Your personal settings"); ?></div>
-                    <!-- Interface language -->
-                    <div class="form-group">
-                        <?php echo CHtml::label(gT("Interface language:"), 'lang', array('class'=>" control-label")); ?>
-                        <div class="">
-                            <?php
-                            $this->widget('yiiwheels.widgets.select2.WhSelect2', array(
-                                'asDropDownList' => true,
-                                'name' => 'lang',
-                                'data' => $aLanguageData,
-                                'pluginOptions' => array(
-                                    'htmlOptions' => array(
-                                        'id' => 'lang',
-                                    'class'=> "form-control"
-                                    )
-                                ),
-                                'value' => $sSavedLanguage
-                            ));
-
-                            ?>
+                    <div class="container-fluid">
+                        <div class="row">
+                            <div class="col-sm-12 col-md-6">
+                                <!-- Interface language -->
+                                <div class="form-group">
+                                    <?php echo CHtml::label(gT("Interface language:"), 'lang', array('class'=>" control-label")); ?>
+                                    <div class="">
+                                        <?php
+                                        $this->widget('yiiwheels.widgets.select2.WhSelect2', array(
+                                            'asDropDownList' => true,
+                                            'name' => 'lang',
+                                            'data' => $aLanguageData,
+                                            'pluginOptions' => array(
+                                                'htmlOptions' => array(
+                                                    'id' => 'lang',
+                                                    'class'=> "form-control"
+                                                    )
+                                                ),
+                                                'value' => $sSavedLanguage
+                                            ));
+                                            
+                                            ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-12 col-md-6">
+                                <!-- HTML editor mode -->
+                                <div class="form-group">
+                                    <?php echo CHtml::label(gT("HTML editor mode:"), 'htmleditormode', array('class'=>" control-label")); ?>
+                                    <div class="">
+                                        <?php
+                                            echo CHtml::dropDownList('htmleditormode', Yii::app()->session['htmleditormode'], array(
+                                                'default' => gT("Default",'unescaped'),
+                                                'inline' => gT("Inline HTML editor",'unescaped'),
+                                                'popup' => gT("Popup HTML editor",'unescaped'),
+                                                'none' => gT("No HTML editor",'unescaped')
+                                            ), array('class'=>"form-control"));
+                                        ?>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-
-                    <!-- HTML editor mode -->
-                    <div class="form-group">
-                        <?php echo CHtml::label(gT("HTML editor mode:"), 'htmleditormode', array('class'=>" control-label")); ?>
-                        <div class="">
-                            <?php
-                                echo CHtml::dropDownList('htmleditormode', Yii::app()->session['htmleditormode'], array(
-                                    'default' => gT("Default",'unescaped'),
-                                    'inline' => gT("Inline HTML editor",'unescaped'),
-                                    'popup' => gT("Popup HTML editor",'unescaped'),
-                                    'none' => gT("No HTML editor",'unescaped')
-                                ), array('class'=>"form-control"));
-                            ?>
-                        </div>
-                    </div>
-
-                    <!-- Question type selector -->
-                    <div class="form-group">
-                        <?php echo CHtml::label(gT("Question type selector:"), 'questionselectormode', array('class'=>" control-label")); ?>
-                        <div class="">
-                            <?php
-                            echo CHtml::dropDownList('questionselectormode', Yii::app()->session['questionselectormode'], array(
-                                'default' => gT("Default",'unescaped'),
-                                'full' => gT("Full selector",'unescaped'),
-                                'none' => gT("Simple selector",'unescaped')
-                            ), array('class'=>"form-control"));
-                            ?>
-                        </div>
-                    </div>
-
-                    <!-- Template editor mode -->
-                    <div class="form-group">
-                        <?php echo CHtml::label(gT("Template editor mode:"), 'templateeditormode', array('class'=>" control-label")); ?>
-                        <div class="">
-                            <?php
-                            echo CHtml::dropDownList('templateeditormode', Yii::app()->session['templateeditormode'], array(
-                                'default' => gT("Default"),
-                                'full' => gT("Full template editor"),
-                                'none' => gT("Simple template editor")
-                            ), array('class'=>"form-control"));
-                            ?>
-                        </div>
-                    </div>
-
-                    <!-- Date format -->
-                    <div class="form-group">
-                        <?php echo CHtml::label( gT("Date format:"), 'dateformat', array('class'=>" control-label")); ?>
-                        <div class="">
-                            <select name='dateformat' id='dateformat' class="form-control">
-                                <?php
-                                foreach (getDateFormatData(0,Yii::app()->session['adminlang']) as $index => $dateformatdata)
-                                {
-                                    echo "<option value='{$index}'";
-                                    if ($index == Yii::app()->session['dateformat'])
-                                    {
-                                        echo " selected='selected'";
-                                    }
+                        <div class="row">
+                            <div class="col-sm-12 col-md-6">
+                                <!-- Question type selector -->
+                                <div class="form-group">
+                                    <?php echo CHtml::label(gT("Question type selector:"), 'questionselectormode', array('class'=>" control-label")); ?>
+                                    <div class="">
+                                        <?php
+                                        echo CHtml::dropDownList('questionselectormode', Yii::app()->session['questionselectormode'], array(
+                                            'default' => gT("Default",'unescaped'),
+                                            'full' => gT("Full selector",'unescaped'),
+                                            'none' => gT("Simple selector",'unescaped')
+                                        ), array('class'=>"form-control"));
+                                        ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-12 col-md-6">
+                                <!-- Template editor mode -->
+                                <div class="form-group">
+                                    <?php echo CHtml::label(gT("Template editor mode:"), 'templateeditormode', array('class'=>" control-label")); ?>
+                                    <div class="">
+                                        <?php
+                                        echo CHtml::dropDownList('templateeditormode', Yii::app()->session['templateeditormode'], array(
+                                            'default' => gT("Default"),
+                                            'full' => gT("Full template editor"),
+                                            'none' => gT("Simple template editor")
+                                        ), array('class'=>"form-control"));
+                                        ?>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-12 col-md-6">
+                                <!-- Date format -->
+                                <div class="form-group">
+                                    <?php echo CHtml::label( gT("Date format:"), 'dateformat', array('class'=>" control-label")); ?>
+                                    <div class="">
+                                        <select name='dateformat' id='dateformat' class="form-control">
+                                            <?php
+                                            foreach (getDateFormatData(0,Yii::app()->session['adminlang']) as $index => $dateformatdata)
+                                            {
+                                                echo "<option value='{$index}'";
+                                                if ($index == Yii::app()->session['dateformat'])
+                                                {
+                                                    echo " selected='selected'";
+                                                }
 
-                                    echo ">" . $dateformatdata['dateformat'] . '</option>';
-                                }
-                                ?>
-                            </select>
+                                                echo ">" . $dateformatdata['dateformat'] . '</option>';
+                                            }
+                                            ?>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>