sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TinyMCE tweaks from skeltoac. fixes #1852 

git-svn-id: https://develop.svn.wordpress.org/trunk@3015 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2005-11-08 19:17:08 +00:00
parent b6930cefd4
commit 609383477a
7 changed files with 53 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/admin-header.php
View File

@ -100,7 +100,7 @@ tinyMCE.init({
entity_encoding : "raw",
relative_urls : false,
remove_script_host : false,
valid_elements : "a[href|title],strong/b,em/i,strike,u,p[class|align],ol,ul,li,br,img[class|src|alt|title|width|height|align],sub,sup,blockquote,table[border=0|cellspacing|cellpadding|width|height|class|align],tr[class|rowspan|width|height|align|valign],td[dir|class|colspan|rowspan|width|height|align|valign],div[dir|class|align],span[class|align],pre[class],address,h1[class|align],h2[class|align],h3[class|align],h4[class|align],h5[class|align],h6[class|align],hr",
valid_elements : "-a[href|title|rel],-strong/b,-em/i,-strike,-del,-u,p[class|align],-ol,-ul,-li,br,img[class|src|alt|title|width|height|align],-sub,-sup,-blockquote,-table[border=0|cellspacing|cellpadding|width|height|class|align],tr[class|rowspan|width|height|align|valign],td[dir|class|colspan|rowspan|width|height|align|valign],-div[dir|class|align],-span[class|align],-pre[class],address,-h1[class|align],-h2[class|align],-h3[class|align],-h4[class|align],-h5[class|align],-h6[class|align],hr",
plugins : "wordpress,autosave"
<?php do_action('mce_options'); ?>
});

2
wp-admin/edit-form-advanced.php
View File

@ -131,7 +131,7 @@ endforeach;
<div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div>
</fieldset>
<fieldset id="postdiv">
<fieldset id="<?php echo ( 'true' != get_user_option('rich_editing') ) ? 'postdiv' : 'postdivrich'; ?>">
<legend><?php _e('Post') ?></legend>
<?php

2
wp-admin/edit-page-form.php
View File

@ -117,7 +117,7 @@ endforeach;
</fieldset>
<fieldset id="postdiv">
<fieldset id="<?php echo ( 'true' != get_user_option('rich_editing') ) ? 'postdiv' : 'postdivrich'; ?>">
<legend><?php _e('Page Content') ?></legend>
<?php
$rows = get_settings('default_post_edit_rows');

58
wp-admin/wp-admin.css
View File

@ -13,10 +13,6 @@ a.delete:hover {
color: #fff;
}
#postdiv div {
margin-left: 1em;
}
#planetnews ul {
list-style: none;
margin: 0;
@ -54,7 +50,7 @@ a:visited {
}
a:hover {
border-bottom: 1px solid #3a75ae;
/* border-bottom: 1px solid #3a75ae;*/
color: #069;
}
@ -193,7 +189,7 @@ textarea, input, select {
.available-theme a.screenshot {
width: 250px;
height: 200px;
display: block;
display: inline-block;
margin: auto;
background: #f1f1f1;
border: 1px solid #ccc;
@ -202,7 +198,7 @@ textarea, input, select {
}
.available-theme a.screenshot:hover {
border: 1px solid #666;
/* border: 1px solid #666;*/
}
.available-theme img {
@ -352,7 +348,7 @@ table .vers, table .name {
}
#submenu {
background: #0d324f;;
background: #0d324f;
border-bottom: none;
margin: 0;
padding: 3px 2em 0 3em;
@ -386,9 +382,33 @@ table .vers, table .name {
border: none;
}
#content, #titlediv input, #quicktags {
margin-left: 2%;
width: 97%;
#titlediv {
margin: 0 8px 0 0;
padding: 0px;
}
#postdiv {
margin: 0 8px 0 0;
padding: 0px;
}
#postdivrich {
margin: 0px;
padding: 0px;
}
#content {
margin: 0 0 0 0;
width: 100%;
}
#titlediv input {
margin: 0px;
width: 100%;
}
#quicktags {
margin-left: -1px;
}
#currenttheme img {
@ -429,9 +449,14 @@ table .vers, table .name {
font-size: 1.5em;
}
#postexcerpt div {
margin-right: 8px;
}
#excerpt {
margin: 0px;
height: 4em;
width: 98%;
width: 100%;
}
#footer {
@ -490,8 +515,8 @@ table .vers, table .name {
#postcustom table {
border: 1px solid #ccc;
margin: .5em;
width: 98%;
margin: 0px;
width: 100%;
}
#postcustom table input, #postcustom table textarea {
@ -654,7 +679,7 @@ table .vers, table .name {
margin-bottom: 1em;
}
#moremeta fieldset div {
margin-left: 5px;
margin: 2px 0 0 5px;
}
#moremeta {
line-height: 130%;
@ -677,7 +702,6 @@ table .vers, table .name {
#advancedstuff div {
margin-top: .5em;
margin-left: 2%;
}
#categorydiv div div {
@ -783,4 +807,4 @@ a.dbx-toggle-open, a.dbx-toggle-open:visited {
-moz-opacity: 0.8;
-khtml-opacity: 0.8;
filter: alpha(opacity=80);
}
}

3
wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
View File

@ -190,6 +190,9 @@ function TinyMCE_wordpress_cleanup(type, content) {
}
}
// The Curse of the Trailing <br />
content = content.replace(new RegExp('<br ?/?>[ \t]*$', ''), '');
break;
}

3
wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
View File

@ -190,6 +190,9 @@ function TinyMCE_wordpress_cleanup(type, content) {
}
}
// The Curse of the Trailing <br />
content = content.replace(new RegExp('<br ?/?>[ \t]*$', ''), '');
break;
}

12
wp-includes/js/tinymce/themes/advanced/css/editor_content.css
View File

@ -4,15 +4,9 @@
body {
background-color: #FFFFFF;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
scrollbar-3dlight-color: #F0F0EE;
scrollbar-arrow-color: #676662;
scrollbar-base-color: #F0F0EE;
scrollbar-darkshadow-color: #DDDDDD;
scrollbar-face-color: #E0E0DD;
scrollbar-highlight-color: #F0F0EE;
scrollbar-shadow-color: #F0F0EE;
scrollbar-track-color: #F5F5F5;
font-size: 0.9em;
line-height: 1.2em;
padding: .3em;
}
td {