Conflicts: lib/base.php lib/filestorage.phpremotes/origin/stable
Jakob Sack
14 years ago
|
After Width: | Height: | Size: 562 B |
|
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 396 B |
|
After Width: | Height: | Size: 4.0 KiB |
|
After Width: | Height: | Size: 330 B |
|
After Width: | Height: | Size: 2.0 KiB |
|
After Width: | Height: | Size: 264 B |
|
After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 657 B After Width: | Height: | Size: 657 B |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 339 B |
|
After Width: | Height: | Size: 2.3 KiB |
|
After Width: | Height: | Size: 701 B |
|
Before Width: | Height: | Size: 695 B After Width: | Height: | Size: 695 B |
|
After Width: | Height: | Size: 9.9 KiB |
|
After Width: | Height: | Size: 478 B |
|
After Width: | Height: | Size: 2.7 KiB |
|
After Width: | Height: | Size: 495 B |
|
After Width: | Height: | Size: 1012 B |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 562 B |
|
After Width: | Height: | Size: 303 B |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 3.5 KiB |
@ -1,4 +1,3 @@ |
||||
<form class="searchbox" action="<?php echo $_['searchurl']?>" method="post">
|
||||
<input type="text" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" />
|
||||
<input type="submit" value="<?php echo $l->t( 'Search' ); ?>" class="prettybutton" />
|
||||
<input type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" />
|
||||
</form> |
||||
|
||||
@ -1,121 +1,48 @@ |
||||
/* FILE MENU */ |
||||
|
||||
#file_menu |
||||
{ |
||||
display: none; |
||||
position: absolute; |
||||
right:0px; |
||||
background-color: #EEE; |
||||
} |
||||
|
||||
#file_menu ul |
||||
{ |
||||
list-style-type: none; |
||||
} |
||||
|
||||
#file_menu li a |
||||
{ |
||||
display: block; |
||||
padding: 0.5em 5em 0.5em 2em; |
||||
text-decoration: none; |
||||
} |
||||
|
||||
.file_upload_form, #file_newfolder_form { |
||||
display: inline; |
||||
margin-left:3em; |
||||
} |
||||
|
||||
#fileSelector, #file_upload_submit, #file_newfolder_submit { |
||||
display: none; |
||||
} |
||||
|
||||
.file_upload_filename, #file_newfolder_name { |
||||
background-repeat: no-repeat; |
||||
background-position: 0.5em 0; |
||||
padding-left: 2em; |
||||
} |
||||
|
||||
.file_upload_filename { |
||||
background-image:url(../img/file.png); font-weight:bold; |
||||
} |
||||
.file_upload_start {opacity:0;filter: alpha(opacity = 0);} |
||||
|
||||
#file_newfolder_name { |
||||
background-image:url(../img/folder.png); font-weight:bold; |
||||
width: 14em; |
||||
} |
||||
|
||||
.file_upload_start, .file_upload_filename{ |
||||
position:absolute; |
||||
top:0px; |
||||
left:0px; |
||||
width:30ex; |
||||
font-size: 0.9em; |
||||
} |
||||
|
||||
.file_upload_wrapper{ |
||||
position:relative; |
||||
top:-1.2em; |
||||
left:-2em; |
||||
display: -moz-inline-box; /* fallback for older firefox versions*/ |
||||
display: inline-block; |
||||
width:30ex; |
||||
} |
||||
|
||||
#file_newfolder_submit, #file_upload_submit { |
||||
width: 3em; |
||||
} |
||||
|
||||
.file_upload_target { |
||||
display: none; |
||||
} |
||||
.actions { padding:.6em; float:right; margin-right:16em; } |
||||
#file_menu { right:0px; position:absolute; top:0; } |
||||
#file_menu a { display:block; float:left; background-image:none; text-decoration:none; } |
||||
.file_upload_form, #file_newfolder_form { display:inline; } |
||||
#fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; } |
||||
.file_upload_filename, #file_newfolder_name { background-repeat:no-repeat; background-position:0.5em 0; padding-left:2em; } |
||||
.file_upload_filename { background-image:url("../img/file.png"); font-weight:bold; }.file_upload_start { opacity:0;filter:alpha(opacity = 0); } |
||||
|
||||
#file_newfolder_name { background-image:url("../img/folder.png"); font-weight:bold; width:11em; } |
||||
.file_upload_start, .file_upload_filename { position:absolute; top:0px; left:0px; width:11em; font-size:0.9em; } |
||||
.file_upload_wrapper { position:relative; top:-1.2em; left:-2em; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; width:12em; } |
||||
#file_newfolder_submit, #file_upload_submit { width:3em; } |
||||
.file_upload_target { display:none; } |
||||
|
||||
/* FILE TABLE */ |
||||
|
||||
table { |
||||
width: 90%; |
||||
} |
||||
|
||||
span#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; } |
||||
table { position:relative; top:37px; width:100%; } |
||||
tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#eee; } |
||||
tbody a { color:#000; } |
||||
|
||||
table td.filesize, table td.date |
||||
{ |
||||
width: 5em; |
||||
padding: 0.5em 1em; |
||||
text-align: right; |
||||
} |
||||
|
||||
table td.date |
||||
{ |
||||
width: 11em; |
||||
} |
||||
|
||||
table td.selection, table th.selection, table td.fileaction |
||||
{ |
||||
width: 2em; |
||||
text-align: center; |
||||
} |
||||
|
||||
table td.filename a |
||||
{ |
||||
display: block; |
||||
background-image: url(../img/file.png); |
||||
text-decoration: none; |
||||
} |
||||
|
||||
.dropArrow{ |
||||
height:16px; |
||||
width:16px; |
||||
display: -moz-inline-box; /* fallback for older firefox versions*/ |
||||
display: inline-block; |
||||
background-image:url('../img/drop-arrow.png'); |
||||
} |
||||
|
||||
span.extention{ |
||||
color:#999; |
||||
} |
||||
|
||||
div.crumb{ |
||||
float:left; |
||||
} |
||||
span.extention, td.date { color:#999; } |
||||
div.crumb { float:left; display:block; background:no-repeat right 0; font-weight:bold; padding:8px 1.5em 0 1em; height:28px; /*36-8*/ } |
||||
table tr.mouseOver td { background-color:#eee; } |
||||
table th { padding:.5em; height:2em; } |
||||
table th .name { float:left; margin-left:.5em; } |
||||
table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; } |
||||
table td { border-bottom:1px solid #eee; font-style:normal; } |
||||
table th#headerSize, table td.filesize { width:5em; padding:0 1em; text-align:right; } |
||||
table th#headerDate, table td.date { width:11em; padding:0 .1em 0 1em; text-align:left; } |
||||
table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; } |
||||
table td.filename a.name { display:block; background-image:url('../img/file.png'); height:1.5em; vertical-align:middle; } |
||||
table tr[data-type="dir"] td.filename a.name {font-weight:bold; } |
||||
table td.filename a.name input, table td.filename a.name form { width:100%; cursor:text } |
||||
table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 3em; background-position:1em .5em; background-repeat:no-repeat; } |
||||
table td.filename .nametext, .modified { float:left; padding:.3em 0; } |
||||
table td.filename .nametext { width:80%; } |
||||
table td.filename form { float:left; font-size:.85em; } |
||||
#fileList tr input[type=checkbox] { display:none; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ } |
||||
#fileList tr input[type=checkbox]:checked, #fileList tr:hover input[type=checkbox] { display:inline; } |
||||
#fileList tr.selected td.filename a, #fileList tr:hover td.filename a { background-image:none !important } |
||||
#select_all { float:left; margin:0.2em; margin-left:0.6em; } |
||||
#uploadsize-message,#delete-confirm { display:none; } |
||||
.selectedActions a, a.file_action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; } |
||||
.selectedActions { display:none; } |
||||
.selectedActions a:hover, a.file_action:hover { background:#fff; -moz-box-shadow:0 0 10px #fff; -webkit-box-shadow:0 0 10px #fff; box-shadow:0 0 10px #fff; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } |
||||
|
||||
/* add breadcrumb divider to the File item in navigation panel */ |
||||
#plugins li:first-child { background-position:15.7em 0px; background-repeat:no-repeat; background-image:url("/owncloud/core/img/breadcrumb-divider-start.png"); width:15.7em; padding-right:11px; } |
||||
|
||||
|
Before Width: | Height: | Size: 2.8 KiB |
@ -1,8 +1,5 @@ |
||||
<div class='crumb' data-dir='/'> |
||||
<a href="<?php echo link_to("files", "index.php"); ?>"><img src="<?php echo image_path("", "actions/go-home.png"); ?>" alt="Root"/></a>
|
||||
</div> |
||||
<?php foreach($_["breadcrumb"] as $crumb): ?> |
||||
<div class='crumb' data-dir='<?php echo $crumb["dir"];?>'>
|
||||
<div class='crumb' data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo image_path('core','breadcrumb-divider.png');?>")'>
|
||||
<a href="<?php echo link_to("files", "index.php?dir=".$crumb["dir"]); ?>"><?php echo htmlspecialchars($crumb["name"]); ?></a>
|
||||
</div> |
||||
<?php endforeach; ?> |
||||
@ -1,19 +1,25 @@ |
||||
<?php foreach($_['files'] as $file): |
||||
<?php if(!$_['files']) echo '<span id="emptyfolder">Nothing in here. Upload something!</span><style>.file_upload_filename { background-color:#ffc100; border:#dda600 1px solid; }</style>'; |
||||
foreach($_['files'] as $file): |
||||
$simple_file_size = simple_file_size($file['size']); |
||||
$simple_size_color = 200-intval(pow(($file['size']/(1024*1024)),2)); ?> |
||||
<tr data-file="<?php echo $file['name'];?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>">
|
||||
<td class="selection"><input type="checkbox" /></td> |
||||
$simple_size_color = 200-intval($file['size']/(1024*1024)*5); |
||||
if($simple_size_color<0) $simple_size_color = 0; |
||||
$relative_modified_date = relative_modified_date($file['mtime']); |
||||
$relative_date_color = round((time()-$file['mtime'])/60/60/24*7); //days ago |
||||
if($relative_date_color>200) $relative_date_color = 200; ?> |
||||
<tr data-file="<?php echo $file['name'];?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>'>
|
||||
<td class="filename"> |
||||
<a style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)" href="<?php if($file['type'] == 'dir') echo link_to('files', 'index.php?dir='.$file['directory'].'/'.$file['name']); else echo link_to('files', 'download.php?file='.$file['directory'].'/'.$file['name']); ?>" title="">
|
||||
<input type="checkbox" /> |
||||
<a class="name" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)" href="<?php if($file['type'] == 'dir') echo link_to('files', 'index.php?dir='.$file['directory'].'/'.$file['name']); else echo link_to('files', 'download.php?file='.$file['directory'].'/'.$file['name']); ?>" title="">
|
||||
<span class="nametext"> |
||||
<?php if($file['type'] == 'dir'):?> |
||||
<strong><?php echo htmlspecialchars($file['name']);?></strong>
|
||||
<?php echo htmlspecialchars($file['name']);?> |
||||
<?php else:?> |
||||
<?php echo htmlspecialchars($file['basename']);?><span class='extention'><?php echo $file['extention'];?></span>
|
||||
<?php endif;?> |
||||
</span> |
||||
</a> |
||||
</td> |
||||
<td class="filesize" title="<?php echo human_file_size($file['size']); ?>" style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)"><?php echo $simple_file_size; ?></td>
|
||||
<td class="date"><?php echo $file['date']; ?></td>
|
||||
<td class="fileaction"><a href="" title="+" class="dropArrow"></a></td> |
||||
<td class="date"><span class="modified" title="<?php echo $file['date']; ?>" style="color:rgb(<?php echo $relative_date_color.','.$relative_date_color.','.$relative_date_color ?>)"><?php echo $relative_modified_date; ?></span></td>
|
||||
</tr> |
||||
<?php endforeach; ?> |
||||
|
||||