New Webdesign ipfire3 by cm

diff --git a/www/footer.inc b/www/footer.inc
index a02c19693c8306a9e26587629085d20a7b4388da..d3d61d6b4611e39c3247912e7acaad1322cb6812 100644 (file)
--- a/www/footer.inc
+++ b/www/footer.inc
@@ -1,7 +1,16 @@
-                               <br class="clear" />
-                       </div>
+                                               <br class="clear" />
+                               </td>
+                               <td id="sh-rgt"></td>
+                           </tr>
+                           <tr>
+                                   <td id="sh-bl"></td>
+                                   <td id="sh-btn"></td>
+                                   <td id="sh-br"></td>
+                           </tr>
+                       </table>
+                   </div>
                </div>
-               <div id="footer" class="fixed">
+               <div id="footer" class="fixed2">
                        Copyright &copy; 2008 IPFire.org. All rights reserved. <a href="/imprint/%(lang)s">Imprint</a>
                </div>
        </body>

diff --git a/www/header.inc b/www/header.inc
index 94b6783fcfbd4d99966e2ce2c9df71898e26bf37..2f7270744bf5b9230d97c823c86073b5fb0a2b52 100644 (file)
--- a/www/header.inc
+++ b/www/header.inc
@@ -10,6 +10,7 @@
                <link rel="stylesheet" type="text/css" href="../style.css" />
                <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="./ie6.css" />
                <script type="text/javascript">
                        function correctPNG() // correctly handle PNG transparency in Win IE 5.5 or higher.
                        {
@@ -43,17 +44,33 @@
                <div id="header">
                        <div id="header_inner" class="fixed">
                                <div id="logo">
-                                       <img src="/images/icons/ipfire.png" width="48px" height="48px" class="symbol" alt="IPFire" />
+                                       <img src="/ipfire3/tux2.png" width="102px" height="102px" class="symbol" alt="IPFire" />
+                               </div>
+                               <div id="line1">
+                                       %(menu)s
+                                       <div id="lang">
+                                               <a href="/%(document_name)s/en" ><img src="/images/en.gif" alt="english" /></a>
+                                               <a href="/%(document_name)s/de" ><img src="/images/de.gif" alt="german" /></a>
+                                       </div>
+                               </div> <!-- Line 1 -->
+                               <div id="line2">
                                        <h1><span>IPFire</span>.org</h1>
-                                       <br />
+                               </div> <!-- Line 2 -->
+                               <div id="line3">
                                        <h2>Security today!</h2>
-                               </div>
-                               <div id="lang">
-                                       <a href="/%(document_name)s/en" ><img src="/images/en.gif" alt="english" /></a>
-                                       <a href="/%(document_name)s/de" ><img src="/images/de.gif" alt="german" /></a>
-                               </div>
-                               %(menu)s
+                               </div> <!-- Line 3 -->
+                               
                        </div>
                </div>
                <div id="main">
-                       <div id="main_inner" class="fixed">
+                   <div id="main_inner" class="fixed">
+                       <table>
+                           <tr>
+                               <td id="sh-tl"></td>
+                               <td id="sh-top"></td>
+                               <td id="sh-tr"></td>
+                           </tr>
+                           <tr>
+                               <td id="sh-lft"></td>
+                               <td id="no-sh">
+

diff --git a/www/ie6.css b/www/ie6.css
new file mode 100644 (file)
index 0000000..9208485
--- /dev/null
+++ b/www/ie6.css
@@ -0,0 +1,23 @@
+/* Settings for IE6 and older */
+body
+{
+    background: #f5f5f5;
+}
+
+#header h1
+{
+    margin-left: 52px;
+}
+
+#header h2
+{
+    margin-left: 52px;
+}
+#menu li
+{
+    width: 1em;
+}
+p
+{
+padding-right: 1.5em;
+}

diff --git a/www/ipfire.py b/www/ipfire.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/www/ipfire3/bg-950.png b/www/ipfire3/bg-950.png
new file mode 100644 (file)
index 0000000..83c7387
Binary files /dev/null and b/www/ipfire3/bg-950.png differ

diff --git a/www/ipfire3/bg-950.png._ b/www/ipfire3/bg-950.png._
new file mode 100644 (file)
index 0000000..743bf8c
Binary files /dev/null and b/www/ipfire3/bg-950.png._ differ

diff --git a/www/ipfire3/bg-new.png b/www/ipfire3/bg-new.png
new file mode 100644 (file)
index 0000000..16a69ad
Binary files /dev/null and b/www/ipfire3/bg-new.png differ

diff --git a/www/ipfire3/bg-shl.png b/www/ipfire3/bg-shl.png
new file mode 100644 (file)
index 0000000..c3fc391
Binary files /dev/null and b/www/ipfire3/bg-shl.png differ

diff --git a/www/ipfire3/bg-shr.png b/www/ipfire3/bg-shr.png
new file mode 100644 (file)
index 0000000..eddb0eb
Binary files /dev/null and b/www/ipfire3/bg-shr.png differ

diff --git a/www/ipfire3/bg1.png b/www/ipfire3/bg1.png
new file mode 100644 (file)
index 0000000..9a6cc82
Binary files /dev/null and b/www/ipfire3/bg1.png differ

diff --git a/www/ipfire3/bg2-950.png b/www/ipfire3/bg2-950.png
new file mode 100644 (file)
index 0000000..05a27b6
Binary files /dev/null and b/www/ipfire3/bg2-950.png differ

diff --git a/www/ipfire3/btn-blue.png b/www/ipfire3/btn-blue.png
new file mode 100644 (file)
index 0000000..c9b0f55
Binary files /dev/null and b/www/ipfire3/btn-blue.png differ

diff --git a/www/ipfire3/btn-empty.png b/www/ipfire3/btn-empty.png
new file mode 100644 (file)
index 0000000..64ee685
Binary files /dev/null and b/www/ipfire3/btn-empty.png differ

diff --git a/www/ipfire3/btn-green.png b/www/ipfire3/btn-green.png
new file mode 100644 (file)
index 0000000..08b47ba
Binary files /dev/null and b/www/ipfire3/btn-green.png differ

diff --git a/www/ipfire3/btn-orange.png b/www/ipfire3/btn-orange.png
new file mode 100644 (file)
index 0000000..c39d263
Binary files /dev/null and b/www/ipfire3/btn-orange.png differ

diff --git a/www/ipfire3/btn-red.png b/www/ipfire3/btn-red.png
new file mode 100644 (file)
index 0000000..50e5a35
Binary files /dev/null and b/www/ipfire3/btn-red.png differ

diff --git a/www/ipfire3/btn-red1.png b/www/ipfire3/btn-red1.png
new file mode 100644 (file)
index 0000000..98d873b
Binary files /dev/null and b/www/ipfire3/btn-red1.png differ

diff --git a/www/ipfire3/btn-red2.png b/www/ipfire3/btn-red2.png
new file mode 100644 (file)
index 0000000..03be381
Binary files /dev/null and b/www/ipfire3/btn-red2.png differ

diff --git a/www/ipfire3/btn-white.png b/www/ipfire3/btn-white.png
new file mode 100644 (file)
index 0000000..c4941f3
Binary files /dev/null and b/www/ipfire3/btn-white.png differ

diff --git a/www/ipfire3/btn-yellow.png b/www/ipfire3/btn-yellow.png
new file mode 100644 (file)
index 0000000..6b15096
Binary files /dev/null and b/www/ipfire3/btn-yellow.png differ

diff --git a/www/ipfire3/btn1-blue.png b/www/ipfire3/btn1-blue.png
new file mode 100644 (file)
index 0000000..6b214ce
Binary files /dev/null and b/www/ipfire3/btn1-blue.png differ

diff --git a/www/ipfire3/btn1-break.png b/www/ipfire3/btn1-break.png
new file mode 100644 (file)
index 0000000..aa19e49
Binary files /dev/null and b/www/ipfire3/btn1-break.png differ

diff --git a/www/ipfire3/btn1-empty.png b/www/ipfire3/btn1-empty.png
new file mode 100644 (file)
index 0000000..d335508
Binary files /dev/null and b/www/ipfire3/btn1-empty.png differ

diff --git a/www/ipfire3/btn1-green.png b/www/ipfire3/btn1-green.png
new file mode 100644 (file)
index 0000000..ac7f141
Binary files /dev/null and b/www/ipfire3/btn1-green.png differ

diff --git a/www/ipfire3/btn1-orange.png b/www/ipfire3/btn1-orange.png
new file mode 100644 (file)
index 0000000..c0b840b
Binary files /dev/null and b/www/ipfire3/btn1-orange.png differ

diff --git a/www/ipfire3/btn1-red.png b/www/ipfire3/btn1-red.png
new file mode 100644 (file)
index 0000000..77ed493
Binary files /dev/null and b/www/ipfire3/btn1-red.png differ

diff --git a/www/ipfire3/btn1-red2.png b/www/ipfire3/btn1-red2.png
new file mode 100644 (file)
index 0000000..5cc1837
Binary files /dev/null and b/www/ipfire3/btn1-red2.png differ

diff --git a/www/ipfire3/btn1-white.png b/www/ipfire3/btn1-white.png
new file mode 100644 (file)
index 0000000..1b74a96
Binary files /dev/null and b/www/ipfire3/btn1-white.png differ

diff --git a/www/ipfire3/btn1-yellow.png b/www/ipfire3/btn1-yellow.png
new file mode 100644 (file)
index 0000000..b3a688f
Binary files /dev/null and b/www/ipfire3/btn1-yellow.png differ

diff --git a/www/ipfire3/ft.png b/www/ipfire3/ft.png
new file mode 100644 (file)
index 0000000..3f29a2b
Binary files /dev/null and b/www/ipfire3/ft.png differ

diff --git a/www/ipfire3/lf1.png b/www/ipfire3/lf1.png
new file mode 100644 (file)
index 0000000..9d3e4be
Binary files /dev/null and b/www/ipfire3/lf1.png differ

diff --git a/www/ipfire3/lf2.png b/www/ipfire3/lf2.png
new file mode 100644 (file)
index 0000000..43ae11b
Binary files /dev/null and b/www/ipfire3/lf2.png differ

diff --git a/www/ipfire3/lf3.png b/www/ipfire3/lf3.png
new file mode 100644 (file)
index 0000000..1065963
Binary files /dev/null and b/www/ipfire3/lf3.png differ

diff --git a/www/ipfire3/mnu2l.png b/www/ipfire3/mnu2l.png
new file mode 100644 (file)
index 0000000..7494590
Binary files /dev/null and b/www/ipfire3/mnu2l.png differ

diff --git a/www/ipfire3/mnu2r.png b/www/ipfire3/mnu2r.png
new file mode 100644 (file)
index 0000000..7c15303
Binary files /dev/null and b/www/ipfire3/mnu2r.png differ

diff --git a/www/ipfire3/mnu2t1.png b/www/ipfire3/mnu2t1.png
new file mode 100644 (file)
index 0000000..fee0474
Binary files /dev/null and b/www/ipfire3/mnu2t1.png differ

diff --git a/www/ipfire3/mnu2t2.png b/www/ipfire3/mnu2t2.png
new file mode 100644 (file)
index 0000000..d271345
Binary files /dev/null and b/www/ipfire3/mnu2t2.png differ

diff --git a/www/ipfire3/sh-bl.png b/www/ipfire3/sh-bl.png
new file mode 100644 (file)
index 0000000..f35805c
Binary files /dev/null and b/www/ipfire3/sh-bl.png differ

diff --git a/www/ipfire3/sh-br.png b/www/ipfire3/sh-br.png
new file mode 100644 (file)
index 0000000..589488a
Binary files /dev/null and b/www/ipfire3/sh-br.png differ

diff --git a/www/ipfire3/sh-btn.png b/www/ipfire3/sh-btn.png
new file mode 100644 (file)
index 0000000..ceda0ff
Binary files /dev/null and b/www/ipfire3/sh-btn.png differ

diff --git a/www/ipfire3/sh-lft.png b/www/ipfire3/sh-lft.png
new file mode 100644 (file)
index 0000000..9663d12
Binary files /dev/null and b/www/ipfire3/sh-lft.png differ

diff --git a/www/ipfire3/sh-rgt.png b/www/ipfire3/sh-rgt.png
new file mode 100644 (file)
index 0000000..a6d6733
Binary files /dev/null and b/www/ipfire3/sh-rgt.png differ

diff --git a/www/ipfire3/sh-tl.png b/www/ipfire3/sh-tl.png
new file mode 100644 (file)
index 0000000..5be4faf
Binary files /dev/null and b/www/ipfire3/sh-tl.png differ

diff --git a/www/ipfire3/sh-top.png b/www/ipfire3/sh-top.png
new file mode 100644 (file)
index 0000000..e92e00f
Binary files /dev/null and b/www/ipfire3/sh-top.png differ

diff --git a/www/ipfire3/sh-tr.png b/www/ipfire3/sh-tr.png
new file mode 100644 (file)
index 0000000..c6fe7e1
Binary files /dev/null and b/www/ipfire3/sh-tr.png differ

diff --git a/www/ipfire3/tux.png b/www/ipfire3/tux.png
new file mode 100644 (file)
index 0000000..0e5700f
Binary files /dev/null and b/www/ipfire3/tux.png differ

diff --git a/www/ipfire3/tux2.png b/www/ipfire3/tux2.png
new file mode 100644 (file)
index 0000000..8670688
Binary files /dev/null and b/www/ipfire3/tux2.png differ

diff --git a/www/style.css b/www/style.css
index c6a2478c0c9adf15f9fade761c3c909308884154..6393e5a547bd75057cbffd9bd1d854262617934d 100644 (file)
--- a/www/style.css
+++ b/www/style.css
@@ -17,7 +17,8 @@ width: 90% !important;
 
 div.fixed
 {
-width: 950px !important;
+width: 965px !important;
+margin: 0;
 }
 
 /* Basic Stuff */
@@ -32,8 +33,16 @@ body
 {
 background-color: #fff;
 color: #585858;
+  font-family: "Verdana", "Deja-Vu Sans", "Bitstream Vera Sans", sans-serif;
 font-size: 9pt;
-font-family: "trebuchet ms", helvetica, sans-serif;
+/* font-family: "trebuchet ms", helvetica, sans-serif; */
+background: #f0f0f0 url(ipfire3/bg-new.png) repeat;
+}
+
+body2xx {
+  font-family: "Verdana", "Deja-Vu Sans", "Bitstream Vera Sans", sans-serif;
+  font-size: 0.8em;
+  background: #f0f0f0 url(images2/bg-new.png) repeat;
 }
 
 h1,h2,h3,h4,h5,h6
@@ -113,7 +122,8 @@ list-style: none;
 
 ul.links li
 {
-line-height: 2em;
+line-height: 1.5em;
+/* display: inline; */
 }
 
 ul.links li.first
@@ -130,16 +140,24 @@ line-height: 1.8em;
 #header
 {
 width:100%;
-height:122px;
-background: #440000 url('images/n1.gif') repeat-x;
+height:102px;
+background: #440000 url('./ipfire3/bg1.png') repeat-x;
+/* margin: 0; */
 }
 
 #header_inner
 {
 position: relative;
-width: 950px;
-height:122px;
+width: 980px;
+height:102px;
 margin: 0 auto;
+/* padding: 0; */
+}
+
+img.symbol
+{
+margin: 0;
+padding: 0;
 }
 
 /* Logo */
@@ -147,22 +165,45 @@ margin: 0 auto;
 #logo
 {
 position: absolute;
-bottom: 0.6em;
+top: 0;
+float: left;
+/* margin: 0;
+bottom: 0.6em; */
 }
 
-#logo h1
+#header h1
 {
-display: inline;
+float: left;
+margin-left: 105px;
+/* display: inline; */
 color: #fff;
-font-size: 2.6em;
+font-size: 200%;
 }
 
-#logo h2
+#header h2
 {
-display: inline;
-padding-left: 0.5em;
+float: left;
+margin-left: 105px;
+/* display: inline; */
 color: #E5CCD0;
 font-size: 1.0em;
+vertical-align: bottom;
+}
+
+/* Header Line's */
+#line1
+{
+height: 36px;
+}
+
+#line2
+{
+height: 32px;
+}
+
+#line3
+{
+height: 31px;
 }
 
 /* Lang */
@@ -189,8 +230,8 @@ width: 30px;
 #menu
 {
 position: absolute;
-right: 0em;
-bottom: 0em;
+left: 105px;
+top: 0em;
 }
 
 #menu ul
@@ -202,39 +243,55 @@ list-style: none;
 {
 float: left;
 }
-
+#menu li
+{
+vertical-align: middle;
+background: #333 url('ipfire3/btn1-break.png') center;
+}
 #menu li a
 {
-margin-left: 0.5em;
+margin-left: 1px; /*0.5em;*/
+margin-right: 1px;
 display: block;
-padding: 1.1em 1.4em 1.0em 1.4em;
-background: #fff url('images/n4.gif') repeat-x;
-border: solid 1px #fff;
-color: #616161;
-font-weight: bold;
-font-size: 1.0em;
+/* padding: 1.1em 1.4em 1.0em 1.4em; */
+padding: 8px 6px 5px 6px;
+height: 23px;
+background: #333 url('ipfire3/btn1-empty.png') repeat-x center;
+/* border: solid 1px #fff; */
+/* color: #616161;  */
+color: #f5f5f5;
+/* font-weight: bolder; */
+vertical-align: middle;
+font-size: 1.25em;
 text-transform: lowercase;
 text-decoration: none;
 }
 
 #menu li a.active
 {
-background: #CA2F2F url('images/n3.gif') repeat-x;
+background: #CA2F2F url('ipfire3/btn1-red2.png') repeat-x center;
+color: #fff;
+/* border: solid 1px #A94B4B; */
+}
+
+#menu li a:hover
+{
+background: #333 url('ipfire3/btn1-red2.png') repeat-x center;
 color: #fff;
-border: solid 1px #A94B4B;
 }
 
 /* Main */
 
 #main
 {
-background: #fff url('images/n2.gif') 0px 1px repeat-x;
+/* background: #fff url('images/n2.gif') 0px 1px repeat-x; */
 }
 
 #main_inner p
 {
 text-align: justify;
 margin-bottom: 2.0em;
+font-size: 0.9em;
 }
 
 #main_inner ul
@@ -247,7 +304,8 @@ margin-bottom: 2.0em;
 position: relative;
 width: 950px;
 margin: 0 auto;
-padding-top: 3.5em;
+/* padding-top: 3.5em; */
+/* background-color: #f5f5f5; */
 }
 
 #main_inner h3,h4
