Theme options optimizations and fixes.

Author: ivopetkov

components/template.php

@@ -26,9 +26,6 @@
                 min-height: 100%;
             }
             *{outline:none;-webkit-tap-highlight-color:rgba(0,0,0,0);}
-            ul,ol,li{list-style-position:inside;}
-            img{border:0;}
-            a{text-decoration:none;}
             .template-content-container{min-height:100vh;display:flex;justify-content:center;flex-direction:column;}
             .template-content-container > *{width:100%;}
         </style>
@@ -38,7 +35,7 @@
         if ($isHomePage) {
             echo '<section class="template-home-page-container">';
             if (!empty($homePageLogoImage)) {
-                $imageHTML = '<component src="bearcms-image-element" class="template-home-page-logo" onClick="openUrl" url="' . htmlentities($app->request->base) . '/" filename="' . htmlentities($homePageLogoImage) . '"/>';
+                $imageHTML = '<component src="bearcms-image-element" class="template-home-page-logo" filename="' . htmlentities($homePageLogoImage) . '"/>';
                 echo '<div><div class="template-home-page-logo-container">' . $imageHTML . '</div></div>';
             }
             if ($homePageTitleVisibility === '1') {
@@ -47,7 +44,6 @@
             if ($homePageDescriptionVisibility === '1') {
                 echo '<div><div class="template-home-page-description-container"><div class="template-home-page-description">' . htmlspecialchars($settings->description) . '</div></div></div>';
             }
-            //<component src="bearcms-elements" id="test1" editable="true"/>
             echo '<div><div class="template-home-page-content-container"><div class="template-home-page-content">{{body}}</div></div></div>';
             echo '</section>';
         } else {

index.php

@@ -26,7 +26,7 @@
             $context->assets
             ->addDir('assets');
 
-            $theme->version = '1.0';
+            $theme->version = '1.1';
 
             $theme->get = function(\BearCMS\Themes\Options $options) use ($context) {
                 $templateFilename = $context->dir . '/components/template.php';

locales/bg.php

@@ -19,7 +19,6 @@
     'bearcms.themes.focus.options.Visibility' => 'Видимост',
     'bearcms.themes.focus.options.Visible' => 'Видимо',
     'bearcms.themes.focus.options.Hidden' => 'Скрито',
-    'bearcms.themes.focus.options.Other content' => 'Друго съдържание',
     'bearcms.themes.focus.options.Other pages' => 'Други страници',
     'bearcms.themes.focus.options.Back to home button' => 'Бутон към началото',
     'bearcms.themes.focus.options.Content' => 'Съдържание',

locales/en.php

@@ -19,7 +19,6 @@
     'bearcms.themes.focus.options.Visibility' => 'Visibility',
     'bearcms.themes.focus.options.Visible' => 'Visible',
     'bearcms.themes.focus.options.Hidden' => 'Hidden',
-    'bearcms.themes.focus.options.Other content' => 'Other content',
     'bearcms.themes.focus.options.Other pages' => 'Other pages',
     'bearcms.themes.focus.options.Back to home button' => 'Back to home button',
     'bearcms.themes.focus.options.Content' => 'Content',

options.php

@@ -21,7 +21,7 @@
         ->addOption("homePageLogoImageCSS", "css", "", [
             "cssTypes" => ["cssMargin", "cssBorder", "cssRadius", "cssShadow", "cssSize"],
             "cssOutput" => [
-                ["rule", ".template-home-page-logo", "box-sizing:border-box;display:inline-block;overflow:hidden;font-size:0;"],
+                ["rule", ".template-home-page-logo", "box-sizing:border-box;overflow:hidden;font-size:0;"],
                 ["selector", ".template-home-page-logo"]
             ]
         ]);
@@ -51,7 +51,7 @@
         ])
         ->addOption("homePageTitleCSS", "css", "", [
             "cssOutput" => [
-                ["rule", ".template-home-page-title", "display:inline-block;text-decoration:none;"],
+                ["rule", ".template-home-page-title", "box-sizing:border-box;display:inline-block;text-decoration:none;"],
                 ["selector", ".template-home-page-title"]
             ]
         ]);
@@ -97,7 +97,7 @@
         ]);
 
 
-$homePageContentGroup = $homePageGroup->addGroup(__("bearcms.themes.focus.options.Other content"));
+$homePageContentGroup = $homePageGroup->addGroup(__("bearcms.themes.focus.options.Content"));
 $homePageContentGroup
         ->addOption("homePageContentCSS", "css", "", [
             "cssTypes" => ["cssPadding", "cssMargin", "cssBorder", "cssRadius", "cssShadow", "cssBackground", "cssSize"],
@@ -127,9 +127,9 @@
             ]
         ]);
 
-$otherPagesGroup = $schema->addGroup(__("bearcms.themes.focus.options.Other pages"));
+$pagesGroup = $schema->addGroup(__("bearcms.themes.focus.options.Other pages"));
 
-$pageBackToHomeGroup = $otherPagesGroup->addGroup(__("bearcms.themes.focus.options.Back to home button"));
+$pageBackToHomeGroup = $pagesGroup->addGroup(__("bearcms.themes.focus.options.Back to home button"));
 $pageBackToHomeGroup
         ->addOption("pageBackToHomeButtonCSS", "css", "", [
             "cssTypes" => ["cssMargin", "cssBorder", "cssRadius", "cssShadow", "cssBackground", "cssSize"],
@@ -149,18 +149,21 @@
             ]
         ]);
 
-$pageContentGroup = $otherPagesGroup->addGroup(__("bearcms.themes.focus.options.Content"));
-$pageContentGroup
+$pagesGroup
         ->addOption("pageContentCSS", "css", "", [
             "cssTypes" => ["cssPadding", "cssMargin", "cssBorder", "cssRadius", "cssShadow", "cssBackground", "cssSize"],
             "cssOutput" => [
                 ["rule", ".template-page-content", "box-sizing:border-box;"],
                 ["selector", ".template-page-content"]
             ]
         ]);
-$pageContentGroup->addElementsGroup('pageContentElements', '.template-page-content');
 
-$pageContentElementsContainerGroup = $pageContentGroup->addGroup(__("bearcms.themes.focus.options.Container"));
+$pagesContentGroup = $pagesGroup->addGroup(__("bearcms.themes.focus.options.Content"));
+
+$pagesContentGroup->addElementsGroup('pageContentElements', '.template-page-content');
+$pagesContentGroup->addPages();
+
+$pageContentElementsContainerGroup = $pagesGroup->addGroup(__("bearcms.themes.focus.options.Container"));
 $pageContentElementsContainerGroup
         ->addOption("pageContentElementsContainerCSS", "css", "", [
             "cssTypes" => ["cssPadding", "cssMargin", "cssBorder", "cssRadius", "cssShadow", "cssBackground", "cssSize", "cssTextAlign"],
@@ -179,7 +182,6 @@
             ]
         ]);
 
-$schema->addPagesGroup();
 
 
 return $schema;