Changeset 11825

Timestamp:

01/27/2018 12:21:27 PM (7 years ago)

Author:

hnla

Message:

Nouveau: re-factor activity template loops main dir & members single

The loops JS inject all act content & loop messages into a ul construct regardless of whether there is true list loop content e.g no activity found or loading loop messages, single items are not a list, we should only show a ul if rendering loop content, this also impacts styles where messages look odd in a li element.

Commit moves the JS required hooks & 'data-bp-list="activity"' up a level to the wrapper element, re-factors the 'if bp_has_activities' to wrap only the ul which moves into the activity-loop.php template, moves the message functions out of the loops & removes unnecessary markup for messages.

Location:

trunk/src/bp-templates/bp-nouveau/buddypress

Files:

• activity/activity-loop.php (modified) (2 diffs)
• activity/index.php (modified) (1 diff)
• members/single/activity.php (modified) (1 diff)

trunk/src/bp-templates/bp-nouveau/buddypress/activity/activity-loop.php

@@ -7 +7 @@
 
 <?php if ( bp_has_activities( bp_ajax_querystring( 'activity' ) ) ) : ?>
+
+    <ul class="activity-list item-list bp-list" >
 
     <?php while ( bp_activities() ) : bp_the_activity(); ?>
@@ -22 +24 @@
     <?php endif; ?>
 
+    </ul>
+
 <?php else : ?>
 
-    <li id="activity-stream-message" class="bp-messages info">
         <?php bp_nouveau_user_feedback( 'activity-loop-none' ); ?>
-    </li>
 
 <?php endif; ?>

trunk/src/bp-templates/bp-nouveau/buddypress/activity/index.php

@@ -29 +29 @@
         <?php bp_nouveau_activity_hook( 'before_directory', 'list' ); ?>
 
-        <div class="activity">
+        <div id="activity-stream" class="activity" data-bp-list="activity">
 
-            <ul id="activity-stream" class="activity-list item-list bp-list" data-bp-list="activity">
-
-                <li id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'directory-activity-loading' ); ?></li>
-
-            </ul>
+                <div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'directory-activity-loading' ); ?></div>
 
         </div><!-- .activity -->
 
         <?php bp_nouveau_after_activity_directory_content(); ?>
+
     </div><!-- // .screen-content -->
 

trunk/src/bp-templates/bp-nouveau/buddypress/members/single/activity.php

@@ -23 +23 @@
 <?php bp_nouveau_member_hook( 'before', 'activity_content' ); ?>
 
-<div class="activity single-user">
+<div id="activity-stream" class="activity single-user" data-bp-list="activity">
 
-    <ul id="activity-stream" class="<?php bp_nouveau_loop_classes(); ?>" data-bp-list="activity">
+    <div id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'member-activity-loading' ); ?></div>
 
-        <li id="bp-ajax-loader"><?php bp_nouveau_user_feedback( 'member-activity-loading' ); ?></li>
+    <ul  class="<?php bp_nouveau_loop_classes(); ?>" >
 
     </ul>