Changeset 4349
- Timestamp:
- 10/06/2006 01:14:47 AM (18 years ago)
- Location:
- trunk
- Files:
-
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/admin-footer.php
r4345 r4349 1 1 2 2 <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>'); ?> — <?php _e('<a href="http://wordpress.org/support/">Support Forums</a>'); ?> <br /> 6 <?php bloginfo('version'); ?> — <?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>'); ?> — <?php _e('<a href="http://wordpress.org/support/">Support Forums</a>'); ?><br /> 5 <?php bloginfo('version'); ?> — <?php printf(__('%s seconds'), timer_stop(0, 2)); ?></p> 8 6 </div> 9 7 <?php do_action('admin_footer', ''); ?> 10 8 <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script> 11 12 9 </body> 13 10 </html> -
trunk/wp-admin/admin.php
r4202 r4349 83 83 include(ABSPATH . "wp-admin/import/$importer.php"); 84 84 85 $parent_file = 'import.php'; 85 $parent_file = 'edit.php'; 86 $submenu_file = 'import.php'; 86 87 $title = __('Import'); 87 88 -
trunk/wp-admin/edit-form-advanced.php
r4311 r4349 15 15 16 16 <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 ↓'); ?></a></small><?php endif; ?></h2>19 17 <?php 20 18 -
trunk/wp-admin/edit.php
r4321 r4349 78 78 <legend><?php _e('Search Posts…') ?></legend> 79 79 <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" /> 81 81 </fieldset> 82 82 </form> … … 107 107 ?> 108 108 </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" /> 110 110 </fieldset> 111 111 </form> … … 117 117 <legend><?php _e('Browse Category…') ?></legend> 118 118 <?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" /> 120 120 </fieldset> 121 121 </form> -
trunk/wp-admin/export.php
r4144 r4349 12 12 <div class="wrap"> 13 13 <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> 16 17 <form action="" method="get"> 17 18 <p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?> »" /> … … 19 20 </p> 20 21 </form> 22 </div> 21 23 </div> 22 24 -
trunk/wp-admin/import/blogware.php
r4165 r4349 23 23 24 24 function greet() { 25 echo '<div class="narrow">'; 25 26 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>'; 26 27 wp_import_upload_form("admin.php?import=blogware&step=1"); 28 echo '</div>'; 27 29 } 28 30 -
trunk/wp-admin/import/dotclear.php
r4264 r4349 144 144 function greet() 145 145 { 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>'; 147 147 echo '<p>'.__('Your Dotclear Configuration settings are as follows:').'</p>'; 148 148 echo '<form action="admin.php?import=dotclear&step=1" method="post">'; 149 149 $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').' »" /></p>'; 151 echo '</form></div>'; 152 152 } 153 153 … … 646 646 function db_form() 647 647 { 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>'; 656 656 } 657 657 -
trunk/wp-admin/import/livejournal.php
r4165 r4349 21 21 22 22 function greet() { 23 echo '<div class="narrow">'; 23 24 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>'; 24 25 wp_import_upload_form("admin.php?import=livejournal&step=1"); 26 echo '</div>'; 25 27 } 26 28 -
trunk/wp-admin/import/mt.php
r4165 r4349 22 22 $this->header(); 23 23 ?> 24 <div class="narrow"> 24 25 <p><?php _e('Howdy! We’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> 25 26 <?php wp_import_upload_form( add_query_arg('step', 1) ); ?> 26 27 <p><?php _e('The importer is smart enough not to import duplicates, so you can run this multiple times without worry if—for whatever reason—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> 27 29 <?php 28 30 $this->footer(); -
trunk/wp-admin/import/rss.php
r4165 r4349 22 22 23 23 function greet() { 24 echo '<div class="narrow">'; 24 25 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>'; 25 26 wp_import_upload_form("admin.php?import=rss&step=1"); 27 echo '</div>'; 26 28 } 27 29 -
trunk/wp-admin/import/textpattern.php
r4264 r4349 51 51 } 52 52 53 function greet() 54 {53 function greet() { 54 echo '<div class="narrow">'; 55 55 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>'; 56 56 echo '<p>'.__('Your Textpattern Configuration settings are as follows:').'</p>'; 57 57 echo '<form action="admin.php?import=textpattern&step=1" method="post">'; 58 58 $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').' »" /></p>'; 60 60 echo '</form>'; 61 echo '</div>'; 61 62 } 62 63 … … 569 570 function db_form() 570 571 { 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>'; 578 579 } 579 580 -
trunk/wp-admin/import/wordpress.php
r4165 r4349 26 26 27 27 function greet() { 28 echo '<div class="narrow">'; 28 29 echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we’ll import the posts and comments into this blog.').'</p>'; 29 30 wp_import_upload_form("admin.php?import=wordpress&step=1"); 31 echo '</div>'; 30 32 } 31 33 -
trunk/wp-admin/index.php
r4295 r4349 133 133 if ( isset($rss->items) && 0 != count($rss->items) ) { 134 134 ?> 135 <h3><?php _e('WordPress Development News'); ?></h3> 135 <div id="devnews"> 136 <h3><?php _e('WordPress Development Blog'); ?></h3> 136 137 <?php 137 138 $rss->items = array_slice($rss->items, 0, 3); … … 144 145 } 145 146 ?> 146 147 </div> 147 148 148 149 <?php … … 151 152 ?> 152 153 <div id="planetnews"> 153 <h3><?php _e('Other WordPress News'); ?> <a href="http://planet.wordpress.org/"><?php _e('more'); ?> »</a></h3>154 <h3><?php _e('Other WordPress News'); ?></h3> 154 155 <ul> 155 156 <?php 156 157 $rss->items = array_slice($rss->items, 0, 20); 157 158 foreach ($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'] ); 158 162 ?> 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> 160 164 <?php 161 165 } 162 166 ?> 163 167 </ul> 168 <p class="readmore"><a href="http://planet.wordpress.org/"><?php _e('Read more'); ?> »</a></p> 164 169 </div> 165 170 <?php -
trunk/wp-admin/menu-header.php
r4202 r4349 54 54 </ul> 55 55 <?php 56 else : 57 ?> 58 <div id="minisub"></div> 59 <?php 56 60 57 61 endif; -
trunk/wp-admin/page.php
r4317 r4349 57 57 ?> 58 58 <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 ↑'); ?></a></small></h2>59 <h2 id="preview-post"><?php _e('Page Preview (updated when page is saved)'); ?></h2> 60 60 <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> 61 61 </div> -
trunk/wp-admin/plugins.php
r4325 r4349 79 79 } else { 80 80 ?> 81 <table class="widefat ">81 <table class="widefat plugins"> 82 82 <thead> 83 83 <tr> … … 113 113 <td class='name'>{$plugin_data['Title']}</td> 114 114 <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> 116 116 <td class='togl'>$toggle</td>"; 117 117 if ( current_user_can('edit_plugins') ) … … 131 131 132 132 <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> 134 135 135 136 </div> -
trunk/wp-admin/post.php
r4317 r4349 63 63 ?> 64 64 <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 ↑'); ?></a></small></h2>65 <h2 id="preview-post"><?php _e('Post Preview (updated when post is saved)'); ?></h2> 66 66 <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> 67 67 </div> -
trunk/wp-admin/profile.php
r4196 r4349 35 35 36 36 <?php do_action('profile_personal_options'); ?> 37 38 <p class="submit"><input type="submit" value="<?php _e('Update Profile »') ?>" name="submit" /></p> 37 39 38 40 <fieldset> … … 139 141 ?> 140 142 </table> 141 <p class="submit"> 142 <input type="submit" value="<?php _e('Update Profile »') ?>" name="submit" /> 143 </p> 143 <p class="submit"><input type="submit" value="<?php _e('Update Profile »') ?>" name="submit" /></p> 144 144 </form> 145 145 -
trunk/wp-admin/rtl.css
r4258 r4349 11 11 } 12 12 13 #postcustomsubmit, h2 small.quickjump,form#upload th, .submit, .editform th {13 #postcustomsubmit, form#upload th, .submit, .editform th { 14 14 text-align: left 15 15 } -
trunk/wp-admin/theme-editor.php
r4268 r4349 94 94 ?> 95 95 </select> 96 <input type="submit" name="Submit" value="<?php _e('Select »') ?>" />96 <input type="submit" name="Submit" value="<?php _e('Select »') ?>" class="button" /> 97 97 </form> 98 98 </div> -
trunk/wp-admin/upload-functions.php
r4348 r4349 13 13 14 14 $class = 'text'; 15 $thumb_src = '';16 15 $innerHTML = get_attachment_innerHTML( $id, false, $dims ); 17 16 if ( $image_src = strstr($innerHTML, 'src="') ) { 18 17 $image_src = explode('"', $image_src); 19 18 $image_src = $image_src[1]; 20 $thumb_src = wp_make_link_relative($image_src);21 19 $class = 'image'; 22 $innerHTML = ' ' . str_replace($image_src, $thumb_src, $innerHTML);20 $innerHTML = ' ' . $innerHTML; 23 21 } 24 25 $src = wp_make_link_relative( get_the_guid() );26 22 27 23 $r = ''; … … 34 30 $r .= "</a>\n"; 35 31 $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"; 37 33 38 34 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"; 40 36 if ( isset($width) ) { 41 37 $r .= "\t\t\t\t<input type='hidden' name='attachment-width-$id' id='attachment-width-$id' value='$width' />\n"; … … 147 143 <?php wp_nonce_field( 'inlineuploading' ); ?> 148 144 <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'); ?> »" /> 150 146 <?php if ( $id ) : ?> 151 147 <input type="submit" name="delete" class="delete" value="<?php _e('Delete'); ?>" /> -
trunk/wp-admin/upload-js.php
r4340 r4349 62 62 63 63 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 else68 h += "<h2>" + this.currentImage.title + "</h2>";69 h += "<span>[ ";70 h += "<a href='#' onclick='theFileList.editView(" + id + ")'>edit</a>"71 h += ' | ';72 64 if ( this.ID ) { 73 65 var params = $H(this.params); 74 66 params.ID = ''; 75 67 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'>« Back</a>"; 77 69 } else { 78 h += "<a href='#' onclick='theFileList.cancelView()' title='Browse your files'>cancel</a>"; 79 } 80 h += " ]</span>"; 70 h += "<a href='#' onclick='theFileList.cancelView()' title='Browse your files' class='back'>« 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 += " — <span>"; 78 h += "<a href='#' onclick='theFileList.editView(" + id + ")'>Edit</a>" 79 h += "</span>"; 81 80 h += '</div>' 82 81 h += "<div id='upload-file-view' class='alignleft'>"; … … 90 89 h += "<table>"; 91 90 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>"; 95 94 h += "</td></tr>"; 96 95 } 97 96 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>"; 102 101 h += "</td></tr>"; 103 102 104 h += "<tr><td colspan='2'> ";103 h += "<tr><td colspan='2'><p class='submit'>"; 105 104 h += "<input type='button' class='button' name='send' onclick='theFileList.sendToEditor(" + id + ")' value='Send to editor »' />"; 106 h += "</ td></tr></table>";105 h += "</p></td></tr></table>"; 107 106 h += "</form>"; 108 107 … … 122 121 action += '&post_id=' + this.postID; 123 122 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 else128 h += "<h2>" + this.currentImage.title + "</h2>";129 h += "<span>[ ";130 h += "<a href='#' onclick='theFileList.imageView(" + id + ")'>options</a>"131 h += ' | ';132 123 if ( this.ID ) { 133 124 var params = $H(this.params); 134 125 params.ID = ''; 135 126 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'>« Back</a>"; 137 128 } else { 138 h += "<a href='#' onclick='theFileList.cancelView()' title='Browse your files'>cancel</a>"; 139 } 140 h += " ]</span>"; 129 h += "<a href='#' onclick='theFileList.cancelView()' title='Browse your files' class='back'>« 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 += " — <span>"; 137 h += "<a href='#' onclick='theFileList.imageView(" + id + ")'>Insert</a>" 138 h += "</span>"; 141 139 h += '</div>' 142 140 h += "<div id='upload-file-view' class='alignleft'>"; … … 154 152 h += "<th scope='row'><label for='post_content'>Description:</label></th>"; 155 153 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>"; 157 155 h += "<input type='hidden' name='from_tab' value='" + this.tab + "' />"; 158 156 h += "<input type='hidden' name='action' id='action-value' value='save' />"; 159 157 h += "<input type='hidden' name='ID' value='" + id + "' />"; 160 158 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 »' />"; 163 160 h += "</div></td></tr></table></form>"; 164 161 -
trunk/wp-admin/upload.css
r4340 r4349 1 body { background: # dfe8f1; }1 body { background: #f9fcfe; } 2 2 3 3 .upload-file-data { display: none; } 4 4 5 5 #upload-menu { 6 background: # fff;6 background: #247fab; 7 7 margin: 0px; 8 8 padding: 0; … … 16 16 17 17 #upload-menu li div { 18 color: #000;19 18 padding: 5px; 20 border-top: 3px solid # fff;19 border-top: 3px solid #247fab; 21 20 } 22 21 23 22 #upload-menu li a { 24 color: #000;25 23 text-decoration: none; 26 24 border-bottom: none; 25 color: #fff; 27 26 } 28 27 … … 30 29 31 30 #upload-menu .current div { 32 background: # dfe8f1;31 background: #f9fcfe; 33 32 border-right: 2px solid #448abd; 33 color: #000; 34 } 35 36 #upload-menu .current div a, #upload-menu div:hover a { 37 color: #000; 34 38 } 35 39 36 40 #upload-menu div:hover { 37 background: # dfe8f1;41 background: #f9fcfe; 38 42 color: #000; 39 43 } … … 51 55 52 56 #upload-file { 53 position: relative; 54 margin: 0; 57 margin: 0 auto; 55 58 top: 0; 56 59 left: 0; 57 width: 100%;60 width: 45em; 58 61 height: 100%; 59 background: #dfe8f1; 62 background: #f9fcfe; 63 } 64 #upload-file th { 65 width: 8em; 60 66 } 61 67 … … 64 70 form#upload-file div.submit input { width: auto; } 65 71 66 #upload-file-view { padding: 0 0 0 15px; }72 #upload-file-view { padding: 0 0 0 75px; } 67 73 68 74 #file-title { 69 margin: 0 0 .2em 15px;75 margin: 0 0 .2em 75px; 70 76 padding: 0; 71 77 display: block; 78 font-family: Georgia, "Times New Roman", Times, serif; 79 font-size: 16px; 72 80 } 73 81 … … 78 86 border: none; 79 87 color: #000; 80 font-weight: bold;81 88 font-size: 1.4em; 82 89 line-height: 1.4em; 90 } 91 92 .back { 93 display: block; 94 position: absolute; 95 left: 14px; 96 top: 10px; 83 97 } 84 98 … … 104 118 background-color: rgb(209, 226, 239); 105 119 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; 107 127 } 108 128 … … 136 156 padding-top: 0; 137 157 } 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 72 72 add_action( 'admin_head', 'wp_upload_admin_head' ); 73 73 include_once('admin-header.php'); 74 echo "<div class='wrap'>"; 74 75 endif; 75 76 … … 117 118 118 119 if ( 'inline' != $style ) : 120 echo "<div class='clear'></div></div>"; 119 121 include_once('admin-footer.php'); 120 122 else : ?> -
trunk/wp-admin/users.php
r4289 r4349 65 65 $this->query_from_where = "FROM $wpdb->users WHERE 1=1 $search_sql"; 66 66 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);69 67 } 70 68 … … 327 325 <?php endif; ?> 328 326 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 335 327 <div class="wrap"> 336 328 … … 342 334 343 335 <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 »'); ?>" /></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 »'); ?>" class="button" /></p> 345 337 </form> 346 338 … … 363 355 <?php endif; ?> 364 356 365 <h3><?php printf(__('%1$s – %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 – %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> 366 362 367 363 <?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> 369 365 <?php endif; ?> 370 366 … … 406 402 407 403 <?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> 409 405 <?php endif; ?> 410 406 … … 437 433 <div class="wrap"> 438 434 <h2 id="add-new-user"><?php _e('Add New User') ?></h2> 435 <div class="narrow"> 439 436 <?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>'; ?> 440 437 <form action="#add-new-user" method="post" name="adduser" id="adduser"> … … 487 484 <input name="adduser" type="submit" id="addusersub" value="<?php _e('Add User »') ?>" /> 488 485 </p> 486 </div> 489 487 </form> 490 488 -
trunk/wp-admin/wp-admin.css
r4339 r4349 19 19 background: #c00; 20 20 color: #fff; 21 } 22 23 #devnews h4 { 24 font-family: Georgia, "Times New Roman", Times, serif; 25 font-size: 18px; 26 font-weight: normal; 21 27 } 22 28 … … 41 47 } 42 48 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 43 66 .widefat { 44 67 width: 100%; … … 53 76 } 54 77 78 .plugins p { 79 margin: 4px; 80 padding: 0; 81 } 82 83 .plugins .name { 84 font-size: 16px; 85 } 86 55 87 .import-system { 56 88 font-size: 16px; … … 62 94 63 95 #import-upload-form { 64 width: 300px;65 96 margin: auto; 66 text-align: center; 97 background: #eee; 98 padding: 1em; 67 99 } 68 100 … … 134 166 135 167 h2 { 136 border-bottom: .5em solid # f0f8ff;168 border-bottom: .5em solid #e5f3ff; 137 169 color: #333; 138 font: normal 3 0px/5px serif;170 font: normal 32px/5px serif; 139 171 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;153 172 } 154 173 … … 171 190 172 191 p, li, dl, dd, dt { 173 line-height: 1 30%;192 line-height: 140%; 174 193 } 175 194 … … 307 326 } 308 327 309 .submit input, .submit input:focus, .button {328 .submit input, .submit input:focus, .button, .button:focus { 310 329 background: url( images/fade-butt.png ); 311 330 border: 3px double #999; … … 323 342 } 324 343 344 .button, .button:focus { 345 padding: 0.15em; 346 } 347 348 * html .button { 349 padding: 0; 350 } 351 325 352 .submit, .editform th, #postcustomsubmit { 326 353 text-align: right; … … 389 416 clear: both; 390 417 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%; 392 428 } 393 429 394 430 .wrap h2 { 395 margin: . 8em 0 .5em;431 margin: .4em 0 .5em; 396 432 clear: both; 433 } 434 435 * html .wrap h2 { 436 margin-top: 1em; 397 437 } 398 438 … … 411 451 padding: .2em .2em .3em 2em; 412 452 } 453 413 454 414 455 #adminmenu .current, #submenu .current { … … 423 464 margin: 0; 424 465 padding: 3px 5px; 425 text-decoration: underline;426 466 border-bottom: none; 427 467 } … … 439 479 } 440 480 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 { 442 490 background: #0d324f; 443 491 border-bottom: none; 444 492 margin: 0; 445 493 padding: 3px 2em 0 3em; 494 height: 25px; 495 } 496 497 #minisub { 498 height: 6px; 446 499 } 447 500 … … 457 510 color: #fff; 458 511 font-size: 12px; 459 padding: .3em .4em . 33em;512 padding: .3em .4em .4em; 460 513 } 461 514 … … 466 519 467 520 #submenu li { 468 line-height: 1 70%;521 line-height: 180%; 469 522 } 470 523 … … 492 545 margin: 0 0 0 0; 493 546 width: 100%; 547 } 548 549 #postdivrich #content { 550 padding: .7em; 551 line-height: 140%; 494 552 } 495 553 … … 564 622 565 623 #title { 566 font-size: 1.5em; 624 font-size: 1.7em; 625 padding: 4px; 567 626 } 568 627 … … 590 649 clear: both; 591 650 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; 592 668 } 593 669 … … 699 775 font-size: 15px; 700 776 } 777 .plugins p { 778 } 701 779 702 780 #login .fullwidth { … … 706 784 #searchform { 707 785 float: left; 708 margin-right: 3em;709 width: 1 6em;786 margin-right: 1em; 787 width: 18em; 710 788 } 711 789 712 790 #viewarc { 713 791 float: left; 714 width: 2 0em;792 width: 23em; 715 793 margin-bottom: 1em; 716 794 } … … 764 842 float: right; 765 843 width: 170px; 844 overflow: hidden; 766 845 } 767 846 … … 813 892 #zeitgeist { 814 893 background: #eee; 815 border: 1px solid # 69c;894 border: 1px solid #c5c5c5; 816 895 float: right; 817 896 font-size: 90%; … … 825 904 #zeitgeist h2, fieldset legend a { 826 905 border-bottom: none; 906 } 907 908 * html #zeitgeist h2 { 909 padding-top: 10px; 827 910 } 828 911 … … 1217 1300 border-bottom: 1px solid #ccc; 1218 1301 } 1302 1303 .page-numbers { 1304 padding: 4px 7px; 1305 border: 1px solid #fff; 1306 margin-right: 3px; 1307 } 1308 1309 a.page-numbers { 1310 border: 1px solid #ccc; 1311 } 1312 1313 a.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 25 25 26 26 body { 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; 32 30 } 33 31
Note: See TracChangeset
for help on using the changeset viewer.