TSFEM 2.6.0 RC-1. Cleaned connect interface, fixed Focus crash.

extensions/essentials/articles/trunk/inc/index.php

@@ -1,10 +1,16 @@
 <?php
 /**
- * When I write, I can shake off all my cares.
- * My sorrow disappears, my spirits are revived!
+ * Met schrijven word ik alles kwijt,
+ * mijn verdriet verdwijnt, mijn moed herleeft.
  *
- * But, and that’s a big question, will I ever be able to write something great,
- * will I ever become a journalist or a writer?
+ * Maar, en dat is de grote vraag, zal ik ooit nog iets groots kunnen schrijven,
+ * zal ik ooit eens journaliste en schrijfster worden?
+ *
+ * (When I write, I can shake off all my cares,
+ * my sorrow disappears, my spirits revives.
+ *
+ * But, and that's a big question, will I ever be able to write something great,
+ * will I ever become a journalist and writer?)
  *
  * - Anne Frank
  */

extensions/essentials/focus/trunk/inc/classes/admin.class.php

@@ -26,6 +26,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * Require extension views trait.
+ *
+ * @since 1.5.2
+ */
+\TSF_Extension_Manager\_load_trait( 'extension/views' );
+
 /**
  * Class TSF_Extension_Manager\Extension\Focus\Admin
  *

extensions/essentials/focus/trunk/lib/css/tsfem-focus-inpost.css

@@ -107,7 +107,7 @@ input[type="checkbox"].tsfem-e-focus-collapse-checkbox:checked:after {
 	display: block;
 	height: 2em;
 	width:  2em;
-	vertical-align: middle; /* inherited downward */
+	vertical-align: middle; /* captured down */
 	cursor: pointer;
 	position: relative;
 	box-shadow: 0 0 0 0 rgba(0,0,0,.25) inset, 0 0 0 0 rgba(0,0,0,.25);

extensions/free/transport/trunk/inc/classes/transformers/core.class.php

@@ -348,7 +348,8 @@ protected static function reset_replacements() {
 		];
 		// This is also where /(%%single)?/ regex comes in.
 		static::$prefix_preserve = [
-			// 'ct_pa_',   // Custom Taxonomy Product Attribute
+			// Custom Taxonomy Product Attribute, implied via ct_*:
+			// 'ct_pa_',
 			'ct_',      // Custom Taxonomy field name., this can be %%ct_something%%single%%, which we do not test.
 			'cf_',      // Custom field name.
 		];

extensions/free/transport/trunk/lib/images/index.php

@@ -0,0 +1,6 @@
+<?php
+/**
+ * I can control the flow of paint; there is no accident.
+ *
+ * - Paul Jackson Pollock
+ */

extensions/free/transport/trunk/lib/js/index.php

@@ -0,0 +1,7 @@
+<?php
+/**
+ * The aim of our efficiency has not been to produce goods, but to harvest dollars...
+ * The production of goods was always secondary to the securing of dollars.
+ *
+ * - Henry Laurence Gantt
+ */

extensions/free/transport/trunk/readme.md

@@ -165,7 +165,7 @@ Not all SEO plugins are alike. The SEO Framework (TSF) takes a straightforward a
 | Primary term ID† | `postmeta` | `_yoast_wpseo_primary_{$taxonomy}`   | –          |
 | Term metadata‡   | `options`  | `wpseo_taxonomy_meta`                | ✓️ |
 
-_&#x2a; When transformed, the importer will set a flag for TSF to add the site title. You can remove this flag via the post edit screen._ <br>
+_&#x2a; When found, the importer will set a flag for TSF to add the site title. You can remove this flag via the post edit screen._ <br>
 _&dagger; To transport primary term IDs, the taxonomy must be active before Transport can detect the data. For example, WooCommerce must be active to transport Primary Product Category IDs for Products._ <br>
 _&Dagger; This includes: title, description, Open Graph title, Open Graph description, Twitter title, Twitter description, Canonical URL, and Robots noindex._
 
@@ -214,7 +214,7 @@ The following data will be irretrievably deleted from your database; doing this
 | Canonical URL               | `termmeta` | `rank_math_canonical_url`        | &ndash;          |
 | Robots metadata             | `termmeta` | `rank_math_robots`               | &#x2713;&#xFE0F; |
 
-_&#x2a; When transformed, the importer will set a flag for TSF to add the site title. You can remove this flag via the post edit screen._ <br>
+_&#x2a; When found, the importer will set a flag for TSF to add the site title. You can remove this flag via the post edit screen._ <br>
 _&dagger; Conditional: Twitter metadata is only transported when enabled for the post or term in Rank Math._
 _&Dagger; To transport primary term IDs, the taxonomy must be active before Transport can detect the data. For example, WooCommerce must be active to transport Primary Product Category IDs for Products._ <br>
 

