Make WordPress Core

Changeset 8681


Ignore:
Timestamp:
08/20/2008 01:16:20 AM (16 years ago)
Author:
azaozz
Message:

The trunk media uploader back in.

Location:
branches/crazyhorse
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/crazyhorse/wp-admin/css/colors-classic.css

    r8677 r8681  
    309309
    310310/* Because we don't want visited on these links */
    311 #adminmenu li.current a, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
     311#adminmenu li.current a, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
    312312    background-color: #fff;
    313313    border-color: #07273e;
     
    730730    background-color: #99ff99;
    731731}
     732
     733/* media popup 0819 */
     734#sidemenu a {
     735    background-color: #14568a;
     736    border-bottom-color: #07273e;
     737    border-top-color: #14568a;
     738    color: #cfebf6;
     739}
  • branches/crazyhorse/wp-admin/css/colors-fresh.css

    r8677 r8681  
    295295
    296296/* Because we don't want visited on these links */
    297 #adminmenu li.current a, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
     297#adminmenu li.current a, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover {
    298298    background-color: #fff;
    299299    border-color: #c6d9e9;
     
    719719}
    720720
    721 
    722 
    723 
    724721#adminmenu,
    725 #html-upload-ui,
    726722#att-info {
    727723    background-color: #E4F2FD;
     
    763759    color: #ccc;
    764760}
     761
     762/* media popup 0819 */
     763#sidemenu a {
     764    background-color: #e4f2fd;
     765    border-bottom-color: #c6d9e9;
     766    border-top-color: #e4f2fd;
     767}
  • branches/crazyhorse/wp-admin/css/media.css

    r8620 r8681  
    2323
    2424form {
    25     margin: 2px;
     25    margin: 1em;
    2626}
    2727
     
    3232.media-upload-form label, .media-upload-form legend {
    3333    display:block;
    34     font-size: 10px;
     34    font-weight: bold;
     35    font-size: 13px;
    3536    margin-bottom: 0.5em;
    3637    margin: 0 0 0.5em 0;
     
    5960/* specific to the image upload form */
    6061.align .field label {
    61     display:inline;
    62     margin:0pt 8px 0pt -2px;
    63     vertical-align:top;
    64 }
    65 
    66 .image-align-none-label input {
    67     background: url(../images/align-none.png) no-repeat center -5px;
    68 }
    69 
    70 .image-align-left-label input {
    71     background: url(../images/align-left.png) no-repeat center -5px;
    72 }
    73 
    74 .image-align-center-label input {
    75     background: url(../images/align-center.png) no-repeat center -5px;
    76 }
    77 
    78 .image-align-right-label input {
    79     background: url(../images/align-right.png) no-repeat center -5px;
     62    display: inline;
     63    padding: 0 0 0 28px;
     64    margin: 0 1em 0 0;
     65}
     66.image-align-none-label {
     67    background: url(../images/align-none.png) no-repeat center left;
     68}
     69
     70.image-align-left-label {
     71    background: url(../images/align-left.png) no-repeat center left;
     72}
     73
     74.image-align-center-label {
     75    background: url(../images/align-center.png) no-repeat center left;
     76}
     77
     78.image-align-right-label {
     79    background: url(../images/align-right.png) no-repeat center left;
    8080}
    8181
     
    179179}
    180180.describe input[type="text"], .describe textarea {
    181     font-size:10px;
    182     width:245px;
    183     padding:2px;
    184     margin:0pt 0pt 10px;
     181    width: 460px;
    185182}
    186183.describe-toggle-on, .describe-toggle-off {
     
    211208
    212209#media-upload .media-upload-form p.ml-submit {
    213     font-size:11px;
    214     margin:0pt;
    215     padding:1em 0pt 1em 68px;
     210    padding: 1em 0;
    216211}
    217212
    218213#media-upload p.help, #media-upload label.help {
    219     font-size:10px;
    220     font-style:italic;
    221     font-weight:normal;
    222     margin-top:-8px;
     214    font-style: italic;
     215    font-weight: normal;
    223216}
    224217#media-upload tr.image-size td.field {
     
    226219}
    227220#media-upload #media-items {
    228     border-style:solid;
    229     border-width:1px;
    230     margin:0pt auto;
    231     width:315px;
    232 
     221    border-width: 1px;
     222    border-style: solid;
     223    border-bottom: none;
     224    width: 623px;
    233225}
    234226
     
    253245}
    254246#media-upload .describe {
     247    border-top-width: 1px;
     248    border-top-style: solid;
    255249    padding: 5px;
    256250    width: 100%;
     
    259253}
    260254#media-upload .describe th.label {
    261     font-size:10px;
    262     padding-top:4px;
    263     text-align:left;
    264     width:57px;
     255    padding-top: .5em;
     256    text-align: left;
    265257}
    266258#media-upload tr.align td.field {
     
    287279}
    288280
     281#media-upload a.delete,
     282#media-upload a.del-link {
     283    padding: 0 3px 1px;
     284}
     285
    289286#media-upload .del-attachment {
    290287    display: none;
     
    325322    z-index: -1;
    326323}
    327 
    328 #media-single-form .filename {
    329     float: none;
    330 }
    331 
    332 .filelink {
    333     float:left;
    334     max-width:65px;
    335     padding:6px;
    336     text-align:center;
    337 }
    338 
    339 .filelink img.thumbnail {
    340     width: 45px;
    341     max-height: 45px;
    342 }
    343 
    344 #media-upload .filelink p.filelink-caption {
    345     cursor:default;
    346     font-size:10px;
    347     height:13px;
    348     margin:0pt 3px 4px;
    349     overflow:hidden;
    350 }
    351 
    352 body#media-upload {
    353     height: auto;
    354 }
    355 
    356 #media-upload .tablenav,
    357 #media-upload .page-numbers {
    358     background-color: #fff;
    359     border: 0 none;
    360     color: #328AB2;
    361     font-weight:normal;
    362 }
    363 
    364 #media-upload .page-numbers {
    365     padding: 0;
    366 }
    367 
    368 #media-upload .tablenav {
    369     margin: 0;
    370     height:1em;
    371     text-align:right;
    372     padding: 4px 10px;
    373 }
    374 
    375 #media-upload .tablenav .tablenav-pages {
    376     float: none;
    377     height: 12px;
    378     padding: 0;
    379 }
    380 
    381 #html-upload-ui {
    382     margin:10px 5px;
    383     padding:5px 0 5px 8px;
    384 }
    385 
    386 #html-upload-help {
    387     font-size:10px;
    388     font-weight:bold;
    389     padding:4px 0 0 15px;
    390 }
    391 
    392 #async-upload {
    393     font-size: 10px;
    394 }
    395 
    396 #html-upload-ui input {
    397     padding: 1px;
    398     font-size:10px;
    399 }
    400 
    401 #html-upload-ui a {
    402     padding: 1px;
    403     font-size:10px;
    404 }
    405 
    406 #att-info {
    407     margin:10px 5px;
    408     padding:4px;
    409 }
    410 
    411 #att-info a,
    412 #att-info p {
    413     font-size: 11px;
    414     text-decoration: none;
    415 }
    416 
    417 .button-link {
    418     font-size: 11px;
    419     padding: 2px;
    420     border: 0;
    421     background: transparent;
    422 }
    423 
    424 #media-upload  #att-info p {
    425     margin:3px 6px 4px 2px;
    426     padding:0pt 0pt 0pt 17px;
    427     height:16px;
    428 }
    429 
    430 #media-upload  #att-info p.type-image {
    431     background: url(../images/media-button-image.gif) no-repeat center left;
    432 }
    433 
    434 #media-upload  #att-info p.type-audio {
    435     background: url(../images/media-button-music.gif) no-repeat center left;
    436 }
    437 
    438 #media-upload  #att-info p.type-video {
    439     background: url(../images/media-button-video.gif) no-repeat center left;
    440 }
    441 
    442 #media-upload  #att-info p.type-file {
    443     background: url(../images/media-button-other.gif) no-repeat center left;
    444 }
    445 
    446 #media-upload  #att-info p.type-single {
    447     background: url(../images/media-button-other.gif) no-repeat center left;
    448 }
    449 
    450 .ml-submit .button {
    451     font-size: 11px;
    452     padding: 1px 2px 2px;
    453 }
  • branches/crazyhorse/wp-admin/edit-form-advanced.php

    r8680 r8681  
    387387<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
    388388
    389 <div id="add-media-button"><a href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&amp;ins=1&amp;TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Add Media' ); ?></a></div>
     389<div id="add-media-button"><a href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&amp;type=image&amp;TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Add Media' ); ?></a></div>
    390390
    391391<h3><?php _e('Post') ?></h3>
  • branches/crazyhorse/wp-admin/edit-page-form.php

    r8680 r8681  
    266266<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
    267267
    268 <div id="add-media-button"><a href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&amp;ins=1&amp;TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Add Media' ); ?></a></div>
     268<div id="add-media-button"><a href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&amp;type=image&amp;TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Add Media' ); ?></a></div>
    269269
    270270<h3><?php _e('Page') ?></h3>
  • branches/crazyhorse/wp-admin/js/media-upload.js

    r8620 r8681  
    2020    tb_position = function() {
    2121        var tbWindow = $('#TB_window');
    22         var w = $(window).width();
    23         var h = $(window).height();
    24         var H = ( 340 < h ) ? 340 : h;
    25         var W = ( 385 < w ) ? 385 : w;
     22        var width = $(window).width();
     23        var H = $(window).height();
     24        var W = ( 720 < width ) ? 720 : width;
    2625
    2726        if ( tbWindow.size() ) {
     
    3029            tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
    3130            if ( typeof document.body.style.maxWidth != 'undefined' )
    32                 tbWindow.css({'margin-top': '-' + parseInt((( H - 10 ) / 2),10) + 'px'});
     31                tbWindow.css({'top':'20px','margin-top':'0'});
    3332            $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
    34             $('#TB_ajaxWindowTitle').text('Add Media').css({'fontSize':'16px','fontWeight':'bold','paddingTop':'3px'});
    3533        };
    3634
     
    5149    });
    5250
    53 //  $(window).resize( function() { tb_position() } );
     51    $(window).resize( function() { tb_position() } );
    5452});
    5553
  • branches/crazyhorse/wp-admin/media-upload.php

    r8680 r8681  
    4040    $tab = strval($_GET['tab']);
    4141else
    42     $tab = apply_filters('media_upload_default_tab', 'library');
     42    $tab = apply_filters('media_upload_default_tab', 'type');
    4343
    4444$body_id = 'media-upload';
    4545
    4646// let the action code decide how to handle the request
    47 if ( isset($_POST['html-upload']) || 'single' == $tab )
    48     do_action("media_upload_image");
     47if ( $tab == 'type' )
     48    do_action("media_upload_$type");
    4949else
    50     do_action("media_upload_library");
     50    do_action("media_upload_$tab");
    5151
    5252?>
  • branches/crazyhorse/wp-admin/wp-admin.css

    r8677 r8681  
    18781878    padding: 2px;
    18791879}
     1880
     1881/* media popup 0819 */
     1882
     1883#sidemenu {
     1884    margin: -30px 15px 0 315px;
     1885    list-style: none;
     1886    position: relative;
     1887    float: right;
     1888    padding-left: 10px;
     1889    font-size:12px;
     1890}
     1891
     1892#sidemenu a {
     1893    padding: 0 7px;
     1894    display: block;
     1895    float: left;
     1896    line-height: 28px;
     1897    border-top-width: 1px;
     1898    border-top-style: solid;
     1899    border-bottom-width: 1px;
     1900    border-bottom-style: solid;
     1901}
     1902
     1903#sidemenu li {
     1904    display: inline;
     1905    line-height: 200%;
     1906    list-style: none;
     1907    text-align: center;
     1908    white-space: nowrap;
     1909    margin: 0;
     1910    padding: 0;
     1911}
     1912
     1913#sidemenu a.current {
     1914    font-weight: normal;
     1915    padding-left: 6px;
     1916    padding-right: 6px;
     1917    -moz-border-radius-topleft: 4px;
     1918    -khtml-border-top-left-radius: 4px;
     1919    -webkit-border-top-left-radius: 4px;
     1920    border-top-left-radius: 4px;
     1921    -moz-border-radius-topright: 4px;
     1922    -khtml-border-top-right-radius: 4px;
     1923    -webkit-border-top-right-radius: 4px;
     1924    border-top-right-radius: 4px;
     1925    border-width: 1px;
     1926    border-style: solid;
     1927}
     1928
     1929#sidemenu {
     1930    margin: -30px 15px 0 315px;
     1931    list-style: none;
     1932    position: relative;
     1933    float: right;
     1934    padding-left: 10px;
     1935    font-size:12px;
     1936}
     1937
     1938#sidemenu a {
     1939    padding: 0 7px;
     1940    display: block;
     1941    float: left;
     1942    line-height: 28px;
     1943    border-top-width: 1px;
     1944    border-top-style: solid;
     1945    border-bottom-width: 1px;
     1946    border-bottom-style: solid;
     1947}
     1948
     1949#sidemenu li a .count-0 {
     1950    display: none;
     1951}
  • branches/crazyhorse/wp-includes/general-template.php

    r8680 r8681  
    970970    }
    971971
    972     if ( $media_buttons ) { ?>
     972/*  if ( $media_buttons ) { ?>
    973973        <div id="media-buttons" class="hide-if-no-js">
    974974        <?php do_action( 'media_buttons' ); ?>
    975975        </div>
    976     <?php } ?>
     976    <?php } */ ?>
    977977    </div>
    978978
Note: See TracChangeset for help on using the changeset viewer.