@@ -291,12 +349,17 @@ top: 3em;
 font-size: 0.8em;
 }
 
+#main_inner .post ul
+{
+padding-left: 1.0em; 
+}
+
 #main_inner .post ul.post_info li
 {
-background-position: 0em 0.2em;
+background-position: 0em center; /* 0.2em; */
 background-repeat: no-repeat;
 display: inline;
-padding-left: 18px;
+padding-left: 15px;
 }
 
 #main_inner .post ul.post_info li.date
@@ -310,17 +373,67 @@ background-image: url('images/n6.gif');
 margin-left: 1.1em;
 }
 
+table {
+  border: 0px;
+  border-collapse: collapse;
+  border-spacing: 0px;
+  margin: 0em;
+  padding: 0em;
+  width: 980px;
+}
+#sh-tl {
+  background: url(ipfire3/sh-tl.png) right bottom;
+}
+#sh-top {
+  background: url(ipfire3/sh-top.png) repeat-x bottom;
+}
+#sh-tr {
+  background: url(ipfire3/sh-tr.png) left bottom;
+}
+#sh-lft {
+  background: url(ipfire3/sh-lft.png) repeat-y right;
+}
+#sh-rgt {
+  background: url(ipfire3/sh-rgt.png) repeat-y left;
+}
+#sh-bl {
+  background: url(ipfire3/sh-bl.png) right top;
+}
+#sh-btn {
+  background: url(ipfire3/sh-btn.png) repeat-x top;
+}
+#sh-br {
+  background: url(ipfire3/sh-br.png) left top;
+}
+#no-sh {
+/*  background: url(ipfire3/sh-br.png) left top; */
+background-color: #f5f5f5;
+padding: 1.5em;
+}
+#sh-tl, #sh-top, #sh-tr, #sh-lft, #sh-rgt, #sh-bl, #sh-btn, #sh-br {
+  width: 12px;
+  height: 12px;
+  padding: 0px;
+  border-width: 0px;
+  border-style: none;
+}
+
+
+
 /* Footer */
 
 #footer
 {
-width: 950px;
-margin: 0 auto;
-text-align: center;
 clear: both;
-border-top: dotted 1px #E1E1E1;
-margin-top: 1.0em;
-margin-bottom: 1.0em;
+width: 100%;
+height: 26px;
+color: #ddd;
+/* margin: 0 auto; */
+text-align: center;
+/* border-top: dotted 1px #E1E1E1; */
+background: url(ipfire3/ft.png) left top;
+margin-top: 0em;
+margin-bottom: 0em;
 padding-top: 1.0em;
 text-transform: lowercase;
 }