AntonLV 9 лет назад
Родитель
Сommit
d045f22453

+ 21 - 66
inc/classes/BxDolTemplate.php

@@ -19,14 +19,6 @@ define('BX_DOL_TEMPLATE_CHECK_IN_BOTH', 'both');
 define('BX_DOL_TEMPLATE_CHECK_IN_BASE', 'base');
 define('BX_DOL_TEMPLATE_CHECK_IN_TMPL', 'tmpl');
 
-define('BX_DOL_TEMPLATE_TAG_I', 'i');
-define('BX_DOL_TEMPLATE_TAG_SPAN', 'span');
-define('BX_DOL_TEMPLATE_TAG_DIV', 'div');
-define('BX_DOL_TEMPLATE_TAG_IMG', 'img');
-define('BX_DOL_TEMPLATE_TAG_A', 'a');
-define('BX_DOL_TEMPLATE_TAG_BUTTON', 'button');
-define('BX_DOL_TEMPLATE_TAG_CUSTOM', 'custom');
-
 define('BX_DOL_COLOR_BG', 'bg');
 define('BX_DOL_COLOR_FT', 'ft');
 
@@ -1385,49 +1377,6 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
 
         return $sRet;
     }
-    
-    /**
-     * 
-     * Enter description here ...
-     * @param string $sName tag name (i, span, div, img, a, button, custom)
-     * @param string $sContent tag content (HTML)
-     * @param array $aAttrs an array of key - value pairs of attributes
-     * @param string $sTemplate
-     */
-    public function parseHtmlTag($sName, $sContent, $aAttrs = array(), $sTemplate = 'html_tags')
-    {
-        $aTags = array(BX_DOL_TEMPLATE_TAG_I, BX_DOL_TEMPLATE_TAG_SPAN, BX_DOL_TEMPLATE_TAG_DIV, BX_DOL_TEMPLATE_TAG_IMG, BX_DOL_TEMPLATE_TAG_A, BX_DOL_TEMPLATE_TAG_BUTTON, BX_DOL_TEMPLATE_TAG_CUSTOM);
-
-        $aTmplVarsAttrs = array();
-        foreach($aAttrs as $sKey => $sValue)
-            $aTmplVarsAttrs[] = array('key' => $sKey, 'value' => bx_html_attribute($sValue));
-
-        $aTmplVars = array();
-        foreach($aTags as $sTag) {
-            $aTmplVarsTag = array();
-            $bTmplVarsTag = $sTag == $sName;
-            if($bTmplVarsTag)
-                $aTmplVarsTag = array(
-                    'content' => $sContent,
-                    'bx_repeat:attrs' => $aTmplVarsAttrs
-                );
-
-            $aTmplVars['bx_if:' . $sTag] = array(
-            	'condition' => $bTmplVarsTag,
-                'content' => $aTmplVarsTag
-            );
-        }
-
-        $sMethod = '';
-        if(strpos($sTemplate, '.') !== false)
-            $sMethod = 'parseHtmlByName';
-        else if(array_key_exists($sTemplate, $this->_aTemplates))
-            $sMethod = 'parseHtmlByTemplateName';
-        else
-            $sMethod = 'parseHtmlByContent';
-
-        return $this->$sMethod($sTemplate, $aTmplVars);
-    }
 
     /**
      * Parse tag <A>
@@ -1438,12 +1387,11 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
      */
     function parseLink($sLink, $sContent, $aAttrs = array())
     {
-        if(!is_array($aAttrs))
-            $aAttrs = array();
-
-        $aAttrs['href'] = $sLink;
+        $sAttrs = '';
+        foreach($aAttrs as $sKey => $sValue)
+            $sAttrs .= ' ' . $sKey . '="' . bx_html_attribute($sValue) . '"';
 
-        return $this->parseHtmlTag(BX_DOL_TEMPLATE_TAG_A, $sContent, $aAttrs);
+        return '<a href="' . $sLink . '"' . $sAttrs . '>' . $sContent . '</a>';
     }
 
     /**
@@ -1454,7 +1402,11 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
      */
     function parseButton($sContent, $aAttrs = array())
     {
-        return $this->parseHtmlTag(BX_DOL_TEMPLATE_TAG_BUTTON, $sContent, $aAttrs);
+        $sAttrs = '';
+        foreach($aAttrs as $sKey => $sValue)
+            $sAttrs .= ' ' . $sKey . '="' . bx_html_attribute($sValue) . '"';
+
+        return '<button' . $sAttrs . '>' . $sContent . '</button>';
     }
 
     /**
@@ -1465,12 +1417,11 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
      */
     function parseImage($sLink, $aAttrs = array())
     {
-        if(!is_array($aAttrs))
-            $aAttrs = array();
-
-        $aAttrs['src'] = $sLink;
+        $sAttrs = '';
+        foreach($aAttrs as $sKey => $sValue)
+            $sAttrs .= ' ' . $sKey . '="' . bx_html_attribute($sValue) . '"';
 
-        return $this->parseHtmlTag(BX_DOL_TEMPLATE_TAG_IMG, '', $aAttrs);
+        return '<img src="' . $sLink . '"' . $sAttrs . ' />';
     }
 
     /**
@@ -1481,12 +1432,16 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
      */
     function parseIcon($sName, $aAttrs = array())
     {
-        if(!is_array($aAttrs))
-            $aAttrs = array();
+        if(!empty($aAttrs['class'])) {
+            $sName .= ' ' . $aAttrs['class'];
+            unset($aAttrs['class']);
+        }
 
-        $aAttrs['class'] = 'sys-icon ' . $sName . (!empty($aAttrs['class']) ? ' ' . $aAttrs['class'] : '');
+        $sAttrs = '';
+        foreach($aAttrs as $sKey => $sValue)
+            $sAttrs .= ' ' . $sKey . '="' . bx_html_attribute($sValue) . '"';
 
-        return $this->parseHtmlTag(BX_DOL_TEMPLATE_TAG_I, '', $aAttrs);
+        return '<i class="sys-icon ' . $sName . '"' . $sAttrs . '></i>';
     }
 
     function getCacheFilePrefix($sType)

