open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'refs/merge-requests/3' of git://gitorious.org/owncloud/owncloud

Browse Source
remotes/origin/stable
Frank Karlitschek 17 years ago
parent 2616621ad9 740bcf5c72
commit d12bd67ebf
10 changed files with 73 additions and 31 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 46
      css/default.css
  2. 8
      inc/lib_base.php
  3. 12
      inc/lib_files.php
  4. 4
      inc/lib_log.php
  5. 2
      inc/templates/footer.php
  6. 18
      inc/templates/header.php
  7. 2
      index.php
  8. 4
      plugins/music/index.php
  9. 4
      plugins/test/index.php
  10. 4
      settings/index.php

46
css/default.css
Unescape View File

@ -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;} 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;} .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;} .highlighttext {color:#333333; font-size:9pt; font-weight:bold; text-decoration:none;}
.datetext {color:#333333; font-size:7pt;} .datetext {color:#333333; font-size:7pt;}
.sizetext {color:#333333; font-size:7pt;} .sizetext {color:#333333; font-size:7pt;}
.footer {color:#999999; text-align:center; font-size:9pt;} .footer {color:#999999; text-align:center; font-size:9pt; margin-top:4em;}
.hint {color:#AAAAAA; text-align:center; font-size:8pt;} .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;} .hint a{color:#AAAAAA; text-align:center; font-size:8pt;}
.formstyle { .formstyle {
@ -44,6 +80,12 @@ body,th,td,ul,li,a,div,p,pre {color:#333333; font-family:Verdana,"Bitstream Vera
.navigationitem1 a{ .navigationitem1 a{
text-decoration:none; text-decoration:none;
padding-right:15px;
background: transparent url(/img/dots.png) no-repeat scroll center right;
}
.navigationitem1 img {
border:none;
} }
.navigationitem1:hover { .navigationitem1:hover {

8
inc/lib_base.php
Unescape View File

@ -133,7 +133,7 @@ class OC_UTIL {
*/ */
public static function shownavigation(){ public static function shownavigation(){
echo('<table cellpadding="5" cellspacing="0" border="0"><tr>'); 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>'); 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) { foreach(OC_UTIL::$NAVIGATION as $NAVI) {
@ -190,14 +190,14 @@ class OC_DB {
$DBConnection = @new mysqli($CONFIG_DBHOST, $CONFIG_DBUSER, $CONFIG_DBPWD,$CONFIG_DBNAME); $DBConnection = @new mysqli($CONFIG_DBHOST, $CONFIG_DBUSER, $CONFIG_DBPWD,$CONFIG_DBNAME);
if (mysqli_connect_errno()) { if (mysqli_connect_errno()) {
@ob_end_clean(); @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(); exit();
} }
} }
$result = @$DBConnection->query($cmd); $result = @$DBConnection->query($cmd);
if (!$result) { if (!$result) {
$entry='DB Error: "'.$DBConnection->error.'"<br />'; $entry='<p>DB Error: "'.$DBConnection->error.'"</p>';
$entry.='Offending command was: '.$cmd.'<br />'; $entry.='<p>Offending command was: '.$cmd.'</p>';
echo($entry); echo($entry);
} }
return $result; return $result;

12
inc/lib_files.php
Unescape View File

@ -48,18 +48,18 @@ class OC_FILES {
// breadcrumb // breadcrumb
if(count($dirs)>1) { 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>'); echo('<td class="nametext"><a href="/">home</a></td>');
$currentdir=''; $currentdir='';
foreach($dirs as $d) { foreach($dirs as $d) {
$currentdir.='/'.$d.''; $currentdir.='/'.$d.'';
if($d<>'') echo('<td class="nametext"><a href="/?dir='.$currentdir.'"><img src="/img/arrow.png" border="0" />&nbsp;'.$d.'</a></td>'); if($d<>'') echo('<td class="nametext"><a href="/?dir='.$currentdir.'"><img src="/img/arrow.png" />&nbsp;'.$d.'</a></td>');
} }
echo('</tr></table></center>'); echo('</tr></table></div>');
} }
// files and directories // 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; $filesfound=false;
if (is_dir($directory)) { if (is_dir($directory)) {
if ($dh = opendir($directory)) { if ($dh = opendir($directory)) {
@ -82,8 +82,8 @@ class OC_FILES {
} }
} }
echo('</table>'); echo('</table>');
if(!$filesfound) echo('<br />no files here'); if(!$filesfound) echo('<p>no files here</p>');
echo('</center>'); echo('</div>');
} }

4
inc/lib_log.php
Unescape View File

@ -59,7 +59,7 @@ class OC_LOG {
*/ */
public static function show(){ public static function show(){
global $CONFIG_DATEFORMAT; 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'); $result = OC_DB::query('select timestamp,user,type,message from log order by timestamp desc limit 20');
$count=OC_DB::numrows($result); $count=OC_DB::numrows($result);
@ -73,7 +73,7 @@ class OC_LOG {
echo('<td class="nametext">'.$entry['message'].'</td>'); echo('<td class="nametext">'.$entry['message'].'</td>');
echo('</tr>'); echo('</tr>');
} }
echo('</table></center>'); echo('</table></div>');
OC_DB::free_result($result); OC_DB::free_result($result);
} }

2
inc/templates/footer.php
Unescape View File

@ -1,5 +1,3 @@
<br />
<br />
<p class="footer"> <p class="footer">
<?php <?php
echo($CONFIG_FOOTEROWNERNAME); echo($CONFIG_FOOTEROWNERNAME);

18
inc/templates/header.php
Unescape View File

@ -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> <title>ownCloud</title>
<link rel="stylesheet" type="text/css" href="/css/default.css" /> <link rel="stylesheet" type="text/css" href="/css/default.css" />
</head> </head>
<body bgcolor="#F9F9F9"> <body>
<center><a href="/"><img src="/img/owncloud-logo-small.png" border="0"></a></center> <h1><a id="owncloud-logo" href="/"><span>OwnCloud</span></a></h1>
<?php <?php
if(!isset($_SESSION['username']) or $_SESSION['username']=='') { if(!isset($_SESSION['username']) or $_SESSION['username']=='') {
echo('<br /><br /><center>'); echo('<div class="center">');
OC_UTIL::showloginform(); OC_UTIL::showloginform();
echo('</center>'); echo('</div>');
OC_UTIL::showfooter(); OC_UTIL::showfooter();
exit(); exit();
}else{ }else{
echo('<br /><center>'); echo('<div id="nav" class="center">');
OC_UTIL::shownavigation(); OC_UTIL::shownavigation();
echo('</center>'); echo('</div>');
} }
?> ?>
<br />

2
index.php
Unescape View File

@ -39,7 +39,7 @@ if(isset($_GET['file'])) {
OC_FILES::showbrowser($CONFIG_DATADIRECTORY,$dir); 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(); OC_UTIL::showfooter();

4
plugins/music/index.php
Unescape View File

@ -27,9 +27,9 @@ require_once('../../config/config.php');
OC_UTIL::showheader(); OC_UTIL::showheader();
echo('<center>'); echo('<div class="center">');
echo('nothing here yet :-)'); echo('nothing here yet :-)');
echo('</center><br /><br />'); echo('</div>');
OC_UTIL::showfooter(); OC_UTIL::showfooter();

4
plugins/test/index.php
Unescape View File

@ -27,9 +27,9 @@ require_once('../../config/config.php');
OC_UTIL::showheader(); OC_UTIL::showheader();
echo('<center>'); echo('<div class="center">');
echo('nothing here yet :-)'); echo('nothing here yet :-)');
echo('</center><br /><br />'); echo('</div>');
OC_UTIL::showfooter(); OC_UTIL::showfooter();

4
settings/index.php
Unescape View File

@ -26,9 +26,9 @@ require_once('../config/config.php');
OC_UTIL::showheader(); OC_UTIL::showheader();
echo('<center>'); echo('<div class="center">');
echo('nothing here yet :-)'); echo('nothing here yet :-)');
echo('</center><br /><br />'); echo('</div>');
OC_UTIL::showfooter(); OC_UTIL::showfooter();

Write Preview
Loading…
Cancel
Save