[Pkg-owncloud-commits] [owncloud] 158/199: Small fixes to sharing overview

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit fa32243d84e1801c379a5e8956ba2f3de236c718
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Tue May 20 12:00:42 2014 +0200

    Small fixes to sharing overview
    
    - Removed file size from file summary in sharing overview
    - Fixed document title
    - Fixed empty content text for shared overview
---
 apps/files_sharing/js/app.js          | 11 +++++++++++
 apps/files_sharing/templates/list.php |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/js/app.js b/apps/files_sharing/js/app.js
index 9808e06..5755123 100644
--- a/apps/files_sharing/js/app.js
+++ b/apps/files_sharing/js/app.js
@@ -28,6 +28,9 @@ OCA.Sharing.App = {
 		);
 
 		this._initFileActions(this._inFileList);
+		this._extendFileList(this._inFileList);
+		this._inFileList.appName = t('files_sharing', 'Shared with you');
+		this._inFileList.$el.find('#emptycontent').text(t('files_sharing', 'No files have been shared with you yet.'));
 	},
 
 	initSharingOut: function($el) {
@@ -43,6 +46,9 @@ OCA.Sharing.App = {
 		);
 
 		this._initFileActions(this._outFileList);
+		this._extendFileList(this._outFileList);
+		this._outFileList.appName = t('files_sharing', 'Shared with others');
+		this._outFileList.$el.find('#emptycontent').text(t('files_sharing', 'You haven\'t shared any files yet.'));
 	},
 
 	_initFileActions: function(fileList) {
@@ -54,6 +60,11 @@ OCA.Sharing.App = {
 			OCA.Files.App.fileList.changeDirectory(context.$file.attr('data-path') + '/' + filename, true, true);
 		});
 		fileList.setFileActions(fileActions);
+	},
+
+	_extendFileList: function(fileList) {
+		// remove size column from summary
+		fileList.fileSummary.$el.find('.filesize').remove();
 	}
 };
 
diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php
index 6671e67..c688dcf 100644
--- a/apps/files_sharing/templates/list.php
+++ b/apps/files_sharing/templates/list.php
@@ -4,7 +4,7 @@
 </div>
 <div id='notification'></div>
 
-<div id="emptycontent" class="hidden"><?php p($l->t('Nothing in here.'))?></div>
+<div id="emptycontent" class="hidden"></div>
 
 <input type="hidden" name="dir" value="" id="dir">
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git