Ticket #3830 - Protean: Content's description not visible in Dark skin.

inc/classes/BxDolTemplate.php

@@ -662,8 +662,8 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
 
         bx_import('BxTemplFunctions');
         $this->_oTemplateFunctions = BxTemplFunctions::getInstance($this);
-		
-		$this->addJsOption('sys_fixed_header');
+
+        $this->addJsOption('sys_fixed_header');
     }
 
     protected function getInjectionsData ()
@@ -1745,6 +1745,12 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
                 break;
             case 'class_name':
                 $sRet = $this->getCssClassName();
+
+                if(!empty($this->_iMix)) {
+                    $aMix = BxDolDb::getInstance()->getParamsMix($this->_iMix);
+                    if(isset($aMix['dark']) && (int)$aMix['dark'] == 1)
+                        $sRet .= ' dark';
+                }
                 break;
             default:
                 $sRet = ($sTemplAdd = BxTemplFunctions::getInstance()->TemplPageAddComponent($sKey)) !== false ? $sTemplAdd : $aKeyWrappers['left'] . $sKey . $aKeyWrappers['right'];

install/sql/system.sql

@@ -667,6 +667,7 @@ CREATE TABLE `sys_options_mixes` (
   `category` varchar(64) NOT NULL default '',
   `name` varchar(64) NOT NULL default '',
   `title` varchar(64) NOT NULL default '',
+  `dark` tinyint(1) NOT NULL default '0',
   `active` tinyint(1) NOT NULL default '0',
   `published` tinyint(1) NOT NULL default '0',
   `editable` tinyint(1) NOT NULL default '1',

modules/base/text/template/css/main.css

@@ -226,40 +226,12 @@
     max-width: 100%;
 }
 
-.bx-base-text-entity-content,
-.bx-base-text-entity-content p,
-.bx-base-text-entity-content h1,
-.bx-base-text-entity-content h2,
-.bx-base-text-entity-content h3 {
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.bx-base-text-entity-content p:first-child,
-.bx-base-text-entity-content h2:first-child,
-.bx-base-text-entity-content h1:first-child {
-    margin-top:0;
-	margin-bottom: 0;
-}
-
-.bx-base-text-entity-content p:last-child,
-.bx-base-text-entity-content h2:last-child,
-.bx-base-text-entity-content h1:last-child {
-    margin-bottom:0;
-}
-
 .bx-base-text-entity-actions-all .bx-base-text-entity-share,
 .bx-base-text-entity-actions-all .bx-menu-btns-hor {
     display:inline-block;
     vertical-align:top;
 }
 
-.bx-base-text-title-bages{
-    display: flex;
-    overflow: hidden;
-    align-items: center;
-}
-
 /* MEDIA: desktop */
 
 .bx-media-desktop .bx-layout-column-wide .bx-base-pofile-units-wrapper .bx-base-pofile-unit-with-cover {

modules/boonex/english/data/langs/system/en.xml

@@ -1677,6 +1677,7 @@
 	<string name="_adm_stg_err_mix_already_exists"><![CDATA[Mix with the same name already exists.]]></string>
 	<string name="_adm_stg_txt_create_mix_popup"><![CDATA[Add New Mix]]></string>
 	<string name="_adm_stg_txt_import_mix_popup"><![CDATA[Import Mix]]></string>
+        <string name="_adm_stg_txt_mix_dark"><![CDATA[Dark mode]]></string>
 	<string name="_adm_stg_txt_mix_duplicate"><![CDATA[Duplicate from]]></string>
 	<string name="_adm_stg_txt_mix_duplicate_inf"><![CDATA[Use 'None' to duplicate System values]]></string>
 	<string name="_adm_stg_txt_mix_title"><![CDATA[Mix Title]]></string>

modules/boonex/protean/install/sql/install.sql

@@ -929,8 +929,8 @@ INSERT INTO `sys_options_mixes2options` (`option`, `mix_id`, `value`) VALUES
 
 
 -- Dark Mix
-INSERT INTO `sys_options_mixes` (`type`, `category`, `name`, `title`, `active`, `published`, `editable`) VALUES
-(@sName, '', 'Protean-Dark-Mix', 'Dark Mix', 0, 1, 0);
+INSERT INTO `sys_options_mixes` (`type`, `category`, `name`, `title`, `dark`, `active`, `published`, `editable`) VALUES
+(@sName, '', 'Protean-Dark-Mix', 'Dark Mix', 1, 0, 1, 0);
 SET @iMixId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options_mixes2options` (`option`, `mix_id`, `value`) VALUES

modules/boonex/russian/data/langs/system/ru.xml

@@ -1664,6 +1664,7 @@
 	<string name="_adm_stg_err_mix_already_exists"><![CDATA[Набор с таким именем уже существует.]]></string>
 	<string name="_adm_stg_txt_create_mix_popup"><![CDATA[Добавить новый набор]]></string>
 	<string name="_adm_stg_txt_import_mix_popup"><![CDATA[Импортировать набор]]></string>
+        <string name="_adm_stg_txt_mix_dark"><![CDATA[Темный]]></string>
 	<string name="_adm_stg_txt_mix_duplicate"><![CDATA[Продублировать]]></string>
 	<string name="_adm_stg_txt_mix_duplicate_inf"><![CDATA[Используйте 'Никакой', чтобы продублировать Системные значения]]></string>
 	<string name="_adm_stg_txt_mix_title"><![CDATA[Название набора]]></string>

studio/template/scripts/BxBaseStudioOptions.php

@@ -274,6 +274,14 @@ class BxBaseStudioOptions extends BxDolStudioOptions
                     ],
                     'db' => ['pass' => 'Xss']
                 ],
+                'dark' => [
+                    'type' => 'switcher',
+                    'name' => 'dark',
+                    'caption' => _t('_adm_stg_txt_mix_dark'),
+                    'info' => '',
+                    'value' => '1',
+                    'db' => ['pass' => 'Int']
+                ],
                 'duplicate' => [
                     'type' => 'select',
                     'name' => 'duplicate',