+ 38 - 8
modules/base/text/classes/BxBaseModTextTemplate.php

@@ -30,7 +30,7 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
 
     function getUnitMetaItemLink($sContent, $aAttrs = array())
     {
-        return $this->parseHtmlTag(BX_DOL_TEMPLATE_TAG_A, $sContent, $aAttrs, 'unit_meta_item.html');
+        return $this->getUnitMetaItem('a', $sContent, $aAttrs);
     }
 
     function getUnitMetaItemText($sContent, $aAttrs = array())
@@ -40,12 +40,12 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
 
         $aAttrs['class'] = (!empty($aAttrs['class']) ? $aAttrs['class'] . ' ' : '') . 'bx-def-font-grayed';
 
-        return $this->parseHtmlTag(BX_DOL_TEMPLATE_TAG_SPAN, $sContent, $aAttrs, 'unit_meta_item.html');
+        return $this->getUnitMetaItem('span', $sContent, $aAttrs);
     }
 
     function getUnitMetaItemCustom($sContent)
     {
-        return $this->parseHtmlTag(BX_DOL_TEMPLATE_TAG_CUSTOM, $sContent, array(), 'unit_meta_item.html');
+        return $this->getUnitMetaItem('custom', $sContent);
     }
 
     function entryAuthor ($aData, $iProfileId = false, $sFuncAuthorDesc = 'getAuthorDesc', $sTemplateName = 'author.html', $sFuncAuthorAddon = 'getAuthorAddon')
@@ -184,14 +184,14 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
 
         $sTitle = bx_process_output($sTitle);
 
-        $sMeta = '';
+        $aTmplVarsMeta = array();
         if(!empty($CNF['OBJECT_MENU_SNIPPET_META'])) {
             $oMenuMeta = BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_SNIPPET_META'], $this);
             if($oMenuMeta) {
                 $oMenuMeta->setContentId($aData[$CNF['FIELD_ID']]);
-                $sMeta = $this->parseHtmlTag(BX_DOL_TEMPLATE_TAG_DIV, $oMenuMeta->getCode(), array(
-                    'class' => 'bx-base-text-unit-meta' 
-                ));
+                $aTmplVarsMeta = array(
+                    'meta' => $oMenuMeta->getCode()
+                );
             }
         }
 
