big update

skeeks-cms · Jun 1, 2022 · d63d0e1 · d63d0e1
1 parent 5b2c3a8
commit d63d0e1
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 4 deletions.
diff --git a/src/UnifyTheme.php b/src/UnifyTheme.php
@@ -27,6 +27,7 @@
 use skeeks\cms\themes\unify\assets\UnifyThemeAsset;
 use skeeks\cms\themes\unify\widgets\jui\JuiSortableWidget;
 use skeeks\cms\widgets\ColorInput;
+use skeeks\widget\codemirror\CodemirrorWidget;
 use skeeks\yii2\form\fields\BoolField;
 use skeeks\yii2\form\fields\FieldSet;
 use skeeks\yii2\form\fields\HtmlBlock;
@@ -482,7 +483,19 @@ public function getConfigFormModelData()
 
 
                         'css_code' => [
-                            'class' => TextareaField::class,
+                            'class' => WidgetField::class,
+                            'widgetClass' => CodemirrorWidget::class,
+                            'widgetConfig' => [
+                                'preset' => 'htmlmixed',
+                                'assets' =>
+                                    [
+                                        \skeeks\widget\codemirror\CodemirrorAsset::THEME_NIGHT
+                                    ],
+                                        'clientOptions' =>
+                                    [
+                                        'theme' => 'night'
+                                    ],
+                            ]
                         ],
 
                         'is_show_home_slider' => [

diff --git a/src/assets/components/UnifyThemeFloatLabelAsset.php b/src/assets/components/UnifyThemeFloatLabelAsset.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @link https://cms.skeeks.com/
+ * @copyright Copyright (c) 2010 SkeekS
+ * @license https://cms.skeeks.com/license/
+ * @author Semenov Alexander <[email protected]>
+ */
+
+namespace skeeks\cms\themes\unify\assets\components;
+
+use skeeks\assets\unify\base\UnifyHsGoToAsset;
+use skeeks\assets\unify\base\UnifyIconHsAsset;
+use yii\web\JqueryAsset;
+/**
+ * @author Semenov Alexander <[email protected]>
+ */
+class UnifyThemeFloatLabelAsset extends \skeeks\cms\base\AssetBundle
+{
+    public $sourcePath = '@vendor/skeeks/cms-theme-unify-v2/src/assets/src/components/float-label';
+
+    public $css = [
+        'float-label.css'
+    ];
+    public $js = [
+        'float-label.js'
+    ];
+    public $depends = [
+        JqueryAsset::class,
+    ];
+
+    public function registerAssetFiles($view)
+    {
+        parent::registerAssetFiles($view);
+
+        $view->registerJs(<<<JS
+(function(sx, $, _)
+{
+    /*$( '.form-group' ).FloatLabel();*/
+})(sx, sx.$, sx._);
+JS
+        );
+    }
+}
diff --git a/src/views/headers/header-v1.php b/src/views/headers/header-v1.php
@@ -30,7 +30,7 @@
         data-header-fix-moment="100" data-header-fix-effect="slide">
     <!-- Top Bar -->
     <!--u-header__section--hidden -->
-    <div class="u-header__section u-header__section--hidden d-none d-sm-block g-bg-white" style="padding-bottom: 7px; padding-top: 7px;">
+    <div class="u-header__section u-header__section--hidden d-none d-sm-block g-bg-white sx-header-middle-block" style="padding-bottom: 7px; padding-top: 7px;">
         <div class="container sx-container">
             <div class="row flex-column flex-sm-row justify-content-between align-items-center text-uppercase g-font-weight-600 g-color-white g-font-size-12 g-mx-0--lg">
                 <div class="col-auto">

diff --git a/src/views/modules/cms/tree/home-default.php b/src/views/modules/cms/tree/home-default.php
@@ -35,12 +35,18 @@
     </div>
 <? endif; ?>
 
-<?= trim(\skeeks\cms\cmsWidgets\treeMenu\TreeMenuCmsWidget::widget([
+<?php
+  $widget = \skeeks\cms\cmsWidgets\tree\TreeCmsWidget::beginWidget('home-sub-catalog-new');
+  $widget->descriptor->name = 'Подразделы на главной';
+  $widget->viewFile = '@app/views/widgets/TreeMenuCmsWidget/home-sub-catalog';
+  $widget::end(); ?>
+
+<?/*= trim(\skeeks\cms\cmsWidgets\treeMenu\TreeMenuCmsWidget::widget([
     'namespace'       => 'home-sub-catalog',
     'viewFile'        => '@app/views/widgets/TreeMenuCmsWidget/home-sub-catalog',
     'treeParentCode'  => "services",
     'enabledRunCache' => \skeeks\cms\components\Cms::BOOL_N,
-])); ?>
+])); */?>
 
 
 <section class="promo-4 noborder g-bg-secondary g-pt-20 g-pb-20">