From dc641943d9245b371eca1928a64bcadfe72f9cf6 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 16 Dec 2011 17:39:15 +0100
Subject: [PATCH] fix some display issues for readonly folders

---
 files/index.php           |  1 +
 files/templates/index.php | 63 ++++++++++++++++++---------------------
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/files/index.php b/files/index.php
index 4b3bbd1bfd4..7e156130d8e 100644
--- a/files/index.php
+++ b/files/index.php
@@ -97,6 +97,7 @@ $tmpl = new OC_Template( "files", "index", "user" );
 $tmpl->assign( "fileList", $list->fetchPage() );
 $tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() );
 $tmpl->assign( 'dir', $dir);
+$tmpl->assign( 'readonly', !OC_Filesystem::is_writeable($dir));
 $tmpl->assign( "files", $files );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign( 'uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
diff --git a/files/templates/index.php b/files/templates/index.php
index 722c38e4776..c4acab25cc4 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -1,42 +1,37 @@
 <div id="controls">
 	<?php echo($_['breadcrumb']); ?>
-	<?php if (!isset($_['readonly']) || !$_['readonly']) {?>
-	<div class="actions">
-		<div id='new' class='button'>
-			<a>
-				<?php echo $l->t('New');?>
-			</a>
-			<ul class="popup popupTop">
-				<li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
-				<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
-<!-- 				<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='web'><p><?php echo $l->t('From the web');?></p></li> -->
-			</ul>
+	<?php if (!isset($_['readonly']) || !$_['readonly']):?>
+		<div class="actions">
+			<div id='new' class='button'>
+				<a>
+					<?php echo $l->t('New');?>
+				</a>
+				<ul class="popup popupTop">
+					<li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
+					<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
+	<!-- 				<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='web'><p><?php echo $l->t('From the web');?></p></li> -->
+				</ul>
+			</div>
+			<div class="file_upload_wrapper svg">
+				<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
+					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
+					<button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
+					<input class="file_upload_start" type="file" name='files[]'/>
+						<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
+					<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
+				</form>
+			</div>
 		</div>
-		<div class="file_upload_wrapper svg">
-			<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
-				<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
-				<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
-				<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
-				<button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
-				<input class="file_upload_start" type="file" name='files[]'/>
-					<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
-				<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
-			</form>
-		</div>
-	</div>
-	<div id="file_action_panel">
-	</div>
+		<div id="file_action_panel"></div>
+	<?php endif;?>
 </div>
-<?php
-}
-?>
 <div id='notification'></div>
 
-<?php
-if (isset($_['files'])) {
- if (!count($_['files'])) { ?>
-<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
-<?php }}?>
+<?php if (isset($_['files']) and ! $_['readonly'] and count($_['files'])==0):?>
+	<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
+<?php endif; ?>
 
 <table>
 	<thead>
@@ -53,7 +48,7 @@ if (isset($_['files'])) {
 			<th id="headerDate"><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class="selectedActions"><a href="" title="Delete" class="delete"><img class="svg" alt="<?php echo $l->t('Delete')?>" src="<?php echo image_path("core", "actions/delete.svg"); ?>" /></a></span></th>
 		</tr>
 	</thead>
-	<tbody id="fileList">
+	<tbody id="fileList" data-readonly="<?php echo $_['readonly'];?>">
 		<?php echo($_['fileList']); ?>
 	</tbody>
 </table>
-- 
2.39.5