golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use Network and Site for labels. see #11644 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12934 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-02-03 17:23:29 +00:00
parent 3ff2ace58a
commit 559888b3ac
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-admin/ms-admin.php
View File

@ -4,7 +4,7 @@ require_once('admin.php');
if ( !is_multisite() ) if ( !is_multisite() )
wp_die( __('Multisite support is not enabled.') ); wp_die( __('Multisite support is not enabled.') );
$title = __('Site Admin'); $title = __('Network Admin');
$parent_file = 'ms-admin.php'; $parent_file = 'ms-admin.php';
function index_css() { function index_css() {
@ -25,7 +25,6 @@ $user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n(
$blog_text = sprintf( _n( '%s blog', '%s blogs', $c_blogs ), number_format_i18n( $c_blogs ) ); $blog_text = sprintf( _n( '%s blog', '%s blogs', $c_blogs ), number_format_i18n( $c_blogs ) );
$sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text ); $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
$title = __( 'Site Admin' );
?> ?>
<div class="wrap"> <div class="wrap">
@ -33,7 +32,7 @@ $title = __( 'Site Admin' );
<h2><?php echo esc_html( $title ); ?></h2> <h2><?php echo esc_html( $title ); ?></h2>
<ul class="subsubsub"> <ul class="subsubsub">
<li><a href="ms-sites.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Blog'); ?></strong></a> | </li> <li><a href="ms-sites.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Site'); ?></strong></a> | </li>
<li><a href="ms-users.php#form-add-user" class="rbutton"><?php _e('Create a New User'); ?></a></li> <li><a href="ms-users.php#form-add-user" class="rbutton"><?php _e('Create a New User'); ?></a></li>
</ul> </ul>
<br clear='all' /> <br clear='all' />
@ -53,7 +52,7 @@ $title = __( 'Site Admin' );
<p> <p>
<input type="hidden" name="action" value="blogs" /> <input type="hidden" name="action" value="blogs" />
<input type="text" name="s" value="" size="17" /> <input type="text" name="s" value="" size="17" />
<input class="button" type="submit" name="blog_name" value="<?php esc_attr_e("Search Blogs"); ?>" /> <input class="button" type="submit" name="blog_name" value="<?php esc_attr_e("Search Sites"); ?>" />
</p> </p>
</form> </form>

15
wp-admin/ms-sites.php
View File

@ -4,7 +4,7 @@ require_once('admin.php');
if ( !is_multisite() ) if ( !is_multisite() )
wp_die( __('Multisite support is not enabled.') ); wp_die( __('Multisite support is not enabled.') );
$title = __('Blogs'); $title = __('Sites');
$parent_file = 'ms-admin.php'; $parent_file = 'ms-admin.php';
wp_enqueue_script( 'admin-forms' ); wp_enqueue_script( 'admin-forms' );
@ -82,7 +82,7 @@ switch ( $action ) {
?> ?>
<div class="wrap"> <div class="wrap">
<?php screen_icon(); ?> <?php screen_icon(); ?>
<h2><?php _e('Edit Blog'); ?> - <a href='http://<?php echo $details->domain . $details->path; ?>'>http://<?php echo $details->domain . $details->path; ?></a></h2> <h2><?php _e('Edit Site'); ?> - <a href='http://<?php echo $details->domain . $details->path; ?>'>http://<?php echo $details->domain . $details->path; ?></a></h2>
<form method="post" action="ms-edit.php?action=updateblog"> <form method="post" action="ms-edit.php?action=updateblog">
<?php wp_nonce_field('editblog'); ?> <?php wp_nonce_field('editblog'); ?>
<input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" /> <input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
@ -372,7 +372,7 @@ switch ( $action ) {
<div class="wrap" style="position:relative;"> <div class="wrap" style="position:relative;">
<?php screen_icon(); ?> <?php screen_icon(); ?>
<h2><?php _e('Blogs') ?></h2> <h2><?php _e('Sites') ?></h2>
<form action="ms-sites.php" method="get" id="ms-search"> <form action="ms-sites.php" method="get" id="ms-search">
<input type="hidden" name="action" value="blogs" /> <input type="hidden" name="action" value="blogs" />
@ -592,13 +592,12 @@ switch ( $action ) {
<div class="wrap"> <div class="wrap">
<a name="form-add-blog"></a> <a name="form-add-blog"></a>
<?php screen_icon(); ?> <h2><?php _e('Add Site') ?></h2>
<h2><?php _e('Add Blog') ?></h2>
<form method="post" action="ms-edit.php?action=addblog"> <form method="post" action="ms-edit.php?action=addblog">
<?php wp_nonce_field('add-blog') ?> <?php wp_nonce_field('add-blog') ?>
<table class="form-table"> <table class="form-table">
<tr class="form-field form-required"> <tr class="form-field form-required">
<th style="text-align:center;" scope='row'><?php _e('Blog Address') ?></th> <th style="text-align:center;" scope='row'><?php _e('Site Address') ?></th>
<td> <td>
<?php if ( is_subdomain_install() ) { ?> <?php if ( is_subdomain_install() ) { ?>
<input name="blog[domain]" type="text" title="<?php _e('Domain') ?>"/>.<?php echo $current_site->domain;?> <input name="blog[domain]" type="text" title="<?php _e('Domain') ?>"/>.<?php echo $current_site->domain;?>
@ -610,7 +609,7 @@ switch ( $action ) {
</td> </td>
</tr> </tr>
<tr class="form-field form-required"> <tr class="form-field form-required">
<th style="text-align:center;" scope='row'><?php _e('Blog Title') ?></th> <th style="text-align:center;" scope='row'><?php _e('Site Title') ?></th>
<td><input name="blog[title]" type="text" size="20" title="<?php _e('Title') ?>"/></td> <td><input name="blog[title]" type="text" size="20" title="<?php _e('Title') ?>"/></td>
</tr> </tr>
<tr class="form-field form-required"> <tr class="form-field form-required">
@ -622,7 +621,7 @@ switch ( $action ) {
</tr> </tr>
</table> </table>
<p class="submit"> <p class="submit">
<input class="button" type="submit" name="go" value="<?php esc_attr_e('Add Blog') ?>" /></p> <input class="button" type="submit" name="go" value="<?php esc_attr_e('Add Site') ?>" /></p>
</form> </form>
</div> </div>
<?php <?php