Fixed bug #7818: Login page: Hardcoded logo & labels instead of p tags (Thanks to...
authorBenni Mack <benni.mack@typo3.org>
Thu, 20 Mar 2008 23:17:34 +0000 (23:17 +0000)
committerBenni Mack <benni.mack@typo3.org>
Thu, 20 Mar 2008 23:17:34 +0000 (23:17 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3463 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/index.php
typo3/stylesheet.css
typo3/sysext/t3skin/stylesheets/typo3-index-php.css

index 6e7ed9d..a99302b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-21  Benjamin Mack  <benni@typo3.org>
+
+       * Fixed bug #7818: Login page: Hardcoded logo & labels instead of p tags (Thanks to Georg Ringer and Christian Kuhn)
+
 2008-03-20  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #7918: HTMLArea RTE: table width unit default not honoured when width is not set
index 0493ace..0ff0dd3 100755 (executable)
@@ -250,15 +250,15 @@ class SC_index {
                                                                                <td colspan="2"><p class="c-wrong">'.htmlspecialchars($this->L_vars[9]).'</p></td>
                                                                        </tr>' : '').'
                                                                        <tr class="c-username">
-                                                                               <td><p class="c-username">'.htmlspecialchars($this->L_vars[0]).':</p></td>
-                                                                               <td><input type="text" name="username" value="'.htmlspecialchars($this->u).'" class="c-username" /></td>
+                                                                               <td><label for="username" class="c-username">'.htmlspecialchars($this->L_vars[0]).':</label></td>
+                                                                               <td><input type="text" id="username" name="username" value="'.htmlspecialchars($this->u).'" class="c-username" /></td>
                                                                        </tr>
                                                                        <tr class="c-password">
-                                                                               <td><p class="c-password">'.htmlspecialchars($this->L_vars[1]).':</p></td>
-                                                                               <td><input type="password" name="p_field" value="'.htmlspecialchars($this->p).'" class="c-password" /></td>
+                                                                               <td><label for="password" class="c-password">'.htmlspecialchars($this->L_vars[1]).':</label></td>
+                                                                               <td><input type="password" id="password" name="p_field" value="'.htmlspecialchars($this->p).'" class="c-password" /></td>
                                                                        </tr>'.($this->interfaceSelector && !$this->loginRefresh ? '
                                                                        <tr class="c-interfaceselector">
-                                                                               <td><p class="c-interfaceselector">'.htmlspecialchars($this->L_vars[2]).':</p></td>
+                                                                               <td><label for="interfaceselector" class="c-interfaceselector">'.htmlspecialchars($this->L_vars[2]).':</label></td>
                                                                                <td>'.$this->interfaceSelector.'</td>
                                                                        </tr>' : '' ).'
                                                                        <tr class="c-submit">
@@ -480,10 +480,10 @@ class SC_index {
                                                        <option value="'.htmlspecialchars($jumpScript[$valueStr]).'">'.htmlspecialchars($labels[$valueStr]).'</option>';
                                }
                                $this->interfaceSelector='
-                                               <select name="interface" class="c-interfaceselector">'.$this->interfaceSelector.'
+                                               <select id="interfaceselector" name="interface" class="c-interfaceselector">'.$this->interfaceSelector.'
                                                </select>';
                                $this->interfaceSelector_jump='
-                                               <select name="interface" class="c-interfaceselector" onchange="window.location.href=this.options[this.selectedIndex].value;">'.$this->interfaceSelector_jump.'
+                                               <select id="interfaceselector" name="interface" class="c-interfaceselector" onchange="window.location.href=this.options[this.selectedIndex].value;">'.$this->interfaceSelector_jump.'
                                                </select>';
 
                        } else {        // If there is only ONE interface value set:
@@ -508,6 +508,7 @@ class SC_index {
                        // Get values from TYPO3_CONF_VARS:
                $loginCopyrightWarrantyProvider = strip_tags(trim($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightWarrantyProvider']));
                $loginCopyrightWarrantyURL = strip_tags(trim($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightWarrantyURL']));
+               $loginImageSmall = (trim($GLOBALS['TBE_STYLES']['loginBoxImageSmall'])) ? trim($GLOBALS['TBE_STYLES']['loginBoxImageSmall']) : 'gfx/loginlogo_transp.gif';
 
                        // Make warranty note:
                if (strlen($loginCopyrightWarrantyProvider)>=2 && strlen($loginCopyrightWarrantyURL)>=10)       {
@@ -518,7 +519,7 @@ class SC_index {
 
                        // Compile full copyright notice:
                $copyrightNotice = '<a href="http://typo3.com/" target="_blank">'.
-                                       '<img src="gfx/loginlogo_transp.gif" width="75" height="19" alt="TYPO3 logo" align="left" />'.
+                                       '<img src="'.$loginImageSmall.'" alt="TYPO3 logo" align="left" />'.
                                        'TYPO3 CMS'.($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightShowVersion']?' ver. '.htmlspecialchars($GLOBALS['TYPO_VERSION']):'').
                                        '</a>. '.
                                        'Copyright &copy; '.TYPO3_copyright_year.' Kasper Sk&#229;rh&#248;j. Extensions are copyright of their respective owners. '.
index 6bb3cbc..3b8f964 100755 (executable)
@@ -1427,7 +1427,8 @@ table#logintable H2 {
        text-align: left;
 }
 
-table#logintable P {
+table#logintable P,
+table#logintable label {
        font-size: 12px;
        color: white;
        font-weight: bold;
index b331739..6a87aa3 100644 (file)
@@ -77,7 +77,8 @@ table#logintable h2 {
        padding: 0;
 }
 
-table#logintable p {
+table#logintable p,
+table#logintable label {
        font-size: 10px;
        font-weight: semibold;
        color: #000;