extensions/premium/monitor/trunk/views/layout/general/top.php

@@ -11,13 +11,6 @@
 $about   = '';
 $actions = '';
 
-if ( $options ) { // phpcs:ignore, Generic.CodeAnalysis.EmptyStatement
-	// TODO
-} else {
-	$info  = __( 'Let SEO Monitor help you improve your website. Your privacy is respected, read how below.', 'the-seo-framework-extension-manager' );
-	$about = '<div class="tsfem-top-about tsfem-about-activation tsfem-flex tsfem-flex-row tsfem-flex-nowrap"><div>' . esc_html( $info ) . '</div></div>';
-}
-
 ?>
 <div class=tsfem-title>
 	<header><h1>

extensions/premium/monitor/trunk/views/layout/pages/connect.php

@@ -48,7 +48,7 @@
 				<p><?= esc_html__( 'Get detailed information about your website. Automatically.', 'the-seo-framework-extension-manager' ) ?></p>
 			</div>
 		</div>
-		<div class="tsfem-connect-action tsfem-flex">
+		<div class="tsfem-connect-action">
 			<?php $this->get_view( 'forms/connect' ); ?>
 		</div>
 	</div>

inc/traits/core/ui.trait.php

@@ -77,8 +77,8 @@ private function init_ui() {
 	 * @param string $type The type of main content. Accepts 'panes' and 'connect'.
 	 */
 	final protected function ui_wrap( $type = 'panes' ) {
-		\add_action( 'tsfem_page', [ $this, 'header_wrap' ], 25 );
-		\add_action( 'tsfem_page', [ $this, $type . '_wrap' ], 100 );
+		\add_action( 'tsfem_page', [ $this, "{$type}_header_wrap" ], 25 );
+		\add_action( 'tsfem_page', [ $this, "{$type}_page_wrap" ], 100 );
 		\add_action( 'tsfem_page', [ $this, 'footer_wrap' ], 200 );
 
 		\do_action( 'tsfem_before_page' );
@@ -100,9 +100,9 @@ final protected function page_wrap() {
 	/**
 	 * Outputs header wrap and does callback.
 	 *
-	 * @since 1.5.0
+	 * @since 2.6.0
 	 */
-	final public function header_wrap() {
+	final public function panes_header_wrap() {
 		echo '<div id=tsfem-sticky-top>';
 			echo '<div id=tsfem-top-super-wrap><section id=tsfem-top-wrap class="tsfem-flex tsfem-flex-row tsfem-flex-nogrowshrink tsfem-flex-space">';
 				\do_action( 'tsfem_header' );
@@ -111,6 +111,20 @@ final public function header_wrap() {
 		echo '</div>';
 	}
 
+	/**
+	 * Outputs header wrap and does callback.
+	 *
+	 * @since 2.6.0
+	 */
+	final public function connect_header_wrap() {
+		echo '<div id=tsfem-sticky-top>';
+			echo '<div id=tsfem-top-super-wrap><section id=tsfem-top-wrap class="tsfem-flex tsfem-flex-row tsfem-flex-nogrowshrink tsfem-flex-space connect-top-wrap">';
+				\do_action( 'tsfem_header' );
+			echo '</section></div>';
+			$this->notice_wrap();
+		echo '</div>';
+	}
+
 	/**
 	 * Outputs notice wrap and does callback.
 	 *
@@ -130,11 +144,12 @@ final public function notice_wrap() {
 	 * @since 1.5.0
 	 * @since 2.0.1 Now listens to $this->wrap_type
 	 * @since 2.2.0 Is no longer a tsfem-flex-item.
-	 * @since 2.6.0 Added a super wrap to allow a condensed layout.
+	 * @since 2.6.0 1. Added a super wrap to allow a condensed layout.
+	 *              2. Renamed from "panes_wrap".
 	 */
-	final public function panes_wrap() {
+	final public function panes_page_wrap() {
 		printf(
-			'<div class=tsfem-panes-super-wrap><main class="tsfem-panes-wrap tsfem-panes-wrap-%s">',
+			'<div id=tsfem-panes-super-wrap><main class="tsfem-panes-wrap tsfem-panes-wrap-%s">',
 			// phpcs:ignore, WordPress.Security.EscapeOutput.OutputNotEscaped
 			\in_array( $this->wrap_type, [ 'column', 'row' ], true ) ? $this->wrap_type : 'column'
 		);
@@ -147,8 +162,8 @@ final public function panes_wrap() {
 	 *
 	 * @since 1.5.0
 	 */
-	final public function connect_wrap() {
-		echo '<div class=tsfem-panes-super-wrap><main class=tsfem-connect-wrap>';
+	final public function connect_page_wrap() {
+		echo '<div id=tsfem-panes-super-wrap><main id=tsfem-connect-wrap class="tsfem-flex tsfem-flex-row">';
 		\do_action( 'tsfem_content' );
 		echo '</main></div>';
 	}

lib/css/tsfem-ui.css

@@ -150,10 +150,9 @@ body.tsfem.rtl .wrap {
 	max-width: 1240px;
 }
 
-/* Stretches content over the page, pushing footer down. */
-.tsfem-connect-wrap {
-	flex: 1 1 auto;
-	margin: 1.2vw;
+#tsfem-connect-wrap {
+	justify-content: center;
+	margin: 0 1.2vw;
 }
 
 #tsfem-sticky-top {
@@ -162,7 +161,7 @@ body.tsfem.rtl .wrap {
 	margin-bottom: 1.2vw;
 	top: 32px;
 	z-index: 9980; /* Admin sidebar is 9990 */
-	background: linear-gradient( to bottom, rgba(0,0,0,.3), rgba(0,0,0,0) ); /* Revealed when notices appear */
+	background: linear-gradient( to bottom, rgba(0,0,0,.1), rgba(0,0,0,0) ); /* Revealed when notices appear */
 }
 
 @media screen and ( max-width: 782px ) {
@@ -192,6 +191,11 @@ body.tsfem.rtl .wrap {
 	margin: 0 auto;
 	padding: 1em 1.2vw;
 	max-width: 1240px;
+	gap: 1em;
+}
+
+#tsfem-top-wrap.connect-top-wrap {
+	justify-content: center;
 }
 
 /* "padding: 0 0 1.4%" Edge/Firefox inline margins issue */
@@ -225,6 +229,7 @@ body.tsfem.rtl .wrap {
 #tsfem-top-wrap .tsfem-title {
 	text-align: left;
 	align-items: center;
+	align-self: center;
 }
 
 .tsfem-top-actions,
@@ -704,10 +709,6 @@ body.rtl .tsfem-button-loading:after {
 	justify-content: space-between;
 }
 
-.tsfem-connect-option:last-of-type {
-	margin-bottom: 0;
-}
-
 .tsfem-connect-text,
 .tsfem-connect-action {
 	margin: .5em 0;
@@ -730,7 +731,7 @@ body.rtl .tsfem-button-loading:after {
 	margin-bottom: 0;
 }
 
-.tsfem-connect-wrap h3 {
+#tsfem-connect-wrap h3 {
 	font-size: 1.66em;
 	color: #057f9c;
 	font-weight: 400;
@@ -739,7 +740,7 @@ body.rtl .tsfem-button-loading:after {
 /* # Global panes wrap.
 /*--------------------------------------*/
 /* "margin: .6%" Edge/Firefox inline margins issue */
-.tsfem-panes-super-wrap {
+#tsfem-panes-super-wrap {
 	width: 100%;
 	max-width: 1240px;
 	margin: 0 auto;

the-seo-framework-extension-manager.php

@@ -3,7 +3,7 @@
  * Plugin Name: The SEO Framework - Extension Manager
  * Plugin URI: https://theseoframework.com/extension-manager/
  * Description: Add more powerful SEO features to The SEO Framework. Right from your WordPress dashboard.
- * Version: 2.6.0-beta-5
+ * Version: 2.6.0-RC-1
  * Author: The SEO Framework Team
  * Author URI: https://theseoframework.com/
  * License: GPLv3

views/layout/extension/pane.php

@@ -23,7 +23,7 @@
 	<div class="tsfem-flex tsfem-flex-row tsfem-flex-nogrow hide-if-no-tsf-js">
 		<div class=tsfem-pane-inner-pad>
 			<?php
-			$f->_form_wrap( 'start', \menu_page_url( static::$settings_page_slug, false ), true );
+			$f->_form_wrap( 'start', menu_page_url( static::$settings_page_slug, false ), true );
 			$f->_fields( $settings );
 			$f->_form_wrap( 'end' );
 			?>

views/layout/general/top.php

@@ -49,9 +49,6 @@
 
 	$account = "<div class=tsfem-top-account>$account_link</div>";
 	$actions = '<div class="tsfem-top-actions tsfem-flex tsfem-flex-row">' . $account . '</div>';
-} else {
-	$info  = __( 'Add more powerful SEO features to your website. To get started, use one of the options below.', 'the-seo-framework-extension-manager' );
-	$about = '<div class="tsfem-top-about tsfem-about-activation tsfem-flex tsfem-flex-row tsfem-flex-nowrap"><div>' . esc_html( $info ) . '</div></div>';
 }
 
 ?>