Some UI cleanups, changes, and various miscellany.

git-svn-id: http://svn.automattic.com/wordpress/trunk@4349 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
matt 2006-10-06 01:14:47 +00:00
parent 7757b7ff4e
commit c437b9c9b0
27 changed files with 2105 additions and 1955 deletions

View File

@ -1,13 +1,10 @@
<div id="footer"> <div id="footer">
<p><a href="http://wordpress.org/" id="wordpress-logo"><img src="images/wordpress-logo.png" alt="WordPress" /></a></p> <p class="logo"><a href="http://wordpress.org/" id="wordpress-logo"><img src="images/wordpress-logo.png" alt="WordPress" /></a></p>
<p> <p class="docs"><?php _e('<a href="http://codex.wordpress.org/">Documentation</a>'); ?> &#8212; <?php _e('<a href="http://wordpress.org/support/">Support Forums</a>'); ?><br />
<?php _e('<a href="http://codex.wordpress.org/">Documentation</a>'); ?> &#8212; <?php _e('<a href="http://wordpress.org/support/">Support Forums</a>'); ?> <br /> <?php bloginfo('version'); ?> &#8212; <?php printf(__('%s seconds'), timer_stop(0, 2)); ?></p>
<?php bloginfo('version'); ?> &#8212; <?php printf(__('%s seconds'), timer_stop(0, 2)); ?>
</p>
</div> </div>
<?php do_action('admin_footer', ''); ?> <?php do_action('admin_footer', ''); ?>
<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script> <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
</body> </body>
</html> </html>

View File

