projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 597ff7f)
Some small optimizations
authorMarcel Werk <burntime@woltlab.com>
Tue, 13 Nov 2012 22:24:14 +0000 (23:24 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 13 Nov 2012 22:24:14 +0000 (23:24 +0100)
wcfsetup/install/files/acp/templates/footer.tpl patch | blob | blame | history
wcfsetup/install/files/acp/templates/header.tpl patch | blob | blame | history
wcfsetup/install/files/acp/templates/login.tpl patch | blob | blame | history
wcfsetup/install/lang/de.xml patch | blob | blame | history

diff --git a/wcfsetup/install/files/acp/templates/footer.tpl b/wcfsetup/install/files/acp/templates/footer.tpl
index 6f9e1ebbe867ddc69928dde6f9aa70ce5e03edb6..c3ecc092132f24e48056e6cf86fb3598a8d9f10b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/footer.tpl
+++ b/wcfsetup/install/files/acp/templates/footer.tpl
@@ -1,10 +1,7 @@
                        </section>
-                       <!-- CONTENT -->
                </div>
        </div>
-       <!-- /MAIN -->
        
-       <!-- FOOTER -->
        <footer id="pageFooter" class="layoutFluid footer">
                <nav id="footerNavigation" class="navigation navigationFooter clearfix">
                        <ul class="navigationIcons">
@@ -23,10 +20,10 @@
                <div class="footerContent">
                        {if PACKAGE_ID && ENABLE_BENCHMARK}{include file='benchmark'}{/if}
                        
-                       <address class="copyright marginTop"><a href="http://www.woltlab.com" title="Go to the WoltLab website">Copyright &copy; 2001-2012 WoltLab&reg; GmbH</a>{event name='copyright'}</address>
+                       <address class="copyright marginTop"><a href="http://www.woltlab.com">Copyright &copy; 2001-2012 WoltLab&reg; GmbH</a>{event name='copyright'}</address>
                </div>
        </footer>
-       <!-- /FOOTER -->
+       
        <a id="bottom"></a>
 </body>
 </html>
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index d1644528f8e617acb603ca771d1c67ea37412493..334e814c17150ab295a433b61500861d3376cd0a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -4,7 +4,6 @@
        <base href="{$baseHref}" />
        <meta charset="utf-8" />
        <title>{if $pageTitle|isset}{@$pageTitle|language} - {/if}{lang}wcf.acp{/lang}{if PACKAGE_ID} - {PAGE_TITLE|language}{/if}</title>
-       <meta http-equiv="X-UA-Compatible" content="IE=edge" />
        <script type="text/javascript">
                //<![CDATA[
                var SID_ARG_1ST = '{@SID_ARG_1ST}';
@@ -70,6 +69,7 @@
                                'wcf.global.confirmation.confirm': '{lang}wcf.global.confirmation.confirm{/lang}',
                                'wcf.global.confirmation.title': '{lang}wcf.global.confirmation.title{/lang}',
                                'wcf.global.form.edit.success': '{lang}wcf.global.form.edit.success{/lang}'
+                               {event name='javascriptLanguageImport'}
                        });
                        WCF.Icon.addObject({
                                'wcf.icon.add': '{@$__wcf->getPath()}icon/add.svg',
@@ -107,11 +107,10 @@
 
 <body id="tpl{$templateName|ucfirst}">
        <a id="top"></a>
-       <!-- HEADER -->
+       
        <header id="pageHeader" class="layoutFluid">
                <div>
                        {if $__wcf->user->userID}
-                               <!-- top menu -->
                                <nav id="topMenu" class="userPanel">
                                        <div class="layoutFluid clearfix">
                                                <ul class="userPanelItems">
@@ -123,9 +122,9 @@
                                                                        <li><a href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="WCF.System.Confirmation.show('{lang}wcf.user.logout.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a></li>
                                                                </ul>
                                                        </li>
+                                                       {event name='topMenu'}
                                                </ul>
                                                
-                                               <!-- search area -->
                                                {if $__wcf->getSession()->getPermission('admin.general.canUseAcp')}
                                                        <aside id="search" class="searchBar">
                                                                <form method="post" action="{link controller='Search'}{/link}">
@@ -133,27 +132,20 @@
                                                                </form>
                                                        </aside>
                                                {/if}
-                                               <!-- /search area -->
                                        </div>
                                </nav>
-                               <!-- /top menu -->
                        {/if}
                        
-                       <!-- logo -->
                        <div id="logo" class="logo">
-                               <!-- clickable area -->
                                <a href="{link controller='Index'}{/link}">
-                                       <h1>WoltLab Community Framework 2.0 Alpha 1</h1>
-                                       <img src="{@$__wcf->getPath()}acp/images/wcfLogo2.svg" width="321" height="58" alt="Product-logo" title="WoltLab Community Framework 2.0 Alpha 1" />
+                                       <h1>{lang}wcf.acp{/lang}</h1>
+                                       <img src="{@$__wcf->getPath()}acp/images/wcfLogo1.svg" width="321" height="58" alt="" />
                                </a>
-                               <!-- /clickable area -->
                        </div>
-                       <!-- /logo -->
                        
                        {* work-around for unknown core-object during WCFSetup *}
                        {if PACKAGE_ID}
                                {hascontent}
-                                       <!-- main menu -->
                                        <nav id="mainMenu" class="mainMenu">
                                                <ul>
                                                        {content}
@@ -163,23 +155,18 @@
                                                        {/content}
                                                </ul>
                                        </nav>
-                                       <!-- /main menu -->
                                {/hascontent}
                        {/if}
                        
-                       <!-- header navigation -->
                        <nav class="navigation navigationHeader clearfix">
                                <ul class="navigationIcons">
                                        <li id="toBottomLink" class="toBottomLink"><a href="{@$__wcf->getAnchor('bottom')}" title="{lang}wcf.global.scrollDown{/lang}" class="jsTooltip"><img src="{@$__wcf->getPath()}icon/circleArrowDownColored.svg" alt="" class="icon16" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
                                        {event name='navigationIcons'}
                                </ul>
                        </nav>
-                       <!-- /header navigation -->
                </div>
        </header>
-       <!-- /HEADER -->
        
-       <!-- MAIN -->
        <div id="main" class="layoutFluid{if PACKAGE_ID && $__wcf->getACPMenu()->getMenuItems('')|count} sidebarOrientationLeft{/if}">
                <div>
                        {hascontent}
@@ -215,6 +202,5 @@
                                </aside>
                        {/hascontent}
                        
-                       <!-- CONTENT -->
                        <section id="content" class="content clearfix">
                                
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl
index 13a6eae0dec47d7e4eb23ce2122a124f861e0c89..f0ec5e8426463135b8eb70a97b7a06679de74681 100644 (file)
--- a/wcfsetup/install/files/acp/templates/login.tpl
+++ b/wcfsetup/install/files/acp/templates/login.tpl
@@ -15,7 +15,7 @@
 
 <header class="boxHeadline">
        <hgroup>
-               <h1>{@$pageTitle}</h1>
+               <h1>{@$pageTitle|language}</h1>
        </hgroup>
 </header>
 
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 631bc6382f29cbbb4ccddef305c46bfafe97a322..e979f618e311bb4fb6a437ef598ccff4d25a2da3 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="de" languagename="Deutsch" countrycode="de">
        <category name="wcf.acp">
-               <item name="wcf.acp"><![CDATA[Administration]]></item>
+               <item name="wcf.acp"><![CDATA[Administrationsoberfläche]]></item>
        </category>
        
        <category name="wcf.acp.application">
WoltLab Suite Core (previously WoltLab Community Framework)