Removed obsolete templates

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 93458058f8e754130433606360d6dc997f9d7b74..f2d5879c60372e6d80a38c3d36129c16bf1a6baa 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -78,20 +78,22 @@
        <!-- HEADER -->
        <header id="pageHeader" class="pageHeader">
                <div>
-                       <!-- top menu -->
-                       <nav id="topMenu" class="topMenu">
-                               <div>
-                                       <ul>
-                                               <li id="userMenu" class="userMenu"><!-- ToDo: We need an ID and/or class for each list here, this ID may also change! -->
-                                                       <span class="dropdownCaption">{lang}wcf.acp.user.userNote{/lang}</span>
-                                                       <ul class="dropdown">
-                                                               <li><a href="{link}index.php?action=Logout&amp;t={@SECURITY_TOKEN}{/link}" onclick="return confirm('{lang}wcf.user.logout.sure{/lang}')">{lang}wcf.user.logout{/lang}</a></li>
-                                                       </ul>
-                                               </li>
-                                       </ul>
-                               </div>
-                       </nav>
-                       <!-- /top menu -->
+                       {if $__wcf->user->userID}
+                               <!-- top menu -->
+                               <nav id="topMenu" class="topMenu">
+                                       <div>
+                                               <ul>
+                                                       <li id="userMenu" class="userMenu"><!-- ToDo: We need an ID and/or class for each list here, this ID may also change! -->
+                                                               <span class="dropdownCaption">{lang}wcf.acp.user.userNote{/lang}</span>
+                                                               <ul class="dropdown">
+                                                                       <li><a href="{link}index.php?action=Logout&amp;t={@SECURITY_TOKEN}{/link}" onclick="return confirm('{lang}wcf.user.logout.sure{/lang}')">{lang}wcf.user.logout{/lang}</a></li>
+                                                               </ul>
+                                                       </li>
+                                               </ul>
+                                       </div>
+                               </nav>
+                               <!-- /top menu -->
+                       {/if}
                        
                        <!-- logo -->
                        <div id="logo" class="logo">

diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl
index 874de4f1cff966b3b525d8d897e465d7ca038b40..7385e6da0e317c2b480216beeb2046c06807e6ac 100644 (file)
--- a/wcfsetup/install/files/acp/templates/login.tpl
+++ b/wcfsetup/install/files/acp/templates/login.tpl
@@ -1,9 +1,16 @@
 {capture assign='pageTitle'}{lang}wcf.user.login{/lang}{/capture}
-{include file='setupHeader'}
+{include file='header'}
 
 <script type="text/javascript">
        //<![CDATA[
-       onloadEvents.push(function() { if (!'{$username|encodeJS}' || '{$errorField}' == 'username') document.getElementById('username').focus(); else document.getElementById('password').focus(); });
+       $(function() {
+               if (!$('#username').val() || '{$errorField}' == 'username') {
+                       $('#username').focus();
+               }
+               else {
+                       $('#password').focus();
+               }
+       });
        //]]>
 </script>
 

diff --git a/wcfsetup/install/files/acp/templates/permissionDenied.tpl b/wcfsetup/install/files/acp/templates/permissionDenied.tpl
index 2bb8c04743450dd9850408603f8bfa4c8bec6b10..d9362e9f541c421e0fc1b1435750300a6b477868 100644 (file)
--- a/wcfsetup/install/files/acp/templates/permissionDenied.tpl
+++ b/wcfsetup/install/files/acp/templates/permissionDenied.tpl
@@ -1,18 +1,5 @@
-{if $__wcf->session->getPermission('admin.general.canUseAcp')}{include file='header' templateName='permissionDenied'}
+{include file='header' templateName='permissionDenied'}
 
 <p class="error">{lang}wcf.global.error.permissionDenied{/lang}</p>
 
 {include file='footer'}
-{else}{capture assign='pageTitle'}{lang}wcf.global.error.permissionDenied.title{/lang}{/capture}
-{include file='setupHeader'}
-
-<img class="icon" src="{@RELATIVE_WCF_DIR}icon/logIn1.svg" alt="" />
-
-<h1>{@$pageTitle}</h1>
-
-<hr />
-
-<p class="error">{lang}wcf.global.error.permissionDenied{/lang}</p>
-
-{include file='setupFooter'}
-{/if}

diff --git a/wcfsetup/install/files/acp/templates/setupFooter.tpl b/wcfsetup/install/files/acp/templates/setupFooter.tpl
deleted file mode 100644 (file)
index 892a5ac..0000000
--- a/wcfsetup/install/files/acp/templates/setupFooter.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-                       </section>
-                       <!-- CONTENT -->
-               </div>
-       </div>
-       <!-- /MAIN -->
-       
-       <!-- FOOTER -->
-       <footer id="pageFooter" class="pageFooter">
-               <div>
-                       <nav id="footerNavigation" class="footerNavigation">
-                               <ul>
-                                       <li id="toTopLink" class="toTopLink"><a href="#top" title="{lang}wcf.global.scrollUp{/lang}" class="balloonTooltip"><img src="{@RELATIVE_WCF_DIR}icon/toTop.svg" alt="" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
-                               </ul>
-                       </nav>
-               </div>
-               <small class="copyright"><a href="http://www.woltlab.com" title="Go to the WoltLab website">Copyright &copy; 2001-2011 WoltLab&reg; GmbH</a></small>
-       </footer>
-       <!-- /FOOTER -->
-       <a id="bottom"></a>
-</body>
-</html>

