From f6ff1ae9cdbf60723126b6dcf35e189a74b56833 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 28 Feb 2012 20:03:21 +0100
Subject: [PATCH] Added option to show the current time in the footer

---
 com.woltlab.wcf/option.xml               |  5 +++++
 com.woltlab.wcf/template/footer.tpl      | 13 +++++++++++++
 com.woltlab.wcf/template/footerMenu.tpl  | 13 ++++++-------
 wcfsetup/install/files/acp/style/wcf.css |  5 +++--
 wcfsetup/install/lang/de.xml             |  1 +
 wcfsetup/install/lang/en.xml             |  1 +
 6 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index edcae45185..be4f0e64fe 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -255,6 +255,11 @@ imagick:wcf.acp.option.image_adapter_type.imagick]]>
 				<optiontype>timezone</optiontype>
 				<defaultvalue>Europe/London</defaultvalue>
 			</option>
+			<option name="show_clock">
+				<categoryname>general.date</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+			</option>
 			<!-- /general.date -->
 			
 			<!-- mail.general -->
diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl
index 37166131fa..9c7ae20221 100644
--- a/com.woltlab.wcf/template/footer.tpl
+++ b/com.woltlab.wcf/template/footer.tpl
@@ -9,6 +9,19 @@
 	<!-- FOOTER -->
 	<footer id="pageFooter" class="wcf-pageFooter">
 		<div>
+			<!-- footer navigation -->
+			<nav id="footerNavigation" class="wcf-footerNavigation">
+				{include file='footerMenu'}
+				
+				<ul>
+					<li id="toTopLink" class="toTopLink"><a href="{@$__wcf->getAnchor('top')}" title="{lang}wcf.global.scrollUp{/lang}" class="jsTooltip"><img src="{icon size='S'}toTop{/icon}" alt="" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
+					{if SHOW_CLOCK}
+						<li><p><img src="{icon size='S'}time1{/icon}" alt="" /> <span>{@TIME_NOW|plainTime}</span></p></li>
+					{/if}
+				</ul>
+			</nav>
+			<!-- /footer navigation -->
+			
 			{include file='footerMenu'}
 		</div>
 		
diff --git a/com.woltlab.wcf/template/footerMenu.tpl b/com.woltlab.wcf/template/footerMenu.tpl
index 890dd392ae..a6fc493f34 100644
--- a/com.woltlab.wcf/template/footerMenu.tpl
+++ b/com.woltlab.wcf/template/footerMenu.tpl
@@ -1,10 +1,9 @@
-<nav id="footerNavigation" class="wcf-footerNavigation">
-	<ul>
-		<li id="toTopLink" class="toTopLink"><a href="{@$__wcf->getAnchor('top')}" title="{lang}wcf.global.scrollUp{/lang}" class="jsTooltip"><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}
+{if $__wcf->getPageMenu()->getMenuItems('footer')|count > 0}
+	<div class="wcf-menu">
+		<ul>
 			{foreach from=$__wcf->getPageMenu()->getMenuItems('footer') item=menuItem}
 				<li><a href="{$menuItem->getProcessor()->getLink()}">{lang}{$menuItem->menuItem}{/lang}{if $menuItem->getProcessor()->getNotifications()} <span class="wcf-badge">{#$menuItem->getProcessor()->getNotifications()}</span>{/if}</a></li>
 			{/foreach}
-		{/if}
-	</ul>
-</nav>
+		</ul>
+	</div>
+{/if}
diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css
index 06672f9db7..4ced5ce349 100644
--- a/wcfsetup/install/files/acp/style/wcf.css
+++ b/wcfsetup/install/files/acp/style/wcf.css
@@ -1161,13 +1161,14 @@ nav.wcf-topMenu {
 
 .wcf-headerNavigation > ul > li,
 .wcf-footerNavigation > ul > li {
-	cursor: pointer;
+	/*cursor: pointer;*/
 	margin: 0 3px;
 	float: right;
 }
 
 .wcf-headerNavigation > ul > li a,
-.wcf-footerNavigation > ul > li a {
+.wcf-footerNavigation > ul > li a,
+.wcf-footerNavigation > ul > li > p {
 	padding: 3px;
 	display: inline-block;
 }
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index e674eccfdb..672c7f62ed 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -269,6 +269,7 @@
 		<item name="wcf.acp.option.image_adapter_type"><![CDATA[Bildmanipulation]]></item>
 		<item name="wcf.acp.option.image_adapter_type.gd"><![CDATA[GD Library (Standard)]]></item>
 		<item name="wcf.acp.option.image_adapter_type.imagick"><![CDATA[ImageMagick]]></item>
+		<item name="wcf.acp.option.show_clock"><![CDATA[Aktuelle Uhrzeit im Fußbereich der Seite anzeigen]]></item>
 	</category>
 
 	<category name="wcf.acp.package">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 7e243e99c6..83611a5b35 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -269,6 +269,7 @@
 		<item name="wcf.acp.option.image_adapter_type"><![CDATA[Image library]]></item>
 		<item name="wcf.acp.option.image_adapter_type.gd"><![CDATA[GD Library (default)]]></item>
 		<item name="wcf.acp.option.image_adapter_type.imagick"><![CDATA[ImageMagick]]></item>
+		<item name="wcf.acp.option.show_clock"><![CDATA[Show current time in page footer]]></item>
 	</category>
 
 	<category name="wcf.acp.package">
-- 
2.20.1