Ticket #2334 - Usage in Timeline.

modules/boonex/timeline/classes/BxTimelineMenuView.php

@@ -12,7 +12,7 @@
 /**
  * View block menu.
  */
-class BxTimelineMenuView extends BxTemplMenuInteractive
+class BxTimelineMenuView extends BxTemplMenuCustom
 {
     protected $_oModule;
 

modules/boonex/timeline/classes/BxTimelineModule.php

@@ -3750,9 +3750,7 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
 
         $this->_iOwnerId = $aParams['owner_id'];
 
-        return array(
-            'content' => $this->_oTemplate->getViewsBlock($aParams)
-        );
+        return $this->_oTemplate->getViewsBlock($aParams);
     }
 
     protected function _serviceGetBlockViewHome($aBrowseParams = array())

modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -175,14 +175,16 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
 
         $sTitle = _t('_bx_timeline_page_block_title_views_' . $aParams['view']);
 
-        return $this->parseHtmlByName('block_views.html', array(
-            'style_prefix' => $sStylePrefix,
-            'html_id' => $this->_oConfig->getHtmlIdView('views', $aParams, array('with_type' => false)),
-            'html_id_content' => $this->_oConfig->getHtmlIdView('views_content', $aParams, array('with_type' => false)),
-            'title' => $sTitle,
-            'menu' => $oMenu->getCode(),
-            'content' => $this->getViewBlock($aParams)
-        ));
+        return array(
+            'content' => $this->parseHtmlByName('block_views.html', array(
+                'style_prefix' => $sStylePrefix,
+                'html_id' => $this->_oConfig->getHtmlIdView('views', $aParams, array('with_type' => false)),
+                'html_id_content' => $this->_oConfig->getHtmlIdView('views_content', $aParams, array('with_type' => false)),
+                'title' => $sTitle,
+                'content' => $this->getViewBlock($aParams)
+            )),
+            'menu' => $oMenu
+        );
     }
 
     public function getViewBlock($aParams)

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

@@ -31,17 +31,17 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `
 -- PAGES: add page block on dashboard
 SET @iPBCellDashboard = 2;
 SET @iPBOrderDashboard = 1; --(SELECT IFNULL(MAX(`order`), 0) FROM `sys_pages_blocks` WHERE `object` = 'sys_dashboard' AND `cell_id` = @iPBCellDashboard LIMIT 1);
-INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES
-('sys_dashboard', @iPBCellDashboard, 'bx_timeline', '_bx_timeline_page_block_title_system_post_account', '_bx_timeline_page_block_title_post_account', 11, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:22:"get_block_post_account";}', 0, 1, 0, @iPBOrderDashboard),
-('sys_dashboard', @iPBCellDashboard, 'bx_timeline', '_bx_timeline_page_block_title_system_views_timeline', '_bx_timeline_page_block_title_views_timeline', 3, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:24:"get_block_views_timeline";s:6:"params";a:1:{i:0;s:4:"feed";}}', 0, 0, 0, @iPBOrderDashboard + 1),
-('sys_dashboard', @iPBCellDashboard, 'bx_timeline', '_bx_timeline_page_block_title_system_views_outline', '_bx_timeline_page_block_title_views_outline', 3, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:23:"get_block_views_outline";s:6:"params";a:1:{i:0;s:4:"feed";}}', 0, 0, 0, @iPBOrderDashboard + 1);
+INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `tabs`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES
+('sys_dashboard', @iPBCellDashboard, 'bx_timeline', '_bx_timeline_page_block_title_system_post_account', '_bx_timeline_page_block_title_post_account', 11, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:22:"get_block_post_account";}', 0, 1, 0, @iPBOrderDashboard),
+('sys_dashboard', @iPBCellDashboard, 'bx_timeline', '_bx_timeline_page_block_title_system_views_timeline', '_bx_timeline_page_block_title_views_timeline', 11, 1, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:24:"get_block_views_timeline";s:6:"params";a:1:{i:0;s:4:"feed";}}', 0, 0, 0, @iPBOrderDashboard + 1),
+('sys_dashboard', @iPBCellDashboard, 'bx_timeline', '_bx_timeline_page_block_title_system_views_outline', '_bx_timeline_page_block_title_views_outline', 11, 1, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:23:"get_block_views_outline";s:6:"params";a:1:{i:0;s:4:"feed";}}', 0, 0, 0, @iPBOrderDashboard + 1);
 
 -- PAGES: add page block on home
 SET @iPBCellHome = 3;
 SET @iPBOrderHome = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_pages_blocks` WHERE `object` = 'sys_home' AND `cell_id` = @iPBCellHome ORDER BY `order` DESC LIMIT 1);
-INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('sys_home', @iPBCellHome, 'bx_timeline', '_bx_timeline_page_block_title_system_post_home', '_bx_timeline_page_block_title_post_home', 11, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:19:"get_block_post_home";}', 0, 1, 0, @iPBOrderHome + 1),
-('sys_home', @iPBCellHome, 'bx_timeline', '_bx_timeline_page_block_title_system_views_timeline', '_bx_timeline_page_block_title_views_timeline', 3, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:24:"get_block_views_timeline";s:6:"params";a:1:{i:0;s:4:"feed";}}', 0, 0, 1, @iPBOrderHome + 2);
+INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `tabs`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
+('sys_home', @iPBCellHome, 'bx_timeline', '_bx_timeline_page_block_title_system_post_home', '_bx_timeline_page_block_title_post_home', 11, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:19:"get_block_post_home";}', 0, 1, 0, @iPBOrderHome + 1),
+('sys_home', @iPBCellHome, 'bx_timeline', '_bx_timeline_page_block_title_system_views_timeline', '_bx_timeline_page_block_title_views_timeline', 11, 1, 2147483644, 'service', 'a:3:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:24:"get_block_views_timeline";s:6:"params";a:1:{i:0;s:4:"feed";}}', 0, 0, 1, @iPBOrderHome + 2);
 
 SET @iPBCellHome = 4;
 SET @iPBOrderHome = (SELECT IFNULL(MAX(`order`), 0) FROM `sys_pages_blocks` WHERE `object` = 'sys_home' AND `cell_id` = @iPBCellHome ORDER BY `order` DESC LIMIT 1);
@@ -70,13 +70,13 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 
 -- PAGE: service blocks
 SET @iBlockOrder = (SELECT `order` FROM `sys_pages_blocks` WHERE `object` = '' AND `cell_id` = 0 ORDER BY `order` DESC LIMIT 1);
-INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_views_timeline', '_bx_timeline_page_block_title_views_timeline', 3, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:24:"get_block_views_timeline";}', 0, 1, 1, @iPBOrderHome + 1),
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_views_outline', '_bx_timeline_page_block_title_views_outline', 3, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:23:"get_block_views_outline";}', 0, 1, 1, @iPBOrderHome + 2),
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_home', '_bx_timeline_page_block_title_view_home', 0, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:19:"get_block_view_home";}', 0, 1, 1, @iBlockOrder + 3),
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_home_outline', '_bx_timeline_page_block_title_view_home_outline', 0, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:27:"get_block_view_home_outline";}', 0, 1, 1, @iBlockOrder + 4),
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_account', '_bx_timeline_page_block_title_view_account', 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:22:"get_block_view_account";}', 0, 1, 1, @iBlockOrder + 5),
-('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_account_outline', '_bx_timeline_page_block_title_view_account_outline', 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:30:"get_block_view_account_outline";}', 0, 1, 1, @iBlockOrder + 6);
+INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `tabs`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_views_timeline', '_bx_timeline_page_block_title_views_timeline', 11, 1, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:24:"get_block_views_timeline";}', 0, 1, 1, @iPBOrderHome + 1),
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_views_outline', '_bx_timeline_page_block_title_views_outline', 11, 1, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:23:"get_block_views_outline";}', 0, 1, 1, @iPBOrderHome + 2),
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_home', '_bx_timeline_page_block_title_view_home', 0, 0, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:19:"get_block_view_home";}', 0, 1, 1, @iBlockOrder + 3),
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_home_outline', '_bx_timeline_page_block_title_view_home_outline', 0, 0, 2147483647, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:27:"get_block_view_home_outline";}', 0, 1, 1, @iBlockOrder + 4),
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_account', '_bx_timeline_page_block_title_view_account', 0, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:22:"get_block_view_account";}', 0, 1, 1, @iBlockOrder + 5),
+('', 0, 'bx_timeline', '_bx_timeline_page_block_title_system_view_account_outline', '_bx_timeline_page_block_title_view_account_outline', 0, 0, 2147483644, 'service', 'a:2:{s:6:"module";s:11:"bx_timeline";s:6:"method";s:30:"get_block_view_account_outline";}', 0, 1, 1, @iBlockOrder + 6);
 
 
 -- MENU: Feeds

modules/boonex/timeline/js/view.js

@@ -442,6 +442,11 @@ BxTimelineView.prototype.changeView = function(oLink, sType, oRequestParams)
     this._oRequestParams.start = 0;
     this._oRequestParams.type = sType;
 
+    var oTab = $(oLink);
+    var sTabActive = 'bx-menu-tab-active';
+    oTab.parents('.bx-db-menu:first').find('li.' + sTabActive).removeClass(sTabActive);
+    oTab.parents('li:first').addClass(sTabActive);
+
     var sView = this._getHtmlId('main', this._oRequestParams);
     if(oViews.find(sView).length !== 0) {
         oViewBefore.hide();

modules/boonex/timeline/template/block_views.html

@@ -1,11 +1,5 @@
 <div id="__html_id__" class="__style_prefix__-views">
-    <div class="__style_prefix__-v-header">
-        <div class="__style_prefix__-v-title bx-def-padding-leftright bx-def-border-bottom bx-def-box-sizing">__title__</div>
-        <div class="__style_prefix__-v-submenu">
-            <div class="__style_prefix__-v-submenu-cnt bx-def-font-semibold">__menu__</div>
-        </div>
-    </div>
-    <div class="__style_prefix__-v-gap bx-def-padding-top">
+    <div class="__style_prefix__-v-gap">
         <div id="__html_id_content__" class="__style_prefix__-v-cnt">__content__</div>
     </div>
 </div>

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

@@ -18,105 +18,6 @@
     width: 100%;
     height: 100%;
 }
