Merge branch 'master' of https://github.com/unaio/una

modules/base/text/template/entry-text.html

@@ -16,7 +16,7 @@
         <bx_if:show_entry_abstract>
             <div class="bx-base-text-abstract mb-3 md:mb-4 lg:mb-6 text-gray-600 dark:text-gray-400 text-xl font-medium">__entry_abstract__</div>
         </bx_if:show_entry_abstract>
-        <div class="bx-base-text-text">__entry_text__</div>
+        <div class="bx-base-text-text text-ellipsis overflow-hidden">__entry_text__</div>
     </div>
     <bx_if:show_links>
         <div class="__style_prefix__-item-links">

modules/boonex/timeline/classes/BxTimelineModule.php

@@ -2172,6 +2172,55 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
     	return $this->_serviceGetBlockViewByType($aParams);
     }
 
+    public function serviceGetBlockViewChannels($sView = 'timeline')
+    {
+        return $this->serviceGetBlockViewCustom([
+            'view' => $sView, 
+            'type' => 'channels'
+        ]);
+    }
+    
+    public function serviceGetBlockViewFeedAndHot($sView = 'timeline')
+    {
+        return $this->serviceGetBlockViewCustom([
+            'view' => $sView, 
+            'type' => 'feed_and_hot'
+        ]);
+    }
+    
+    public function serviceGetBlockViewContexts($sView = 'timeline', $sContextModule = 'bx_groups')
+    {
+        return $this->serviceGetBlockViewCustom([
+            'view' => $sView, 
+            'type' => 'connected_contexts',
+            'context' => $sContextModule
+        ]);
+    }
+
+    public function serviceGetBlockViewMedia($sView = 'timeline', $mixedMedia = ['files', 'images', 'videos'])
+    {
+        return $this->serviceGetBlockViewCustom([
+            'view' => $sView, 
+            'type' => 'feed',
+            'media' => $mixedMedia
+        ]);
+    }
+
+    public function serviceGetBlockViewMediaFiles($sView = 'timeline')
+    {
+        return $this->serviceGetBlockViewMedia($sView, 'files');
+    }
+
+    public function serviceGetBlockViewMediaImages($sView = 'timeline')
+    {
+        return $this->serviceGetBlockViewMedia($sView, 'images');
+    }
+
+    public function serviceGetBlockViewMediaVideos($sView = 'timeline')
+    {
+        return $this->serviceGetBlockViewMedia($sView, 'videos');
+    }
+
     public function serviceGetBlockMenuDb($aParams = [])
     {
         $aParams = $this->_prepareParams(array_merge([

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

@@ -99,14 +99,14 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 ('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_menu_db', '_bx_timeline_page_block_title_menu_db', 11, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:17:"get_block_menu_db";}', 0, 1, 1, @iBlockOrder + 7),
 ('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_views_db', '_bx_timeline_page_block_title_views_db', 11, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:18:"get_block_views_db";}', 0, 1, 1, @iBlockOrder + 8),
 
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_channels', '_bx_timeline_page_block_title_view_channels', 0, 0, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:21:"get_block_view_custom";s:6:"params";a:1:{i:0;a:2:{s:4:"view";s:8:"timeline";s:4:"type";s:8:"channels";}}}', 0, 1, 1, @iBlockOrder + 9),
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_feed_and_hot', '_bx_timeline_page_block_title_view_feed_and_hot', 0, 0, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:21:"get_block_view_custom";s:6:"params";a:1:{i:0;a:2:{s:4:"view";s:8:"timeline";s:4:"type";s:12:"feed_and_hot";}}}', 0, 1, 1, @iBlockOrder + 10),
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_contexts_groups', '_bx_timeline_page_block_title_view_contexts_groups', 0, 0, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:21:"get_block_view_custom";s:6:"params";a:1:{i:0;a:3:{s:4:"view";s:8:"timeline";s:4:"type";s:18:"connected_contexts";s:7:"context";s:9:"bx_groups";}}}', 0, 1, 1, @iBlockOrder + 11),
-
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_media_files', '_bx_timeline_page_block_title_view_media_files', 0, 0, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:21:"get_block_view_custom";s:6:"params";a:1:{i:0;a:3:{s:4:"view";s:8:"timeline";s:4:"type";s:4:"feed";s:5:"media";s:5:"files";}}}', 0, 1, 1, @iBlockOrder + 12),
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_media_images', '_bx_timeline_page_block_title_view_media_images', 0, 0, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:21:"get_block_view_custom";s:6:"params";a:1:{i:0;a:3:{s:4:"view";s:8:"timeline";s:4:"type";s:4:"feed";s:5:"media";s:6:"images";}}}', 0, 1, 1, @iBlockOrder + 13),
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_media_videos', '_bx_timeline_page_block_title_view_media_videos', 0, 0, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:21:"get_block_view_custom";s:6:"params";a:1:{i:0;a:3:{s:4:"view";s:8:"timeline";s:4:"type";s:4:"feed";s:5:"media";s:6:"videos";}}}', 0, 1, 1, @iBlockOrder + 14),
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_media_any', '_bx_timeline_page_block_title_view_media_any', 0, 0, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:21:"get_block_view_custom";s:6:"params";a:1:{i:0;a:3:{s:4:"view";s:8:"timeline";s:4:"type";s:4:"feed";s:5:"media";a:3:{i:0;s:5:"files";i:1;s:6:"images";i:2;s:6:"videos";}}}}', 0, 1, 1, @iBlockOrder + 15);
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_channels', '_bx_timeline_page_block_title_view_channels', 0, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:23:"get_block_view_channels";}', 0, 1, 1, @iBlockOrder + 9),
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_feed_and_hot', '_bx_timeline_page_block_title_view_feed_and_hot', 0, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:27:"get_block_view_feed_and_hot";}', 0, 1, 1, @iBlockOrder + 10),
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_contexts_groups', '_bx_timeline_page_block_title_view_contexts_groups', 0, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:21:"get_block_view_contexts";}', 0, 1, 1, @iBlockOrder + 11),
+
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_media_files', '_bx_timeline_page_block_title_view_media_files', 0, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:26:"get_block_view_media_files";}', 0, 1, 1, @iBlockOrder + 12),
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_media_images', '_bx_timeline_page_block_title_view_media_images', 0, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:27:"get_block_view_media_images";}', 0, 1, 1, @iBlockOrder + 13),
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_media_videos', '_bx_timeline_page_block_title_view_media_videos', 0, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:27:"get_block_view_media_videos";}', 0, 1, 1, @iBlockOrder + 14),
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_media_any', '_bx_timeline_page_block_title_view_media_any', 0, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:20:"get_block_view_media";}', 0, 1, 1, @iBlockOrder + 15);
 
 
 -- MENU: View