Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 22:58:40 +02:00
Code Issues Projects Releases Wiki Activity

Fixed invalid XHTML in a number of admin pages.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@1411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
jverber 2004-06-11 18:23:12 +00:00
parent a2f67bc9a4
commit e42967386c
14 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/categories.php
View File

@ -102,7 +102,7 @@ case 'edit':
<p><?php _e('Category parent:') ?><br />
<select name='cat' class='postform'>
<option value='0'<?php if (!$category->category_parent) echo " selected='selected'"; ?>><?php _e('None') ?></option>
<?php wp_dropdown_cats($category->cat_ID, $category->category_parent); ?></p>
<?php wp_dropdown_cats($category->cat_ID, $category->category_parent); ?>
</select>
</p>
@ -183,8 +183,8 @@ set them back to the default category <strong>%s</strong>.'), get_catname(1)) ?>
<p><?php _e('Category parent:') ?><br />
<select name='cat' class='postform'>
<option value='0'><?php _e('None') ?></option>
<?php wp_dropdown_cats(0); ?></p>
</select>
<?php wp_dropdown_cats(0); ?>
</select></p>
<p><?php _e('Description: (optional)') ?> <br />
<textarea name="category_description" rows="5" cols="50" style="width: 97%;"></textarea></p>
<p class="submit"><input type="hidden" name="action" value="addcat" /><input type="submit" name="submit" value="<?php _e('Add Category &raquo;') ?>" /></p>

2
wp-admin/edit-form.php
View File

@ -97,7 +97,7 @@ edCanvas = document.getElementById('content');
<?php if ('bookmarklet' != $mode) {
echo '<input name="advanced" type="submit" id="advancededit" tabindex="7" value="' . __('Advanced Editing &raquo;') . '" />';
} ?>
<input name="referredby" type="hidden" id="referredby" value="<?php if (isset($_SERVER['HTTP_REFERER'])) echo $_SERVER['HTTP_REFERER']; ?>" />
<input name="referredby" type="hidden" id="referredby" value="<?php if (isset($_SERVER['HTTP_REFERER'])) echo urlencode($_SERVER['HTTP_REFERER']); ?>" />
</p>
</div>

2
wp-admin/edit.php
View File

@ -104,7 +104,7 @@ $bgcolor = ('#eee' == $bgcolor) ? 'none' : '#eee';
</a>
<?php if ('private' == $post->post_status) _e(' - <strong>Private</strong>'); ?></td>
<td><?php the_category(','); ?></td>
<td><a href="edit.php?p=<?php echo $id ?>&c=1">
<td><a href="edit.php?p=<?php echo $id ?>&amp;c=1">
<?php comments_number(__('no comments'), __('1 comment'), __("% comments")) ?>
</a></td>
<td><?php the_author() ?></td>

10
wp-admin/link-add.php
View File

@ -83,7 +83,7 @@ th { text-align: right; }
<table class="editform" width="100%" cellspacing="2" cellpadding="5">
<tr>
<th width="33%" scope="row"><?php _e('URI:') ?></th>
<td width="67%"><input type="text" name="linkurl" value="<?php echo $_GET['linkurl']; ?>" style="width: 95%; /"></td>
<td width="67%"><input type="text" name="linkurl" value="<?php echo $_GET['linkurl']; ?>" style="width: 95%;" /></td>
</tr>
<tr>
<th scope="row"><?php _e('Link Name:') ?></th>
@ -107,7 +107,7 @@ th { text-align: right; }
<table class="editform" width="100%" cellspacing="2" cellpadding="5">
<tr>
<th width="33%" scope="row"><?php _e('rel:') ?></th>
<td width="67%"><input type="text" name="rel" id="rel" size="50" value=""></td>
<td width="67%"><input type="text" name="rel" id="rel" size="50" value="" /></td>
</tr>
<tr>
<th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th>
@ -115,7 +115,7 @@ th { text-align: right; }
<tr>
<th scope="row"> <?php _e('friendship') ?> </th>
<td><label for="label">
<input class="valinp" type="radio" name="friendship" value="acquaintance" id="label" />
<input class="valinp" type="radio" name="friendship" value="acquaintance" id="label" />
<?php _e('acquaintance') ?></label>
<label for="label2">
<input class="valinp" type="radio" name="friendship" value="friend" id="label2" />
@ -241,7 +241,7 @@ th { text-align: right; }
<td><label>
<input type="radio" name="visible" checked="checked" value="Y" />
<?php _e('Yes') ?></label><br />
<label><input type="radio" name="visible" value="N"> <input type="hidden" name="action" value="Add" />
<label><input type="radio" name="visible" value="N" /> <input type="hidden" name="action" value="Add" />
<?php _e('No') ?></label></td>
</tr>
</table>
@ -254,7 +254,7 @@ th { text-align: right; }
</div>
<div class="wrap">
<?php printf(__('<p>You can drag <a href="%s" title="Link add bookmarklet">Link This</a> to your toolbar and when you click it a window will pop up that will allow you to add whatever site you&#8217;re on to your links! Right now this only works on Mozilla or Netscape, but we&#8217;re working on it.</p>'), "javascript:void(linkmanpopup=window.open('" . get_settings('siteurl') . "/wp-admin/link-add.php?action=popup&linkurl='+escape(location.href)+'&name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();") ?>
<?php printf(__('<p>You can drag <a href="%s" title="Link add bookmarklet">Link This</a> to your toolbar and when you click it a window will pop up that will allow you to add whatever site you&#8217;re on to your links! Right now this only works on Mozilla or Netscape, but we&#8217;re working on it.</p>'), "javascript:void(linkmanpopup=window.open('" . get_settings('siteurl') . "/wp-admin/link-add.php?action=popup&amp;linkurl='+escape(location.href)+'&amp;name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();") ?>
</div>
<?php