@@ -211,7 +211,10 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
             'entry_posting_date' => bx_time_js($aData[$CNF['FIELD_ADDED']], BX_FORMAT_DATE),
             'module_name' => _t($CNF['T']['txt_sample_single']),
             'ts' => $aData[$CNF['FIELD_ADDED']],
-            'meta' => $sMeta,
+            'bx_if:meta' => array(
+                'condition' => !empty($aTmplVarsMeta),
+                'content' => $aTmplVarsMeta
+            ),
             'bx_if:thumb' => array (
                 'condition' => $sPhotoThumb,
                 'content' => array (
@@ -234,6 +237,33 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
         );
     }
 
+    protected function getUnitMetaItem($sName, $sContent, $aAttrs = array(), $sTemplate = 'unit_meta_item.html')
+    {
+        $aTags = array('span', 'a', 'custom');
+
+        $aTmplVarsAttrs = array();
+        foreach($aAttrs as $sKey => $sValue)
+            $aTmplVarsAttrs[] = array('key' => $sKey, 'value' => bx_html_attribute($sValue));
+
+        $aTmplVars = array();
+        foreach($aTags as $sTag) {
+            $aTmplVarsTag = array();
+            $bTmplVarsTag = $sTag == $sName;
+            if($bTmplVarsTag)
+                $aTmplVarsTag = array(
+                    'content' => $sContent,
+                    'bx_repeat:attrs' => $aTmplVarsAttrs
+                );
+
+            $aTmplVars['bx_if:' . $sTag] = array(
+            	'condition' => $bTmplVarsTag,
+                'content' => $aTmplVarsTag
+            );
+        }
+
+        return $this->parseHtmlByName($sTemplate, $aTmplVars);
+    }
+
     protected function getTitle($aData)
     {
         $CNF = &$this->getModule()->_oConfig->CNF;

+ 3 - 1
modules/base/text/template/unit.html

@@ -6,7 +6,9 @@
 	</bx_if:thumb>
 	<div class="bx-base-text-unit-text bx-def-padding bx-def-box-sizing">
 	    <h2 class="bx-base-text-unit-title"><a href="__content_url__">__title__</a></h2>
-	    <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">__meta__</div>
+	    <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">
+            <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+        </div>
 	    <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-clearfix">
 	        __summary__
 	    </div> 

+ 3 - 1
modules/base/text/template/unit_full.html

@@ -1,5 +1,7 @@
 <div class="bx-base-text-unit bx-base-text-unit-ext bx-def-margin-bottom">
     <h1 class="bx-base-text-unit-title bx-def-padding-sec-top"><a href="__content_url__">__title__</a></h1>
-    <div class="bx-base-text-unit-info bx-def-margin-sec-top">__meta__</div>
+    <div class="bx-base-text-unit-info bx-def-margin-sec-top">
+        <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+    </div>
     <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-def-margin-sec-bottom bx-clearfix">__text__</div> 
 </div>

+ 3 - 1
modules/base/text/template/unit_gallery.html

@@ -2,7 +2,9 @@
 	<div class="bx-base-text-unit-cnt bx-def-box bx-def-round-corners bx-def-color-bg-box bx-def-box-sizing">
 		<div class="bx-base-text-unit-text bx-def-padding-leftright bx-def-padding-sec-topbottom bx-def-font-align-center bx-def-box-sizing">
 			<h2><a href="__content_url__">__title__</a></h2>
-		    <div class="bx-base-text-unit-info">__meta__</div>
+		    <div class="bx-base-text-unit-info">
+                <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+            </div>
 		</div>
 	    <bx_if:thumb>
 	        <a href="__content_url__" title="__summary_attr__">

+ 7 - 5
modules/boonex/albums/classes/BxAlbumsTemplate.php

@@ -66,9 +66,9 @@ class BxAlbumsTemplate extends BxBaseModTextTemplate
             $oMenuMeta = BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_SNIPPET_META'], $this);
             if($oMenuMeta) {
                 $oMenuMeta->setContentId($aData[$CNF['FIELD_ID']]);
-                $sMeta = $this->parseHtmlTag(BX_DOL_TEMPLATE_TAG_DIV, $oMenuMeta->getCode(), array(
-                	'class' => 'bx-base-text-unit-meta' 
-                ));
+                $aTmplVarsMeta = array(
+                    'meta' => $oMenuMeta->getCode()
+                );
             }
         }
 
