Fix | Move 'Image Source Control' from ft-media to ft-site-editing pa…

README.md

@@ -65,6 +65,7 @@ Thoose are completely managed by code and lack of their typical UI.
 
 * [Abbreviation Button for the Block Editor](https://wordpress.org/plugins/abbreviation-button-for-the-block-editor/#developers)
 * [Copyright Block](https://wordpress.org/plugins/copyright-block/#developers)
+* [Block Catalog](https://wordpress.org/plugins/block-catalog/#developers)
 * [Block Visibility](https://wordpress.org/plugins/block-visibility/#developers)
     Conditional Visibility Control for the Block Editor
 * [Dinosaur Game](https://wordpress.org/plugins/dinosaur-game/#developers)

assets/image-source-control-isc/fix.css

@@ -0,0 +1,11 @@
+/* remove ugly scroll-bars */
+.isc_all_image_list_box {
+  overflow: unset !important;
+}
+.isc_all_image_list_box th {
+  text-align: left;
+}
+/* hide column with attachment-ID */
+.isc_all_image_list_box tr > :first-child {
+  display: none;
+}

composer.json

@@ -25,6 +25,7 @@
     "autoload": {
         "files": [
             "inc/abbreviation-button-for-the-block-editor/namespace.php",
+            "inc/block-catalog/namespace.php",
             "inc/block-visibility/namespace.php",
             "inc/cbstdsys-post-subtitle/namespace.php",
             "inc/copyright-block/namespace.php",
@@ -74,8 +75,9 @@
         "figuren-theater/ft-options": "^1.1",
         "figuren-theater/ft-network-block-editor": "*",
         "figuren-theater/ft-network-block-patterns": "^1.0",
-        "carstingaxion/cbstdsys-post-subtitle": "dev-master",
+        "carstingaxion/cbstdsys-post-subtitle": "0.1.1",
         "wpackagist-plugin/abbreviation-button-for-the-block-editor":"^0.1",
+        "wpackagist-plugin/block-catalog":"^1.4",
         "wpackagist-plugin/block-visibility":"^2",
         "wpackagist-plugin/copyright-block": "^0.1",
         "wpackagist-plugin/dinosaur-game": "^1.0",
@@ -97,6 +99,7 @@
                 "figuren-theater/ft-network-block-patterns",
                 "carstingaxion/cbstdsys-post-subtitle",
                 "wpackagist-plugin/abbreviation-button-for-the-block-editor",
+                "wpackagist-plugin/block-catalog",
                 "wpackagist-plugin/block-visibility",
                 "wpackagist-plugin/copyright-block",
                 "wpackagist-plugin/dinosaur-game",
@@ -119,6 +122,6 @@
         }
     },
     "require-dev": {
-        "wpackagist-plugin/gutenberg": ">=15.1"
+        "wpackagist-plugin/gutenberg": ">=15.2"
     }
 }

inc/block-catalog/namespace.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Figuren_Theater Site_Editing Block_Catalog.
+ *
+ * @package figuren-theater/site_editing/block_catalog
+ */
+
+namespace Figuren_Theater\Site_Editing\Block_Catalog;
+
+use FT_VENDOR_DIR;
+
+use Figuren_Theater;
+use function Figuren_Theater\get_config;
+
+use function add_action;
+use function is_admin;
+use function is_network_admin;
+use function is_user_admin;
+
+const BASENAME   = 'block-catalog/block-catalog.php';
+const PLUGINPATH = FT_VENDOR_DIR . '/wpackagist-plugin/' . BASENAME;
+
+/**
+ * Bootstrap module, when enabled.
+ */
+function bootstrap() {
+
+	add_action( 'init', __NAMESPACE__ . '\\load_plugin', 9 );
+}
+
+function load_plugin() {
+
+	$config = Figuren_Theater\get_config()['modules']['site_editing'];
+	if ( ! $config['block-catalog'] )
+		return; // early
+
+	// Do only load in "normal" admin view
+	// Not for:
+	// - public views
+	// - network-admin views
+	// - user-admin views
+	if ( ! is_admin() || is_network_admin() || is_user_admin() )
+		return;
+
+	require_once PLUGINPATH;
+}

inc/block-visibility/namespace.php

@@ -13,9 +13,10 @@
 use function Figuren_Theater\get_config;
 
 use function add_action;
-use function is_admin;
+use function current_user_can;
 use function is_network_admin;
 use function is_user_admin;
+use function remove_action;
 
 const BASENAME   = 'block-visibility/block-visibility.php';
 const PLUGINPATH = FT_VENDOR_DIR . '/wpackagist-plugin/' . BASENAME;
@@ -35,12 +36,24 @@ function load_plugin() {
 		return; // early
 
 	// Do only load in "normal" admin view
+	// and public views
 	// Not for:
-	// - public views
 	// - network-admin views
 	// - user-admin views
-	if ( ! is_admin() || is_network_admin() || is_user_admin() )
+	if ( is_network_admin() || is_user_admin() )
 		return;
 
 	require_once PLUGINPATH;
+
+	// 'plugins_loaded' is too early for 'current_user_can()'
+	// add_action( 'plugins_loaded', __NAMESPACE__ . '\\post_load_plugin', 11 );
+	add_action( 'admin_menu', __NAMESPACE__ . '\\post_load_plugin', 0 );
+
+}
+
+function post_load_plugin() {
+	if ( current_user_can( 'manage_sites' ) ) {
+		return;
+	}
+	remove_action( 'admin_menu', 'BlockVisibility\\Admin\\add_settings_page' );
 }