<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12934] trunk/wp-admin: Use Network and Site for labels.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12934">12934</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-03 17:23:29 +0000 (Wed, 03 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use Network and Site for labels. see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsadminphp">trunk/wp-admin/ms-admin.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-admin.php (12933 => 12934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-admin.php 2010-02-03 01:00:57 UTC (rev 12933)
+++ trunk/wp-admin/ms-admin.php 2010-02-03 17:23:29 UTC (rev 12934)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> if ( !is_multisite() )
</span><span class="cx"> wp_die( __('Multisite support is not enabled.') );
</span><span class="cx">
</span><del>-$title = __('Site Admin');
</del><ins>+$title = __('Network Admin');
</ins><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx">
</span><span class="cx"> function index_css() {
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> $blog_text = sprintf( _n( '%s blog', '%s blogs', $c_blogs ), number_format_i18n( $c_blogs ) );
</span><span class="cx">
</span><span class="cx"> $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
</span><del>-$title = __( 'Site Admin' );
</del><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="lines">@@ -33,7 +32,7 @@
</span><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx">
</span><span class="cx"> <ul class="subsubsub">
</span><del>- <li><a href="ms-sites.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Blog'); ?></strong></a> | </li>
</del><ins>+ <li><a href="ms-sites.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Site'); ?></strong></a> | </li>
</ins><span class="cx"> <li><a href="ms-users.php#form-add-user" class="rbutton"><?php _e('Create a New User'); ?></a></li>
</span><span class="cx"> </ul>
</span><span class="cx"> <br clear='all' />
</span><span class="lines">@@ -53,7 +52,7 @@
</span><span class="cx"> <p>
</span><span class="cx"> <input type="hidden" name="action" value="blogs" />
</span><span class="cx"> <input type="text" name="s" value="" size="17" />
</span><del>- <input class="button" type="submit" name="blog_name" value="<?php esc_attr_e("Search Blogs"); ?>" />
</del><ins>+ <input class="button" type="submit" name="blog_name" value="<?php esc_attr_e("Search Sites"); ?>" />
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (12933 => 12934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-02-03 01:00:57 UTC (rev 12933)
+++ trunk/wp-admin/ms-sites.php 2010-02-03 17:23:29 UTC (rev 12934)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> if ( !is_multisite() )
</span><span class="cx"> wp_die( __('Multisite support is not enabled.') );
</span><span class="cx">
</span><del>-$title = __('Blogs');
</del><ins>+$title = __('Sites');
</ins><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx">
</span><span class="cx"> wp_enqueue_script( 'admin-forms' );
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>- <h2><?php _e('Edit Blog'); ?> - <a href='http://<?php echo $details->domain . $details->path; ?>'>http://<?php echo $details->domain . $details->path; ?></a></h2>
</del><ins>+ <h2><?php _e('Edit Site'); ?> - <a href='http://<?php echo $details->domain . $details->path; ?>'>http://<?php echo $details->domain . $details->path; ?></a></h2>
</ins><span class="cx"> <form method="post" action="ms-edit.php?action=updateblog">
</span><span class="cx"> <?php wp_nonce_field('editblog'); ?>
</span><span class="cx"> <input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap" style="position:relative;">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>- <h2><?php _e('Blogs') ?></h2>
</del><ins>+ <h2><?php _e('Sites') ?></h2>
</ins><span class="cx">
</span><span class="cx"> <form action="ms-sites.php" method="get" id="ms-search">
</span><span class="cx"> <input type="hidden" name="action" value="blogs" />
</span><span class="lines">@@ -592,13 +592,12 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <a name="form-add-blog"></a>
</span><del>- <?php screen_icon(); ?>
- <h2><?php _e('Add Blog') ?></h2>
</del><ins>+ <h2><?php _e('Add Site') ?></h2>
</ins><span class="cx"> <form method="post" action="ms-edit.php?action=addblog">
</span><span class="cx"> <?php wp_nonce_field('add-blog') ?>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr class="form-field form-required">
</span><del>- <th style="text-align:center;" scope='row'><?php _e('Blog Address') ?></th>
</del><ins>+ <th style="text-align:center;" scope='row'><?php _e('Site Address') ?></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <?php if ( is_subdomain_install() ) { ?>
</span><span class="cx"> <input name="blog[domain]" type="text" title="<?php _e('Domain') ?>"/>.<?php echo $current_site->domain;?>
</span><span class="lines">@@ -610,7 +609,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field form-required">
</span><del>- <th style="text-align:center;" scope='row'><?php _e('Blog Title') ?></th>
</del><ins>+ <th style="text-align:center;" scope='row'><?php _e('Site Title') ?></th>
</ins><span class="cx"> <td><input name="blog[title]" type="text" size="20" title="<?php _e('Title') ?>"/></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="lines">@@ -622,7 +621,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx"> <p class="submit">
</span><del>- <input class="button" type="submit" name="go" value="<?php esc_attr_e('Add Blog') ?>" /></p>
</del><ins>+ <input class="button" type="submit" name="go" value="<?php esc_attr_e('Add Site') ?>" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>