On 05/02/12 14:18, Carlos R. Mafra wrote:
> On Sun, 5 Feb 2012 at 13:13:08 +0000, Carlos R. Mafra wrote:
>>
>> http://repo.or.cz/w/whome.git
>
> The source there does not correspond to what you currently see
> at beta.windowmaker.org, as the site was not updated yet.
>
>
Hi Carlos,
please, don't edit the pages with that html editor, because it is writing the
headers (head, title, body,...) tags in every file. The editor is breaking the
lines too.
I don't delete the homewmaker2.png image, but I am not using it in these files
(dock, header and main). You can change
<?php include("header.php"); ?><?php include("dock.php"); ?><?php
include("main.php"); ?>
by
<?php include("header.php"); include("dock.php"); include("main.php"); ?>
These are the changes that I made in the previous mail :-)
Cheers.
>From 3e926515415fbbde3432302b739e274ed2c73798 Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <[email protected]>
Date: Sun, 5 Feb 2012 16:09:51 +0100
Subject: [PATCH] Width tags clean
Removed the body and header tags of these pages, because when are joined by php
the final document will have three times the body and the header tags included.
Removed the width tags, to avoid the space in the right side and the horizontal
slide.
Removed the homewmaker2.png link image, because this text can be made using
formatted text.
Removed a lot of \n \r.
---
dock.php | 28 ++++----------------------
header.php | 16 ++------------
index.php | 12 +++++++---
main.php | 40 +++++++++++---------------------------
title.css | 61 ++++++++++++++++++++++++++++++-----------------------------
5 files changed, 59 insertions(+), 98 deletions(-)
diff --git a/dock.php b/dock.php
index 29f0a0f..ffe56c3 100644
--- a/dock.php
+++ b/dock.php
@@ -1,41 +1,23 @@
-<html>
-<head>
- <meta name="generator" content="HTML Tidy for Linux (vers 25 March 2009),
see www.w3.org">
-
- <title></title>
-</head>
-
-<body>
<div id="dock">
<table width="64" height="500" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td><a href="home.php" onmouseout="MM_swapImgRestore()" onmouseover=
- "MM_swapImage('Image1','','homewmaker.png',0)"><img
src="homewmaker.png" alt="Home" width="60" height="81" border="0" id=
- "Image1"></a></td>
+ <td><a href="home.php" onmouseout="MM_swapImgRestore()"
onmouseover="MM_swapImage('Image1','','homewmaker.png',0)"><img
src="homewmaker.png" alt="Home" width="60" height="81"></a></td>
</tr>
<tr>
- <td><a href="news.php" onmouseout="MM_swapImgRestore()"
onmouseover="MM_swapImage('Image2','','news.png',0)"><img src=
- "news.png" alt="News" width="60" height="81" border="0"
id="Image2"></a></td>
+ <td><a href="news.php" onmouseout="MM_swapImgRestore()"
onmouseover="MM_swapImage('Image2','','news.png',0)"><img src="news.png"
alt="News" width="60" height="81"></a></td>
</tr>
<tr>
- <td><a href="docs.php" onmouseout="MM_swapImgRestore()"
onmouseover="MM_swapImage('Image3','','docs.png',0)"><img src=
- "docs.png" alt="Documentation" width="60" height="81" border="0"
id="Image3"></a></td>
+ <td><a href="docs.php" onmouseout="MM_swapImgRestore()"
onmouseover="MM_swapImage('Image3','','docs.png',0)"><img src="docs.png"
alt="Documentation" width="60" height="81"></a></td>
</tr>
<tr>
- <td><a href="lists.php" onmouseout="MM_swapImgRestore()" onmouseover=
- "MM_swapImage('Image4','','mailing_list.png',0)"><img
src="mailing_list.png" alt="Mailing Lists" width="60" height="81"
- border="0" id="Image4"></a></td>
+ <td><a href="lists.php" onmouseout="MM_swapImgRestore()"
onmouseover="MM_swapImage('Image4','','mailing_list.png',0)"><img
src="mailing_list.png" alt="Mailing Lists" width="60" height="81"></a></td>
</tr>
<tr>
- <td><a href="dev.php" onmouseout="MM_swapImgRestore()" onmouseover=
- "MM_swapImage('Image5','','development.png',0)"><img
src="development.png" alt="Development" width="60" height="81"
- border="0" id="Image5"></a></td>
+ <td><a href="dev.php" onmouseout="MM_swapImgRestore()"
onmouseover="MM_swapImage('Image5','','development.png',0)"><img
src="development.png" alt="Development" width="60" height="81"></a></td>
</tr>
</table>
</div>
-</body>
-</html>
diff --git a/header.php b/header.php
index 6046cf0..2cc4813 100644
--- a/header.php
+++ b/header.php
@@ -1,13 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-
-<html>
-<head>
- <meta name="generator" content="HTML Tidy for Linux (vers 25 March 2009),
see www.w3.org">
-
- <title>Window Maker homepage</title>
-</head>
-
-<body>
- <div id="header"><img src="homewmaker2.png" width="1100" height="110"
style="border-bottom: #FFF" alt=""></div>
-</body>
-</html>
+ <div id="header">
+ Window Maker Home
+ </div>
diff --git a/index.php b/index.php
index 734ec28..20803b0 100644
--- a/index.php
+++ b/index.php
@@ -2,15 +2,19 @@
<html>
<head>
- <meta name="generator" content="HTML Tidy for Linux (vers 25 March 2009),
see www.w3.org">
- <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+ <meta name="generator" content="vim :-)">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Window Maker - A window manager for X</title>
- <meta name="Keywords" content="">
+ <meta name="Keywords" content="Window Maker, Window Manager, X11, X-Window">
<link href="title.css" rel="stylesheet" type="text/css">
</head>
<body>
- <?php include("header.php"); ?><?php include("dock.php"); ?><?php
include("main.php"); ?>
+ <?php
+ include("header.php");
+ include("dock.php");
+ include("main.php");
+ ?>
</body>
</html>
diff --git a/main.php b/main.php
index 0758c90..edeb3ce 100644
--- a/main.php
+++ b/main.php
@@ -1,32 +1,16 @@
-<html>
-<head>
- <meta name="generator" content="HTML Tidy for Linux (vers 25 March 2009),
see www.w3.org">
-
- <title></title>
-</head>
-
-<body>
<div id="inhalt">
- <table width="880" border="0" cellpadding="1" cellspacing="1">
- <tr>
- <td content="content" colspan="2" valign="top">
- <br>
- <br>
+ <br>
+ <br>
- <p><strong>Window Maker</strong> is an X11 window manager originally
designed to provide integration support for the
- <a href="http://gnustep.org";>GNUstep</a> Desktop Environment. In
every way possible, it reproduces the elegant look and
- feel of the NEXTSTEP user interface. It is fast, feature rich, easy
to configure, and easy to use. It is also free
- software, with contributions being made by programmers from around
the world.</p>
+ <p><strong>Window Maker</strong> is an X11 window manager originally
designed to provide integration support for the
+ <a href="http://gnustep.org";>GNUstep</a> Desktop Environment. In every way
possible, it reproduces the elegant look and
+ feel of the NEXTSTEP user interface. It is fast, feature rich, easy to
configure, and easy to use. It is also free
+ software, with contributions being made by programmers from around the
world.</p>
- <p>Window Maker includes compatibility options which allow it to
work with other popular desktop environments, namely
- GNOME and KDE, and comes with a powerful GUI configuration editor,
called WPrefs, which removes the need to edit
- text-based config files by hand. It also supports running <a
href="http://dockapps.windowmaker.org";>dockapps</a> which
- help on tasks such as monitoring system performance and battery
usage, mounting devices or connecting to the internet
- etc. Please see the features section for more specifics on what
Window Maker can do, and how it compares with other
- popular window managers.</p>
- </td>
- </tr>
- </table>
+ <p>Window Maker includes compatibility options which allow it to work with
other popular desktop environments, namely
+ GNOME and KDE, and comes with a powerful GUI configuration editor, called
WPrefs, which removes the need to edit
+ text-based config files by hand. It also supports running <a
href="http://dockapps.windowmaker.org";>dockapps</a> which
+ help on tasks such as monitoring system performance and battery usage,
mounting devices or connecting to the internet
+ etc. Please see the features section for more specifics on what Window
Maker can do, and how it compares with other
+ popular window managers.</p>
</div>
-</body>
-</html>
diff --git a/title.css b/title.css
index abc7122..521079b 100644
--- a/title.css
+++ b/title.css
@@ -1,6 +1,6 @@
body {
color: #FFF;
- font-size: 0.9em;
+ font-size: 1.0em;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
background-color: #505075;
border-size: 0px;
@@ -9,11 +9,7 @@ body {
margin-bottom: 0px;
margin-left: 0px;
}
-td {
-}
-th {
- color: #000
-}
+
.hpadding {
color: #483d8b;
font-weight: normal;
@@ -21,6 +17,7 @@ th {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
padding: 0px 10px
}
+
.textpadding {
color: white;
font-size: 12px;
@@ -29,9 +26,11 @@ th {
margin: 0;
padding: 0 10px
}
+
a {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
+
h1 {
color: #ebdeff;
font-size: 20pt;
@@ -40,6 +39,7 @@ h1 {
font-weight: bold;
line-height: 22pt
}
+
h2 {
color: #ebdeff;
font-size: 18pt;
@@ -47,6 +47,7 @@ h2 {
font-style: italic;
line-height: 20pt
}
+
h3 {
color: #e8fd00;
font-size: 14pt;
@@ -54,6 +55,7 @@ h3 {
font-style: normal;
line-height: 16pt
}
+
h4 {
color: #FFF;
font-size: 12pt;
@@ -62,40 +64,39 @@ h4 {
font-weight: bolder;
line-height: 12pt
}
-pre {
- background-color: #FFFFFF;
- color: #000;
-}
+
.caption {
font-size: 11pt;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif
}
-a:hover {
- text-decoration: underline;
- color: #F00;
+
+a:hover, a:focus {
+ text-decoration: underline;
+ font-style: italic;
+ color: #CCC;
}
-a: link {
- text-decoration: underline;
- color: #FFF;
+
+a:link, a:visited, a:active {
+ text-decoration: underline;
+ color: #FFF;
}
-# a:visited, a:active {
-# text-decoration: underline;
-# color: #FFF;
-#}
+
img {
border: none;
}
-#header { position: relative; top: 0px; left: 6%;
- width: 100%; }
-#dock { position: absolute; top: 150px; left: 5px;
- width: 100%; height: 500px;
- }
+#header {
+ font-family: "American Typewriter", Courier, monospace;
+ font-size: 4.5em;
+ font-weight: normal;
+ position: absolute; top: 0px; left: 100px;
+}
-#inhalt { position: relative; top: 10px; left: 10%;
- width: 100%;
- }
+#dock {
+ position: absolute; top: 100px; left: 5px;
+}
-#tableline {
- color: #F00;
+#inhalt {
+ position: absolute; top: 110px; left: 100px;
+ width: 70%;
}
--
1.7.7.3
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From 3e926515415fbbde3432302b739e274ed2c73798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Sun, 5 Feb 2012 16:09:51 +0100
Subject: [PATCH] Width tags clean
Removed the body and header tags of these pages, because when are joined by php the final document will have three times the body and the header tags included.
Removed the width tags, to avoid the space in the right side and the horizontal slide.
Removed the homewmaker2.png link image, because this text can be made using formatted text.
Removed a lot of \n \r.
---
dock.php | 28 ++++----------------------
header.php | 16 ++------------
index.php | 12 +++++++---
main.php | 40 +++++++++++---------------------------
title.css | 61 ++++++++++++++++++++++++++++++-----------------------------
5 files changed, 59 insertions(+), 98 deletions(-)
diff --git a/dock.php b/dock.php
index 29f0a0f..ffe56c3 100644
--- a/dock.php
+++ b/dock.php
@@ -1,41 +1,23 @@
-<html>
-<head>
- <meta name="generator" content="HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
-
- <title></title>
-</head>
-
-<body>
<div id="dock">
<table width="64" height="500" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td><a href="home.php" onmouseout="MM_swapImgRestore()" onmouseover=
- "MM_swapImage('Image1','','homewmaker.png',0)"><img src="homewmaker.png" alt="Home" width="60" height="81" border="0" id=
- "Image1"></a></td>
+ <td><a href="home.php" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image1','','homewmaker.png',0)"><img src="homewmaker.png" alt="Home" width="60" height="81"></a></td>
</tr>
<tr>
- <td><a href="news.php" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image2','','news.png',0)"><img src=
- "news.png" alt="News" width="60" height="81" border="0" id="Image2"></a></td>
+ <td><a href="news.php" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image2','','news.png',0)"><img src="news.png" alt="News" width="60" height="81"></a></td>
</tr>
<tr>
- <td><a href="docs.php" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image3','','docs.png',0)"><img src=
- "docs.png" alt="Documentation" width="60" height="81" border="0" id="Image3"></a></td>
+ <td><a href="docs.php" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image3','','docs.png',0)"><img src="docs.png" alt="Documentation" width="60" height="81"></a></td>
</tr>
<tr>
- <td><a href="lists.php" onmouseout="MM_swapImgRestore()" onmouseover=
- "MM_swapImage('Image4','','mailing_list.png',0)"><img src="mailing_list.png" alt="Mailing Lists" width="60" height="81"
- border="0" id="Image4"></a></td>
+ <td><a href="lists.php" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image4','','mailing_list.png',0)"><img src="mailing_list.png" alt="Mailing Lists" width="60" height="81"></a></td>
</tr>
<tr>
- <td><a href="dev.php" onmouseout="MM_swapImgRestore()" onmouseover=
- "MM_swapImage('Image5','','development.png',0)"><img src="development.png" alt="Development" width="60" height="81"
- border="0" id="Image5"></a></td>
+ <td><a href="dev.php" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('Image5','','development.png',0)"><img src="development.png" alt="Development" width="60" height="81"></a></td>
</tr>
</table>
</div>
-</body>
-</html>
diff --git a/header.php b/header.php
index 6046cf0..2cc4813 100644
--- a/header.php
+++ b/header.php
@@ -1,13 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-
-<html>
-<head>
- <meta name="generator" content="HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
-
- <title>Window Maker homepage</title>
-</head>
-
-<body>
- <div id="header"><img src="homewmaker2.png" width="1100" height="110" style="border-bottom: #FFF" alt=""></div>
-</body>
-</html>
+ <div id="header">
+ Window Maker Home
+ </div>
diff --git a/index.php b/index.php
index 734ec28..20803b0 100644
--- a/index.php
+++ b/index.php
@@ -2,15 +2,19 @@
<html>
<head>
- <meta name="generator" content="HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
- <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+ <meta name="generator" content="vim :-)">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Window Maker - A window manager for X</title>
- <meta name="Keywords" content="">
+ <meta name="Keywords" content="Window Maker, Window Manager, X11, X-Window">
<link href="title.css" rel="stylesheet" type="text/css">
</head>
<body>
- <?php include("header.php"); ?><?php include("dock.php"); ?><?php include("main.php"); ?>
+ <?php
+ include("header.php");
+ include("dock.php");
+ include("main.php");
+ ?>
</body>
</html>
diff --git a/main.php b/main.php
index 0758c90..edeb3ce 100644
--- a/main.php
+++ b/main.php
@@ -1,32 +1,16 @@
-<html>
-<head>
- <meta name="generator" content="HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
-
- <title></title>
-</head>
-
-<body>
<div id="inhalt">
- <table width="880" border="0" cellpadding="1" cellspacing="1">
- <tr>
- <td content="content" colspan="2" valign="top">
- <br>
- <br>
+ <br>
+ <br>
- <p><strong>Window Maker</strong> is an X11 window manager originally designed to provide integration support for the
- <a href="http://gnustep.org";>GNUstep</a> Desktop Environment. In every way possible, it reproduces the elegant look and
- feel of the NEXTSTEP user interface. It is fast, feature rich, easy to configure, and easy to use. It is also free
- software, with contributions being made by programmers from around the world.</p>
+ <p><strong>Window Maker</strong> is an X11 window manager originally designed to provide integration support for the
+ <a href="http://gnustep.org";>GNUstep</a> Desktop Environment. In every way possible, it reproduces the elegant look and
+ feel of the NEXTSTEP user interface. It is fast, feature rich, easy to configure, and easy to use. It is also free
+ software, with contributions being made by programmers from around the world.</p>
- <p>Window Maker includes compatibility options which allow it to work with other popular desktop environments, namely
- GNOME and KDE, and comes with a powerful GUI configuration editor, called WPrefs, which removes the need to edit
- text-based config files by hand. It also supports running <a href="http://dockapps.windowmaker.org";>dockapps</a> which
- help on tasks such as monitoring system performance and battery usage, mounting devices or connecting to the internet
- etc. Please see the features section for more specifics on what Window Maker can do, and how it compares with other
- popular window managers.</p>
- </td>
- </tr>
- </table>
+ <p>Window Maker includes compatibility options which allow it to work with other popular desktop environments, namely
+ GNOME and KDE, and comes with a powerful GUI configuration editor, called WPrefs, which removes the need to edit
+ text-based config files by hand. It also supports running <a href="http://dockapps.windowmaker.org";>dockapps</a> which
+ help on tasks such as monitoring system performance and battery usage, mounting devices or connecting to the internet
+ etc. Please see the features section for more specifics on what Window Maker can do, and how it compares with other
+ popular window managers.</p>
</div>
-</body>
-</html>
diff --git a/title.css b/title.css
index abc7122..521079b 100644
--- a/title.css
+++ b/title.css
@@ -1,6 +1,6 @@
body {
color: #FFF;
- font-size: 0.9em;
+ font-size: 1.0em;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
background-color: #505075;
border-size: 0px;
@@ -9,11 +9,7 @@ body {
margin-bottom: 0px;
margin-left: 0px;
}
-td {
-}
-th {
- color: #000
-}
+
.hpadding {
color: #483d8b;
font-weight: normal;
@@ -21,6 +17,7 @@ th {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
padding: 0px 10px
}
+
.textpadding {
color: white;
font-size: 12px;
@@ -29,9 +26,11 @@ th {
margin: 0;
padding: 0 10px
}
+
a {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
+
h1 {
color: #ebdeff;
font-size: 20pt;
@@ -40,6 +39,7 @@ h1 {
font-weight: bold;
line-height: 22pt
}
+
h2 {
color: #ebdeff;
font-size: 18pt;
@@ -47,6 +47,7 @@ h2 {
font-style: italic;
line-height: 20pt
}
+
h3 {
color: #e8fd00;
font-size: 14pt;
@@ -54,6 +55,7 @@ h3 {
font-style: normal;
line-height: 16pt
}
+
h4 {
color: #FFF;
font-size: 12pt;
@@ -62,40 +64,39 @@ h4 {
font-weight: bolder;
line-height: 12pt
}
-pre {
- background-color: #FFFFFF;
- color: #000;
-}
+
.caption {
font-size: 11pt;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif
}
-a:hover {
- text-decoration: underline;
- color: #F00;
+
+a:hover, a:focus {
+ text-decoration: underline;
+ font-style: italic;
+ color: #CCC;
}
-a: link {
- text-decoration: underline;
- color: #FFF;
+
+a:link, a:visited, a:active {
+ text-decoration: underline;
+ color: #FFF;
}
-# a:visited, a:active {
-# text-decoration: underline;
-# color: #FFF;
-#}
+
img {
border: none;
}
-#header { position: relative; top: 0px; left: 6%;
- width: 100%; }
-#dock { position: absolute; top: 150px; left: 5px;
- width: 100%; height: 500px;
- }
+#header {
+ font-family: "American Typewriter", Courier, monospace;
+ font-size: 4.5em;
+ font-weight: normal;
+ position: absolute; top: 0px; left: 100px;
+}
-#inhalt { position: relative; top: 10px; left: 10%;
- width: 100%;
- }
+#dock {
+ position: absolute; top: 100px; left: 5px;
+}
-#tableline {
- color: #F00;
+#inhalt {
+ position: absolute; top: 110px; left: 100px;
+ width: 70%;
}
--
1.7.7.3
