From 91d3ce06856bf07fa8b630fcea6e5c992b367c4f Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 10 Nov 2011 22:09:48 +0100
Subject: [PATCH] Some small optimizations

---
 com.woltlab.wcf/template/footerMenu.tpl            |  3 +--
 com.woltlab.wcf/template/headInclude.tpl           |  8 ++++++++
 com.woltlab.wcf/template/header.tpl                |  2 +-
 .../install/files/lib/page/AbstractPage.class.php  | 14 +++++++-------
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/com.woltlab.wcf/template/footerMenu.tpl b/com.woltlab.wcf/template/footerMenu.tpl
index e729e15ab1..ec789da5e2 100644
--- a/com.woltlab.wcf/template/footerMenu.tpl
+++ b/com.woltlab.wcf/template/footerMenu.tpl
@@ -1,8 +1,7 @@
 <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>
+		<li id="toTopLink" class="toTopLink"><a href="#top" title="{lang}wcf.global.scrollUp{/lang}" class="balloonTooltip"><img src="{icon size='S'}toTop{/icon}" alt="" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
 		{if $__wcf->getPageMenu()->getMenuItems('footer')|count > 0}
-			<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>
 			{foreach from=$__wcf->getPageMenu()->getMenuItems('footer') item=menuItem}
 				<li><a href="{$menuItem->menuItemLink}">{$menuItem->menuItem} ({#$menuItem->getProcessor()->getNotifications()})</a></li>
 			{/foreach}
diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index e772f72ee7..7a6f184dd4 100644
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -35,6 +35,14 @@
 	{event name='stylesheetImport'}
 </style>
 
+<noscript>
+	<style type="text/css">
+		.javascriptOnly {
+			display: none !important;
+		}
+	</style>
+</noscript>
+
 <script type="text/javascript">
 	//<![CDATA[
 	$(function() {
diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index b322dcd4e4..6ab722e6a0 100644
--- a/com.woltlab.wcf/template/header.tpl
+++ b/com.woltlab.wcf/template/header.tpl
@@ -36,8 +36,8 @@
 		<nav class="headerNavigation">
 			<div>
 				<ul>
+					<li id="toBottomLink" class="toBottomLink"><a href="#bottom" title="{lang}wcf.global.scrollDown{/lang}" class="balloonTooltip"><img src="{icon size='S'}toBottom{/icon}" alt="" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
 					{event name='headerNavigation'}
-					<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>
diff --git a/wcfsetup/install/files/lib/page/AbstractPage.class.php b/wcfsetup/install/files/lib/page/AbstractPage.class.php
index dbaf1341d7..bfa8052f3c 100644
--- a/wcfsetup/install/files/lib/page/AbstractPage.class.php
+++ b/wcfsetup/install/files/lib/page/AbstractPage.class.php
@@ -131,6 +131,13 @@ abstract class AbstractPage implements IPage {
 		// read data
 		$this->readData();
 
+		// try to guess template name
+		if (empty($this->templateName)) {
+			$classParts = explode('\\', get_class($this));
+			$className = preg_replace('~(Form|Page)$~', '', array_pop($classParts));
+			$this->templateName = lcfirst($className);
+		}
+		
 		// assign variables
 		$this->assignVariables();		
 		
@@ -138,13 +145,6 @@ abstract class AbstractPage implements IPage {
 		EventHandler::getInstance()->fireAction($this, 'show');
 		
 		if ($this->useTemplate) {
-			// try to guess template name
-			if (empty($this->templateName)) {
-				$classParts = explode('\\', get_class($this));
-				$className = preg_replace('~(Form|Page)$~', '', array_pop($classParts));
-				$this->templateName = lcfirst($className);
-			}
-			
 			// show template
 			WCF::getTPL()->display($this->templateName);
 		}
-- 
2.20.1