8
wp-admin/link-categories.php
View File

@ -156,7 +156,7 @@ switch ($action) {
<th scope="row"><?php _e('Sort order:') ?></th>
<td>
<select name="sort_order" size="1">
<option value="name" <?php echo ($row->sort_order == 'name') ? 'selected' : ''?>><?php _e('Name') ?></option>
<option value="name" <?php echo ($row->sort_order == 'name') ? 'selected="selected"' : ''?>><?php _e('Name') ?></option>
<option value="id" <?php echo ($row->sort_order == 'id') ? 'selected' : ''?>><?php _e('Id') ?></option>
<option value="url" <?php echo ($row->sort_order == 'url') ? 'selected' : ''?>><?php _e('URL') ?></option>
<option value="rating" <?php echo ($row->sort_order == 'rating') ? 'selected' : ''?>><?php _e('Rating') ?></option>
@ -190,15 +190,15 @@ switch ($action) {
<table class="editform" width="100%" cellspacing="2" cellpadding="5">
<tr>
<th width="33%" scope="row"><?php _e('Before Link:') ?></th>
<td width="67%"><input type="text" name="text_before_link" size="45" value="<?php echo stripslashes($row->text_before_link)?>" /></td>
<td width="67%"><input type="text" name="text_before_link" size="45" value="<?php echo htmlspecialchars(stripslashes($row->text_before_link))?>" /></td>
</tr>
<tr>
<th scope="row"><?php _e('Between Link and Description:') ?></th>
<td><input type="text" name="text_after_link" size="45" value="<?php echo stripslashes($row->text_after_link)?>" /></td>
<td><input type="text" name="text_after_link" size="45" value="<?php echo htmlspecialchars(stripslashes($row->text_after_link))?>" /></td>
</tr>
<tr>
<th scope="row"><?php _e('After Link:') ?></th>
<td><input type="text" name="text_after_all" size="45" value="<?php echo stripslashes($row->text_after_all)?>"/></td>
<td><input type="text" name="text_after_all" size="45" value="<?php echo htmlspecialchars(stripslashes($row->text_after_all))?>"/></td>
</tr>
</table>
</fieldset>

2
wp-admin/link-import.php
View File

@ -137,11 +137,11 @@ switch ($step) {
} // end else
?>
</div>
<?php
break;
} // end case 1
} // end switch
?>
</div>
</body>
</html>

10
wp-admin/link-manager.php
View File