@ -82,7 +82,8 @@ if (isset($plugin_page)) {
include(ABSPATH . "wp-admin/import/$importer.php"); include(ABSPATH . "wp-admin/import/$importer.php");
$parent_file = 'import.php'; $parent_file = 'edit.php';
$submenu_file = 'import.php';
$title = __('Import'); $title = __('Import');
if (! isset($_GET['noheader'])) if (! isset($_GET['noheader']))

View File

@ -14,8 +14,6 @@ $messages[3] = __('Custom field deleted.');
<?php endif; ?> <?php endif; ?>
<div class="wrap"> <div class="wrap">
<h2 id="write-post"><?php _e('Write Post'); ?><?php if ( 0 != $post_ID ) : ?>
<small class="quickjump"><a href="#preview-post"><?php _e('preview &darr;'); ?></a></small><?php endif; ?></h2>
<?php <?php
if (0 == $post_ID) { if (0 == $post_ID) {

View File

@ -77,7 +77,7 @@ if ( is_month() ) {
<fieldset> <fieldset>
<legend><?php _e('Search Posts&hellip;') ?></legend> <legend><?php _e('Search Posts&hellip;') ?></legend>
<input type="text" name="s" value="<?php if (isset($s)) echo wp_specialchars($s, 1); ?>" size="17" /> <input type="text" name="s" value="<?php if (isset($s)) echo wp_specialchars($s, 1); ?>" size="17" />
<input type="submit" name="submit" value="<?php _e('Search') ?>" /> <input type="submit" name="submit" value="<?php _e('Search') ?>" class="button" />
</fieldset> </fieldset>
</form> </form>
@ -106,7 +106,7 @@ if ( count($arc_result) ) { ?>
} }
?> ?>
</select> </select>
<input type="submit" name="submit" value="<?php _e('Show Month') ?>" /> <input type="submit" name="submit" value="<?php _e('Show Month') ?>" class="button" />
</fieldset> </fieldset>
</form> </form>
@ -116,7 +116,7 @@ if ( count($arc_result) ) { ?>
<fieldset> <fieldset>
<legend><?php _e('Browse Category&hellip;') ?></legend> <legend><?php _e('Browse Category&hellip;') ?></legend>
<?php wp_dropdown_categories('show_option_all='.__('All').'&hide_empty=1&hierarchical=1&show_count=1&selected='.$cat);?> <?php wp_dropdown_categories('show_option_all='.__('All').'&hide_empty=1&hierarchical=1&show_count=1&selected='.$cat);?>
<input type="submit" name="submit" value="<?php _e('Show Category') ?>" /> <input type="submit" name="submit" value="<?php _e('Show Category') ?>" class="button" />
</fieldset> </fieldset>
</form> </form>

View File

@ -11,14 +11,16 @@ require_once ('admin-header.php');
<div class="wrap"> <div class="wrap">
<h2><?php _e('Export'); ?></h2> <h2><?php _e('Export'); ?></h2>
<p><?php _e('This will allow you to download an export of your WordPress posts and comments in a XML format.'); ?></p> <div class="narrow">
<p>We need some more text here. Maybe talking about the export file or how to save it.</p> <p><?php _e('When you click the button below WordPress will create a XML file for you to save to your computer.'); ?></p>
<p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, comments, custom fields, and categories.'); ?></p>
<form action="" method="get"> <form action="" method="get">
<p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?> &raquo;" /> <p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?> &raquo;" />
<input type="hidden" name="download" value="true" /> <input type="hidden" name="download" value="true" />
</p> </p>
</form> </form>
</div> </div>
</div>
<?php <?php

View File

@ -22,8 +22,10 @@ class BW_Import {
} }
function greet() { function greet() {
echo '<div class="narrow">';
echo '<p>'.__('Howdy! This importer allows you to extract posts from Blogware XML export file into your blog. Pick a Blogware file to upload and click Import.').'</p>'; echo '<p>'.__('Howdy! This importer allows you to extract posts from Blogware XML export file into your blog. Pick a Blogware file to upload and click Import.').'</p>';
wp_import_upload_form("admin.php?import=blogware&amp;step=1"); wp_import_upload_form("admin.php?import=blogware&amp;step=1");
echo '</div>';
} }
function import_posts() { function import_posts() {

File diff suppressed because it is too large Load Diff

View File

@ -20,8 +20,10 @@ class LJ_Import {
} }
function greet() { function greet() {
echo '<div class="narrow">';
echo '<p>'.__('Howdy! This importer allows you to extract posts from LiveJournal XML export file into your blog. Pick a LiveJournal file to upload and click Import.').'</p>'; echo '<p>'.__('Howdy! This importer allows you to extract posts from LiveJournal XML export file into your blog. Pick a LiveJournal file to upload and click Import.').'</p>';
wp_import_upload_form("admin.php?import=livejournal&amp;step=1"); wp_import_upload_form("admin.php?import=livejournal&amp;step=1");
echo '</div>';
} }
function import_posts() { function import_posts() {

View File

@ -21,9 +21,11 @@ class MT_Import {
function greet() { function greet() {
$this->header(); $this->header();
?> ?>
<div class="narrow">
<p><?php _e('Howdy! We&#8217;re about to begin the process to import all of your Movable Type entries into WordPress. To begin, select a file to upload and click Import.'); ?></p> <p><?php _e('Howdy! We&#8217;re about to begin the process to import all of your Movable Type entries into WordPress. To begin, select a file to upload and click Import.'); ?></p>
<?php wp_import_upload_form( add_query_arg('step', 1) ); ?> <?php wp_import_upload_form( add_query_arg('step', 1) ); ?>
<p><?php _e('The importer is smart enough not to import duplicates, so you can run this multiple times without worry if&#8212;for whatever reason&#8212;it doesn\'t finish. If you get an <strong>out of memory</strong> error try splitting up the import file into pieces.'); ?> </p> <p><?php _e('The importer is smart enough not to import duplicates, so you can run this multiple times without worry if&#8212;for whatever reason&#8212;it doesn\'t finish. If you get an <strong>out of memory</strong> error try splitting up the import file into pieces.'); ?> </p>
</div>
<?php <?php
$this->footer(); $this->footer();
} }

View File

@ -21,8 +21,10 @@ class RSS_Import {
} }
function greet() { function greet() {
echo '<div class="narrow">';
echo '<p>'.__('Howdy! This importer allows you to extract posts from any RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>'; echo '<p>'.__('Howdy! This importer allows you to extract posts from any RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>';
wp_import_upload_form("admin.php?import=rss&amp;step=1"); wp_import_upload_form("admin.php?import=rss&amp;step=1");
echo '</div>';
} }
function get_posts() { function get_posts() {

View File

@ -50,14 +50,15 @@ class Textpattern_Import {
echo '</div>'; echo '</div>';
} }
function greet() function greet() {
{ echo '<div class="narrow">';
echo '<p>'.__('Howdy! This importer allows you to extract posts from any Textpattern 4.0.2+ into your blog. This has not been tested on previous versions of Textpattern. Mileage may vary.').'</p>'; echo '<p>'.__('Howdy! This importer allows you to extract posts from any Textpattern 4.0.2+ into your blog. This has not been tested on previous versions of Textpattern. Mileage may vary.').'</p>';
echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>'; echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>';
echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">'; echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">';
$this->db_form(); $this->db_form();
echo '<input type="submit" name="submit" value="'.__('Import Categories').'" />'; echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Categories').' &raquo;" /></p>';
echo '</form>'; echo '</form>';
echo '</div>';
} }
function get_txp_cats() function get_txp_cats()
@ -568,13 +569,13 @@ class Textpattern_Import {
function db_form() function db_form()
{ {
echo '<ul>'; echo '<table class="editform">';
printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" id="dbuser" /></li>', __('Textpattern Database User:')); printf('<tr><th scope="row"><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('Textpattern Database User:'));
printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" id="dbpass" /></li>', __('Textpattern Database Password:')); printf('<tr><th scope="row"><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('Textpattern Database Password:'));
printf('<li><label for="dbname">%s</label> <input type="text" id="dbname" name="dbname" /></li>', __('Textpattern Database Name:')); printf('<tr><th scope="row"><label for="dbname">%s</label></th><td><input type="text" id="dbname" name="dbname" /></td></tr>', __('Textpattern Database Name:'));
printf('<li><label for="dbhost">%s</label> <input type="text" id="dbhost" name="dbhost" value="localhost" /></li>', __('Textpattern Database Host:')); printf('<tr><th scope="row"><label for="dbhost">%s</label></th><td><input type="text" id="dbhost" name="dbhost" value="localhost" /></td></tr>', __('Textpattern Database Host:'));
printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" id="dbprefix" /></li>', __('Textpattern Table prefix (if any):')); printf('<tr><th scope="row"><label for="dbprefix">%s</label></th><td><input type="text" name="dbprefix" id="dbprefix" /></td></tr>', __('Textpattern Table prefix (if any):'));
echo '</ul>'; echo '</table>';
} }
function dispatch() function dispatch()

View File

@ -25,8 +25,10 @@ class WP_Import {
} }
function greet() { function greet() {
echo '<div class="narrow">';
echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts and comments into this blog.').'</p>'; echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts and comments into this blog.').'</p>';
wp_import_upload_form("admin.php?import=wordpress&amp;step=1"); wp_import_upload_form("admin.php?import=wordpress&amp;step=1");
echo '</div>';
} }
function get_tag( $string, $tag ) { function get_tag( $string, $tag ) {

View File

@ -132,7 +132,8 @@ if (0 < $numcats) $numcats = number_format($numcats);
$rss = @fetch_rss('http://wordpress.org/development/feed/'); $rss = @fetch_rss('http://wordpress.org/development/feed/');
if ( isset($rss->items) && 0 != count($rss->items) ) { if ( isset($rss->items) && 0 != count($rss->items) ) {
?> ?>
<h3><?php _e('WordPress Development News'); ?></h3> <div id="devnews">
<h3><?php _e('WordPress Development Blog'); ?></h3>
<?php <?php
$rss->items = array_slice($rss->items, 0, 3); $rss->items = array_slice($rss->items, 0, 3);
foreach ($rss->items as $item ) { foreach ($rss->items as $item ) {
@ -143,24 +144,28 @@ foreach ($rss->items as $item ) {
} }
} }
?> ?>
</div>
<?php <?php
$rss = @fetch_rss('http://planet.wordpress.org/feed/'); $rss = @fetch_rss('http://planet.wordpress.org/feed/');
if ( isset($rss->items) && 0 != count($rss->items) ) { if ( isset($rss->items) && 0 != count($rss->items) ) {
?> ?>
<div id="planetnews"> <div id="planetnews">
<h3><?php _e('Other WordPress News'); ?> <a href="http://planet.wordpress.org/"><?php _e('more'); ?> &raquo;</a></h3> <h3><?php _e('Other WordPress News'); ?></h3>
<ul> <ul>
<?php <?php
$rss->items = array_slice($rss->items, 0, 20); $rss->items = array_slice($rss->items, 0, 20);
foreach ($rss->items as $item ) { foreach ($rss->items as $item ) {
$title = wp_specialchars($item['title']);
$author = preg_replace( '|(.+?):.+|s', '$1', $item['title'] );
$post = preg_replace( '|.+?:(.+)|s', '$1', $item['title'] );
?> ?>
<li><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a></li> <li><a href='<?php echo wp_filter_kses($item['link']); ?>'><span class="post"><?php echo $post; ?></span><span class="hidden"> - </span><cite><?php echo $author; ?></cite></a></li>
<?php <?php
} }
?> ?>
</ul> </ul>
<p class="readmore"><a href="http://planet.wordpress.org/"><?php _e('Read more'); ?> &raquo;</a></p>
</div> </div>
<?php <?php
} }

View File

@ -53,6 +53,10 @@ endforeach;
</ul> </ul>
<?php <?php
else :
?>
<div id="minisub"></div>
<?php
endif; endif;

View File

@ -1,160 +1,160 @@
<?php <?php
require_once('admin.php'); require_once('admin.php');
$parent_file = 'edit.php'; $parent_file = 'edit.php';
$submenu_file = 'edit-pages.php'; $submenu_file = 'edit-pages.php';
wp_reset_vars(array('action')); wp_reset_vars(array('action'));
if (isset($_POST['deletepost'])) { if (isset($_POST['deletepost'])) {
$action = "delete"; $action = "delete";
} }
switch($action) { switch($action) {
case 'post': case 'post':
check_admin_referer('add-page'); check_admin_referer('add-page');
$page_ID = write_post(); $page_ID = write_post();
// Redirect. // Redirect.
if (!empty($_POST['mode'])) { if (!empty($_POST['mode'])) {
switch($_POST['mode']) { switch($_POST['mode']) {
case 'bookmarklet': case 'bookmarklet':
$location = $_POST['referredby']; $location = $_POST['referredby'];
break; break;
case 'sidebar': case 'sidebar':
$location = 'sidebar.php?a=b'; $location = 'sidebar.php?a=b';
break; break;
default: default:
$location = 'page-new.php'; $location = 'page-new.php';
break; break;
} }
} else { } else {
$location = "page-new.php?posted=$page_ID"; $location = "page-new.php?posted=$page_ID";
} }
if ( isset($_POST['save']) ) if ( isset($_POST['save']) )
$location = "page.php?action=edit&post=$page_ID"; $location = "page.php?action=edit&post=$page_ID";
wp_redirect($location); wp_redirect($location);
exit(); exit();
break; break;
case 'edit': case 'edit':
$title = __('Edit'); $title = __('Edit');
$editing = true; $editing = true;
$page_ID = $post_ID = $p = (int) $_GET['post']; $page_ID = $post_ID = $p = (int) $_GET['post'];
$post = get_post_to_edit($page_ID); $post = get_post_to_edit($page_ID);
if($post->post_status == 'draft') { if($post->post_status == 'draft') {
wp_enqueue_script('prototype'); wp_enqueue_script('prototype');
wp_enqueue_script('autosave'); wp_enqueue_script('autosave');
} }
require_once('admin-header.php'); require_once('admin-header.php');
if ( !current_user_can('edit_page', $page_ID) ) if ( !current_user_can('edit_page', $page_ID) )
die ( __('You are not allowed to edit this page.') ); die ( __('You are not allowed to edit this page.') );
include('edit-page-form.php'); include('edit-page-form.php');
?> ?>
<div id='preview' class='wrap'> <div id='preview' class='wrap'>
<h2 id="preview-post"><?php _e('Page Preview (updated when page is saved)'); ?> <small class="quickjump"><a href="#write-post"><?php _e('edit &uarr;'); ?></a></small></h2> <h2 id="preview-post"><?php _e('Page Preview (updated when page is saved)'); ?></h2>
<iframe src="<?php echo wp_specialchars(apply_filters('preview_page_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" width="100%" height="600" ></iframe> <iframe src="<?php echo wp_specialchars(apply_filters('preview_page_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" width="100%" height="600" ></iframe>
</div> </div>
<?php <?php
break; break;
case 'editattachment': case 'editattachment':
$page_id = $post_ID = (int) $_POST['post_ID']; $page_id = $post_ID = (int) $_POST['post_ID'];
check_admin_referer('update-attachment_' . $page_id); check_admin_referer('update-attachment_' . $page_id);
// Don't let these be changed // Don't let these be changed
unset($_POST['guid']); unset($_POST['guid']);
$_POST['post_type'] = 'attachment'; $_POST['post_type'] = 'attachment';
// Update the thumbnail filename // Update the thumbnail filename
$oldmeta = $newmeta = get_post_meta($page_id, '_wp_attachment_metadata', true); $oldmeta = $newmeta = get_post_meta($page_id, '_wp_attachment_metadata', true);
$newmeta['thumb'] = $_POST['thumb']; $newmeta['thumb'] = $_POST['thumb'];
if ( '' !== $oldmeta ) if ( '' !== $oldmeta )
update_post_meta($page_id, '_wp_attachment_metadata', $newmeta, $oldmeta); update_post_meta($page_id, '_wp_attachment_metadata', $newmeta, $oldmeta);
else else
add_post_meta($page_id, '_wp_attachment_metadata', $newmeta); add_post_meta($page_id, '_wp_attachment_metadata', $newmeta);
case 'editpost': case 'editpost':
$page_ID = (int) $_POST['post_ID']; $page_ID = (int) $_POST['post_ID'];
check_admin_referer('update-page_' . $page_ID); check_admin_referer('update-page_' . $page_ID);
$page_ID = edit_post(); $page_ID = edit_post();
if ( 'post' == $_POST['originalaction'] ) { if ( 'post' == $_POST['originalaction'] ) {
if (!empty($_POST['mode'])) { if (!empty($_POST['mode'])) {
switch($_POST['mode']) { switch($_POST['mode']) {
case 'bookmarklet': case 'bookmarklet':
$location = $_POST['referredby']; $location = $_POST['referredby'];
break; break;
case 'sidebar': case 'sidebar':
$location = 'sidebar.php?a=b'; $location = 'sidebar.php?a=b';
break; break;
default: default:
$location = 'page-new.php'; $location = 'page-new.php';
break; break;
} }
} else { } else {
$location = "page-new.php?posted=$page_ID"; $location = "page-new.php?posted=$page_ID";
} }
if ( isset($_POST['save']) ) if ( isset($_POST['save']) )
$location = "page.php?action=edit&post=$page_ID"; $location = "page.php?action=edit&post=$page_ID";
} else { } else {
if ($_POST['save']) { if ($_POST['save']) {
$location = "page.php?action=edit&post=$page_ID"; $location = "page.php?action=edit&post=$page_ID";
} elseif ($_POST['updatemeta']) { } elseif ($_POST['updatemeta']) {
$location = wp_get_referer() . '&message=2#postcustom'; $location = wp_get_referer() . '&message=2#postcustom';
} elseif ($_POST['deletemeta']) { } elseif ($_POST['deletemeta']) {
$location = wp_get_referer() . '&message=3#postcustom'; $location = wp_get_referer() . '&message=3#postcustom';
} elseif (!empty($_POST['referredby']) && $_POST['referredby'] != wp_get_referer()) { } elseif (!empty($_POST['referredby']) && $_POST['referredby'] != wp_get_referer()) {
$location = $_POST['referredby']; $location = $_POST['referredby'];
if ( $_POST['referredby'] == 'redo' ) if ( $_POST['referredby'] == 'redo' )
$location = get_permalink( $page_ID ); $location = get_permalink( $page_ID );
} elseif ($action == 'editattachment') { } elseif ($action == 'editattachment') {
$location = 'attachments.php'; $location = 'attachments.php';
} else { } else {
$location = 'page-new.php'; $location = 'page-new.php';
} }
} }
wp_redirect($location); // Send user on their way while we keep working wp_redirect($location); // Send user on their way while we keep working
exit(); exit();
break; break;
case 'delete': case 'delete':
$page_id = (isset($_GET['post'])) ? intval($_GET['post']) : intval($_POST['post_ID']); $page_id = (isset($_GET['post'])) ? intval($_GET['post']) : intval($_POST['post_ID']);
check_admin_referer('delete-page_' . $page_id); check_admin_referer('delete-page_' . $page_id);
$page = & get_post($page_id); $page = & get_post($page_id);
if ( !current_user_can('delete_page', $page_id) ) if ( !current_user_can('delete_page', $page_id) )
wp_die( __('You are not allowed to delete this page.') ); wp_die( __('You are not allowed to delete this page.') );
if ( $page->post_type == 'attachment' ) { if ( $page->post_type == 'attachment' ) {
if ( ! wp_delete_attachment($page_id) ) if ( ! wp_delete_attachment($page_id) )
wp_die( __('Error in deleting...') ); wp_die( __('Error in deleting...') );
} else { } else {
if ( !wp_delete_post($page_id) ) if ( !wp_delete_post($page_id) )
wp_die( __('Error in deleting...') ); wp_die( __('Error in deleting...') );
} }
$sendback = wp_get_referer(); $sendback = wp_get_referer();
if (strstr($sendback, 'page.php')) $sendback = get_option('siteurl') .'/wp-admin/page.php'; if (strstr($sendback, 'page.php')) $sendback = get_option('siteurl') .'/wp-admin/page.php';
elseif (strstr($sendback, 'attachments.php')) $sendback = get_option('siteurl') .'/wp-admin/attachments.php'; elseif (strstr($sendback, 'attachments.php')) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
$sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
wp_redirect($sendback); wp_redirect($sendback);
exit(); exit();
break; break;
default: default:
wp_redirect('edit-pages.php'); wp_redirect('edit-pages.php');
exit(); exit();
break; break;
} // end switch } // end switch
include('admin-footer.php'); include('admin-footer.php');
?> ?>

View File

@ -78,7 +78,7 @@ if (empty($plugins)) {
echo '</p>'; echo '</p>';
} else { } else {
?> ?>
<table class="widefat"> <table class="widefat plugins">
<thead> <thead>
<tr> <tr>
<th><?php _e('Plugin'); ?></th> <th><?php _e('Plugin'); ?></th>
@ -112,7 +112,7 @@ if (empty($plugins)) {
<tr $style> <tr $style>
<td class='name'>{$plugin_data['Title']}</td> <td class='name'>{$plugin_data['Title']}</td>
<td class='vers'>{$plugin_data['Version']}</td> <td class='vers'>{$plugin_data['Version']}</td>
<td class='desc'>{$plugin_data['Description']} <cite>".sprintf(__('By %s'), $plugin_data['Author']).".</cite></td> <td class='desc'><p>{$plugin_data['Description']} <cite>".sprintf(__('By %s'), $plugin_data['Author']).".</cite></p></td>
<td class='togl'>$toggle</td>"; <td class='togl'>$toggle</td>";
if ( current_user_can('edit_plugins') ) if ( current_user_can('edit_plugins') )
echo " echo "
@ -130,7 +130,8 @@ if (empty($plugins)) {
<p><?php _e(sprintf('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.', PLUGINDIR)); ?></p> <p><?php _e(sprintf('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.', PLUGINDIR)); ?></p>
<h2><?php _e('Get More Plugins'); ?></h2> <h2><?php _e('Get More Plugins'); ?></h2>
<p><?php _e(sprintf('You can find additional plugins for your site in the <a href="http://wordpress.org/extend/plugins/">WordPress plugin directory</a>. To install a plugin you generally just need to upload the plugin file into your <code>%s</code> directory. Once a plugin is uploaded, you may activate it here.', PLUGINDIR)); ?></p> <p><?php _e('You can find additional plugins for your site in the <a href="http://wordpress.org/extend/plugins/">WordPress plugin directory</a>.'); ?></p>
<p><?php _e(sprintf('To install a plugin you generally just need to upload the plugin file into your <code>%s</code> directory. Once a plugin is uploaded, you may activate it here.', PLUGINDIR)); ?></p>
</div> </div>

View File

@ -62,7 +62,7 @@ case 'edit':
?> ?>
<div id='preview' class='wrap'> <div id='preview' class='wrap'>
<h2 id="preview-post"><?php _e('Post Preview (updated when post is saved)'); ?> <small class="quickjump"><a href="#write-post"><?php _e('edit &uarr;'); ?></a></small></h2> <h2 id="preview-post"><?php _e('Post Preview (updated when post is saved)'); ?></h2>
<iframe src="<?php echo wp_specialchars(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" width="100%" height="600" ></iframe> <iframe src="<?php echo wp_specialchars(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" width="100%" height="600" ></iframe>
</div> </div>
<?php <?php

View File

@ -35,6 +35,8 @@ $bookmarklet_height= 440;
<?php do_action('profile_personal_options'); ?> <?php do_action('profile_personal_options'); ?>
<p class="submit"><input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" /></p>
<fieldset> <fieldset>
<legend><?php _e('Name'); ?></legend> <legend><?php _e('Name'); ?></legend>
<p><label><?php _e('Username: (no editing)'); ?><br /> <p><label><?php _e('Username: (no editing)'); ?><br />
@ -138,9 +140,7 @@ if ( $show_password_fields ) :
endif; endif;
?> ?>
</table> </table>
<p class="submit"> <p class="submit"><input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" /></p>
<input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" />
</p>
</form> </form>
</div> </div>

View File

@ -1,223 +1,223 @@
#viewarc, #viewcat, #namediv, #emaildiv, #uridiv, #planetnews li, #login ul li, #your-profile fieldset, .alignleft .available-theme { #viewarc, #viewcat, #namediv, #emaildiv, #uridiv, #planetnews li, #login ul li, #your-profile fieldset, .alignleft .available-theme {
float: right float: right
} }
#templateside, .alignright { #templateside, .alignright {
float: left; float: left;
} }
#login, #send, .widefat th { #login, #send, .widefat th {
text-align: right text-align: right
} }
#postcustomsubmit, h2 small.quickjump, form#upload th, .submit, .editform th { #postcustomsubmit, form#upload th, .submit, .editform th {
text-align: left text-align: left
} }
body, td { body, td {
font: 13px Tahoma, "Lucida Grande", "Lucida Sans Unicode", Verdana; font: 13px Tahoma, "Lucida Grande", "Lucida Sans Unicode", Verdana;
} }
fieldset.options legend { fieldset.options legend {
font-family: Tahoma, Georgia, "Times New Roman", Times, serif; font-family: Tahoma, Georgia, "Times New Roman", Times, serif;
} }
textarea, input, select { textarea, input, select {
font: 13px Tahoma, Verdana, Arial, Helvetica, sans-serif; font: 13px Tahoma, Verdana, Arial, Helvetica, sans-serif;
} }
.quicktags, .search { .quicktags, .search {
font: 12px Tahoma, Georgia, "Times New Roman", Times, serif; font: 12px Tahoma, Georgia, "Times New Roman", Times, serif;
} }
.submit input, .submit input:focus, .button { .submit input, .submit input:focus, .button {
border-right-color: #ccc; border-right-color: #ccc;
} }
.submit input:active, .button:active { .submit input:active, .button:active {
border-right-color: #999; border-right-color: #999;
} }
.updated, .confirm { .updated, .confirm {
padding: 0 3em 0 1em; padding: 0 3em 0 1em;
} }
#adminmenu { #adminmenu {
padding: .2em 2em .3em .2em; padding: .2em 2em .3em .2em;
height: 30px; height: 30px;
} }
#adminmenu a { #adminmenu a {
margin: 0 0 0 10px; margin: 0 0 0 10px;
display: block; display: block;
float: right; float: right;
} }
#submenu { #submenu {
height: 21px; height: 21px;
padding: 3px 3em 0 2em; padding: 3px 3em 0 2em;
} }
#submenu .current { #submenu .current {
border-left: 2px solid #045290; border-left: 2px solid #045290;
} }
#submenu a { #submenu a {
padding: .3em .4em .33em .4em; padding: .3em .4em .33em .4em;
margin: 0 0 0 10px; margin: 0 0 0 10px;
display: block; display: block;
float: right; float: right;
} }
#submenu li { #submenu li {
line-height: 100%; line-height: 100%;
} }
#postdiv , #titlediv, #guiddiv { #postdiv , #titlediv, #guiddiv {
margin: 0 0 0 8px; margin: 0 0 0 8px;
} }
#currenttheme img { #currenttheme img {
float: right; float: right;
margin-right: auto; margin-right: auto;
margin-left: 1em; margin-left: 1em;
} }
#postdiv #quicktags { #postdiv #quicktags {
padding-right: auto; padding-right: auto;
padding-left: 6px; padding-left: 6px;
} }
#quicktags #ed_toolbar { #quicktags #ed_toolbar {
padding: 0px 0 0 2px; padding: 0px 0 0 2px;
} }
#ed_toolbar input { #ed_toolbar input {
margin: 3px 0 2px 2px; margin: 3px 0 2px 2px;
} }
* html #postexcerpt .dbx-toggle-open, * html #postexcerpt .dbx-toggle-open, #postexcerpt div, #attachmentlinks div { * html #postexcerpt .dbx-toggle-open, * html #postexcerpt .dbx-toggle-open, #postexcerpt div, #attachmentlinks div {
padding-right: auto; padding-right: auto;
padding-left: 8px; padding-left: 8px;
} }
#login h1 { #login h1 {
left: auto; left: auto;
right: 137px; right: 137px;
} }
#login h1 a { #login h1 a {
display: none; display: none;
} }
#searchform { #searchform {
float: right; float: right;
margin-right: auto; margin-right: auto;
margin-left: 3em; margin-left: 3em;
} }
#poststuff { #poststuff {
margin-right: auto; margin-right: auto;
margin-left: 16em; margin-left: 16em;
} }
#template div { #template div {
margin-right: auto; margin-right: auto;
margin-left: 190px; margin-left: 190px;
} }
* html #template div { * html #template div {
margin-right: auto; margin-right: auto;
margin-left: 0px; margin-left: 0px;
} }
#user_info { #user_info {
right: auto; right: auto;
left: 1em; left: 1em;
} }
#wphead { #wphead {
padding: .8em 2em .8em 19em; padding: .8em 2em .8em 19em;
} }
#wphead h1 { #wphead h1 {
font-size: 2.4em; font-size: 2.4em;
font-family: Tahoma, Georgia, "Times New Roman", Times, serif font-family: Tahoma, Georgia, "Times New Roman", Times, serif
} }
#zeitgeist { #zeitgeist {
float: left; float: left;
margin-left: auto; margin-left: auto;
margin-right: 1em; margin-right: 1em;
} }
#zeitgeist ul { #zeitgeist ul {
margin: 0 .6em .3em 0; margin: 0 .6em .3em 0;
padding: 0 .6em 0 0; padding: 0 .6em 0 0;
} }
#moremeta fieldset div { #moremeta fieldset div {
margin: 2px 0px 0 0; margin: 2px 0px 0 0;
} }
#moremeta { #moremeta {
margin-right: auto; margin-right: auto;
margin-left: 15px; margin-left: 15px;
right: auto; right: auto;
left: 5%; left: 5%;
} }
#categorydiv ul { #categorydiv ul {
margin-left: auto; margin-left: auto;
margin-right: 10px; margin-right: 10px;
} }
#your-profile legend { #your-profile legend {
font-family: Tahoma, Georgia, "Times New Roman", Times, serif; font-family: Tahoma, Georgia, "Times New Roman", Times, serif;
} }
#moremeta .dbx-content { #moremeta .dbx-content {
background: url(images/box-butt.gif) no-repeat bottom left; background: url(images/box-butt.gif) no-repeat bottom left;
padding-right: auto; padding-right: auto;
padding-left: 2px; padding-left: 2px;
} }
#moremeta .dbx-handle { #moremeta .dbx-handle {
background: #2685af url(images/box-head.gif) no-repeat left; background: #2685af url(images/box-head.gif) no-repeat left;
} }
#moremeta .dbx-box { #moremeta .dbx-box {
background: url(images/box-bg.gif) repeat-y left; background: url(images/box-bg.gif) repeat-y left;
} }
a.dbx-toggle, a.dbx-toggle:visited { a.dbx-toggle, a.dbx-toggle:visited {
right: auto; right: auto;
left: 2px; left: 2px;
} }
#advancedstuff a.dbx-toggle, #advancedstuff a.dbx-toggle-open:visited { #advancedstuff a.dbx-toggle, #advancedstuff a.dbx-toggle-open:visited {
right: auto; right: auto;
left: 5px; left: 5px;
} }
#advancedstuff a.dbx-toggle-open, #advancedstuff a.dbx-toggle-open:visited { #advancedstuff a.dbx-toggle-open, #advancedstuff a.dbx-toggle-open:visited {
right: auto; right: auto;
left: 5px; left: 5px;
} }
#categorychecklist { #categorychecklist {
margin-right: auto; margin-right: auto;
margin-left: 6px; margin-left: 6px;
} }
#ajax-response.alignleft { #ajax-response.alignleft {
margin-left: auto; margin-left: auto;
margin-right: 2em; margin-right: 2em;
} }
#postdivrich #edButtons { #postdivrich #edButtons {
padding-left: auto; padding-left: auto;
padding-right: 3px; padding-right: 3px;
} }
#edButtons input, #edButtons input:active { #edButtons input, #edButtons input:active {
margin: 0px 0 -1px 2px; margin: 0px 0 -1px 2px;
} }

