visual changes

This commit is contained in:
Robin 2010-04-12 14:31:22 +02:00
parent 2e39fba305
commit 48341b0826
6 changed files with 47 additions and 21 deletions

View File

@ -9,21 +9,31 @@ html,body {
width:100%; width:100%;
position:absolute; position:absolute;
} }
#mainlayout, #mainlayout>tbody{ #mainlayout{
width:100%; width:100%;
height:100%; height:100%;
} }
#mainlayout .head{ #mainlayout>div{
position:absolute;
width:100%;
left:0px;
}
#mainlayout>.head{
height:175px; height:175px;
top:0px;
} }
#mainlayout .body{ #mainlayout>.body{
vertical-align:top; vertical-align:top;
top:175px;
bottom:75px;
} }
#mainlayout .foot{ #mainlayout>.foot{
height:75px; height:75px;
bottom:0px;
} }
body.error {background-color: #F0F0F0;} body.error {background-color: #F0F0F0;}
@ -55,6 +65,8 @@ div#nav {
background-color: #EEEEEE; background-color: #EEEEEE;
padding:0px; padding:0px;
margin:0px; margin:0px;
position:absolute;
bottom:0px;
} }
a#owncloud-logo { a#owncloud-logo {
@ -80,7 +92,7 @@ a#owncloud-logo span {
} }
.footer {color:#999999; text-align:center; font-size:9pt; margin-top:4em;} .footer {color:#999999; text-align:center; font-size:9pt; margin-top:4em;}
.footer a {color:#999999; text-decoration:none;} .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;} .hint a{color:#AAAAAA; text-align:center; font-size:8pt;}
.formstyle { .formstyle {
@ -165,6 +177,7 @@ a#owncloud-logo span {
position:absolute; position:absolute;
top:0px; top:0px;
left:0px; left:0px;
overflow:hidden;
/*do not use display:none here, it breaks iframes in some browsers*/ /*do not use display:none here, it breaks iframes in some browsers*/
} }
@ -217,6 +230,8 @@ tr.breadcrumb{
} }
#content, div.browser{ #content, div.browser{
vertical-align:top;
/*min-height:200px;*/
height:100%; height:100%;
} }
@ -248,19 +263,20 @@ span.upload{
} }
table.browser>tbody{ table.browser>tbody{
height:100%;
vertical-align:top; vertical-align:top;
} }
table.browser>tbody>tr>td, table.browser>tbody>tr{ table.browser>tbody>tr>td, table.browser>tbody>tr{
padding:0px; padding:0px;
height:100%; /*height:100%;*/
} }
div.fileList{ div.fileList{
width:800px; width:800px;
overflow:auto; overflow:auto;
vertical-align:top; vertical-align:top;
height:100%;
min-height:200px;
top:0px; top:0px;
} }
@ -271,8 +287,8 @@ div.fileList table{
thead td, tfoot td{ thead td, tfoot td{
padding-left:6px; padding-left:6px;
padding-top:2px; padding-top:0px;
padding-bottom:2px; padding-bottom:0px;
} }
#imageframe{ #imageframe{
@ -292,4 +308,8 @@ thead td, tfoot td{
max-width:90%; max-width:90%;
margin:10px; margin:10px;
border: black solid 3px; border: black solid 3px;
}
tr.hint, tr.hint td{
background:transparent;
} }

View File

@ -77,7 +77,7 @@ class OC_FILES {
echo('</table>'); echo('</table>');
if(!$content) echo('<p>no files here</p>'); if(!$content) echo('<p>no files here</p>');
echo('</div>');*/ echo('</div>');*/
echo '<div id="content"/>'; echo '<div id="content"></div>';
} }
/** /**

View File

@ -1,9 +1,10 @@
</td></tr> </div>
<tr class='foot'><td class='foot'> <div class='foot'>
<p class="footer"> <p class="footer">
<?php <?php
echo('<a href="http://ownCloud.org">ownCloud</a> - 1.0 beta 2'); echo('<a href="http://ownCloud.org">ownCloud</a> - 1.0 beta 2');
?> ?>
</p> </p>
</td></tr> </div>
</div>
</body></html> </body></html>

View File

@ -22,8 +22,8 @@ foreach(OC_UTIL::$scripts as $script){
</script> </script>
</head> </head>
<body onload='OC_onload.run()'> <body onload='OC_onload.run()'>
<table id='mainlayout' cellpadding='0' cellspacing='0'> <div id='mainlayout'>
<tr class='head'><td class='head'> <div class='head'>
<?php <?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>');
@ -55,7 +55,7 @@ echo('<h1><a id="owncloud-logo" href="'.$WEBROOT.'"><span>ownCloud</span></a></h
echo('<div id="nav" class="center">'); echo('<div id="nav" class="center">');
OC_UTIL::shownavigation(); OC_UTIL::shownavigation();
echo('</div>'); echo('</div>');
echo('</td></tr><tr class="body"><td class="body">'); echo('</div><div class="body">');
} }
?> ?>

View File

@ -36,7 +36,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"].$WEBROOT.'/webdav/owncloud.php">webdav://'.$_SERVER["HTTP_HOST"].$WEBROOT.'/webdav/owncloud.php</a></p>'); echo('<p class="hint">Hint: Mount it via webdav like this: <a href="webdav://'.$_SERVER["HTTP_HOST"].$WEBROOT.'/webdav/owncloud.php">webdav://'.$_SERVER["HTTP_HOST"].$WEBROOT.'/webdav/owncloud.php</a></p>');
OC_UTIL::showfooter(); OC_UTIL::showfooter();

View File

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