Changeset 12048

Timestamp:

05/03/2018 04:29:34 PM (8 years ago)

Author:

boonebgorges

Message:

Nouveau: Don't add customizer controls/settings for inactive components.

Fixes #7802.

Location:

trunk/src/bp-templates/bp-nouveau/includes

Files:

• activity/functions.php (modified) (1 diff)
• activity/loader.php (modified) (1 diff)
• blogs/functions.php (modified) (1 diff)
• customizer.php (modified) (5 diffs)
• groups/functions.php (modified) (2 diffs)

trunk/src/bp-templates/bp-nouveau/includes/activity/functions.php

@@ -500 +500 @@
     }
 }
+
+/**
+ * Add controls for the settings of the customizer for the activity component.
+ *
+ * @since 3.0.0
+ *
+ * @param array $controls Optional. The controls to add.
+ *
+ * @return array the controls to add.
+ */
+function bp_nouveau_activity_customizer_controls( $controls = array() ) {
+    return array_merge( $controls, array(
+        'act_dir_layout' => array(
+            'label'      => __( 'Use column navigation for the Activity directory.', 'buddypress' ),
+            'section'    => 'bp_nouveau_dir_layout',
+            'settings'   => 'bp_nouveau_appearance[activity_dir_layout]',
+            'type'       => 'checkbox',
+        ),
+        'act_dir_tabs' => array(
+            'label'      => __( 'Use tab styling for Activity directory navigation.', 'buddypress' ),
+            'section'    => 'bp_nouveau_dir_layout',
+            'settings'   => 'bp_nouveau_appearance[activity_dir_tabs]',
+            'type'       => 'checkbox',
+        ),
+    ) );
+}

trunk/src/bp-templates/bp-nouveau/includes/activity/loader.php

@@ -88 +88 @@
      */
     protected function setup_filters() {
+        // Register customizer controls.
+        add_filter( 'bp_nouveau_customizer_controls', 'bp_nouveau_activity_customizer_controls', 10, 1 );
 
         // Register activity scripts

trunk/src/bp-templates/bp-nouveau/includes/blogs/functions.php

@@ -171 +171 @@
             'choices'    => bp_nouveau_customizer_grid_choices(),
         ),
+        'sites_dir_layout' => array(
+            'label'      => __( 'Use column navigation for the Sites directory.', 'buddypress' ),
+            'section'    => 'bp_nouveau_dir_layout',
+            'settings'   => 'bp_nouveau_appearance[sites_dir_layout]',
+            'type'       => 'checkbox',
+        ),
+        'sites_dir_tabs' => array(
+            'label'      => __( 'Use tab styling for Sites directory navigation.', 'buddypress' ),
+            'section'    => 'bp_nouveau_dir_layout',
+            'settings'   => 'bp_nouveau_appearance[sites_dir_tabs]',
+            'type'       => 'checkbox',
+        ),
     ) );
 }

trunk/src/bp-templates/bp-nouveau/includes/customizer.php

@@ -186 +186 @@
             'type'              => 'option',
         ),
-        'bp_nouveau_appearance[groups_dir_tabs]' => array(
-            'index'             => 'groups_dir_tabs',
-            'capability'        => 'bp_moderate',
-            'sanitize_callback' => 'absint',
-            'transport'         => 'refresh',
-            'type'              => 'option',
-        ),
         'bp_nouveau_appearance[sites_dir_layout]' => array(
             'index'             => 'sites_dir_layout',
@@ -222 +215 @@
     }
 
