Changeset 8066

Show
Ignore:
Timestamp:
06/10/08 04:40:21 (3 months ago)
Author:
ryan
Message:

Unify TinyMCE image popup and insert image popup. Props azaozz. see #6811

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/css/colors-classic.css

    r8049 r8066  
    562562 
    563563/* Containers */ 
    564 .wp_themeSkin table { 
     564.wp_themeSkin table, #wp_editbtns { 
    565565    background: #83B4D5; 
    566566} 

  • trunk/wp-admin/css/colors-fresh.css

    r8049 r8066  
    534534 
    535535/* Containers */ 
    536 .wp_themeSkin table { 
     536.wp_themeSkin table, #wp_editbtns { 
    537537    background: #cee1ef; 
    538538} 

  • trunk/wp-admin/gears-manifest.php

    r8047 r8066  
    8888{ 
    8989"betaManifestVersion" : 1, 
    90 "version" : "<?php echo $man_version; ?>_20080602", 
     90"version" : "<?php echo $man_version; ?>_20080606", 
    9191"entries" : [ 
    9292<?php echo $defaults; ?> 
    …… 
    150150{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=3091" }, 
    151151{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=3091" }, 
     152{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=3091" }, 
    152153 
    153154{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=3091" }, 
    …… 
    163164{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=3091" }, 
    164165{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=3091" }, 
     166{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=3091" }, 
    165167{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=3091" }, 
    166168 
    …… 
    175177{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=3091" }, 
    176178{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=3091" }, 
     179{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=3091" }, 
    177180{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=3091" }, 
    178181 
    …… 
    209212{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif" }, 
    210213{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif" }, 
     214{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png" }, 
     215{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png" }, 
    211216{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.gif" } 
    212217]} 

  • trunk/wp-admin/wp-admin.css

    r8049 r8066  
    15881588    padding: 0 7px; 
    15891589} 
     1590 
     1591#wp_editbtns { 
     1592    padding: 2px; 
     1593    position: absolute; 
     1594    display: none; 
     1595    z-index: 999998; 
     1596} 
     1597 
     1598#wp_editimgbtn, #wp_delimgbtn { 
     1599    margin: 2px; 
     1600    padding: 2px; 
     1601    border: 1px solid #999; 
     1602    background-color: #eee; 
     1603    -moz-border-radius: 3px; 
     1604    -khtml-border-radius: 3px; 
     1605    -webkit-border-radius: 3px; 
     1606    border-radius: 3px; 
     1607} 
     1608 
     1609#wp_editimgbtn:hover, #wp_delimgbtn:hover { 
     1610    border-color: #555; 
     1611    background-color: #ccc; 
     1612} 

  • trunk/wp-includes/js/tinymce/tiny_mce_config.php

    r8047 r8066  
    7171$mce_spellchecker_languages = apply_filters('mce_spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv'); 
    7272 
    73 $plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen' ); 
     73$plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen', 'wpeditimage' ); 
    7474 
    7575/*  
    …… 
    123123$plugins = implode($plugins, ','); 
    124124 
    125 $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'image', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' )); 
     125$mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' )); 
    126126$mce_buttons = implode($mce_buttons, ','); 
    127127 
    …… 
    227227if ( $disk_cache ) { 
    228228 
    229     $cacheKey = apply_filters('tiny_mce_version', '20080602'); 
     229    $cacheKey = apply_filters('tiny_mce_version', '20080606'); 
    230230 
    231231    foreach ( $initArray as $v ) 

  • trunk/wp-includes/script-loader.php

    r8064 r8066  
    3636 
    3737    // Modify this version when tinyMCE plugins are changed. 
    38     $mce_version = apply_filters('tiny_mce_version', '20080602'); 
     38    $mce_version = apply_filters('tiny_mce_version', '20080606'); 
    3939    $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version ); 
    4040