-
-.bx-tl-v-header {
-    position: relative;
-    display: -webkit-flex;
-    display: flex;
-
-    border-bottom-color: #e6f0fa;
-    border-bottom-width: 2px;
-}
-.bx-tl-v-title,
-.bx-tl-v-submenu {
-    -webkit-flex: 0 1 auto; 
-    -ms-flex:  0 1 auto; 
-    flex:  0 1 auto;
-    line-height: 3.125rem;
-}
-.bx-tl-v-title,
-.bx-tl-v-submenu-cnt {
-    height: 3.125rem;
-}
-
-.bx-tl-v-title {
-    -webkit-flex-grow: 3;
-    flex-grow: 3;
-
-    border-bottom: 2px solid rgba(0,0,0,0.1);
-
-    white-space: nowrap;
-    font-size: 1rem;
-    font-weight: 400;
-}
-.bx-tl-v-submenu {
-    overflow-x: auto;
-    overflow-y: hidden;
-
-    -webkit-overflow-scrolling: touch;
-}
-.bx-tl-v-submenu::-webkit-scrollbar {
-    width: 0.5rem;
-}
-.bx-tl-v-submenu::-webkit-scrollbar-track {
-    -webkit-border-radius: 0.5rem;
-    border-radius: 0.5rem;
-
-    background-color: rgba(0, 0, 0, 0.1); 
-}
-.bx-tl-v-submenu::-webkit-scrollbar-thumb {
-    -webkit-border-radius: 0.5rem;
-    border-radius: 0.5rem;
-
-    background: rgba(255, 255, 255, 0.9); 
-    -webkit-box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.5);
-}
-.bx-tl-v-submenu::-webkit-scrollbar-thumb:window-inactive {
-    background: rgba(255, 255, 255, 0.4); 
-}
-.bx-tl-v-submenu-cnt ul {
-    display: -webkit-flex;
-    display: flex;
-}
-.bx-tl-v-submenu-cnt ul li {
-    -webkit-flex: 0 1 auto; 
-    -ms-flex:  0 1 auto; 
-    flex:  0 1 auto;
-    box-sizing: border-box;
-    height: 3.125rem;
-
-    border-bottom: 2px solid rgba(0,0,0,0.1);
-    border-radius: 0;
-
-    line-height: 3.125rem;
-    white-space: nowrap;
-    
-}
-.bx-tl-v-submenu-cnt ul li div {
-    padding: 0 0.625rem;
-}
-.bx-tl-v-submenu-cnt ul li.bx-menu-inter-act {
-    border-bottom-color: #364f6b;
-}
-.bx-tl-v-submenu-item .bx-cnc-psi-icon,
-.bx-tl-v-submenu-item .bx-cnc-psi-icon img {
-    width: 1.5rem;
-    height: 1.5rem;
-}
-.bx-tl-v-submenu-item .bx-cnc-psi-icon img {
-    color: #002e74;
-}
-
-.bx-tl-v-submenu-item .bx-cnc-psi-icon .sys-icon {
-    vertical-align: middle;
-    font-size: 1.5rem;
-}
-.bx-tl-v-submenu-item .bx-cnc-psi-title {
-    text-align: center;
-}
-.bx-tl-v-submenu-item.bx-cnc-psi-main .bx-cnc-psi-title {
-    text-align: left;
-}
 .bx-tl-v-view {
     position: relative;
 }

template/css/common.css

@@ -200,17 +200,22 @@ div.mce-fullscreen {
     white-space: nowrap;
 }
 .bx-db-menu ul.bx-menu-hor > li,
-.bx-db-menu ul.bx-menu-custom:not(.bx-menu-submenu-more-auto) > li {
+.bx-db-menu ul.bx-menu-custom.bx-menu-custom-hor > li {
     -webkit-flex: 0 1 auto; 
     -ms-flex:  0 1 auto; 
     flex:  0 1 auto;
 
     height: 2.5rem;
+    padding: 0 0.5rem;
+
     border-bottom: 1px solid transparent;
 
     line-height: 2.5rem;
 }
-.bx-db-menu ul li > span {
+.bx-db-menu ul.bx-menu-custom.bx-menu-custom-hor > li {
+    display: block;
+}
+.bx-db-menu .bx-menu-custom.bx-menu-custom-hor > li > span {
     margin: 0;
     padding: 0;
 }
@@ -219,6 +224,7 @@ div.mce-fullscreen {
 }
 
 /*--- Block menu with Auto-More ---*/
+.bx-db-menu ul.bx-menu-custom.bx-menu-custom-hor,
 .bx-db-menu ul.bx-menu-custom.bx-menu-custom-hor.bx-menu-more-auto:not(.bx-menu-submenu-more-auto) {
     display: -webkit-flex;
     display: flex;