From 88f4b87d15087a11842dfaef34f662db8744d5d1 Mon Sep 17 00:00:00 2001 From: nacin Date: Mon, 1 Mar 2010 00:50:55 +0000 Subject: [PATCH] Rearrange action links in the install plugins browser. First pass on the UI overhaul. see #11050 git-svn-id: http://svn.automattic.com/wordpress/trunk@13520 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/plugin-install.css | 2 +- wp-admin/css/plugin-install.dev.css | 5 +++++ wp-admin/includes/plugin-install.php | 14 ++++++-------- wp-includes/script-loader.php | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/wp-admin/css/plugin-install.css b/wp-admin/css/plugin-install.css index defbb4f289..50d3c03805 100644 --- a/wp-admin/css/plugin-install.css +++ b/wp-admin/css/plugin-install.css @@ -1 +1 @@ -div.star-holder{position:relative;height:19px;width:100px;font-size:19px;}div.star{height:100%;position:absolute;top:0;left:0;background-color:transparent;letter-spacing:1ex;border:none;}.star1{width:20%;}.star2{width:40%;}.star3{width:60%;}.star4{width:80%;}.star5{width:100%;}.star img,div.star a,div.star a:hover,div.star a:visited{display:block;position:absolute;right:0;border:none;text-decoration:none;}div.star img{width:19px;height:19px;border-left:1px solid #fff;border-right:1px solid #fff;}#plugin-information-header{margin:0;padding:0 5px;font-weight:bold;position:relative;border-bottom-width:1px;border-bottom-style:solid;height:2.5em;}#plugin-information ul#sidemenu{font-weight:normal;margin:0 5px;position:absolute;left:0;bottom:-1px;}#plugin-information p.action-button{width:100%;padding-bottom:0;margin-bottom:0;margin-top:10px;-moz-border-radius:3px 0 0 3px;-webkit-border-top-left-radius:3px;-khtml-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;-khtml-border-bottom-left-radius:3px;border-bottom-left-radius:3px;}#plugin-information .action-button a{text-align:center;font-weight:bold;text-decoration:none;display:block;line-height:2em;}#plugin-information h2{clear:none!important;margin-right:200px;}#plugin-information .fyi{margin:0 10px 50px;width:210px;}#plugin-information .fyi h2{font-size:.9em;margin-bottom:0;margin-right:0;}#plugin-information .fyi h2.mainheader{padding:5px;-moz-border-radius-topleft:3px;-webkit-border-top-left-radius:3px;-khtml-border-top-left-radius:3px;border-top-left-radius:3px;}#plugin-information .fyi ul{padding:10px 5px 10px 7px;margin:0;list-style:none;-moz-border-radius-bottomleft:3px;-webkit-border-bottom-left-radius:3px;-khtml-border-bottom-left-radius:3px;border-bottom-left-radius:3px;}#plugin-information .fyi li{margin-right:0;}#plugin-information #section-holder{padding:10px;}#plugin-information .section ul,#plugin-information .section ol{margin-left:16px;list-style-type:square;list-style-image:none;}#plugin-information #section-screenshots li img{vertical-align:text-top;}#plugin-information #section-screenshots li p{font-style:italic;padding-left:20px;padding-bottom:2em;}#plugin-information .updated,#plugin-information pre{margin-right:215px;}#plugin-information pre{padding:7px;} \ No newline at end of file +div.star-holder{position:relative;height:19px;width:100px;font-size:19px;}div.action-links{font-weight:normal;margin:6px 0 0;}div.star{height:100%;position:absolute;top:0;left:0;background-color:transparent;letter-spacing:1ex;border:none;}.star1{width:20%;}.star2{width:40%;}.star3{width:60%;}.star4{width:80%;}.star5{width:100%;}.star img,div.star a,div.star a:hover,div.star a:visited{display:block;position:absolute;right:0;border:none;text-decoration:none;}div.star img{width:19px;height:19px;border-left:1px solid #fff;border-right:1px solid #fff;}#plugin-information-header{margin:0;padding:0 5px;font-weight:bold;position:relative;border-bottom-width:1px;border-bottom-style:solid;height:2.5em;}#plugin-information ul#sidemenu{font-weight:normal;margin:0 5px;position:absolute;left:0;bottom:-1px;}#plugin-information p.action-button{width:100%;padding-bottom:0;margin-bottom:0;margin-top:10px;-moz-border-radius:3px 0 0 3px;-webkit-border-top-left-radius:3px;-khtml-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;-khtml-border-bottom-left-radius:3px;border-bottom-left-radius:3px;}#plugin-information .action-button a{text-align:center;font-weight:bold;text-decoration:none;display:block;line-height:2em;}#plugin-information h2{clear:none!important;margin-right:200px;}#plugin-information .fyi{margin:0 10px 50px;width:210px;}#plugin-information .fyi h2{font-size:.9em;margin-bottom:0;margin-right:0;}#plugin-information .fyi h2.mainheader{padding:5px;-moz-border-radius-topleft:3px;-webkit-border-top-left-radius:3px;-khtml-border-top-left-radius:3px;border-top-left-radius:3px;}#plugin-information .fyi ul{padding:10px 5px 10px 7px;margin:0;list-style:none;-moz-border-radius-bottomleft:3px;-webkit-border-bottom-left-radius:3px;-khtml-border-bottom-left-radius:3px;border-bottom-left-radius:3px;}#plugin-information .fyi li{margin-right:0;}#plugin-information #section-holder{padding:10px;}#plugin-information .section ul,#plugin-information .section ol{margin-left:16px;list-style-type:square;list-style-image:none;}#plugin-information #section-screenshots li img{vertical-align:text-top;}#plugin-information #section-screenshots li p{font-style:italic;padding-left:20px;padding-bottom:2em;}#plugin-information .updated,#plugin-information pre{margin-right:215px;}#plugin-information pre{padding:7px;} \ No newline at end of file diff --git a/wp-admin/css/plugin-install.dev.css b/wp-admin/css/plugin-install.dev.css index 87fc417c1b..21865e830f 100644 --- a/wp-admin/css/plugin-install.dev.css +++ b/wp-admin/css/plugin-install.dev.css @@ -6,6 +6,11 @@ div.star-holder { font-size: 19px; } +div.action-links { + font-weight: normal; + margin: 6px 0 0; +} + div.star { height: 100%; position: absolute; diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 1861c587fc..21de78238c 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -309,7 +309,6 @@ function display_plugins_table($plugins, $page = 1, $totalpages = 1){ - @@ -319,7 +318,6 @@ function display_plugins_table($plugins, $page = 1, $totalpages = 1){ - @@ -354,18 +352,19 @@ function display_plugins_table($plugins, $page = 1, $totalpages = 1){ $author = wp_kses($author, $plugins_allowedtags); - if ( isset($plugin['homepage']) ) - $title = '' . $title . ''; - $action_links = array(); $action_links[] = '' . __('Install') . ''; + esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __('Install') . ''; + if ( isset( $plugin['homepage'] ) ) + $action_links[] = '' . __('Info') . ''; $action_links = apply_filters('plugin_install_action_links', $action_links, $plugin); ?> - + +
+
@@ -378,7 +377,6 @@ function display_plugins_table($plugins, $page = 1, $totalpages = 1){
- add( 'press-this', "/wp-admin/css/press-this$suffix.css", array(), '20091022' ); $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' ); $styles->add( 'login', "/wp-admin/css/login$suffix.css", array(), '20091010' ); - $styles->add( 'plugin-install', "/wp-admin/css/plugin-install$suffix.css", array(), '20090514' ); + $styles->add( 'plugin-install', "/wp-admin/css/plugin-install$suffix.css", array(), '20100228' ); $styles->add( 'theme-install', "/wp-admin/css/theme-install$suffix.css", array(), '20090610' ); $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' ); $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );