Merge branch 'master' of github.com:luyadev/luya-module-cms

luyadev · Aug 23, 2023 · 67099e7 · 67099e7
2 parents b73beae + fd9c6c5
commit 67099e7
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 36 deletions.
diff --git a/src/admin/apis/MenuController.php b/src/admin/apis/MenuController.php
@@ -174,7 +174,7 @@ private function getItems(NavContainer $container, $parentNavId = 0, $parentGrou
 
             self::$_permissionItemData[$container->id][] = $array;
 
-            $this->getItems($container, $nav->id, $array['groups'], $index+1);
+            $this->getItems($container, $nav->id, $array['groups'], $index + 1);
         }
     }
 

diff --git a/src/admin/messages/cn/cmsadmin.php b/src/admin/messages/cn/cmsadmin.php
@@ -64,7 +64,7 @@
     'model_navitemredirect_value_label' => '重定向目标',
     'view_index_add_title' => '添加新页面',
     'view_index_add_page_from_language' => 'Add page from language',
-    'view_index_add_page_from_language_info'=>'您想在创建此页面时从其他语言复制内容吗？',
+    'view_index_add_page_from_language_info' => '您想在创建此页面时从其他语言复制内容吗？',
     'view_index_add_page_empty' => '添加一个空页面',
     'view_index_page_loading' => '正在加载页面',
     'draft_title' => '模板',
@@ -101,17 +101,17 @@
     'view_index_page_version_chooser' => '发布版本',
     'versions_selector' => '版本',
     'page_has_no_version' => '这个页面没有版本也没有布局文件. 点击添加图标<i class="material-icons green-text">add</i> 创建一个新版本.',
-    'version_edit_title'=>'编辑版本',
-    'version_input_name'=>'名称',
-    'version_input_layout'=>'布局',
-    'version_create_title'=>'添加新版本',
-    'version_create_info'=>'您可以创建任意数量的具有不同内容的页面版本。 发布一个版本，使其在网站上可见。',
-    'version_input_copy_chooser'=>'要复制的版本',
-    'version_create_copy'=>'创建现有版本的副本',
-    'version_create_new'=>'创建一个新的空白版本',
-    'js_version_update_success'=>'版本已经成功更新',
-    'js_version_error_empty_fields'=>'一个或多个字段为空或具有无效值。',
-    'js_version_create_success'=>'新版本已经成功创建',
+    'version_edit_title' => '编辑版本',
+    'version_input_name' => '名称',
+    'version_input_layout' => '布局',
+    'version_create_title' => '添加新版本',
+    'version_create_info' => '您可以创建任意数量的具有不同内容的页面版本。 发布一个版本，使其在网站上可见。',
+    'version_input_copy_chooser' => '要复制的版本',
+    'version_create_copy' => '创建现有版本的副本',
+    'version_create_new' => '创建一个新的空白版本',
+    'js_version_update_success' => '版本已经成功更新',
+    'js_version_error_empty_fields' => '一个或多个字段为空或具有无效值。',
+    'js_version_create_success' => '新版本已经成功创建',
 
 // added translations in version 1.0.0-beta7:
     'view_index_create_page_please_choose' => '请选择',

diff --git a/src/frontend/messages/cn/cms.php b/src/frontend/messages/cn/cms.php
@@ -10,22 +10,22 @@
     'tb_seo_link' => 'URL链接',
     'tb_seo_keywords' => '关键字',
     'tb_seo_keywords_notfound' => '未找到关键字.您应该添加关键字来分析您的内容.',
