Fixes #2334: Converted viewtype => listtype and viewtypetoggle => listtypetoggle. Did my best to maintain backwards compatibility but might have missed something...

git-svn-id: http://code.elgg.org/elgg/trunk@7311 36083f99-b078-4883-b0ff-0f9b5a30f544

7 files changed, 33 insertions, 33 deletions

diff --git a/mod/ecml/ecml_functions.php b/mod/ecml/ecml_functions.php
index 75839aec4..4d30ee9c7 100644
--- a/mod/ecml/ecml_functions.php
+++ b/mod/ecml/ecml_functions.php
@@ -67,7 +67,7 @@ function ecml_parse_view_match($matches) {
 			// possible options for elgg_get_entities*() functions...)
 			$entities = elgg_get_entities_from_relationship($options);
 			$content = elgg_view_entity_list($entities, count($entities), $options['offset'],
-				$options['limit'], $options['full_view'], $options['view_type_toggle'], $options['pagination']);
+				$options['limit'], $options['full_view'], $options['list_type_toggle'], $options['pagination']);
 			break;
 
 		case 'view':
diff --git a/mod/file/search.php b/mod/file/search.php
index 8dd4669a9..5c6c0a969 100644
--- a/mod/file/search.php
+++ b/mod/file/search.php
@@ -14,7 +14,7 @@
 	// Get input
 		$md_type = 'simpletype';
 		$tag = get_input('tag');
-		$search_viewtype = get_input('search_viewtype');
+		$listtype = get_input('listtype');
 
 		$friends = (int) get_input('friends_guid',0);
 		if ($friends) {
@@ -73,7 +73,7 @@
 
 		$offset = (int)get_input('offset', 0);
 		$limit = 10;
-		if ($search_viewtype == "gallery") $limit = 12;
+		if ($listtype == "gallery") $limit = 12;
 		if (!empty($tag)) {
 			$params = array(
 				'metadata_name' => $md_type,
diff --git a/mod/file/views/default/file/typecloud.php b/mod/file/views/default/file/typecloud.php
index 0e2f3a53c..bb322d4d7 100644
--- a/mod/file/views/default/file/typecloud.php
+++ b/mod/file/views/default/file/typecloud.php
@@ -1,10 +1,10 @@
 <?php
 
 	$types = $vars['types'];
-	
+
 	if (is_array($vars['types']) && sizeof($vars['types'])) {
-		
-?>			
+
+?>
 <ul>
 <?php
 
@@ -20,7 +20,7 @@
 		} else {
 			$label = elgg_echo('all');
 		}
-		
+
 		$url = elgg_get_site_url() . "mod/file/search.php?subtype=file";
 		if ($tag != "all")
 			$url .= "&md_type=simpletype&tag=" . urlencode($tag);
@@ -35,25 +35,25 @@
 			$url .= "&owner_guid={$owner_guid}";
 		}
 		if ($tag == "image")
-			$url .= "&search_viewtype=gallery";
-		
+			$url .= "&listtype=gallery";
+
 		$url .= "&page_owner=" . elgg_get_page_owner_guid();
-			
+
 		$inputtag = get_input('tag');
 		if ($inputtag == $tag || (empty($inputtag) && $tag == "all")) {
 			$class = " class=\"selected\" ";
 		} else {
 			$class = "";
 		}
-			
-		add_submenu_item($label, $url, 'filetypes');		
+
+		add_submenu_item($label, $url, 'filetypes');
 	}
-	
+
 ?>
 </ul>
 
 <?php
-		
+
 	}
 
 ?>
