diff --git a/css/default.php b/css/default.php index 93089b9d61..c3c380cf15 100755 --- a/css/default.php +++ b/css/default.php @@ -9,21 +9,31 @@ html,body { width:100%; position:absolute; } -#mainlayout, #mainlayout>tbody{ +#mainlayout{ width:100%; height:100%; } -#mainlayout .head{ +#mainlayout>div{ + position:absolute; + width:100%; + left:0px; +} + +#mainlayout>.head{ height:175px; + top:0px; } -#mainlayout .body{ +#mainlayout>.body{ vertical-align:top; + top:175px; + bottom:75px; } -#mainlayout .foot{ +#mainlayout>.foot{ height:75px; + bottom:0px; } body.error {background-color: #F0F0F0;} @@ -55,6 +65,8 @@ div#nav { background-color: #EEEEEE; padding:0px; margin:0px; + position:absolute; + bottom:0px; } a#owncloud-logo { @@ -80,7 +92,7 @@ a#owncloud-logo span { } .footer {color:#999999; text-align:center; font-size:9pt; margin-top:4em;} .footer a {color:#999999; text-decoration:none;} -.hint {color:#AAAAAA; text-align:center; font-size:8pt; margin-top:4em; margin-bottom:2em;} +.hint {color:#AAAAAA; text-align:center; font-size:8pt; margin-top:10px;} .hint a{color:#AAAAAA; text-align:center; font-size:8pt;} .formstyle { @@ -165,6 +177,7 @@ a#owncloud-logo span { position:absolute; top:0px; left:0px; + overflow:hidden; /*do not use display:none here, it breaks iframes in some browsers*/ } @@ -217,6 +230,8 @@ tr.breadcrumb{ } #content, div.browser{ + vertical-align:top; + /*min-height:200px;*/ height:100%; } @@ -248,19 +263,20 @@ span.upload{ } table.browser>tbody{ - height:100%; vertical-align:top; } table.browser>tbody>tr>td, table.browser>tbody>tr{ padding:0px; - height:100%; + /*height:100%;*/ } div.fileList{ width:800px; overflow:auto; vertical-align:top; + height:100%; + min-height:200px; top:0px; } @@ -271,8 +287,8 @@ div.fileList table{ thead td, tfoot td{ padding-left:6px; - padding-top:2px; - padding-bottom:2px; + padding-top:0px; + padding-bottom:0px; } #imageframe{ @@ -292,4 +308,8 @@ thead td, tfoot td{ max-width:90%; margin:10px; border: black solid 3px; +} + +tr.hint, tr.hint td{ + background:transparent; } \ No newline at end of file diff --git a/inc/lib_files.php b/inc/lib_files.php index dbafa52a18..5ddf5a4e1f 100755 --- a/inc/lib_files.php +++ b/inc/lib_files.php @@ -77,7 +77,7 @@ class OC_FILES { echo(''); if(!$content) echo('

no files here

'); echo('');*/ - echo '
'; + echo '
'; } /** diff --git a/inc/templates/footer.php b/inc/templates/footer.php index a63014ed51..275f419118 100755 --- a/inc/templates/footer.php +++ b/inc/templates/footer.php @@ -1,9 +1,10 @@ - - +
+

ownCloud - 1.0 beta 2'); ?>

- +
+ diff --git a/inc/templates/header.php b/inc/templates/header.php index 755eba26e4..09529f6726 100755 --- a/inc/templates/header.php +++ b/inc/templates/header.php @@ -22,8 +22,8 @@ foreach(OC_UTIL::$scripts as $script){ - -
+
+
'); @@ -55,7 +55,7 @@ echo('

'); OC_UTIL::shownavigation(); echo('

'); - echo('
'); + echo('
'); } ?> diff --git a/index.php b/index.php index 08d94c6079..335d39b097 100755 --- a/index.php +++ b/index.php @@ -36,7 +36,7 @@ if(isset($_GET['file'])) { OC_FILES::showbrowser($CONFIG_DATADIRECTORY,$dir); - echo('

Hint: Mount it via webdav like this: webdav://'.$_SERVER["HTTP_HOST"].$WEBROOT.'/webdav/owncloud.php

'); + echo('

Hint: Mount it via webdav like this: webdav://'.$_SERVER["HTTP_HOST"].$WEBROOT.'/webdav/owncloud.php

'); OC_UTIL::showfooter(); diff --git a/js/filebrowser.js b/js/filebrowser.js index 2f587fa418..dac81327b6 100644 --- a/js/filebrowser.js +++ b/js/filebrowser.js @@ -51,7 +51,7 @@ OC_FILES.browser.show_callback=function(content){ //remove current content; var contentNode=document.getElementById('content'); - contentNode.className+=' center'; + contentNode.className='center'; if(contentNode.hasChildNodes()){ while(contentNode.childNodes.length >=1){ contentNode.removeChild(contentNode.firstChild); @@ -120,6 +120,7 @@ OC_FILES.browser.show_callback=function(content){ div=document.createElement('div'); td.appendChild(div); div.className='fileList'; + div.setAttribute('style','max-height:'+(parseInt(document.body.clientHeight)-300)+'px;'); table2=document.createElement('table'); div.appendChild(table2); tbody2=document.createElement('tbody'); @@ -195,10 +196,10 @@ OC_FILES.browser.show_callback=function(content){ option=document.createElement('option'); dropdown.appendChild(option); option.setAttribute('value',index); - option.appendChild(document.createTextNode(index)); + option.appendChild(document.createTextNode(capitaliseFirstLetter(index))); } } - span.appendChild(document.createTextNode(' selected. ')); + span.appendChild(document.createTextNode(' Selected ')); button=document.createElement('button'); span.appendChild(button); button.appendChild(document.createTextNode('Go')); @@ -314,7 +315,7 @@ OC_FILES.browser.showactions=function(file,hide){ tr.appendChild(td); a=document.createElement('a'); td.appendChild(a); - a.appendChild(document.createTextNode(name)); + a.appendChild(document.createTextNode(capitaliseFirstLetter(name))); var action=actions[name]; td.addEvent('onclick',new callBack(action,file)); } @@ -368,4 +369,8 @@ OC_FILES.browser.showImage=function(dir,file){ OC_FILES.browser.hideImage=function(){ var div=document.getElementById('imageframe'); div.parentNode.removeChild(div); +} + +function capitaliseFirstLetter(string){ + return string.charAt(0).toUpperCase() + string.slice(1); } \ No newline at end of file