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, 40 insertions, 0 deletions

diff --git a/mod/lightpics/views/default/river/object/album/create.php b/mod/lightpics/views/default/river/object/album/create.php
new file mode 100644
index 000000000..29620041f
--- /dev/null
+++ b/mod/lightpics/views/default/river/object/album/create.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Album river view
+ *
+ * @author Cash Costello
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
+ */
+
+elgg_load_css('lightbox');
+elgg_load_js('lightbox');
+elgg_load_js('tidypics');
+
+$album = $vars['item']->getObjectEntity();
+
+$album_river_view = elgg_get_plugin_setting('album_river_view', 'tidypics');
+if ($album_river_view == "cover") {
+	$image = $album->getCoverImage();
+	if ($image) {
+		$attachments = elgg_view_entity_icon($image, 'tiny');
+	}
+} else {
+	$images = $album->getImages(7);
+
+	if (count($images)) {
+		$attachments = '<ul class="tidypics-river-list elgg-lightbox-gallery">';
+		foreach($images as $image) {
+			$attachments .= '<li class="tidypics-photo-item">';
+			$attachments .= elgg_view_entity_icon($image, 'tiny', array(
+				'link_class' => 'tidypics-lightbox elgg-lightbox-photo',
+			));
+			$attachments .= '</li>';
+		}
+		$attachments .= '</ul>';
+	}
+}
+
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'attachments' => $attachments,
+));