WordPress.org

Make WordPress Core

Changeset 8705


Ignore:
Timestamp:
08/21/08 23:18:51 (6 years ago)
Author:
ryan
Message:

Move Setting menu to top-level. see #7552

Location:
trunk/wp-admin
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/menu.php

    r8691 r8705  
    6262    $submenu['users.php'][30] = array( __('Import'), 'import', 'import.php' ); 
    6363    $submenu['users.php'][35] = array( __('Export'), 'import', 'export.php' ); 
    64     $submenu['users.php'][40] = array( __('Settings'), 'manage_options', 'options-general.php' ); 
    65         $_wp_real_parent_file['options-general.php'] = 'users.php'; 
    66         $submenu['options-general.php'][10] = array( __('General'), 'manage_options', 'options-general.php' ); 
    67         $submenu['options-general.php'][15] = array( __('Writing'), 'manage_options', 'options-writing.php' ); 
    68         $submenu['options-general.php'][20] = array( __('Reading'), 'manage_options', 'options-reading.php' ); 
    69         $submenu['options-general.php'][25] = array( __('Discussion'), 'manage_options', 'options-discussion.php' ); 
    70         $submenu['options-general.php'][30] = array( __('Privacy'), 'manage_options', 'options-privacy.php' ); 
    71         $submenu['options-general.php'][35] = array( __('Permalinks'), 'manage_options', 'options-permalink.php' ); 
    72         $submenu['options-general.php'][40] = array( __('Miscellaneous'), 'manage_options', 'options-misc.php' ); 
    7364 
    74 $menu[20] = array( __('Plugins'), 'activate_plugins', 'plugins.php' ); 
     65$menu[20] = array(__('Settings'), 'manage_options', 'options-general.php'); 
     66    $submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php'); 
     67    $submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php'); 
     68    $submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php'); 
     69    $submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php'); 
     70    $submenu['options-general.php'][30] = array(__('Privacy'), 'manage_options', 'options-privacy.php'); 
     71    $submenu['options-general.php'][35] = array(__('Permalinks'), 'manage_options', 'options-permalink.php'); 
     72    $submenu['options-general.php'][40] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php'); 
     73 
     74$menu[25] = array( __('Plugins'), 'activate_plugins', 'plugins.php' ); 
    7575    $submenu['plugins.php'][5]  = array( __('Plugins'), 'activate_plugins', 'plugins.php' ); 
    7676    $submenu['plugins.php'][10] = array( __('Plugin Editor'), 'edit_plugins', 'plugin-editor.php' ); 
  • trunk/wp-admin/options-discussion.php

    r8691 r8705  
    1717 
    1818<div class="wrap"> 
    19 <ul class="wp-menu"> 
    20 <?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?> 
    21 </ul> 
    2219<h2><?php _e('Discussion Settings') ?></h2> 
    2320<form method="post" action="options.php"> 
  • trunk/wp-admin/options-general.php

    r8691 r8705  
    1111 
    1212$title = __('General Settings'); 
     13$parent_file = 'options-general.php'; 
    1314 
    1415include('./admin-header.php'); 
     
    1617 
    1718<div class="wrap"> 
    18 <ul class="wp-menu"> 
    19 <?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?> 
    20 </ul> 
    2119<h2><?php _e('General Settings') ?></h2> 
    2220<form method="post" action="options.php"> 
  • trunk/wp-admin/options-misc.php

    r8691 r8705  
    1818 
    1919<div class="wrap"> 
    20 <ul class="wp-menu"> 
    21 <?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?> 
    22 </ul> 
    2320<h2><?php _e('Miscellaneous Settings') ?></h2> 
    2421<form method="post" action="options.php"> 
  • trunk/wp-admin/options-permalink.php

    r8691 r8705  
    124124 
    125125<div class="wrap"> 
    126 <ul class="wp-menu"> 
    127 <?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?> 
    128 </ul> 
    129126  <h2><?php _e('Customize Permalink Structure') ?></h2> 
    130127<form name="form" action="options-permalink.php" method="post"> 
  • trunk/wp-admin/options-privacy.php

    r8691 r8705  
    1717 
    1818<div class="wrap"> 
    19 <ul class="wp-menu"> 
    20 <?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?> 
    21 </ul> 
    2219<h2><?php _e('Privacy Settings') ?></h2> 
    2320<form method="post" action="options.php"> 
  • trunk/wp-admin/options-reading.php

    r8691 r8705  
    1717 
    1818<div class="wrap"> 
    19 <ul class="wp-menu"> 
    20 <?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?> 
    21 </ul> 
    2219<h2><?php _e('Reading Settings') ?></h2> 
    2320<form name="form1" method="post" action="options.php"> 
  • trunk/wp-admin/options-writing.php

    r8691 r8705  
    1717 
    1818<div class="wrap"> 
    19 <ul class="wp-menu"> 
    20 <?php $array = array(); _wp_menu_output( $submenu['options-general.php'], $array ); unset($array); ?> 
    21 </ul> 
    2219<h2><?php _e('Writing Settings') ?></h2> 
    2320<form method="post" action="options.php"> 
Note: See TracChangeset for help on using the changeset viewer.