diff options
| author | Frank Karlitschek <frank@dev.(none)> | 2010-03-22 09:25:06 +0100 |
|---|---|---|
| committer | Frank Karlitschek <frank@dev.(none)> | 2010-03-22 09:25:06 +0100 |
| commit | d5d84ebf53d896c78ad8425b4ddafd7731c71cca (patch) | |
| tree | 7acfa9e347ee5752127adc24980406a7ca2a7b4f | |
| parent | b9fa280eaaf3139b4dc19e7326e4abf44a42624c (diff) | |
| parent | 44e8c7ed8d13d1c483bd4628c542f63a6595607f (diff) | |
| download | nextcloud-server-d5d84ebf53d896c78ad8425b4ddafd7731c71cca.tar.gz nextcloud-server-d5d84ebf53d896c78ad8425b4ddafd7731c71cca.zip | |
Merge commit 'refs/merge-requests/6' of git://gitorious.org/owncloud/owncloud
| -rwxr-xr-x | inc/lib_base.php | 8 | ||||
| -rwxr-xr-x | inc/templates/header.php | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/inc/lib_base.php b/inc/lib_base.php index 2da7713db6c..edb884e07b2 100755 --- a/inc/lib_base.php +++ b/inc/lib_base.php @@ -188,15 +188,15 @@ class OC_UTIL { global $SERVERROOT; echo('<table cellpadding="5" cellspacing="0" border="0"><tr>'); echo('<td class="navigationitem1"><a href="'.$WEBROOT.'/">'.$_SESSION['username'].'</a></td>'); - if($_SERVER['SCRIPT_NAME']==$WEBROOT.'/index.php') echo('<td class="navigationitemselected"><a href="'.$WEBROOT.'/">Files</a></td>'); else echo('<td class="navigationitem"><a href="'.$WEBROOT.'/">Files</a></td>'); + if($_SERVER['SCRIPT_NAME']==$WEBROOT.'/index.php') echo('<td class="navigationitemselected"><a href="/'.$WEBROOT.'/">Files</a></td>'); else echo('<td class="navigationitem"><a href="/'.$WEBROOT.'/">Files</a></td>'); foreach(OC_UTIL::$NAVIGATION as $NAVI) { if(dirname($_SERVER['SCRIPT_NAME'])==$WEBROOT.$NAVI['url']) echo('<td class="navigationitemselected"><a href="'.$WEBROOT.$NAVI['url'].'">'.$NAVI['name'].'</a></td>'); else echo('<td class="navigationitem"><a href="'.$WEBROOT.$NAVI['url'].'">'.$NAVI['name'].'</a></td>'); } - if($_SERVER['SCRIPT_NAME']==$WEBROOT.'/log/index.php') echo('<td class="navigationitemselected"><a href="'.$WEBROOT.'/log">Log</a></td>'); else echo('<td class="navigationitem"><a href="'.$WEBROOT.'/log">Log</a></td>'); - if($_SERVER['SCRIPT_NAME']==$WEBROOT.'/settings/index.php') echo('<td class="navigationitemselected"><a href="'.$WEBROOT.'/settings">Settings</a></td>'); else echo('<td class="navigationitem"><a href="'.$WEBROOT.'/settings">Settings</a></td>'); - echo('<td class="navigationitem"><a href="'.$WEBROOT.'/?logoutbutton=1">Logout</a></td>'); + if($_SERVER['SCRIPT_NAME']==$WEBROOT.'/log/index.php') echo('<td class="navigationitemselected"><a href="log">Log</a></td>'); else echo('<td class="navigationitem"><a href="log">Log</a></td>'); + if($_SERVER['SCRIPT_NAME']==$WEBROOT.'/settings/index.php') echo('<td class="navigationitemselected"><a href="settings">Settings</a></td>'); else echo('<td class="navigationitem"><a href="settings">Settings</a></td>'); + echo('<td class="navigationitem"><a href="?logoutbutton=1">Logout</a></td>'); echo('</tr></table>'); } diff --git a/inc/templates/header.php b/inc/templates/header.php index 57e45e708a9..53bb838f61e 100755 --- a/inc/templates/header.php +++ b/inc/templates/header.php @@ -1,13 +1,14 @@ <!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="<?php echo($WEBROOT); ?>/css/default.php" /> -</head> -<body> + <head> + <title>ownCloud</title> + <base href="/<?php echo($WEBROOT); ?>" /> + <link rel="stylesheet" type="text/css" href="css/default.php" /> + </head> + <body> <?php -echo('<h1><a id="owncloud-logo" href="'.$WEBROOT.'/"><span>ownCloud</span></a></h1>'); +echo('<h1><a id="owncloud-logo" href="/'.$WEBROOT.'/"><span>ownCloud</span></a></h1>'); // check if already configured. otherwise start configuration wizard |