<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[33072] trunk/src/wp-admin: Improve the display of my-sites.php on small screens.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/33072">33072</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/33072","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-03 20:46:54 +0000 (Fri, 03 Jul 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Improve the display of my-sites.php on small screens.
Props tryon.
Fixes <a href="https://core.trac.wordpress.org/ticket/31685">#31685</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadminmysitesphp">trunk/src/wp-admin/my-sites.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscommoncss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/common.css 2015-07-03 20:46:48 UTC (rev 33071)
+++ trunk/src/wp-admin/css/common.css 2015-07-03 20:46:54 UTC (rev 33072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,6 +647,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .striped > tbody > :nth-child(odd),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ul.striped > :nth-child(odd),
</ins><span class="cx" style="display: block; padding: 0 10px"> .alternate {
</span><span class="cx" style="display: block; padding: 0 10px"> background-color: #f9f9f9;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3039,6 +3040,128 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-bottom: 1px solid #dfdfdf;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* My Sites */
+.my-sites {
+ display: block;
+ overflow: auto;
+ zoom: 1;
+ border: 1px solid #e5e5e5;
+}
+
+.my-sites li {
+ display: block;
+ padding: 8px 1%;
+ margin: 0;
+}
+
+@media only screen and (min-width: 600px) {
+ .my-sites.striped li {
+ background-color: #fff;
+ position: relative;
+ }
+ .my-sites.striped li:after {
+ content: "";
+ width: 1px;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ right: 0;
+ background: #ccc;
+ }
+
+}
+@media only screen and (min-width: 600px) and (max-width: 699px) {
+ .my-sites li{
+ float: left;
+ width: 48%;
+ }
+ .my-sites.striped li {
+ background-color: #fff;
+ }
+ .my-sites.striped li:nth-of-type(2n+2):after {
+ content: none;
+ }
+ .my-sites li:nth-of-type(4n+1),
+ .my-sites li:nth-of-type(4n+2) {
+ background-color: #f9f9f9;
+ }
+
+}
+
+@media only screen and (min-width: 700px) and (max-width: 1199px) {
+ .my-sites li {
+ float: left;
+ width: 31.333333%;
+ background-color: #fff;
+ }
+ .my-sites.striped li:nth-of-type(3n+3):after {
+ content: none;
+ }
+ .my-sites li:nth-of-type(6n+1),
+ .my-sites li:nth-of-type(6n+2),
+ .my-sites li:nth-of-type(6n+3) {
+ background-color: #f9f9f9;
+ }
+}
+
+@media only screen and (min-width: 1200px) and (max-width: 1399px) {
+ .my-sites li {
+ float: left;
+ width: 23%;
+ background-color: #fff;
+ }
+ .my-sites.striped li:nth-of-type(4n+4):after {
+ content: none;
+ }
+ .my-sites li:nth-of-type(8n+1),
+ .my-sites li:nth-of-type(8n+2),
+ .my-sites li:nth-of-type(8n+3),
+ .my-sites li:nth-of-type(8n+4) {
+ background-color: #f9f9f9;
+ }
+}
+
+@media only screen and (min-width: 1400px) and (max-width: 1599px) {
+ .my-sites li {
+ float: left;
+ width: 18%;
+ background-color: #fff;
+ }
+ .my-sites.striped li:nth-of-type(5n+5):after {
+ content: none;
+ }
+ .my-sites li:nth-of-type(10n+1),
+ .my-sites li:nth-of-type(10n+2),
+ .my-sites li:nth-of-type(10n+3),
+ .my-sites li:nth-of-type(10n+4),
+ .my-sites li:nth-of-type(10n+5) {
+ background-color: #f9f9f9;
+ }
+}
+
+@media only screen and (min-width: 1600px) {
+ .my-sites li {
+ float: left;
+ width: 14.666666%;
+ background-color: #fff;
+ }
+ .my-sites.striped li:nth-of-type(6n+6):after {
+ content: none;
+ }
+ .my-sites li:nth-of-type(12n+1),
+ .my-sites li:nth-of-type(12n+2),
+ .my-sites li:nth-of-type(12n+3),
+ .my-sites li:nth-of-type(12n+4),
+ .my-sites li:nth-of-type(12n+5),
+ .my-sites li:nth-of-type(12n+6) {
+ background-color: #f9f9f9;
+ }
+}
+
+.my-sites li a {
+ text-decoration: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* =Media Queries
</span><span class="cx" style="display: block; padding: 0 10px"> -------------------------------------------------------------- */
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminmysitesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/my-sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/my-sites.php 2015-07-03 20:46:48 UTC (rev 33071)
+++ trunk/src/wp-admin/my-sites.php 2015-07-03 20:46:54 UTC (rev 33072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,14 +68,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> choose_primary_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires before the sites table on the My Sites screen.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires before the sites list on the My Sites screen.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'myblogs_allblogs_options' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <br clear="all" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <table class="widefat fixed striped">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <ul class="my-sites striped">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Enable the Global Settings section on the My Sites screen.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,48 +91,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $settings_html = apply_filters( 'myblogs_options', '', 'global' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $settings_html != '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<tr><td><h3>' . __( 'Global Settings' ) . '</h3></td><td>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<h3>' . __( 'Global Settings' ) . '</h3>';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $settings_html;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '</td></tr>';
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> reset( $blogs );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $num = count( $blogs );
- $cols = 1;
- if ( $num >= 20 )
- $cols = 4;
- elseif ( $num >= 10 )
- $cols = 2;
- $num_rows = ceil( $num / $cols );
- $split = 0;
- for ( $i = 1; $i <= $num_rows; $i++ ) {
- $rows[] = array_slice( $blogs, $split, $cols );
- $split = $split + $cols;
- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $rows as $row ) {
- echo "<tr>";
- $i = 0;
- foreach ( $row as $user_blog ) {
- $s = $i == 3 ? '' : 'border-right: 1px solid #ccc;';
- echo "<td style='$s'>";
- echo "<h3>{$user_blog->blogname}</h3>";
- /**
- * Filter the row links displayed for each site on the My Sites screen.
- *
- * @since MU
- *
- * @param string $string The HTML site link markup.
- * @param object $user_blog An object containing the site data.
- */
- echo "<p>" . apply_filters( 'myblogs_blog_actions', "<a href='" . esc_url( get_home_url( $user_blog->userblog_id ) ). "'>" . __( 'Visit' ) . "</a> | <a href='" . esc_url( get_admin_url( $user_blog->userblog_id ) ) . "'>" . __( 'Dashboard' ) . "</a>", $user_blog ) . "</p>";
- /** This filter is documented in wp-admin/my-sites.php */
- echo apply_filters( 'myblogs_options', '', $user_blog );
- echo "</td>";
- $i++;
- }
- echo "</tr>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $blogs as $user_blog ) {
+ echo "<li>";
+ echo "<h3>{$user_blog->blogname}</h3>";
+ /**
+ * Filter the row links displayed for each site on the My Sites screen.
+ *
+ * @since MU
+ *
+ * @param string $string The HTML site link markup.
+ * @param object $user_blog An object containing the site data.
+ */
+ echo "<p class='my-sites-actions'>" . apply_filters( 'myblogs_blog_actions', "<a href='" . esc_url( get_home_url( $user_blog->userblog_id ) ). "'>" . __( 'Visit' ) . "</a> | <a href='" . esc_url( get_admin_url( $user_blog->userblog_id ) ) . "'>" . __( 'Dashboard' ) . "</a>", $user_blog ) . "</p>";
+ /** This filter is documented in wp-admin/my-sites.php */
+ echo apply_filters( 'myblogs_options', '', $user_blog );
+ echo "</li>";
</ins><span class="cx" style="display: block; padding: 0 10px"> }?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </table>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </ul>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="updateblogsettings" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'update-my-sites' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button(); ?>
</span></span></pre>
</div>
</div>
</body>
</html>