View File

@ -93,7 +93,7 @@ default:
} }
?> ?>
</select> </select>
<input type="submit" name="Submit" value="<?php _e('Select &raquo;') ?>" /> <input type="submit" name="Submit" value="<?php _e('Select &raquo;') ?>" class="button" />
</form> </form>
</div> </div>

View File

@ -1,362 +1,358 @@
<?php <?php
function wp_upload_display( $dims = false, $href = '' ) { function wp_upload_display( $dims = false, $href = '' ) {
global $post; global $post;
$id = get_the_ID(); $id = get_the_ID();
$attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true ); $attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true );
if ( isset($attachment_data['width']) ) if ( isset($attachment_data['width']) )
list($width,$height) = wp_shrink_dimensions($attachment_data['width'], $attachment_data['height'], 171, 128); list($width,$height) = wp_shrink_dimensions($attachment_data['width'], $attachment_data['height'], 171, 128);
ob_start(); ob_start();
the_title(); the_title();
$post_title = wp_specialchars( ob_get_contents(), 1 ); $post_title = wp_specialchars( ob_get_contents(), 1 );
ob_end_clean(); ob_end_clean();
$post_content = apply_filters( 'content_edit_pre', $post->post_content ); $post_content = apply_filters( 'content_edit_pre', $post->post_content );
$class = 'text'; $class = 'text';
$thumb_src = ''; $innerHTML = get_attachment_innerHTML( $id, false, $dims );
$innerHTML = get_attachment_innerHTML( $id, false, $dims ); if ( $image_src = strstr($innerHTML, 'src="') ) {
if ( $image_src = strstr($innerHTML, 'src="') ) { $image_src = explode('"', $image_src);
$image_src = explode('"', $image_src); $image_src = $image_src[1];
$image_src = $image_src[1]; $class = 'image';
$thumb_src = wp_make_link_relative($image_src); $innerHTML = '&nbsp;' . $innerHTML;
$class = 'image'; }
$innerHTML = '&nbsp;' . str_replace($image_src, $thumb_src, $innerHTML);
} $r = '';
$src = wp_make_link_relative( get_the_guid() ); if ( $href )
$r .= "<a id='file-link-$id' href='$href' title='$post_title' class='file-link $class'>\n";
$r = ''; if ( $href || $image_src )
$r .= "\t\t\t$innerHTML";
if ( $href ) if ( $href )
$r .= "<a id='file-link-$id' href='$href' title='$post_title' class='file-link $class'>\n"; $r .= "</a>\n";
if ( $href || $image_src ) $r .= "\n\t\t<div class='upload-file-data'>\n\t\t\t<p>\n";
$r .= "\t\t\t$innerHTML"; $r .= "\t\t\t\t<input type='hidden' name='attachment-url-$id' id='attachment-url-$id' value='" . get_the_guid() . "' />\n";
if ( $href )
$r .= "</a>\n"; if ( $image_src )
$r .= "\n\t\t<div class='upload-file-data'>\n\t\t\t<p>\n"; $r .= "\t\t\t\t<input type='hidden' name='attachment-thumb-url-$id' id='attachment-thumb-url-$id' value='$image_src' />\n";
$r .= "\t\t\t\t<input type='hidden' name='attachment-url-$id' id='attachment-url-$id' value='$src' />\n"; if ( isset($width) ) {
$r .= "\t\t\t\t<input type='hidden' name='attachment-width-$id' id='attachment-width-$id' value='$width' />\n";
if ( $image_src ) $r .= "\t\t\t\t<input type='hidden' name='attachment-height-$id' id='attachment-height-$id' value='$height' />\n";
$r .= "\t\t\t\t<input type='hidden' name='attachment-thumb-url-$id' id='attachment-thumb-url-$id' value='$thumb_src' />\n"; }
if ( isset($width) ) { $r .= "\t\t\t\t<input type='hidden' name='attachment-page-url-$id' id='attachment-page-url-$id' value='" . get_attachment_link( $id ) . "' />\n";
$r .= "\t\t\t\t<input type='hidden' name='attachment-width-$id' id='attachment-width-$id' value='$width' />\n"; $r .= "\t\t\t\t<input type='hidden' name='attachment-title-$id' id='attachment-title-$id' value='$post_title' />\n";
$r .= "\t\t\t\t<input type='hidden' name='attachment-height-$id' id='attachment-height-$id' value='$height' />\n"; $r .= "\t\t\t\t<input type='hidden' name='attachment-description-$id' id='attachment-description-$id' value='$post_content' />\n";
} $r .= "\t\t\t</p>\n\t\t</div>\n";
$r .= "\t\t\t\t<input type='hidden' name='attachment-page-url-$id' id='attachment-page-url-$id' value='" . get_attachment_link( $id ) . "' />\n"; return $r;
$r .= "\t\t\t\t<input type='hidden' name='attachment-title-$id' id='attachment-title-$id' value='$post_title' />\n"; }
$r .= "\t\t\t\t<input type='hidden' name='attachment-description-$id' id='attachment-description-$id' value='$post_content' />\n";
$r .= "\t\t\t</p>\n\t\t</div>\n"; function wp_upload_view() {
return $r; global $style, $post_id;
} $id = get_the_ID();
$attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true );
function wp_upload_view() { ?>
global $style, $post_id; <div id="upload-file">
$id = get_the_ID(); <div id="file-title">
$attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true ); <h2><?php if ( !isset($attachment_data['width']) )
?> echo "<a href='" . get_the_guid() . "' title='" . __('Direct link to file') . "'>";
<div id="upload-file"> the_title();
<div id="file-title"> if ( !isset($attachment_data['width']) )
<h2><?php if ( !isset($attachment_data['width']) ) echo '</a>';
echo "<a href='" . get_the_guid() . "' title='" . __('Direct link to file') . "'>"; ?></h2>
the_title(); <span><?php
if ( !isset($attachment_data['width']) ) echo '[&nbsp;';
echo '</a>'; echo '<a href="' . get_permalink() . '">' . __('view') . '</a>';
?></h2> echo '&nbsp;|&nbsp;';
<span><?php echo '<a href="' . wp_specialchars( add_query_arg( 'action', 'edit' ), 1 ) . '" title="' . __('Edit this file') . '">' . __('edit') . '</a>';
echo '[&nbsp;'; echo '&nbsp;|&nbsp;';
echo '<a href="' . get_permalink() . '">' . __('view') . '</a>'; echo '<a href="' . wp_specialchars( remove_query_arg( array('action', 'ID') ), 1 ) . '" title="' . __('Browse your files') . '">' . __('cancel') . '</a>';
echo '&nbsp;|&nbsp;'; echo '&nbsp;]'; ?></span>
echo '<a href="' . wp_specialchars( add_query_arg( 'action', 'edit' ), 1 ) . '" title="' . __('Edit this file') . '">' . __('edit') . '</a>'; </div>
echo '&nbsp;|&nbsp;';
echo '<a href="' . wp_specialchars( remove_query_arg( array('action', 'ID') ), 1 ) . '" title="' . __('Browse your files') . '">' . __('cancel') . '</a>'; <div id="upload-file-view" class="alignleft">
echo '&nbsp;]'; ?></span> <?php if ( isset($attachment_data['width']) )
</div> echo "<a href='" . get_the_guid() . "' title='" . __('Direct link to file') . "'>";
echo wp_upload_display( array(171, 128) );
<div id="upload-file-view" class="alignleft"> if ( isset($attachment_data['width']) )
<?php if ( isset($attachment_data['width']) ) echo '</a>'; ?>
echo "<a href='" . get_the_guid() . "' title='" . __('Direct link to file') . "'>"; </div>
echo wp_upload_display( array(171, 128) ); <?php the_attachment_links( $id ); ?>
if ( isset($attachment_data['width']) ) </div>
echo '</a>'; ?> <?php
</div> }
<?php the_attachment_links( $id ); ?>
</div> function wp_upload_form() {
<?php $id = get_the_ID();
} global $post_id, $tab, $style;
$enctype = $id ? '' : ' enctype="multipart/form-data"';
function wp_upload_form() { ?>
$id = get_the_ID(); <form<?php echo $enctype; ?> id="upload-file" method="post" action="<?php echo get_option('siteurl') . "/wp-admin/upload.php?style=$style&amp;tab=upload&amp;post_id=$post_id"; ?>">
global $post_id, $tab, $style; <?php
$enctype = $id ? '' : ' enctype="multipart/form-data"'; if ( $id ) :
?> $attachment = get_post_to_edit( $id );
<form<?php echo $enctype; ?> id="upload-file" method="post" action="<?php echo get_option('siteurl') . "/wp-admin/upload.php?style=$style&amp;tab=upload&amp;post_id=$post_id"; ?>"> $attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true );
<?php ?>
if ( $id ) : <div id="file-title">
$attachment = get_post_to_edit( $id ); <h2><?php if ( !isset($attachment_data['width']) )
$attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true ); echo "<a href='" . get_the_guid() . "' title='" . __('Direct link to file') . "'>";
?> the_title();
<div id="file-title"> if ( !isset($attachment_data['width']) )
<h2><?php if ( !isset($attachment_data['width']) ) echo '</a>';
echo "<a href='" . get_the_guid() . "' title='" . __('Direct link to file') . "'>"; ?></h2>
the_title(); <span><?php
if ( !isset($attachment_data['width']) ) echo '[&nbsp;';
echo '</a>'; echo '<a href="' . get_permalink() . '">' . __('view') . '</a>';
?></h2> echo '&nbsp;|&nbsp;';
<span><?php echo '<a href="' . wp_specialchars( add_query_arg( 'action', 'view' ), 1 ) . '">' . __('links') . '</a>';
echo '[&nbsp;'; echo '&nbsp;|&nbsp;';
echo '<a href="' . get_permalink() . '">' . __('view') . '</a>'; echo '<a href="' . wp_specialchars( remove_query_arg( array('action','ID') ), 1 ) . '" title="' . __('Browse your files') . '">' . __('cancel') . '</a>';
echo '&nbsp;|&nbsp;'; echo '&nbsp;]'; ?></span>
echo '<a href="' . wp_specialchars( add_query_arg( 'action', 'view' ), 1 ) . '">' . __('links') . '</a>'; </div>
echo '&nbsp;|&nbsp;';
echo '<a href="' . wp_specialchars( remove_query_arg( array('action','ID') ), 1 ) . '" title="' . __('Browse your files') . '">' . __('cancel') . '</a>'; <div id="upload-file-view" class="alignleft">
echo '&nbsp;]'; ?></span> <?php if ( isset($attachment_data['width']) )
</div> echo "<a href='" . get_the_guid() . "' title='" . __('Direct link to file') . "'>";
echo wp_upload_display( array(171, 128) );
<div id="upload-file-view" class="alignleft"> if ( isset($attachment_data['width']) )
<?php if ( isset($attachment_data['width']) ) echo '</a>'; ?>
echo "<a href='" . get_the_guid() . "' title='" . __('Direct link to file') . "'>"; </div>
echo wp_upload_display( array(171, 128) ); <?php endif; ?>
if ( isset($attachment_data['width']) ) <table>
echo '</a>'; ?> <?php if ( !$id ): ?>
</div> <tr>
<?php endif; ?> <th scope="row"><label for="upload"><?php _e('File:'); ?></label></th>
<table> <td><input type="file" id="upload" name="image" /></td>
<?php if ( !$id ): ?> </tr>
<tr> <?php endif; ?>
<th scope="row"><label for="upload"><?php _e('File:'); ?></label></th> <tr>
<td><input type="file" id="upload" name="image" /></td> <th scope="row"><label for="post_title"><?php _e('Title:'); ?></label></th>
</tr> <td><input type="text" id="post_title" name="post_title" value="<?php echo $attachment->post_title; ?>" /></td>
<?php endif; ?> </tr>
<tr> <tr>
<th scope="row"><label for="post_title"><?php _e('Title:'); ?></label></th> <th scope="row"><label for="post_content"><?php _e('Description:'); ?></label></th>
<td><input type="text" id="post_title" name="post_title" value="<?php echo $attachment->post_title; ?>" /></td> <td><textarea name="post_content" id="post_content"><?php echo $attachment->post_content; ?></textarea></td>
</tr> </tr>
<tr> <tr id="buttons">
<th scope="row"><label for="post_content"><?php _e('Description:'); ?></label></th> <th></th>
<td><textarea name="post_content" id="post_content"><?php echo $attachment->post_content; ?></textarea></td> <td>
</tr> <input type="hidden" name="from_tab" value="<?php echo $tab; ?>" />
<tr id="buttons"> <input type="hidden" name="action" value="<?php echo $id ? 'save' : 'upload'; ?>" />
<th></th> <?php if ( $post_id ) : ?>
<td> <input type="hidden" name="post_id" value="<?php echo $post_id; ?>" />
<input type="hidden" name="from_tab" value="<?php echo $tab; ?>" /> <?php endif; if ( $id ) : ?>
<input type="hidden" name="action" value="<?php echo $id ? 'save' : 'upload'; ?>" /> <input type="hidden" name="ID" value="<?php echo $id; ?>" />
<?php if ( $post_id ) : ?> <?php endif; ?>
<input type="hidden" name="post_id" value="<?php echo $post_id; ?>" /> <?php wp_nonce_field( 'inlineuploading' ); ?>
<?php endif; if ( $id ) : ?> <div class="submit">
<input type="hidden" name="ID" value="<?php echo $id; ?>" /> <input type="submit" value="<?php $id ? _e('Save') : _e('Upload'); ?> &raquo;" />
<?php endif; ?> <?php if ( $id ) : ?>
<?php wp_nonce_field( 'inlineuploading' ); ?> <input type="submit" name="delete" class="delete" value="<?php _e('Delete'); ?>" />
<div class="submit"> <?php endif; ?>
<input type="submit" value="<?php $id ? _e('Save') : _e('Upload'); ?>" /> </div>
<?php if ( $id ) : ?> </td>
<input type="submit" name="delete" class="delete" value="<?php _e('Delete'); ?>" /> </tr>
<?php endif; ?> </table>
</div> </form>
</td> <?php
</tr> }
</table>
</form> function wp_upload_tab_upload() {
<?php wp_upload_form();
} }
function wp_upload_tab_upload() { function wp_upload_tab_upload_action() {
wp_upload_form(); global $action;
} if ( isset($_POST['delete']) )
$action = 'delete';
function wp_upload_tab_upload_action() {
global $action; switch ( $action ) :
if ( isset($_POST['delete']) ) case 'upload' :
$action = 'delete'; global $from_tab, $post_id, $style;
if ( !$from_tab )
switch ( $action ) : $from_tab = 'upload';
case 'upload' :
global $from_tab, $post_id, $style; check_admin_referer( 'inlineuploading' );
if ( !$from_tab )
$from_tab = 'upload'; global $post_id, $post_title, $post_content;
check_admin_referer( 'inlineuploading' ); if ( !current_user_can( 'upload_files' ) )
wp_die( __('You are not allowed to upload files.')
global $post_id, $post_title, $post_content; . " <a href='" . get_option('siteurl') . "/wp-admin/upload.php?style=$style&amp;tab=browse-all&amp;post_id=$post_id'>"
. __('Browse Files') . '</a>'
if ( !current_user_can( 'upload_files' ) ) );
wp_die( __('You are not allowed to upload files.')
. " <a href='" . get_option('siteurl') . "/wp-admin/upload.php?style=$style&amp;tab=browse-all&amp;post_id=$post_id'>" $overrides = array('action'=>'upload');
. __('Browse Files') . '</a>'
); $file = wp_handle_upload($_FILES['image'], $overrides);
$overrides = array('action'=>'upload'); if ( isset($file['error']) )
wp_die($file['error'] . "<br /><a href='" . get_option('siteurl')
$file = wp_handle_upload($_FILES['image'], $overrides); . "/wp-admin/upload.php?style=$style&amp;tab=$from_tab&amp;post_id=$post_id'>'" . __('Back to Image Uploading') . '</a>'
);
if ( isset($file['error']) )
wp_die($file['error'] . "<br /><a href='" . get_option('siteurl') $url = $file['url'];
. "/wp-admin/upload.php?style=$style&amp;tab=$from_tab&amp;post_id=$post_id'>'" . __('Back to Image Uploading') . '</a>' $type = $file['type'];
); $file = $file['file'];
$filename = basename($file);
$url = $file['url'];
$type = $file['type']; // Construct the attachment array
$file = $file['file']; $attachment = array(
$filename = basename($file); 'post_title' => $post_title ? $post_title : $filename,
'post_content' => $post_content,
// Construct the attachment array 'post_type' => 'attachment',
$attachment = array( 'post_parent' => $post_id,
'post_title' => $post_title ? $post_title : $filename, 'post_mime_type' => $type,
'post_content' => $post_content, 'guid' => $url
'post_type' => 'attachment', );
'post_parent' => $post_id,
'post_mime_type' => $type, // Save the data
'guid' => $url $id = wp_insert_attachment($attachment, $file, $post_id);
);
if ( preg_match('!^image/!', $attachment['post_mime_type']) ) {
// Save the data // Generate the attachment's postmeta.
$id = wp_insert_attachment($attachment, $file, $post_id); $imagesize = getimagesize($file);
$imagedata['width'] = $imagesize['0'];
if ( preg_match('!^image/!', $attachment['post_mime_type']) ) { $imagedata['height'] = $imagesize['1'];
// Generate the attachment's postmeta. list($uwidth, $uheight) = get_udims($imagedata['width'], $imagedata['height']);
$imagesize = getimagesize($file); $imagedata['hwstring_small'] = "height='$uheight' width='$uwidth'";
$imagedata['width'] = $imagesize['0']; $imagedata['file'] = $file;
$imagedata['height'] = $imagesize['1'];
list($uwidth, $uheight) = get_udims($imagedata['width'], $imagedata['height']); add_post_meta($id, '_wp_attachment_metadata', $imagedata);
$imagedata['hwstring_small'] = "height='$uheight' width='$uwidth'";
$imagedata['file'] = $file; if ( $imagedata['width'] * $imagedata['height'] < 3 * 1024 * 1024 ) {
if ( $imagedata['width'] > 128 && $imagedata['width'] >= $imagedata['height'] * 4 / 3 )
add_post_meta($id, '_wp_attachment_metadata', $imagedata); $thumb = wp_create_thumbnail($file, 128);
elseif ( $imagedata['height'] > 96 )
if ( $imagedata['width'] * $imagedata['height'] < 3 * 1024 * 1024 ) { $thumb = wp_create_thumbnail($file, 96);
if ( $imagedata['width'] > 128 && $imagedata['width'] >= $imagedata['height'] * 4 / 3 )
$thumb = wp_create_thumbnail($file, 128); if ( @file_exists($thumb) ) {
elseif ( $imagedata['height'] > 96 ) $newdata = $imagedata;
$thumb = wp_create_thumbnail($file, 96); $newdata['thumb'] = basename($thumb);
update_post_meta($id, '_wp_attachment_metadata', $newdata, $imagedata);
if ( @file_exists($thumb) ) { } else {
$newdata = $imagedata; $error = $thumb;
$newdata['thumb'] = basename($thumb); }
update_post_meta($id, '_wp_attachment_metadata', $newdata, $imagedata); }
} else { } else {
$error = $thumb; add_post_meta($id, '_wp_attachment_metadata', array());
} }
}
} else { wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=browse&action=view&ID=$id&post_id=$post_id");
add_post_meta($id, '_wp_attachment_metadata', array()); die;
} break;
wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=browse&action=view&ID=$id&post_id=$post_id"); case 'save' :
die; global $from_tab, $post_id, $style;
break; if ( !$from_tab )
$from_tab = 'upload';
case 'save' : check_admin_referer( 'inlineuploading' );
global $from_tab, $post_id, $style;
if ( !$from_tab ) wp_update_post($_POST);
$from_tab = 'upload'; wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=$from_tab&post_id=$post_id");
check_admin_referer( 'inlineuploading' ); die;
break;
wp_update_post($_POST);
wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=$from_tab&post_id=$post_id"); case 'delete' :
die; global $ID, $post_id, $from_tab, $style;
break; if ( !$from_tab )
$from_tab = 'upload';
case 'delete' :
global $ID, $post_id, $from_tab, $style; check_admin_referer( 'inlineuploading' );
if ( !$from_tab )
$from_tab = 'upload'; if ( !current_user_can('edit_post', (int) $ID) )
wp_die( __('You are not allowed to delete this attachment.')
check_admin_referer( 'inlineuploading' ); . " <a href='" . get_option('siteurl') . "/wp-admin/upload.php?style=$style&amp;tab=$from_tab&amp;post_id=$post_id'>"
. __('Go back') . '</a>'
if ( !current_user_can('edit_post', (int) $ID) ) );
wp_die( __('You are not allowed to delete this attachment.')
. " <a href='" . get_option('siteurl') . "/wp-admin/upload.php?style=$style&amp;tab=$from_tab&amp;post_id=$post_id'>" wp_delete_attachment($ID);
. __('Go back') . '</a>'
); wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=$from_tab&post_id=$post_id" );
die;
wp_delete_attachment($ID); break;
wp_redirect( get_option('siteurl') . "/wp-admin/upload.php?style=$style&tab=$from_tab&post_id=$post_id" ); endswitch;
die; }
break;
add_action( 'upload_files_upload', 'wp_upload_tab_upload_action' );
endswitch;
} function wp_upload_grab_attachments( $obj ) {
$obj->is_attachment = true;
add_action( 'upload_files_upload', 'wp_upload_tab_upload_action' ); }
function wp_upload_grab_attachments( $obj ) { function wp_upload_posts_where( $where ) {
$obj->is_attachment = true; global $post_id;
} return $where . " AND post_parent = '" . (int) $post_id . "'";
}
function wp_upload_posts_where( $where ) {
global $post_id; function wp_upload_tab_browse() {
return $where . " AND post_parent = '" . (int) $post_id . "'"; global $wpdb, $action, $paged;
} $old_vars = compact( 'paged' );
function wp_upload_tab_browse() { switch ( $action ) :
global $wpdb, $action, $paged; case 'edit' :
$old_vars = compact( 'paged' ); case 'view' :
global $ID;
switch ( $action ) : $attachments = query_posts("attachment_id=$ID");
case 'edit' : if ( have_posts() ) : while ( have_posts() ) : the_post();
case 'view' : 'edit' == $action ? wp_upload_form() : wp_upload_view();
global $ID; endwhile; endif;
$attachments = query_posts("attachment_id=$ID"); break;
if ( have_posts() ) : while ( have_posts() ) : the_post(); default :
'edit' == $action ? wp_upload_form() : wp_upload_view(); global $tab, $post_id, $style;
endwhile; endif; add_action( 'pre_get_posts', 'wp_upload_grab_attachments' );
break; if ( 'browse' == $tab && $post_id )
default : add_filter( 'posts_where', 'wp_upload_posts_where' );
global $tab, $post_id, $style; $attachments = query_posts("what_to_show=posts&posts_per_page=10&paged=$paged");
add_action( 'pre_get_posts', 'wp_upload_grab_attachments' ); $count_query = "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'attachment'";
if ( 'browse' == $tab && $post_id ) if ( $post_id )
add_filter( 'posts_where', 'wp_upload_posts_where' ); $count_query .= " AND post_parent = '$post_id'";
$attachments = query_posts("what_to_show=posts&posts_per_page=10&paged=$paged"); $total = $wpdb->get_var($count_query);
$count_query = "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'attachment'";
if ( $post_id ) echo "<ul id='upload-files'>\n";
$count_query .= " AND post_parent = '$post_id'"; if ( have_posts() ) : while ( have_posts() ) : the_post();
$total = $wpdb->get_var($count_query); $href = wp_specialchars( add_query_arg( array(
'action' => 'inline' == $style ? 'view' : 'edit',
echo "<ul id='upload-files'>\n"; 'ID' => get_the_ID())
if ( have_posts() ) : while ( have_posts() ) : the_post(); ), 1 );
$href = wp_specialchars( add_query_arg( array(
'action' => 'inline' == $style ? 'view' : 'edit', echo "\t<li id='file-";
'ID' => get_the_ID()) the_ID();
), 1 ); echo "' class='alignleft'>\n";
echo wp_upload_display( array(128,128), $href );
echo "\t<li id='file-"; echo "\t</li>\n";
the_ID(); endwhile;
echo "' class='alignleft'>\n"; else :
echo wp_upload_display( array(128,128), $href ); echo "\t<li>" . __('There are no attachments to show.') . "</li>\n";
echo "\t</li>\n"; endif;
endwhile; echo "</ul>\n\n";
else :
echo "\t<li>" . __('There are no attachments to show.') . "</li>\n"; echo "<form action='' id='browse-form'><input type='hidden' id='nonce-value' value='" . wp_create_nonce( 'inlineuploading' ) . "' /></form>\n";
endif; break;
echo "</ul>\n\n"; endswitch;
echo "<form action='' id='browse-form'><input type='hidden' id='nonce-value' value='" . wp_create_nonce( 'inlineuploading' ) . "' /></form>\n"; extract($old_vars);
break; }
endswitch;
extract($old_vars); function wp_upload_tab_browse_action() {
} global $style;
if ( 'inline' == $style )
wp_enqueue_script('upload');
function wp_upload_tab_browse_action() { }
global $style;
if ( 'inline' == $style ) add_action( 'upload_files_browse', 'wp_upload_tab_browse_action' );
wp_enqueue_script('upload'); add_action( 'upload_files_browse-all', 'wp_upload_tab_browse_action' );
}
function wp_upload_admin_head() {
add_action( 'upload_files_browse', 'wp_upload_tab_browse_action' ); global $wp_locale;
add_action( 'upload_files_browse-all', 'wp_upload_tab_browse_action' ); echo "<link rel='stylesheet' href='" . get_option('siteurl') . '/wp-admin/upload.css?version=' . get_bloginfo('version') . "' type='text/css' />\n";
if ( 'rtl' == $wp_locale->text_direction )
function wp_upload_admin_head() { echo "<link rel='stylesheet' href='" . get_option('siteurl') . '/wp-admin/upload-rtl.css?version=' . get_bloginfo('version') . "' type='text/css' />\n";
global $wp_locale; if ( 'inline' == @$_GET['style'] ) {
echo "<link rel='stylesheet' href='" . get_option('siteurl') . '/wp-admin/upload.css?version=' . get_bloginfo('version') . "' type='text/css' />\n"; echo "<style type='text/css'>\n";
if ( 'rtl' == $wp_locale->text_direction ) echo "\tbody { height: 14em; overflow: hidden; }\n";
echo "<link rel='stylesheet' href='" . get_option('siteurl') . '/wp-admin/upload-rtl.css?version=' . get_bloginfo('version') . "' type='text/css' />\n"; echo "\t#upload-content { overflow-y: auto; }\n";
if ( 'inline' == @$_GET['style'] ) { echo "\t#upload-file { position: absolute; }\n";
echo "<style type='text/css'>\n"; echo "</style>";
echo "\tbody { height: 14em; overflow: hidden; }\n"; }
echo "\t#upload-content { overflow-y: auto; }\n"; }
echo "\t#upload-file { position: absolute; }\n";
echo "</style>";
}
}

View File

@ -1,242 +1,239 @@
<?php require_once('admin.php'); cache_javascript_headers(); ?> <?php require_once('admin.php'); cache_javascript_headers(); ?>
addLoadEvent( function() { addLoadEvent( function() {
theFileList = { theFileList = {
currentImage: {ID: 0}, currentImage: {ID: 0},
nonce: '', nonce: '',
tab: '', tab: '',
postID: 0, postID: 0,
initializeVars: function() { initializeVars: function() {
this.urlData = document.location.href.split('?'); this.urlData = document.location.href.split('?');
this.params = this.urlData[1].toQueryParams(); this.params = this.urlData[1].toQueryParams();
this.postID = this.params['post_id']; this.postID = this.params['post_id'];
this.tab = this.params['tab']; this.tab = this.params['tab'];
this.style = this.params['style']; this.style = this.params['style'];
this.ID = this.params['ID']; this.ID = this.params['ID'];
if ( !this.style ) if ( !this.style )
this.style = 'default'; this.style = 'default';
var nonceEl = $('nonce-value'); var nonceEl = $('nonce-value');
if ( nonceEl ) if ( nonceEl )
this.nonce = nonceEl.value; this.nonce = nonceEl.value;
if ( this.ID ) { if ( this.ID ) {
this.grabImageData( this.ID ); this.grabImageData( this.ID );
this.imageView( this.ID ); this.imageView( this.ID );
} }
}, },
initializeLinks: function() { initializeLinks: function() {
if ( this.ID ) if ( this.ID )
return; return;
$$('a.file-link').each( function(i) { $$('a.file-link').each( function(i) {
var id = i.id.split('-').pop(); var id = i.id.split('-').pop();
i.onclick = function(e) { theFileList[ 'inline' == theFileList.style ? 'imageView' : 'editView' ](id, e); } i.onclick = function(e) { theFileList[ 'inline' == theFileList.style ? 'imageView' : 'editView' ](id, e); }
} ); } );
}, },
grabImageData: function(id) { grabImageData: function(id) {
if ( id == this.currentImage.ID ) if ( id == this.currentImage.ID )
return; return;
var thumbEl = $('attachment-thumb-url-' + id); var thumbEl = $('attachment-thumb-url-' + id);
if ( thumbEl ) if ( thumbEl )
this.currentImage.thumb = ( 0 == id ? '' : thumbEl.value ); this.currentImage.thumb = ( 0 == id ? '' : thumbEl.value );
else else
this.currentImage.thumb = false; this.currentImage.thumb = false;
this.currentImage.src = ( 0 == id ? '' : $('attachment-url-' + id).value ); this.currentImage.src = ( 0 == id ? '' : $('attachment-url-' + id).value );
this.currentImage.page = ( 0 == id ? '' : $('attachment-page-url-' + id).value ); this.currentImage.page = ( 0 == id ? '' : $('attachment-page-url-' + id).value );
this.currentImage.title = ( 0 == id ? '' : $('attachment-title-' + id).value ); this.currentImage.title = ( 0 == id ? '' : $('attachment-title-' + id).value );
this.currentImage.description = ( 0 == id ? '' : $('attachment-description-' + id).value ); this.currentImage.description = ( 0 == id ? '' : $('attachment-description-' + id).value );
var widthEl = $('attachment-width-' + id); var widthEl = $('attachment-width-' + id);
if ( widthEl ) { if ( widthEl ) {
this.currentImage.width = ( 0 == id ? '' : widthEl.value ); this.currentImage.width = ( 0 == id ? '' : widthEl.value );
this.currentImage.height = ( 0 == id ? '' : $('attachment-height-' + id).value ); this.currentImage.height = ( 0 == id ? '' : $('attachment-height-' + id).value );
} else { } else {
this.currentImage.width = false; this.currentImage.width = false;
this.currentImage.height = false; this.currentImage.height = false;
} }
this.currentImage.ID = id; this.currentImage.ID = id;
}, },
imageView: function(id, e) { imageView: function(id, e) {
this.prepView(id); this.prepView(id);
var h = ''; var h = '';
h += "<div id='upload-file'>" h += "<div id='upload-file'>"
h += "<div id='file-title'>" if ( this.ID ) {
if ( !this.currentImage.thumb ) var params = $H(this.params);
h += "<h2><a href='" + this.currentImage.src + "' title='Direct link to file'>" + this.currentImage.title + "</a></h2>"; params.ID = '';
else params.action = '';
h += "<h2>" + this.currentImage.title + "</h2>"; h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "' title='Browse your files' class='back'>&laquo; Back</a>";
h += "<span>[&nbsp;"; } else {
h += "<a href='#' onclick='theFileList.editView(" + id + ")'>edit</a>" h += "<a href='#' onclick='theFileList.cancelView()' title='Browse your files' class='back'>&laquo; Back</a>";
h += '&nbsp;|&nbsp;'; }
if ( this.ID ) { h += "<div id='file-title'>"
var params = $H(this.params); if ( !this.currentImage.thumb )
params.ID = ''; h += "<h2><a href='" + this.currentImage.src + "' title='Direct link to file'>" + this.currentImage.title + "</a></h2>";
params.action = ''; else
h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "' title='Browse your files'>cancel</a>"; h += "<h2>" + this.currentImage.title + "</h2>";
} else { h += " &#8212; <span>";
h += "<a href='#' onclick='theFileList.cancelView()' title='Browse your files'>cancel</a>"; h += "<a href='#' onclick='theFileList.editView(" + id + ")'>Edit</a>"
} h += "</span>";
h += "&nbsp;]</span>"; h += '</div>'
h += '</div>' h += "<div id='upload-file-view' class='alignleft'>";
h += "<div id='upload-file-view' class='alignleft'>"; if ( this.currentImage.thumb )
if ( this.currentImage.thumb ) h += "<a href='" + this.currentImage.src + "' title='Direct link to file'><img src='" + this.currentImage.thumb + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' /></a>";
h += "<a href='" + this.currentImage.src + "' title='Direct link to file'><img src='" + this.currentImage.thumb + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' /></a>"; else
else h += '&nbsp;';
h += '&nbsp;'; h += "</div>";
h += "</div>";
h += "<form name='uploadoptions' id='uploadoptions' class='alignleft'>";
h += "<form name='uploadoptions' id='uploadoptions' class='alignleft'>"; h += "<table>";
h += "<table>"; if ( this.currentImage.thumb ) {
if ( this.currentImage.thumb ) { h += "<tr><th style='padding-bottom:.5em'>Show:</th><td style='padding-bottom:.5em'>";
h += "<tr><th style='padding-bottom:.5em'>Show</th><td style='padding-bottom:.5em'>"; h += "<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' checked='checked' /> Thumbnail</label><br />";
h += "<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' checked='checked' /> thumbnail</label><br />"; h += "<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> Full size</label>";
h += "<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> full size</label>"; h += "</td></tr>";
h += "</td></tr>"; }
}
h += "<tr><th>Link to:</th><td>";
h += "<tr><th>Link</th><td>"; h += "<label for='link-file'><input type='radio' name='link' id='link-file' value='file' checked='checked'/> File</label><br />";
h += "<label for='link-file'><input type='radio' name='link' id='link-file' value='file' checked='checked'/> file</label><br />"; h += "<label for='link-page'><input type='radio' name='link' id='link-page' value='page' /> Page</label><br />";
h += "<label for='link-page'><input type='radio' name='link' id='link-page' value='page' /> page</label><br />"; h += "<label for='link-none'><input type='radio' name='link' id='link-none' value='none' /> None</label>";
h += "<label for='link-none'><input type='radio' name='link' id='link-none' value='none' /> none</label>"; h += "</td></tr>";
h += "</td></tr>";
h += "<tr><td colspan='2'><p class='submit'>";
h += "<tr><td colspan='2'>"; h += "<input type='button' class='button' name='send' onclick='theFileList.sendToEditor(" + id + ")' value='Send to editor &raquo;' />";
h += "<input type='button' class='button' name='send' onclick='theFileList.sendToEditor(" + id + ")' value='Send to editor &raquo;' />"; h += "</p></td></tr></table>";
h += "</td></tr></table>"; h += "</form>";
h += "</form>";
h += "</div>";
h += "</div>";
new Insertion.Top('upload-content', h);
new Insertion.Top('upload-content', h); if (e) Event.stop(e);
if (e) Event.stop(e); return false;
return false; },
},
editView: function(id, e) {
editView: function(id, e) { this.prepView(id);
this.prepView(id); var h = '';
var h = '';
var action = 'upload.php?style=' + this.style + '&amp;tab=upload';
var action = 'upload.php?style=' + this.style + '&amp;tab=upload'; if ( this.postID )
if ( this.postID ) action += '&amp;post_id=' + this.postID;
action += '&amp;post_id=' + this.postID; h += "<form id='upload-file' method='post' action='" + action + "'>";
h += "<form id='upload-file' method='post' action='" + action + "'>"; if ( this.ID ) {
h += "<div id='file-title'>" var params = $H(this.params);
if ( !this.currentImage.thumb ) params.ID = '';
h += "<h2><a href='" + this.currentImage.src + "' title='Direct link to file'>" + this.currentImage.title + "</a></h2>"; params.action = '';
else h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "' title='Browse your files' class='back'>&laquo; Back</a>";
h += "<h2>" + this.currentImage.title + "</h2>"; } else {
h += "<span>[&nbsp;"; h += "<a href='#' onclick='theFileList.cancelView()' title='Browse your files' class='back'>&laquo; Back</a>";
h += "<a href='#' onclick='theFileList.imageView(" + id + ")'>options</a>" }
h += '&nbsp;|&nbsp;'; h += "<div id='file-title'>"
if ( this.ID ) { if ( !this.currentImage.thumb )
var params = $H(this.params); h += "<h2><a href='" + this.currentImage.src + "' title='Direct link to file'>" + this.currentImage.title + "</a></h2>";
params.ID = ''; else
params.action = ''; h += "<h2>" + this.currentImage.title + "</h2>";
h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "' title='Browse your files'>cancel</a>"; h += " &#8212; <span>";
} else { h += "<a href='#' onclick='theFileList.imageView(" + id + ")'>Insert</a>"
h += "<a href='#' onclick='theFileList.cancelView()' title='Browse your files'>cancel</a>"; h += "</span>";
} h += '</div>'
h += "&nbsp;]</span>"; h += "<div id='upload-file-view' class='alignleft'>";
h += '</div>' if ( this.currentImage.thumb )
h += "<div id='upload-file-view' class='alignleft'>"; h += "<a href='" + this.currentImage.src + "' title='Direct link to file'><img src='" + this.currentImage.thumb + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' /></a>";
if ( this.currentImage.thumb ) else
h += "<a href='" + this.currentImage.src + "' title='Direct link to file'><img src='" + this.currentImage.thumb + "' alt='" + this.currentImage.title + "' width='" + this.currentImage.width + "' height='" + this.currentImage.height + "' /></a>"; h += '&nbsp;';
else h += "</div>";
h += '&nbsp;';
h += "</div>";
h += "<table><tr>"
h += "<th scope='row'><label for='post_title'>Title:</label></th>";
h += "<table><tr>" h += "<td><input type='text' id='post_title' name='post_title' value='" + this.currentImage.title + "' /></td>";
h += "<th scope='row'><label for='post_title'>Title:</label></th>"; h += "</tr><tr>";
h += "<td><input type='text' id='post_title' name='post_title' value='" + this.currentImage.title + "' /></td>"; h += "<th scope='row'><label for='post_content'>Description:</label></th>";
h += "</tr><tr>"; h += "<td><textarea name='post_content' id='post_content'>" + this.currentImage.description + "</textarea></td>";
h += "<th scope='row'><label for='post_content'>Description:</label></th>"; h += "</tr><tr id='buttons'><th><input type='button' name='delete' class='delete button' value='Delete' onclick='theFileList.deleteFile(" + id + ");' /></th><td>";
h += "<td><textarea name='post_content' id='post_content'>" + this.currentImage.description + "</textarea></td>"; h += "<input type='hidden' name='from_tab' value='" + this.tab + "' />";
h += "</tr><tr id='buttons'><th></th><td>"; h += "<input type='hidden' name='action' id='action-value' value='save' />";
h += "<input type='hidden' name='from_tab' value='" + this.tab + "' />"; h += "<input type='hidden' name='ID' value='" + id + "' />";
h += "<input type='hidden' name='action' id='action-value' value='save' />"; h += "<input type='hidden' name='_wpnonce' value='" + this.nonce + "' />";
h += "<input type='hidden' name='ID' value='" + id + "' />"; h += "<div class='submit'><input type='submit' value='Save &raquo;' />";
h += "<input type='hidden' name='_wpnonce' value='" + this.nonce + "' />"; h += "</div></td></tr></table></form>";
h += "<div class='submit'><input type='submit' value='Save' />";
h += "<input type='button' name='delete' class='delete' value='Delete' onclick='theFileList.deleteFile(" + id + ");' />"; new Insertion.Top('upload-content', h);
h += "</div></td></tr></table></form>"; if (e) Event.stop(e);
return false;
new Insertion.Top('upload-content', h); },
if (e) Event.stop(e);
return false; prepView: function(id) {
}, this.cancelView( true );
var filesEl = $('upload-files');
prepView: function(id) { if ( filesEl )
this.cancelView( true ); filesEl.hide();
var filesEl = $('upload-files'); var navEl = $('current-tab-nav');
if ( filesEl ) if ( navEl )
filesEl.hide(); navEl.hide();
var navEl = $('current-tab-nav'); this.grabImageData(id);
if ( navEl ) },
navEl.hide();
this.grabImageData(id); cancelView: function( prep ) {
}, if ( !prep ) {
var filesEl = $('upload-files');
cancelView: function( prep ) { if ( filesEl )
if ( !prep ) { filesEl.show();
var filesEl = $('upload-files'); var navEl = $('current-tab-nav');
if ( filesEl ) if ( navEl )
filesEl.show(); navEl.show();
var navEl = $('current-tab-nav'); }
if ( navEl ) if ( !this.ID )
navEl.show(); this.grabImageData(0);
} var div = $('upload-file');
if ( !this.ID ) if ( div )
this.grabImageData(0); div.remove();
var div = $('upload-file'); return false;
if ( div ) },
div.remove();
return false; sendToEditor: function(id) {
}, this.grabImageData(id);
var link = '';
sendToEditor: function(id) { var display = '';
this.grabImageData(id); var h = '';
var link = '';
var display = ''; link = $A(document.forms.uploadoptions.elements.link).detect( function(i) { return i.checked; } ).value;
var h = ''; displayEl = $A(document.forms.uploadoptions.elements.display).detect( function(i) { return i.checked; } )
if ( displayEl )
link = $A(document.forms.uploadoptions.elements.link).detect( function(i) { return i.checked; } ).value; display = displayEl.value;
displayEl = $A(document.forms.uploadoptions.elements.display).detect( function(i) { return i.checked; } )
if ( displayEl ) if ( 'none' != link )
display = displayEl.value; h += "<a href='" + ( 'file' == link ? this.currentImage.src : this.currentImage.page ) + "' title='" + this.currentImage.title + "'>";
if ( display )
if ( 'none' != link ) h += "<img src='" + ( 'thumb' == display ? this.currentImage.thumb : this.currentImage.src ) + "' alt='" + this.currentImage.title + "' />";
h += "<a href='" + ( 'file' == link ? this.currentImage.src : this.currentImage.page ) + "' title='" + this.currentImage.title + "'>"; else
if ( display ) h += this.currentImage.title;
h += "<img src='" + ( 'thumb' == display ? this.currentImage.thumb : this.currentImage.src ) + "' alt='" + this.currentImage.title + "' />"; if ( 'none' != link )
else h += "</a>";
h += this.currentImage.title;
if ( 'none' != link ) var win = window.opener ? window.opener : window.dialogArguments;
h += "</a>"; if ( !win )
win = top;
var win = window.opener ? window.opener : window.dialogArguments; tinyMCE = win.tinyMCE;
if ( !win ) if ( typeof tinyMCE != 'undefined' && tinyMCE.getInstanceById('content') )
win = top; win.tinyMCE.execCommand('mceInsertContent', false, h);
tinyMCE = win.tinyMCE; else
if ( typeof tinyMCE != 'undefined' && tinyMCE.getInstanceById('content') ) win.edInsertContent(win.edCanvas, h);
win.tinyMCE.execCommand('mceInsertContent', false, h); this.cancelView();
else return false;
win.edInsertContent(win.edCanvas, h); },
this.cancelView();
return false; deleteFile: function(id) {
}, if ( confirm("Are you sure you want to delete the file '" + this.currentImage.title + "'?\nClick ok to delete or cancel to go back.") ) {
$('action-value').value = 'delete';
deleteFile: function(id) { $('upload-file').submit();
if ( confirm("Are you sure you want to delete the file '" + this.currentImage.title + "'?\nClick ok to delete or cancel to go back.") ) { return true;
$('action-value').value = 'delete'; }
$('upload-file').submit(); return false;
return true; }
}
return false; };
} theFileList.initializeVars();
theFileList.initializeLinks();
}; } );
theFileList.initializeVars();
theFileList.initializeLinks();
} );

