Merge branch 'esope_1.11' of github.com:Facyla/esope into esope_1.11

Facyla · Dec 8, 2015 · b0439a0 · b0439a0
2 parents 64e2830 + 3fcad4d
commit b0439a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mod/theme_transitions2/pages/theme_transitions2/index.php b/mod/theme_transitions2/pages/theme_transitions2/index.php
@@ -112,13 +112,13 @@
 //$list_options['metadata_name_value_pairs'][] = array('name' => 'featured', 'value' => "($meta_featured_id, $meta_background_id)", 'operand' => 'NOT IN');
 //$list_options['metadata_name_value_pairs'][] = array('name' => 'featured', 'value' => 'background', 'operand' => '<>');
 $catalogue = '';
-$catalogue .= '<div class="transitions-gallery transitions-gallery-recent hidden">';
+$catalogue .= '<div class="transitions-gallery transitions-gallery-recent">';
 $catalogue .= elgg_list_entities_from_metadata($list_options);
 $catalogue .= '</div>';
 
 // Featured content only
 $list_options = array('types' => 'object', 'subtypes' => 'transitions', 'limit' => 12, 'list_type' => 'gallery', 'item_class' => 'transitions-item', 'pagination' => true, 'metadata_name_value_pairs' => array('name' => 'featured', 'value' => 'featured'));
-$catalogue .= '<div class="transitions-gallery transitions-gallery-featured">';
+$catalogue .= '<div class="transitions-gallery transitions-gallery-featured hidden">';
 $catalogue .= elgg_list_entities_from_metadata($list_options);
 $catalogue .= '</div>';
 
@@ -145,7 +145,7 @@
 
 
 // Switch filter (+ onChange)
-$content .= elgg_view('forms/theme_transitions2/switch_filter', array('id' => 'transitions-form-switch-filter', 'value' => 'featured'));
+$content .= elgg_view('forms/theme_transitions2/switch_filter', array('id' => 'transitions-form-switch-filter', 'value' => 'recent'));
 
 $content .= '<h2>' . elgg_echo('theme_transitions2:transitions:title') . '</h2>';
 //$content .= '<h2>' . elgg_echo('theme_transitions2:transitions:count', array($count)) . '</h2>';

diff --git a/mod/transitions/views/default/object/transitions.php b/mod/transitions/views/default/object/transitions.php
@@ -240,7 +240,7 @@
 					echo '<div class="transitions-gallery-actions">';
 						echo '<div class="transitions-gallery-inner">';
 							echo '<span class="float-alt">' . $actions . '</span>';
-							echo $stats;
+							//echo $stats;
 						echo '</div>';
 					echo '</div>';
 					// Admins only (all T² admins)