Преглед изворни кода

Ticket #24 - Minor fixes and improvements.

AntonLV пре 10 година
родитељ
комит
6c56d8dad7

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

@@ -501,6 +501,7 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
             'js_object' => $sJsObject,
             'js_object' => $sJsObject,
         	'html_id' => $this->_oConfig->getHtmlIds('view', 'item') . $aEvent['id'],
         	'html_id' => $this->_oConfig->getHtmlIds('view', 'item') . $aEvent['id'],
             'class' => $bBrowseItem ? 'bx-tl-view-sizer' : 'bx-tl-grid-sizer',
             'class' => $bBrowseItem ? 'bx-tl-view-sizer' : 'bx-tl-grid-sizer',
+        	'class_content' => $bBrowseItem ? 'bx-def-color-bg-block' : 'bx-def-color-bg-box',
             'bx_if:show_icon' => array(
             'bx_if:show_icon' => array(
                 'condition' => $bAuthorIcon,
                 'condition' => $bAuthorIcon,
                 'content' => array(
                 'content' => array(
@@ -640,7 +641,7 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
         if($bBrowseItem)
         if($bBrowseItem)
         	 $sText = strip_tags($sText, '<br><br/><p>');
         	 $sText = strip_tags($sText, '<br><br/><p>');
         else {
         else {
-        	$sText = strip_tags(preg_replace("/<br[\s\/]*>/i", "\n", $sText));
+        	$sText = strip_tags($sText);
 
 
         	$iMaxLength = $this->_oConfig->getCharsDisplayMax();
         	$iMaxLength = $this->_oConfig->getCharsDisplayMax();
         	if(strlen($sText) > $iMaxLength) {
         	if(strlen($sText) > $iMaxLength) {

+ 1 - 1
modules/boonex/timeline/template/item.html

@@ -1,6 +1,6 @@
 <div id="__html_id__" class="__style_prefix__-item __class__">
 <div id="__html_id__" class="__style_prefix__-item __class__">
 	<div class="__style_prefix__-item-ind bx-def-padding-sec">
 	<div class="__style_prefix__-item-ind bx-def-padding-sec">
-	    <div class="__style_prefix__-item-cnt bx-def-box bx-def-padding bx-def-round-corners bx-def-color-bg-box">
+	    <div class="__style_prefix__-item-cnt bx-def-box bx-def-padding bx-def-round-corners __class_content__">
 	    	<div class="__style_prefix__-item-owner bx-def-margin-bottom"> 
 	    	<div class="__style_prefix__-item-owner bx-def-margin-bottom"> 
 		       	<div class="__style_prefix__-owner-avatar bx-def-thumb bx-def-thumb-size">
 		       	<div class="__style_prefix__-owner-avatar bx-def-thumb bx-def-thumb-size">
 					<bx_if:show_icon>
 					<bx_if:show_icon>