WordPress.org

Make WordPress Core

Changeset 4349


Ignore:
Timestamp:
10/06/2006 01:14:47 AM (12 years ago)
Author:
matt
Message:

Some UI cleanups, changes, and various miscellany.

Location:
trunk
Files:
27 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin-footer.php

    r4345 r4349  
    11
    22<div id="footer">
    3     <p><a href="http://wordpress.org/" id="wordpress-logo"><img src="images/wordpress-logo.png" alt="WordPress" /></a></p>
    4     <p>
    5         <?php _e('<a href="http://codex.wordpress.org/">Documentation</a>'); ?> &#8212; <?php _e('<a href="http://wordpress.org/support/">Support Forums</a>'); ?> <br />
    6         <?php bloginfo('version'); ?> &#8212; <?php printf(__('%s seconds'), timer_stop(0, 2)); ?>
    7     </p>
     3<p class="logo"><a href="http://wordpress.org/" id="wordpress-logo"><img src="images/wordpress-logo.png" alt="WordPress" /></a></p>
     4<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 />
     5<?php bloginfo('version'); ?> &#8212; <?php printf(__('%s seconds'), timer_stop(0, 2)); ?></p>
    86</div>
    97<?php do_action('admin_footer', ''); ?>
    108<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
    11 
    129</body>
    1310</html>
  • trunk/wp-admin/admin.php

    r4202 r4349  
    8383    include(ABSPATH . "wp-admin/import/$importer.php");
    8484
    85     $parent_file = 'import.php';
     85    $parent_file = 'edit.php';
     86    $submenu_file = 'import.php';
    8687    $title = __('Import');
    8788
  • trunk/wp-admin/edit-form-advanced.php

    r4311 r4349  
    1515
    1616<div class="wrap">
    17 <h2 id="write-post"><?php _e('Write Post'); ?><?php if ( 0 != $post_ID ) : ?>
    18  <small class="quickjump"><a href="#preview-post"><?php _e('preview &darr;'); ?></a></small><?php endif; ?></h2>
    1917<?php
    2018
  • trunk/wp-admin/edit.php

    r4321 r4349  
    7878  <legend><?php _e('Search Posts&hellip;') ?></legend>
    7979  <input type="text" name="s" value="<?php if (isset($s)) echo wp_specialchars($s, 1); ?>" size="17" />
    80   <input type="submit" name="submit" value="<?php _e('Search') ?>" />
     80  <input type="submit" name="submit" value="<?php _e('Search') ?>" class="button" />
    8181  </fieldset>
    8282</form>
     
    107107    ?>
    108108    </select>
    109         <input type="submit" name="submit" value="<?php _e('Show Month') ?>" />
     109        <input type="submit" name="submit" value="<?php _e('Show Month') ?>" class="button" />
    110110    </fieldset>
    111111</form>
     
    117117    <legend><?php _e('Browse Category&hellip;') ?></legend>
    118118    <?php wp_dropdown_categories('show_option_all='.__('All').'&hide_empty=1&hierarchical=1&show_count=1&selected='.$cat);?>
    119     <input type="submit" name="submit" value="<?php _e('Show Category') ?>" />
     119    <input type="submit" name="submit" value="<?php _e('Show Category') ?>" class="button" />
    120120    </fieldset>
    121121</form>
  • trunk/wp-admin/export.php

    r4144 r4349  
    1212<div class="wrap">
    1313<h2><?php _e('Export'); ?></h2>
    14 <p><?php _e('This will allow you to download an export of your WordPress posts and comments in a XML format.'); ?></p>
    15 <p>We need some more text here. Maybe talking about the export file or how to save it.</p>
     14<div class="narrow">
     15<p><?php _e('When you click the button below WordPress will create a XML file for you to save to your computer.'); ?></p>
     16<p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, comments, custom fields, and categories.'); ?></p>
    1617<form action="" method="get">
    1718<p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?> &raquo;" />
     
    1920</p>
    2021</form>
     22</div>
    2123</div>
    2224
  • trunk/wp-admin/import/blogware.php

    r4165 r4349  
    2323   
    2424    function greet() {
     25        echo '<div class="narrow">';
    2526        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>';
    2627        wp_import_upload_form("admin.php?import=blogware&amp;step=1");
     28        echo '</div>';
    2729    }
    2830
  • trunk/wp-admin/import/dotclear.php

    r4264 r4349  
    144144    function greet()
    145145    {
    146         echo '<p>'.__('Howdy! This importer allows you to extract posts from a Dotclear database into your blog.  Mileage may vary.').'</p>';
     146        echo '<div class="narrow"><p>'.__('Howdy! This importer allows you to extract posts from a Dotclear database into your blog.  Mileage may vary.').'</p>';
    147147        echo '<p>'.__('Your Dotclear Configuration settings are as follows:').'</p>';
    148148        echo '<form action="admin.php?import=dotclear&amp;step=1" method="post">';
    149149        $this->db_form();
    150         echo '<input type="submit" name="submit" value="'.__('Import Categories').'" />';
    151         echo '</form>';
     150        echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Categories').' &raquo;" /></p>';
     151        echo '</form></div>';
    152152    }
    153153
     
    646646    function db_form()
    647647    {
    648         echo '<ul>';
    649         printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" id="dbuser" /></li>', __('Dotclear Database User:'));
    650         printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" id="dbpass" /></li>', __('Dotclear Database Password:'));
    651         printf('<li><label for="dbname">%s</label> <input type="text" name="dbname" id="dbname" /></li>', __('Dotclear Database Name:'));
    652         printf('<li><label for="dbhost">%s</label> <input type="text" name="dbhost" nameid="dbhost" value="localhost" /></li>', __('Dotclear Database Host:'));
    653         printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" id="dbprefix" value="dc_"/></li>', __('Dotclear Table prefix:'));
    654         printf('<li><label for="dccharset">%s</label> <input type="text" name="dccharset" id="dccharset" value="ISO-8859-15"/></li>', __('Originating character set:'));
    655         echo '</ul>';
     648        echo '<table class="editform">';
     649        printf('<tr><th><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('Dotclear Database User:'));
     650        printf('<tr><th><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('Dotclear Database Password:'));
     651        printf('<tr><th><label for="dbname">%s</label></th><td><input type="text" name="dbname" id="dbname" /></td></tr>', __('Dotclear Database Name:'));
     652        printf('<tr><th><label for="dbhost">%s</label></th><td><input type="text" name="dbhost" nameid="dbhost" value="localhost" /></td></tr>', __('Dotclear Database Host:'));
     653        printf('<tr><th><label for="dbprefix">%s</label></th><td><input type="text" name="dbprefix" id="dbprefix" value="dc_"/></td></tr>', __('Dotclear Table prefix:'));
     654        printf('<tr><th><label for="dccharset">%s</label></th><td><input type="text" name="dccharset" id="dccharset" value="ISO-8859-15"/></td></tr>', __('Originating character set:'));
     655        echo '</table>';
    656656    }
    657657
  • trunk/wp-admin/import/livejournal.php

    r4165 r4349  
    2121
    2222    function greet() {
     23        echo '<div class="narrow">';
    2324        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>';
    2425        wp_import_upload_form("admin.php?import=livejournal&amp;step=1");
     26        echo '</div>';
    2527    }
    2628
  • trunk/wp-admin/import/mt.php

    r4165 r4349  
    2222        $this->header();
    2323?>
     24<div class="narrow">
    2425<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>
    2526<?php wp_import_upload_form( add_query_arg('step', 1) ); ?>
    2627    <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>
     28</div>
    2729<?php
    2830        $this->footer();
  • trunk/wp-admin/import/rss.php

    r4165 r4349  
    2222
    2323    function greet() {
     24        echo '<div class="narrow">';
    2425        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>';
    2526        wp_import_upload_form("admin.php?import=rss&amp;step=1");
     27        echo '</div>';
    2628    }
    2729
  • trunk/wp-admin/import/textpattern.php

    r4264 r4349  
    5151    }
    5252
    53     function greet()
    54     {
     53    function greet() {
     54        echo '<div class="narrow">';
    5555        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>';
    5656        echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>';
    5757        echo '<form action="admin.php?import=textpattern&amp;step=1" method="post">';
    5858        $this->db_form();
    59         echo '<input type="submit" name="submit" value="'.__('Import Categories').'" />';
     59        echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Categories').' &raquo;" /></p>';
    6060        echo '</form>';
     61        echo '</div>';
    6162    }
    6263
     
    569570    function db_form()
    570571    {
    571         echo '<ul>';
    572         printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" id="dbuser" /></li>', __('Textpattern Database User:'));
    573         printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" id="dbpass" /></li>', __('Textpattern Database Password:'));
    574         printf('<li><label for="dbname">%s</label> <input type="text" id="dbname" name="dbname" /></li>', __('Textpattern Database Name:'));
    575         printf('<li><label for="dbhost">%s</label> <input type="text" id="dbhost" name="dbhost" value="localhost" /></li>', __('Textpattern Database Host:'));
    576         printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" id="dbprefix"  /></li>', __('Textpattern Table prefix (if any):'));
    577         echo '</ul>';
     572        echo '<table class="editform">';
     573        printf('<tr><th scope="row"><label for="dbuser">%s</label></th><td><input type="text" name="dbuser" id="dbuser" /></td></tr>', __('Textpattern Database User:'));
     574        printf('<tr><th scope="row"><label for="dbpass">%s</label></th><td><input type="password" name="dbpass" id="dbpass" /></td></tr>', __('Textpattern Database Password:'));
     575        printf('<tr><th scope="row"><label for="dbname">%s</label></th><td><input type="text" id="dbname" name="dbname" /></td></tr>', __('Textpattern Database Name:'));
     576        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:'));
     577        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):'));
     578        echo '</table>';
    578579    }
    579580
  • trunk/wp-admin/import/wordpress.php

    r4165 r4349  
    2626
    2727    function greet() {
     28        echo '<div class="narrow">';
    2829        echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts and comments into this blog.').'</p>';
    2930        wp_import_upload_form("admin.php?import=wordpress&amp;step=1");
     31        echo '</div>';
    3032    }
    3133
  • trunk/wp-admin/index.php

    r4295 r4349  
    133133if ( isset($rss->items) && 0 != count($rss->items) ) {
    134134?>
    135 <h3><?php _e('WordPress Development News'); ?></h3>
     135<div id="devnews">
     136<h3><?php _e('WordPress Development Blog'); ?></h3>
    136137<?php
    137138$rss->items = array_slice($rss->items, 0, 3);
     
    144145}
    145146?>
    146 
     147</div>
    147148
    148149<?php
     
    151152?>
    152153<div id="planetnews">
    153 <h3><?php _e('Other WordPress News'); ?> <a href="http://planet.wordpress.org/"><?php _e('more'); ?> &raquo;</a></h3>
     154<h3><?php _e('Other WordPress News'); ?></h3>
    154155<ul>
    155156<?php
    156157$rss->items = array_slice($rss->items, 0, 20);
    157158foreach ($rss->items as $item ) {
     159$title = wp_specialchars($item['title']);
     160$author = preg_replace( '|(.+?):.+|s', '$1', $item['title'] );
     161$post = preg_replace( '|.+?:(.+)|s', '$1', $item['title'] );
    158162?>
    159 <li><a href='<?php echo wp_filter_kses($item['link']); ?>'><?php echo wp_specialchars($item['title']); ?></a></li>
     163<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>
    160164<?php
    161165    }
    162166?>
    163167</ul>
     168<p class="readmore"><a href="http://planet.wordpress.org/"><?php _e('Read more'); ?> &raquo;</a></p>
    164169</div>
    165170<?php
  • trunk/wp-admin/menu-header.php

    r4202 r4349  
    5454</ul>
    5555<?php
     56else :
     57?>
     58<div id="minisub"></div>
     59<?php
    5660
    5761endif;
  • trunk/wp-admin/page.php

    r4317 r4349  
    5757    ?>
    5858    <div id='preview' class='wrap'>
    59     <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>
     59    <h2 id="preview-post"><?php _e('Page Preview (updated when page is saved)'); ?></h2>
    6060        <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>
    6161    </div>
  • trunk/wp-admin/plugins.php

    r4325 r4349  
    7979} else {
    8080?>
    81 <table class="widefat">
     81<table class="widefat plugins">
    8282    <thead>
    8383    <tr>
     
    113113        <td class='name'>{$plugin_data['Title']}</td>
    114114        <td class='vers'>{$plugin_data['Version']}</td>
    115         <td class='desc'>{$plugin_data['Description']} <cite>".sprintf(__('By %s'), $plugin_data['Author']).".</cite></td>
     115        <td class='desc'><p>{$plugin_data['Description']} <cite>".sprintf(__('By %s'), $plugin_data['Author']).".</cite></p></td>
    116116        <td class='togl'>$toggle</td>";
    117117        if ( current_user_can('edit_plugins') )
     
    131131
    132132<h2><?php _e('Get More Plugins'); ?></h2>
    133 <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>
     133<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>
     134<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>
    134135
    135136</div>
  • trunk/wp-admin/post.php

    r4317 r4349  
    6363    ?>
    6464    <div id='preview' class='wrap'>
    65     <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>
     65    <h2 id="preview-post"><?php _e('Post Preview (updated when post is saved)'); ?></h2>
    6666        <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>
    6767    </div>
  • trunk/wp-admin/profile.php

    r4196 r4349  
    3535
    3636<?php do_action('profile_personal_options'); ?>
     37
     38<p class="submit"><input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" /></p>
    3739
    3840<fieldset>
     
    139141    ?>
    140142  </table>
    141 <p class="submit">
    142 <input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" />
    143 </p>
     143<p class="submit"><input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" /></p>
    144144</form>
    145145
  • trunk/wp-admin/rtl.css

    r4258 r4349  
    1111}
    1212
    13 #postcustomsubmit, h2 small.quickjump, form#upload th, .submit, .editform th {
     13#postcustomsubmit, form#upload th, .submit, .editform th {
    1414    text-align: left
    1515}
  • trunk/wp-admin/theme-editor.php

    r4268 r4349  
    9494?>
    9595 </select>
    96  <input type="submit" name="Submit" value="<?php _e('Select &raquo;') ?>" />
     96 <input type="submit" name="Submit" value="<?php _e('Select &raquo;') ?>" class="button" />
    9797 </form>
    9898 </div>
  • trunk/wp-admin/upload-functions.php

    r4348 r4349  
    1313   
    1414    $class = 'text';
    15     $thumb_src = '';
    1615    $innerHTML = get_attachment_innerHTML( $id, false, $dims );
    1716    if ( $image_src = strstr($innerHTML, 'src="') ) {
    1817        $image_src = explode('"', $image_src);
    1918        $image_src = $image_src[1];
    20         $thumb_src = wp_make_link_relative($image_src);
    2119        $class = 'image';
    22         $innerHTML = '&nbsp;' . str_replace($image_src, $thumb_src, $innerHTML);
     20        $innerHTML = '&nbsp;' . $innerHTML;
    2321    }
    24 
    25     $src = wp_make_link_relative( get_the_guid() );
    2622
    2723    $r = '';
     
    3430        $r .= "</a>\n";
    3531    $r .= "\n\t\t<div class='upload-file-data'>\n\t\t\t<p>\n";
    36     $r .= "\t\t\t\t<input type='hidden' name='attachment-url-$id' id='attachment-url-$id' value='$src' />\n";
     32    $r .= "\t\t\t\t<input type='hidden' name='attachment-url-$id' id='attachment-url-$id' value='" . get_the_guid() . "' />\n";
    3733
    3834    if ( $image_src )
    39         $r .= "\t\t\t\t<input type='hidden' name='attachment-thumb-url-$id' id='attachment-thumb-url-$id' value='$thumb_src' />\n";
     35        $r .= "\t\t\t\t<input type='hidden' name='attachment-thumb-url-$id' id='attachment-thumb-url-$id' value='$image_src' />\n";
    4036    if ( isset($width) ) {
    4137        $r .= "\t\t\t\t<input type='hidden' name='attachment-width-$id' id='attachment-width-$id' value='$width' />\n";
     
    147143                    <?php wp_nonce_field( 'inlineuploading' ); ?>
    148144                    <div class="submit">
    149                         <input type="submit" value="<?php $id ? _e('Save') : _e('Upload'); ?>" />
     145                        <input type="submit" value="<?php $id ? _e('Save') : _e('Upload'); ?> &raquo;" />
    150146<?php   if ( $id ) : ?>
    151147                        <input type="submit" name="delete" class="delete" value="<?php _e('Delete'); ?>" />
  • trunk/wp-admin/upload-js.php

    r4340 r4349  
    6262
    6363            h += "<div id='upload-file'>"
    64             h += "<div id='file-title'>"
    65             if ( !this.currentImage.thumb )
    66                 h += "<h2><a href='" + this.currentImage.src + "' title='Direct link to file'>" + this.currentImage.title + "</a></h2>";
    67             else
    68                 h += "<h2>" + this.currentImage.title + "</h2>";
    69             h += "<span>[&nbsp;";
    70             h += "<a href='#' onclick='theFileList.editView(" + id + ")'>edit</a>"
    71             h += '&nbsp;|&nbsp;';
    7264            if ( this.ID ) {
    7365                var params = $H(this.params);
    7466                params.ID = '';
    7567                params.action = '';
    76                 h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "'  title='Browse your files'>cancel</a>";
     68                h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "'  title='Browse your files' class='back'>&laquo; Back</a>";
    7769            } else {
    78                 h += "<a href='#' onclick='theFileList.cancelView()'  title='Browse your files'>cancel</a>";
    79             }
    80             h += "&nbsp;]</span>";
     70                h += "<a href='#' onclick='theFileList.cancelView()'  title='Browse your files' class='back'>&laquo; Back</a>";
     71            }
     72            h += "<div id='file-title'>"
     73            if ( !this.currentImage.thumb )
     74                h += "<h2><a href='" + this.currentImage.src + "' title='Direct link to file'>" + this.currentImage.title + "</a></h2>";
     75            else
     76                h += "<h2>" + this.currentImage.title + "</h2>";
     77            h += " &#8212; <span>";
     78            h += "<a href='#' onclick='theFileList.editView(" + id + ")'>Edit</a>"
     79            h += "</span>";
    8180            h += '</div>'
    8281            h += "<div id='upload-file-view' class='alignleft'>";
     
    9089            h += "<table>";
    9190            if ( this.currentImage.thumb ) {
    92                 h += "<tr><th style='padding-bottom:.5em'>Show</th><td style='padding-bottom:.5em'>";
    93                 h += "<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' checked='checked' /> thumbnail</label><br />";
    94                 h += "<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> full size</label>";
     91                h += "<tr><th style='padding-bottom:.5em'>Show:</th><td style='padding-bottom:.5em'>";
     92                h += "<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' checked='checked' /> Thumbnail</label><br />";
     93                h += "<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> Full size</label>";
    9594                h += "</td></tr>";
    9695            }
    9796
    98             h += "<tr><th>Link</th><td>";
    99             h += "<label for='link-file'><input type='radio' name='link' id='link-file' value='file' checked='checked'/> file</label><br />";
    100             h += "<label for='link-page'><input type='radio' name='link' id='link-page' value='page' /> page</label><br />";
    101             h += "<label for='link-none'><input type='radio' name='link' id='link-none' value='none' /> none</label>";
     97            h += "<tr><th>Link to:</th><td>";
     98            h += "<label for='link-file'><input type='radio' name='link' id='link-file' value='file' checked='checked'/> File</label><br />";
     99            h += "<label for='link-page'><input type='radio' name='link' id='link-page' value='page' /> Page</label><br />";
     100            h += "<label for='link-none'><input type='radio' name='link' id='link-none' value='none' /> None</label>";
    102101            h += "</td></tr>";
    103102
    104             h += "<tr><td colspan='2'>";
     103            h += "<tr><td colspan='2'><p class='submit'>";
    105104            h += "<input type='button' class='button' name='send' onclick='theFileList.sendToEditor(" + id + ")' value='Send to editor &raquo;' />";
    106             h += "</td></tr></table>";
     105            h += "</p></td></tr></table>";
    107106            h += "</form>";
    108107
     
    122121                action += '&amp;post_id=' + this.postID;
    123122            h += "<form id='upload-file' method='post' action='" + action + "'>";
    124             h += "<div id='file-title'>"
    125             if ( !this.currentImage.thumb )
    126                 h += "<h2><a href='" + this.currentImage.src + "' title='Direct link to file'>" + this.currentImage.title + "</a></h2>";
    127             else
    128                 h += "<h2>" + this.currentImage.title + "</h2>";
    129             h += "<span>[&nbsp;";
    130             h += "<a href='#' onclick='theFileList.imageView(" + id + ")'>options</a>"
    131             h += '&nbsp;|&nbsp;';
    132123            if ( this.ID ) {
    133124                var params = $H(this.params);
    134125                params.ID = '';
    135126                params.action = '';
    136                 h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "'  title='Browse your files'>cancel</a>";
     127                h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "'  title='Browse your files' class='back'>&laquo; Back</a>";
    137128            } else {
    138                 h += "<a href='#' onclick='theFileList.cancelView()'  title='Browse your files'>cancel</a>";
    139             }
    140             h += "&nbsp;]</span>";
     129                h += "<a href='#' onclick='theFileList.cancelView()'  title='Browse your files' class='back'>&laquo; Back</a>";
     130            }
     131            h += "<div id='file-title'>"
     132            if ( !this.currentImage.thumb )
     133                h += "<h2><a href='" + this.currentImage.src + "' title='Direct link to file'>" + this.currentImage.title + "</a></h2>";
     134            else
     135                h += "<h2>" + this.currentImage.title + "</h2>";
     136            h += " &#8212; <span>";
     137            h += "<a href='#' onclick='theFileList.imageView(" + id + ")'>Insert</a>"
     138            h += "</span>";
    141139            h += '</div>'
    142140            h += "<div id='upload-file-view' class='alignleft'>";
     
    154152            h += "<th scope='row'><label for='post_content'>Description:</label></th>";
    155153            h += "<td><textarea name='post_content' id='post_content'>" + this.currentImage.description + "</textarea></td>";
    156             h += "</tr><tr id='buttons'><th></th><td>";
     154            h += "</tr><tr id='buttons'><th><input type='button' name='delete' class='delete button' value='Delete' onclick='theFileList.deleteFile(" + id + ");' /></th><td>";
    157155            h += "<input type='hidden' name='from_tab' value='" + this.tab + "' />";
    158156            h += "<input type='hidden' name='action' id='action-value' value='save' />";
    159157            h += "<input type='hidden' name='ID' value='" + id + "' />";
    160158            h += "<input type='hidden' name='_wpnonce' value='" + this.nonce + "' />";
    161             h += "<div class='submit'><input type='submit' value='Save' />";
    162             h += "<input type='button' name='delete' class='delete' value='Delete' onclick='theFileList.deleteFile(" + id + ");' />";
     159            h += "<div class='submit'><input type='submit' value='Save &raquo;' />";
    163160            h += "</div></td></tr></table></form>";
    164161
  • trunk/wp-admin/upload.css

    r4340 r4349  
    1 body { background: #dfe8f1; }
     1body { background: #f9fcfe; }
    22
    33.upload-file-data { display: none; }
    44
    55#upload-menu {
    6     background: #fff;
     6    background: #247fab;
    77    margin: 0px;
    88    padding: 0;
     
    1616
    1717#upload-menu li div {
    18     color: #000;
    1918    padding: 5px;
    20     border-top: 3px solid #fff;
     19    border-top: 3px solid #247fab;
    2120}
    2221
    2322#upload-menu li a {
    24     color: #000;
    2523    text-decoration: none;
    2624    border-bottom: none;
     25    color: #fff;
    2726}
    2827
     
    3029
    3130#upload-menu .current div {
    32     background: #dfe8f1;
     31    background: #f9fcfe;
    3332    border-right: 2px solid #448abd;
     33    color: #000;
     34}
     35
     36#upload-menu .current div a, #upload-menu div:hover a {
     37    color: #000;
    3438}
    3539
    3640#upload-menu div:hover {
    37     background: #dfe8f1;
     41    background: #f9fcfe;
    3842    color: #000;
    3943}
     
    5155
    5256#upload-file {
    53     position: relative;
    54     margin: 0;
     57    margin: 0 auto;
    5558    top: 0;
    5659    left: 0;
    57     width: 100%;
     60    width: 45em;
    5861    height: 100%;
    59     background: #dfe8f1;
     62    background: #f9fcfe;
     63}
     64#upload-file th {
     65    width: 8em;
    6066}
    6167
     
    6470form#upload-file div.submit input { width: auto; }
    6571
    66 #upload-file-view { padding: 0 0 0 15px; }
     72#upload-file-view { padding: 0 0 0 75px; }
    6773
    6874#file-title {
    69     margin: 0 0 .2em 15px;
     75    margin: 0 0 .2em 75px;
    7076    padding: 0;
    7177    display: block;
     78    font-family: Georgia, "Times New Roman", Times, serif;
     79    font-size: 16px;
    7280}
    7381
     
    7886    border: none;
    7987    color: #000;
    80     font-weight: bold;
    8188    font-size: 1.4em;
    8289    line-height: 1.4em;
     90}
     91
     92.back {
     93    display: block;
     94    position: absolute;
     95    left: 14px;
     96    top: 10px;
    8397}
    8498
     
    104118    background-color: rgb(209, 226, 239);
    105119    text-align: center;
    106     overflow-y: hidden;
     120    overflow: hidden;
     121}
     122
     123#upload-files a.text {
     124    padding-top: 40px;
     125    height: 88px;
     126    font-size: 16px;
    107127}
    108128
     
    136156    padding-top: 0;
    137157}
     158
     159#uploadoptions th {
     160    width: 80px;
     161}
     162
     163#uploadoptions p {
     164    margin: 0;
     165    padding: 0;
     166}
     167
     168#uploadoptions td {
     169    padding-left: 1em;
     170    line-height: 140%;
     171}
     172
     173#uploadoptions table {
     174    width: 300px;
     175}
  • trunk/wp-admin/upload.php

    r4340 r4349  
    7272    add_action( 'admin_head', 'wp_upload_admin_head' );
    7373    include_once('admin-header.php');
     74    echo "<div class='wrap'>";
    7475endif;
    7576
     
    117118
    118119if ( 'inline' != $style ) :
     120    echo "<div class='clear'></div></div>";
    119121    include_once('admin-footer.php');
    120122else : ?>
  • trunk/wp-admin/users.php

    r4289 r4349  
    6565        $this->query_from_where = "FROM $wpdb->users WHERE 1=1 $search_sql";
    6666
    67         if ( !$_GET['update'] && !$this->search_term && !$this->raw_page && $wpdb->get_var("SELECT COUNT(ID) FROM $wpdb->users") > $this->users_per_page )
    68             $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);
    6967    }
    7068
     
    327325<?php endif; ?>
    328326
    329 <?php if ( $wp_user_search->too_many_total_users ) : ?>
    330     <div id="message" class="updated">
    331         <p><?php echo $wp_user_search->too_many_total_users; ?></p>
    332     </div>
    333 <?php endif; ?>
    334 
    335327<div class="wrap">
    336328
     
    342334
    343335    <form action="" method="get" name="search" id="search">
    344         <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>
     336        <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>
    345337    </form>
    346338
     
    363355    <?php endif; ?>
    364356
    365     <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>
     357    <h3><?php
     358    if ( 0 == $wp_user_search->first_user && $wp_user_search->total_users_for_query <= 50 )
     359        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);
     360    else
     361        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>
    366362
    367363    <?php if ( $wp_user_search->results_are_paged() ) : ?>
    368         <div class="user-paging-text"><?php $wp_user_search->page_links(); ?></p></div>
     364        <div class="user-paging-text"><p><?php $wp_user_search->page_links(); ?></p></div>
    369365    <?php endif; ?>
    370366
     
    406402
    407403<?php if ( $wp_user_search->results_are_paged() ) : ?>
    408     <div class="user-paging-text"><?php $wp_user_search->page_links(); ?></div>
     404    <div class="user-paging-text"><p><?php $wp_user_search->page_links(); ?></p></div>
    409405<?php endif; ?>
    410406
     
    437433<div class="wrap">
    438434<h2 id="add-new-user"><?php _e('Add New User') ?></h2>
     435<div class="narrow">
    439436<?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>'; ?>
    440437<form action="#add-new-user" method="post" name="adduser" id="adduser">
     
    487484    <input name="adduser" type="submit" id="addusersub" value="<?php _e('Add User &raquo;') ?>" />
    488485</p>
     486</div>
    489487</form>
    490488
  • trunk/wp-admin/wp-admin.css

    r4339 r4349  
    1919    background: #c00;
    2020    color: #fff;
     21}
     22
     23#devnews h4 {
     24    font-family: Georgia, "Times New Roman", Times, serif;
     25    font-size: 18px;
     26    font-weight: normal;
    2127}
    2228
     
    4147}
    4248
     49#planetnews li .post {
     50    font-family: Georgia, "Times New Roman", Times, serif;
     51    font-size: 18px;
     52    display: block;
     53    height: 60px;
     54}
     55
     56#planetnews .hidden {
     57    display: none;
     58}
     59
     60.readmore {
     61    clear: both;
     62    text-align: right;
     63    margin-right: 5em;
     64}
     65
    4366.widefat {
    4467    width: 100%;
     
    5376}
    5477
     78.plugins p {
     79    margin: 4px;
     80    padding: 0;
     81}
     82
     83.plugins .name {
     84    font-size: 16px;
     85}
     86
    5587.import-system {
    5688    font-size: 16px;
     
    6294
    6395#import-upload-form {
    64     width: 300px;
    6596    margin: auto;
    66     text-align: center;
     97    background: #eee;
     98    padding: 1em;
    6799}
    68100
     
    134166
    135167h2 {
    136     border-bottom: .5em solid #f0f8ff;
     168    border-bottom: .5em solid #e5f3ff;
    137169    color: #333;
    138     font: normal 30px/5px serif;
     170    font: normal 32px/5px serif;
    139171    margin: 5px 10px;
    140 }
    141 
    142 h2 small.quickjump {
    143     display: block;
    144     text-align: right;
    145 }
    146 
    147 h2 small.quickjump a {
    148     text-decoration: none;
    149     border-bottom: 0;
    150     font-size: 15px;
    151     background: #f0f8ff;
    152     padding: 5px 10px;
    153172}
    154173
     
    171190
    172191p, li, dl, dd, dt {
    173     line-height: 130%;
     192    line-height: 140%;
    174193}
    175194
     
    307326}
    308327
    309 .submit input, .submit input:focus, .button {
     328.submit input, .submit input:focus, .button, .button:focus {
    310329    background: url( images/fade-butt.png );
    311330    border: 3px double #999;
     
    323342}
    324343
     344.button, .button:focus {
     345    padding: 0.15em;
     346}
     347
     348* html .button {
     349    padding: 0;
     350}
     351
    325352.submit, .editform th, #postcustomsubmit {
    326353    text-align: right;
     
    389416    clear: both;
    390417    margin: 15px 5%;
    391     padding: .5em 1em;
     418    padding: 1em;
     419}
     420
     421.narrow {
     422    width: 450px;
     423    margin: auto;
     424}
     425
     426.narrow p {
     427    line-height: 150%;
    392428}
    393429
    394430.wrap h2 {
    395     margin: .8em 0 .5em;
     431    margin: .4em 0 .5em;
    396432    clear: both;
     433}
     434
     435* html .wrap h2 {
     436    margin-top: 1em;
    397437}
    398438
     
    411451    padding: .2em .2em .3em 2em;
    412452}
     453
    413454
    414455#adminmenu .current, #submenu .current {
     
    423464    margin: 0;
    424465    padding: 3px 5px;
    425     text-decoration: underline;
    426466    border-bottom: none;
    427467}
     
    439479}
    440480
    441 #submenu {
     481#adminmenu a.current {
     482    background: #0d324f;
     483    border-right: 2px solid #4f96c8;
     484    border-top: 1px solid #96c0de;
     485    color: #fff;
     486    padding-bottom: 8px;
     487}
     488
     489#submenu, #minisub {
    442490    background: #0d324f;
    443491    border-bottom: none;
    444492    margin: 0;
    445493    padding: 3px 2em 0 3em;
     494    height: 25px;
     495}
     496
     497#minisub {
     498    height: 6px;
    446499}
    447500
     
    457510    color: #fff;
    458511    font-size: 12px;
    459     padding: .3em .4em .33em;
     512    padding: .3em .4em .4em;
    460513}
    461514
     
    466519
    467520#submenu li {
    468     line-height: 170%;
     521    line-height: 180%;
    469522}
    470523
     
    492545    margin: 0 0 0 0;
    493546    width: 100%;
     547}
     548
     549#postdivrich #content {
     550    padding: .7em;
     551    line-height: 140%;
    494552}
    495553
     
    564622
    565623#title {
    566     font-size: 1.5em;
     624    font-size: 1.7em;
     625    padding: 4px;
    567626}
    568627
     
    590649    clear: both;
    591650    text-align: center;
     651    width: 500px;
     652    margin: auto;
     653    height: 100px;
     654}
     655
     656#footer .docs {
     657    padding-top: 19px;
     658    line-height: 160%;
     659}
     660
     661#footer .docs a {
     662    text-decoration: underline;
     663}
     664#footer .logo {
     665    float: left;
     666    margin: 0;
     667    padding: 0;
    592668}
    593669
     
    699775    font-size: 15px;
    700776}
     777.plugins p {
     778}
    701779
    702780#login .fullwidth {
     
    706784#searchform {
    707785    float: left;
    708     margin-right: 3em;
    709     width: 16em;
     786    margin-right: 1em;
     787    width: 18em;
    710788}
    711789
    712790#viewarc {
    713791    float: left;
    714     width: 20em;
     792    width: 23em;
    715793    margin-bottom: 1em;
    716794}
     
    764842    float: right;
    765843    width: 170px;
     844    overflow: hidden;
    766845}
    767846
     
    813892#zeitgeist {
    814893    background: #eee;
    815     border: 1px solid #69c;
     894    border: 1px solid #c5c5c5;
    816895    float: right;
    817896    font-size: 90%;
     
    825904#zeitgeist h2, fieldset legend a {
    826905    border-bottom: none;
     906}
     907
     908* html #zeitgeist h2 {
     909    padding-top: 10px;
    827910}
    828911
     
    12171300    border-bottom: 1px solid #ccc;
    12181301}
     1302
     1303.page-numbers {
     1304    padding: 4px 7px;
     1305    border: 1px solid #fff;
     1306    margin-right: 3px;
     1307}
     1308
     1309a.page-numbers {
     1310    border: 1px solid #ccc;
     1311}
     1312
     1313a.page-numbers:hover {
     1314    border: 1px solid #999;
     1315}
     1316
     1317.page-numbers.current {
     1318    border: 1px solid #999;
     1319    font-weight: bold;
     1320}
  • trunk/wp-includes/js/tinymce/plugins/wordpress/wordpress.css

    r3664 r4349  
    2525
    2626body {
    27     font-family: Verdana, Arial, Helvetica, sans-serif;
    28     font-size: 0.9em;
    29     line-height: 1.2em;
    30     padding: .3em;
    31     background-color: #FFFFFF;
     27    background: #fff;
     28    font: 1em/1.3em Georgia, "Times New Roman", Times, serif;
     29    padding: .5em;
    3230}
    3331
Note: See TracChangeset for help on using the changeset viewer.