Changeset 2748
- Timestamp:
- 08/04/05 08:37:46 (3 years ago)
- Files:
-
- trunk/wp-admin/admin-header.php (modified) (1 diff)
- trunk/wp-admin/edit-form-advanced.php (modified) (2 diffs)
- trunk/wp-admin/options-writing.php (modified) (2 diffs)
- trunk/wp-admin/tinymce (added)
- trunk/wp-admin/tinymce/blank.htm (added)
- trunk/wp-admin/tinymce/langs (added)
- trunk/wp-admin/tinymce/langs/en.js (added)
- trunk/wp-admin/tinymce/plugins (added)
- trunk/wp-admin/tinymce/plugins/contextmenu (added)
- trunk/wp-admin/tinymce/plugins/contextmenu/contextmenu.css (added)
- trunk/wp-admin/tinymce/plugins/contextmenu/editor_plugin.js (added)
- trunk/wp-admin/tinymce/plugins/contextmenu/editor_plugin_src.js (added)
- trunk/wp-admin/tinymce/plugins/contextmenu/images (added)
- trunk/wp-admin/tinymce/plugins/contextmenu/images/spacer.gif (added)
- trunk/wp-admin/tinymce/plugins/contextmenu/readme.txt (added)
- trunk/wp-admin/tinymce/plugins/emotions (added)
- trunk/wp-admin/tinymce/plugins/emotions/editor_plugin.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/editor_plugin_src.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/emotions.htm (added)
- trunk/wp-admin/tinymce/plugins/emotions/images (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/emotions.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/readme.txt (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-cool.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-cry.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-embarassed.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-foot-in-mouth.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-frown.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-innocent.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-kiss.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-laughing.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-money-mouth.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-sealed.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-smile.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-surprised.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-tongue-out.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-undecided.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-wink.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/images/smiley-yell.gif (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/cs.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/de.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/el.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/en.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/fa.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/fr.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/fr_ca.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/it.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/ko.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/nl.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/pl.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/pt_br.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/sv.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/langs/zh_cn.js (added)
- trunk/wp-admin/tinymce/plugins/emotions/readme.txt (added)
- trunk/wp-admin/tinymce/plugins/iespell (added)
- trunk/wp-admin/tinymce/plugins/iespell/editor_plugin.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/editor_plugin_src.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/images (added)
- trunk/wp-admin/tinymce/plugins/iespell/images/iespell.gif (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/cs.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/de.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/el.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/en.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/fr.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/fr_ca.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/it.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/ko.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/nl.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/pl.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/pt_br.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/sv.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/langs/zh_cn.js (added)
- trunk/wp-admin/tinymce/plugins/iespell/readme.txt (added)
- trunk/wp-admin/tinymce/plugins/preview (added)
- trunk/wp-admin/tinymce/plugins/preview/editor_plugin.js (added)
- trunk/wp-admin/tinymce/plugins/preview/editor_plugin_src.js (added)
- trunk/wp-admin/tinymce/plugins/preview/example.html (added)
- trunk/wp-admin/tinymce/plugins/preview/images (added)
- trunk/wp-admin/tinymce/plugins/preview/images/preview.gif (added)
- trunk/wp-admin/tinymce/plugins/preview/langs (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/cs.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/de.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/el.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/en.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/fa.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/fr.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/fr_ca.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/it.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/ko.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/nl.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/pl.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/pt.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/pt_br.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/sv.js (added)
- trunk/wp-admin/tinymce/plugins/preview/langs/zh_cn.js (added)
- trunk/wp-admin/tinymce/plugins/preview/readme.txt (added)
- trunk/wp-admin/tinymce/plugins/save (added)
- trunk/wp-admin/tinymce/plugins/save/editor_plugin.js (added)
- trunk/wp-admin/tinymce/plugins/save/editor_plugin_src.js (added)
- trunk/wp-admin/tinymce/plugins/save/images (added)
- trunk/wp-admin/tinymce/plugins/save/images/save.gif (added)
- trunk/wp-admin/tinymce/plugins/save/langs (added)
- trunk/wp-admin/tinymce/plugins/save/langs/cs.js (added)
- trunk/wp-admin/tinymce/plugins/save/langs/de.js (added)
- trunk/wp-admin/tinymce/plugins/save/langs/en.js (added)
- trunk/wp-admin/tinymce/plugins/save/langs/fa.js (added)
- trunk/wp-admin/tinymce/plugins/save/langs/fr.js (added)
- trunk/wp-admin/tinymce/plugins/save/langs/fr_ca.js (added)
- trunk/wp-admin/tinymce/plugins/save/langs/nl.js (added)
- trunk/wp-admin/tinymce/plugins/save/langs/pl.js (added)
- trunk/wp-admin/tinymce/plugins/save/langs/pt_br.js (added)
- trunk/wp-admin/tinymce/plugins/save/langs/zh_cn.js (added)
- trunk/wp-admin/tinymce/plugins/save/readme.txt (added)
- trunk/wp-admin/tinymce/themes (added)
- trunk/wp-admin/tinymce/themes/advanced (added)
- trunk/wp-admin/tinymce/themes/advanced/docs (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/about.htm (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/common_buttons.htm (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/images (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/images/insert_anchor_window.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/images/insert_image_window.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/images/insert_link_window.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/images/insert_table_window.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/index.htm (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/insert_anchor_button.htm (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/insert_image_button.htm (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/insert_link_button.htm (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/insert_table_button.htm (added)
- trunk/wp-admin/tinymce/themes/advanced/docs/en/style.css (added)
- trunk/wp-admin/tinymce/themes/advanced/editor_content.css (added)
- trunk/wp-admin/tinymce/themes/advanced/editor_popup.css (added)
- trunk/wp-admin/tinymce/themes/advanced/editor_template.js (added)
- trunk/wp-admin/tinymce/themes/advanced/editor_template_src.js (added)
- trunk/wp-admin/tinymce/themes/advanced/editor_ui.css (added)
- trunk/wp-admin/tinymce/themes/advanced/image.htm (added)
- trunk/wp-admin/tinymce/themes/advanced/images (added)
- trunk/wp-admin/tinymce/themes/advanced/images/Thumbs.db (added)
- trunk/wp-admin/tinymce/themes/advanced/images/anchor.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/backcolor.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/bold.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/bold_de_se.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/bold_fr.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/bold_ru.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/browse.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/bullist.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/buttons.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/center.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/charmap.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/cleanup.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/close.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/code.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/copy.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/custom_1.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/cut.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/forecolor.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/full.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/help.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/hr.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/image.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/indent.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/italic.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/italic_de_se.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/italic_ru.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/left.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/link.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/newdocument.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/numlist.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/outdent.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/paste.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/redo.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/removeformat.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/right.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/spacer.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/strikethrough.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/sub.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/sup.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/table.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/table_delete_col.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/table_delete_row.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/table_insert_col_after.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/table_insert_col_before.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/table_insert_row_after.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/table_insert_row_before.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/underline.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/underline_fr.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/underline_ru.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/undo.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/unlink.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/images/visualaid.gif (added)
- trunk/wp-admin/tinymce/themes/advanced/langs (added)
- trunk/wp-admin/tinymce/themes/advanced/langs/en.js (added)
- trunk/wp-admin/tinymce/themes/advanced/link.htm (added)
- trunk/wp-admin/tinymce/themes/advanced/source_editor.htm (added)
- trunk/wp-admin/tinymce/tiny_mce.js (added)
- trunk/wp-admin/tinymce/tiny_mce_gzip.php (added)
- trunk/wp-admin/tinymce/tiny_mce_popup.js (added)
- trunk/wp-admin/tinymce/tiny_mce_src.js (added)
- trunk/wp-admin/upgrade-schema.php (modified) (2 diffs)
- trunk/wp-admin/wp-admin.css (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/wp-admin/admin-header.php
r2746 r2748 9 9 <link rel="stylesheet" href="<?php echo get_settings('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" /> 10 10 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" /> 11 12 <?php if ( get_option('rich_editing') ) :?> 13 <script type="text/javascript" src="tinymce/tiny_mce_gzip.php"></script> 14 <script type="text/javascript"> 15 tinyMCE.init({ 16 mode : "specific_textareas", 17 textarea_trigger : "title", 18 theme : "advanced", 19 theme_advanced_buttons1 : "bold,italic,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,separator,link,unlink,image,emotions,separator,undo,redo,code", 20 theme_advanced_buttons2 : "", 21 theme_advanced_buttons3 : "", 22 theme_advanced_toolbar_location : "top", 23 theme_advanced_toolbar_align : "left", 24 theme_advanced_path_location : "bottom", 25 entity_encoding : "numeric", 26 extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|width|height|align],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]", 27 plugins : "emotions" 28 }); 29 </script> 30 <?php endif; ?> 11 31 12 32 <script type="text/javascript"> trunk/wp-admin/edit-form-advanced.php
r2730 r2748 137 137 138 138 <fieldset id="postdiv"> 139 <legend><?php _e('Post') ?></legend> 139 <legend><?php _e('Post') ?></legend> 140 <?php if ( !get_option('rich_editing') ) : ?> 140 141 <?php the_quicktags(); ?> 141 <?php142 $rows = get_settings('default_post_edit_rows');143 if (($rows < 3) || ($rows > 100)) {144 $rows = 10;145 }146 ?>147 <div><textarea rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="2" id="content"><?php echo $post->post_content ?></textarea></div>148 </fieldset>149 142 <script type="text/javascript"> 150 143 <!-- … … 152 145 //--> 153 146 </script> 147 <?php endif; ?> 148 <?php 149 $rows = get_settings('default_post_edit_rows'); 150 if (($rows < 3) || ($rows > 100)) { 151 $rows = 12; 152 } 153 ?> 154 <div><textarea title="true" rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="2" id="content"><?php echo $post->post_content ?></textarea></div> 155 </fieldset> 154 156 155 157 <?php echo $form_pingback ?> trunk/wp-admin/options-writing.php
r2728 r2748 12 12 <form name="form1" method="post" action="options.php"> 13 13 <input type="hidden" name="action" value="update" /> 14 <input type="hidden" name="page_options" value="'default_post_edit_rows','use_smilies',' use_balanceTags','ping_sites','mailserver_url', 'mailserver_port','mailserver_login','mailserver_pass','default_category','default_email_category'" />14 <input type="hidden" name="page_options" value="'default_post_edit_rows','use_smilies','rich_editing','ping_sites','mailserver_url', 'mailserver_port','mailserver_login','mailserver_pass','default_category','default_email_category'" /> 15 15 <table width="100%" cellspacing="2" cellpadding="5" class="editform"> 16 16 <tr valign="top"> … … 19 19 <?php _e('lines') ?></td> 20 20 </tr> 21 <tr valign="top"> 22 <th scope="row"><?php _e('Formatting:') ?></th> 23 <td> <label for="label"> 24 <input name="use_smilies" type="checkbox" id="label" value="1" <?php checked('1', get_settings('use_smilies')); ?> /> 25 <?php _e('Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display') ?></label> <br /> <label for="label2"> 26 <input name="use_balanceTags" type="checkbox" id="label2" value="1" <?php checked('1', get_settings('use_balanceTags')); ?> /> 27 <?php _e('WordPress should correct invalidly nested XHTML automatically') ?></label></td> 28 </tr> 21 <tr valign="top"> 22 <th scope="row"><?php _e('Formatting:') ?></th> 23 <td> 24 <label for="rich_editing"> 25 <input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_settings('rich_editing')); ?> /> 26 <?php _e('Use the visual rich editor when writing') ?></label><br /> 27 <label for="use_smilies"> 28 <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_settings('use_smilies')); ?> /> 29 <?php _e('Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display') ?></label> 30 </td> 31 </tr> 29 32 <tr valign="top"> 30 33 <th scope="row"><?php _e('Default post category:') ?></th> trunk/wp-admin/upgrade-schema.php
r2734 r2748 179 179 add_option('default_ping_status', 'open'); 180 180 add_option('default_pingback_flag', 1); 181 add_option('default_post_edit_rows', 9);181 add_option('default_post_edit_rows', 10); 182 182 add_option('posts_per_page', 10); 183 183 add_option('what_to_show', 'posts'); … … 218 218 // 1.6 219 219 add_option('default_role', 'inactive'); 220 add_option('rich_editing', 'true'); 220 221 221 222 populate_roles(); trunk/wp-admin/wp-admin.css
r2730 r2748 12 12 background: #c00; 13 13 color: #fff; 14 } 15 16 #postdiv div { 17 margin-left: 1em; 14 18 } 15 19
