Changeset 8855

Timestamp:

09/09/2008 10:31:22 PM (16 years ago)

Author:

ryan

Message:

add_settings_section() and add_settings_field(). see #7682

Location:

trunk/wp-admin

Files:

• includes/template.php (modified) (2 diffs)
• options-discussion.php (modified) (2 diffs)
• options-general.php (modified) (1 diff)
• options-misc.php (modified) (3 diffs)
• options-permalink.php (modified) (1 diff)
• options-privacy.php (modified) (1 diff)
• options-reading.php (modified) (1 diff)
• options-writing.php (modified) (4 diffs)

trunk/wp-admin/includes/template.php

@@ -1508 +1508 @@
 }
 
-// crazyhorse - this can be made simpler
 function do_meta_boxes($page, $context, $object) {
     global $wp_meta_boxes;
@@ -1603 +1602 @@
     }
 }
+
+/**
+ * Add a new section to a settings page
+ *
+ * @since 2.7
+ *
+ * @param string $id String for use in the 'id' attribute of tags.
+ * @param string $title Title of the section
+ * @param string $callback Function that fills the section with the desired content.  The function should echo its output.
+ * @param string $page The type of settings page on which to show the section (general, reading, writing, ...)
+ */
+function add_settings_section($id, $title, $callback, $page) {
+    global $wp_settings_sections;
+
+    if  ( !isset($wp_settings_sections) )
+        $wp_settings_sections = array();
+    if ( !isset($wp_settings_sections[$page]) )
+        $wp_settings_sections[$page] = array();
+    if ( !isset($wp_settings_sections[$page][$id]) )
+        $wp_settings_sections[$page][$id] = array();
+
+    $wp_settings_sections[$page][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback);
+}
+
+/**
+ * Add a new field to a settings page
+ *
+ * @since 2.7
+ *
+ * @param string $id String for use in the 'id' attribute of tags.
+ * @param string $title Title of the field
+ * @param string $callback Function that fills the field with the desired content.  The function should echo its output.
+ * @param string $page The type of settings page on which to show the field (general, reading, writing, ...)
+ * @param string $section The section of the settingss page in which to show the box (default, ...)
+ * @param array $args Additional arguments
+ */
+function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) {
+    global $wp_settings_fields;
+
+    if  ( !isset($wp_settings_fields) )
+        $wp_settings_fields = array();
+    if ( !isset($wp_settings_fields[$page]) )
+        $wp_settings_fields[$page] = array();
+    if ( !isset($wp_settings_fields[$page][$section]) )
+        $wp_settings_fields[$page][$section] = array();
+
+    $wp_settings_fields[$page][$section][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $args);
+}
+
+function do_settings_sections($page) {
+    global $wp_settings_sections, $wp_settings_fields;
+
+    if ( !isset($wp_settings_sections) || !isset($wp_settings_sections[$page]) )
+        return;
+
+    foreach ( (array) $wp_settings_sections[$page] as $section ) {
+        echo "<h3>{$section['title']}</h3>\n";
+        call_user_func($section['callback'], $section);
+        if ( !isset($wp_settings_fields) || !isset($wp_settings_fields[$page]) || !isset($wp_settings_fields[$page][$section['id']]) )
+            continue;
+        echo '<table class="form-table">';
+        do_settings_fields($page, $section['id']);
+        echo '</table>';
+    }
+}
+
+function do_settings_fields($page, $section) {
+    global $wp_settings_fields;
+
+    if ( !isset($wp_settings_fields) || !isset($wp_settings_fields[$page]) || !isset($wp_settings_fields[$page][$section]) )
+        return;
+
+    foreach ( (array) $wp_settings_fields[$page][$section] as $field ) {
+        echo '<tr valign="top">';
+        if ( !empty($field['args']['label_for']) )
+            echo '<th scope="row"><label for="' . $field['args']['label_for'] . '">' . $field['title'] . '</label></th>';
+        else
+            echo '<th scope="row">' . $field['title'] . '</th>';
+        echo '<td>';
+        call_user_func($field['callback']);
+        echo '</td>';
+        echo '</tr>';
+    }   
+}
+
 ?>

trunk/wp-admin/options-discussion.php

@@ -84 +84 @@
 </fieldset></td>
 </tr>
+<?php do_settings_fields('discussion', 'default'); ?>
 </table>
 
@@ -155 +156 @@
 </fieldset></td>
 </tr>
-
+<?php do_settings_fields('discussion', 'avatars'); ?>
 </table>
 
+<?php do_settings_sections('discussion'); ?>
 
 <p class="submit">

trunk/wp-admin/options-general.php

@@ -118 +118 @@
 </select></td>
 </tr>
+<?php do_settings_fields('general', 'default'); ?>
 </table>
+
+<?php do_settings_sections('general'); ?>
 
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />

trunk/wp-admin/options-misc.php

@@ -46 +46 @@
 </th>
 </tr>
+<?php do_settings_fields('misc', 'default'); ?>
 </table>
 
@@ -131 +132 @@
 </fieldset></td>
 </tr>
-
+<?php do_settings_fields('misc', 'images'); ?>
 </table>
 
@@ -158 +159 @@
 </table>
 
+<?php do_settings_sections('misc'); ?>
+
 <p class="submit">
 <input type="hidden" name="action" value="update" />

trunk/wp-admin/options-permalink.php

@@ -192 +192 @@
         <td><input name="tag_base" id="tag_base" type="text" class="code"  value="<?php echo attribute_escape($tag_base); ?>" size="30" /></td>
     </tr>
+    <?php do_settings_fields('permalink', 'optional'); ?>
 </table>
+
+<?php do_settings_sections('permalink'); ?>
+
 <p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Save Changes') ?>" /></p>
   </form>

trunk/wp-admin/options-privacy.php

@@ -32 +32 @@
 </fieldset></td>
 </tr>
+<?php do_settings_fields('privacy', 'default'); ?>
 </table>
+
+<?php do_settings_sections('privacy'); ?>
 
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />

trunk/wp-admin/options-reading.php

@@ -73 +73 @@
 <?php _e('The character encoding you write your blog in (UTF-8 is <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html">recommended</a>)') ?></td>
 </tr>
+<?php do_settings_fields('reading', 'default'); ?>
 </table>
 <p class="submit">

trunk/wp-admin/options-writing.php

@@ -64 +64 @@
 </select></td>
 </tr>
+<?php do_settings_fields('writing', 'default'); ?>
 </table>
 
@@ -84 +85 @@
 <?php _e('Enable the WordPress, Movable Type, MetaWeblog and Blogger XML-RPC publishing protocols.') ?></label><br />
 </fieldset></td>
-</tr></table>
+</tr>
+<?php do_settings_fields('writing', 'remote_publishing'); ?>
+</table>
 
 <h3><?php _e('Post via e-mail') ?></h3>
@@ -121 +124 @@
 </select></td>
 </tr>
+<?php do_settings_fields('writing', 'post_via_email'); ?>
 </table>
 
@@ -137 +141 @@
 <?php endif; ?>
 
+<?php do_settings_sections('writing'); ?>
+
 <p class="submit">
 <input type="hidden" name="action" value="update" />