<!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>[20272] trunk/wp-admin: Responsive columns on the dashboard and write screens, first run, see #20015</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20272">20272</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2012-03-23 21:41:00 +0000 (Fri, 23 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Responsive columns on the dashboard and write screens, first run, see <a href="http://core.trac.wordpress.org/ticket/20015">#20015</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsscolorsclassicdevcss">trunk/wp-admin/css/colors-classic.dev.css</a></li>
<li><a href="#trunkwpadmincsscolorsfreshdevcss">trunk/wp-admin/css/colors-fresh.dev.css</a></li>
<li><a href="#trunkwpadmincssiertldevcss">trunk/wp-admin/css/ie-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssiedevcss">trunk/wp-admin/css/ie.dev.css</a></li>
<li><a href="#trunkwpadmincsswpadminrtldevcss">trunk/wp-admin/css/wp-admin-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadmineditformcommentphp">trunk/wp-admin/edit-form-comment.php</a></li>
<li><a href="#trunkwpadmineditlinkformphp">trunk/wp-admin/edit-link-form.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
<li><a href="#trunkwpadminjscommondevjs">trunk/wp-admin/js/common.dev.js</a></li>
<li><a href="#trunkwpadminjspostboxdevjs">trunk/wp-admin/js/postbox.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsscolorsclassicdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-classic.dev.css (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-classic.dev.css 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/css/colors-classic.dev.css 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -136,6 +136,10 @@
</span><span class="cx"> border-top-color: #ccc;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ul.category-tabs li {
+ border-color: transparent;
+}
+
</ins><span class="cx"> div.tabs-panel,
</span><span class="cx"> .wp-tab-panel,
</span><span class="cx"> ul.category-tabs li.tabs,
</span></span></pre></div>
<a id="trunkwpadmincsscolorsfreshdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-fresh.dev.css (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-fresh.dev.css 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/css/colors-fresh.dev.css 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -144,6 +144,10 @@
</span><span class="cx"> border-top-color: #ccc;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ul.category-tabs li {
+ border-color: transparent;
+}
+
</ins><span class="cx"> div.tabs-panel,
</span><span class="cx"> .wp-tab-panel,
</span><span class="cx"> ul.category-tabs li.tabs,
</span></span></pre></div>
<a id="trunkwpadmincssiertldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/ie-rtl.dev.css (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/ie-rtl.dev.css 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/css/ie-rtl.dev.css 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -126,10 +126,6 @@
</span><span class="cx"> height:22px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.inner-sidebar { /* fix edit single comment */
- position: static;
-}
-
</del><span class="cx"> form#widgets-filter { /* fix widget page */
</span><span class="cx"> position: static;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadmincssiedevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/ie.dev.css (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/ie.dev.css 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/css/ie.dev.css 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -1,4 +1,13 @@
</span><del>-/* Fixes for IE bugs */
</del><ins>+/* Fixes for IE 7 bugs */
+
+.wp-editor-wrap .wp-editor-container textarea.wp-editor-area {
+ width: 97%;
+}
+
+#post-body.columns-2 #postbox-container-1 {
+ padding-left: 19px;
+}
+
</ins><span class="cx"> .welcome-panel .wp-badge {
</span><span class="cx"> position: absolute;
</span><span class="cx"> }
</span><span class="lines">@@ -497,7 +506,6 @@
</span><span class="cx"> display: inline;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-* html .inner-sidebar #side-sortables,
</del><span class="cx"> * html .postbox-container .meta-box-sortables {
</span><span class="cx"> height: 300px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadmincsswpadminrtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin-rtl.dev.css (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin-rtl.dev.css 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/css/wp-admin-rtl.dev.css 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -2119,12 +2119,6 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#side-info-column {
- float: left;
- right: auto;
- left: 0;
-}
-
</del><span class="cx"> h3.tb {
</span><span class="cx"> margin-left: 0;
</span><span class="cx"> margin-right: 5px;
</span></span></pre></div>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/css/wp-admin.dev.css 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* inner 2 column liquid layout */
</span><ins>+/*
</ins><span class="cx"> .inner-sidebar {
</span><span class="cx"> float: right;
</span><span class="cx"> clear: right;
</span><span class="lines">@@ -140,10 +141,7 @@
</span><span class="cx"> margin-right: 300px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body-content #side-sortables.empty-container {
- border: 0 none;
- height: 0;
-}
</del><ins>+*/
</ins><span class="cx">
</span><span class="cx"> /* 2 columns main area */
</span><span class="cx">
</span><span class="lines">@@ -915,11 +913,6 @@
</span><span class="cx"> margin-top: -2px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body #major-publishing-actions {
- border-top: 0;
- margin-top: 0;
-}
-
</del><span class="cx"> #delete-action {
</span><span class="cx"> line-height: 25px;
</span><span class="cx"> vertical-align: middle;
</span><span class="lines">@@ -933,32 +926,6 @@
</span><span class="cx"> line-height: 23px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body #minor-publishing {
- padding-bottom: 10px;
-}
-
-#post-body #misc-publishing-actions {
- padding: 0;
-}
-
-#post-body .misc-pub-section {
- border-left-width: 1px;
- border-left-style: solid;
- border-top: 0;
- border-bottom: 0;
- min-height: 30px;
- float: left;
- max-width: 32%;
-}
-
-#post-body .misc-pub-section:first-child {
- border-left: 0;
-}
-
-#post-body .misc-pub-section-last {
- border-right: 0;
-}
-
</del><span class="cx"> #misc-publishing-actions {
</span><span class="cx"> padding: 6px 0 0;
</span><span class="cx"> }
</span><span class="lines">@@ -1217,6 +1184,10 @@
</span><span class="cx"> margin: 0 5px 0 2px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.metabox-prefs .columns-prefs label input {
+ margin: 0 2px;
+}
+
</ins><span class="cx"> .metabox-prefs label a {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="lines">@@ -1825,20 +1796,171 @@
</span><span class="cx"> margin: 0.6em 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* Screens with postboxes */
</ins><span class="cx"> .postbox-container {
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#dashboard-widgets.columns-1 .postbox-container {
+ width: 100%;
+}
+
+#dashboard-widgets.columns-2 .postbox-container {
+ width: 49.5%;
+}
+
+#dashboard-widgets.columns-2 #postbox-container-2,
+#dashboard-widgets.columns-2 #postbox-container-3,
+#dashboard-widgets.columns-2 #postbox-container-4 {
+ float: right;
+ width: 50.5%;
+}
+
+#dashboard-widgets.columns-3 .postbox-container {
+ width: 33.5%;
+}
+
+#dashboard-widgets.columns-3 #postbox-container-1 {
+ width: 33%;
+}
+
+#dashboard-widgets.columns-3 #postbox-container-3,
+#dashboard-widgets.columns-3 #postbox-container-4 {
+ float: right;
+}
+
+#dashboard-widgets.columns-4 .postbox-container {
+ width: 25%;
+}
+
</ins><span class="cx"> .postbox-container .meta-box-sortables {
</span><del>- min-height: 350px;
</del><ins>+ min-height: 50px;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.postbox-container .meta-box-sortables.empty-container,
-#side-sortables.empty-container {
</del><ins>+.postbox-container .meta-box-sortables:empty {
+ min-height: 0;
+ height: 0;
+}
+
+.metabox-holder .postbox-container .empty-container {
</ins><span class="cx"> border: 3px dashed #CCCCCC;
</span><del>- height: 350px;
</del><ins>+ height: 250px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.metabox-holder.columns-1 .postbox-container .empty-container,
+.columns-2 #postbox-container-3 .empty-container,
+.columns-2 #postbox-container-4 .empty-container,
+.columns-3 #postbox-container-4 .empty-container {
+ border: 0 none;
+ height: 0;
+ min-height: 0;
+}
+
+#poststuff {
+ padding-top: 10px;
+}
+
+#poststuff #post-body {
+ padding: 0;
+}
+
+#post-body-content {
+ width: 100%;
+ float: left;
+}
+
+#poststuff .postbox-container {
+ width: 100%;
+}
+
+#poststuff #post-body.columns-2 {
+ margin-right: 300px;
+}
+
+#post-body.columns-2 #postbox-container-1 {
+ float: right;
+ margin-right: -300px;
+ width: 280px;
+}
+
+/* one column on the dash */
+@media only screen and (max-width: 768px) {
+ #wpbody-content #dashboard-widgets .postbox-container {
+ width: 100%;
+ }
+
+ #wpbody-content .metabox-holder .postbox-container .empty-container {
+ border: 0 none;
+ height: 0;
+ min-height: 0;
+ }
+}
+
+/* two columns on the dash, but keep the setting if one is selected */
+@media only screen and (min-width: 768px) and (max-width: 1200px) {
+ #wpbody-content #dashboard-widgets .postbox-container {
+ width: 49.5%;
+ }
+
+ #wpbody-content #dashboard-widgets #postbox-container-2,
+ #wpbody-content #dashboard-widgets #postbox-container-3,
+ #wpbody-content #dashboard-widgets #postbox-container-4 {
+ float: right;
+ width: 50.5%;
+ }
+
+ #wpbody-content .metabox-holder .postbox-container .empty-container,
+ #wpbody-content #postbox-container-3 .empty-container,
+ #wpbody-content #postbox-container-4 .empty-container {
+ border: 0 none;
+ height: 0;
+ min-height: 0;
+ }
+
+ #wpbody #wpbody-content #dashboard-widgets.columns-1 .postbox-container {
+ width: 100%;
+ }
+
+ #wpbody #wpbody-content .metabox-holder.columns-1 .postbox-container .empty-container {
+ border: 0 none;
+ height: 0;
+ min-height: 0;
+ }
+
+ /* show the radio buttons for column prefs only for one or two columns */
+ .index-php .screen-layout,
+ .index-php .columns-prefs {
+ display: block;
+ }
+
+ .columns-prefs .columns-prefs-3,
+ .columns-prefs .columns-prefs-4 {
+ display: none;
+ }
+}
+
+/* one column on the post write/edit screen */
+@media only screen and (max-width: 1024px) {
+ #wpbody-content #poststuff #post-body {
+ margin: 0;
+ }
+
+ #wpbody-content #post-body.columns-2 #postbox-container-1 {
+ margin-right: 0;
+ width: 100%;
+ }
+
+ /* hide the radio buttons for column prefs */
+ .screen-layout,
+ .columns-prefs {
+ display: none;
+ }
+}
+
</ins><span class="cx"> .postbox .hndle {
</span><span class="cx"> cursor: move;
</span><span class="cx"> -webkit-border-top-left-radius: 3px;
</span><span class="lines">@@ -2746,82 +2868,25 @@
</span><span class="cx"> max-width: 260px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body ul.category-tabs,
-#post-body ul.add-menu-item-tabs {
- float: left;
- width: 120px;
- text-align: right;
- /* Negative margin for the sake of those without JS: all tabs display */
- margin: 0 -120px 0 5px;
- padding: 0;
-}
-
-#post-body ul.category-tabs li,
-#post-body ul.add-menu-item-tabs li {
- padding: 8px;
-}
-
-#post-body ul.category-tabs li.tabs,
-#post-body ul.add-menu-item-tabs li.tabs {
- -webkit-border-top-left-radius: 3px;
- -webkit-border-bottom-left-radius: 3px;
- border-top-left-radius: 3px;
- border-bottom-left-radius: 3px;
-}
-
-.wp-tab-panel,
-.categorydiv div.tabs-panel,
-.customlinkdiv div.tabs-panel,
-.posttypediv div.tabs-panel,
-.taxonomydiv div.tabs-panel,
-#linkcategorydiv div.tabs-panel {
- height: 200px;
- overflow: auto;
- padding: 0.5em 0.9em;
- border-style: solid;
- border-width: 1px;
-}
-
-.nav-menus-php .customlinkdiv div.tabs-panel,
-.nav-menus-php .posttypediv div.tabs-panel,
-.nav-menus-php .taxonomydiv div.tabs-panel {
- height: auto;
- max-height: 205px;
-}
-
-div.tabs-panel-active {
- display:block;
-}
-
-div.tabs-panel-inactive {
- display:none;
-}
-
-#post-body .categorydiv div.tabs-panel,
-.taxonomy div.tabs-panel,
-#post-body #linkcategorydiv div.tabs-panel {
- margin: 0 5px 0 125px;
-}
-
</del><span class="cx"> .press-this #side-sortables .category-tabs li,
</span><del>-.has-right-sidebar #side-sortables .category-tabs li,
</del><ins>+ul.category-tabs li,
</ins><span class="cx"> #side-sortables .add-menu-item-tabs li,
</span><span class="cx"> .wp-tab-bar li {
</span><span class="cx"> display: inline;
</span><span class="cx"> line-height: 1.35em;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.no-js #side-sortables .category-tabs li.hide-if-no-js {
</del><ins>+.no-js .category-tabs li.hide-if-no-js {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#side-sortables .category-tabs a,
</del><ins>+.category-tabs a,
</ins><span class="cx"> #side-sortables .add-menu-item-tabs a,
</span><span class="cx"> .wp-tab-bar a {
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#side-sortables .category-tabs {
</del><ins>+.category-tabs {
</ins><span class="cx"> margin: 8px 0 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2834,16 +2899,6 @@
</span><span class="cx"> margin-bottom: 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.categorydiv ul,
-.customlinkdiv ul,
-.posttypediv ul,
-.taxonomydiv ul,
-#linkcategorydiv ul {
- list-style: none;
- padding: 0;
- margin: 0;
-}
-
</del><span class="cx"> #normal-sortables .postbox #replyrow .submit {
</span><span class="cx"> float: none;
</span><span class="cx"> margin: 0;
</span><span class="lines">@@ -2867,14 +2922,13 @@
</span><span class="cx"> margin-top: 12px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ul.category-tabs li.tabs,
</del><ins>+ul.category-tabs li,
</ins><span class="cx"> ul.add-menu-item-tabs li.tabs,
</span><span class="cx"> .wp-tab-active {
</span><span class="cx"> border-style: solid solid none;
</span><span class="cx"> border-width: 1px 1px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body .category-tabs li.tabs,
</del><span class="cx"> #post-body .add-menu-item-tabs li.tabs {
</span><span class="cx"> border-style: solid none solid solid;
</span><span class="cx"> border-width: 1px 0 1px 1px;
</span><span class="lines">@@ -3141,7 +3195,6 @@
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body ul.category-tabs,
</del><span class="cx"> #post-body ul.add-menu-item-tabs {
</span><span class="cx"> float: left;
</span><span class="cx"> width: 120px;
</span><span class="lines">@@ -3151,12 +3204,10 @@
</span><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body ul.category-tabs li,
</del><span class="cx"> #post-body ul.add-menu-item-tabs li {
</span><span class="cx"> padding: 8px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body ul.category-tabs li.tabs,
</del><span class="cx"> #post-body ul.add-menu-item-tabs li.tabs {
</span><span class="cx"> -webkit-border-top-left-radius: 3px;
</span><span class="cx"> -webkit-border-bottom-left-radius: 3px;
</span><span class="lines">@@ -3164,11 +3215,11 @@
</span><span class="cx"> border-bottom-left-radius: 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.wp-tab-panel,
</ins><span class="cx"> .categorydiv div.tabs-panel,
</span><span class="cx"> .customlinkdiv div.tabs-panel,
</span><span class="cx"> .posttypediv div.tabs-panel,
</span><del>-.taxonomydiv div.tabs-panel,
-#linkcategorydiv div.tabs-panel {
</del><ins>+.taxonomydiv div.tabs-panel {
</ins><span class="cx"> height: 200px;
</span><span class="cx"> overflow: auto;
</span><span class="cx"> padding: 0.5em 0.9em;
</span><span class="lines">@@ -3191,17 +3242,14 @@
</span><span class="cx"> display:none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body .categorydiv div.tabs-panel,
-.taxonomy div.tabs-panel,
-#post-body #linkcategorydiv div.tabs-panel {
</del><ins>+.colunms-1 .categorydiv div.tabs-panel,
+.taxonomy div.tabs-panel {
</ins><span class="cx"> margin: 0 5px 0 125px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.categorydiv ul,
</del><span class="cx"> .customlinkdiv ul,
</span><span class="cx"> .posttypediv ul,
</span><del>-.taxonomydiv ul,
-#linkcategorydiv ul {
</del><ins>+.taxonomydiv ul {
</ins><span class="cx"> list-style: none;
</span><span class="cx"> padding: 0;
</span><span class="cx"> margin: 0;
</span><span class="lines">@@ -3214,8 +3262,7 @@
</span><span class="cx"> .categorydiv ul.categorychecklist ul,
</span><span class="cx"> .customlinkdiv ul.categorychecklist ul,
</span><span class="cx"> .posttypediv ul.categorychecklist ul,
</span><del>-.taxonomydiv ul.categorychecklist ul,
-#linkcategorydiv ul.categorychecklist ul {
</del><ins>+.taxonomydiv ul.categorychecklist ul {
</ins><span class="cx"> margin-left: 18px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4244,7 +4291,6 @@
</span><span class="cx"> font-size: 15px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#post-body ul.category-tabs li.tabs a,
</del><span class="cx"> #post-body ul.add-menu-item-tabs li.tabs a,
</span><span class="cx"> #TB_window #TB_title a.tb-theme-preview-link,
</span><span class="cx"> #TB_window #TB_title a.tb-theme-preview-link:visited {
</span><span class="lines">@@ -5170,10 +5216,6 @@
</span><span class="cx"> width: 98%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-editor-container textarea.wp-editor-area {
- width: 99.9%;
-}
-
</del><span class="cx"> #template div {
</span><span class="cx"> margin-right: 190px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/edit-form-advanced.php 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -272,17 +272,9 @@
</span><span class="cx"> wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<div id="poststuff" class="metabox-holder<?php echo 1 != $screen_layout_columns ? ' has-right-sidebar' : ''; ?>">
-<div id="side-info-column" class="inner-sidebar">
-<?php
-if ( 1 != $screen_layout_columns ) {
- ('page' == $post_type) ? do_action('submitpage_box') : do_action('submitpost_box');
- $side_meta_boxes = do_meta_boxes($post_type, 'side', $post);
-}
-?>
-</div>
</del><ins>+<div id="poststuff">
</ins><span class="cx">
</span><del>-<div id="post-body">
</del><ins>+<div id="post-body" class="metabox-holder columns-<?php echo 1 == $screen_layout_columns ? '1' : '2'; ?>">
</ins><span class="cx"> <div id="post-body-content">
</span><span class="cx"> <?php if ( post_type_supports($post_type, 'title') ) { ?>
</span><span class="cx"> <div id="titlediv">
</span><span class="lines">@@ -338,25 +330,43 @@
</span><span class="cx"> </tr></tbody></table>
</span><span class="cx">
</span><span class="cx"> </div>
</span><del>-
</del><ins>+</div><!-- /post-body-content -->
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( 1 == $screen_layout_columns ) {
- ('page' == $post_type) ? do_action('submitpage_box') : do_action('submitpost_box');
- $side_meta_boxes = do_meta_boxes($post_type, 'side', $post);
-}
</del><ins>+?>
+<div id="postbox-container-1" class="postbox-container">
+<?php
</ins><span class="cx">
</span><ins>+if ( 'page' == $post_type )
+ do_action('submitpage_box');
+else
+ do_action('submitpost_box');
+
+do_meta_boxes($post_type, 'side', $post);
+
+?>
+</div>
+<div id="postbox-container-2" class="postbox-container">
+<?php
+
</ins><span class="cx"> do_meta_boxes(null, 'normal', $post);
</span><span class="cx">
</span><del>-( 'page' == $post_type ) ? do_action('edit_page_form') : do_action('edit_form_advanced');
</del><ins>+if ( 'page' == $post_type )
+ do_action('edit_page_form');
+else
+ do_action('edit_form_advanced');
</ins><span class="cx">
</span><span class="cx"> do_meta_boxes(null, 'advanced', $post);
</span><span class="cx">
</span><del>-do_action('dbx_post_sidebar'); ?>
</del><ins>+?>
+</div>
+<?php
</ins><span class="cx">
</span><del>-</div>
-</div>
</del><ins>+do_action('dbx_post_sidebar');
+
+?>
+</div><!-- /post-body -->
</ins><span class="cx"> <br class="clear" />
</span><span class="cx"> </div><!-- /poststuff -->
</span><span class="cx"> </form>
</span></span></pre></div>
<a id="trunkwpadmineditformcommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-comment.php (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-comment.php 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/edit-form-comment.php 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -16,13 +16,60 @@
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php _e('Edit Comment'); ?></h2>
</span><span class="cx">
</span><del>-<div id="poststuff" class="metabox-holder has-right-sidebar">
</del><ins>+<div id="poststuff">
</ins><span class="cx"> <input type="hidden" name="user_ID" value="<?php echo (int) $user_ID; ?>" />
</span><span class="cx"> <input type="hidden" name="action" value="editedcomment" />
</span><span class="cx"> <input type="hidden" name="comment_ID" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
</span><span class="cx"> <input type="hidden" name="comment_post_ID" value="<?php echo esc_attr( $comment->comment_post_ID ); ?>" />
</span><span class="cx">
</span><del>-<div id="side-info-column" class="inner-sidebar">
</del><ins>+<div id="post-body" class="metabox-holder columns-2">
+<div id="post-body-content">
+<div id="namediv" class="stuffbox">
+<h3><label for="name"><?php _e( 'Author' ) ?></label></h3>
+<div class="inside">
+<table class="form-table editcomment">
+<tbody>
+<tr valign="top">
+ <td class="first"><?php _e( 'Name:' ); ?></td>
+ <td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" tabindex="1" id="name" /></td>
+</tr>
+<tr valign="top">
+ <td class="first">
+ <?php
+ if ( $comment->comment_author_email ) {
+ printf( __( 'E-mail (%s):' ), get_comment_author_email_link( __( 'send e-mail' ), '', '' ) );
+ } else {
+ _e( 'E-mail:' );
+ }
+?></td>
+ <td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" tabindex="2" id="email" /></td>
+</tr>
+<tr valign="top">
+ <td class="first">
+ <?php
+ if ( ! empty( $comment->comment_author_url ) && 'http://' != $comment->comment_author_url ) {
+ $link = '<a href="' . $comment->comment_author_url . '" rel="external nofollow" target="_blank">' . __('visit site') . '</a>';
+ printf( __( 'URL (%s):' ), apply_filters('get_comment_author_link', $link ) );
+ } else {
+ _e( 'URL:' );
+ } ?></td>
+ <td><input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr($comment->comment_author_url); ?>" tabindex="3" /></td>
+</tr>
+</tbody>
+</table>
+<br />
+</div>
+</div>
+
+<div id="postdiv" class="postarea">
+<?php
+ $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
+ wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
+ wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+</div>
+</div><!-- /post-body-content -->
+
+<div id="postbox-container-1" class="postbox-container">
</ins><span class="cx"> <div id="submitdiv" class="stuffbox" >
</span><span class="cx"> <h3><span class='hndle'><?php _e('Status') ?></span></h3>
</span><span class="cx"> <div class="inside">
</span><span class="lines">@@ -69,71 +116,29 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><ins>+</div><!-- /submitdiv -->
</ins><span class="cx"> </div>
</span><del>-</div>
</del><span class="cx">
</span><del>-<div id="post-body">
-<div id="post-body-content">
-<div id="namediv" class="stuffbox">
-<h3><label for="name"><?php _e( 'Author' ) ?></label></h3>
-<div class="inside">
-<table class="form-table editcomment">
-<tbody>
-<tr valign="top">
- <td class="first"><?php _e( 'Name:' ); ?></td>
- <td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" tabindex="1" id="name" /></td>
-</tr>
-<tr valign="top">
- <td class="first">
- <?php
- if ( $comment->comment_author_email ) {
- printf( __( 'E-mail (%s):' ), get_comment_author_email_link( __( 'send e-mail' ), '', '' ) );
- } else {
- _e( 'E-mail:' );
- }
-?></td>
- <td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" tabindex="2" id="email" /></td>
-</tr>
-<tr valign="top">
- <td class="first">
- <?php
- if ( ! empty( $comment->comment_author_url ) && 'http://' != $comment->comment_author_url ) {
- $link = '<a href="' . $comment->comment_author_url . '" rel="external nofollow" target="_blank">' . __('visit site') . '</a>';
- printf( __( 'URL (%s):' ), apply_filters('get_comment_author_link', $link ) );
- } else {
- _e( 'URL:' );
- } ?></td>
- <td><input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr($comment->comment_author_url); ?>" tabindex="3" /></td>
-</tr>
-</tbody>
-</table>
-<br />
-</div>
-</div>
-
-<div id="postdiv" class="postarea">
</del><ins>+<div id="postbox-container-2" class="postbox-container">
</ins><span class="cx"> <?php
</span><del>- $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
- wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
- wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
-</div>
</del><span class="cx">
</span><del>-<?php
</del><span class="cx"> do_action('add_meta_boxes', 'comment', $comment);
</span><span class="cx"> do_action('add_meta_boxes_comment', $comment);
</span><span class="cx">
</span><span class="cx"> do_meta_boxes(null, 'normal', $comment);
</span><ins>+
</ins><span class="cx"> ?>
</span><ins>+</div>
+
</ins><span class="cx"> <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID) ?>" />
</span><span class="cx"> <input type="hidden" name="p" value="<?php echo esc_attr($comment->comment_post_ID) ?>" />
</span><span class="cx"> <input name="referredby" type="hidden" id="referredby" value="<?php echo esc_url(stripslashes(wp_get_referer())); ?>" />
</span><span class="cx"> <?php wp_original_referer_field(true, 'previous'); ?>
</span><span class="cx"> <input type="hidden" name="noredir" value="1" />
</span><span class="cx">
</span><ins>+</div><!-- /post-body -->
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-</div>
-</div>
</del><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <script type="text/javascript">
</span></span></pre></div>
<a id="trunkwpadmineditlinkformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-form.php (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-form.php 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/edit-link-form.php 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -75,17 +75,9 @@
</span><span class="cx"> wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
</span><span class="cx"> wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
</span><span class="cx">
</span><del>-<div id="poststuff" class="metabox-holder<?php echo 1 != $screen_layout_columns ? ' has-right-sidebar' : ''; ?>">
-<div id="side-info-column" class="inner-sidebar">
-<?php
-if ( 1 != $screen_layout_columns ) {
- do_action('submitlink_box');
- $side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
-}
-?>
-</div>
</del><ins>+<div id="poststuff">
</ins><span class="cx">
</span><del>-<div id="post-body">
</del><ins>+<div id="post-body" class="metabox-holder columns-<?php echo 1 == $screen_layout_columns ? '1' : '2'; ?>">
</ins><span class="cx"> <div id="post-body-content">
</span><span class="cx"> <div id="namediv" class="stuffbox">
</span><span class="cx"> <h3><label for="link_name"><?php _ex('Name', 'link name') ?></label></h3>
</span><span class="lines">@@ -110,18 +102,27 @@
</span><span class="cx"> <p><?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><ins>+</div><!-- /post-body-content -->
</ins><span class="cx">
</span><ins>+<div id="postbox-container-1" class="postbox-container">
</ins><span class="cx"> <?php
</span><span class="cx">
</span><del>-if ( 1 == $screen_layout_columns ) {
- do_action('submitlink_box');
- $side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
-}
</del><ins>+do_action('submitlink_box');
+$side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
</ins><span class="cx">
</span><ins>+?>
+</div>
+<div id="postbox-container-2" class="postbox-container">
+<?php
+
</ins><span class="cx"> do_meta_boxes(null, 'normal', $link);
</span><span class="cx">
</span><span class="cx"> do_meta_boxes(null, 'advanced', $link);
</span><span class="cx">
</span><ins>+?>
+</div>
+<?php
+
</ins><span class="cx"> if ( $link_id ) : ?>
</span><span class="cx"> <input type="hidden" name="action" value="save" />
</span><span class="cx"> <input type="hidden" name="link_id" value="<?php echo (int) $link_id; ?>" />
</span><span class="lines">@@ -133,7 +134,6 @@
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-</div>
</del><span class="cx">
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/includes/dashboard.php 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -196,51 +196,28 @@
</span><span class="cx"> global $screen_layout_columns;
</span><span class="cx">
</span><span class="cx"> $screen = get_current_screen();
</span><ins>+ $class = 'columns-' . $screen_layout_columns;
</ins><span class="cx">
</span><del>- $hide2 = $hide3 = $hide4 = '';
- switch ( $screen_layout_columns ) {
- case 4:
- $width = 'width:25%;';
- break;
- case 3:
- $width = 'width:33.333333%;';
- $hide4 = 'display:none;';
- break;
- case 2:
- $width = 'width:50%;';
- $hide3 = $hide4 = 'display:none;';
- break;
- default:
- $width = 'width:100%;';
- $hide2 = $hide3 = $hide4 = 'display:none;';
- }
</del><span class="cx"> ?>
</span><del>-<div id="dashboard-widgets" class="metabox-holder">
-<?php
- echo "\t<div id='postbox-container-1' class='postbox-container' style='$width'>\n";
- do_meta_boxes( $screen->id, 'normal', '' );
</del><ins>+<div id="dashboard-widgets" class="metabox-holder <?php echo $class; ?>">
+ <div id='postbox-container-1' class='postbox-container'>
+ <?php do_meta_boxes( $screen->id, 'normal', '' ); ?>
+ </div>
+ <div id='postbox-container-2' class='postbox-container'>
+ <?php do_meta_boxes( $screen->id, 'side', '' ); ?>
+ </div>
+ <div id='postbox-container-3' class='postbox-container'>
+ <?php do_meta_boxes( $screen->id, 'column3', '' ); ?>
+ </div>
+ <div id='postbox-container-4' class='postbox-container'>
+ <?php do_meta_boxes( $screen->id, 'column4', '' ); ?>
+ </div>
+</div>
</ins><span class="cx">
</span><del>- echo "\t</div><div id='postbox-container-2' class='postbox-container' style='{$hide2}$width'>\n";
- do_meta_boxes( $screen->id, 'side', '' );
-
- echo "\t</div><div id='postbox-container-3' class='postbox-container' style='{$hide3}$width'>\n";
- do_meta_boxes( $screen->id, 'column3', '' );
-
- echo "\t</div><div id='postbox-container-4' class='postbox-container' style='{$hide4}$width'>\n";
- do_meta_boxes( $screen->id, 'column4', '' );
-?>
-</div></div>
-
-<form style="display:none" method="get" action="">
- <p>
</del><span class="cx"> <?php
</span><span class="cx"> wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
</span><span class="cx"> wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
</span><del>-?>
- </p>
-</form>
</del><span class="cx">
</span><del>-<?php
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Dashboard Widgets */
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/includes/meta-boxes.php 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -658,39 +658,42 @@
</span><span class="cx"> *
</span><span class="cx"> * @param object $link
</span><span class="cx"> */
</span><del>-function link_categories_meta_box($link) { ?>
-<ul id="category-tabs" class="category-tabs">
- <li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
- <li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
-</ul>
-
-<div id="categories-all" class="tabs-panel">
- <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
- <?php
- if ( isset($link->link_id) )
- wp_link_category_checklist($link->link_id);
- else
- wp_link_category_checklist();
- ?>
</del><ins>+function link_categories_meta_box($link) {
+?>
+<div id="taxonomy-linkcategory" class="categorydiv">
+ <ul id="category-tabs" class="category-tabs">
+ <li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
+ <li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
</ins><span class="cx"> </ul>
</span><ins>+
+ <div id="categories-all" class="tabs-panel">
+ <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+ <?php
+ if ( isset($link->link_id) )
+ wp_link_category_checklist($link->link_id);
+ else
+ wp_link_category_checklist();
+ ?>
+ </ul>
+ </div>
+
+ <div id="categories-pop" class="tabs-panel" style="display: none;">
+ <ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
+ <?php wp_popular_terms_checklist('link_category'); ?>
+ </ul>
+ </div>
+
+ <div id="category-adder" class="wp-hidden-children">
+ <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
+ <p id="link-category-add" class="wp-hidden-child">
+ <label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
+ <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
+ <input type="button" id="category-add-submit" class="add:categorychecklist:linkcategorydiv button" value="<?php esc_attr_e( 'Add' ); ?>" />
+ <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
+ <span id="category-ajax-response"></span>
+ </p>
+ </div>
</ins><span class="cx"> </div>
</span><del>-
-<div id="categories-pop" class="tabs-panel" style="display: none;">
- <ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
- <?php wp_popular_terms_checklist('link_category'); ?>
- </ul>
-</div>
-
-<div id="category-adder" class="wp-hidden-children">
- <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
- <p id="link-category-add" class="wp-hidden-child">
- <label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
- <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
- <input type="button" id="category-add-submit" class="add:categorychecklist:linkcategorydiv button" value="<?php esc_attr_e( 'Add' ); ?>" />
- <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
- <span id="category-ajax-response"></span>
- </p>
-</div>
</del><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/includes/screen.php 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -929,12 +929,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span><del>- <h5><?php _e('Screen Layout'); ?></h5>
</del><ins>+ <h5 class="screen-layout"><?php _e('Screen Layout'); ?></h5>
</ins><span class="cx"> <div class='columns-prefs'><?php
</span><span class="cx"> _e('Number of Columns:');
</span><span class="cx"> for ( $i = 1; $i <= $num; ++$i ):
</span><span class="cx"> ?>
</span><del>- <label>
</del><ins>+ <label class="columns-prefs-<?php echo $i; ?>">
</ins><span class="cx"> <input type='radio' name='screen_columns' value='<?php echo esc_attr( $i ); ?>'
</span><span class="cx"> <?php checked( $screen_layout_columns, $i ); ?> />
</span><span class="cx"> <?php echo esc_html( $i ); ?>
</span></span></pre></div>
<a id="trunkwpadminjscommondevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.dev.js (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.dev.js 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/js/common.dev.js 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // auto-fold the menu when screen is under 800px
</del><ins>+ // auto-fold the menu when screen is under 900px
</ins><span class="cx"> $(window).bind('resize.autofold', function(){
</span><span class="cx"> if ( getUserSetting('mfold') == 'f' )
</span><span class="cx"> return;
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> var width = $(window).width();
</span><span class="cx">
</span><span class="cx"> // fold admin menu
</span><del>- if ( width <= 800 ) {
</del><ins>+ if ( width <= 900 ) {
</ins><span class="cx"> if ( !folded ) {
</span><span class="cx"> $(document.body).addClass('folded');
</span><span class="cx"> folded = true;
</span></span></pre></div>
<a id="trunkwpadminjspostboxdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/postbox.dev.js (20271 => 20272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/postbox.dev.js 2012-03-23 17:53:14 UTC (rev 20271)
+++ trunk/wp-admin/js/postbox.dev.js 2012-03-23 21:41:00 UTC (rev 20272)
</span><span class="lines">@@ -3,8 +3,10 @@
</span><span class="cx"> (function($) {
</span><span class="cx"> postboxes = {
</span><span class="cx"> add_postbox_toggles : function(page, args) {
</span><del>- this.init(page, args);
</del><ins>+ var self = this;
</ins><span class="cx">
</span><ins>+ self.init(page, args);
+
</ins><span class="cx"> $('.postbox h3, .postbox .handlediv').bind('click.postboxes', function() {
</span><span class="cx"> var p = $(this).parent('.postbox'), id = p.attr('id');
</span><span class="cx">
</span><span class="lines">@@ -12,13 +14,15 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> p.toggleClass('closed');
</span><del>- postboxes.save_state(page);
</del><span class="cx">
</span><ins>+ if ( page != 'press-this' )
+ self.save_state(page);
+
</ins><span class="cx"> if ( id ) {
</span><span class="cx"> if ( !p.hasClass('closed') && $.isFunction(postboxes.pbshow) )
</span><del>- postboxes.pbshow(id);
</del><ins>+ self.pbshow(id);
</ins><span class="cx"> else if ( p.hasClass('closed') && $.isFunction(postboxes.pbhide) )
</span><del>- postboxes.pbhide(id);
</del><ins>+ self.pbhide(id);
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -38,22 +42,22 @@
</span><span class="cx"> if ( $(this).prop('checked') ) {
</span><span class="cx"> $('#' + box).show();
</span><span class="cx"> if ( $.isFunction( postboxes.pbshow ) )
</span><del>- postboxes.pbshow( box );
</del><ins>+ self.pbshow( box );
</ins><span class="cx"> } else {
</span><span class="cx"> $('#' + box).hide();
</span><span class="cx"> if ( $.isFunction( postboxes.pbhide ) )
</span><del>- postboxes.pbhide( box );
</del><ins>+ self.pbhide( box );
</ins><span class="cx"> }
</span><del>- postboxes.save_state(page);
- postboxes._mark_area();
</del><ins>+ self.save_state(page);
+ self._mark_area();
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> $('.columns-prefs input[type="radio"]').bind('click.postboxes', function(){
</span><del>- var n = parseInt($(this).val(), 10), pb = postboxes;
</del><ins>+ var n = parseInt($(this).val(), 10);
</ins><span class="cx">
</span><span class="cx"> if ( n ) {
</span><del>- pb._pb_edit(n);
- pb.save_order(page);
</del><ins>+ self._pb_edit(n);
+ self.save_order(page);
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="lines">@@ -88,8 +92,8 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- if ( navigator.userAgent.match(/iPad/) ) {
- $(document.body).bind('orientationchange', function(){ postboxes._pb_change(); });
</del><ins>+ if ( navigator.userAgent.match(/mobile/i) ) {
+ $(document.body).bind('orientationchange.postboxes', function(){ postboxes._pb_change(); });
</ins><span class="cx"> this._pb_change();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -124,89 +128,22 @@
</span><span class="cx"> $.post( ajaxurl, postVars );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _colname : function(n) {
- switch (n) {
- case 1:
- return 'normal';
- break
- case 2:
- return 'side';
- break
- case 3:
- return 'column3';
- break
- case 4:
- return 'column4';
- break
- default:
- return '';
- }
- },
-
</del><span class="cx"> _mark_area : function() {
</span><del>- $('#side-info-column .meta-box-sortables:visible, #dashboard-widgets .meta-box-sortables:visible').each(function(n, el){
</del><ins>+ var visible = $('div.postbox:visible').length;
+
+ $('#post-body .meta-box-sortables:visible, #dashboard-widgets .meta-box-sortables:visible').not('#advanced-sortables').each(function(n, el){
</ins><span class="cx"> var t = $(this);
</span><span class="cx">
</span><del>- if ( !t.children('.postbox:visible').length )
- t.addClass('empty-container');
- else
</del><ins>+ if ( visible == 1 || t.children('.postbox:visible').length )
</ins><span class="cx"> t.removeClass('empty-container');
</span><ins>+ else
+ t.addClass('empty-container');
</ins><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _pb_edit : function(n) {
</span><del>- var ps = $('#poststuff'), i, el, done, pb = postboxes, visible = $('.postbox-container:visible').length;
-
- if ( n == visible )
- return;
-
- if ( ps.length ) {
- if ( n == 2 ) {
- $('.wrap').removeClass('columns-1').addClass('columns-2');
- ps.addClass('has-right-sidebar');
-
- if ( !$('#side-info-column #side-sortables').length )
- $('#side-info-column').append( $('#side-sortables') );
-
- } else if ( n == 1 ) {
- $('.wrap').removeClass('columns-2').addClass('columns-1');
- ps.removeClass('has-right-sidebar');
-
- if ( !$('#post-body-content #side-sortables').length )
- $('#normal-sortables').before( $('#side-sortables') );
- }
- } else {
- for ( i = 4; ( i > n && i > 1 ); i-- ) {
- el = $('#' + postboxes._colname(i) + '-sortables');
- $('#' + postboxes._colname(i-1) + '-sortables').append(el.children('.postbox'));
- el.parent().hide();
- }
-
- for ( i = n; i > 0; i-- ) {
- el = $('#' + postboxes._colname(i) + '-sortables');
- done = false;
-
- if ( el.parent().is(':hidden') ) {
- switch ( i ) {
- case 4:
- done = pb._move_one( el, $('.postbox:visible', $('#column3-sortables')) );
- case 3:
- if ( !done )
- done = pb._move_one( el, $('.postbox:visible', $('#side-sortables')) );
- case 2:
- if ( !done )
- done = pb._move_one( el, $('.postbox:visible', $('#normal-sortables')) );
- default:
- if ( !done )
- el.addClass('empty-container')
- }
-
- el.parent().show();
- }
- }
-
- $('.postbox-container:visible').css('width', 100/n + '%');
- }
</del><ins>+ var el = $('.metabox-holder').get(0);
+ el.className = el.className.replace(/columns-\d+/, 'columns-' + n);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _pb_change : function() {
</span><span class="lines">@@ -225,14 +162,6 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _move_one : function(el, move) {
- if ( move.length > 1 ) {
- el.append( move.last() );
- return true;
- }
- return false;
- },
-
</del><span class="cx"> /* Callbacks */
</span><span class="cx"> pbshow : false,
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>