Index: /trunk/src/wp-admin/css/common.css =================================================================== --- /trunk/src/wp-admin/css/common.css (revision 27558) +++ /trunk/src/wp-admin/css/common.css (revision 27559) @@ -1789,56 +1789,114 @@ } -/* Header on thickbox */ -#plugin-information-header { +/* Plugin install thickbox */ +#plugin-information { + background: #fcfcfc; + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + height: auto; + padding: 0; +} + +#plugin-information-title { + padding: 0 36px 0 16px; + font-size: 18px; + font-weight: 600; + line-height: 36px; + top: 0; + right: 0; + left: 0; + height: 36px; + border-bottom: 1px solid #ddd; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +#plugin-information-tabs { + padding: 0 16px; + position: absolute; + top: 56px; + right: 0; + left: 0; + height: 36px; + z-index: 1; +} + +#plugin-information-tabs a { + position: relative; + float: left; + padding: 8px 10px 9px; margin: 0; - padding: 0 5px; - font-weight: 600; - position: relative; - border-bottom: 1px solid #dfdfdf; - height: 2.5em; - background-color: #f9f9f9; -} -#plugin-information ul#sidemenu { - font-weight: normal; - margin: 0 5px; + height: 18px; + line-height: 18px; + font-size: 14px; + text-decoration: none; + transition: none; +} + +#plugin-information-tabs a.current { + margin: -1px -1px 0; + background: #fff; + border: 1px solid #ddd; + border-bottom: none; + color: #333; +} + +#plugin-information-tabs a:active, +#plugin-information-tabs a:focus { + outline: none; +} + +#plugin-information-content { + background: #fff; + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; position: absolute; + top: 90px; + right: 0; + bottom: 44px; left: 0; - bottom: -1px; -} - -/* Install sidemenu */ -#plugin-information { - height: auto; -} - -#plugin-information p.action-button { - width: 100%; - padding-bottom: 0; - margin-bottom: 0; - margin-top: 10px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; -} - -#plugin-information .action-button a { - background-color: #2ea2cc; - color: #fff; - text-align: center; - font-weight: 600; - text-decoration: none; - display: block; - line-height: 2em; -} - -#plugin-information h2 { - clear: none !important; - margin-right: 200px; + overflow: auto; +} + +#section-holder { + margin: 0; + padding: 10px 26px; + position: absolute; + top: 0; + right: 250px; + bottom: 0; + left: 0; +} + +#section-holder .updated { + margin: 16px 0; } #plugin-information .fyi { - margin: 0 10px 50px; - width: 210px; + background: #f3f3f3; + border: 1px solid #ddd; + border-top: 0; + color: #666; + padding: 16px; + position: absolute; + top: 0; + right: 0; + width: 217px; +} + +#plugin-information .fyi strong { + color: #464646; +} + +#plugin-information .fyi h3 { + font-weight: bold; + text-transform: uppercase; + font-size: 12px; + color: #666; + margin: 24px 0 8px; } @@ -1849,33 +1907,32 @@ } -#plugin-information .fyi h2.mainheader { - padding: 5px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - background-color: #cee1ef; -} - #plugin-information .fyi ul { - padding: 10px 5px 10px 7px; + padding: 0; margin: 0; list-style: none; - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - background-color: #eaf3fa; } #plugin-information .fyi li { - margin-right: 0; -} - -#plugin-information #section-holder { - padding: 10px; + margin: 0 0 10px; +} + +#plugin-information-footer { + padding: 8px 16px; + position: absolute; + right: 0; + bottom: 0; + left: 0; } #plugin-information .section ul, #plugin-information .section ol { - margin-left: 16px; - list-style-type: square; - list-style-image: none; + list-style-type: disc; + margin-left: 24px; +} + +#plugin-information .section, +#plugin-information .section p { + font-size: 14px; + line-height: 1.7; } @@ -1887,7 +1944,10 @@ #plugin-information #section-screenshots li img { vertical-align: text-top; + margin-top: 16px; max-width: 100%; width: auto; height: auto; + -webkit-box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.3 ); + box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.3 ); } @@ -1895,11 +1955,4 @@ font-style: italic; padding-left: 20px; - padding-bottom: 2em; -} - -#plugin-information #section-screenshots ol, -#plugin-information .updated, -#plugin-information pre { - margin-right: 215px; } @@ -1910,11 +1963,74 @@ } -#plugin-information pre, -#plugin-information code { - background-color: #ededff; -} - .plugin-version-author-uri { font-size: 13px; +} + +@media screen and ( max-width: 782px ) { + #plugin-information-content { + overflow: auto; + bottom: 62px; + } + + #plugin-information .fyi { + border: 1px solid #ddd; + position: static; + width: auto; + margin: 26px 26px 16px; + } + + #section-holder { + position: static; + } + + #plugin-information .fyi h3, + #plugin-information .fyi small { + display: none; + } + + #plugin-information-footer { + padding: 12px 16px; + height: 37px; + } +} + +/* Thickbox for Plugin Install screen */ +body.plugin-install-php #TB_window, +body.index-php #TB_window { + background: #fcfcfc url( ../images/spinner.gif ) no-repeat center; +} + +@media print, + (-o-min-device-pixel-ratio: 5/4), + (-webkit-min-device-pixel-ratio: 1.25), + (min-resolution: 120dpi) { + + body.plugin-install-php #TB_window, + body.index-php #TB_window { + background: #fcfcfc url( ../images/spinner-2x.gif ) no-repeat center; + } +} + +body.plugin-install-php #TB_title, +body.index-php #TB_title { + float: left; + height: 1px; +} + +body.plugin-install-php #TB_ajaxWindowTitle, +body.index-php #TB_ajaxWindowTitle { + display: none; +} + +body.plugin-install-php .tb-close-icon, +body.index-php .tb-close-icon { + line-height: 36px; + width: 36px; + height: 36px; +} + +body.plugin-install-php .tb-close-icon:before, +body.index-php .tb-close-icon:before { + line-height: 36px; } Index: /trunk/src/wp-admin/includes/plugin-install.php =================================================================== --- /trunk/src/wp-admin/includes/plugin-install.php (revision 27558) +++ /trunk/src/wp-admin/includes/plugin-install.php (revision 27559) @@ -313,6 +313,6 @@ $api = plugins_api( 'plugin_information', array( 'slug' => wp_unslash( $_REQUEST['plugin'] ), 'is_ssl' => is_ssl() ) ); - if ( is_wp_error($api) ) - wp_die($api); + if ( is_wp_error( $api ) ) + wp_die( $api ); $plugins_allowedtags = array( @@ -335,10 +335,14 @@ //Sanitize HTML - foreach ( (array)$api->sections as $section_name => $content ) + foreach ( (array)$api->sections as $section_name => $content ) { $api->sections[$section_name] = wp_kses($content, $plugins_allowedtags); + } + foreach ( array( 'version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug' ) as $key ) { if ( isset( $api->$key ) ) $api->$key = wp_kses( $api->$key, $plugins_allowedtags ); } + + $_tab = esc_attr( $tab ); $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English. @@ -349,6 +353,8 @@ iframe_header( __('Plugin Install') ); - echo "