From: Georg Ehrke <developer@georgehrke.com>
Date: Thu, 29 Aug 2013 08:50:55 +0000 (+0200)
Subject: Merge master into oc_preview
X-Git-Tag: v6.0.0alpha2~235^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b7758d0f8d52b2f9653cfee549558327c00c8e01;p=nextcloud-server.git

Merge master into oc_preview
---

b7758d0f8d52b2f9653cfee549558327c00c8e01
diff --cc 3rdparty
index bd366f82084,21b466b72cd..dc87ea63028
--- a/3rdparty
+++ b/3rdparty
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit bd366f82084718903c8a7b85fbc9ad0595d29c5a
 -Subproject commit 21b466b72cdd4c823c011669593ecef1defb1f3c
++Subproject commit dc87ea630287f27502eba825fbb19fcc33c34c86
diff --cc apps/files/css/files.css
index b94d6fbcbe8,a9b93dc2dee..be2af2d1aa5
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@@ -91,46 -85,16 +91,47 @@@ span.extension { text-transform:lowerca
  tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; }
  table tr.mouseOver td { background-color:#eee; }
  table th { height:2em; padding:0 .5em; color:#999; }
 -table th .name { float:left; margin-left:.5em; }
 +table th .name {
 +	position: absolute;
 +	left: 55px;
 +	top: 15px;
 +}
  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; background-position:1em .5em; background-repeat:no-repeat; }
 -table th#headerName { width:100em; /* not really sure why this works better than 100% … table styling */ }
 -table th#headerSize, table td.filesize { min-width:3em; padding:0 1em; text-align:right; }
 -table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-align:left; }
 +table td {
 +	border-bottom: 1px solid #eee;
 +	font-style: normal;
 +	background-position: 8px center;
 +	background-repeat: no-repeat;
 +}
 +table th#headerName {
 +	position: relative;
 +	width: 100em; /* not really sure why this works better than 100% … table styling */
 +	padding: 0;
 +}
 +#headerName-container {
 +	position: relative;
 +	height: 50px;
 +}
 +table th#headerSize, table td.filesize {
 +	min-width: 3em;
 +	padding: 0 1em;
 +	text-align: right;
 +}
 +table th#headerDate, table td.date {
 +	-moz-box-sizing: border-box;
 +	box-sizing: border-box;
 +	position: relative;
 +	min-width: 11em;
 +	display: block;
 +	height: 51px;
 +}
  
  /* Multiselect bar */
 -#filestable.multiselect { top:63px; }
 +#filestable.multiselect {
 +	top: 88px;
 +}
- table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 64px; width:100%; }
+ table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 80px; width:100%; }
++
  table.multiselect thead th {
  	background-color: rgba(210,210,210,.7);
  	color: #000;
@@@ -298,10 -170,24 +299,23 @@@ a.action>img { max-height:16px; max-wid
  }
  
  .summary {
- 	opacity: .5;
+ 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+ 	filter: alpha(opacity=30);
+ 	opacity: .3;
+ 	height: 70px;
+ }
+ 
+ .summary:hover, .summary, table tr.summary td {
+ 	background-color: transparent;
+ }
+ 
+ .summary td {
+ 	padding-top: 8px;
+ 	padding-bottom: 8px;
+ 	border-bottom: none;
  }
 -
  .summary .info {
 -	margin-left: 3em;
 +	margin-left: 55px;
  }
  
  #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
diff --cc apps/files/templates/part.list.php
index c91dda4c77e,3e6f619868d..4076c1bb331
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@@ -1,16 -1,5 +1,7 @@@
  <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
- <?php $totalfiles = 0;
- $totaldirs = 0;
- $totalsize = 0; ?>
  <?php foreach($_['files'] as $file):
 +	//strlen('files/') => 6
 +	$relativePath = substr($file['path'], 6);
- 	$totalsize += $file['size'];
- 	if ($file['type'] === 'dir') {
- 		$totaldirs++;
- 	} else {
- 		$totalfiles++;
- 	}
  	// the bigger the file, the darker the shade of grey; megabytes*2
  	$simple_size_color = intval(160-$file['size']/(1024*1024)*2);
  	if($simple_size_color<0) $simple_size_color = 0;
diff --cc config/config.sample.php
index 6dd45163677,f5cb33732f8..5f748438bc7
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@@ -189,19 -201,4 +201,17 @@@ $CONFIG = array
  'customclient_desktop' => '', //http://owncloud.org/sync-clients/
  'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android
  'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
 +
 +// PREVIEW
 +'enable_previews' => true,
 +/* the max width of a generated preview, if value is null, there is no limit */
 +'preview_max_x' => null,
 +/* the max height of a generated preview, if value is null, there is no limit */
 +'preview_max_y' => null,
 +/* the max factor to scale a preview, default is set to 10 */
 +'preview_max_scale_factor' => 10,
 +/* custom path for libreoffice / openoffice binary */
 +'preview_libreoffice_path' => '/usr/bin/libreoffice',
 +/* cl parameters for libreoffice / openoffice */
 +'preview_office_cl_parameters' => '',
- // date format to be used while writing to the owncloud logfile
- 'logdateformat' => 'F d, Y H:i:s',
  );
diff --cc lib/base.php
index 5043c491475,2e6a37c9f4e..488634f86f3
--- a/lib/base.php
+++ b/lib/base.php
@@@ -490,8 -490,8 +490,9 @@@ class OC 
  
  		self::registerCacheHooks();
  		self::registerFilesystemHooks();
 +		self::registerPreviewHooks();
  		self::registerShareHooks();
+ 		self::registerLogRotate();
  
  		//make sure temporary files are cleaned up
  		register_shutdown_function(array('OC_Helper', 'cleanTmp'));