Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 27 insertions, 0 deletions

diff --git a/mod/lightpics/views/default/photos/sidebar/quota.php b/mod/lightpics/views/default/photos/sidebar/quota.php
new file mode 100644
index 000000000..16b7885c4
--- /dev/null
+++ b/mod/lightpics/views/default/photos/sidebar/quota.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * User quota
+ */
+
+$user = elgg_get_logged_in_user_entity();
+
+
+$quota = elgg_get_plugin_setting('quota', 'tidypics');
+if ($quota) {
+	$image_repo_size = (int)$user->image_repo_size;
+	$image_repo_size = $image_repo_size / 1024 / 1024;
+	$quote_percentage = round(100 * ($image_repo_size / $quota));
+	// for small quotas, so one decimal place
+	if ($quota < 10) {
+		$image_repo_size = sprintf('%.1f', $image_repo_size);
+	} else {
+		$image_repo_size = round($image_repo_size);
+	}
+	if ($image_repo_size > $quota) {
+		$image_repo_size = $quota;
+	}
+
+	$title = elgg_echo('tidypics:title:quota');
+	$body = elgg_echo("tidypics:quota") . ' ' . $image_repo_size . '/' . $quota . " MB ({$quote_percentage}%)";
+	echo elgg_view_module('aside', $title, $body);
+}