upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge branch 'master' into sharing

Browse source 
Conflicts:
	.gitignore
This commit is contained in:
Michael Gapczynski 2011-07-10 17:26:36 -04:00
commit e202c29926
5 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -20,11 +20,8 @@ RCS/*
# kdevelop
.kdev
*.kdev4
<<<<<<< HEAD
.project
=======
# Lokalize
*lokalize*
>>>>>>> master
.project

4
files/index.php
View file

@ -59,10 +59,10 @@ foreach( OC_FILES::getdirectorycontent( $dir ) as $i ){
// Make breadcrumb
$breadcrumb = array();
$pathtohere = "/";
$pathtohere = "";
foreach( explode( "/", $dir ) as $i ){
if( $i != "" ){
$pathtohere .= "$i/";
$pathtohere .= "/$i";
$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
}
}

15
files/js/admin.js Normal file
View file

@ -0,0 +1,15 @@
function switchPublicFolder()
{
var publicEnable = $('#publicEnable').is(':checked');
var sharingaimGroup = $('input:radio[name=sharingaim]'); //find all radiobuttons of that group
$.each(sharingaimGroup, function(index, sharingaimItem) {
sharingaimItem.disabled = !publicEnable; //set all buttons to the correct state
});
}
$(document).ready(function(){
switchPublicFolder(); // Execute the function after loading DOM tree
$('#publicEnable').click(function(){
switchPublicFolder(); // To get rid of onClick()
});
});

4
files/js/files.js
View file

@ -39,7 +39,7 @@ $(document).ready(function() {
// Sets the file link behaviour :
$('td.filename a').live('click',function(event) {
event.preventDefault();
var filename=$(this).text();
var filename=$(this).parent().parent().attr('data-file');
var mime=$(this).parent().parent().attr('data-mime');
var type=$(this).parent().parent().attr('data-type');
var action=FileActions.getDefault(mime,type);
@ -245,7 +245,7 @@ function formatDate(date){
//options for file drag/dropp
var dragOptions={
distance: 20, revert: true, opacity: 0.7,
distance: 20, revert: 'invalid', opacity: 0.7,
stop: function(event, ui) {
$('#fileList tr td.filename').addClass('ui-draggable');
}

16
files/templates/admin.php
View file

@ -1,21 +1,13 @@
<script type="text/javascript">
function switchPublicFolder()
{
var publicEnable = document.forms['filesForm'].elements['publicEnable'].checked;
var sharingaimGroup = document.forms['filesForm'].elements['sharingaim'];
for(i=0;i<sharingaimGroup.length;i++) {
sharingaimGroup[i].disabled = !publicEnable;
}
}
</script>
<?php OC_UTIL::addScript('files','admin'); ?>
<form name="filesForm" action='#' method='post'>
<?php if($_['htaccessWorking']):?>
<label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label><input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/><br/>
<?php endif;?>
<input type="checkbox" name="publicEnable" id="publicEnable" onClick="switchPublicFolder()" /><label for="publicEnable"> <?php echo $l->t( 'Allow public folders' ); ?></label><br>
<input type="checkbox" name="publicEnable" id="publicEnable" /><label for="publicEnable"> <?php echo $l->t( 'Allow public folders' ); ?></label><br>
<div style="padding-left: 20px">
<input type="radio" name="sharingaim" id="separated" checked="checked" /><label for="separated"> <?php echo $l->t( 'separated from webdav storage' ); ?></label><br>
<input type="radio" name="sharingaim" id="separated" /><label for="separated"> <?php echo $l->t( 'separated from webdav storage' ); ?></label><br>
<input type="radio" name="sharingaim" id="userdecide" /><label for="userdecide"> <?php echo $l->t( 'let the user decide' ); ?></label><br>
<input type="radio" name="sharingaim" id="inwebdav" /><label for="inwebdav"> <?php echo $l->t( 'folder "/public" in webdav storage' ); ?></label>
</div>