[TASK] Move login.html to EXT: backend 64/20464/2
authorFelix Kopp <felix-source@phorax.com>
Fri, 3 May 2013 11:34:59 +0000 (13:34 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Fri, 3 May 2013 11:54:19 +0000 (13:54 +0200)
Move templates/login.html to EXT: backend.

Change-Id: I6b7813f8f4d05256ea1fa8a12c54ba2e660202cc
Fixes: #47873
Releases: 6.2
Reviewed-on: https://review.typo3.org/20464
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
typo3/sysext/backend/Classes/Controller/LoginController.php
typo3/sysext/backend/Resources/Private/Templates/login.html [new file with mode: 0644]
typo3/sysext/t3skin/ext_tables.php
typo3/templates/login.html [deleted file]

index 17a1317..5483380 100644 (file)
@@ -184,7 +184,7 @@ class LoginController {
        public function main() {
                // Initialize template object:
                $GLOBALS['TBE_TEMPLATE']->bodyTagAdditions = ' onload="startUp();"';
-               $GLOBALS['TBE_TEMPLATE']->moduleTemplate = $GLOBALS['TBE_TEMPLATE']->getHtmlTemplate('templates/login.html');
+               $GLOBALS['TBE_TEMPLATE']->moduleTemplate = $GLOBALS['TBE_TEMPLATE']->getHtmlTemplate('EXT:backend/Resources/Private/Templates/login.html');
                $GLOBALS['TBE_TEMPLATE']->getPageRenderer()->loadExtJS();
                $GLOBALS['TBE_TEMPLATE']->getPageRenderer()->loadPrototype();
                $GLOBALS['TBE_TEMPLATE']->getPageRenderer()->loadScriptaculous();
diff --git a/typo3/sysext/backend/Resources/Private/Templates/login.html b/typo3/sysext/backend/Resources/Private/Templates/login.html
new file mode 100644 (file)
index 0000000..bab7adb
--- /dev/null
@@ -0,0 +1,94 @@
+<!-- ###PAGE### begin -->
+<table cellspacing="0" cellpadding="0" border="0" id="wrapper">
+       <tr>
+               <td class="c-wrappercell" align="center">
+                       <div id="loginimage">###LOGO###</div>
+                       <table cellspacing="0" cellpadding="0" border="0" id="loginwrapper">
+                               <tr>
+                                       <td ###CSS_ERRORCLASS###>
+                                               ###LOGINBOX_IMAGE###
+                                               ###FORM###
+                                       </td>
+                               </tr>
+                       </table>
+                       ###NEWS###
+                       <div id="copyrightnotice">###COPYRIGHT###</div>
+               </td>
+       </tr>
+</table>
+<!-- ###PAGE### end -->
+
+
+<!-- ###LOGIN_FORM### begin -->
+<table cellspacing="0" cellpadding="0" border="0" id="logintable">
+       <tr>
+               <td colspan="2"><h2>###HEADLINE###</h2></td>
+       </tr>
+       <!-- ###LOGIN_ERROR### begin -->
+       <tr class="c-wrong">
+               <td colspan="2"><p class="c-wrong">###ERROR_MESSAGE###</p></td>
+       </tr>
+       <!-- ###LOGIN_ERROR### end -->
+       <tr class="c-username">
+               <td><label for="username" class="c-username">###LABEL_USERNAME###:</label></td>
+               <td><input type="text" id="username" name="username" value="###VALUE_USERNAME###" class="c-username" /></td>
+       </tr>
+       <tr class="c-password">
+               <td><label for="password" class="c-password">###LABEL_PASSWORD###:</label></td>
+               <td><input type="password" id="password" name="p_field" value="###VALUE_PASSWORD###" class="c-password" /></td>
+       </tr>
+
+       <!-- ###INTERFACE_SELECTOR### begin -->
+       <tr class="c-interfaceselector">
+               <td><label for="interfaceselector" class="c-interfaceselector">###LABEL_INTERFACE###:</label></td>
+               <td>###VALUE_INTERFACE###</td>
+       </tr>
+       <!-- ###INTERFACE_SELECTOR### end -->
+       <tr class="c-submit">
+               <td></td>
+               <td><input type="submit" name="commandLI" value="###VALUE_SUBMIT###" class="c-submit" /></td>
+       </tr>
+       <tr class="c-info">
+               <td colspan="2"><p class="c-info">###INFO###</p></td>
+       </tr>
+</table>
+<!-- ###LOGIN_FORM### end -->
+
+
+<!-- ###LOGOUT_FORM### begin -->
+<table cellspacing="0" cellpadding="0" border="0" id="logintable">
+       <tr>
+               <td></td>
+               <td><h2>###HEADLINE###</h2></td>
+       </tr>
+       <tr class="c-username">
+               <td><p class="c-username">###LABEL_USERNAME###:</p></td>
+               <td><p class="c-username-current">###VALUE_USERNAME###</p></td>
+       </tr>
+       <!-- ###INTERFACE_SELECTOR### begin -->
+       <tr class="c-interfaceselector">
+               <td><p class="c-interfaceselector">###LABEL_INTERFACE###:</p></td>
+               <td>###VALUE_INTERFACE###</td>
+       </tr>
+       <!-- ###INTERFACE_SELECTOR### end -->
+       <tr class="c-submit">
+               <td><input type="hidden" name="p_field" value="" /></td>
+               <td><input type="submit" name="commandLO" value="###VALUE_SUBMIT###" class="c-submit" /></td>
+       </tr>
+       <tr class="c-info">
+               <td></td>
+               <td><p class="c-info">###INFO###</p></td>
+       </tr>
+</table>
+<!-- ###LOGOUT_FORM### end -->
+
+<!-- ###LOGIN_NEWS### begin -->
+       <!-- Login screen news: -->
+       <h2 id="loginNewsTitle">###NEWS_HEADLINE###</h2>
+       <dl id="loginNews">
+        <!-- ###NEWS_ITEM### begin -->
+                               <dt>###HEADER### <span>###DATE###</span></dt>
+                               <dd>###CONTENT###</dd>
+        <!-- ###NEWS_ITEM### end -->
+       </dl>
+<!-- ###LOGIN_NEWS### end -->
\ No newline at end of file
index 8293394..dba1945 100644 (file)
@@ -390,7 +390,7 @@ if (TYPO3_MODE == 'BE' || TYPO3_MODE == 'FE' && isset($GLOBALS['BE_USER'])) {
        // extJS theme
        $TBE_STYLES['extJS']['theme'] = $temp_eP . 'extjs/xtheme-t3skin.css';
        // Adding HTML template for login screen
-       $TBE_STYLES['htmlTemplates']['templates/login.html'] = 'sysext/t3skin/templates/login.html';
+       $TBE_STYLES['htmlTemplates']['EXT:backend/Resources/Private/Templates/login.html'] = 'sysext/t3skin/templates/login.html';
        $GLOBALS['TBE_STYLES']['stylesheets']['admPanel'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath('t3skin') . 'stylesheets/standalone/admin_panel.css';
        foreach ($flagNames as $flagName) {
                \TYPO3\CMS\Backend\Sprite\SpriteManager::addIconSprite(array(
diff --git a/typo3/templates/login.html b/typo3/templates/login.html
deleted file mode 100644 (file)
index bab7adb..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-<!-- ###PAGE### begin -->
-<table cellspacing="0" cellpadding="0" border="0" id="wrapper">
-       <tr>
-               <td class="c-wrappercell" align="center">
-                       <div id="loginimage">###LOGO###</div>
-                       <table cellspacing="0" cellpadding="0" border="0" id="loginwrapper">
-                               <tr>
-                                       <td ###CSS_ERRORCLASS###>
-                                               ###LOGINBOX_IMAGE###
-                                               ###FORM###
-                                       </td>
-                               </tr>
-                       </table>
-                       ###NEWS###
-                       <div id="copyrightnotice">###COPYRIGHT###</div>
-               </td>
-       </tr>
-</table>
-<!-- ###PAGE### end -->
-
-
-<!-- ###LOGIN_FORM### begin -->
-<table cellspacing="0" cellpadding="0" border="0" id="logintable">
-       <tr>
-               <td colspan="2"><h2>###HEADLINE###</h2></td>
-       </tr>
-       <!-- ###LOGIN_ERROR### begin -->
-       <tr class="c-wrong">
-               <td colspan="2"><p class="c-wrong">###ERROR_MESSAGE###</p></td>
-       </tr>
-       <!-- ###LOGIN_ERROR### end -->
-       <tr class="c-username">
-               <td><label for="username" class="c-username">###LABEL_USERNAME###:</label></td>
-               <td><input type="text" id="username" name="username" value="###VALUE_USERNAME###" class="c-username" /></td>
-       </tr>
-       <tr class="c-password">
-               <td><label for="password" class="c-password">###LABEL_PASSWORD###:</label></td>
-               <td><input type="password" id="password" name="p_field" value="###VALUE_PASSWORD###" class="c-password" /></td>
-       </tr>
-
-       <!-- ###INTERFACE_SELECTOR### begin -->
-       <tr class="c-interfaceselector">
-               <td><label for="interfaceselector" class="c-interfaceselector">###LABEL_INTERFACE###:</label></td>
-               <td>###VALUE_INTERFACE###</td>
-       </tr>
-       <!-- ###INTERFACE_SELECTOR### end -->
-       <tr class="c-submit">
-               <td></td>
-               <td><input type="submit" name="commandLI" value="###VALUE_SUBMIT###" class="c-submit" /></td>
-       </tr>
-       <tr class="c-info">
-               <td colspan="2"><p class="c-info">###INFO###</p></td>
-       </tr>
-</table>
-<!-- ###LOGIN_FORM### end -->
-
-
-<!-- ###LOGOUT_FORM### begin -->
-<table cellspacing="0" cellpadding="0" border="0" id="logintable">
-       <tr>
-               <td></td>
-               <td><h2>###HEADLINE###</h2></td>
-       </tr>
-       <tr class="c-username">
-               <td><p class="c-username">###LABEL_USERNAME###:</p></td>
-               <td><p class="c-username-current">###VALUE_USERNAME###</p></td>
-       </tr>
-       <!-- ###INTERFACE_SELECTOR### begin -->
-       <tr class="c-interfaceselector">
-               <td><p class="c-interfaceselector">###LABEL_INTERFACE###:</p></td>
-               <td>###VALUE_INTERFACE###</td>
-       </tr>
-       <!-- ###INTERFACE_SELECTOR### end -->
-       <tr class="c-submit">
-               <td><input type="hidden" name="p_field" value="" /></td>
-               <td><input type="submit" name="commandLO" value="###VALUE_SUBMIT###" class="c-submit" /></td>
-       </tr>
-       <tr class="c-info">
-               <td></td>
-               <td><p class="c-info">###INFO###</p></td>
-       </tr>
-</table>
-<!-- ###LOGOUT_FORM### end -->
-
-<!-- ###LOGIN_NEWS### begin -->
-       <!-- Login screen news: -->
-       <h2 id="loginNewsTitle">###NEWS_HEADLINE###</h2>
-       <dl id="loginNews">
-        <!-- ###NEWS_ITEM### begin -->
-                               <dt>###HEADER### <span>###DATE###</span></dt>
-                               <dd>###CONTENT###</dd>
-        <!-- ###NEWS_ITEM### end -->
-       </dl>
-<!-- ###LOGIN_NEWS### end -->
\ No newline at end of file