[wp-cvs] wordpress/wp-admin admin-header.php, 1.27,
1.28 edit-form-advanced.php, 1.29, 1.30 edit-form-comment.php,
1.12, 1.13 edit-form.php, 1.26, 1.27 post.php, 1.72,
1.73 profile.php, 1.27, 1.28 quicktags.php, 1.3,
1.4 templates.php, 1.22, 1.23
Matthew Mullenweg
saxmatt at users.sourceforge.net
Sun Aug 1 08:04:41 UTC 2004
Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9123/wp-admin
Modified Files:
admin-header.php edit-form-advanced.php edit-form-comment.php
edit-form.php post.php profile.php quicktags.php templates.php
Log Message:
Cleaning out some errors and fixing some XHTML 1.1 problems.
Index: edit-form-comment.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-form-comment.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** edit-form-comment.php 28 Jul 2004 04:01:45 -0000 1.12
--- edit-form-comment.php 1 Aug 2004 08:04:38 -0000 1.13
***************
*** 57,61 ****
</fieldset>
! <script type="text/javascript" language="JavaScript">
<!--
edCanvas = document.getElementById('content');
--- 57,61 ----
</fieldset>
! <script type="text/javascript">
<!--
edCanvas = document.getElementById('content');
Index: templates.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/templates.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** templates.php 10 Jul 2004 23:34:47 -0000 1.22
--- templates.php 1 Aug 2004 08:04:39 -0000 1.23
***************
*** 84,88 ****
require_once('admin-header.php');
!
if ($user_level <= 5) {
die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
--- 84,88 ----
require_once('admin-header.php');
! update_option('recently_edited', array(1, 2, 3) );
if ($user_level <= 5) {
die(__('<p>You have do not have sufficient permissions to edit templates for this blog.</p>'));
Index: admin-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-header.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** admin-header.php 21 Jul 2004 01:59:09 -0000 1.27
--- admin-header.php 1 Aug 2004 08:04:38 -0000 1.28
***************
*** 2,20 ****
require_once('../wp-config.php');
! require_once(ABSPATH.'/wp-admin/auth.php');
! require(ABSPATH.'/wp-admin/admin-functions.php');
!
! function gethelp_link($this_file, $helptag) {
! $url = 'http://wordpress.org/docs/reference/links/#'.$helptag;
! $s = ' <a href="'.$url.'" title="' . __('Click here for help') .'">?</a>';
! return $s;
! }
!
! if (!isset($blogID)) $blog_ID=1;
! if (!isset($debug)) $debug=0;
! $dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories WHERE 1=1");
foreach ($dogs as $catt) {
! $cache_categories[$catt->cat_ID] = $catt;
}
--- 2,11 ----
require_once('../wp-config.php');
! require_once(ABSPATH . '/wp-admin/auth.php');
! require(ABSPATH . '/wp-admin/admin-functions.php');
! $dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories");
foreach ($dogs as $catt) {
! $cache_categories[$catt->cat_ID] = $catt;
}
***************
*** 24,33 ****
$what_to_show = get_settings('what_to_show');
$archive_mode = get_settings('archive_mode');
! $date_format = stripslashes(get_settings('date_format'));
! $time_format = stripslashes(get_settings('time_format'));
!
! // let's deactivate quicktags on IE Mac and Lynx, because they don't work there.
! if (($is_macIE) || ($is_lynx))
! $use_quicktags = 0;
$wpvarstoreset = array('profile','standalone','redirect','redirect_url','a','popuptitle','popupurl','text', 'trackback', 'pingback');
--- 15,20 ----
$what_to_show = get_settings('what_to_show');
$archive_mode = get_settings('archive_mode');
! $date_format = get_settings('date_format');
! $time_format = get_settings('time_format');
$wpvarstoreset = array('profile','standalone','redirect','redirect_url','a','popuptitle','popupurl','text', 'trackback', 'pingback');
***************
*** 59,63 ****
if ($redirect==1) {
?>
! <script language="javascript" type="text/javascript">
<!--
function redirect() {
--- 46,50 ----
if ($redirect==1) {
?>
! <script type="text/javascript">
<!--
function redirect() {
***************
*** 72,76 ****
<?php if (isset($xfn)) : ?>
! <script language="javascript" type="text/javascript">
//<![CDATA[
--- 59,63 ----
<?php if (isset($xfn)) : ?>
! <script type="text/javascript">
//<![CDATA[
***************
*** 133,136 ****
--- 120,124 ----
</head>
<body>
+
<div id="wphead">
<h1><?php bloginfo('name') ?></h1>
Index: edit-form-advanced.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-form-advanced.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** edit-form-advanced.php 28 Jul 2004 18:44:36 -0000 1.29
--- edit-form-advanced.php 1 Aug 2004 08:04:38 -0000 1.30
***************
*** 12,17 ****
$allowed_users = explode(" ", trim(get_settings('fileupload_allowedusers')));
- $submitbutton_text = __('Save');
- $toprow_title = sprintf(__('Editing Post #%s'), $post_ID);
if (0 == $post_ID) {
$form_action = 'post';
--- 12,15 ----
***************
*** 20,23 ****
--- 18,22 ----
$form_extra = "<input type='hidden' name='post_ID' value='$post_ID' />";
}
+
if (get_settings('use_pingback')) {
$form_pingback = '<input type="checkbox" class="checkbox" name="post_pingback" value="1" ';
***************
*** 28,33 ****
}
- $colspan = 2;
$form_prevstatus = '<input type="hidden" name="prev_status" value="'.$post_status.'" />';
if (get_settings('use_trackback')) {
$form_trackback = '<p><label for="trackback"><a href="http://wordpress.org/docs/reference/post/#trackback" title="' . __('Help on trackbacks') . '">' . __('<strong>TrackBack</strong> an <abbr title="Universal Resource Identifier">URI</abbr></a>') . '</label> ' . __('(Separate multiple <abbr title="Universal Resource Identifier">URI</abbr>s with spaces.)') . '<br />
--- 27,32 ----
}
$form_prevstatus = '<input type="hidden" name="prev_status" value="'.$post_status.'" />';
+
if (get_settings('use_trackback')) {
$form_trackback = '<p><label for="trackback"><a href="http://wordpress.org/docs/reference/post/#trackback" title="' . __('Help on trackbacks') . '">' . __('<strong>TrackBack</strong> an <abbr title="Universal Resource Identifier">URI</abbr></a>') . '</label> ' . __('(Separate multiple <abbr title="Universal Resource Identifier">URI</abbr>s with spaces.)') . '<br />
***************
*** 124,128 ****
<?php
?>
! <script type="text/javascript" language="JavaScript">
<!--
edCanvas = document.getElementById('content');
--- 123,127 ----
<?php
?>
! <script type="text/javascript">
<!--
edCanvas = document.getElementById('content');
***************
*** 190,193 ****
--- 189,193 ----
?>
</fieldset>
+ <?php do_action('edit_form_advanced', ''); ?>
</div>
</form>
Index: edit-form.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/edit-form.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** edit-form.php 1 Aug 2004 07:51:26 -0000 1.26
--- edit-form.php 1 Aug 2004 08:04:39 -0000 1.27
***************
*** 5,12 ****
$allowed_users = explode(" ", trim(get_settings('fileupload_allowedusers')));
- $submitbutton_text = __('Blog this!');
- $toprow_title = __('New Post');
$form_action = 'post';
$form_extra = '';
if (get_settings('use_pingback')) {
$form_pingback = '<input type="checkbox" class="checkbox" name="post_pingback" value="1" ';
--- 5,11 ----
$allowed_users = explode(" ", trim(get_settings('fileupload_allowedusers')));
$form_action = 'post';
$form_extra = '';
+
if (get_settings('use_pingback')) {
$form_pingback = '<input type="checkbox" class="checkbox" name="post_pingback" value="1" ';
***************
*** 16,19 ****
--- 15,19 ----
$form_pingback = '';
}
+
if (get_settings('use_trackback')) {
$form_trackback = '<p><label for="trackback">' . sprintf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <acronym title="Uniform Resource Locator">URL</acronym></a>:</label> (Separate multiple <abbr title="Universal Resource Identifier">URI</abbr>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') .
***************
*** 22,26 ****
$form_trackback = '';
}
! $colspan = 3;
$saveasdraft = '';
--- 22,26 ----
$form_trackback = '';
}
!
$saveasdraft = '';
***************
*** 80,84 ****
! <script type="text/javascript" language="JavaScript">
<!--
edCanvas = document.getElementById('content');
--- 80,84 ----
! <script type="text/javascript">
<!--
edCanvas = document.getElementById('content');
***************
*** 88,91 ****
--- 88,92 ----
<?php echo $form_pingback ?>
<?php echo $form_trackback; ?>
+
<p class="submit"><input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="<?php _e('Save as Draft') ?>" />
<input name="saveasprivate" type="submit" id="saveasprivate" tabindex="10" value="<?php _e('Save as Private') ?>" />
***************
*** 96,100 ****
<input name="referredby" type="hidden" id="referredby" value="<?php if (isset($_SERVER['HTTP_REFERER'])) echo urlencode($_SERVER['HTTP_REFERER']); ?>" />
</p>
!
</div>
</form>
--- 97,101 ----
<input name="referredby" type="hidden" id="referredby" value="<?php if (isset($_SERVER['HTTP_REFERER'])) echo urlencode($_SERVER['HTTP_REFERER']); ?>" />
</p>
! <?php do_action('edit_form', ''); ?>
</div>
</form>
Index: quicktags.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/quicktags.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** quicktags.php 15 Jun 2004 23:24:35 -0000 1.3
--- quicktags.php 1 Aug 2004 08:04:39 -0000 1.4
***************
*** 1,2 ****
! <script src="quicktags.js" language="JavaScript" type="text/javascript"></script>
! <script language="JavaScript" type="text/javascript">edToolbar();</script>
\ No newline at end of file
--- 1,2 ----
! <script src="quicktags.js" type="text/javascript"></script>
! <script type="text/javascript">edToolbar();</script>
\ No newline at end of file
Index: profile.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/profile.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** profile.php 21 Jul 2004 07:23:44 -0000 1.27
--- profile.php 1 Aug 2004 08:04:39 -0000 1.28
***************
*** 343,347 ****
<?php if ($is_gecko && $profiledata->user_level != 0) { ?>
<div class="wrap">
! <script language="JavaScript" type="text/javascript">
//<![CDATA[
function addPanel()
--- 343,347 ----
<?php if ($is_gecko && $profiledata->user_level != 0) { ?>
<div class="wrap">
! <script type="text/javascript">
//<![CDATA[
function addPanel()
Index: post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/post.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** post.php 28 Jul 2004 16:08:03 -0000 1.72
--- post.php 1 Aug 2004 08:04:39 -0000 1.73
***************
*** 765,769 ****
?>
<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>
! <script type="text/javascript" language="JavaScript">
<!--
function oneclickbookmarklet(blah) {
--- 765,769 ----
?>
<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>
! <script type="text/javascript">
<!--
function oneclickbookmarklet(blah) {
More information about the cvs
mailing list