@ -343,7 +343,7 @@ th { text-align: right; }
<table class="editform" width="100%" cellspacing="2" cellpadding="5">
<tr>
<th width="33%" scope="row"><?php _e('URI:') ?></th>
<td width="67%"><input type="text" name="linkurl" value="<?php echo $link_url; ?>" style="width: 95%; /"></td>
<td width="67%"><input type="text" name="linkurl" value="<?php echo $link_url; ?>" style="width: 95%;" /></td>
</tr>
<tr>
<th scope="row"><?php _e('Link Name:') ?></th>
@ -367,7 +367,7 @@ th { text-align: right; }
<table class="editform" width="100%" cellspacing="2" cellpadding="5">
<tr>
<th width="33%" scope="row"><?php _e('rel:') ?></th>
<td width="67%"><input type="text" name="rel" id="rel" size="50" value="<?php echo $link_rel; ?>"></td>
<td width="67%"><input type="text" name="rel" id="rel" size="50" value="<?php echo $link_rel; ?>" /></td>
</tr>
<tr>
<th scope="row"><?php _e('<a href="http://gmpg.org/xfn/">XFN</a> Creator:') ?></th>
@ -655,9 +655,9 @@ function checkAll(form)
</div>
<form name="links" id="links" method="post" action="">
<div class="wrap">
<form name="links" id="links" method="post" action="">
<input type="hidden" name="link_id" value="" />
<input type="hidden" name="action" value="" />
<input type="hidden" name="order_by" value="<?php echo $order_by ?>" />
@ -726,7 +726,7 @@ LINKS;
if ($show_buttons) {
echo '<td><a href="link-manager.php?link_id=' . $link->link_id . '&amp;action=linkedit" class="edit">' . __('Edit') . '</a></td>';
echo '<td><a href="link-manager.php?link_id=' . $link->link_id . '&amp;action=Delete"' . "onclick=\"return confirm('" . __("You are about to delete this link.\\n \'Cancel\' to stop, \'OK\' to delete.") . "');" . '" class="delete">' . __('Delete') . '</a></td>';
echo '<td><a href="link-manager.php?link_id=' . $link->link_id . '&amp;action=Delete"' . " onclick=\"return confirm('" . __("You are about to delete this link.\\n \'Cancel\' to stop, \'OK\' to delete.") . "');" . '" class="delete">' . __('Delete') . '</a></td>';
echo '<td><input type="checkbox" name="linkcheck[]" value="' . $link->link_id . '" /></td>';
} else {
echo "<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>\n";
@ -773,8 +773,8 @@ LINKS;
<?php
} // end if !popup
?>
</form>
</div>
</form>
<?php

8
wp-admin/optionhandler.php
View File

@ -29,8 +29,8 @@ TEXTINPUT;
//break;
case 2: // boolean
$true_selected = ($option_result->option_value == '1') ? 'selected' : '';
$false_selected = ($option_result->option_value == '0') ? 'selected' : '';
$true_selected = ($option_result->option_value == '1') ? 'selected="selected"' : '';
$false_selected = ($option_result->option_value == '0') ? 'selected="selected"' : '';
return <<<BOOLSELECT
<label for="$option_result->option_name">$option_result->option_name</label>$between
<select name="$option_result->option_name" $disabled>
@ -55,7 +55,7 @@ SELECT;
$ret .= '<option value="'.$option->optionvalue.'"';
//error_log("comparing [$option_result->option_value] == [$option->optionvalue]");
if ($option_result->option_value == $option->optionvalue) {
$ret .=' selected';
$ret .=' selected="selected"';
}
$ret .= ">$option->optionvalue_desc</option>\n";
}
@ -85,7 +85,7 @@ SELECT;
$ret .= '<option value="'.$option->value.'"';
//error_log("comparing [$option_result->option_value] == [$option->optionvalue]");
if ($option_result->option_value == $option->value) {
$ret .=' selected';
$ret .=' selected="selected"';
}
$ret .= ">$option->label</option>\n";
}

6
wp-admin/options-misc.php
View File

@ -70,13 +70,13 @@ include('options-head.php');
</tr>
<tr>
<th scope="row"><?php _e('Maximum size:') ?> </th>
<td><input name="fileupload_maxk" type="text" id="fileupload_maxk" value="<?php echo get_settings('fileupload_maxk'); ?>" size="4">
<td><input name="fileupload_maxk" type="text" id="fileupload_maxk" value="<?php echo get_settings('fileupload_maxk'); ?>" size="4" />
<?php _e('Kilobytes (KB)') ?></td>
</tr>
<tr>
<th valign="top" scope="row"><?php _e('Allowed file extensions:') ?></th>
<td><input name="fileupload_allowedtypes" type="text" id="fileupload_allowedtypes" value="<?php echo get_settings('fileupload_allowedtypes'); ?>" size="40">
<br>
<td><input name="fileupload_allowedtypes" type="text" id="fileupload_allowedtypes" value="<?php echo get_settings('fileupload_allowedtypes'); ?>" size="40" />
<br />
<?php _e('Recommended: <code>jpg jpeg png gif </code>') ?></td>
</tr>
<tr>

