WordPress.org

Make WordPress Core

Ticket #26387: 26387.8.diff

File 26387.8.diff, 16.9 KB (added by melchoyce, 8 years ago)
  • wp-admin/about.php

     
    2121
    2222<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
    2323
    24 <div class="about-text"><?php printf( __( 'Thank you for updating to WordPress 3.8! We&rsquo;re happy to bring you the most beautiful WordPress yet.' ), $display_version ); ?></div>
     24<div class="about-text"><?php printf( __( 'Thank you for updating to WordPress 3.8, the most beautiful WordPress yet.' ), $display_version ); ?></div>
    2525
    2626<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
    2727
     
    3636</h2>
    3737
    3838<div class="changelog">
    39         <h2 class="about-headline-callout"><?php echo ( 'Introducing a new, modern admin design' ); ?></h2>
     39        <h2 class="about-headline-callout"><?php echo ( 'Introducing a modern new design' ); ?></h2>
    4040        <img class="about-overview-img" src="<?php echo admin_url( 'images/about-overview.png' ); ?>" />
    4141
    4242        <div class="feature-section col three-col about-updates">
    4343                <div class="col-1">
    44                         <p style="margin-top: 20px; background-color: grey; padding: 1em; color: white; min-height: 150px;">Image</p>
    45                         <h3><?php echo ( 'Modern aesthetics' ); ?></h3>
    46                         <p><?php echo ( 'Goodbye decoration, hello simplicity. We removed extraneous details, focusing on a cleaner, more streamlined admin design.' ); ?></p>
     44                        <img src="images/about-modern-aesthetics.png" />
     45                        <h3><?php echo ( 'Modern aesthetic' ); ?></h3>
     46                        <p><?php echo ( 'The new admin has a fresh, simple design that puts clarity and simplicity ahead of web design flourishes.' ); ?></p>
    4747                </div>
    4848                <div class="col-2">
    49                         <p style="margin-top: 20px; background-color: grey; padding: 1em; color: white; min-height: 150px;">Image</p>
    50                         <h3><?php echo ( 'Improved typography' ); ?></h3>
    51                         <p><?php echo ( 'You might notice the type is a little bit bigger. We improved the typography, crafting a better reading experience.' ); ?></p>
     49                        <img src="images/about-typography.png" />
     50                        <h3><?php echo ( 'Clean typography' ); ?></h3>
     51                        <p><?php echo ( 'Open sans meets open source. WordPress&#8217;s new typography is upright, friendly, and optimized for web and mobile interfaces.' ); ?></p>
    5252                </div>
    5353                <div class="col-3 last-feature">
    54                         <p style="margin-top: 20px; background-color: grey; padding: 1em; color: white; min-height: 150px;">Image</p>
    55                         <h3><?php echo ( 'Higher contrast' ); ?></h3>
    56                         <p><?php echo ( 'With bigger typography and both high and low contrast color schemes, our new admin design is great for users of all ages.' ); ?></p>
     54                        <img src="images/about-contrast.png" />
     55                        <h3><?php echo ( 'Refined contrast' ); ?></h3>
     56                        <p><?php echo ( 'What good is beautiful design if you can&#8217;t see it? Improved contrast gives you a better reading experience.' ); ?></p>
    5757                </div>
    5858        </div>
    5959</div>
    6060
    6161<hr>
    6262
    63 <!-- Image example -->
    64 <!-- <img alt="" src="<?php echo admin_url( 'images/about-search-2x.png' ); ?>" /> -->
    65 
    6663<div class="changelog">
    6764        <div class="feature-section col two-col">
    6865                <div>
    69                         <h3><?php echo ( 'Take WordPress with you anywhere with our responsive design' ); ?></h3>
    70                         <p><?php echo ( 'The WordPress admin is now completely responsive: you can work on your website easily from your smartphone or tablet. The full power of WordPress is at your fingertips, even when you’re on the go.' ); ?></p>
    71                         <h4><?php echo ( 'Naturally HiDPI' ); ?></h4>
    72                         <p><?php echo ( 'No more blurry edges &#8212; with the inclusion of vector icons and graphics, the admin is now entirely HiDPI, so you get the best viewing experience no matter what kind of computer or mobile device you use.' ); ?></p>
     66                        <h3><?php echo ( 'WordPress on every device' ); ?></h3>
     67                        <p><?php echo ( 'Whether you&#8217;re on your smartphone or tablet, your notebook or desktop, WordPress looks beautiful on every device. Now you can update your website wherever you are.' ); ?></p>
     68                        <h4><?php echo ( 'High definition is here' ); ?></h4>
     69                        <p><?php echo ( 'WordPress is sharper than ever; vector icons and graphics mean no more blurry edges. You get the best viewing experience no matter what type of device you use.' ); ?></p>
    7370                </div>
    7471                <div class="last-feature about-colors-img">
    7572                        <img src="<?php echo admin_url( 'images/about-colors.png' ); ?>" />
     
    8279<div class="changelog about-colors">
    8380        <div class="feature-section col one-col">
    8481                <div>
    85                         <h3><?php echo ( 'Now with more color' ); ?></h3>
    86                         <p><?php echo ( 'Your admin is not longer monochromatic &#8212; we&#8217;ve brought some more color to keep it looking fresh. You now have the option of four different default color schemes.' ); ?></p>
    87                         <p><?php echo ( 'Try them out below:' ); ?></p>
    88                         <img src="https://i.cloudup.com/NBlGusRk0H.png" style="border: 2px solid red; max-width: 99%; margin: 0;" />
    89                         <p><?php echo ( 'You can change your color scheme at any time from your profile page.' ); ?></p>
     82                        <h3><?php echo ( 'Pick a color' ); ?></h3>
     83                        <p><?php echo ( 'We&#8217;ve included four color schemes so that you can choose your favorite. Don&#8217;t like this striking new admin? Choose from any of the schemes below to change it in an instant.' ); ?></p>
     84                        <?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) :?>
     85                                <?php
     86                                /** This action is documented in wp-admin/user-edit.php */
     87                                do_action( 'admin_color_scheme_picker' );
     88                                ?>
     89                        <?php else : ?>
     90                                <img src="<?php echo admin_url( 'images/about-color-schemes.png' ); ?>" />
     91                        <?php endif; ?>
     92                        <p><?php printf( ( 'To change your color scheme later, just <a href="%1$s">visit your profile settings</a>.' ), get_edit_profile_url( get_current_user_id() ) ); ?></p>
    9093                </div>
    9194        </div>
    9295</div>
     
    97100        <div class="feature-section col two-col">
    98101                <div>
    99102                        <h3><?php echo ( 'A new theme experience' ); ?></h3>
    100                         <p><?php echo ( 'A sleeker, faster, and more visual organization of your themes that is responsive.' ); ?></p>
    101                         <h4><?php echo ( 'Browse better' ); ?></h4>
    102                         <p><?php echo ( 'Enjoy a focused experience with theme screenshots at the center. Quickly search through your themes or add new ones.' ); ?></p>
     103                        <p><?php echo ( 'Finding and installing the right theme has never been easier.' ); ?></p>
     104                        <h4><?php echo ( 'Better browsing' ); ?></h4>
     105                        <p><?php echo ( 'Focus is placed on what&#8217;s important - your theme&#8217;s design. Search through your themes at a glance and add new ones with a click.' ); ?></p>
    103106                        <h4><?php echo ( 'Dive into the details' ); ?></h4>
    104                         <p><?php echo ( 'Expand a theme to see more information and preview it. Use the arrow navigation to quickly swift through your themes.' ); ?></p>
    105                         <h4><?php echo ( 'Easier updates' ); ?></h4>
    106                         <p><?php echo ( 'Identify immediately when a theme update is available.' ); ?></p>
     107                        <p><?php echo ( 'If you need information about any of your themes just click to discover more. Sit back and use your keyboard&#8217;s navigation arrows to flip through every theme you&#8217;ve got.' ); ?></p>
     108                        <h4><?php echo ( 'Stay updated' ); ?></h4>
     109                        <p><?php echo ( 'You can tell in an instant if a theme needs updated and, like so many things in WordPress, updating it takes just a second.' ); ?></p>
    107110                </div>
    108111                <div class="last-feature about-themes-img">
    109112                        <img src="<?php echo admin_url( 'images/about-themes.png' ); ?>" />
     
    117120        <h2 class="about-headline-callout"><?php echo ( 'Twenty Fourteen, a sleek new magazine theme' ); ?></h2>
    118121        <img src="<?php echo admin_url( 'images/about-twentyfourteen.png' ); ?>" />
    119122
    120         <div class="feature-section col one-col">
     123        <div class="feature-section col one-col center-col">
    121124                <div>
    122                         <h3><?php echo ( 'Our new default theme lets you create a responsive magazine website with an elegant, modern design.' ); ?></h3>
    123                         <p><?php echo ( 'Feature your favorite homepage content in either a grid or a slider. Use the three widget areas to customize your website, and change your content&#8217;s layout with a full width page template and a contributor page to show of your authors.' ); ?></p>
     125                        <h3><?php echo ( 'Turn your blog into a magazine' ); ?></h3>
     126                        <p><?php echo ( 'With a striking design that does not comprise on our trademark simplicity, Twenty Fourteen is our boldest default theme. Choose a grid or a slider to display featured content on your homepage. Customize your homepage with three widget areas or change your layout with two page templates.' ); ?></p>
    124127                        <p><?php echo ( 'Creating a magazine website with WordPress has never been easier.' ); ?></p>
    125128                </div>
    126129        </div>
     
    128131
    129132<hr>
    130133
    131 <div class="changelog">
    132         <h3><?php echo ( 'Under the Hood' ); ?></h3>
    133 
    134         <div class="feature-section col three-col">
    135                 <div>
    136                         <h4><?php echo ( 'Meta query fixes' ); ?></h4>
    137                         <p><?php echo ( 'Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Vestibulum id ligula porta felis.' ); ?></p>
    138                 </div>
    139                 <div>
    140                         <h4><?php echo ( 'Automated RTL styles' ); ?></h4>
    141                         <p><?php echo ( 'Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Vestibulum id ligula porta felis.' ); ?></p>
    142                 </div>
    143                 <div class="last-feature">
    144                         <h4><?php echo ( 'Improved customizer' ); ?></h4>
    145                         <p><?php echo ( 'Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Vestibulum id ligula porta felis.' ); ?></p>
    146                 </div>
    147 </div>
    148 
    149134<div class="return-to-dashboard">
    150135        <?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
    151136        <a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>"><?php
  • wp-admin/css/wp-admin.css

     
    78677867
    78687868/* 3.8 Images */
    78697869
    7870 .about-wrap .about-colors-img,
    7871 .about-wrap .about-themes-img {
     7870.about-wrap .about-colors-img {
    78727871        bottom: -25px;
    78737872}
    78747873
     7874.about-wrap .about-themes-img {
     7875        bottom: -32px;
     7876}
     7877
    78757878.about-wrap .about-overview-img {
    78767879        border-bottom: 1px solid #ddd;
    78777880}
     
    79547957        margin-bottom: 0;
    79557958}
    79567959
    7957 .about-wrap .feature-section.one-col div {
     7960.about-wrap .feature-section.center-col > div {
    79587961        margin: auto;
    79597962        width: 60%;
    79607963}
    79617964
    7962 .about-wrap .about-colors .one-col div {
     7965.about-wrap .about-colors .one-col > div {
    79637966        width: 100%;
    79647967}
    79657968
    7966 .about-wrap .feature-section.two-col div {
     7969.about-wrap .feature-section.two-col > div {
    79677970        position: relative;
    79687971        width: 50%;
    79697972        float: left;
    79707973}
    79717974
    7972 .about-wrap .feature-section.two-col div p {
    7973         margin-right: 3%;
    7974 }
    7975 
    7976 .about-wrap .feature-section.three-col div {
     7975.about-wrap .feature-section.three-col > div {
    79777976        position: relative;
    7978         width: 30%;
     7977        width: 29.95%;
    79797978        margin-right: 4.999999999%;
    79807979        float: left;
    79817980}
     
    79847983        margin-right: 0;
    79857984}
    79867985
    7987 .about-wrap .three-col.about-updates img {
    7988         margin: 0;
    7989 }
     7986.about-wrap .about-updates img {
     7987        margin: 2em 0 0 0;
     7988        border: 1px solid #ddd;
     7989        -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
     7990        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
     7991}
    79907992
    79917993.about-wrap .changelog .feature-section {
    79927994        overflow: hidden;
    79937995}
    79947996
    7995 .about-wrap .about-passwords {
    7996         margin: 20px 0;
    7997         padding: 1px 20px 10px;
    7998         background-color: #fff;
     7997.about-wrap .about-colors .scheme-list {
     7998        margin-bottom: 1em;
    79997999}
    80008000
    8001 .about-wrap .about-auto-update {
    8002         text-align: center;
    8003         background-color: #f9f9ef;
    8004         clear: both;
    8005         padding: 10px;
     8001.about-wrap .about-colors .color-option {
     8002        width: 24%;
     8003        padding-top: 10px;
    80068004}
    8007 
    8008 .about-wrap .about-auto-update.cool {
    8009         background-color: #eff9ef;
     8005.about-wrap .about-colors .color-option label {
     8006        display: inline-block;
     8007        margin: 0.25em 0 0.5em;
    80108008}
    80118009
    8012 .about-wrap .about-password-meter input {
    8013         font-size: 250%;
    8014         line-height: 1;
    8015         width: 100%;
    8016         display: block;
    8017         padding: 5px;
     8010.about-wrap .feature-section.two-col div p {
     8011        margin-right: 3%;
    80188012}
    80198013
    8020 .about-wrap .about-password-meter #pass-strength-result {
    8021         display: block !important;
    8022         font-size: 150%;
    8023         font-weight: normal !important;
    8024         -webkit-box-sizing: border-box;
    8025         -moz-box-sizing:    border-box;
    8026         box-sizing:         border-box;
    8027         width: 100%;
    8028         padding: 17px 0;
    8029         margin-bottom: 15px;
    8030 }
    8031 
    80328014.about-wrap .feature-section div p img {
    80338015        float: right;
    80348016        margin-left: 10px;
     
    1273812720        }
    1273912721
    1274012722        /*  About Page */
    12741         .about-wrap .feature-section.two-col div {
     12723        .about-wrap .feature-section.one-col > div,
     12724        .about-wrap .feature-section.two-col > div,
     12725        .about-wrap .three-col.about-updates > div  {
    1274212726                width: 100%;
    1274312727                margin: 0;
    1274412728                float: none;
    1274512729        }
    1274612730
    12747         .about-wrap .three-col.about-updates .col-1,
    12748                 /*.about-wrap .three-col.about-updates .col-2,*/
    12749         .about-wrap .three-col.about-updates .col-3 {
    12750                 padding: 0;
     12731        .about-wrap .about-colors .color-option {
     12732                width: 49%;
    1275112733        }
    1275212734
    12753         .about-wrap .three-col.about-updates .col-1 {
    12754                 width: 100%;
    12755                 padding-right: 210px;
    12756         }
    12757 
    12758         .about-wrap .three-col.about-updates .col-2 {
    12759                 position: relative;
    12760                 float: right;
    12761                 width: 180px;
    12762                 margin-left: -100%;
    12763         }
    12764 
    12765         .about-wrap .three-col.about-updates .col-3 {
    12766                 width: 100%;
    12767         }
    12768 
    12769         .about-wrap .about-password-meter input,
    12770         .about-wrap .about-password-meter #pass-strength-result {
    12771                 width: 99%;
    12772         }
    12773 
    1277412735        /* Moderate Comment */
    1277512736        .comment-ays {
    1277612737                border-bottom: none;
     
    1291112872                float: none;
    1291212873        }
    1291312874
    12914         .about-wrap .about-passwords {
    12915                 margin: 20px -20px;
    12916         }
    12917 
    1291812875        /* Align Add Media + Visual + Text tabs */
    1291912876        #wp-content-media-buttons a {
    1292012877                font-size: 14px;
  • wp-admin/js/about.js

     
    1 /* global pwsL10n:true */
     1/* global isRtl */
    22(function($){
    3         var password = 'Gosh, WordPress is grand.',
    4                 $input = $('#pass'),
    5                 shouldAnimate = true,
    6                 timesForAnimation = [280, 300, 305, 310, 315, 325, 330, 345, 360, 370, 380, 400, 450, 500, 600],
    7                 resultsCache = {},
    8                 indicatorString = $('#pass-strength-result').text();
    93
    10         function updateResult(){
    11                 var strength;
    12 
    13                 if ( typeof( resultsCache[ $input.val() ]) === 'undefined') {
    14                         strength = wp.passwordStrength.meter($input.val(), [], $input.val());
    15                         resultsCache[ $input.val() ] = strength;
    16                 } else {
    17                         strength = resultsCache[ $input.val() ];
     4        $(document).ready( function() {
     5                var $colorpicker, $stylesheet;
     6       
     7                $('.color-palette').click( function() {
     8                        $(this).siblings('input[name="admin_color"]').prop('checked', true);
     9                });
     10       
     11                $colorpicker = $( '#color-picker' );
     12                $stylesheet = $( '#colors-css' );
     13                if ( isRtl ){
     14                        $stylesheet = $( '#colors-rtl-css' );
    1815                }
     16       
     17                $colorpicker.on( 'click.colorpicker', '.color-option', function() {
     18                        var colors, css_url,
     19                                $this = $(this);
     20       
     21                        if ( $this.hasClass( 'selected' ) ) {
     22                                return;
     23                        }
     24       
     25                        $this.siblings( '.selected' ).removeClass( 'selected' );
     26                        $this.addClass( 'selected' ).find( 'input[type="radio"]' ).prop( 'checked', true );
     27       
     28                        // Set color scheme
     29                        // Load the colors stylesheet
     30                        css_url = $this.children( '.css_url' ).val();
     31                        if ( isRtl ){
     32                                css_url = css_url.replace('.min', '-rtl.min');
     33                        }
    1934
    20                 $('#pass-strength-result').removeClass('short bad good strong');
    21                 switch ( strength ) {
    22                         case 2:
    23                                 $('#pass-strength-result').addClass('bad').html( pwsL10n.bad );
    24                                 break;
    25                         case 3:
    26                                 $('#pass-strength-result').addClass('good').html( pwsL10n.good );
    27                                 break;
    28                         case 4:
    29                                 $('#pass-strength-result').addClass('strong').html( pwsL10n.strong );
    30                                 break;
    31                         default:
    32                                 $('#pass-strength-result').addClass('short').html( pwsL10n['short'] );
    33                 }
    34         }
    35         function resetMeter(){
    36                 $input.val('');
    37                 $('#pass-strength-result').text(indicatorString);
    38                 $('#pass-strength-result').removeClass('short bad good strong');
    39         }
     35                        $stylesheet.attr( 'href', css_url );
    4036
    41         function animate(){
    42                 if (shouldAnimate === false)
    43                         return;
    44                 if ($input.val().length < password.length){
    45                         $input.val( password.substr(0, $input.val().length + 1) );
    46                         updateResult();
     37                        // repaint icons
     38                        if ( typeof wp !== 'undefined' && wp.svgPainter ) {
     39                                try {
     40                                        colors = $.parseJSON( $this.children( '.icon_colors' ).val() );
     41                                } catch ( error ) {}
    4742
    48                         // Look like real typing by changing the speed new letters are added each time
    49                         setTimeout( animate, ( timesForAnimation[ Math.floor( Math.random() * timesForAnimation.length ) ] ) );
    50                 } else {
    51                         resetMeter();
    52 
    53                         // When we reset, let's wait a bit longer than normal to start again
    54                         setTimeout(animate, 700);
    55                 }
    56 
    57         }
    58 
    59         function begin(){
    60                 // we async load zxcvbn, so we need to make sure it's loaded before starting
    61                 if (typeof(zxcvbn) !== 'undefined')
    62                         animate();
    63                 else
    64                         setTimeout(begin,800);
    65         }
    66 
    67         // Turn off the animation on focus
    68         $input.on('focus', function(){
    69                 shouldAnimate = false;
    70                 resetMeter();
     43                                if ( colors ) {
     44                                        wp.svgPainter.setColors( colors );
     45                                        wp.svgPainter.paint();
     46                                }
     47                        }
     48                });
    7149        });
    7250
    73         // Act like a normal password strength meter
    74         $input.on('keyup', function(){
    75                 updateResult();
    76         });
    77 
    78         // Start the animation
    79         begin();
    80 
    8151})(jQuery);