From 2a439c7ee637459e7ce52787cce8e5c991d753c0 Mon Sep 17 00:00:00 2001 From: bellord13 Date: Fri, 3 Sep 2021 20:41:26 +0300 Subject: [PATCH] fix --- assets/flex-kit/flex-kit.css | 1 + templates/card/block.php | 25 ++++++++ templates/picture.php | 2 +- templates/svg/fire.php | 5 ++ templates/svg/ps/belkartInternetPassword.php | 30 +++------ .../round-fill/{facebook.svg => facebook.php} | 0 templates/svg/social/round-fill/instagram.php | 5 ++ templates/svg/social/round-fill/instagram.svg | 5 -- templates/svg/social/round-fill/ok.php | 4 ++ templates/svg/social/round-fill/ok.svg | 4 -- .../round-fill/{telegram.svg => telegram.php} | 0 .../round-fill/{tiktok.svg => tiktok.php} | 0 templates/svg/social/round-fill/vk.php | 3 + templates/svg/social/round-fill/vk.svg | 3 - .../round-fill/{youtube.svg => youtube.php} | 0 templates/svg/social/twitter.php | 1 + tests/cheatsheet.php | 2 +- tests/templates.svg.php | 63 +++++++++++++++++++ 18 files changed, 116 insertions(+), 37 deletions(-) create mode 100644 templates/card/block.php create mode 100644 templates/svg/fire.php rename templates/svg/social/round-fill/{facebook.svg => facebook.php} (100%) create mode 100644 templates/svg/social/round-fill/instagram.php delete mode 100644 templates/svg/social/round-fill/instagram.svg create mode 100644 templates/svg/social/round-fill/ok.php delete mode 100644 templates/svg/social/round-fill/ok.svg rename templates/svg/social/round-fill/{telegram.svg => telegram.php} (100%) rename templates/svg/social/round-fill/{tiktok.svg => tiktok.php} (100%) create mode 100644 templates/svg/social/round-fill/vk.php delete mode 100644 templates/svg/social/round-fill/vk.svg rename templates/svg/social/round-fill/{youtube.svg => youtube.php} (100%) create mode 100644 templates/svg/social/twitter.php create mode 100644 tests/templates.svg.php diff --git a/assets/flex-kit/flex-kit.css b/assets/flex-kit/flex-kit.css index 7341f53..48ba4ca 100644 --- a/assets/flex-kit/flex-kit.css +++ b/assets/flex-kit/flex-kit.css @@ -804,6 +804,7 @@ script, style { } .flex-card__picture .kit-picture { + position: relative; height: 100%; width: 100%; background-position: center; diff --git a/templates/card/block.php b/templates/card/block.php new file mode 100644 index 0000000..a7fa7d9 --- /dev/null +++ b/templates/card/block.php @@ -0,0 +1,25 @@ + + +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
diff --git a/templates/picture.php b/templates/picture.php index 29a31bf..0e1e0b6 100644 --- a/templates/picture.php +++ b/templates/picture.php @@ -9,7 +9,7 @@ use Wt\Core\Type; ?> - <?=Type\Str::safeHtmlAttr($arParams['ALT'])?> title="" + <?=Type\Str::safeHtmlAttr($arParams['ALT'])?> title="" /> \ No newline at end of file diff --git a/templates/svg/fire.php b/templates/svg/fire.php new file mode 100644 index 0000000..62074be --- /dev/null +++ b/templates/svg/fire.php @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/templates/svg/ps/belkartInternetPassword.php b/templates/svg/ps/belkartInternetPassword.php index 8b63eab..dac8478 100644 --- a/templates/svg/ps/belkartInternetPassword.php +++ b/templates/svg/ps/belkartInternetPassword.php @@ -1,24 +1,8 @@ - - - - - - - + + + + + + + diff --git a/templates/svg/social/round-fill/facebook.svg b/templates/svg/social/round-fill/facebook.php similarity index 100% rename from templates/svg/social/round-fill/facebook.svg rename to templates/svg/social/round-fill/facebook.php diff --git a/templates/svg/social/round-fill/instagram.php b/templates/svg/social/round-fill/instagram.php new file mode 100644 index 0000000..2c740ed --- /dev/null +++ b/templates/svg/social/round-fill/instagram.php @@ -0,0 +1,5 @@ + + + + + diff --git a/templates/svg/social/round-fill/instagram.svg b/templates/svg/social/round-fill/instagram.svg deleted file mode 100644 index 50c5524..0000000 --- a/templates/svg/social/round-fill/instagram.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/templates/svg/social/round-fill/ok.php b/templates/svg/social/round-fill/ok.php new file mode 100644 index 0000000..a5a21b5 --- /dev/null +++ b/templates/svg/social/round-fill/ok.php @@ -0,0 +1,4 @@ + + + + diff --git a/templates/svg/social/round-fill/ok.svg b/templates/svg/social/round-fill/ok.svg deleted file mode 100644 index 51b8bb1..0000000 --- a/templates/svg/social/round-fill/ok.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/templates/svg/social/round-fill/telegram.svg b/templates/svg/social/round-fill/telegram.php similarity index 100% rename from templates/svg/social/round-fill/telegram.svg rename to templates/svg/social/round-fill/telegram.php diff --git a/templates/svg/social/round-fill/tiktok.svg b/templates/svg/social/round-fill/tiktok.php similarity index 100% rename from templates/svg/social/round-fill/tiktok.svg rename to templates/svg/social/round-fill/tiktok.php diff --git a/templates/svg/social/round-fill/vk.php b/templates/svg/social/round-fill/vk.php new file mode 100644 index 0000000..9c2d0ea --- /dev/null +++ b/templates/svg/social/round-fill/vk.php @@ -0,0 +1,3 @@ + + + diff --git a/templates/svg/social/round-fill/vk.svg b/templates/svg/social/round-fill/vk.svg deleted file mode 100644 index faabcc6..0000000 --- a/templates/svg/social/round-fill/vk.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/templates/svg/social/round-fill/youtube.svg b/templates/svg/social/round-fill/youtube.php similarity index 100% rename from templates/svg/social/round-fill/youtube.svg rename to templates/svg/social/round-fill/youtube.php diff --git a/templates/svg/social/twitter.php b/templates/svg/social/twitter.php new file mode 100644 index 0000000..7b10420 --- /dev/null +++ b/templates/svg/social/twitter.php @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tests/cheatsheet.php b/tests/cheatsheet.php index 5d2d5da..7e5ddda 100644 --- a/tests/cheatsheet.php +++ b/tests/cheatsheet.php @@ -1,7 +1,7 @@ service()->assets()->setPlugin([ + app()->service()->assets()->setPlugins([ 'kit:config', 'kit:flex-kit', 'kit:core', diff --git a/tests/templates.svg.php b/tests/templates.svg.php new file mode 100644 index 0000000..54afb65 --- /dev/null +++ b/tests/templates.svg.php @@ -0,0 +1,63 @@ + +service()->assets()->setPlugins([ + 'kit:config', + 'kit:flex-kit', + 'kit:core', + 'kit:bsCore', + 'kit:collapse', + 'kit:site', + 'kit:toolkit', + 'kit:theme', + ])->render(); +} +$APPLICATION->ShowHead(); + +$templatePath = app()->service()->templater()->getComponent('kit')->getTemplatePath(); +$templateSvgPath = $templatePath . '/svg'; + + +function scanTemplates($path, $basePath, $recursive = false){ + + $tree = glob($path . '/*.php'); + ?>
' . app()->service()->templater()->get('kit:card/block', [ + 'name' => $templateName, + 'picture' => '
'.app()->service()->templater()->get('kit:'.$templateName).'
', + 'header' => filesize($t), + ]) . '
'; + } + ?> +
+ +
+ \ No newline at end of file