From: Heiner Schmeling <heiner.schmeling@ipfire.org>
Date: Tue, 7 Jul 2009 08:17:57 +0000 (+0200)
Subject: Modified template.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0fcfc468f4992526e00d29676f3be558fd7dfb32;p=ipfire.org.git

Modified template.
---

diff --git a/www/images/bg-menu99.png b/www/images/bg-menu99.png
new file mode 100755
index 00000000..414c53c6
Binary files /dev/null and b/www/images/bg-menu99.png differ
diff --git a/www/images/tux2-99.png b/www/images/tux2-99.png
new file mode 100755
index 00000000..6911f3c2
Binary files /dev/null and b/www/images/tux2-99.png differ
diff --git a/www/include/style.css b/www/include/style.css
index 17c2f7ef..c464c687 100644
--- a/www/include/style.css
+++ b/www/include/style.css
@@ -31,11 +31,10 @@ padding: 0em;
 
 body
 {
-background-color: #fff;
-color: #585858;
   font-family: "Verdana", "Deja-Vu Sans", "Bitstream Vera Sans", sans-serif;
-font-size: 0.9em;
-background: #f0f0f0 url(/images/bg.png) repeat;
+  font-size: 0.9em;
+  background: #880400; /* url(/images/bg.png) repeat;*/
+  color: #585858;
 }
 
 h1,h2,h3,h4,h5,h6
@@ -138,7 +137,7 @@ line-height: 1.5em;
 {
 width:100%;
 height:102px;
-background: #440000 url('/images/bg1.png') repeat-x;
+background: url('/images/bg-menu99.png') repeat-x;
 }
 
 #header_inner
@@ -409,7 +408,8 @@ table {
   background: url(/images/sh-br.png) no-repeat left top;
 }
 #no-sh {
-background-color: #f5f5f5;
+  background-color: #f5f5f5;
+  width: 980px;
 }
 #sh-tl, #sh-top, #sh-tr, #sh-lft, #sh-rgt, #sh-bl, #sh-btn, #sh-br {
   width: 16px;
@@ -431,19 +431,20 @@ background-color: #f5f5f5;
 #nodes td {
   width: 50px;
 }
+
 /* Footer */
 
 #footer
 {
 clear: both;
-width: 100%;
 height: 26px;
 color: #ddd;
 text-align: center;
 background: url(/images/ft.png) left top;
 margin-top: 0em;
 margin-bottom: 0em;
-padding-top: 1.0em;
+padding-top: 0.5em;
+padding-bottom: 0.5em;
 text-transform: lowercase;
 }
 
diff --git a/www/template.inc b/www/template.inc
index 9b4d9798..5984ba8d 100644
--- a/www/template.inc
+++ b/www/template.inc
@@ -8,10 +8,7 @@
 		<meta name="description" content="" />
 		<meta name="verify-v1" content="2LEf3W8naILGWVy2dhedSVEHPXTpp2xFNVsHXZMH1JI=" />
 		<link rel="stylesheet" type="text/css" href="/include/style.css" />
-		<link rel="alternate" type="application/rss+xml" title="RSS" href="feed://www.ipfire.org/de/news.rss" />
-		<script src="/include/jquery.js" type="text/javascript"></script>
-		<script src="/include/jquery-ui.js" type="text/javascript"></script>
-		<script src="/include/jquery.progressbar.min.js" type="text/javascript"></script>
+		<link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.ipfire.org/data/feeds/main-en.rss" />
 	<!--[if lt IE 7]>
 		<link rel="stylesheet" type="text/css" href="/include/ie6.css" />
 		<script src="/include/correctpng.js" type="text/javascript"></script>
@@ -21,7 +18,7 @@
 		<div id="header">
 			<div id="header_inner" class="fixed">
 				<div id="logo">
-					<a href="/" accesskey="h" title="[ALT+H]"><img src="/images/tux2.png" width="102px" height="102px" class="symbol" alt="IPFire" /></a>
+					<a href="/" accesskey="h" title="[ALT+H]"><img src="/images/tux2-99.png" width="100px" height="102px" class="symbol" alt="IPFire" /></a>
 				</div>
 				<div id="line1">
 					%(menu)s
@@ -64,6 +61,15 @@
 						</td>
 						<td id="sh-rgt"></td>
 					</tr>
+					
+					<tr>
+						<td id="sh-lft"></td>
+						<td id="footer" class="fixed2">
+							Copyright &copy; %(year)s IPFire.org. All rights reserved. <a href="/%(lang)s/imprint">Imprint</a>
+						</td>
+						<td id="sh-rgt"></td>
+					</tr>
+					
 					<tr>
 						<td id="sh-bl"></td>
 						<td id="sh-btn"></td>
@@ -72,8 +78,5 @@
 				</table>
 			</div>
 		</div>
-		<div id="footer" class="fixed2">
-			Copyright &copy; %(year)s IPFire.org. All rights reserved. <a href="/%(lang)s/imprint">Imprint</a>
-		</div>
 	</body>
 </html>