@@ -83,9 +83,11 @@ class BxAlbumsTemplate extends BxBaseModTextTemplate
             'entry_posting_date' => bx_time_js($aData[$CNF['FIELD_ADDED']], BX_FORMAT_DATE),
             'module_name' => _t($CNF['T']['txt_sample_single']),
             'ts' => $aData[$CNF['FIELD_ADDED']],
-        	'meta' => $sMeta,
+        	'bx_if:meta' => array(
+                'condition' => !empty($aTmplVarsMeta),
+                'content' => $aTmplVarsMeta
+            ),
             'bx_repeat:browse' => $aBrowseUnits,
-
             'bx_if:thumb' => array (
                 'condition' => $aBrowseUnits,
                 'content' => array (

+ 3 - 1
modules/boonex/albums/template/unit.html

@@ -1,7 +1,9 @@
 <div class="bx-base-text-unit bx-base-text-unit-ext bx-def-box bx-def-round-corners bx-def-color-bg-box bx-def-margin-bottom">
 	<div class="bx-albums-unit-text-cont bx-def-padding-top bx-def-padding-sec-bottom bx-def-padding-leftright">
 	    <h2 class="bx-base-text-unit-title"><a href="__content_url__">__title__</a></h2>
-	    <div class="bx-base-text-unit-info bx-def-margin-thd-top bx-def-margin-sec-bottom">__meta__</div>
+	    <div class="bx-base-text-unit-info bx-def-margin-thd-top bx-def-margin-sec-bottom">
+            <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+        </div>
 	    <div class="bx-base-text-unit-summary bx-clearfix">__summary__</div> 
 	</div>
     <div class="bx-albums-unit-images-cont bx-def-padding-thd-leftright bx-def-padding-bottom">

+ 3 - 1
modules/boonex/albums/template/unit_gallery.html

@@ -2,7 +2,9 @@
 	<div class="bx-base-text-unit-cnt bx-def-box bx-def-round-corners bx-def-color-bg-box">
 		<div class="bx-albums-unit-text-cont bx-def-padding-sec-topbottom bx-def-padding-thd-leftright bx-def-font-align-center">
 		    <h2 class="bx-base-text-unit-title"><a href="__content_url__">__title__</a></h2>
-		    <div class="bx-base-text-unit-info">__meta__</div>
+		    <div class="bx-base-text-unit-info">
+                <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+            </div>
 		</div>
 	    <div class="bx-albums-unit-images-cont bx-def-padding-thd-leftright bx-def-padding-sec-bottom">
 	        <div class="bx-albums-unit-images bx-clearfix">

+ 3 - 1
modules/boonex/files/template/unit.html

@@ -7,7 +7,9 @@
 	<div class="bx-base-text-unit-text bx-def-padding bx-def-box-sizing">
         <i class="sys-icon __icon__ bx-def-padding"></i>
 	    <h2><a href="__content_url__">__title__</a></h2>
-	    <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">__meta__</div>
+	    <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">
+            <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+        </div>
 	    <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-clearfix">
 	        __summary__
 	    </div> 

+ 3 - 1
modules/boonex/files/template/unit_gallery.html

@@ -2,7 +2,9 @@
 	<div class="bx-base-text-unit-cnt bx-def-box bx-def-round-corners bx-def-color-bg-box bx-def-box-sizing">
 		<div class="bx-base-text-unit-text bx-def-padding-leftright bx-def-padding-sec-topbottom bx-def-font-align-center bx-def-box-sizing">
 			<h2><a href="__content_url__">__title__</a></h2>
-		    <div class="bx-base-text-unit-info">__meta__</div>
+		    <div class="bx-base-text-unit-info">
+                <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+            </div>
 		</div>
 	    <bx_if:thumb>
 	        <a href="__content_url__" title="__summary_attr__">

+ 1 - 1
modules/boonex/market/template/unit_gallery.html

@@ -45,7 +45,7 @@
                 </div>
 			    <div class="bx-market-unit-title bx-def-thumb-size-min-height bx-def-thumb-size-left-indent">
 					<a class="bx-def-font-h3" href="__content_url__" title="__title_attr__">__title__</a><br />
-					__meta__
+					<bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
 			    </div>
 		    </div>
 		</div>

+ 3 - 1
modules/boonex/polls/template/unit.html

@@ -6,7 +6,9 @@
     </bx_if:thumb>
     <div class="bx-base-text-unit-text bx-def-padding bx-def-box-sizing">
         <h2 class="bx-base-text-unit-title"><a href="__content_url__">__title__</a></h2>
-        <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">__meta__</div>
+        <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">
+            <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+        </div>
         <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-clearfix">
             __summary__
         </div> 

+ 3 - 1
modules/boonex/polls/template/unit_full.html

@@ -6,7 +6,9 @@
     </bx_if:thumb>
     <div class="bx-base-text-unit-text bx-def-padding bx-def-box-sizing">
         <div class="bx-base-text-unit-title">__text__</div>
-        <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">__meta__</div>
+        <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">
+            <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+        </div>
         <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-clearfix">
             __summary__
         </div> 

+ 3 - 1
modules/boonex/shopify/template/unit.html

@@ -4,7 +4,9 @@
 	</div>
     <div class="bx-base-text-unit-text bx-spf-unit-text bx-def-padding bx-def-box-sizing">
         <h2><a href="__content_url__">__title__</a></h2>
-        <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">__meta__</div>
+        <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">
+            <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+        </div>
         <div class="bx-base-text-unit-summary bx-spf-unit-summary bx-def-margin-sec-top bx-clearfix"></div>
         <div class="bx-base-text-unit-actions bx-spf-unit-actions">
             <a class="bx-btn bx-shopify-buy bx-def-margin-sec-top" href="" style="display:none">

+ 3 - 1
modules/boonex/shopify/template/unit_full.html

@@ -1,6 +1,8 @@
 <div class="bx-base-text-unit bx-base-text-unit-ext __class__ bx-def-margin-bottom">
     <h1 class="bx-def-padding-sec-top"><a href="__content_url__">__title__</a></h1>
-    <div class="bx-base-text-unit-info bx-def-margin-sec-top">__meta__</div>
+    <div class="bx-base-text-unit-info bx-def-margin-sec-top">
+        <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+    </div>
     <div class="bx-base-text-unit-summary bx-spf-unit-summary bx-def-margin-sec-top bx-def-margin-sec-bottom bx-clearfix"></div> 
     <div class="bx-base-text-unit-actions bx-spf-unit-actions">
         <a class="bx-btn bx-shopify-buy" href="" style="display:none">

+ 3 - 1
modules/boonex/shopify/template/unit_gallery.html

@@ -2,7 +2,9 @@
     <div class="bx-base-text-unit-cnt bx-def-box bx-def-round-corners bx-def-color-bg-box bx-def-box-sizing">
         <div class="bx-base-text-unit-text bx-def-padding-leftright bx-def-padding-sec-topbottom bx-def-font-align-center bx-def-box-sizing">
             <h2><a href="__content_url__">__title__</a></h2>
-            <div class="bx-base-text-unit-info">__meta__</div>
+            <div class="bx-base-text-unit-info">
+                <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+            </div>
         </div>
         <a href="__content_url__" title="__summary_attr__">
             <div class="bx-base-text-unit-thumb bx-spf-unit-thumb bx-def-gal-div-size bx-def-round-corners bx-def-font-middle" style="background-image:url(__gallery_url__)">

+ 3 - 1
modules/boonex/snipcart/template/unit.html

@@ -6,7 +6,9 @@
     </bx_if:thumb>
     <div class="bx-base-text-unit-text bx-def-padding bx-def-box-sizing">
         <h2><a href="__content_url__">__title__</a></h2>
-        <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">__meta__</div>
+        <div class="bx-base-text-unit-info bx-def-margin-sec-top bx-def-font-small">
+            <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+        </div>
         <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-clearfix">__summary__</div>
         <bx_if:show_buy>
 	        <div class="bx-snipcart-unit-actions bx-def-margin-sec-top">

+ 3 - 1
modules/boonex/snipcart/template/unit_full.html

@@ -1,6 +1,8 @@
 <div class="bx-base-text-unit bx-base-text-unit-ext bx-def-margin-bottom">
     <h1 class="bx-def-padding-sec-top"><a href="__content_url__">__title__</a></h1>
-    <div class="bx-base-text-unit-info bx-def-margin-sec-top">__meta__</div>
+    <div class="bx-base-text-unit-info bx-def-margin-sec-top">
+        <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+    </div>
     <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-def-margin-sec-bottom bx-clearfix">__text__</div>
     <bx_if:show_buy>
 	    <div class="bx-snipcart-unit-actions">

+ 3 - 1
modules/boonex/snipcart/template/unit_gallery.html

@@ -2,7 +2,9 @@
 	<div class="bx-base-text-unit-cnt bx-def-box bx-def-round-corners bx-def-color-bg-box bx-def-box-sizing">
 		<div class="bx-base-text-unit-text bx-def-padding-leftright bx-def-padding-sec-topbottom bx-def-font-align-center bx-def-box-sizing">
 			<h2><a href="__content_url__">__title__</a></h2>
-		    <div class="bx-base-text-unit-info">__meta__</div>
+		    <div class="bx-base-text-unit-info">
+                <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+            </div>
 		</div>
 	    <bx_if:thumb>
 	        <a href="__content_url__" title="__summary_attr__">

+ 3 - 1
modules/boonex/videos/template/unit.html

@@ -7,7 +7,9 @@
     </bx_if:thumb>
     <div class="bx-base-text-unit-text bx-def-padding bx-def-box-sizing">
         <h2 class="bx-base-text-unit-title"><a href="__content_url__">__title__</a></h2>
-        <div class="bx-base-text-unit-info bx-def-margin-sec-top">__meta__</div>
+        <div class="bx-base-text-unit-info bx-def-margin-sec-top">
+            <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+        </div>
         <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-clearfix">
             __summary__
         </div> 

+ 3 - 1
modules/boonex/videos/template/unit_full.html

@@ -6,7 +6,9 @@
         </div>
     </bx_if:thumb>
     <h1 class="bx-base-text-unit-title bx-def-padding-sec-top"><a href="__content_url__">__title__</a></h1>
-    <div class="bx-base-text-unit-info">__meta__</div>
+    <div class="bx-base-text-unit-info">
+	    <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+	</div>
     <div class="bx-base-text-unit-summary bx-def-margin-sec-top bx-clearfix">
         __text__
     </div> 

+ 3 - 1
modules/boonex/videos/template/unit_gallery.html

@@ -18,7 +18,9 @@
         </bx_if:no_thumb>
         <div class="bx-base-text-unit-text bx-def-padding-leftright bx-def-padding-sec-topbottom bx-def-font-align-center bx-def-box-sizing">
             <h2><a href="__content_url__">__title__</a></h2>
-            <div class="bx-base-text-unit-info bx-def-font-small">__meta__</div>
+            <div class="bx-base-text-unit-info bx-def-font-small">
+                <bx_if:meta><div class="bx-base-text-unit-meta">__meta__</div></bx_if:meta>
+            </div>
         </div>
     </div>
 </div>

+ 0 - 7
template/html_tags.html

@@ -1,7 +0,0 @@
-<bx_if:i><i <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</i></bx_if:i>
-<bx_if:span><span <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</span></bx_if:span>
-<bx_if:div><div <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</div></bx_if:div>
-<bx_if:img><img <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs> /></bx_if:img>
-<bx_if:a><a <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a></bx_if:a>
-<bx_if:button><button <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</button></bx_if:button>
-<bx_if:custom>__content__</bx_if:custom>