From 8fef6a2468063f578e4b730627242b4dcfc25a70 Mon Sep 17 00:00:00 2001
From: Fahad Abbas <fahad-cb@users.noreply.github.com>
Date: Wed, 27 May 2015 07:37:07 +0000
Subject: [PATCH] updated: issues (add video to collection in watch video,
 pagination in manage collection items)

---
 upload/includes/classes/collections.class.php |  3 +--
 upload/manage_collections.php                 | 21 +++++++++++++++++--
 .../blocks/manage/account_collections.html    |  5 +++--
 .../cb_27/layout/manage_collections.html      |  3 ++-
 upload/styles/cb_27/layout/watch_video.html   | 11 ++++++++++
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/upload/includes/classes/collections.class.php b/upload/includes/classes/collections.class.php
index 9d058d2c..6588750f 100644
--- a/upload/includes/classes/collections.class.php
+++ b/upload/includes/classes/collections.class.php
@@ -44,8 +44,7 @@ class Collections extends CBCategory
 
 		$this->cat_tbl = "collection_categories";
 		$this->section_tbl = "collections";
-		// Video type is temporarily removed. Full features will be developed soon.  
-		$this->types = array('photos' => lang("Photos")); //'videos' => lang("Videos"),
+		$this->types = array('videos' => lang("Videos"),'photos' => lang("Photos"));
 		ksort($this->types);
 		$this->setting_up_collections();
 		$this->init_actions();
diff --git a/upload/manage_collections.php b/upload/manage_collections.php
index eb8c9523..ce490db8 100644
--- a/upload/manage_collections.php
+++ b/upload/manage_collections.php
@@ -120,7 +120,17 @@ switch($mode)
 					$eh->flush();
 					e(sprintf("selected_items_removed","videos"),"m");
 				}
-				$objs = $cbvideo->collection->get_collection_items_with_details($cid,$order);
+				 
+				$get_limit = create_query_limit($page,COLLIP);
+				
+				$objs = $cbvideo->collection->get_collection_items_with_details($cid,$order,$get_limit);
+
+
+				$total_rows = $cbvideo->collection->get_collection_items_with_details($cid,$order,NULL,TRUE);
+				$total_pages = count_pages($total_rows,COLLIP);
+				
+				//Pagination
+				$pages->paginate($total_pages,$page);
 			}
 			break;
 			
@@ -137,7 +147,14 @@ switch($mode)
 					$eh->flush();
 					e(sprintf("selected_items_removed","photos"),"m");
 				}
-				$objs = $cbphoto->collection->get_collection_items_with_details($cid,$order);
+				$get_limit = create_query_limit($page,COLLIP);
+				$objs = $cbphoto->collection->get_collection_items_with_details($cid,$order,$get_limit);
+
+				$total_rows = $cbphoto->collection->get_collection_items_with_details($cid,$order,NULL,TRUE);
+				$total_pages = count_pages($total_rows,COLLIP);
+				
+				//Pagination
+				$pages->paginate($total_pages,$page);
 			}
 			break;
 		}
diff --git a/upload/styles/cb_27/layout/blocks/manage/account_collections.html b/upload/styles/cb_27/layout/blocks/manage/account_collections.html
index 3e2cbbe0..6e4ab487 100644
--- a/upload/styles/cb_27/layout/blocks/manage/account_collections.html
+++ b/upload/styles/cb_27/layout/blocks/manage/account_collections.html
@@ -41,7 +41,8 @@
  	      <label for="checkbox"></label></td>
  	    <td valign="middle">
         <div style="padding-left:10px; float:left;width:300px">
-       <label for="check_item-{$collection.videoid}"> <img src="{getThumb vdetails=$collection}" width="40" height="30" border="0" class="acc_usr_video_thumb" /></label>{$collection.title|truncate:100}<br />
+       <label for="check_item-{$collection.videoid}"> <img src="{getThumb vdetails=$collection}" border="0" class="acc_usr_video_thumb" /></label>
+       <span>{$collection.title|truncate:100}</span><br />
 <span class="video_control"><a href="{$cbcollection->collection_links($collection,'view_item')}">{lang code="view"}</a></span>
         </div>
         </td>
@@ -65,7 +66,7 @@
  	    <td valign="middle">
         <div style="padding-left:10px; float:left;">
         <label for="check_item-{$collection.photo_id}">{get_photo style='padding:1px; border:1px solid #999; float:left;' details=$collection output="html"}</label>
-        {$collection.photo_title|truncate:100}<br />
+        <span>{$collection.photo_title|truncate:100}</span><br />
 <span class="video_control"><a href="{$cbphoto->photo_links($collection,'view_item')}">{lang code="view"}</a></span>
         </div>
         </td>
diff --git a/upload/styles/cb_27/layout/manage_collections.html b/upload/styles/cb_27/layout/manage_collections.html
index b017a887..0eb87ea9 100644
--- a/upload/styles/cb_27/layout/manage_collections.html
+++ b/upload/styles/cb_27/layout/manage_collections.html
@@ -139,7 +139,8 @@
                             {include file="$style_dir/blocks/manage/account_collections.html" display_type="items" collection=$objs[olist]}
                         {sectionelse}
                             <div align="center" style="font:bold 11px Tahoma; margin-top:5px;">{lang code="no_items_found_in_collect"}</div>
-                        {/section}    
+                        {/section}
+                        {include file="$style_dir/blocks/pagination.html"}    
                     {/if}
 
                     {if $mode == "favorite"}
diff --git a/upload/styles/cb_27/layout/watch_video.html b/upload/styles/cb_27/layout/watch_video.html
index 2d98bd5d..ba0155ff 100644
--- a/upload/styles/cb_27/layout/watch_video.html
+++ b/upload/styles/cb_27/layout/watch_video.html
@@ -141,6 +141,17 @@
                             <div class="alert ">
                             {show_playlist_form id=$vdo.videoid type=video}
                             </div>
+                            {if userid()}
+                            <div class="alert ">
+                                <div class="clearfix"></div>
+                                <div align="right"><a href="javascript:void(0)"
+                                     onclick="$('#addCollectionCont').toggle()"
+                                        style="text-decoration:none"><strong>+ {lang code='add_to_my_collection'}</strong></a>
+                                </div>
+                                <div id="addCollectionCont" style="display:none">{show_collection_form id=$vdo.videoid type=Video}</div>
+                            </div>
+                            {/if}    
+                            </div>
                         </div>
 
                         <div class="tab-pane" id="cb-item-report">