From: Georg Ehrke <developer@georgehrke.com>
Date: Wed, 10 Jul 2013 10:41:53 +0000 (+0200)
Subject: merge conflicts ...
X-Git-Tag: v6.0.0alpha2~235^2~78
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a357e5b284ed5b752864e4570cb179f3f2d88229;p=nextcloud-server.git

merge conflicts ...
---

a357e5b284ed5b752864e4570cb179f3f2d88229
diff --cc apps/files/templates/part.list.php
index 6dabd7d6970,97a9026860b..38d1314392b
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@@ -1,7 -1,14 +1,15 @@@
  <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
- 
+ <?php $totalfiles = 0;
+ $totaldirs = 0;
+ $totalsize = 0; ?>
  <?php foreach($_['files'] as $file):
 +	$relativePath = substr($file['path'], 6);
+ 	$totalsize += $file['size'];
+ 	if ($file['type'] === 'dir') {
+ 		$totaldirs++;
+ 	} else {
+ 		$totalfiles++;
+ 	}
  	$simple_file_size = OCP\simple_file_size($file['size']);
  	// the bigger the file, the darker the shade of grey; megabytes*2
  	$simple_size_color = intval(160-$file['size']/(1024*1024)*2);