close to final version of river entries - commented out cover from image view and...

diff --git a/actions/upload.php b/actions/upload.php
index e7c78c17895c56a0cef896809ea5ff6d7625bb62..2e33d67db49f865aedb42ee036a52ac0a2dcef23 100644 (file)
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -55,7 +55,7 @@
        $not_uploaded = array();\r
        $error_msgs = array();\r
        \r
-       $river_view = get_plugin_setting('river_view', 'tidypics');\r
+       $img_river_view = get_plugin_setting('img_river_view', 'tidypics');\r
        \r
        $accepted_formats = array(\r
                                                                'image/jpeg',\r
@@ -197,7 +197,7 @@
                // update user/group size for checking quota\r
                $image_repo_size += $sent_file['size'];\r
 \r
-               if($river_view == "all") {\r
+               if($img_river_view == "all") {\r
                        add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());\r
                }\r
                unset($file);  // may not be needed but there seems to be a memory leak\r
@@ -232,7 +232,7 @@
                $album->new_album = TP_OLD_ALBUM;\r
        }\r
        \r
-       if(count($uploaded_images) && $river_view == "1") {\r
+       if(count($uploaded_images) && $img_river_view == "1") {\r
                if (function_exists('add_to_river')) {\r
                        add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());\r
                }\r

diff --git a/languages/en.php b/languages/en.php
index c5f4dd99f6b0c65238450323902b38b0348438ce..6aff280619e89b94cab8a8e10bbb972cb04b8bf6 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -53,7 +53,8 @@
                        'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",\r
                        'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick Cmdline must be selected for the image library",\r
                        'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",\r
-                       'tidypics:settings:river_view' => "How many entries in river for each batch of uploaded images",\r
+                       'tidypics:settings:img_river_view' => "How many entries in river for each batch of uploaded images",\r
+                       'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album",\r
                        'tidypics:settings:largesize' => "Primary image size",\r
                        'tidypics:settings:smallsize' => "Album view image size",\r
                        'tidypics:settings:thumbsize' => "Thumbnail image size",\r

diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 40f847c783fc1561351cb0c3e1e1666dbd6e1ec8..5f8b079654161b224bcd2445d78ebe9c04b035f9 100644 (file)
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -6,9 +6,27 @@
        $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";\r
        $string = sprintf(elgg_echo("album:river:created"),$url) . " ";\r
        $string .= "<a href=\"" . $album->getURL() . "\">" . $album->title . "</a>";\r
+\r
+       $album_river_view = get_plugin_setting('album_river_view', 'tidypics');\r
        \r
-       if ($album->cover) {\r
-               $string .= "<div class=\"river_content\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/>' . "</div>";\r
+       if ($album_river_view == "cover") {\r
+               if ($album->cover) {\r
+                       $string .= "<div class=\"river_content\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/>' . "</div>";\r
+               }\r
+       } else {\r
+\r
+               $string .= "<div class=\"river_content\">";\r
+               \r
+               // display the simple image views. Uses: via 'object/image.php'\r
+               $images = get_entities("object", "image", $file_guid, 'time_created desc', 7);\r
+\r
+               if (count($images)) {\r
+                       foreach($images as $image){\r
+                               $string .= "<a href=\"" . $image->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> </a>';\r
+                       }\r
+               }\r
+\r
+               $string .= "</div>";\r
        }\r
 \r
 echo $string;\r

diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 09320080b30bfc98bd5d352079cb108ee4c359fc..8f7a856eae35d1ff97483610778ee5f9af0b7c25 100644 (file)
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -17,7 +17,10 @@
        $string = sprintf(elgg_echo("image:river:created"),$performed_by->name, $image_link, $album_link);\r
                \r
        $string .= "<div class=\"river_content\">";\r
+\r
+/*     // this adds the album cover to the river display \r
        $string .= "<a href=\"" . $album->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> </a>';\r
+*/\r
        $string .= "<a href=\"" . $image->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> </a>';\r
        $string .= "</div>";\r
        \r

diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index d2d676290d822250161afc675aeca9877cd87a07..a67d320d503b39a91488a0395dccd95e0cc1baea 100644 (file)
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -71,18 +71,32 @@
        $form_body .= "<p>" . elgg_echo('tidypics:settings:quota') . "<br />";\r
        $form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "</p>";\r
 \r
-       // River options\r
-       $river_view = $plugin->river_view;\r
-       if (!$river_view) $river_view = '1';\r
-       $form_body .= '<p>' . elgg_echo('tidypics:settings:river_view');\r
+       // River Image options\r
+       $img_river_view = $plugin->img_river_view;\r
+       if (!$img_river_view) $img_river_view = '1';\r
+       $form_body .= '<p>' . elgg_echo('tidypics:settings:img_river_view');\r
        $form_body .= elgg_view('input/pulldown', array(\r
-                                       'internalname' => 'params[river_view]',\r
+                                       'internalname' => 'params[img_river_view]',\r
                                        'options_values' => array(\r
                                                'all' => 'all',\r
                                                '1' => '1',\r
                                                'none' => 'none',\r
                                        ),\r
-                                       'value' => $river_view\r
+                                       'value' => $img_river_view\r
+       ));\r
+       $form_body .= '</p>';\r
+\r
+       // River Album options\r
+       $album_river_view = $plugin->album_river_view;\r
+       if (!$album_river_view) $album_river_view = '1';\r
+       $form_body .= '<p>' . elgg_echo('tidypics:settings:album_river_view');\r
+       $form_body .= elgg_view('input/pulldown', array(\r
+                                       'internalname' => 'params[album_river_view]',\r
+                                       'options_values' => array(\r
+                                               'cover' => 'cover',\r
+                                               'set' => 'set',\r
+                                       ),\r
+                                       'value' => $album_river_view\r
        ));\r
        $form_body .= '</p>';\r
 \r