diff --git a/wcfsetup/install/files/acp/templates/setupHeader.tpl b/wcfsetup/install/files/acp/templates/setupHeader.tpl
deleted file mode 100644 (file)
index e15f589..0000000
--- a/wcfsetup/install/files/acp/templates/setupHeader.tpl
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html dir="{@$__wcf->getLanguage()->getPageDirection()}" lang="{@$__wcf->getLanguage()->getFixedLanguageCode()}">
-<head>
-       <meta charset="utf-8" />
-       <title>{@$pageTitle} - {lang}wcf.global.pageTitle{/lang}</title>
-       <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-       <script type="text/javascript">
-               //<![CDATA[
-               var SID_ARG_2ND = '{@SID_ARG_2ND_NOT_ENCODED}';
-               var RELATIVE_WCF_DIR = '{@RELATIVE_WCF_DIR}';
-               var SECURITY_TOKEN = '{@SECURITY_TOKEN}';
-               //]]>
-       </script>
-       <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/3rdParty/jquery.min.js"></script>
-       <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/3rdParty/jquery-ui.min.js"></script>
-       <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/3rdParty/jquery.tools.min.js"></script>
-       <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/WCF.js"></script>
-       <script type="text/javascript" src="{@RELATIVE_WCF_DIR}acp/js/WCF.ACP.js"></script>
-       <script type="text/javascript">
-               //<![CDATA[
-               WCF.User.init({$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}');
-               //]]>
-       </script>
-       
-       <!-- Stylesheets -->
-       <style type="text/css">
-               @import url("{@RELATIVE_WCF_DIR}acp/style/style.css") screen;
-               {*
-               
-               @import url("{@RELATIVE_WCF_DIR}acp/style/style-{@$__wcf->getLanguage()->getPageDirection()}.css") screen;
-       
-               @import url("{@RELATIVE_WCF_DIR}acp/style/print.css") print;
-               *}
-       </style>
-       
-       {*
-       {if $specialStyles|isset}
-               <!-- special styles -->
-               {@$specialStyles}
-       {/if}
-       *}
-       
-       <script type="text/javascript">
-               //<![CDATA[
-               $(function() {
-                       WCF.Language.addObject({
-                               'wcf.global.button.next': '{lang}wcf.global.button.next{/lang}',
-                               'wcf.global.loading': '{lang}wcf.global.loading{/lang}',
-                               'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
-                               'wcf.date.relative.hours': '{capture assign=relativeHours}{lang}wcf.date.relative.hours{/lang}{/capture}{@$relativeHours|encodeJS}',
-                               'wcf.date.relative.pastDays': '{capture assign=relativePastDays}{lang}wcf.date.relative.pastDays{/lang}{/capture}{@$relativePastDays|encodeJS}',
-                               'wcf.date.dateTimeFormat': '{lang}wcf.date.dateTimeFormat{/lang}',
-                               '__days': [ '{lang}wcf.date.day.sunday{/lang}', '{lang}wcf.date.day.monday{/lang}', '{lang}wcf.date.day.tuesday{/lang}', '{lang}wcf.date.day.wednesday{/lang}', '{lang}wcf.date.day.thursday{/lang}', '{lang}wcf.date.day.friday{/lang}', '{lang}wcf.date.day.saturday{/lang}' ],
-                               'wcf.global.thousandsSeparator': '{capture assign=thousandsSeparator}{lang}wcf.global.thousandsSeparator{/lang}{/capture}{@$thousandsSeparator|encodeJS}',
-                               'wcf.global.decimalPoint': '{capture assign=decimalPoint}{lang}wcf.global.decimalPoint{/lang}{/capture}{$decimalPoint|encodeJS}',
-                               'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}',
-                               'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}'
-                       });
-                       new WCF.Date.Time();
-                       new WCF.Effect.SmoothScroll();
-                       new WCF.Effect.BalloonTooltip();
-               });
-               //]]>
-       </script>
-</head>
-
-<body id="tpl{$templateName|ucfirst}">
-       <a id="top"></a>
-       <!-- HEADER -->
-       <header id="pageHeader" class="pageHeader">
-               <div>
-                       <!-- no top menu -->
-                       
-                       <!-- logo -->
-                       <div id="logo" class="logo">
-                               <!-- clickable area -->
-                               <a href="index.php{@SID_ARG_1ST}">
-                                       <h1>WoltLab Community Framework 2.0 Pre-Alpha 1</h1>
-                                       <img src="{@RELATIVE_WCF_DIR}acp/images/wcfLogoWhite.svg" width="300" height="58" alt="Product-logo" title="WoltLab Community Framework 2.0 Pre-Alpha 1" />
-                               </a>
-                               <!-- /clickable area -->
-                               
-                               <!-- no search area -->
-                       </div>
-                       <!-- /logo -->
-                       
-                       <!-- main menu -->
-                       <nav id="mainMenu" class="mainMenu">
-                               <ul>
-                                       <li class="activeMenuItem">Log-In</li>
-                               </ul>
-                       </nav>
-                       <!-- /main menu -->
-                       
-                       <!-- header navigation -->
-                       <nav class="headerNavigation">
-                               <div>
-                                       <ul>
-                                               <li id="toBottomLink" class="toBottomLink"><a href="#bottom" title="{lang}wcf.global.scrollDown{/lang}" class="balloonTooltip"><img src="{@RELATIVE_WCF_DIR}icon/toBottom.svg" alt="" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
-                                       </ul>
-                               </div>
-                       </nav>
-                       <!-- /header navigation -->
-               </div>
-       </header>
-       <!-- /HEADER -->
-       
-       <!-- MAIN -->
-       <div id="main" class="main">
-               <div>
-                       <!-- NO SIDEBAR -->
-                       
-                       <!-- CONTENT -->
-                       <section id="content" class="content">
-                               
\ No newline at end of file