diff --git a/css/default.css b/css/default.css
index 6158ee4a40dc7052470988a6765114b35d585b21..be4ffd0bc1f9241dcd2628ff06b4daa8ccc23293 100755
--- a/css/default.css
+++ b/css/default.css
@@ -1,11 +1,47 @@
+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;}
+a img {
+ border:none;
+}
+
+h1 {
+ margin-bottom:1.5em;
+}
+
+.center {
+ text-align:center;
+}
+
+.center * {
+ margin-left:auto;
+ margin-right:auto;
+}
+
+div#nav {
+ margin-bottom:2em;
+}
+
+a#owncloud-logo {
+ margin-left:auto;
+ margin-right:auto;
+ display:block;
+ width:200px;
+ height:99px;
+ background: transparent url(/img/owncloud-logo-small.png) no-repeat scroll 0 0;
+}
+
+a#owncloud-logo span {
+ display:none;
+}
+
.nametext a {color:#333333; font-size:8pt; font-weight:bold; text-decoration:none;}
.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 {
@@ -44,6 +80,12 @@ body,th,td,ul,li,a,div,p,pre {color:#333333; font-family:Verdana,"Bitstream Vera
.navigationitem1 a{
text-decoration:none;
+ padding-right:15px;
+ background: transparent url(/img/dots.png) no-repeat scroll center right;
+}
+
+.navigationitem1 img {
+ border:none;
}
.navigationitem1:hover {
diff --git a/inc/lib_base.php b/inc/lib_base.php
index 9419226aca6ca343edcab0c244b9b5461b5fb3ae..20d7ef04cb6c46b1df2ce4d4af4911abe1b23363 100755
--- a/inc/lib_base.php
+++ b/inc/lib_base.php
@@ -133,7 +133,7 @@ class OC_UTIL {
*/
public static function shownavigation(){
echo('<table cellpadding="5" cellspacing="0" border="0"><tr>');
- echo('<td class="navigationitem1"><a href="/">'.$_SESSION['username'].'</a> <img src="/img/dots.png" border="0"></td>');
+ echo('<td class="navigationitem1"><a href="/">'.$_SESSION['username'].'</a></td>');
if($_SERVER['SCRIPT_NAME']=='/index.php') echo('<td class="navigationitemselected"><a href="/">Files</a></td>'); else echo('<td class="navigationitem"><a href="/">Files</a></td>');
foreach(OC_UTIL::$NAVIGATION as $NAVI) {
@@ -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 bgcolor="#F0F0F0"><br /><br /><center><b>can not connect to database.</center></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 0c3d84519c2d1299040baafce4e5ab5b780425a6..ab0a5252982ddb29aa79062db43b0db96dfdb39f 100755
--- a/inc/lib_files.php
+++ b/inc/lib_files.php
@@ -48,18 +48,18 @@ class OC_FILES {
// breadcrumb
if(count($dirs)>1) {
- echo('<center><table cellpadding="2" cellspacing="0" border="0"><tr>');
+ echo('<div class="center"><table cellpadding="2" cellspacing="0" border="0"><tr>');
echo('<td class="nametext"><a href="/">home</a></td>');
$currentdir='';
foreach($dirs as $d) {
$currentdir.='/'.$d.'';
- if($d<>'') echo('<td class="nametext"><a href="/?dir='.$currentdir.'"><img src="/img/arrow.png" border="0" /> '.$d.'</a></td>');
+ if($d<>'') echo('<td class="nametext"><a href="/?dir='.$currentdir.'"><img src="/img/arrow.png" /> '.$d.'</a></td>');
}
- echo('</tr></table></center>');
+ echo('</tr></table></div>');
}
// files and directories
- echo('<center><table cellpadding="6" cellspacing="0" border="0" class="browser">');
+ echo('<div class="center"><table cellpadding="6" cellspacing="0" border="0" class="browser">');
$filesfound=false;
if (is_dir($directory)) {
if ($dh = opendir($directory)) {
@@ -82,8 +82,8 @@ class OC_FILES {
}
}
echo('</table>');
- if(!$filesfound) echo('<br />no files here');
- echo('</center>');
+ if(!$filesfound) echo('<p>no files here</p>');
+ echo('</div>');
}
diff --git a/inc/lib_log.php b/inc/lib_log.php
index 4f34728ff1dce2227be7ca98676cbbf7b9fb899b..980011e05e2502583ba1a88c9a7ab4e9846a97fd 100755
--- a/inc/lib_log.php
+++ b/inc/lib_log.php
@@ -59,7 +59,7 @@ class OC_LOG {
*/
public static function show(){
global $CONFIG_DATEFORMAT;
- echo('<center><table cellpadding="6" cellspacing="0" border="0" class="browser">');
+ echo('<div class="center"><table cellpadding="6" cellspacing="0" border="0" class="browser">');
$result = OC_DB::query('select timestamp,user,type,message from log order by timestamp desc limit 20');
$count=OC_DB::numrows($result);
@@ -73,7 +73,7 @@ class OC_LOG {
echo('<td class="nametext">'.$entry['message'].'</td>');
echo('</tr>');
}
- echo('</table></center>');
+ echo('</table></div>');
OC_DB::free_result($result);
}
diff --git a/inc/templates/footer.php b/inc/templates/footer.php
index 138d563658a2a24adc166e45a13293cadfe1e08e..9771c797787a2692a70b942c3c8f34508cc923b3 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 cad8c7f68e176f22adb8a62b6872884efe51ca70..90a9b1c23f0b62448a1c41df6538a7fca517c1ba 100755
--- a/inc/templates/header.php
+++ b/inc/templates/header.php
@@ -1,25 +1,27 @@
-<html><head>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
<title>ownCloud</title>
<link rel="stylesheet" type="text/css" href="/css/default.css" />
</head>
-<body bgcolor="#F9F9F9">
-<center><a href="/"><img src="/img/owncloud-logo-small.png" border="0"></a></center>
+<body>
+<h1><a id="owncloud-logo" href="/"><span>OwnCloud</span></a></h1>
<?php
if(!isset($_SESSION['username']) or $_SESSION['username']=='') {
- echo('<br /><br /><center>');
+ echo('<div class="center">');
OC_UTIL::showloginform();
- echo('</center>');
+ echo('</div>');
OC_UTIL::showfooter();
exit();
}else{
- echo('<br /><center>');
+ echo('<div id="nav" class="center">');
OC_UTIL::shownavigation();
- echo('</center>');
+ echo('</div>');
}
?>
-<br />
diff --git a/index.php b/index.php
index ffe66e41953e2a7ceccb642b90528c8b0458ae69..438d2fef0df15ae412744a13e3e1f4eff07473e1 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 9002a4052e77c513a06cee45d7e51c36bbc61e00..f9a7c8a2e88925a16dc65f1570a10b214a70b158 100755
--- a/plugins/music/index.php
+++ b/plugins/music/index.php
@@ -27,9 +27,9 @@ require_once('../../config/config.php');
OC_UTIL::showheader();
-echo('<center>');
+echo('<div class="center">');
echo('nothing here yet :-)');
-echo('</center><br /><br />');
+echo('</div>');
OC_UTIL::showfooter();
diff --git a/plugins/test/index.php b/plugins/test/index.php
index 9002a4052e77c513a06cee45d7e51c36bbc61e00..f9a7c8a2e88925a16dc65f1570a10b214a70b158 100755
--- a/plugins/test/index.php
+++ b/plugins/test/index.php
@@ -27,9 +27,9 @@ require_once('../../config/config.php');
OC_UTIL::showheader();
-echo('<center>');
+echo('<div class="center">');
echo('nothing here yet :-)');
-echo('</center><br /><br />');
+echo('</div>');
OC_UTIL::showfooter();
diff --git a/settings/index.php b/settings/index.php
index a5e3649e8555ac714c28f2b20d41fd65ef4e8cfe..467e0ad96322350f2f999973a5863d4118286681 100755
--- a/settings/index.php
+++ b/settings/index.php
@@ -26,9 +26,9 @@ require_once('../config/config.php');
OC_UTIL::showheader();
-echo('<center>');
+echo('<div class="center">');
echo('nothing here yet :-)');
-echo('</center><br /><br />');
+echo('</div>');
OC_UTIL::showfooter();