Fixed issue #07746: Login screen is ugly in IE9

LimeSurvey · May 28, 2013 · 0e18312 · 0e18312
1 parent d4c3a47
commit 0e18312
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 18 deletions.
diff --git a/application/views/admin/authentication/login.php b/application/views/admin/authentication/login.php
@@ -20,7 +20,14 @@
                     $info = App()->getPluginManager()->getPluginInfo($plugin);
                     $possibleAuthMethods[$plugin] = $info['pluginName'];
                 }
-                echo CHtml::dropDownList('authMethod', $selectedAuth, $possibleAuthMethods, array('onChange'=>'this.form.submit();'));
+                $this->widget('bootstrap.widgets.TbSelect2', array(
+                    'name' => 'authMethod',
+                    'value' => $selectedAuth,
+                    'data' => $possibleAuthMethods,
+                    'options' => array(
+                        'onChange'=>'this.form.submit();'
+                    )
+                ));
             } else {
                 echo CHtml::hiddenField('authMethod', $defaultAuth);
                 $selectedAuth = $defaultAuth;
@@ -31,22 +38,29 @@
                 /* @var $blockData PluginEventContent */
                 echo $blockData->getContent();
             }
+
+            $languageData = array(
+                'default' => gT('Default')
+            );
+            foreach (getLanguageDataRestricted(true) as $sLangKey => $aLanguage)
+            {
+                $languageData[$sLangKey] =  html_entity_decode($aLanguage['nativedescription']) . " - " . $aLanguage['description'];
+            }
+            echo CHtml::openTag('li');
+            echo CHtml::label(gT('Language'), 'loginlang');
+            $this->widget('bootstrap.widgets.TbSelect2', array(
+                'name' => 'loginlang',
+                'data' => $languageData,
+                'options' => array(
+                    'width' => '230px'
+                ),
+                'htmlOptions' => array(
+                    'id' => 'loginlang'
+                ),
+                'value' => 'default'
+            ));
+            echo CHtml::closeTag('li');
             ?>
-            <li><label for='loginlang'><?php $clang->eT("Language"); ?></label>
-                <select id='loginlang' name='loginlang'>
-                    <option value="default" selected="selected"><?php $clang->eT('Default'); ?></option>
-                    <?php
-                    $x = 0;
-                    foreach (getLanguageDataRestricted(true) as $sLangKey => $aLanguage)
-                    {
-                        //The following conditional statements select the browser language in the language drop down box and echoes the other options.
-                        ?>
-                        <option value='<?php echo $sLangKey; ?>'><?php echo $aLanguage['nativedescription'] . " - " . $aLanguage['description']; ?></option>
-                        <?php
-                    }
-                    ?>
-                </select>
-            </li>
         </ul>
         <p><input type='hidden' name='action' value='login' />
             <input class='action' type='submit' name='login_submit' value='<?php $clang->eT("Login"); ?>' /><br />

diff --git a/styles/adminstyle.css b/styles/adminstyle.css
@@ -123,8 +123,8 @@ label, legend {
 
 /* fixing login form password/login height in IE */
 #loginform input { 
-    height: auto;
-    min-height: 0;
+    height: 26px;
+
 }
 
 /* Make line spacing more compact for advanced question settings */