View File

@ -1,137 +1,175 @@
body { background: #dfe8f1; } body { background: #f9fcfe; }
.upload-file-data { display: none; } .upload-file-data { display: none; }
#upload-menu { #upload-menu {
background: #fff; background: #247fab;
margin: 0px; margin: 0px;
padding: 0; padding: 0;
list-style: none; list-style: none;
height: 2em; height: 2em;
border-bottom: 1px solid #448abd; border-bottom: 1px solid #448abd;
width: 100%; width: 100%;
} }
#upload-menu li { margin: 0 0 0 .75em; } #upload-menu li { margin: 0 0 0 .75em; }
#upload-menu li div { #upload-menu li div {
color: #000; padding: 5px;
padding: 5px; border-top: 3px solid #247fab;
border-top: 3px solid #fff; }
}
#upload-menu li a {
#upload-menu li a { text-decoration: none;
color: #000; border-bottom: none;
text-decoration: none; color: #fff;
border-bottom: none; }
}
#upload-menu li span a.page-numbers { color: #00019b; }
#upload-menu li span a.page-numbers { color: #00019b; }
#upload-menu .current div {
#upload-menu .current div { background: #f9fcfe;
background: #dfe8f1; border-right: 2px solid #448abd;
border-right: 2px solid #448abd; color: #000;
} }
#upload-menu div:hover { #upload-menu .current div a, #upload-menu div:hover a {
background: #dfe8f1; color: #000;
color: #000; }
}
#upload-menu div:hover {
#upload-content { background: #f9fcfe;
position: relative; color: #000;
clear: both; }
margin: 0;
padding: 0; #upload-content {
border: none; position: relative;
width: 100%; clear: both;
height: 100%; margin: 0;
background: none; padding: 0;
} border: none;
width: 100%;
#upload-file { height: 100%;
position: relative; background: none;
margin: 0; }
top: 0;
left: 0; #upload-file {
width: 100%; margin: 0 auto;
height: 100%; top: 0;
background: #dfe8f1; left: 0;
} width: 45em;
height: 100%;
form#upload-file input, form#upload-file textarea, div#upload-content.upload table { width: 100%; } background: #f9fcfe;
}
form#upload-file div.submit input { width: auto; } #upload-file th {
width: 8em;
#upload-file-view { padding: 0 0 0 15px; } }
#file-title { form#upload-file input, form#upload-file textarea, div#upload-content.upload table { width: 100%; }
margin: 0 0 .2em 15px;
padding: 0; form#upload-file div.submit input { width: auto; }
display: block;
} #upload-file-view { padding: 0 0 0 75px; }
h2 { #file-title {
margin: 0 .2em 0 0; margin: 0 0 .2em 75px;
padding: 0; padding: 0;
display: inline; display: block;
border: none; font-family: Georgia, "Times New Roman", Times, serif;
color: #000; font-size: 16px;
font-weight: bold; }
font-size: 1.4em;
line-height: 1.4em; h2 {
} margin: 0 .2em 0 0;
padding: 0;
#upload-files { display: inline;
list-style-type: none; border: none;
margin: 0; color: #000;
padding: 15px 0 0; font-size: 1.4em;
} line-height: 1.4em;
}
#upload-files li { margin: 0 0 15px 15px; }
.back {
#upload-files a, #upload-file-view a, a.file-link { display: block;
border: none; position: absolute;
text-decoration: none; left: 14px;
} top: 10px;
}
#upload-file-view a img { padding-bottom: .2em; border-bottom: 1px solid #6699CC; }
#upload-files {
#upload-files a.file-link { list-style-type: none;
display: block; margin: 0;
width: 130px; padding: 15px 0 0;
height: 128px; }
background-color: rgb(209, 226, 239);
text-align: center; #upload-files li { margin: 0 0 15px 15px; }
overflow-y: hidden;
} #upload-files a, #upload-file-view a, a.file-link {
border: none;
#upload-files a.file-link.image { text-decoration: none;
line-height: 128px; }
font-size: 2px;
letter-spacing: 0; #upload-file-view a img { padding-bottom: .2em; border-bottom: 1px solid #6699CC; }
}
#upload-files a.file-link {
#upload-files a.file-link img { vertical-align: middle; } display: block;
width: 130px;
#the-attachment-links { float: right; } height: 128px;
background-color: rgb(209, 226, 239);
#the-attachment-links textarea { text-align: center;
font-size: 10px; overflow: hidden;
overflow: hidden; }
}
#upload-files a.text {
form table { float: none; padding: 0 15px; } padding-top: 40px;
height: 88px;
table { font-size: 16px;
float: left; }
margin: 0;
padding: 0; #upload-files a.file-link.image {
} line-height: 128px;
font-size: 2px;
th { text-align: right; vertical-align: text-top; } letter-spacing: 0;
}
tr, td, th {
margin-top: 0; #upload-files a.file-link img { vertical-align: middle; }
padding-top: 0;
} #the-attachment-links { float: right; }
#the-attachment-links textarea {
font-size: 10px;
overflow: hidden;
}
form table { float: none; padding: 0 15px; }
table {
float: left;
margin: 0;
padding: 0;
}
th { text-align: right; vertical-align: text-top; }
tr, td, th {
margin-top: 0;
padding-top: 0;
}
#uploadoptions th {
width: 80px;
}
#uploadoptions p {
margin: 0;
padding: 0;
}
#uploadoptions td {
padding-left: 1em;
line-height: 140%;
}
#uploadoptions table {
width: 300px;
}

