Ticket #1401

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

@@ -13,8 +13,6 @@
 	<string name="_bx_timeline_option_events_per_page"><![CDATA[Количество элементов на странице]]></string>
 	<string name="_bx_timeline_option_rss_length"><![CDATA[Количество элементов в RSS-ленте]]></string>
 	<string name="_bx_timeline_option_events_hide"><![CDATA[Показывать события в ленте]]></string>
-	<string name="_bx_timeline_option_chars_display_max"><![CDATA[Макс. число отображаемых символов в текстовом сообщении]]></string>
-	<string name="_bx_timeline_option_err_chars_display_max"><![CDATA[Введите число, желательно, большее 150.]]></string>
     <string name="_bx_timeline_option_videos_autoplay"><![CDATA[Автоматически проигрывать видео ролики на Ленте]]></string>
     <string name="_bx_timeline_option_videos_autoplay_off"><![CDATA[Отключено]]></string>
     <string name="_bx_timeline_option_videos_autoplay_on_mute"><![CDATA[Включено (без звука)]]></string>

modules/boonex/timeline/classes/BxTimelineConfig.php

@@ -21,7 +21,6 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
 
     protected $_iRssLength;
     protected $_iLiveUpdateLength;
-    protected $_iCharsDisplayMax;
     protected $_iCharsDisplayMaxTitle;
     protected $_sVideosAutoplay;
 
@@ -266,7 +265,6 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
 
         $this->_iRssLength = (int)getParam($sOptionPrefix . 'rss_length');
         $this->_iLiveUpdateLength = 10;
-        $this->_iCharsDisplayMax = (int)getParam($sOptionPrefix . 'chars_display_max');
         $this->_iCharsDisplayMaxTitle = 20;
         $this->_sVideosAutoplay = getParam($sOptionPrefix . 'videos_autoplay');
 
@@ -328,11 +326,6 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
         return $this->_iLiveUpdateLength;
     }
 
-    public function getCharsDisplayMax()
-    {
-        return $this->_iCharsDisplayMax;
-    }
-
     public function getCharsDisplayMaxTitle()
     {
         return $this->_iCharsDisplayMaxTitle;

modules/boonex/timeline/install/langs/en.xml

@@ -13,8 +13,6 @@
 	<string name="_bx_timeline_option_events_per_page"><![CDATA[Number of items per page]]></string>
 	<string name="_bx_timeline_option_rss_length"><![CDATA[The length of RSS feed]]></string>
 	<string name="_bx_timeline_option_events_hide"><![CDATA[Show events in Timeline]]></string>
-	<string name="_bx_timeline_option_chars_display_max"><![CDATA[Max number of displayed character in text post]]></string>
-	<string name="_bx_timeline_option_err_chars_display_max"><![CDATA[Enter the number which should be greater then 150.]]></string>
 	<string name="_bx_timeline_option_videos_autoplay"><![CDATA[Videos autoplay in Timeline]]></string>
 	<string name="_bx_timeline_option_videos_autoplay_off"><![CDATA[Disabled]]></string>
 	<string name="_bx_timeline_option_videos_autoplay_on_mute"><![CDATA[Enabled without sound]]></string>

modules/boonex/timeline/install/sql/enable.sql

@@ -153,7 +153,6 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `c
 ('bx_timeline_events_per_page', '24', @iCategId, '_bx_timeline_option_events_per_page', 'digit', '', '', '', '', 13),
 ('bx_timeline_rss_length', '5', @iCategId, '_bx_timeline_option_rss_length', 'digit', '', '', '', '', 20),
 ('bx_timeline_events_hide', '', @iCategId, '_bx_timeline_option_events_hide', 'rlist', '', '', '', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:21:"get_actions_checklist";}', 30),
-('bx_timeline_chars_display_max', '300', @iCategId, '_bx_timeline_option_chars_display_max', 'digit', 'GreaterThan', 'a:1:{s:3:"min";i:150;}', '_bx_timeline_option_err_chars_display_max', '', 40),
 ('bx_timeline_videos_autoplay', 'off', @iCategId, '_bx_timeline_option_videos_autoplay', 'select', '', '', '', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:27:"get_options_videos_autoplay";}', 50),
 ('bx_timeline_enable_hot', '', @iCategId, '_bx_timeline_option_enable_hot', 'checkbox', '', '', '', '', 60),
 ('bx_timeline_hot_interval', '48', @iCategId, '_bx_timeline_option_hot_interval', 'digit', '', '', '', '', 61);

modules/boonex/timeline/template/css/view.css

@@ -153,7 +153,7 @@ div.bx-tl-item-content div.bx-tl-content iframe {
 }
 div.bx-tl-item-text div.bx-tl-content {
 	position: relative;
-    max-height: 1000px;
+    max-height: 250px;
 
 	text-overflow: ellipsis;
     overflow: hidden;