Added : Collapsed Options in Admin area

Fixed : comma problem in cbpage.class.php
Added : Collapsed for Checkboxes
Fixed : invite_member function. Loop was running for empty index
Updated : get_user_level function. Now user has select fields.
Updated : Initialization of Admin Area Menu
Updated : common.php. Added new modifiers for json_decode and Group Privacy
Updated : functions.php
Fixed : search_result.php. Inserted checking for category.
Updated : A lot template changing.
Updated : view_group.php
Added : new icons for group and new files for group

upload/add_group_videos.php

@@ -34,6 +34,7 @@ else
 
 	$array = array('user'=>userid(),'limit'=>$get_limit);
 	$usr_vids = get_videos($array);
+	//echo $db->db_query;
 	assign('usr_vids',$usr_vids);
 	
 	$array['count_only'] = true;

upload/admin_area/main.php

@@ -150,6 +150,7 @@ if(isset($_POST['update'])){
 					'search_list_per_page',
 					'server_friendly_conversion',
 					'support_email',
+					'show_collapsed_checkboxes',
 					
 					'thumb_width',
 					'thumb_height',

upload/admin_area/styles/cbv2/layout/main.html

@@ -227,6 +227,23 @@ $(document).ready(function(){
           >No</option>
               </select></td>
             </tr>
+			<tr>
+              <td>Collpase Category Checkboxes</td>
+              <td><select name="show_collapsed_checkboxes" id="show_collapsed_checkboxes">
+                <option value="1"
+       {if $row.show_collapsed_checkboxes == 1}
+        selected="selected"
+      {/if}
+        >Yes</option>
+                <option value="0"
+        {if $row.show_collapsed_checkboxes == 0}
+          selected="selected"
+          {/if}
+          >No</option>
+              </select>
+               <span class="smallText" style="font-size:11px;">If selected <strong>YES</strong>, Categories shown while uploading <strong>video</strong> will be collapsed.</span>
+              </td>
+            </tr>            
             <tr>
               <td>&nbsp;</td>
               <td>&nbsp;</td>

upload/admin_area/styles/cbv2/theme/main.css

@@ -8,7 +8,7 @@ body,html {background-color:#fff; margin:0px; padding:0px; font-family:Verdana;
 
 /* CLEARS */
 .clearfix { }
-.clearfix:after{ content: "."; display:block; height:0; font-size:0; clear:both; visibility:visible; }
+.clearfix:after{ content: "."; display:block; height:0; font-size:0; clear:both; visibility:hidden; }
 
 /* GENERAL CSS */
 a{ color:#0099cc; text-decoration:none; outline:none; }
@@ -312,6 +312,15 @@ li.myAdminList input[disabled=disabled].disabled { font:normal 11px Tahoma; padd
 
 .delTab { font:normal 10px Verdana; background:#eee; border:1px solid white; margin:0px; padding:1px;  color:#333; }
 .delTab:hover { background:#000; border:1px solid white; color:#FFF; cursor:pointer; }
+
+.TabButton:hover .delTab { display:inline-block; }
+
+.uploadCategoryCheckBlock { position:relative; width:200px; }
+.uploadCategoryCheckBlock br { display:none; }
+.CategoryToggler { position:absolute; width:10px; height:10px; top:5px; right:5px; }
+.CategoryToggler.none { background: url(../images/catgory_toggler.png) left top no-repeat; }
+.CategoryToggler.block { background: url(../images/catgory_toggler.png) right top no-repeat; top:5px; }
+.CategoryToggler:hover { cursor:pointer; }
 .TabButton:hover .delTab { display:inline-block; }
 
 
@@ -325,4 +334,4 @@ li.myAdminList input[disabled=disabled].disabled { font:normal 11px Tahoma; padd
 
 .optionsListsCont{ border:1px solid #09c; width:auto; margin-left:219px;padding:10px}
 .templateCodeCont{ border:1px solid #757575; padding:10px; background-color:#F7F7F7;}
-.templateCode{width:100%; height:100%; border:1px solid #F4F4F4; border:0px; background:none; min-height:500px;}
+.templateCode{width:100%; height:100%; border:1px solid #F4F4F4; border:0px; background:none; min-height:500px;}

upload/includes/classes/ClipBucket.class.php

@@ -89,7 +89,7 @@ class ClipBucket
 		
 		
 		//This is used to create Admin Menu
-		$this->AdminMenu = $this->get_admin_menu();
+		//$this->AdminMenu = $this->get_admin_menu();
 
 		//Updating Upload Options		
 		$this->temp_exts = array('ahz','jhz','abc','xyz','cb2','tmp','olo','oar','ozz');
@@ -298,6 +298,68 @@ class ClipBucket
 		  
 		  return $menu_array;
 	  }	 
+
+	function LatestAdminMenu()
+	{
+			global $userquery;
+			$per = $userquery->get_user_level($_SESSION['userid']);
+			if($per['web_config_access'] == "yes")
+				$NewMenu[ 'Stats And Configurations'] = array(
+													'Reports & Stats'=>'reports.php',
+													'Website Configurations'=>'main.php',
+													'Email Settings'=>'email_settings.php',
+													'Language Settings' => 'language_settings.php',
+													'Add New Phrases'	=> 'add_phrase.php',
+													'Manage Pages'	=> 'manage_pages.php',
+													'Manage Comments' => 'comments.php'
+													);
+			if($per['video_moderation'] == "yes")
+				$NewMenu['Videos'	] =  array(
+													'Videos Manager'=>'video_manager.php',
+													'Manage Categories'=>'category.php',
+													'List Flagged Videos'=>'flagged_videos.php',
+													'Upload Videos'	=>'mass_uploader.php',
+													'List Inactive Videos'=>'video_manager.php?search=search&active=no'
+													);	
+			if($per['member_moderation'] == "yes")
+				$NewMenu['Users'] = array(
+													 'Manage Members' => 'members.php',
+													 'Add Member'=>'add_member.php',
+													 'Manage categories' => 'user_category.php',
+													 'User Levels'=>'user_levels.php',
+													 'Search Members'=>'members.php?view=search',
+													 'Inactive Only'=>'members.php?search=yes&status=ToActivate',
+													 'Active Only'=>'members.php?search=yes&status=Ok',
+													 'Reported Users'=>'flagged_users.php',
+													 'Mass Email'=>'mass_email.php'
+													);	
+			if($per['group_moderation'] == "yes")
+				$NewMenu['Groups'] = array('Add Group'=>'add_group.php',
+				 'Manage Groups'=>'groups_manager.php',
+				 'Manage Categories'=>'group_category.php?view=show_category',
+				 'View Inactive Groups' => 'groups_manager.php?active=no&search=yes',
+				 'View Reported Groups' => 'flagged_groups.php');
+				 
+			if($per['ad_manager_access'] == "yes")
+				$NewMenu['Advertisement'] = 			   array(
+				  'Manage Advertisments'=>'ads_manager.php',
+				  'Manage Placements'=>'ads_add_placements.php'
+				);
+			if($per['manage_template_access'] == "yes")
+				$NewMenu['Templates And Players'] = array(	'Templates Manager'=>'templates.php',
+				 'Templates Editor'=>'template_editor.php',
+				 'Players Manager' => 'manage_players.php',
+				 'Player Settings' => 'manage_players.php?mode=show_settings');	
+			$NewMenu['Plugin Manager'] = array('Plugin Manager'=>'plugin_manager.php');
+			$NewMenu['Tool Box'] = array(				 'PHP Info'	=> 'phpinfo.php',
+				 'Server Modules Info'	=> 'cb_mod_check.php',
+				 'Conversion Queue Manager'	=> 'cb_conversion_queue.php',
+				 'ReIndexer'	=> 'reindex_cb.php',
+				 'Conversion Lab α'	=> 'conversion_lab.php',
+				 'Repair video duration'	=> 'repair_vid_duration.php');
+
+			return $NewMenu;	 				  																																		
+	}	 
 	
 	/**
 	 * Function used to assign ClipBucket configurations

upload/includes/classes/category.class.php

@@ -277,10 +277,8 @@ abstract class CBCategory
 			if(array_key_exists($catID,$_COOKIE))
 			{
 				$property = $_COOKIE[$catID];
-				if($property == "expanded")
-					$display = "block";
-				if($property == "collapsed")
-					$display = "none";		
+				if($property == "expanded")$display = "block";
+				if($property == "collapsed")$display = "none";		
 			} else {
 				$display = "none";	
 			}	

upload/includes/classes/cbpage.class.php

@@ -29,7 +29,7 @@ class cbpage
 		global $db;
 		$name = mysql_clean($param['page_name']);
 		$title = mysql_clean($param['page_title']);
-		$content = ($param['page_content']);
+		$content = addslashes($param['page_content']);
 		
 		if(empty($name))
 			e(lang("page_name_empty"));
@@ -84,7 +84,7 @@ class cbpage
 		$id = $param['page_id'];
 		$name = mysql_clean($param['page_name']);
 		$title = mysql_clean($param['page_title']);
-		$content = ($param['page_content']);
+		$content = addslashes($param['page_content']);
 		
 		$page = $this->get_page($id);
 		

upload/includes/classes/form.class.php

@@ -140,7 +140,11 @@ class formObj
 			if(is_array($catArray))
 			{
 				$this->multi_cat_id = $this->multi_cat_id + 1;
-				$this->listCategoryCheckBox(array('categories'=>$catArray,'field'=>$field),$multi);
+				$params['categories'] = $catArray;
+				$params['field'] = $field;
+				if(config('show_collapsed_checkboxes') == 1)
+					$params['collapsed'] = true;	
+				$this->listCategoryCheckBox($params,$multi);
 				return false;
 			}else
 				return "There is no category to select";
@@ -193,18 +197,69 @@ class formObj
 		}
 	}
 	
+	function listCategoryCheckBoxCollapsed($in,$multi)
+	{
+		$cats = $in['categories'];
+		$field = $in['field'];
+		$rand = (rand(0,100000));
+		if($field['sep'] == "<br/>")
+			$field['sep'] = "";
+			
+		if(!$multi)
+			$fieldName = $field['name'];
+		else
+		{
+			$fieldName = $field['name'];
+			$fieldName = $this->rmBrackets($fieldName);
+			$fieldName = $fieldName.$multi_cat_id.'[]';
+		}
+		$display = "none";
+		$values = $field['value'][1][0];
+		$Values = array();
+		if(!empty($values))
+			foreach($values as $val)
+				$Values[] = "|".$val."|";
+	
+		if($cats)
+		{
+			$output = "";
+			foreach($cats as $cat)
+			{
+				$checked = "";
+				if(in_array("|".$cat['category_id']."|",$Values))
+					$checked = 'checked';
+				echo "<div class='uploadCategoryCheckBlock' style='position:relative'>";
+				echo $field['sep'];
+				echo '<label><input name="'.$fieldName.'" type="checkbox" value="'.$cat['category_id'].'" '.$field_id.'
+				 '.$checked.' '.$field['extra_tags'].'>'.$cat['category_name'].'</label>';
+				 if($cat['children'])
+				 {
+				 		echo "<span id='".$cat['category_id']."_toggler' alt='".$cat['category_id']."_".$rand."' class='CategoryToggler CheckBoxCategoryToggler ".$display."' style='display:block;' onclick='toggleCategory(this);'>&nbsp;</span>";
+							$childField = $field;
+							$childField['sep'] = $field['sep'].str_repeat('&nbsp;',5); 
+						echo "<div id='".$cat['category_id']."_".$rand."' class='sub_categories sub_categories_checkbox' style='display:".$display."'>";
+							echo 	$this->listCategoryCheckBoxCollapsed(array('categories'=>$cat['children'],'field'=>$childField,'children_indent'=>true),$multi);
+						echo "</div>"; 
+				 }
+				 echo "</div>";
+			}
+		}
+	}
+	
 	//Creating checkbox with indent for cateogry childs
 	function listCategoryCheckBox($in,$multi)
 	{
 		$cats = $in['categories'];
 		$field = $in['field'];
-		
+		//$in['collapsed'] = true;
+		$collapsed = $in['collapsed'];
+		if($collapsed)
+			return $this->listCategoryCheckBoxCollapsed($in,$multi);
 		//setting up the field name
 		if(!$multi)
 			$field_name = $field['name'];
 		else
 		{
-			
 			$field_name = $field['name'];
 			$field_name = $this->rmBrackets($field_name);
 			$field_name = $field_name.$this->multi_cat_id.'[]';

upload/includes/classes/groups.class.php

@@ -1330,7 +1330,6 @@ class CBGroups extends CBCategory
 			$var = array_merge($more_var,$var);
 			$subj = $cbemail->replace($tpl['email_template_subject'],$var);
 			$msg = nl2br($cbemail->replace($tpl['email_template'],$var));
-			
 			//Now Finally Sending Email
 			cbmail(array('to'=>$reciever['email'],'from'=>WEBSITE_EMAIL,'subject'=>$subj,'content'=>$msg));		
 		}
@@ -1343,7 +1342,7 @@ class CBGroups extends CBCategory
 	{
 		global $eh;
 		$total = count($user_array);
-		for($i=0;$i<=$total;$i++)
+		for($i=0;$i<$total;$i++)
 		{
 			$this->invite_member($user_array[$i],$group,$owner);
 		}

upload/includes/classes/user.class.php

@@ -1636,10 +1636,13 @@ class userquery extends CBCategory{
 	 * @param : level_id
 	 * @param : count BOOLEAN (if TRUE it will return NUMBERS)
 	 */
-	function get_level_users($id,$count=FALSE)
+	function get_level_users($id,$count=FALSE,$fields="level")
 	{
 		global $db;
-		$results = $db->select(tbl("users"),"level"," level='$id'");
+		if($fields == "all")
+			$fields = "*";
+			
+		$results = $db->select(tbl("users"),$fields," level='$id'");
 		if($db->num_rows>0)
 		{
 			if($count)

upload/includes/common.php

@@ -20,7 +20,7 @@
 
 ob_start();
 
-define("DEVELOPMENT_MODE",TRUE);
+define("DEVELOPMENT_MODE",FALSE);
 define("DEV_INGNORE_SYNTAX",TRUE);
 
 //Setting Cookie Timeout
@@ -405,7 +405,7 @@ if(phpversion() < '5.2.0')
 	define("ALLOWED_GROUP_CATEGORIES",$row['grp_categories']);
 	define('ALLOWED_VDO_CATS',$row['video_categories']);
 	define('ALLOWED_CATEGORIES',3);
-	
+	$Cbucket->AdminMenu = $Cbucket->LatestAdminMenu();
 	
  	//Assigning Smarty Tags & Values
     Assign('CB_VERSION',CB_VERSION);
@@ -589,7 +589,8 @@ $Smarty->register_modifier('formatfilesize','formatfilesize');
 $Smarty->register_modifier('getWidth','getWidth');
 $Smarty->register_modifier('getHeight','getHeight');
 $Smarty->register_modifier('get_collection_name','get_collection_name');
-
+$Smarty->register_modifier('json_decode','jd');
+$Smarty->register_modifier('getGroupPrivacy','getGroupPrivacy');
 
 assign('updateEmbedCode','updateEmbed');
 /*

upload/includes/defined_links.php

@@ -29,8 +29,8 @@ $cbLinks = array
 'signup'		=>array('signup.php','signup'),
 'upload'		=>array('upload.php','upload'),
 'user_contacts' =>array('user_contacts.php?user=','user_contacts.php?user='),
-'user_subscriptions' =>array('user_contacts.php?mode=subscriptions&user=','user_contacts.php?subscriptions&user='),
-'user_subscribers' =>array('user_contacts.php?mode=subscribers&user=','user_contacts.php?subscribers&user='),
+'user_subscriptions' =>array('user_contacts.php?mode=subscriptions&user=','user_contacts.php?mode=subscriptions&user='),
+'user_subscribers' =>array('user_contacts.php?mode=subscribers&user=','user_contacts.php?mode=subscribers&user='),
 'user_favorites'=>array('user_videos.php?mode=favorites&user=','user_videos.php?mode=favorites&user='),
 'user_videos' 	=>array('user_videos.php?user=','user_videos.php?user='),
 'videos'		=>array('videos.php','videos'),

upload/includes/functions.php

@@ -2703,6 +2703,12 @@
 				&& $vdo['userid']!=$uid){
 			e(lang('private_video_error'));
 			return false;
+		}elseif($vdo['active'] == 'pen'){
+				e(lang("video_in_pending_list"));
+				if(has_access('admin_access',TRUE) || $vdo['userid'] == userid())
+					return true;
+				else
+					return false;
 		}elseif($vdo['broadcast']=='logged' 
 				&& !userid()
 				&& !has_access('video_moderation',true) 
@@ -2733,6 +2739,7 @@
 		else
 		{
 			$funcs = cb_get_functions('watch_video');
+			
 			if($funcs)
 			foreach($funcs as $func)
 			{
@@ -4952,7 +4959,7 @@
 		
 		$preUrl = preg_replace(array("/(\&{2,10})/","/\?\&/"),array("&","?"),$preUrl);
 		
-		return $preUrl.$var;		
+		return $preUrl.$var;
 	}
 	
 	
@@ -5118,7 +5125,7 @@
 	/**
 	 * JSON_DECODE short
 	 */
-	function jd($in){ return json_decode($in); }
+	function jd($in,$returnClass=false){ if(!$returnClass) return  json_decode($in,true); else return  json_decode($in); }
 	
 	
 	/**
@@ -5226,8 +5233,39 @@
 			return true;
 		else
 			return false;
-	}
-	
+	}	
+	/**
+	 * Function used display privacy in text
+	 * according to provided number
+	 * 0 - Public
+	 * 1 - Protected
+	 * 2 - Private
+	 */
+	 function getGroupPrivacy($privacyID)
+	 {
+			{
+				switch($privacyID)
+				{
+					case "0": default:
+					{
+						return lang("group_is_public");
+					}
+					break;
+					
+					case "1":
+					{
+						return lang("group_is_protected");
+					}
+					break;
+					
+					case "2":
+					{
+						return lang("group_is_private");
+					}
+					break;
+				}
+			}
+	 }	
 	
 	/**
 	 * Function used to create user feed

upload/includes/plugins.php

@@ -51,6 +51,20 @@ function display_inactive_sign($vdo)
 		echo '<div style="position:absolute;top:2px; height:13px; background-color:#ed0000; width:100%; color:#fff; font-size:10px; text-align:center">Video is inactive</div>';
 	}
 }
+
+function show_pending_alert($data)
+{
+	if($data['active'] == 'pen')
+	{
+		$out = "<div style='position:absolute; text-align:center; top:0px; left:0px; width:100%; padding:2px 0px; color:#FFF; background:#d40000; font:normal 10px Tahoma;'>";
+		$out .= "Video is pending";
+		$out .= "</div>";
+		
+		echo $out;	
+	}
+}
+
+register_anchor_function('show_pending_alert','in_video_thumb');
 register_anchor_function('display_inactive_sign','in_video_thumb');
 
 ?>

upload/js/functions.js

@@ -382,14 +382,13 @@ var loading = loading_img+" Loading...";
 	
 	function submit_share_form(form_id,type)
 	{
-		
 		$("#share_form_results").css("display","block");
 		$("#share_form_results").html(loading);
 		$.post(page, 
 		{ 	
 			mode : 'share_object',
 			type : type,
-			users : $("#"+form_id+" input:#users").val(),
+			users : $("#"+form_id+" input:#ShareUsers").val(),
 			message : $("#"+form_id+" textarea:#message").val(),
 			id : $("#"+form_id+" input:#objectid").val()
 		},
@@ -1244,18 +1243,23 @@ function showAdvanceSearch(simple,advance,expandClass,collapseClass)
 	$('.'+expandClass).toggleClass(collapseClass);
 }
 
-function toggleCategory(object)
+function toggleCategory(object,perPage)
 {
 	var obj = $(object), childTarget = obj.attr('alt'), child = $("#"+childTarget),
 		childparts = childTarget.split("_"), childID = childparts[0];
-		
+	var browser = $.browser.msie; var browserVersion = $.browser.version;
+	
 	if(child.css('display') == "none")
 	{
 		child.slideDown(350);
+		if(browser && browserVersion == "7.0")
+			child.addClass('internetExplorer7CategoryToggleFix');
 		$.cookie(childID,'expanded',{ expires: 1, path: '/' });
 		obj.removeClass('none').addClass('block');	
 	} else {
 		child.slideUp(350);
+		if(browser && browserVersion == "7.0")
+			child.removeClass('internetExplorer7CategoryToggleFix');		
 		$.cookie(childID,'collapsed',{ expires: 1, path: '/' });
 		obj.removeClass('block').addClass('none');		
 	}
@@ -1379,8 +1383,6 @@ function checkUncheckAll(theElement) {
      }
     }
 	
-	
-	
 /**
  * Function used to rate object
  */
@@ -1401,4 +1403,72 @@ function rate(id,rating,type)
 		else
 			$("#rating_container").html(data);
 	},'text');
+}
+
+function setPageHash(Page)
+{
+	// Removing baseurl
+	var hashPart = Page.replace(baseurl,"");
+	var prevHash = window.location.hash.replace("#!",'');
+	//alert(hashPart+"       "+prevHash);
+    {
+		window.location.hash = "#!"+hashPart;
+	}
+	
+}
+
+function callURLParser()
+{
+	var expression = /(\#![/a-zA-Z0-9=\.\&\-\_\?]*)/g,
+		   location = window.location.href,
+		   returned = location.match(expression),
+		   lastVisited;
+	if(returned)
+	{
+		lastVisited = returned[returned.length - 1];	   
+		if(lastVisited)
+			window.location.href = baseurl+lastVisited.replace("#!",'');	
+	}
+}
+
+function groupsAjax(event,selector,divSelector)
+{
+	event.preventDefault(); // prevent from redirecting to URL
+	var ajaxPage, onLink = false, PreserveHTML, ParentTag, DIV;
+	if(divSelector == undefined)
+		divSelector = "ajaxGroupResultContainer";
+	if(selector.href) // Means function is on link
+	{
+		ajaxPage = selector.href;
+		onLink = true;
+		jqueryObj = $(selector);
+		javaObj = selector;	
+	} else {
+		ajaxPage = selector.childNodes[0].href;
+		jqueryObj = $(selector.childNodes[0]);
+		javaObj = selector.childNodes[0];	
+	}
+	if(ajaxPage == "undefined") {
+		alert("URL not found"); 
+		return false;
+	} else {
+		PreserveHTML = jqueryObj.html();
+		setPageHash(ajaxPage);
+		//return false;
+		if(onLink == true) {
+			ParentTag = jqueryObj.parent().parent();
+			ParentTag.children().filter('.selected').removeClass('selected');
+			jqueryObj.parent().addClass('selected');
+		} else {
+			ParentTag = jqueryObj.parent();
+			ParentTag.children().filter('.selected').removeClass('selected');
+			jqueryObj.addClass('selected');
+		}
+		jqueryObj.html(loading_img);
+		$("#"+divSelector).load(ajaxPage+" #"+divSelector+"",function(response, status, xhr){
+				jqueryObj.html(PreserveHTML);
+				if(document.getElementById('flag_item'))
+					$('#flag_item').show();	
+		});
+	}
 }

upload/search_result.php

@@ -30,23 +30,23 @@ if($type!='videos')
 else
 {
 	$child_ids = array();
-	
-	foreach($_GET['category'] as $category)
-	{
-		$childs = $cbvid->get_sub_categories(mysql_clean($category));
-		if($childs)
-		foreach($childs as $child)
+	if($_GET['category'])
+		foreach($_GET['category'] as $category)
 		{
-			$child_ids[] = $child['category_id'];
-			$subchilds = $childs = $cbvid->get_sub_categories($child['category_id']);
-			if($subchilds)
-			foreach($subchilds as $subchild)
+			$childs = $cbvid->get_sub_categories(mysql_clean($category));
+			if($childs)
+			foreach($childs as $child)
 			{
-				$child_ids[] = $subchild['category_id'];
+				$child_ids[] = $child['category_id'];
+				$subchilds = $childs = $cbvid->get_sub_categories($child['category_id']);
+				if($subchilds)
+				foreach($subchilds as $subchild)
+				{
+					$child_ids[] = $subchild['category_id'];
+				}
 			}
+			$child_ids[] = mysql_clean($category);	
 		}
-		$child_ids[] = mysql_clean($category);	
-	}
 	
 	$search->category = $child_ids;
 }
@@ -54,7 +54,7 @@ $search->date_margin = mysql_clean($_GET['datemargin']);
 $search->sort_by = mysql_clean($_GET['sort']);
 $search->limit = create_query_limit($page,$search->results_per_page);
 $results = $search->search();
-
+//echo $db->db_query;
 //Collecting Data for Pagination
 $total_rows = $search->total_results;
 $total_pages = count_pages($total_rows,$search->results_per_page);

upload/styles/cbv2new/layout/add_group_videos.html

@@ -1,22 +1,33 @@
-<div class="group_view">
-
-{include file="$style_dir/blocks/group/group_header.html" group=$group}
-
-<h2>{lang code='grp_add_vdo_msg'}</h2>
-   
-<form name="add_group_videos" id="add_group_videos" method="post" action="">     
-{foreach from=$usr_vids item=video}
-	{if $cbgroup->is_group_video($video.videoid,$group.group_id)}
-    	{assign var='check_this' value='yes'}
-    {else}
-    	{assign var='check_this' value=''}
-    {/if}
-    {include file="$style_dir/blocks/video.html" video=$video display_type='add_type'}    
-{/foreach}
-<div class="clear"></div>
-{include file="$style_dir/blocks/pagination.html"}
-<div align="center">
-	<input type="submit" name="add_videos" id="add_videos" value="{lang code='grp_add_vdos'}" class="cb_button">
+{include file="$style_dir/blocks/group/group_left.html"}
+<div class="groupContent">
+	<div class="groupTitle clearfix">{$group.group_name}</div>
+    <div style="padding:0px 5px">
+	<ul class="groupsBar clearfix" style="border-color:#aaa; border-width:0px 0px 1px;">
+    	<li  {if $mode == "" || $mode == "main"}class="selected"{/if}><a href="{group_link details=$group}" onClick="groupsAjax(event,this);" id="gpViewInfo"><img src="{$imageurl}/dot.gif" class="blueDoc"/> {lang code="info"}</a></li>
+        <li {if $mode == "view_topics"}class="selected"{/if}><a href="{group_link details=$group}?mode=view_topics" onClick="groupsAjax(event,this);" id="gpViewTopics"><img src="{$imageurl}/dot.gif" class="ballonBox"/> {lang code="grp_topics_title"}</a></li>
+        <li {if $mode == "view_members"}class="selected"{/if}><a href="{group_link details=$group type='view_members'}" id="gpAllMembers" onClick="groupsAjax(event,this);"><img src="{$imageurl}/dot.gif" class="blackUser"/>  {lang code="members"}</a></li>
+        <li {if $mode == "view_videos"}class="selected"{/if}><a href="{group_link details=$group type='view_videos'}" id="gpAllVideos" onClick="groupsAjax(event,this);"><img src="{$imageurl}/dot.gif" class="camCorder"/>  {lang code="videos"}</a></li>
+        <li {if $mode == "view_report_form"}class="selected"{/if}><a href="{group_link details=$group}?mode=view_report_form" onClick="groupsAjax(event,this);" id="gpAllReport"><img src="{$imageurl}/dot.gif" class="redShield"/>  Report</a></li>
+    </ul>
+    <div id="ajaxGroupResultContainer">
+        <div class="groupSep"><span class="SepText">{lang code='grp_add_vdo_msg'}</span></div>
+            <form name="add_group_videos" id="add_group_videos" method="post" action="">     
+                {foreach from=$usr_vids item=video}
+                	{if $cbgroup->is_group_video($video.videoid,$group.group_id)}
+                		{assign var='check_this' value='yes'}
+                	{else}
+                		{assign var='check_this' value=''}
+                	{/if}
+                	{include file="$style_dir/blocks/video.html" video=$video display_type='add_type'}    
+                {/foreach}
+                <div class="clear"></div>
+                {include file="$style_dir/blocks/pagination.html"}
+                <div align="center">
+                <input type="submit" name="add_videos" id="add_videos" value="{lang code='grp_add_vdos'}" class="cb_button">
+                </div>
+            </form>
+        </div>    
+ </div>   
 </div>
-</form>   
-</div>
+
+{include file="$style_dir/blocks/group/group_right.html"}  

upload/styles/cbv2new/layout/blocks/flag_form.html

@@ -1,5 +1,5 @@
 <!-- Flag This {$type} -->
-<div id="flag_item" class="action_box" style="display:none">
+<div id="flag_item" class="action_box" style="display:{if $display}{$display}{else}none{/if}">
 	<div class="action_box_title">Flag this {$params.type} &#8212; <span class="cancel"><a href="javascript:void(0)" onclick="$('#flag_item').slideUp();">cancel</a></span></div>
     <div class="form_container" align="center">
     

upload/styles/cbv2new/layout/blocks/group/add_topic.html

@@ -1,30 +1,14 @@
-<div>
-	
-	<div class="add_topic_container">
-    	<h2>{lang code='grp_add_new_topic'}</h2>
-      <form name="form1" method="post" action="{group_link details=$group}" class="topic_form">
-      	{assign var='form_fields' value=$cbgroup->load_add_topic_form_fields()}
-        
-        {foreach from=$form_fields item=field}
-        <label for="{$field.id}" class="label">{$field.title}</label>
-        	{$field.hint_1}{ANCHOR place=$field.anchor_before}{$formObj->createField($field)}{ANCHOR place=$field.anchor_after}
-        {/foreach}
-        
-        <div class="topic_icon_cont">
-        <fieldset>
-          <legend>{lang code='topic_icon'}</legend>
-        {assign var=topic_icons value=$cbgroup->get_topic_icons()}
-        {if $topic_icons}
-          {foreach from=$topic_icons item=icon}
-          	<label><img src="{$icon.url}"><br>
-            <input type="radio" name="topic_icon" value="{$icon.file}" {if $smarty.post.topic_icon ==$icon.file} checked{/if} ></label>
-          {/foreach}
-          <div class="clearfix"></div>
-       	{/if}
-        </fieldset>
-        </div>
-        
-        <div align="left" style="padding:5px 0px"><button name="add_topic" id="add_topic" value="submit" class="cb_button_2">{lang code='grp_add_new_topic'}</button></div>
-      </form>
-	</div>
+<div class="add_topic_container">
+  <form name="form1" method="post" action="{group_link details=$group}" class="topic_form">
+    {assign var='form_fields' value=$cbgroup->load_add_topic_form_fields()}
+    
+    {foreach from=$form_fields item=field}
+    <div class="channelRow">
+    	<div class="channelLabel"><label for="{$field.id}">{$field.title}</label></div>
+        <div class="channelDetail">{$field.hint_1}{ANCHOR place=$field.anchor_before}{$formObj->createField($field)}{ANCHOR place=$field.anchor_after}</div>
+	</div>        
+    {/foreach}
+    
+    <div align="right" style="padding:5px 0px"><button name="add_topic" id="add_topic" value="submit" class="cb_button_2">{lang code='grp_add_new_topic'}</button></div>
+  </form>
 </div>

upload/styles/cbv2new/layout/blocks/group/group_header.html

@@ -115,9 +115,9 @@
                 	{assign var=users_items_group_page value=func->config(users_items_group_page)}
                 	{assign var=members value=$cbgroup->get_members($group.group_id,"yes",$users_items_group_page)}
                     {if $members}
-                    {foreach from=$members item=member}
-						{include file="$style_dir/blocks/user.html" user=$member block_type='medium'}
-                    {/foreach}
+                        {foreach from=$members item=member}
+                            {include file="$style_dir/blocks/user.html" user=$member block_type='medium'}
+                        {/foreach}
                     {/if}
                     <div class="clear"></div>
                     <div align="right"><a href="{group_link details=$group type='view_members'}">{lang code='view_all_mems'}</a></div>

upload/styles/cbv2new/layout/blocks/group/group_left.html

@@ -0,0 +1,23 @@
+<div class="groupLeftSide">
+	<div class="groupThumb" align="center">
+    	<span class="groupThumbBG"><a href="{group_link details=$group}"><img src="{$cbgroup->get_group_thumb($group)}" border="0" /></a></span>
+    </div>
+    <div class="channelLegend">Admin Links</div>
+    <ul class="channel_action_links channelBox clearfix">
+            {if isSectionEnabled('videos')}
+            {assign var=manage_videos_link value=$cbgroup->group_opt_link($group,'manage_videos')}
+            {if $manage_videos_link}<li>{$manage_videos_link}</li>{/if}
+            {/if}
+            
+            {if isSectionEnabled('channels')}
+            {assign var=manage_members_link value=$cbgroup->group_opt_link($group,'manage_members')}
+            {if $manage_members_link}<li>{$manage_members_link}</li>{/if}
+            {/if}
+            
+            {assign var=edit_group_link value=$cbgroup->group_opt_link($group,'edit_group')}
+            {if $edit_group_link}<li onClick="groupsAjax(event,this);">{$edit_group_link}</li>{/if}
+            
+            {assign var=remove_group_link value=$cbgroup->group_opt_link($group,'remove_group')}
+            {if $remove_group_link}<li>{$remove_group_link}</li>{/if}    
+    </ul>
+</div>

upload/styles/cbv2new/layout/blocks/group/group_right.html

@@ -0,0 +1,29 @@
+<div class="groupRightSide">	
+	<div class="channelLegend clearfix">{lang code="members"}</div>
+    <div class="channelBox clearfix">
+        {assign var=users_items_group_page value=func->config(users_items_group_page)}
+        {assign var=members value=$cbgroup->get_members($group.group_id,"yes",$users_items_group_page)}
+        {if $members}
+            {foreach from=$members item=member}
+                {include file="$style_dir/blocks/user.html" user=$member block_type='friends'}
+            {/foreach}
+        {/if}
+    </div>
+    <div style="height:10px;"></div>
+	<div class="channelLegend clearfix">{lang code="Links"}</div>
+    <ul class="channel_action_links channelBox clearfix">
+        {assign var=join_link value=$cbgroup->group_opt_link($group,'join')}
+        {if $join_link}<li>{$join_link}</li>{/if}
+        
+        {assign var=invite_link value=$cbgroup->group_opt_link($group,'invite')}
+        {if $invite_link}<li onClick="groupsAjax(event,this);">{$invite_link}</li>{/if}
+        
+        {assign var=leave_link value=$cbgroup->group_opt_link($group,'leave')}
+        {if $leave_link}<li>{$leave_link}</li>{/if}
+        {if isSectionEnabled('videos')}
+        
+        {assign var=add_videos_link value=$cbgroup->group_opt_link($group,'add_videos')}
+        {if $add_videos_link}<li>{$add_videos_link}</li>{/if}
+        {/if}                    
+    </ul>   
+</div>

upload/styles/cbv2new/layout/blocks/group/group_topics.html

@@ -3,48 +3,28 @@
     {assign var=topics value=$cbgroup->get_group_topics($group.group_id)}
 {/if}
 
-<table width="100%" border="0" cellspacing="0" cellpadding="0" class="topic_table_head">
-  <tr>
-    <td width="40" align="left">&nbsp;</td>
-    <td align="left">{lang code='topic_title'}</td>
-    <td width="150" align="left">{lang code='views'}</td>
-    <td width="100" align="left">{lang code='grp_replies_title'}</td>
-    <td width="100" align="left">{lang code='last_reply'}</td>
-  </tr>
-</table>
-{if $topics}
+
 {foreach from=$topics item=topic}
-{assign var=poster value=$userquery->get_user_details($topic.userid)}
-
+{assign var=user value=$userquery->get_user_details($topic.userid)}
 {if $topic.last_poster}
-{assign var=last_poster value=$userquery->get_user_details($topic.last_poster)}
+	{assign var=last_poster value=$userquery->get_user_details($topic.last_poster)}
 {else}
-{assign var=last_poster value=''}
+	{assign var=last_poster value=''}
 {/if}
-
-<div class="topic_table">
-<table width="100%" border="0" cellspacing="0" cellpadding="0" >
-  <tr bgcolor="{cycle values=f7f7f7,ffffff}">
-    <td width="40" align="left"><img src="{$cbgroup->get_topic_icon($topic)}" /></td>
-    <td align="left">
-    {lang code='topic_by_user' assign='topic_by_user'}
-    
-    <span class="topic_title">{$topic_by_user|sprintf:$cbgroup->topic_link($topic):$topic.topic_title:$userquery->profile_link($poster):$poster.username} {$title.date_added|niceTime} 
-	{if has_access('admin_access') || $topic.userid == $userquery->userid}<small><a href="javascript:void(0)" id="delete_topic-{$topic.topic_id}" onmousedown="delete_item('delete_topic','{$topic.topic_id}','{lang code="tp_del_confirm"}','?mode=topic_del&amp;topic_id={$topic.topic_id}&amp;url={$group.group_url}');">Delete</a></small>{/if}
-	</td>
-    <td width="150" align="left">{$topic.total_views|number_format}</td>
-    <td width="100" align="left">{$topic.total_replies|number_format}</td>
-    <td width="100" align="left">
-    {if $last_poster}
-    {lang code='last_post_time_by_user' assign='last_post_time_by_user'}
-    {assign var=last_post_time value=$topic.last_post_time|niceTime}   
-    {$last_post_time_by_user|sprintf:$last_post_time:$userquery->profile_link($last_poster):$last_poster.username}
-    {else}{lang code='bad_date'}{/if}</td>
-  </tr>
-</table>
-</div>
-
-{/foreach}
-{else}
-<div align="center"><em><strong>{lang code='no_topics'}</strong></em></div>
-{/if}
+<li class="topicRow clearfix">
+	<div class="topicStarterAvatar moveL">
+		<i class="topicStarterAvatarBG" style="background:url({avatar details=$user }) center no-repeat; width:48px; height:48px;"><a href="{$userquery->profile_link($user)}">{$user.username}</a></i>
+    </div>
+    <div class="moveR" style="width:90%;">
+    	<h2 class="topicStarter"><a href="{$userquery->profile_link($user)}">{$user.username}</a></h2>
+            <div class="topicPreviewContainer clearfix">
+            <h4 class="topicTitle"><a href="{$cbgroup->topic_link($topic)}" onclick="groupsAjax(event,this);">{$topic.topic_title}</a></h4>
+            <div style="height:2px;"></div>
+            <div class="topicPreview">{$topic.topic_post|description|strip_tags|truncate:100}</div>
+        </div>
+        <span style="font:normal 10px Tahoma; color:#464646">{$topic.date_added|niceTime} &ndash; {if $last_poster}{lang code="last_reply"} {lang code="by"} <a href="{$userquery->profile_link($last_poster)}">{$last_poster.username}</a> ({$topic.last_post_time|niceTime}){else}<a href="{$cbgroup->topic_link($topic)}" onclick="groupsAjax(event,this);">Participate</a>{/if} {if has_access('admin_access') || $topic.userid == $userquery->userid} &ndash; <a href="javascript:void(0)" id="delete_topic-{$topic.topic_id}" onmousedown="delete_item('delete_topic','{$topic.topic_id}','{lang code="tp_del_confirm"}','?mode=view_topics&amp;topic_action=delete&amp;topic_id={$topic.topic_id}&amp;url={$group.group_url}');">Delete</a>{/if}</span>
+    </div>
+</li>
+{foreachelse}
+<li></li>
+{/foreach}

upload/styles/cbv2new/layout/blocks/share_form.html

@@ -9,7 +9,7 @@
 {if $Cbucket->configs.video_embed==1 && $vdo.allow_embedding=='yes'}
 
 <div class="form_container"><label for="embed_code" style="font-size:12px; font-weight:bold">{lang code='embed_code'}</label>
-<textarea name="embed_code" id="embed_code" style="margin-bottom:5px; width:99%; height:50px" onclick="this.select()"  class="left_text_area">{$cbvid->embed_code($vdo)|htmlspecialchars}</textarea></div>
+<textarea name="embed_code" id="embed_code" style="margin-bottom:5px; width:99%; height:150px" onclick="this.select()"  class="left_text_area">{$cbvid->embed_code($vdo)|htmlspecialchars}</textarea></div>
 
 Player size : 
 

upload/styles/cbv2new/layout/blocks/user.html

@@ -28,4 +28,10 @@
 	<div style="float:left; margin:0 0px 2px 0;" id="user-{$user.userid}">
     	<a href="{$userquery->profile_link($user)}" title="{$user.username}"><img src="{avatar details=$user size='small'}" alt="{$user.username}" style="padding:1px; vertical-align:middle;" /></a>
     </div> <!-- friend_{$user.userid} end -->
+{/if}
+
+{if $block_type == "topic_view"}
+	<div class="topicStarterAvatar moveL">
+		<i class="topicStarterAvatarBG" style="background:url({avatar details=$user }) center no-repeat; width:56px; height:56px;"><a href="{$userquery->profile_link($user)}">{$user.username}</a></i>
+    </div>
 {/if}

upload/styles/cbv2new/layout/blocks/video.html

@@ -42,7 +42,6 @@
 
 {if $display_type=='add_type'}
 <div class="vertical">
-<div class="the_vid_container">
     <div class="video_thumb">
     	{ANCHOR place='in_video_thumb' data=$video}
         <label for="check_video_{$video.videoid}"><img src="{getThumb vdetails=$video}" width="110" height="66" border="0"  /></label>
@@ -63,7 +62,7 @@
         </div> <!--LVL1 END-->
         
         <div class="lvl2 clearfix">
-            <div class="desc">{$video.description|description|truncate:100}</div>
+            <div class="desc">{$video.description|description|strip_tags|truncate:100}</div>
             <div class="length">Time: <span>{$video.duration|SetTime:false}</span></div>
         </div> <!--LVL2 END-->
         
@@ -80,9 +79,7 @@
             
     </div> <!--DETAILS_BLOCK END-->
     <div class="clearfix"></div>
- </div> 
-</div>
-    
+ </div>  
 {if $only_once}
     <div class="clearfix"></div>
 {/if}

upload/styles/cbv2new/layout/edit_group.html

@@ -14,7 +14,7 @@
 
  
  
- <div class="account_form">
+ <div class="account_form" id="ajaxGroupResultContainer">
  <form method="post" enctype="multipart/form-data" name="edit_video">
  
  {* GETTING THUMBS INFO *}

upload/styles/cbv2new/layout/user_videos.html

@@ -1,3 +1,4 @@
+{lang code='channel' assign='object_type'}
 {include file="$style_dir/global_header.html"}
 <body>
 {include file="$style_dir/blocks/view_channel/channel_global.html" }
@@ -18,13 +19,6 @@
             <div class="clearfix"></div>
             {include file="$style_dir/blocks/pagination.html"}       
         </div>
-     </div> <!-- this is right side -->
-</div> <!-- container end -->
-<div class="clearfix" style="height:10px"></div>
-<div id="footer" class="clearfix" style="margin-top:0px;">
-    <div class="footer">
-        &copy; {$title} {$smarty.now|date_format:"%Y"}
-    </div>
-</div> 
+</div>
 </body>
 </html>

upload/styles/cbv2new/layout/view_group.html

@@ -1,107 +1,120 @@
-<div class="group_view">
+{include file="$style_dir/blocks/group/group_left.html"}
 
-{include file="$style_dir/blocks/group/group_header.html" group=$group}
-
-{if ($mode=='' || $mode=='main') &&  $isviewable}
-<div class="clearfix" style="margin-top:10px">
-	<div style="float:left; width:500px"><h2 style="margin:0px; margin:0px">{lang code='grp_discus_title'} ({$group.total_topics|number_format})</h2></div>
-    <div style="float:right; width:250px" align="right">
-    <span class="add_topic" onclick="$('#add_topic_cont').slideToggle()">
-    <img src="{$imageurl}/group/add.png" />{lang code='grp_add_new_topic'}<span class="clearfix"></span></span>
-    </div>
-</div>
-
-<div id="add_topic_cont" style="display:none;">
-{include file="$style_dir/blocks/group/add_topic.html" group=$group}
-</div>
-	{include file="$style_dir/blocks/group/group_topics.html" group=$group}
-{/if}
-
-
-{if $mode=='invite_group'}
-
-<!-- Inviting Members to Group -->
-<h2>{lang code='grp_invite_grp_title'}</h2>
-
-<div style="display:inline; margin:auto">
-	<div style="width:600px;margin:auto">
-    {if $friends}
-     <form name="invite_friends" id="invite_friends" action="" method="post">
-<table width="100%" border="0" cellspacing="0" cellpadding="0" class="manage_contacts_tbl_head">
-      <tr>
-        <td width="15"><input type="checkbox" name="checkall" onclick="checkUncheckAll(this);"/></td>
-        <td width="50">&nbsp;</td>
-        <td>Username</td>
-        <td width="100">views</td>
-        </tr>
-  </table>
+<div class="groupContent">
+	<div class="groupTitle clearfix">{$group.group_name}</div>
+    <div style="padding:0px 5px">
+	<ul class="groupsBar clearfix" style="border-color:#aaa; border-width:0px 0px 1px;">
+    	<li  {if $mode == "" || $mode == "main"}class="selected"{/if}><a href="{group_link details=$group}" onClick="groupsAjax(event,this);" id="gpViewInfo"><img src="{$imageurl}/dot.gif" class="blueDoc"/> {lang code="info"}</a></li>
+        <li {if $mode == "view_topics"}class="selected"{/if}><a href="{group_link details=$group}?mode=view_topics" onClick="groupsAjax(event,this);" id="gpViewTopics"><img src="{$imageurl}/dot.gif" class="ballonBox"/> {lang code="grp_topics_title"}</a></li>
+        <li {if $mode == "view_members"}class="selected"{/if}><a href="{group_link details=$group type='view_members'}" id="gpAllMembers" onClick="groupsAjax(event,this);"><img src="{$imageurl}/dot.gif" class="blackUser"/>  {lang code="members"}</a></li>
+        <li {if $mode == "view_videos"}class="selected"{/if}><a href="{group_link details=$group type='view_videos'}" id="gpAllVideos" onClick="groupsAjax(event,this);"><img src="{$imageurl}/dot.gif" class="camCorder"/>  {lang code="videos"}</a></li>
+        <li {if $mode == "view_report_form"}class="selected"{/if}><a href="{group_link details=$group}?mode=view_report_form" onClick="groupsAjax(event,this);" id="gpAllReport"><img src="{$imageurl}/dot.gif" class="redShield"/>  Report</a></li>
+    </ul>
+        <div id="ajaxGroupResultContainer"> <!-- dont you dare touch this. If you did Zeus will personally kick your ASS --> 
+        {if $mode == "" || $mode == "main"}
+    	<div class="groupSep"><span class="SepText">{lang code="basic_info"}</span></div>
+        <div class="channelRow">
+        	<div class="channelLabel">{lang code="vdo_desc"}</div>
+            <div class="channelDetail">{$group.group_description}</div>
+        </div>
+        <div class="channelRow">
+        	<div class="channelLabel">{lang code="category"}</div>
+            <div class="channelDetail">{$group.category|categories:group}</div>
+        </div> 
+        <div class="channelRow">
+        	<div class="channelLabel">{lang code="tags"}</div>
+            <div class="channelDetail">{$group.group_tags|tags:group}</div>
+        </div>
+		<div class="channelRow">
+        	<div class="channelLabel">{lang code="privacy"}</div>
+            <div class="channelDetail">{$group.group_privacy|getGroupPrivacy}</div>
+        </div>
+        <div class="groupSep"><span class="SepText">{lang code="Group Stats"}</span></div>
+		<div class="channelRow">
+        	<div class="channelLabel">{lang code="Since"}</div>
+            <div class="channelDetail">{$group.date_added|date_format:"%B %e, %Y"}</div>
+        </div>
+        <div class="channelRow">
+        	<div class="channelLabel">{lang code="total_mems"}</div>
+            <div class="channelDetail">{$group.total_members|number_format} {lang code="members"}</div>
+        </div>
+		<div class="channelRow">
+        	<div class="channelLabel">{lang code="com_total_vids"}</div>
+            <div class="channelDetail">{$group.total_videos|number_format} {lang code="videos"}</div>
+        </div>
+        <div class="channelRow">
+        	<div class="channelLabel">{lang code="total_topics"}</div>
+            <div class="channelDetail">{$group.total_topics|number_format} {lang code="grp_topics_title"}</div>
+        </div>
+        <div class="channelRow">
+        	<div class="channelLabel">{lang code="viewed"}</div>
+            <div class="channelDetail">{$group.total_views|number_format} {lang code="user_times"}</div>
+        </div>
+        {/if}
+        {if $mode=='invite_group'}
+        	<div class="groupSep"><span class="SepText">{lang code='grp_invite_grp_title'}</span></div>
+             {if $friends}
+             	 <form name="invite_friends" id="invite_friends" action="" method="post">
+                    <table width="100%" border="0" cellspacing="0" cellpadding="0" class="manage_contacts_tbl_head">
+                        <tr>
+                            <td width="15"><input type="checkbox" name="checkall" onclick="checkUncheckAll(this);"/></td>
+                            <td width="50">&nbsp;</td>
+                            <td>Username</td>
+                            <td width="100">views</td>
+                        </tr>
+                    </table>
+                        {foreach from=$friends item=friend}
+                            {if userid()!=$friend.userid}
+                            	{assign var=user_detail value=$userquery->get_user_details($friend.userid)}
+                            {else}
+                            	{assign var=user_detail value=$userquery->get_user_details($friend.contact_userid)}
+                            {/if}
+                            
+                            <div class="manage_contacts_tbl">
+                            <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                            <td width="15"><input type="checkbox" name="friend[]" id="check_userd-{$user_detail.userid}" value="{$user_detail.userid}" /></td>
+                            <td width="50" height="50" align="center" valign="middle"><a href="{$userquery->profile_link($user_detail)}"><img src="{$userquery->getUserThumb($user_detail)}" alt="{$user_detail.username}" width="40" height="40" border="0"></a></td>
+                            <td><a href="{$userquery->profile_link($user_detail)}">{$user_detail.username}</a></td>
+                            <td width="100">{$user_detail.profile_hits|number_format}</td>
+                            </tr>
+                            </table>
+                            </div>
+                        {/foreach}
+                        <div align="left" style="margin-top:10px"><input type="submit" name="invite_friends" class="cb_button" value="{lang code='invite'}"></div>                                  
+                 </form>
+             {else}
+             	No Contact
+             {/if}
+        {/if}
+        {if $mode == "view_members"}
+        	 <div class="groupSep"><span class="SepText">{lang code="group"} {lang code="members"}</span></div>
+            {section name=u_list loop=$users}
+                {include file="$style_dir/blocks/user.html" user=$users[u_list]}
+            {/section}
+        {/if}
         
+        {if $mode == "view_videos"}
+        	<div class="groupSep"><span class="SepText">{lang code="group"} {lang code="videos"}</span></div>
+            {section name=v_list loop=$videos}
+                {include file="$style_dir/blocks/video.html" video=$videos[v_list]}
+            {/section}           
+        {/if}
         
-        {foreach from=$friends item=friend}
-            {if userid()!=$friend.userid}
-                {assign var=user_detail value=$userquery->get_user_details($friend.userid)}
-            {else}
-                {assign var=user_detail value=$userquery->get_user_details($friend.contact_userid)}
-            {/if}
-            
-            <div class="manage_contacts_tbl">
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-            <td width="15"><input type="checkbox" name="friend[]" id="check_userd-{$user_detail.userid}" value="{$user_detail.userid}" /></td>
-            <td width="50" height="50" align="center" valign="middle"><a href="{$userquery->profile_link($user_detail)}"><img src="{$userquery->getUserThumb($user_detail)}" alt="{$user_detail.username}" width="40" height="40" border="0"></a></td>
-            <td><a href="{$userquery->profile_link($user_detail)}">{$user_detail.username}</a></td>
-            <td width="100">{$user_detail.profile_hits|number_format}</td>
-            </tr>
-            </table>
+        {if $mode == "view_topics"}
+        	<div class="groupSep"><span class="SepText">{lang code="group"} {lang code="grp_topics_title"} - <a href="#" onclick="$('#groupAddNewTopic').toggle();return false;" style="text-decoration:none;">{lang code="grp_add_new_topic"}</a></span></div>
+            <div id="groupAddNewTopic" style="display:none">
+            	{include file="$style_dir/blocks/group/add_topic.html"}
             </div>
-            
-        {/foreach}
-        <div align="left" style="margin-top:10px"><input type="submit" name="invite_friends" class="cb_button" value="{lang code='invite'}"></div>
-    </form>
-    {else}
-    	No Contact
-    {/if}
-
+        	{include file="$style_dir/blocks/group/group_topics.html" group=$group}
+        {/if}
+        
+        {if $mode == "view_report_form"}
+        	<div class="groupSep"><span class="SepText">{lang code="Report"} {lang code="group"}</span></div>
+            {show_flag_form id=$group.group_id type=Group display="block"}
+        {/if}
+        </div>                               
     </div>
 </div>
-<!-- Inviting Members to Group -->
-{/if}
 
-
-{* LISTING VIDEOS *}
-{if $mode=='view_videos'}
-<!-- Listing Group Videos Only -->
-	<h2>
-    {lang code='users_videos' assign='users_videos'}
-    
-    {$users_videos|sprintf:$group.group_name}({$group.total_videos})</h2>
-    <div id="style_change" style="margin-top:10px">Change Style of Listing 
-        	<div id="grid" onclick="ToggleView(this)" title="Change To Grid Style"></div> 
-            <div id="list" onclick="ToggleView(this)" title="Change to List Style"></div>
-		</div> 
-	<div id="grp_videos_page">
-        {section name=v_list loop=$videos}
-            {include file="$style_dir/blocks/video.html" video=$videos[v_list]}
-        {/section}
-    </div>
-    <div class="clearfix"></div>
-{include file="$style_dir/blocks/pagination.html"}
-<!-- Listing Group Videos end-->
-{/if}
-{* LISTING VIDEOS END*}
-
-
-{* LISTING MEMBERS *}
-{if $mode=='view_members'}
-	<!-- Listing members -->
-    <h2>{$group.group_name} {lang code='members'} ({$group.total_members})</h2>
-    {section name=u_list loop=$users}
-        {include file="$style_dir/blocks/user.html" user=$users[u_list]}
-    {/section}
-    <div class="clearfix"></div>
-
-    <!-- Listing Members -->
-{/if}
-{* LISTING MEMBERS END *}
-
-</div>
+{include file="$style_dir/blocks/group/group_right.html"}

upload/styles/cbv2new/layout/view_topic.html

@@ -1,22 +1,34 @@
 <!-- Defining object type-->
 {lang code='topic' assign='object_type'}
 
-<div class="group_view">
+{include file="$style_dir/blocks/group/group_left.html"}
 
-{include file="$style_dir/blocks/group/group_header.html" group=$group}
-{assign var=topic_starter value=$userquery->get_user_details($topic.userid)}
-<div class="topic_container">
-	{include file="$style_dir/blocks/user.html" user=$topic_starter block_type='medium'}
-    <div class="topic_detail_cont">
-    	<div class="topic_title"><img src="{$cbgroup->get_topic_icon($topic)}" style="float:left" />{$topic.topic_title}<span class="date"> &#8212; {$topic.date_added|niceTime}</span><span class="clearfix"></span></div>
-        {$topic.topic_post|description}
-    </div>
-    <div class="clearfix"></div>
+<div class="groupContent">
+	<div class="groupTitle clearfix">{$group.group_name}</div>
+    <div style="padding:0px 5px">
+	<ul class="groupsBar clearfix" style="border-color:#aaa; border-width:0px 0px 1px;">
+    	<li  {if $mode == "" || $mode == "main"}class="selected"{/if}><a href="{group_link details=$group}" onClick="groupsAjax(event,this);" id="gpViewInfo"><img src="{$imageurl}/dot.gif" class="blueDoc"/> {lang code="info"}</a></li>
+        <li {if $mode == "view_topics"}class="selected"{/if}><a href="{group_link details=$group}?mode=view_topics" onClick="groupsAjax(event,this);" id="gpViewTopics"><img src="{$imageurl}/dot.gif" class="ballonBox"/> {lang code="grp_topics_title"}</a></li>
+        <li {if $mode == "view_members"}class="selected"{/if}><a href="{group_link details=$group type='view_members'}" id="gpAllMembers" onClick="groupsAjax(event,this);"><img src="{$imageurl}/dot.gif" class="blackUser"/>  {lang code="members"}</a></li>
+        <li {if $mode == "view_videos"}class="selected"{/if}><a href="{group_link details=$group type='view_videos'}" id="gpAllVideos" onClick="groupsAjax(event,this);"><img src="{$imageurl}/dot.gif" class="camCorder"/>  {lang code="videos"}</a></li>
+        <li {if $mode == "view_report_form"}class="selected"{/if}><a href="{group_link details=$group}?mode=view_report_form" onClick="groupsAjax(event,this);" id="gpAllReport"><img src="{$imageurl}/dot.gif" class="redShield"/>  Report</a></li>
+    </ul>
+ <div id="ajaxGroupResultContainer">   
+<div class="groupSep"><span class="SepText"><a href="{group_link details=$group}?mode=view_topics" onclick="groupsAjax(event,this)">Back To Topics</a></span></div>
+<div style="height:5px;"></div>
+<div class="topic_post clearfix">
+    <div class="topic_title">{$topic.topic_title}</div>
+    {assign var=topic_starter value=$userquery->get_user_details($topic.userid)}
+    {include file="$style_dir/blocks/user.html" user=$topic_starter block_type="topic_view"}
+    <div class="moveR topic_content" style="width:88%">
+    	{$topic.topic_post}
+        <div style="height:5px"></div>
+        <div style="font:normal 10px Tahoma; color:#787878">{lang code="Added"}: {$topic.date_added|niceTime}</div>
+    </div>    
 </div>
 
-
-
 <div class="topic_comments">
+<a href="#" style="font:bold 11px Tahoma; text-decoration:none; text-align:right; display:block;" onclick="getComments('t','{$topic.topic_id}','{$topic.last_post_time}',1,'{$topic.total_replies 	}','{$object_type}'); return false;">Re-load Posts</a>
 	<div id="comments"></div>
     <script>
 		$(document).ready(function()
@@ -29,4 +41,7 @@
 </div>
 <hr width="100%" size="1" noshade>
 {include file="$style_dir/blocks/comments/add_comment.html" id=$topic.topic_id type=t}
-</div>
+</div>
+</div>
+</div>
+{include file="$style_dir/blocks/group/group_right.html"}

upload/styles/cbv2new/theme/main.css

@@ -727,7 +727,7 @@ ul.upload_opts li.selected { cursor:pointer; background:none; border:1px solid;
 .topic_table td, .topic_table_head td{padding:4px 2px; color:#333; font-family:Tahoma;}
 .topic_table:nth-child(2n+1){background-color:#f7f7f7}
 
-.topic_title{font-weight:bold; display:block}
+.topic_title{font-weight:bold; display:block; font-family:Tahoma, Geneva, sans-serif; border-bottom:1px solid #aaa; font-size:13px; padding-bottom:5px; margin-bottom:5px;}
 .topic_title a{font-weight:bold; display:block; color:#333; text-decoration:none}
 .topic_title a:hover{color:#06c}
 
@@ -735,11 +735,11 @@ ul.upload_opts li.selected { cursor:pointer; background:none; border:1px solid;
 .add_topic:hover{color:#06c}
 .add_topic img{display:inline; float:left; margin-right:5px 0px; }
 
-.add_topic_container{width:700px; margin:auto;background:#FFF url(../images/simple_gradient.png) repeat-x bottom; border:1px solid #f0f0f0; padding:5px; margin-bottom:10px}
+.add_topic_container{margin:auto;background:#FFF url(../images/simple_gradient.png) repeat-x bottom; border:1px solid #ccc; padding:5px; margin-bottom:10px}
 
 .topic_form .label{ display:block; font-size:12px; font-weight:bold; font-family:tahoma}
-.topic_form input[type=text],.topic_form textarea,.topic_form input[type=select]{width:600px; border:1px solid #999; padding:3px; margin-bottom:10px}
-.topic_icon_cont{width:600px; padding:3px}
+.topic_form input[type=text],.topic_form textarea,.topic_form input[type=select]{border:1px solid #999; padding:3px; margin-bottom:10px}
+.topic_icon_cont{padding:3px}
 .topic_icon_cont fieldset{margin:0px; border:1px solid #999;border-radius:5px; -moz-border-radius:5px; -webkit-border-radius:5px;}
 .topic_icon_cont label{display:block; width:70px; text-align:center; float:left; margin-bottom:5px}
 
@@ -755,7 +755,7 @@ ul.upload_opts li.selected { cursor:pointer; background:none; border:1px solid;
 .topic_post:last-child{border-bottom:none}
 .topic_post .topic_poster{display:block; color:#999}
 .topic_post .topic_poster a{font-weight:bold; font-family:tahoma; text-decoration:none}
-
+.topic_content { font:normal 11px Tahoma; color:#464646; }
 
 .manage_contacts_tbl_head{border:1px solid #c2c2c2; border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px; background-image:url(../images/gradients.png); background-position:0px -36px; height:19px}
 
@@ -975,4 +975,38 @@ a.CollectThumb { border:1px solid #ccc; display:inline-block; background:#FFF; }
 
 .channel_title{font-size:13px; font-weight:bold; margin-bottom:3px}
 .channelCounts{font-size:16px; font-weight:bold; text-align:center;}
-.channelBox{padding:0px 5px 5px 5px; background-color:#fff}
+.channelBox{padding:0px 5px 5px 5px; background-color:#fff}
+
+/* NEW GROUP LAYOUT */
+.groupLeftSide { width:160px; float:left;  padding:0 0px; }
+.groupLeftSide .channelLegend, .groupContent .channelLegend, .groupRightSide .channelLegend { width:auto; }
+.groupContent { width:588px; float:left; padding:0 0px; border:solid #aaa; border-width:0 1px; min-height:500px; height:500px; height:auto !important; }
+.groupRightSide { width:250px; float:right; padding:0px 0px; }
+.groupThumb { padding:0px 0px; margin-bottom:9px;}
+.groupThumbBG { display:inline-block;padding:2px; background:#FFF; border:1px solid #ccc; margin:0px auto; }
+.groupDropShadow { -moz-box-shadow:0 1px 0 rgba(0,0,0,0.1); -webkit-box-shadow:0 1px 0 rgba(0,0,0,0.1); box-shadow:0 1px 0 rgba(0,0,0,0.1); }
+.groupTitle { background:#F0F2F7; border:solid #aaa; border-width:1px 0px; padding:8px; font:bold 14px Arial; }
+.groupSep { background:#f3f3f3; text-align:center; margin-bottom:8px; }
+.SepText { font:bold 11px 'Tahoma', Geneva, sans-serif; color:#787878; background:white; padding:3px 5px; text-transform:uppercase }
+.groupsBar { margin:0px; padding:0px; list-style:none; padding:8px 0px; border-bottom:1px solid #ccc; margin-bottom:10px; }
+.groupsBar li { font:bold 11px Tahoma; text-decoration:none; display:inline-block; margin-right:10px; margin-left:10px; }
+.groupsBar li a { color:#00769d; text-decoration:none; vertical-align:middle; }
+.groupsBar li.selected a { color:#232323; }
+.topicRow { border-bottom:1px solid #ccc; padding:5px 5px; list-style:none; }
+.topicStarter { margin:0px; padding:0px; text-transform:capitalize; text-decoration:none; font:bold 14px Arial; margin-bottom:4px; }
+.topicStarter a { text-decoration:none; }
+.topicTitle { font-size:11px; font-family:Tahoma; padding:0px; margin:0px; }
+.topicTitle a { text-decoration:none; }
+.topicStarterAvatar { padding:1px; border:1px solid #ccc; }
+.topicStarterAvatarBG { display:block; text-indent:-9000px; }
+.topicStarterAvatarBG a { display:block; height:100%;}
+.topicPreview { font:normal 10px Tahoma; color:#787878; }
+.topicPreviewContainer { padding:3px 5px 3px 5px; border-left:3px solid #eee; margin-bottom:6px; }
+/* ICONS */
+.ballonBox, .camCorder, .blackUser, .blueDoc, .redShield, .ballonSmall { width:16px; height:16px; vertical-align:middle; padding-right:2px; }
+.ballonBox { background:url(../images/icons/balloons-box.png) no-repeat }
+.camCorder { background:url(../images/icons/camcorder.png) no-repeat }
+.blackUser { background:url(../images/icons/black-user.png) no-repeat }
+.blueDoc { background:url(../images/icons/blue-document.png) no-repeat }
+.redShield { background:url(../images/icons/shield.png) no-repeat; }
+.ballonSmall { background:url(../images/icons/balloon-small.png) no-repeat; }

upload/styles/global/head.html

@@ -28,8 +28,9 @@ function updateEmbed(width,height,autoplay)
  {/foreach}
 {/foreach}
 <!-- Including JS Files-->
-
-
+<script type="text/javascript">
+	callURLParser();
+</script>
 <!-- Including Plugin Headers -->
 {foreach key=file item=type from=$Cbucket->header_files}
 	{include_header file=$file type=$type}
@@ -452,6 +453,7 @@ $(document).ready(function() {
     <meta property="og:image" content="{getThumb vdetails=$vdo}" />
     <meta name="medium" content="video" />
 {/if}
+
 {if $object.photo_id}
 <meta property="og:title" content="{$object.photo_title}" />
 <meta property="og:description" content="{$object.photo_description|description}" />
@@ -467,4 +469,4 @@ $(function() {
 	$( ".date_field" ).datepicker({ dateFormat: 'yy-mm-dd' ,changeMonth: true,changeYear: true});
 });
 </script>
-{/literal}
+{/literal}

upload/view_group.php

@@ -17,7 +17,7 @@ $url = mysql_clean($_GET['url']);
 $mode = $_GET['mode'];
 
 $details = $cbgroup->group_details_url($url);
-assign('group',$details);
+
 
 if($details)
 {		
@@ -27,12 +27,20 @@ if($details)
 	else
 	{
 		assign('isviewable',$shouldView);
+		if(isset($_POST['update_group']))
+		{
+			//pr($_POST,true);
+			$_POST['group_id'] = $details['group_id'];
+			$cbgroup->update_group();
+			$details = $cbgroup->get_group_details($details['group_id']);	
+		}		
 		//Joining Group
 		if($_GET['join'])
 			$cbgroup->join_group($details['group_id'],userid());
 		//Leaving
 		if($_GET['leave'])
-			$cbgroup->leave_group($details['group_id'],userid());			
+			$cbgroup->leave_group($details['group_id'],userid());
+						
 		//adding group topic
 		if(isset($_POST['add_topic']))
 		{
@@ -41,17 +49,44 @@ if($details)
 			$cbgroup->add_topic($array);
 			if(!error()) $_POST = NULL;
 		}
-
+		
+		// Sending invitations
+		if(isset($_POST['invite_friends']))
+			$cbgroup->invite_members($_POST['friend'],$details['group_id']);
+		
+		//Adding videos to group
+		if(isset($_POST['add_videos']))
+		{
+			
+			$total = count($usr_vids);
+			for($i=0;$i<$total;$i++)
+			{
+				$videoid = $usr_vids[$i]['videoid'];
+				if($_POST['check_video_'.$videoid]=='yes')
+					$cbgroup->add_group_video($videoid,$details['group_id'],false);
+				else
+					$cbgroup->remove_group_video($videoid,$details['group_id'],false);
+			}
+			//Update Group Total Videos
+			$cbgroup->update_group_videos_count($details['group_id']);
+			
+			$eh->flush_msg();
+			e(lang("sel_vids_updated"),"m");
+		}
+			
 		//Calling all functions when a topic is called
 		call_view_group_functions($details);
 
 		switch($mode)
 		{
-			case 'topic_del':
+			case 'view_topics':
 			{
-				if(!empty($_GET['topic_id'])) {
-					$tid = $_GET['topic_id'];
-					$cbgroup->delete_topic($tid);
+				if($_GET['topic_action'] == "delete")
+				{
+					if(!empty($_GET['topic_id'])) {
+						$tid = $_GET['topic_id'];
+						$cbgroup->delete_topic($tid);
+					}					
 				}
 			}
 			break;
@@ -60,6 +95,8 @@ if($details)
 		//Getting list of topics
 		$topics = $cbgroup->get_topics(array('group'=>$details['group_id']));
 		assign('topics',$topics);
+		assign('mode',$mode);
+		assign('group',$details);
 	}
 	subtitle($details['group_name']);	
 }else

upload/watch_video.php

@@ -29,7 +29,6 @@ if(video_playable($vdo))
 	}	
 	//Calling Functions When Video Is going to play
 	call_watch_video_function($vdo);
-	
 	subtitle($vdo['title']);
 	
 }else