View File

@ -71,6 +71,7 @@ function addLoadEvent(func) {if ( typeof wpOnload!='function'){wpOnload=func;}el
else : else :
add_action( 'admin_head', 'wp_upload_admin_head' ); add_action( 'admin_head', 'wp_upload_admin_head' );
include_once('admin-header.php'); include_once('admin-header.php');
echo "<div class='wrap'>";
endif; endif;
echo "<ul id='upload-menu'>\n"; echo "<ul id='upload-menu'>\n";
@ -116,6 +117,7 @@ call_user_func( $wp_upload_tabs[$tab][2] );
echo "</div>\n"; echo "</div>\n";
if ( 'inline' != $style ) : if ( 'inline' != $style ) :
echo "<div class='clear'></div></div>";
include_once('admin-footer.php'); include_once('admin-footer.php');
else : ?> else : ?>
<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script> <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>

View File

@ -64,8 +64,6 @@ class WP_User_Search {
} }
$this->query_from_where = "FROM $wpdb->users WHERE 1=1 $search_sql"; $this->query_from_where = "FROM $wpdb->users WHERE 1=1 $search_sql";
if ( !$_GET['update'] && !$this->search_term && !$this->raw_page && $wpdb->get_var("SELECT COUNT(ID) FROM $wpdb->users") > $this->users_per_page )
$this->too_many_total_users = sprintf(__('Because this blog has more than %s users, they cannot all be shown on one page. Use the paging or search functionality in order to find the user you want to edit.'), $this->users_per_page);
} }
function query() { function query() {
@ -326,12 +324,6 @@ default:
</div> </div>
<?php endif; ?> <?php endif; ?>
<?php if ( $wp_user_search->too_many_total_users ) : ?>
<div id="message" class="updated">
<p><?php echo $wp_user_search->too_many_total_users; ?></p>
</div>
<?php endif; ?>
<div class="wrap"> <div class="wrap">
<?php if ( $wp_user_search->is_search() ) : ?> <?php if ( $wp_user_search->is_search() ) : ?>
@ -341,7 +333,7 @@ default:
<?php endif; ?> <?php endif; ?>
<form action="" method="get" name="search" id="search"> <form action="" method="get" name="search" id="search">
<p><input type="text" name="usersearch" id="usersearch" value="<?php echo wp_specialchars($wp_user_search->search_term, 1); ?>" /> <input type="submit" value="<?php _e('Search for users &raquo;'); ?>" /></p> <p><input type="text" name="usersearch" id="usersearch" value="<?php echo wp_specialchars($wp_user_search->search_term, 1); ?>" /> <input type="submit" value="<?php _e('Search users &raquo;'); ?>" class="button" /></p>
</form> </form>
<?php if ( is_wp_error( $wp_user_search->search_errors ) ) : ?> <?php if ( is_wp_error( $wp_user_search->search_errors ) ) : ?>
@ -362,10 +354,14 @@ default:
<p><a href="users.php"><?php _e('&laquo; Back to All Users'); ?></a></p> <p><a href="users.php"><?php _e('&laquo; Back to All Users'); ?></a></p>
<?php endif; ?> <?php endif; ?>
<h3><?php printf(__('%1$s &#8211; %2$s of %3$s shown below'), $wp_user_search->first_user + 1, min($wp_user_search->first_user + $wp_user_search->users_per_page, $wp_user_search->total_users_for_query), $wp_user_search->total_users_for_query); ?></h3> <h3><?php
if ( 0 == $wp_user_search->first_user && $wp_user_search->total_users_for_query <= 50 )
printf(__('%3$s shown below'), $wp_user_search->first_user + 1, min($wp_user_search->first_user + $wp_user_search->users_per_page, $wp_user_search->total_users_for_query), $wp_user_search->total_users_for_query);
else
printf(__('%1$s &#8211; %2$s of %3$s shown below'), $wp_user_search->first_user + 1, min($wp_user_search->first_user + $wp_user_search->users_per_page, $wp_user_search->total_users_for_query), $wp_user_search->total_users_for_query); ?></h3>
<?php if ( $wp_user_search->results_are_paged() ) : ?> <?php if ( $wp_user_search->results_are_paged() ) : ?>
<div class="user-paging-text"><?php $wp_user_search->page_links(); ?></p></div> <div class="user-paging-text"><p><?php $wp_user_search->page_links(); ?></p></div>
<?php endif; ?> <?php endif; ?>
<form action="" method="post" name="updateusers" id="updateusers"> <form action="" method="post" name="updateusers" id="updateusers">
@ -405,7 +401,7 @@ foreach ( (array) $roleclass as $user_object ) {
</table> </table>
<?php if ( $wp_user_search->results_are_paged() ) : ?> <?php if ( $wp_user_search->results_are_paged() ) : ?>
<div class="user-paging-text"><?php $wp_user_search->page_links(); ?></div> <div class="user-paging-text"><p><?php $wp_user_search->page_links(); ?></p></div>
<?php endif; ?> <?php endif; ?>
<h3><?php _e('Update Selected'); ?></h3> <h3><?php _e('Update Selected'); ?></h3>
@ -436,6 +432,7 @@ foreach ( (array) $roleclass as $user_object ) {
<div class="wrap"> <div class="wrap">
<h2 id="add-new-user"><?php _e('Add New User') ?></h2> <h2 id="add-new-user"><?php _e('Add New User') ?></h2>
<div class="narrow">
<?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_option('siteurl').'/wp-register.php').'</p>'; ?> <?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_option('siteurl').'/wp-register.php').'</p>'; ?>
<form action="#add-new-user" method="post" name="adduser" id="adduser"> <form action="#add-new-user" method="post" name="adduser" id="adduser">
<?php wp_nonce_field('add-user') ?> <?php wp_nonce_field('add-user') ?>
@ -486,6 +483,7 @@ foreach ( (array) $roleclass as $user_object ) {
<?php echo $referer; ?> <?php echo $referer; ?>
<input name="adduser" type="submit" id="addusersub" value="<?php _e('Add User &raquo;') ?>" /> <input name="adduser" type="submit" id="addusersub" value="<?php _e('Add User &raquo;') ?>" />
</p> </p>
</div>
</form> </form>
<?php if ( is_wp_error( $add_user_errors ) ) : ?> <?php if ( is_wp_error( $add_user_errors ) ) : ?>

View File

@ -20,6 +20,12 @@ a.delete:hover {
color: #fff; color: #fff;
} }
#devnews h4 {
font-family: Georgia, "Times New Roman", Times, serif;
font-size: 18px;
font-weight: normal;
}
#planetnews ul { #planetnews ul {
list-style: none; list-style: none;
margin: 0; margin: 0;
@ -40,6 +46,23 @@ a.delete:hover {
overflow: hidden; overflow: hidden;
} }
#planetnews li .post {
font-family: Georgia, "Times New Roman", Times, serif;
font-size: 18px;
display: block;
height: 60px;
}
#planetnews .hidden {
display: none;
}
.readmore {
clear: both;
text-align: right;
margin-right: 5em;
}
.widefat { .widefat {
width: 100%; width: 100%;
} }
@ -52,6 +75,15 @@ a.delete:hover {
text-align: left; text-align: left;
} }
.plugins p {
margin: 4px;
padding: 0;
}
.plugins .name {
font-size: 16px;
}
.import-system { .import-system {
font-size: 16px; font-size: 16px;
} }
@ -61,9 +93,9 @@ thead, .thead {
} }
#import-upload-form { #import-upload-form {
width: 300px;
margin: auto; margin: auto;
text-align: center; background: #eee;
padding: 1em;
} }
a.edit, a.delete, a.edit:hover, a.delete:hover { a.edit, a.delete, a.edit:hover, a.delete:hover {
@ -133,25 +165,12 @@ form, label input {
} }
h2 { h2 {
border-bottom: .5em solid #f0f8ff; border-bottom: .5em solid #e5f3ff;
color: #333; color: #333;
font: normal 30px/5px serif; font: normal 32px/5px serif;
margin: 5px 10px; margin: 5px 10px;
} }
h2 small.quickjump {
display: block;
text-align: right;
}
h2 small.quickjump a {
text-decoration: none;
border-bottom: 0;
font-size: 15px;
background: #f0f8ff;
padding: 5px 10px;
}
img, #footer a { img, #footer a {
border: 0; border: 0;
} }
@ -170,7 +189,7 @@ li, dd {
} }
p, li, dl, dd, dt { p, li, dl, dd, dt {
line-height: 130%; line-height: 140%;
} }
textarea, input, select { textarea, input, select {
@ -306,7 +325,7 @@ form#upload #post_content {
font: 12px Georgia, "Times New Roman", Times, serif; font: 12px Georgia, "Times New Roman", Times, serif;
} }
.submit input, .submit input:focus, .button { .submit input, .submit input:focus, .button, .button:focus {
background: url( images/fade-butt.png ); background: url( images/fade-butt.png );
border: 3px double #999; border: 3px double #999;
border-left-color: #ccc; border-left-color: #ccc;
@ -322,6 +341,14 @@ form#upload #post_content {
border-top-color: #999; border-top-color: #999;
} }
.button, .button:focus {
padding: 0.15em;
}
* html .button {
padding: 0;
}
.submit, .editform th, #postcustomsubmit { .submit, .editform th, #postcustomsubmit {
text-align: right; text-align: right;
} }
@ -388,14 +415,27 @@ form#upload #post_content {
border: 1px solid #ccc; border: 1px solid #ccc;
clear: both; clear: both;
margin: 15px 5%; margin: 15px 5%;
padding: .5em 1em; padding: 1em;
}
.narrow {
width: 450px;
margin: auto;
}
.narrow p {
line-height: 150%;
} }
.wrap h2 { .wrap h2 {
margin: .8em 0 .5em; margin: .4em 0 .5em;
clear: both; clear: both;
} }
* html .wrap h2 {
margin-top: 1em;
}
table .vers { table .vers {
text-align: center; text-align: center;
} }
@ -411,6 +451,7 @@ textarea.all-options, input.all-options {
padding: .2em .2em .3em 2em; padding: .2em .2em .3em 2em;
} }
#adminmenu .current, #submenu .current { #adminmenu .current, #submenu .current {
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
@ -422,7 +463,6 @@ textarea.all-options, input.all-options {
font-weight: normal; font-weight: normal;
margin: 0; margin: 0;
padding: 3px 5px; padding: 3px 5px;
text-decoration: underline;
border-bottom: none; border-bottom: none;
} }
@ -438,11 +478,24 @@ textarea.all-options, input.all-options {
text-align: center; text-align: center;
} }
#submenu { #adminmenu a.current {
background: #0d324f;
border-right: 2px solid #4f96c8;
border-top: 1px solid #96c0de;
color: #fff;
padding-bottom: 8px;
}
#submenu, #minisub {
background: #0d324f; background: #0d324f;
border-bottom: none; border-bottom: none;
margin: 0; margin: 0;
padding: 3px 2em 0 3em; padding: 3px 2em 0 3em;
height: 25px;
}
#minisub {
height: 6px;
} }
#submenu .current { #submenu .current {
@ -456,7 +509,7 @@ textarea.all-options, input.all-options {
border: none; border: none;
color: #fff; color: #fff;
font-size: 12px; font-size: 12px;
padding: .3em .4em .33em; padding: .3em .4em .4em;
} }
#submenu a:hover { #submenu a:hover {
@ -465,7 +518,7 @@ textarea.all-options, input.all-options {
} }
#submenu li { #submenu li {
line-height: 170%; line-height: 180%;
} }
@ -493,6 +546,11 @@ textarea.all-options, input.all-options {
width: 100%; width: 100%;
} }
#postdivrich #content {
padding: .7em;
line-height: 140%;
}
#titlediv input, #guiddiv input { #titlediv input, #guiddiv input {
margin: 0px; margin: 0px;
width: 100%; width: 100%;
@ -563,7 +621,8 @@ input.delete:hover {
} }
#title { #title {
font-size: 1.5em; font-size: 1.7em;
padding: 4px;
} }
#postexcerpt div, #attachmentlinks div { #postexcerpt div, #attachmentlinks div {
@ -589,6 +648,23 @@ input.delete:hover {
#footer { #footer {
clear: both; clear: both;
text-align: center; text-align: center;
width: 500px;
margin: auto;
height: 100px;
}
#footer .docs {
padding-top: 19px;
line-height: 160%;
}
#footer .docs a {
text-decoration: underline;
}
#footer .logo {
float: left;
margin: 0;
padding: 0;
} }
#login { #login {
@ -698,6 +774,8 @@ input.delete:hover {
margin: 0; margin: 0;
font-size: 15px; font-size: 15px;
} }
.plugins p {
}
#login .fullwidth { #login .fullwidth {
width: 320px; width: 320px;
@ -705,13 +783,13 @@ input.delete:hover {
#searchform { #searchform {
float: left; float: left;
margin-right: 3em; margin-right: 1em;
width: 16em; width: 18em;
} }
#viewarc { #viewarc {
float: left; float: left;
width: 20em; width: 23em;
margin-bottom: 1em; margin-bottom: 1em;
} }
@ -763,6 +841,7 @@ input.delete:hover {
#templateside { #templateside {
float: right; float: right;
width: 170px; width: 170px;
overflow: hidden;
} }
#templateside h3, #postcustom p.submit { #templateside h3, #postcustom p.submit {
@ -812,7 +891,7 @@ input.delete:hover {
#zeitgeist { #zeitgeist {
background: #eee; background: #eee;
border: 1px solid #69c; border: 1px solid #c5c5c5;
float: right; float: right;
font-size: 90%; font-size: 90%;
margin-bottom: .5em; margin-bottom: .5em;
@ -826,6 +905,10 @@ input.delete:hover {
border-bottom: none; border-bottom: none;
} }
* html #zeitgeist h2 {
padding-top: 10px;
}
#zeitgeist h2 { #zeitgeist h2 {
margin-top: .4em; margin-top: .4em;
} }
@ -1216,3 +1299,22 @@ input #catadd {
background: #fff url( images/fade-butt.png ) repeat-x 0px 15px; background: #fff url( images/fade-butt.png ) repeat-x 0px 15px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.page-numbers {
padding: 4px 7px;
border: 1px solid #fff;
margin-right: 3px;
}
a.page-numbers {
border: 1px solid #ccc;
}
a.page-numbers:hover {
border: 1px solid #999;
}
.page-numbers.current {
border: 1px solid #999;
font-weight: bold;
}

View File

@ -24,11 +24,9 @@
/* You can extend this CSS by adding your own CSS file with the the content_css option */ /* You can extend this CSS by adding your own CSS file with the the content_css option */
body { body {
font-family: Verdana, Arial, Helvetica, sans-serif; background: #fff;
font-size: 0.9em; font: 1em/1.3em Georgia, "Times New Roman", Times, serif;
line-height: 1.2em; padding: .5em;
padding: .3em;
background-color: #FFFFFF;
} }
td { td {