Ticket #3360: 3360.diff
File 3360.diff, 7.6 KB (added by , 17 years ago) |
---|
-
wp-admin/wp-admin.css
206 206 border-style: none; 207 207 padding: 0px; 208 208 margin-bottom: 16px; 209 height: 1 7em;209 height: 18em; 210 210 width: 100%; 211 /* overflow-y: hidden;*/212 211 } 213 212 214 213 form#upload th { -
wp-admin/upload-js.php
74 74 params.action = ''; 75 75 h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "' title='Browse your files' class='back'>« Back</a>"; 76 76 } else { 77 h += "<a href='#' onclick=' theFileList.cancelView()' title='Browse your files' class='back'>« Back</a>";77 h += "<a href='#' onclick='return theFileList.cancelView();' title='Browse your files' class='back'>« Back</a>"; 78 78 } 79 79 h += "<div id='file-title'>" 80 80 if ( !this.currentImage.isImage ) … … 82 82 else 83 83 h += "<h2>" + this.currentImage.title + "</h2>"; 84 84 h += " — <span>"; 85 h += "<a href='#' onclick=' theFileList.editView(" + id + ")'>Edit</a>"85 h += "<a href='#' onclick='return theFileList.editView(" + id + ");'>Edit</a>" 86 86 h += "</span>"; 87 87 h += '</div>' 88 88 h += "<div id='upload-file-view' class='alignleft'>"; … … 136 136 params.action = ''; 137 137 h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "' title='Browse your files' class='back'>« Back</a>"; 138 138 } else { 139 h += "<a href='#' onclick=' theFileList.cancelView()' title='Browse your files' class='back'>« Back</a>";139 h += "<a href='#' onclick='return theFileList.cancelView();' title='Browse your files' class='back'>« Back</a>"; 140 140 } 141 141 h += "<div id='file-title'>" 142 142 if ( !this.currentImage.isImage ) … … 144 144 else 145 145 h += "<h2>" + this.currentImage.title + "</h2>"; 146 146 h += " — <span>"; 147 h += "<a href='#' onclick=' theFileList.imageView(" + id + ")'>Insert</a>"147 h += "<a href='#' onclick='return theFileList.imageView(" + id + ");'>Insert</a>" 148 148 h += "</span>"; 149 149 h += '</div>' 150 150 h += "<div id='upload-file-view' class='alignleft'>"; -
wp-admin/upload.php
35 35 36 36 $wp_upload_tabs = array_merge($wp_upload_tabs, apply_filters( 'wp_upload_tabs', array() )); 37 37 38 if ( ! function_exists($wp_upload_tabs[$tab][2]) ) {38 if ( !is_callable($wp_upload_tabs[$tab][2]) ) { 39 39 $to_tab = isset($wp_upload_tabs['upload']) ? 'upload' : 'browse-all'; 40 40 wp_redirect( add_query_arg( 'tab', $to_tab ) ); 41 41 exit; … … 76 76 77 77 echo "<ul id='upload-menu'>\n"; 78 78 foreach ( $wp_upload_tabs as $t => $tab_array ) { // We've already done the current_user_can check 79 $class = 'upload-tab';80 79 $href = add_query_arg( array('tab' => $t, 'ID' => '', 'action' => '', 'paged' => '') ); 81 80 if ( isset($tab_array[4]) && is_array($tab_array[4]) ) 82 81 add_query_arg( $tab_array[4], $href ); 83 82 $_href = wp_specialchars( $href, 1 ); 84 83 $page_links = ''; 84 $class = 'upload-tab alignleft'; 85 85 if ( $tab == $t ) { 86 86 $class .= ' current'; 87 87 if ( $tab_array[3] ) { … … 105 105 } 106 106 } 107 107 108 echo "\t<li class='$class alignleft'><div><a href='$_href' title='{$tab_array[0]}'>{$tab_array[0]}</a>$page_links</div></li>\n";108 echo "\t<li class='$class'><a href='$_href' class='upload-tab-link' title='{$tab_array[0]}'>{$tab_array[0]}</a>$page_links</li>\n"; 109 109 } 110 110 unset($t, $tab_array, $href, $_href, $page_links, $total, $per, $class); 111 111 echo "</ul>\n\n"; -
wp-admin/upload-rtl.css
1 #upload-menu li a.upload-tab-link { 2 float: right; 3 margin: 0 .75em 0 0; 4 } 5 1 6 table { float: right; } 2 7 8 #upload-menu li #current-tab-nav { 9 float: right; 10 padding: 5px 0 0 5px; 11 margin-right: -5px; 12 } 13 3 14 #upload-file th, #the-attachment-links textarea { text-align: left; } 4 15 5 16 h2 { margin: 0 0 0 .2em; } … … 9 20 #upload-file-view { padding: 0 75px 0 0; } 10 21 11 22 #upload-menu li { 12 margin: 0 .75em 0 0;13 23 display: block; 14 24 float: right; 15 25 } 16 26 17 #upload-menu .current div{27 #upload-menu li.current { 18 28 border-right: 0; 19 29 border-left: 2px solid #448abd; 20 30 } -
wp-admin/upload-functions.php
358 358 359 359 function wp_upload_admin_head() { 360 360 global $wp_locale; 361 echo "<link rel='stylesheet' href='" . get_option('siteurl') . '/wp-admin/upload.css?version=' . get_bloginfo('version') . " ' type='text/css' />\n";361 echo "<link rel='stylesheet' href='" . get_option('siteurl') . '/wp-admin/upload.css?version=' . get_bloginfo('version') . "a' type='text/css' />\n"; 362 362 if ( 'rtl' == $wp_locale->text_direction ) 363 echo "<link rel='stylesheet' href='" . get_option('siteurl') . '/wp-admin/upload-rtl.css?version=' . get_bloginfo('version') . " ' type='text/css' />\n";363 echo "<link rel='stylesheet' href='" . get_option('siteurl') . '/wp-admin/upload-rtl.css?version=' . get_bloginfo('version') . "a' type='text/css' />\n"; 364 364 if ( 'inline' == @$_GET['style'] ) { 365 echo "<style type='text/css'>\n"; 366 echo "\tbody { height: 15em; overflow: hidden; }\n"; 367 echo "\t#upload-content { overflow-y: auto; }\n"; 368 echo "\t#upload-file { position: absolute; }\n"; 365 echo "<style type='text/css' media='screen'>\n"; 366 echo "\t#upload-menu { position: absolute; z-index: 2; }\n"; 367 echo "\tbody > #upload-menu { position: fixed; }\n"; 368 echo "\t#upload-content { top: 2em; }\n"; 369 echo "\t#upload-file { position: absolute; top: 15px; }\n"; 369 370 echo "</style>"; 370 371 } 371 372 } -
wp-admin/upload.css
3 3 .upload-file-data { display: none; } 4 4 5 5 #upload-menu { 6 b ackground:#247fab;7 margin: 0 px;6 border-top: 2em solid #247fab; 7 margin: 0; 8 8 padding: 0; 9 height: 0; 9 10 list-style: none; 10 height: 2em;11 border-bottom: 1px solid #448abd;12 11 width: 100%; 13 12 } 14 13 15 #upload-menu li { margin: 0 0 0 .75em; }14 body > #upload-menu { border-bottom: 7px solid #fff; } 16 15 17 #upload-menu li div { 18 padding: 5px; 16 #upload-menu li { 17 margin: 0; 18 position: relative; 19 top: -2em; 20 padding-bottom: 5px; 21 border: none; 19 22 border-top: 3px solid #247fab; 20 23 } 21 24 22 #upload-menu li a { 25 #upload-menu li a.upload-tab-link { 26 margin-left: 0.75em; 27 padding: 5px 5px 0; 28 display: block; 29 float: left; 30 height: 100%; 23 31 text-decoration: none; 24 32 border-bottom: none; 25 33 color: #fff; 26 34 } 27 35 28 #upload-menu li span a.page-numbers { color: #00019b; } 29 30 #upload-menu .current div { 31 background: #f9fcfe; 36 #upload-menu li.current { 32 37 border-right: 2px solid #448abd; 33 38 color: #000; 34 39 } 35 40 36 #upload-menu .current div a, #upload-menu div:hover a { 41 #upload-menu li.current a.upload-tab-link, #upload-menu li a:hover { 42 background: #f9fcfe; 37 43 color: #000; 38 44 } 39 45 40 #upload-menu div:hover { 41 background: #f9fcfe; 42 color: #000; 46 #upload-menu li #current-tab-nav { 47 float: left; 48 padding: 5px 5px 0 0; 49 margin-left: -5px; 43 50 } 44 51 52 #upload-menu li span .page-numbers { 53 padding: 0; 54 border: none; 55 } 56 57 #upload-menu li span a.page-numbers { color: #00019b; } 58 #upload-menu li span a.page-numbers:hover { text-decoration: underline; } 59 45 60 #upload-content { 46 61 position: relative; 47 62 clear: both;