\ No newline at end of file
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 3da9567a5..054184c7b 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -24,7 +24,7 @@
 
 	if (elgg_get_context() == "search") { 	// Start search listing version
 
-		if (get_input('search_viewtype') == "gallery") {
+		if (get_input('listtype') == "gallery") {
 			echo "<div class='filerepo_gallery_item'>";
 			if ($vars['entity']->smallthumb) {
 				echo "<p class='filerepo_title'>" . $file->title . "</p>";
@@ -94,7 +94,7 @@
 		<div class="filerepo_title_owner_wrapper">
 		<?php
 			//get the user and a link to their gallery
-			$user_gallery = elgg_get_site_url() . "mod/file/search.php?md_type=simpletype&subtype=file&tag=image&owner_guid=" . $owner->guid . "&search_viewtype=gallery";
+			$user_gallery = elgg_get_site_url() . "mod/file/search.php?md_type=simpletype&subtype=file&tag=image&owner_guid=" . $owner->guid . "&listtype=gallery";
 		?>
 		<div class="filerepo_user_gallery_link"><a href="<?php echo $user_gallery; ?>"><?php echo elgg_echo("file:user:gallery",array('')); ?></a></div>
 		<div class="filerepo_title"><h2><a href="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $file_guid; ?>"><?php echo $title; ?></a></h2></div>
diff --git a/mod/pages/views/default/object/page.php b/mod/pages/views/default/object/page.php
index 5b4af5198..dbca0755b 100644
--- a/mod/pages/views/default/object/page.php
+++ b/mod/pages/views/default/object/page.php
@@ -8,7 +8,7 @@
 if ($vars['full']) {
 	echo elgg_view("pages/pageprofile", $vars);
 } else {
-	if (get_input('search_viewtype') == "gallery") {
+	if (get_input('listtype') == "gallery") {
 		echo elgg_view('pages/pagegallery', $vars);
 	} else {
 		echo elgg_view("pages/pagelisting", $vars);
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 6922118c1..0a1cfdf83 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -8,7 +8,7 @@
 if ($vars['full']) {
 	echo elgg_view("pages/pageprofile", $vars);
 } else {
-	if (get_input('search_viewtype') == "gallery") {
+	if (get_input('listtype') == "gallery") {
 		echo elgg_view('pages/pagegallery', $vars);
 	} else {
 		echo elgg_view("pages/pagelisting", $vars);
diff --git a/mod/search/views/default/search/entity_list.php b/mod/search/views/default/search/entity_list.php
index 4a04aaf84..f9105c711 100644
--- a/mod/search/views/default/search/entity_list.php
+++ b/mod/search/views/default/search/entity_list.php
@@ -6,40 +6,40 @@ $limit = $vars['limit'];
 $count = $vars['count'];
 $baseurl = $vars['baseurl'];
 $context = $vars['context'];
-$viewtype = $vars['viewtype'];
+$listtype = $vars['listtype'];
 $pagination = $vars['pagination'];
-$fullview = $vars['fullview']; 
-		
+$fullview = $vars['fullview'];
+
 $html = "";
 $nav = "";
-if (isset($vars['viewtypetoggle'])) {
-	$viewtypetoggle = $vars['viewtypetoggle'];
+if (isset($vars['listtypetoggle'])) {
+	$listtypetoggle = $vars['listtypetoggle'];
 } else {
-	$viewtypetoggle = true;
+	$listtypetoggle = true;
 }
 
-if ($context == "search" && $count > 0 && $viewtypetoggle) {
-	$nav .= elgg_view("navigation/viewtype",array(
-									      
+if ($context == "search" && $count > 0 && $listtypetoggle) {
+	$nav .= elgg_view("navigation/listtype",array(
+
 				  'baseurl' => $baseurl,
 				  'offset' => $offset,
 				  'count' => $count,
-				  'viewtype' => $viewtype,
-			
+				  'listtype' => $listtype,
+
 				  ));
 }
 
 if ($pagination)
 	$nav .= elgg_view('navigation/pagination',array(
-			
+
 				  'baseurl' => $baseurl,
 				  'offset' => $offset,
 				  'count' => $count,
 				  'limit' => $limit,
-			
+
 				  ));
 
-if ($viewtype == "list") {
+if ($listtype == "list") {
 	if (is_array($entities) && sizeof($entities) > 0) {
 		foreach($entities as $entity) {
 			// print out the entity
@@ -50,7 +50,7 @@ if ($viewtype == "list") {
 
 		}
 	}
-} else if ($viewtype == "gallery") {
+} else if ($listtype == "gallery") {
 	if (is_array($entities) && sizeof($entities) > 0) {
 		$html .= elgg_view("search/gallery",array('entities' => $entities));
 	}