Merge branch 'dev-5' of github.com:baserproject/basercms into dev-5

baserproject · Mar 4, 2024 · ae35815 · ae35815
2 parents cbd7a88 + 71a7eb2
commit ae35815
Show file tree

Hide file tree

Showing 22 changed files with 4,982 additions and 4,869 deletions.
diff --git a/plugins/baser-core/resources/locales/baser_core.pot b/plugins/baser-core/resources/locales/baser_core.pot
diff --git a/plugins/baser-core/resources/locales/en/baser_core.mo b/plugins/baser-core/resources/locales/en/baser_core.mo
diff --git a/plugins/baser-core/resources/locales/en/baser_core.po b/plugins/baser-core/resources/locales/en/baser_core.po
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: baserCMS\n"
 "POT-Creation-Date: 2023-04-24 13:30+0900\n"
-"PO-Revision-Date: 2023-04-24 13:41+0900\n"
+"PO-Revision-Date: 2024-03-04 18:30+0900\n"
 "Last-Translator: ryuring\n"
 "Language-Team: baserCMS Users Community <[email protected]>\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.2.2\n"
+"X-Generator: Poedit 3.4.2\n"
 
 #: plugins/baser-core/config/permission.php:22
 msgid "コンテンツフォルダ管理"
@@ -7415,8 +7415,8 @@ msgid "いいね！をクリックして普及にご協力ください。"
 msgstr "Please support spreading by clicking Like!"
 
 #: plugins/bc-admin-third/templates/email/text/installed.php:87
-msgid "baserCMS公式Twitter"
-msgstr "baserCMS Official Twitter"
+msgid "baserCMS公式X"
+msgstr "baserCMS Official X"
 
 #: plugins/bc-admin-third/templates/email/text/installed.php:89
 msgid "TIPSや最新情報をつぶやいてます。Follow Me！"
@@ -9396,8 +9396,8 @@ msgid "フォーラムにインストールの不具合を報告する"
 msgstr "Report bug in installation to forum"
 
 #: plugins/bc-admin-third/templates/plugin/BcInstaller/Admin/Installations/step5.php:44
-msgid "公式Twitterをフォローする"
-msgstr "Follow official Twitter"
+msgid "公式Xをフォローする"
+msgstr "Follow official X"
 
 #: plugins/bc-admin-third/templates/plugin/BcInstaller/Admin/Installations/step5.php:46
 msgid "Facebookでいいね！する"
@@ -14929,8 +14929,8 @@ msgstr ""
 #~ msgid "baserCMS Facebook"
 #~ msgstr "baserCMS Facebook"
 
-#~ msgid "baserCMS Twitter"
-#~ msgstr "baserCMS Twitter"
+#~ msgid "baserCMS X"
+#~ msgstr "baserCMS X"
 
 #~ msgid "baserCMS管理システム"
 #~ msgstr "baserCMS Management System"

