diff options
| author | Frank Karlitschek <frank@dev.(none)> | 2010-04-12 15:50:39 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@dev.(none)> | 2010-04-12 15:50:39 +0200 |
| commit | c69eab18d25fb685705a7bc20117f2f042fe7981 (patch) | |
| tree | 7a307c335ef6e2be1b283612313b3774318090a2 /inc/templates | |
| parent | a061dd3314e3bf1e9adf29b5033086c991b2cf51 (diff) | |
| parent | 4a1d9370fcd5fb542d8d3915658d7fa1167dfeaf (diff) | |
| download | nextcloud-server-c69eab18d25fb685705a7bc20117f2f042fe7981.tar.gz nextcloud-server-c69eab18d25fb685705a7bc20117f2f042fe7981.zip | |
Merge commit 'refs/merge-requests/18' of git://gitorious.org/owncloud/owncloud
merge
Conflicts:
index.php
Diffstat (limited to 'inc/templates')
| -rwxr-xr-x | inc/templates/footer.php | 10 | ||||
| -rwxr-xr-x | inc/templates/header.php | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/inc/templates/footer.php b/inc/templates/footer.php index 5ce34a95791..16b41d3e2e3 100755 --- a/inc/templates/footer.php +++ b/inc/templates/footer.php @@ -1,6 +1,16 @@ +<?php +global $WEBROOT; +?> +</div> +<div class='foot'> +<div class='bar'><p class="hint"> +Hint: Mount it via webdav like this: <a href="webdav://'.<?php echo($_SERVER["HTTP_HOST"].$WEBROOT.'/webdav/owncloud.php');?>">webdav://<?php echo($_SERVER["HTTP_HOST"].$WEBROOT);?>/webdav/owncloud.php</a> +</p></div> <p class="footer"> <?php echo('<a href="http://ownCloud.org">ownCloud</a> - 1.0 beta 2'); ?> </p> +</div> +</div> </body></html> diff --git a/inc/templates/header.php b/inc/templates/header.php index ec714684589..09529f67268 100755 --- a/inc/templates/header.php +++ b/inc/templates/header.php @@ -10,6 +10,8 @@ <script type='text/ecmascript' src='<?php echo($WEBROOT)?>/js/lib_notification.js'></script> <script type='text/ecmascript' src='<?php echo($WEBROOT)?>/js/lib_xmlloader.js'></script> <script type='text/ecmascript' src='<?php echo($WEBROOT)?>/js/lib_files.js'></script> + <script type='text/ecmascript' src='<?php echo($WEBROOT)?>/js/lib_event.js'></script> + <script type='text/ecmascript' src='<?php echo($WEBROOT)?>/js/filebrowser.js'></script> <?php foreach(OC_UTIL::$scripts as $script){ echo("<script type='text/ecmascript' src='$WEBROOT/$script'></script>"); @@ -20,6 +22,8 @@ foreach(OC_UTIL::$scripts as $script){ </script> </head> <body onload='OC_onload.run()'> +<div id='mainlayout'> +<div class='head'> <?php echo('<h1><a id="owncloud-logo" href="'.$WEBROOT.'"><span>ownCloud</span></a></h1>'); @@ -51,6 +55,7 @@ echo('<h1><a id="owncloud-logo" href="'.$WEBROOT.'"><span>ownCloud</span></a></h echo('<div id="nav" class="center">'); OC_UTIL::shownavigation(); echo('</div>'); + echo('</div><div class="body">'); } ?> |