-    'tb_seo_warning'=>'您的某些关键字在您的内容中找不到，您应该通过更改关键字或将缺少的关键字添加到内容来解决这个问题。',
-    'tb_edit_alt'=>'在CMS管理中编辑此页面',
-    'tb_visible_not_alt'=>'这个网页对访客不可见',
-    'tb_visible_alt'=>'这个页面对访问者是可见的',
-    'block_html_html_label'=>'HTML代码',
-    'block_html_no_content'=>'没有添加HTML代码。',
-    'block_module_name'=>'模块',
-    'block_module_modulename_label'=>'模块名称',
-    'block_module_modulecontroller_label'=>'控制器名称（不带controller后缀）',
-    'block_module_moduleaction_label'=>'动作名称（不带action前缀）',
-    'block_module_moduleactionargs_label'=>'动作参数（json：{“var”：“value”}）',
-    'block_module_no_module'=>'尚未指定模块。',
-    'block_module_integration'=>'模块整合',
-    'block_html_name'=>'HTML',
-    'block_module_modulename_help'=>'只列出在配置文件中注册的前端模块。',
-    'block_group_dev_elements'=>'高级',
+    'tb_seo_warning' => '您的某些关键字在您的内容中找不到，您应该通过更改关键字或将缺少的关键字添加到内容来解决这个问题。',
+    'tb_edit_alt' => '在CMS管理中编辑此页面',
+    'tb_visible_not_alt' => '这个网页对访客不可见',
+    'tb_visible_alt' => '这个页面对访问者是可见的',
+    'block_html_html_label' => 'HTML代码',
+    'block_html_no_content' => '没有添加HTML代码。',
+    'block_module_name' => '模块',
+    'block_module_modulename_label' => '模块名称',
+    'block_module_modulecontroller_label' => '控制器名称（不带controller后缀）',
+    'block_module_moduleaction_label' => '动作名称（不带action前缀）',
+    'block_module_moduleactionargs_label' => '动作参数（json：{“var”：“value”}）',
+    'block_module_no_module' => '尚未指定模块。',
+    'block_module_integration' => '模块整合',
+    'block_html_name' => 'HTML',
+    'block_module_modulename_help' => '只列出在配置文件中注册的前端模块。',
+    'block_group_dev_elements' => '高级',
     'block_group_layout_elements' => '布局',
     'block_group_basic_elements' => '基础',
     'block_group_project_elements' => '开发',

diff --git a/src/models/NavItemPage.php b/src/models/NavItemPage.php
@@ -236,8 +236,8 @@ private function renderPlaceholderRecursive($navItemPageId, $placeholderVar, $pr
         // foreach all placeholders but preserve varaibles above to make calculations
         foreach ($placeholders as $key => $placeholder) {
             $i++;
-            $prev = $key-1;
-            $next = $key+1;
+            $prev = $key - 1;
+            $next = $key + 1;
             $cacheKey = ['blockcache', (int) $placeholder['id']];
 
             /** @var $blockObject \luya\cms\base\InternalBaseBlock */
@@ -328,7 +328,7 @@ private function renderPlaceholderRecursive($navItemPageId, $placeholderVar, $pr
                     $blockObject->onRegisterFromCache();
                 }
 
-                $string.= $blockResponse;
+                $string .= $blockResponse;
                 unset($blockResponse);
             }
         }

diff --git a/tests/src/frontend/commands/BlockControllerTest.php b/tests/src/frontend/commands/BlockControllerTest.php
@@ -139,11 +139,11 @@ public function admin()
         $ctrl->config = [
             'vars' => [
                 ['var' => 'foo', 'type' => 'self::TYPE_TEXT', 'label' => 'Foo'],
-                ['var' => 'bar', 'type' => 'self::TYPE_IMAGEUPLOAD', 'label' => 'Bar', 'options'=> 'OPTIONS!'],
+                ['var' => 'bar', 'type' => 'self::TYPE_IMAGEUPLOAD', 'label' => 'Bar', 'options' => 'OPTIONS!'],
             ],
             'cfgs' => [
                 ['var' => 'foo', 'type' => 'self::TYPE_TEXT', 'label' => 'Foo'],
-                ['var' => 'bar', 'type' => 'self::TYPE_IMAGEUPLOAD', 'label' => 'Bar', 'options'=> 'OPTIONS!'],
+                ['var' => 'bar', 'type' => 'self::TYPE_IMAGEUPLOAD', 'label' => 'Bar', 'options' => 'OPTIONS!'],
             ],
             'placeholders' => [
                 ['var' => 'foo', 'label' => 'Foo'],
@@ -281,11 +281,11 @@ public function admin()
         $ctrl->config = [
             'vars' => [
                 ['var' => 'foo', 'type' => 'self::TYPE_TEXT', 'label' => 'Foo'],
-                ['var' => 'bar', 'type' => 'self::TYPE_IMAGEUPLOAD', 'label' => 'Bar', 'options'=> 'OPTIONS!'],
+                ['var' => 'bar', 'type' => 'self::TYPE_IMAGEUPLOAD', 'label' => 'Bar', 'options' => 'OPTIONS!'],
             ],
             'cfgs' => [
                 ['var' => 'foo', 'type' => 'self::TYPE_TEXT', 'label' => 'Foo'],
-                ['var' => 'bar', 'type' => 'self::TYPE_IMAGEUPLOAD', 'label' => 'Bar', 'options'=> 'OPTIONS!'],
+                ['var' => 'bar', 'type' => 'self::TYPE_IMAGEUPLOAD', 'label' => 'Bar', 'options' => 'OPTIONS!'],
             ],
             'placeholders' => [
                 ['var' => 'foo', 'label' => 'Foo'],