diff options
| author | Frank Karlitschek <frank@dev.(none)> | 2010-03-14 22:01:38 +0100 |
|---|---|---|
| committer | Frank Karlitschek <frank@dev.(none)> | 2010-03-14 22:01:38 +0100 |
| commit | d12bd67ebf9c8d4d561e240de581181a350ec07a (patch) | |
| tree | 683ef79c12a46779d34ba857cc6f38ae6e8669e2 /inc | |
| parent | 2616621ad9bd3ec9339209ecaa9b8a3dd39fff1c (diff) | |
| parent | 740bcf5c7200dd11181b6305839725a8eca3ad29 (diff) | |
| download | nextcloud-server-d12bd67ebf9c8d4d561e240de581181a350ec07a.tar.gz nextcloud-server-d12bd67ebf9c8d4d561e240de581181a350ec07a.zip | |
Merge commit 'refs/merge-requests/3' of git://gitorious.org/owncloud/owncloud
Diffstat (limited to 'inc')
| -rwxr-xr-x | inc/lib_base.php | 8 | ||||
| -rwxr-xr-x | inc/lib_files.php | 12 | ||||
| -rwxr-xr-x | inc/lib_log.php | 4 | ||||
| -rwxr-xr-x | inc/templates/footer.php | 2 | ||||
| -rwxr-xr-x | inc/templates/header.php | 18 |
5 files changed, 22 insertions, 22 deletions
diff --git a/inc/lib_base.php b/inc/lib_base.php index 9419226aca6..20d7ef04cb6 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 0c3d84519c2..ab0a5252982 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 4f34728ff1d..980011e05e2 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 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 cad8c7f68e1..90a9b1c23f0 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 /> |