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 @@