Merge branch 'AMP_PWA_abolished'

xserver-inc · Dec 26, 2023 · 63b347c · 63b347c
2 parents 22cb239 + e43287f
commit 63b347c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/lib/page-settings/_top-page.php b/lib/page-settings/_top-page.php
@@ -247,11 +247,13 @@
   <input id="tab-page-404-input" value="tab-page-404-input" class="tab-input" type="radio" name="tab-input">
   <label for="tab-page-404-input" id="tab-page-404-label" class="tab-page-404-label tab-label"><?php _e( '404ページ', THEME_NAME ) ?></label>
 
+  <?php if (false): ?>
   <input id="tab-amp-input" value="tab-amp-input" class="tab-input" type="radio" name="tab-input">
   <label for="tab-amp-input" id="tab-amp-label" class="tab-amp-label tab-label"><?php _e( 'AMP', THEME_NAME ) ?></label>
 
   <input id="tab-pwa-input" value="tab-pwa-input" class="tab-input" type="radio" name="tab-input">
   <label for="tab-pwa-input" id="tab-pwa-label" class="tab-pwa-label tab-label"><?php _e( 'PWA', THEME_NAME ) ?></label>
+  <?php endif; ?>
 
   <input id="tab-admin-input" value="tab-admin-input" class="tab-input" type="radio" name="tab-input">
   <label for="tab-admin-input" id="tab-admin-label" class="tab-admin-label tab-label"><?php _e( '管理者画面', THEME_NAME ) ?></label>
@@ -433,7 +435,8 @@
     <?php require_once abspath(__FILE__).'404-forms.php'; ?>
   </div><!-- /.metabox-holder -->
 
-  <!-- AMP -->
+  <?php if (false): ?>
+   <!-- AMP -->
   <div id="tab-amp-content" class="amp metabox-holder">
     <?php require_once abspath(__FILE__).'amp-forms.php'; ?>
   </div><!-- /.metabox-holder -->
@@ -442,6 +445,7 @@
   <div id="tab-pwa-content" class="pwa metabox-holder">
     <?php require_once abspath(__FILE__).'pwa-forms.php'; ?>
   </div><!-- /.metabox-holder -->
+  <?php endif; ?>
 
   <!-- 管理画面 -->
   <div id="tab-admin-content" class="admin metabox-holder">

diff --git a/lib/page-settings/admin-forms.php b/lib/page-settings/admin-forms.php
@@ -237,6 +237,7 @@
           </td>
         </tr>
 
+        <?php if (false): ?>
         <!-- AMPエリアの表示  -->
         <tr>
           <th scope="row">
@@ -261,6 +262,8 @@
             </div>
           </td>
         </tr>
+        <?php endif; ?>
+
 
         <!-- チェックツールエリアの表示  -->
         <tr>

diff --git a/lib/page-settings/admin-funcs.php b/lib/page-settings/admin-funcs.php
@@ -196,31 +196,35 @@ function is_admin_panel_wlw_edit_visible(){
 define('OP_ADMIN_PANEL_AMP_AREA_VISIBLE', 'admin_panel_amp_area_visible');
 if ( !function_exists( 'is_admin_panel_amp_area_visible' ) ):
 function is_admin_panel_amp_area_visible(){
-  return get_theme_option(OP_ADMIN_PANEL_AMP_AREA_VISIBLE, 1);
+  return false;
+  // return get_theme_option(OP_ADMIN_PANEL_AMP_AREA_VISIBLE, 1);
 }
 endif;
 
 //Google AMPテストリンクの表示
 define('OP_ADMIN_GOOGLE_AMP_TEST_VISIBLE', 'admin_google_amp_test_visible');
 if ( !function_exists( 'is_admin_google_amp_test_visible' ) ):
 function is_admin_google_amp_test_visible(){
-  return get_theme_option(OP_ADMIN_GOOGLE_AMP_TEST_VISIBLE, 1);
+  return false;
+  // return get_theme_option(OP_ADMIN_GOOGLE_AMP_TEST_VISIBLE, 1);
 }
 endif;
 
 //The AMP Validatorリンクの表示
 define('OP_ADMIN_THE_AMP_VALIDATOR_VISIBLE', 'admin_the_amp_validator_visible');
 if ( !function_exists( 'is_admin_the_amp_validator_visible' ) ):
 function is_admin_the_amp_validator_visible(){
-  return get_theme_option(OP_ADMIN_THE_AMP_VALIDATOR_VISIBLE, 1);
+  return false;
+  // return get_theme_option(OP_ADMIN_THE_AMP_VALIDATOR_VISIBLE, 1);
 }
 endif;
 
 //AMPBenchリンクの表示
 define('OP_ADMIN_AMPBENCH_VISIBLE', 'admin_ampbench_visible');
 if ( !function_exists( 'is_admin_ampbench_visible' ) ):
 function is_admin_ampbench_visible(){
-  return false;//get_theme_option(OP_ADMIN_AMPBENCH_VISIBLE, 1);
+  return false;
+  // return get_theme_option(OP_ADMIN_AMPBENCH_VISIBLE, 1);
 }
 endif;
 

diff --git a/lib/page-settings/amp-funcs.php b/lib/page-settings/amp-funcs.php
@@ -11,7 +11,8 @@
 define('OP_AMP_ENABLE', 'amp_enable');
 if ( !function_exists( 'is_amp_enable' ) ):
 function is_amp_enable(){
-  return get_theme_option(OP_AMP_ENABLE);
+  return false;
+  // return get_theme_option(OP_AMP_ENABLE);
 }
 endif;
 

diff --git a/lib/page-settings/pwa-funcs.php b/lib/page-settings/pwa-funcs.php
@@ -11,7 +11,8 @@
 define('OP_PWA_ENABLE', 'pwa_enable');
 if ( !function_exists( 'is_pwa_enable' ) ):
 function is_pwa_enable(){
-  return get_theme_option(OP_PWA_ENABLE);
+  return false;
+  // return get_theme_option(OP_PWA_ENABLE);
 }
 endif;