-    /**
-     * Filters the BuddyPress Nouveau customizer controls and their arguments.
-     *
-     * @since 3.0.0
-     *
-     * @param array $value Array of Customizer controls.
-     */
-    $controls = apply_filters( 'bp_nouveau_customizer_controls', array(
+    $controls = array(
         'bp_site_avatars' => array(
             'label'      => __( 'Use the round style for member and group avatars.', 'buddypress' ),
@@ -280 +266 @@
             'choices'    => bp_nouveau_customizer_grid_choices(),
         ),
-        'members_group_layout' => array(
-            'label'      => __( 'Group > Members', 'buddypress' ),
-            'section'    => 'bp_nouveau_loops_layout',
-            'settings'   => 'bp_nouveau_appearance[members_group_layout]',
-            'type'       => 'select',
-            'choices'    => bp_nouveau_customizer_grid_choices(),
-        ),
         'members_friends_layout' => array(
             'label'      => __( 'Member > Friends', 'buddypress' ),
@@ -294 +273 @@
             'choices'    => bp_nouveau_customizer_grid_choices(),
         ),
-        'act_dir_layout' => array(
-            'label'      => __( 'Use column navigation for the Activity directory.', 'buddypress' ),
-            'section'    => 'bp_nouveau_dir_layout',
-            'settings'   => 'bp_nouveau_appearance[activity_dir_layout]',
-            'type'       => 'checkbox',
-        ),
-        'act_dir_tabs' => array(
-            'label'      => __( 'Use tab styling for Activity directory navigation.', 'buddypress' ),
-            'section'    => 'bp_nouveau_dir_layout',
-            'settings'   => 'bp_nouveau_appearance[activity_dir_tabs]',
-            'type'       => 'checkbox',
-        ),
         'members_dir_layout' => array(
             'label'      => __( 'Use column navigation for the Members directory.', 'buddypress' ),
@@ -318 +285 @@
             'type'       => 'checkbox',
         ),
-        'group_dir_layout' => array(
-            'label'      => __( 'Use column navigation for the Groups directory.', 'buddypress' ),
-            'section'    => 'bp_nouveau_dir_layout',
-            'settings'   => 'bp_nouveau_appearance[groups_dir_layout]',
-            'type'       => 'checkbox',
-        ),
-        'group_dir_tabs' => array(
-            'label'      => __( 'Use tab styling for Groups directory navigation.', 'buddypress' ),
-            'section'    => 'bp_nouveau_dir_layout',
-            'settings'   => 'bp_nouveau_appearance[groups_dir_tabs]',
-            'type'       => 'checkbox',
-        ),
-        'sites_dir_layout' => array(
-            'label'      => __( 'Use column navigation for the Sites directory.', 'buddypress' ),
-            'section'    => 'bp_nouveau_dir_layout',
-            'settings'   => 'bp_nouveau_appearance[sites_dir_layout]',
-            'type'       => 'checkbox',
-        ),
-        'sites_dir_tabs' => array(
-            'label'      => __( 'Use tab styling for Sites directory navigation.', 'buddypress' ),
-            'section'    => 'bp_nouveau_dir_layout',
-            'settings'   => 'bp_nouveau_appearance[sites_dir_tabs]',
-            'type'       => 'checkbox',
-        ),
-    ) );
+    );
+
+    /**
+     * Filters the BuddyPress Nouveau customizer controls and their arguments.
+     *
+     * @since 3.0.0
+     *
+     * @param array $value Array of Customizer controls.
+     */
+    $controls = apply_filters( 'bp_nouveau_customizer_controls', $controls );
 
     // Add the controls to the customizer's section

trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php

@@ -752 +752 @@
             'type'              => 'option',
         ),
+        'bp_nouveau_appearance[groups_dir_tabs]' => array(
+            'index'             => 'groups_dir_tabs',
+            'capability'        => 'bp_moderate',
+            'sanitize_callback' => 'absint',
+            'transport'         => 'refresh',
+            'type'              => 'option',
+        ),
     ) );
 }
@@ -821 +828 @@
             'type'       => 'select',
             'choices'    => bp_nouveau_customizer_grid_choices(),
+        ),
+        'members_group_layout' => array(
+            'label'      => __( 'Group > Members', 'buddypress' ),
+            'section'    => 'bp_nouveau_loops_layout',
+            'settings'   => 'bp_nouveau_appearance[members_group_layout]',
+            'type'       => 'select',
+            'choices'    => bp_nouveau_customizer_grid_choices(),
+        ),
+        'group_dir_layout' => array(
+            'label'      => __( 'Use column navigation for the Groups directory.', 'buddypress' ),
+            'section'    => 'bp_nouveau_dir_layout',
+            'settings'   => 'bp_nouveau_appearance[groups_dir_layout]',
+            'type'       => 'checkbox',
+        ),
+        'group_dir_tabs' => array(
+            'label'      => __( 'Use tab styling for Groups directory navigation.', 'buddypress' ),
+            'section'    => 'bp_nouveau_dir_layout',
+            'settings'   => 'bp_nouveau_appearance[groups_dir_tabs]',
+            'type'       => 'checkbox',
         ),
     ) );