2
wp-admin/options-permalink.php
View File

@ -100,7 +100,7 @@ if (isset($_POST['submit'])) {
<input name="category_base" type="text" style="width: 98%;" value="<?php echo $category_base; ?>" />
</p>
<p class="submit">
<input type="submit" name="submit" value="<?php _e('Update Permalink Structure &raquo;') ?>">
<input type="submit" name="submit" value="<?php _e('Update Permalink Structure &raquo;') ?>" />
</p>
</form>
<?php

2
wp-admin/options-reading.php
View File

@ -74,7 +74,7 @@ include('options-head.php');
<th scope="row"><?php _e('For each article, show:') ?> </th>
<td><label>
<input name="rss_use_excerpt" type="radio" value="0" <?php checked(0, get_settings('rss_use_excerpt')); ?> />
full text</label> <br>
full text</label> <br />
<label>
<input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_settings('rss_use_excerpt')); ?> />
summary</label> </td>

6
wp-admin/post.php
View File

@ -747,7 +747,7 @@ default:
?>
<div class="wrap">
<?php _e('<h3>WordPress bookmarklet</h3>
<p>You can drag the following link to your links bar or add it to your bookmarks and when you "Press it" it will open up a popup window with information and a link to the site you&#8217re currently browsing so you can make a quick post about it. Try it out:</p>') ?>
<p>You can drag the following link to your links bar or add it to your bookmarks and when you "Press it" it will open up a popup window with information and a link to the site you&#8217;re currently browsing so you can make a quick post about it. Try it out:</p>') ?>
<p>
<?php
@ -755,11 +755,11 @@ $bookmarklet_height= (get_settings('use_trackback')) ? 460 : 420;
if ($is_NS4 || $is_gecko) {
?>
<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}void(window.open('<?php echo get_settings('siteurl') ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'<?php _e('WordPress bookmarklet') ?>','scrollbars=yes,width=600,height=460,left=100,top=150,status=yes'));"><?php printf(__('Press It - %s'), get_settings('blogname')); ?></a>
<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}void(window.open('<?php echo get_settings('siteurl') ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'&amp;popupurl='+escape(location.href)+'&amp;popuptitle='+escape(document.title),'<?php _e('WordPress bookmarklet') ?>','scrollbars=yes,width=600,height=460,left=100,top=150,status=yes'));"><?php printf(__('Press It - %s'), get_settings('blogname')); ?></a>
<?php
} else if ($is_winIE) {
?>
<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(btw=window.open('<?php echo get_settings('siteurl') ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'<?php echo $bookmarklet_tbpb ?>&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'bookmarklet','scrollbars=yes,width=600,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(btw=window.open('<?php echo get_settings('siteurl') ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'<?php echo $bookmarklet_tbpb ?>&amp;popupurl='+escape(location.href)+'&amp;popuptitle='+escape(document.title),'bookmarklet','scrollbars=yes,width=600,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
<script type="text/javascript" language="JavaScript">
<!--
function oneclickbookmarklet(blah) {

20
wp-admin/profile.php
View File

@ -303,40 +303,42 @@ default:
<td><select name="newuser_idmode">
<option value="nickname"<?php
if ($profiledata->user_idmode == 'nickname')
echo " selected"; ?>><?php echo $profiledata->user_nickname ?></option>
echo ' selected="selected"'; ?>><?php echo $profiledata->user_nickname ?></option>
<option value="login"<?php
if ($profiledata->user_idmode=="login")
echo " selected"; ?>><?php echo $profiledata->user_login ?></option>
echo ' selected="selected"'; ?>><?php echo $profiledata->user_login ?></option>
<option value="firstname"<?php
if ($profiledata->user_idmode=="firstname")
echo " selected"; ?>><?php echo $profiledata->user_firstname ?></option>
echo ' selected="selected"'; ?>><?php echo $profiledata->user_firstname ?></option>
<option value="lastname"<?php
if ($profiledata->user_idmode=="lastname")
echo " selected"; ?>><?php echo $profiledata->user_lastname ?></option>
echo ' selected="selected"'; ?>><?php echo $profiledata->user_lastname ?></option>
<option value="namefl"<?php
if ($profiledata->user_idmode=="namefl")
echo " selected"; ?>><?php echo $profiledata->user_firstname." ".$profiledata->user_lastname ?></option>
echo ' selected="selected"'; ?>><?php echo $profiledata->user_firstname." ".$profiledata->user_lastname ?></option>
<option value="namelf"<?php
if ($profiledata->user_idmode=="namelf")
echo " selected"; ?>><?php echo $profiledata->user_lastname." ".$profiledata->user_firstname ?></option>
echo ' selected="selected"'; ?>><?php echo $profiledata->user_lastname." ".$profiledata->user_firstname ?></option>
</select> </td>
</tr>
<tr>
<th scope="row"><?php _e('New <strong>Password</strong> (Leave blank to stay the same.)') ?></th>
<td><input type="password" name="pass1" size="16" value="" />
<br>
<br />
<input type="password" name="pass2" size="16" value="" /></td>
</tr>
</table>
<p class="submit">
<input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" />
</p>
</div>
</form>
</div>
<?php if ($is_gecko && $profiledata->user_level != 0) { ?>
<div class="wrap">
<script language="JavaScript" type="text/javascript">
//<![CDATA[
function addPanel()
{
if ((typeof window.sidebar == "object") && (typeof window.sidebar.addPanel == "function"))
@ -344,6 +346,7 @@ function addPanel()
else
alert(<?php __("'No Sidebar found! You must use Mozilla 0.9.4 or later!'") ?>);
}
//]]>
</script>
<strong><?php _e('SideBar') ?></strong><br />
<?php _e('Add the <a href="#" onClick="addPanel()">WordPress Sidebar</a>!') ?>
@ -355,6 +358,7 @@ function addPanel()
</div>
<?php } ?>
</div>
<?php
break;

14
wp-admin/users.php
View File

@ -219,11 +219,11 @@ default:
<td><a href='$url' title='website: $url'>$short_url</a></td>
<td align='center'>";
if (($user_level >= 2) and ($user_level > $user_data->user_level) and ($user_data->user_level > 0))
echo " <a href=\"users.php?action=promote&id=".$user_data->ID."&prom=down\">-</a> ";
echo " <a href=\"users.php?action=promote&amp;id=".$user_data->ID."&amp;prom=down\">-</a> ";
echo $user_data->user_level;
if (($user_level >= 2) and ($user_level > ($user_data->user_level + 1)))
echo " <a href=\"users.php?action=promote&id=".$user_data->ID."&prom=up\">+</a> ";
echo "<td align='right'>$numposts</td>";
echo " <a href=\"users.php?action=promote&amp;id=".$user_data->ID."&amp;prom=up\">+</a> ";
echo "</td><td align='right'>$numposts</td>";
echo '</tr>';
}
@ -261,16 +261,16 @@ default:
$style = ('class="alternate"' == $style) ? '' : 'class="alternate"';
echo "\n<tr $style>
<td align='center'>$user_data->ID</td>
<td><strong>$user_data->user_nickname</td>
<td><strong>$user_data->user_nickname</strong></td>
<td>$user_data->user_firstname $user_data->user_lastname</td>
<td><a href='mailto:$email' title='" . sprintf(__('e-mail: %s'), $email) . "'>$email</a></td>
<td><a href='$url' title='website: $url'>$short_url</a></td>
<td align='center'>";
if ($user_level >= 3)
echo " <a href=\"users.php?action=delete&id=".$user_data->ID."\" style=\"color:red;font-weight:bold;\">X</a> ";
echo " <a href=\"users.php?action=delete&amp;id=".$user_data->ID."\" style=\"color:red;font-weight:bold;\">X</a> ";
echo $user_data->user_level;
if ($user_level >= 2)
echo " <a href=\"users.php?action=promote&id=".$user_data->ID."&prom=up\">+</a> ";
echo " <a href=\"users.php?action=promote&amp;id=".$user_data->ID."&amp;prom=up\">+</a> ";
echo "</td>\n</tr>\n";
}
?>
@ -316,7 +316,7 @@ echo "\n<tr $style>
</tr>
</table>
<p class="submit">
<input name="adduser" type="submit" id="adduser" value="<?php _e('Add User') ?> &raquo;">
<input name="adduser" type="submit" id="adduser" value="<?php _e('Add User') ?> &raquo;" />
</p>
</form>
</div>