From c921e5422d3c927c7ccd1c062e9fa3338834c1b7 Mon Sep 17 00:00:00 2001
From: CharlyCoste <contact@ccoste.fr>
Date: Sun, 14 Mar 2010 02:03:29 +0100
Subject: [PATCH] <br /> is not a valid strict xhtml1.0 tag. Not semantic.
Replacing it by CSS instructions on semantic tags.
---
css/default.css | 12 ++++++++++--
inc/lib_base.php | 6 +++---
inc/lib_files.php | 2 +-
inc/templates/footer.php | 2 --
inc/templates/header.php | 5 ++---
index.php | 2 +-
plugins/music/index.php | 2 +-
plugins/test/index.php | 2 +-
settings/index.php | 2 +-
9 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/css/default.css b/css/default.css
index 61d61bb2207..a3cbaab3123 100755
--- a/css/default.css
+++ b/css/default.css
@@ -2,6 +2,10 @@ body {background-color: #F9F9F9;}
body.error {background-color: #F0F0F0;}
body,th,td,ul,li,a,div,p,pre {color:#333333; font-family:Verdana,"Bitstream Vera Sans",Arial,Helvetica,Sans,"Bitstream Vera Serif"; font-size:9.0pt;}
+h1 {
+ margin-bottom:1.5em;
+}
+
.center {
text-align:center;
}
@@ -11,6 +15,10 @@ body,th,td,ul,li,a,div,p,pre {color:#333333; font-family:Verdana,"Bitstream Vera
margin-right:auto;
}
+div#nav {
+ margin-bottom:2em;
+}
+
a#owncloud-logo {
margin-left:auto;
margin-right:auto;
@@ -28,8 +36,8 @@ a#owncloud-logo span {
.highlighttext {color:#333333; font-size:9pt; font-weight:bold; text-decoration:none;}
.datetext {color:#333333; font-size:7pt;}
.sizetext {color:#333333; font-size:7pt;}
-.footer {color:#999999; text-align:center; font-size:9pt;}
-.hint {color:#AAAAAA; text-align:center; font-size:8pt;}
+.footer {color:#999999; text-align:center; font-size:9pt; margin-top:4em;}
+.hint {color:#AAAAAA; text-align:center; font-size:8pt; margin-top:4em; margin-bottom:2em;}
.hint a{color:#AAAAAA; text-align:center; font-size:8pt;}
.formstyle {
diff --git a/inc/lib_base.php b/inc/lib_base.php
index f4523228674..b8d5bcb9ed4 100755
--- a/inc/lib_base.php
+++ b/inc/lib_base.php
@@ -190,14 +190,14 @@ class OC_DB {
$DBConnection = @new mysqli($CONFIG_DBHOST, $CONFIG_DBUSER, $CONFIG_DBPWD,$CONFIG_DBNAME);
if (mysqli_connect_errno()) {
@ob_end_clean();
- echo('<html><head></head><body class="error"><br /><br /><div class="center"><b>can not connect to database.</div></body></html>');
+ echo('<html><head></head><body class="error"><div class="center"><b>can not connect to database.</div></body></html>');
exit();
}
}
$result = @$DBConnection->query($cmd);
if (!$result) {
- $entry='DB Error: "'.$DBConnection->error.'"<br />';
- $entry.='Offending command was: '.$cmd.'<br />';
+ $entry='<p>DB Error: "'.$DBConnection->error.'"</p>';
+ $entry.='<p>Offending command was: '.$cmd.'</p>';
echo($entry);
}
return $result;
diff --git a/inc/lib_files.php b/inc/lib_files.php
index d00444ab09d..39d48c13a97 100755
--- a/inc/lib_files.php
+++ b/inc/lib_files.php
@@ -82,7 +82,7 @@ class OC_FILES {
}
}
echo('</table>');
- if(!$filesfound) echo('<br />no files here');
+ if(!$filesfound) echo('<p>no files here</p>');
echo('</div>');
}
diff --git a/inc/templates/footer.php b/inc/templates/footer.php
index 138d563658a..9771c797787 100755
--- a/inc/templates/footer.php
+++ b/inc/templates/footer.php
@@ -1,5 +1,3 @@
-<br />
-<br />
<p class="footer">
<?php
echo($CONFIG_FOOTEROWNERNAME);
diff --git a/inc/templates/header.php b/inc/templates/header.php
index efd235168bd..90a9b1c23f0 100755
--- a/inc/templates/header.php
+++ b/inc/templates/header.php
@@ -11,18 +11,17 @@
if(!isset($_SESSION['username']) or $_SESSION['username']=='') {
- echo('<br /><br /><div class="center">');
+ echo('<div class="center">');
OC_UTIL::showloginform();
echo('</div>');
OC_UTIL::showfooter();
exit();
}else{
- echo('<br /><div class="center">');
+ echo('<div id="nav" class="center">');
OC_UTIL::shownavigation();
echo('</div>');
}
?>
-<br />
diff --git a/index.php b/index.php
index 5f7eb8e12ba..b33d3502bd6 100755
--- a/index.php
+++ b/index.php
@@ -39,7 +39,7 @@ if(isset($_GET['file'])) {
OC_FILES::showbrowser($CONFIG_DATADIRECTORY,$dir);
- echo('<br /><br /><p class="hint">Hint: Mount it via webdav like this: <a href="webdav://'.$_SERVER["HTTP_HOST"].'/webdav/owncloud.php">webdav://'.$_SERVER["HTTP_HOST"].'/webdav/owncloud.php</a></p>');
+ echo('<p class="hint">Hint: Mount it via webdav like this: <a href="webdav://'.$_SERVER["HTTP_HOST"].'/webdav/owncloud.php">webdav://'.$_SERVER["HTTP_HOST"].'/webdav/owncloud.php</a></p>');
OC_UTIL::showfooter();
diff --git a/plugins/music/index.php b/plugins/music/index.php
index 622a89d7e7a..f9a7c8a2e88 100755
--- a/plugins/music/index.php
+++ b/plugins/music/index.php
@@ -29,7 +29,7 @@ OC_UTIL::showheader();
echo('<div class="center">');
echo('nothing here yet :-)');
-echo('</div><br /><br />');
+echo('</div>');
OC_UTIL::showfooter();
diff --git a/plugins/test/index.php b/plugins/test/index.php
index 622a89d7e7a..f9a7c8a2e88 100755
--- a/plugins/test/index.php
+++ b/plugins/test/index.php
@@ -29,7 +29,7 @@ OC_UTIL::showheader();
echo('<div class="center">');
echo('nothing here yet :-)');
-echo('</div><br /><br />');
+echo('</div>');
OC_UTIL::showfooter();
diff --git a/settings/index.php b/settings/index.php
index 61296433673..467e0ad9632 100755
--- a/settings/index.php
+++ b/settings/index.php
@@ -28,7 +28,7 @@ OC_UTIL::showheader();
echo('<div class="center">');
echo('nothing here yet :-)');
-echo('</div><br /><br />');
+echo('</div>');
OC_UTIL::showfooter();
--
GitLab