diff options
| author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-14 19:31:38 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-14 19:31:38 +0200 |
| commit | 2cb231d0a409ae21141be19dddbbc2efc4aac19e (patch) | |
| tree | 68cb5753db178bd24f38467bb2cd98e1817bdda5 /files/templates | |
| parent | 5cb687d168280a14ff10ff096d4d13dc76849e17 (diff) | |
| parent | 0e25dd65c0ae3ae9290aa6352bfae00567e02485 (diff) | |
| download | nextcloud-server-2cb231d0a409ae21141be19dddbbc2efc4aac19e.tar.gz nextcloud-server-2cb231d0a409ae21141be19dddbbc2efc4aac19e.zip | |
resolved merge conflict
Diffstat (limited to 'files/templates')
| -rw-r--r-- | files/templates/admin.php | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/files/templates/admin.php b/files/templates/admin.php index e0cf2608301..0122865ee72 100644 --- a/files/templates/admin.php +++ b/files/templates/admin.php @@ -7,14 +7,4 @@ <?php else:?> No settings currently available. <?php endif;?> -<!-- <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" /><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> - - <input type="checkbox" id="downloadShared" /><label for="downloadShared"> <?php echo $l->t( 'Allow downloading shared files' ); ?></label><br> - <input type="checkbox" id="uploadShared" /><label for="uploadShared"> <?php echo $l->t( 'Allow uploading in shared directory' ); ?></label><br>--> </form> |