diff --git a/plugins/bc-admin-third/src/bc_blog/js/admin/blog_posts/form.js b/plugins/bc-admin-third/src/bc_blog/js/admin/blog_posts/form.js
@@ -51,8 +51,8 @@ $(function () {
         } else {
             previewurl += '?url=' + fullUrl +  '&preview=' + previewMode;
         }
-        if (typeof $.bcCkeditor.editor['editor_detail_tmp'] !== undefined) {
-            $.bcCkeditor.editor['editor_detail_tmp'].execCommand('synchronize');
+        if (typeof $.bcCkeditor.editor.editor_detail_tmp !== "undefined") {
+            $.bcCkeditor.editor.editor_detail_tmp.execCommand('synchronize');
         }
         form.attr('target', 'preview');
         form.attr('action', previewurl);
@@ -70,8 +70,8 @@ $(function () {
      */
     $("#BtnSave").click(function () {
         $.bcUtil.showLoader();
-        if (typeof $.bcCkeditor.editor['editor_detail_tmp'] !== undefined) {
-            $.bcCkeditor.editor['editor_detail_tmp'].execCommand('synchronize');
+        if (typeof $.bcCkeditor.editor.editor_detail_tmp !== "undefined") {
+            $.bcCkeditor.editor.editor_detail_tmp.execCommand('synchronize');
         }
         $("#BlogPostMode").val('save');
         $.bcToken.check(function () {

diff --git a/plugins/bc-admin-third/src/css/components/_footer.scss b/plugins/bc-admin-third/src/css/components/_footer.scss
@@ -170,7 +170,7 @@
       }
       &--twitter {
         @include bca-icon(twitter);
-        background-color: #54ABED;
+        background-color: #000;
       }
     }
   }

diff --git a/plugins/bc-admin-third/src/css/vendor/Font-Awesome/_variables.scss b/plugins/bc-admin-third/src/css/vendor/Font-Awesome/_variables.scss
@@ -1247,7 +1247,7 @@ $fa-var-tumblr: \f173;
 $fa-var-tumblr-square: \f174;
 $fa-var-tv: \f26c;
 $fa-var-twitch: \f1e8;
-$fa-var-twitter: \f099;
+$fa-var-twitter: \1d54f;
 $fa-var-twitter-square: \f081;
 $fa-var-typo3: \f42b;
 $fa-var-uber: \f402;

diff --git a/plugins/bc-admin-third/templates/Admin/Utilities/credit.php b/plugins/bc-admin-third/templates/Admin/Utilities/credit.php
@@ -51,7 +51,7 @@
                     <?php echo h($contributor->alphabet) ?>
                   <?php endif ?>
                   <?php if (!empty($contributor->twitter)): ?>
-                    (<?php $this->BcBaser->link($contributor->twitter, 'http://twitter.com/' . $contributor->twitter, ['target' => '_blank', 'escape' => true]) ?>)
+                    (<?php $this->BcBaser->link($contributor->twitter, 'https://twitter.com/' . $contributor->twitter, ['target' => '_blank', 'escape' => true]) ?>)
                   <?php endif ?>
                 </li>
                 <?php if ($i % 6 == 0 || $this->BcArray->last($credits->{$type}, $key)): ?>

diff --git a/plugins/bc-admin-third/templates/email/text/installed.php b/plugins/bc-admin-third/templates/email/text/installed.php
@@ -84,7 +84,7 @@
 https://www.facebook.com/basercms
 <?php echo __d('baser_core', 'いいね！をクリックして普及にご協力ください。') ?>　
 
-■ <?php echo __d('baser_core', 'baserCMS公式Twitter') ?>　
+■ <?php echo __d('baser_core', 'baserCMS公式X') ?>　
 https://twitter.com/basercms
 <?php echo __d('baser_core', 'TIPSや最新情報をつぶやいてます。Follow Me！') ?>　
 

diff --git a/...ns/bc-admin-third/templates/plugin/BcBlog/Admin/element/BlogPosts/popup_blog_category.php b/...ns/bc-admin-third/templates/plugin/BcBlog/Admin/element/BlogPosts/popup_blog_category.php
@@ -31,7 +31,7 @@
       <div class="bca-helptext">
         <ul>
           <li><?php echo __d('baser_core', 'URLに利用されます') ?></li>
-          <li><?php echo __d('baser_core', '半角のみで入力してください') ?></li>
+          <li><?php echo __d('baser_core', 'カテゴリ名は半角英数字とハイフン、アンダースコアのみ入力可能です') ?></li>
           <li><?php echo __d('baser_core', '空の場合はカテゴリタイトルから値が自動で設定されます') ?></li>
         </ul>
       </div>

diff --git a/plugins/bc-admin-third/templates/plugin/BcInstaller/Admin/Installations/step5.php b/plugins/bc-admin-third/templates/plugin/BcInstaller/Admin/Installations/step5.php
@@ -40,8 +40,8 @@
             <?php echo __d('baser_core', 'baserCMS公式ガイドで学ぶ') ?></a></li>
         <li><a href="https://forum.basercms.net" title="baserCMSユーザーズフォーラム" target="_blank" class="outside-link">
             <?php echo __d('baser_core', 'フォーラムにインストールの不具合を報告する') ?></a></li>
-        <li><a href="https://twitter.com/#!/basercms" title="baserCMS公式Twitter" target="_blank" class="outside-link">
-            <?php echo __d('baser_core', '公式Twitterをフォローする') ?></a></li>
+        <li><a href="https://twitter.com/basercms" title="baserCMS公式X" target="_blank" class="outside-link">
+            <?php echo __d('baser_core', '公式Xをフォローする') ?></a></li>
         <li><a href="https://facebook.com/basercms" title="baserCMS公式Facebookページ" target="_blank" class="outside-link">
             <?php echo __d('baser_core', 'Facebookでいいね！する') ?></a></li>
       </ul>

diff --git a/.../bc-admin-third/templates/plugin/BcUploader/Admin/element/search/uploader_files_index.php b/.../bc-admin-third/templates/plugin/BcUploader/Admin/element/search/uploader_files_index.php
@@ -67,6 +67,9 @@
       <?php echo $this->BcAdminForm->button(__d('baser_core', '検索'), ['id' => 'BtnSearchSubmit', 'class' => 'bca-btn bca-loading', 'data-bca-btn-type' => 'search']) ?>
       <?php endif ?>
     </span>
+    <div class="bca-search__btns-item">
+      <?php echo $this->BcAdminForm->button(__d('baser_core', 'クリア'), ['id' => 'BtnSearchClear', 'class' => 'bca-btn', 'data-bca-btn-type' => 'clear']) ?>
+    </div>
 	</span>
 </div>
 <?php echo $this->Form->end() ?>
diff --git a/plugins/bc-admin-third/webroot/bc_blog/js/admin/blog_posts/form.bundle.js b/plugins/bc-admin-third/webroot/bc_blog/js/admin/blog_posts/form.bundle.js