Skip to content
Permalink
Browse files

About: Update Freedoms page to include illustrations.

@cathibosco has made some great illustrations of the Four Freedoms on https://wordpress.org/about/. Let's bring that over to the admin Freedoms page.

Props @melchoyce, @cathibosco, @boemedia, @karmatosed, @tobifjellner, @helen, @matveb, @mcsf.
Fixes #45386.



git-svn-id: https://develop.svn.wordpress.org/branches/5.0@43938 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information...
gziolo committed Nov 22, 2018
1 parent 8e65c87 commit a4f3345eca4249816fbe6d2be4ecfd071aefe705
Showing with 61 additions and 21 deletions.
  1. +17 −2 src/wp-admin/css/about.css
  2. +44 −19 src/wp-admin/freedoms.php
@@ -476,6 +476,21 @@
margin: 0.6em 0;
}

.freedoms-php .about-wrap .col .freedoms-image {
background-image: url('https://s.w.org/wp-content/themes/pub/wporg-main/images/freedoms-2x.png');
background-size: 100%;
padding-top: 100%;
}
.freedoms-php .about-wrap .col:nth-of-type(2) .freedoms-image {
background-position: 0 34%;
}
.freedoms-php .about-wrap .col:nth-of-type(3) .freedoms-image {
background-position: 0 66%;
}
.freedoms-php .about-wrap .col:nth-of-type(4) .freedoms-image {
background-position: 0 100%;
}

/*------------------------------------------------------------------------------
4.0 - Media Queries
------------------------------------------------------------------------------*/
@@ -507,7 +522,7 @@
.about-wrap .four-col .col {
min-width: 48% !important;
}

.about-wrap .eight-col .col {
min-width: 24% !important;
}
@@ -518,7 +533,7 @@
display: block;
margin: 0 auto;
}

.about-wrap figcaption {
position: relative;
margin-top: 10px;
@@ -45,25 +45,50 @@

<?php else : ?>
<div class="about-wrap-content">
<p class="about-description"><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'https://wordpress.org/about/license/' ); ?></p>

<ol start="0">
<li><p><?php _e( 'You have the freedom to run the program, for any purpose.' ); ?></p></li>
<li><p><?php _e( 'You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish.' ); ?></p></li>
<li><p><?php _e( 'You have the freedom to redistribute copies of the original program so you can help your neighbor.' ); ?></p></li>
<li><p><?php _e( 'You have the freedom to distribute copies of your modified versions to others. By doing this you can give the whole community a chance to benefit from your changes.' ); ?></p></li>
</ol>

<p><?php printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); ?></p>

<p><?php
$plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' );
$themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
printf( __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' ); ?></p>

<p><?php _e( 'Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
<div class="feature-section one-col">
<div class="col">
<h2><?php _e( 'Freedoms' ); ?></h2>
<p class="about-description"><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'https://wordpress.org/about/license/' ); ?></p>
</div>
</div>

<div class="feature-section four-col">
<div class="col">
<div class="freedoms-image"></div>
<h3><?php _e( 'The 1st Freedom' ); ?></h3>
<p><?php _e( 'To run the program for any purpose.' ); ?></p>
</div>
<div class="col">
<div class="freedoms-image"></div>
<h3><?php _e( 'The 2nd Freedom' ); ?></h3>
<p><?php _e( 'To study how the program works and change it to make it do what you wish.' ); ?></p>
</div>
<div class="col">
<div class="freedoms-image"></div>
<h3><?php _e( 'The 3rd Freedom' ); ?></h3>
<p><?php _e( 'To redistribute.' ); ?></p>
</div>
<div class="col">
<div class="freedoms-image"></div>
<h3><?php _e( 'The 4th Freedom' ); ?></h3>
<p><?php _e( 'To distribute copies of your modified versions to others.' ); ?></p>
</div>
</div>

<div class="feature-section one-col">
<div class="col">
<p><?php printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); ?></p>

<p><?php
$plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' );
$themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
printf( __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' ); ?></p>

<p><?php _e( 'Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
</div>
</div>
</div>

<?php endif; ?>

0 comments on commit a4f3345

Please sign in to comment.
You can’t perform that action at this time.