AntonLV 5 лет назад
Родитель
Сommit
91aa6ffb06

+ 21 - 0
inc/classes/BxDolTemplate.php

@@ -1649,6 +1649,27 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
         return '<a href="' . $sLink . '"' . $sAttrs . '>' . $sContent . '</a>';
         return '<a href="' . $sLink . '"' . $sAttrs . '>' . $sContent . '</a>';
     }
     }
 
 
+    /**
+     * Parse tag <A> using provided HTML template
+     * 
+     * @param string $sName template's file name
+     * @param string $sLink link URL
+     * @param string $sContent link content
+     * @param array $aAttrs an array of key => value pairs
+     */
+    function parseLinkByName($sName, $sLink, $sContent, $aAttrs = array())
+    {
+        $sAttrs = '';
+        foreach($aAttrs as $sKey => $sValue)
+            $sAttrs .= ' ' . $sKey . '="' . bx_html_attribute($sValue) . '"';
+
+        return $this->parseHtmlByName($sName, array(
+            'href' => $sLink,
+            'attrs' => $sAttrs,
+            'content' => $sContent
+        ));
+    }
+
     /**
     /**
      * Parse tag <BUTTON>
      * Parse tag <BUTTON>
      * 
      * 

+ 2 - 2
modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -2303,7 +2303,7 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
             else if(!$bViewItem && !empty($aImage['src_orig']))
             else if(!$bViewItem && !empty($aImage['src_orig']))
                 $aAttrs['onclick'] = 'return ' . $sJsObject . '.showItem(this, \'' . $aEvent['id'] . '\', \'photo\', ' . json_encode(array('src' => base64_encode($aImage['src_orig']))) . ')'; 
                 $aAttrs['onclick'] = 'return ' . $sJsObject . '.showItem(this, \'' . $aEvent['id'] . '\', \'photo\', ' . json_encode(array('src' => base64_encode($aImage['src_orig']))) . ')'; 
 
 
-            $sImage = $this->parseLink(isset($aImage['url']) ? $aImage['url'] : 'javascript:void(0)', $sImage, $aAttrs);
+            $sImage = $this->parseLinkByName('image_link.html', isset($aImage['url']) ? $aImage['url'] : 'javascript:void(0)', $sImage, $aAttrs);
 
 
             $aTmplVarsImages[] = array(
             $aTmplVarsImages[] = array(
                 'style_prefix' => $sStylePrefix,
                 'style_prefix' => $sStylePrefix,
@@ -2488,7 +2488,7 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
             else if(!$bViewItem && !empty($aFile['src_orig']))
             else if(!$bViewItem && !empty($aFile['src_orig']))
                 $aAttrs['onclick'] = 'return ' . $sJsObject . '.showItem(this, \'' . $aEvent['id'] . '\', \'photo\', ' . json_encode(array('src' => base64_encode($aFile['src_orig']))) . ')'; 
                 $aAttrs['onclick'] = 'return ' . $sJsObject . '.showItem(this, \'' . $aEvent['id'] . '\', \'photo\', ' . json_encode(array('src' => base64_encode($aFile['src_orig']))) . ')'; 
 
 
-            $sImage = $this->parseLink(isset($aFile['url']) ? $aFile['url'] : 'javascript:void(0)', $sImage, $aAttrs);
+            $sImage = $this->parseLinkByName('file_link.html', isset($aFile['url']) ? $aFile['url'] : 'javascript:void(0)', $sImage, $aAttrs);
 
 
             $aTmplVarsFiles[] = array(
             $aTmplVarsFiles[] = array(
                 'style_prefix' => $sStylePrefix,
                 'style_prefix' => $sStylePrefix,

+ 1 - 0
modules/boonex/timeline/template/file_link.html

@@ -0,0 +1 @@
+<a href="__href__"__attrs__>__content__</a>

+ 1 - 0
modules/boonex/timeline/template/image_link.html

@@ -0,0 +1 @@
+<a href="__href__"__attrs__>__content__</a>