Merge branch 'master' of https://github.com/boonex/dolphin

modules/base/profile/classes/BxBaseModProfileModule.php

@@ -237,27 +237,6 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolPro
         return $this->_serviceEntityForm ('editDataForm', $iContentId, $this->_oConfig->CNF['OBJECT_FORM_ENTRY_DISPLAY_EDIT_COVER']);
     }
 
-    public function serviceProfileCover ($iContentId = 0)
-    {
-        if (!$iContentId) {
-            if (bx_get('id')) {
-                $iContentId = bx_process_input(bx_get('id'), BX_DATA_INT);
-            } elseif (bx_get('profile_id')) {
-                $oProfile = BxDolProfile::getInstance(bx_get('profile_id'));
-                if ($oProfile && ($a = $oProfile->getInfo()) && $this->getName() == $a['type'])
-                    $iContentId = $oProfile->getContentId();
-            }
-        }
-        if (!$iContentId)
-            return false;
-
-        $aContentInfo = $this->_oDb->getContentInfoById($iContentId);
-        if (!$aContentInfo)
-            return false;
-
-        return $this->_oTemplate->cover($aContentInfo);
-    }
-
     public function serviceProfileFriends ($iContentId = 0)
     {
         if (!$iContentId)

modules/base/profile/classes/BxBaseModProfilePageEntry.php

@@ -74,6 +74,9 @@ class BxBaseModProfilePageEntry extends BxBaseModGeneralPageEntry
             foreach ($aInformers as $a)
                 $oInformer->add($a['name'], $this->_replaceMarkers($a['msg']), $a['type']);
         }
+
+        // set cover
+        $this->_oModule->_oTemplate->setCover($this->_aContentInfo);
     }
 
 }

modules/base/profile/classes/BxBaseModProfileTemplate.php

@@ -47,7 +47,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
     /**
      * Get profile cover
      */
-    function cover ($aData, $sTemplateName = 'cover.html')
+    function setCover ($aData, $sTemplateName = 'cover.html')
     {
         $CNF = &$this->_oConfig->CNF;
 
@@ -89,6 +89,8 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
             )), true, true);
         }
 
+        $oMenu = BxTemplMenu::getObjectInstance($this->_oConfig->CNF['OBJECT_MENU_ACTIONS_VIEW_ENTRY']);
+
         // generate html
         $aVars = array (
             'id' => $aData[$CNF['FIELD_ID']],
@@ -96,6 +98,8 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
             'title' => $aData[$CNF['FIELD_NAME']],
             //'menu' => BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_SUBMENU_VIEW_ENTRY_COVER'])->getCode(), // TODO: check if menu is used somewhere
 
+            'action_menu' => $oMenu ? $oMenu->getCode() : '',
+
             'picture_avatar_url' => $sUrlAvatar,
             'picture_popup' => $sPicturePopup,
             'picture_popup_id' => $sPicturePopupId,
@@ -109,8 +113,6 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
         );
 
         BxDolCover::getInstance($this)->set($aVars, $sTemplateName);
-
-        return '';//$this->parseHtmlByName($sTemplateName, $aVars); TODO: move somewhere!
     }
 
     /**

modules/base/profile/template/cover.html

@@ -1,15 +1,18 @@
 
 <div class="bx-base-pofile-cover-wrapper bx-menu-toolbar-padding">
-    <div class="bx-base-pofile-cover">
+    <div class="bx-base-pofile-cover bx-def-box-sizing">
         <a class="bx-base-pofile-cover-image bx-def-box-sizing" href="__cover_href__" onclick="$('#__cover_popup_id__').dolPopupImage('__cover_url__', this)" style="background-image:url(__cover_url__)">&nbsp;</a>
+        <div class="bx-base-pofile-cover-info-container bx-def-centered bx-def-page-width" onclick="$('#__cover_popup_id__').dolPopupImage('__cover_url__', this)">
 
-        <div class="bx-def-centered bx-def-page-width bx-base-pofile-cover-info-container">
-            <div class="bx-base-pofile-cover-info bx-def-unit bx-def-padding">
-                <a href="__picture_href__" onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent())"><img class="bx-def-margin-right bx-def-ava bx-def-ava-size" src="__picture_avatar_url__" /></a>
+            <div class="bx-base-pofile-cover-info bx-def-padding">
+                <a href="__picture_href__" onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();"><img class="bx-def-margin-right bx-def-ava bx-def-ava-size" src="__picture_avatar_url__" /></a>
                 <h1 class="bx-def-unit-info bx-def-margin-sec-bottom bx-def-margin-sec-top bx-def-font-contrasted">__title__</h1>
+                <div class="bx-base-pofile-cover-actions" onclick="event.stopPropagation();">
+                    __action_menu__                    
+                </div>
             </div>
-        </div>
 
+        </div>
     </div>
 </div>
 

modules/base/profile/template/css/main.css

@@ -26,12 +26,7 @@
 
 .bx-base-pofile-cover {
     position:relative;
-    height:17rem;
-
-    -moz-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
+    min-height:10rem;
 }
 
 a.bx-base-pofile-cover-image:hover,
@@ -51,19 +46,25 @@ a.bx-base-pofile-cover-image:hover,
 }
 
 .bx-base-pofile-cover-info-container {
+    display:block;
     position:relative;
     height:100%;
+    cursor:pointer; 
+    cursor:hand;
 }
 
 .bx-base-pofile-cover-info {
-    position:absolute;
-    bottom:0;
-    left:0;
+    text-align:center;
 }
-
-.bx-base-pofile-cover-info img,
-.bx-base-pofile-cover-info h1 {
-    vertical-align:bottom;
+.bx-base-pofile-cover-info .bx-def-ava,
+.bx-base-pofile-cover-info h1,
+.bx-base-pofile-cover-info .bx-base-pofile-cover-actions {
+    display:block;
+    text-align:center;
+}
+.bx-base-pofile-cover-info .bx-def-ava,
+.bx-base-pofile-cover-info .bx-base-pofile-cover-actions {
+    display:inline-block;
 }
 
 .bx-base-pofile-cover-info img {

modules/boonex/albums/install/sql/enable.sql

@@ -202,7 +202,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: module sub-menu
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_albums_submenu', '_bx_albums_menu_title_submenu', 'bx_albums_submenu', 'bx_albums', 6, 0, 1, '', '');
+('bx_albums_submenu', '_bx_albums_menu_title_submenu', 'bx_albums_submenu', 'bx_albums', 8, 0, 1, '', '');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_albums_submenu', 'bx_albums', '_bx_albums_menu_set_title_submenu', 0);
@@ -217,7 +217,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: sub-menu for view entry
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_albums_view_submenu', '_bx_albums_menu_title_view_entry_submenu', 'bx_albums_view_submenu', 'bx_albums', 6, 0, 1, 'BxAlbumsMenuView', 'modules/boonex/albums/classes/BxAlbumsMenuView.php');
+('bx_albums_view_submenu', '_bx_albums_menu_title_view_entry_submenu', 'bx_albums_view_submenu', 'bx_albums', 8, 0, 1, 'BxAlbumsMenuView', 'modules/boonex/albums/classes/BxAlbumsMenuView.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_albums_view_submenu', 'bx_albums', '_bx_albums_menu_set_title_view_entry_submenu', 0);

modules/boonex/market/install/sql/enable.sql

@@ -202,7 +202,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 
 -- MENU: module sub-menu
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_market_submenu', '_bx_market_menu_title_submenu', 'bx_market_submenu', 'bx_market', 6, 0, 1, '', '');
+('bx_market_submenu', '_bx_market_menu_title_submenu', 'bx_market_submenu', 'bx_market', 8, 0, 1, '', '');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_market_submenu', 'bx_market', '_bx_market_menu_set_title_submenu', 0);
@@ -215,7 +215,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 
 -- MENU: sub-menu for view entry
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_market_view_submenu', '_bx_market_menu_title_view_entry_submenu', 'bx_market_view_submenu', 'bx_market', 6, 0, 1, 'BxMarketMenuView', 'modules/boonex/market/classes/BxMarketMenuView.php');
+('bx_market_view_submenu', '_bx_market_menu_title_view_entry_submenu', 'bx_market_view_submenu', 'bx_market', 8, 0, 1, 'BxMarketMenuView', 'modules/boonex/market/classes/BxMarketMenuView.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_market_view_submenu', 'bx_market', '_bx_market_menu_set_title_view_entry_submenu', 0);

modules/boonex/organizations/install/sql/enable.sql

@@ -33,9 +33,7 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_organizations_view_profile', 2, 'bx_organizations', '', '_bx_orgs_page_block_title_profile_info', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:11:\"entity_info\";}', 0, 0, 1, 0),
-('bx_organizations_view_profile', 3, 'bx_organizations', '', '_bx_orgs_page_block_title_profile_friends', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:15:\"profile_friends\";}', 0, 0, 1, 0),
-('bx_organizations_view_profile', 1, 'bx_organizations', '', '_bx_orgs_page_block_title_profile_actions', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:14:\"entity_actions\";}', 0, 0, 1, 0),
-('bx_organizations_view_profile', 1, 'bx_organizations', '', '_bx_orgs_page_block_title_profile_cover', 3, 2147483647, 'service', 'a:2:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:13:\"profile_cover\";}', 0, 0, 1, 1);
+('bx_organizations_view_profile', 3, 'bx_organizations', '', '_bx_orgs_page_block_title_profile_friends', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:15:\"profile_friends\";}', 0, 0, 1, 0);
 
 -- PAGE: edit profile
 
@@ -175,7 +173,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: module sub-menu
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_organizations_submenu', '_bx_orgs_menu_title_submenu', 'bx_organizations_submenu', 'bx_organizations', 6, 0, 1, '', '');
+('bx_organizations_submenu', '_bx_orgs_menu_title_submenu', 'bx_organizations_submenu', 'bx_organizations', 8, 0, 1, '', '');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_organizations_submenu', 'bx_organizations', '_bx_orgs_menu_set_title_submenu', 0);
@@ -188,7 +186,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: view submenu
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_organizations_view_submenu', '_bx_orgs_menu_title_view_profile_submenu', 'bx_organizations_view_submenu', 'bx_organizations', 6, 0, 1, 'BxOrgsMenuView', 'modules/boonex/organizations/classes/BxOrgsMenuView.php'),
+('bx_organizations_view_submenu', '_bx_orgs_menu_title_view_profile_submenu', 'bx_organizations_view_submenu', 'bx_organizations', 8, 0, 1, 'BxOrgsMenuView', 'modules/boonex/organizations/classes/BxOrgsMenuView.php'),
 ('bx_organizations_view_submenu_cover', '_bx_orgs_menu_title_view_profile_submenu_cover', 'bx_organizations_view_submenu', 'bx_organizations', 7, 0, 1, 'BxOrgsMenuView', 'modules/boonex/organizations/classes/BxOrgsMenuView.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 

modules/boonex/persons/install/sql/enable.sql

@@ -33,9 +33,7 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_persons_view_profile', 2, 'bx_persons', '', '_bx_persons_page_block_title_profile_info', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:11:\"entity_info\";}', 0, 0, 1, 0),
-('bx_persons_view_profile', 3, 'bx_persons', '', '_bx_persons_page_block_title_profile_friends', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:15:\"profile_friends\";}', 0, 0, 1, 0),
-('bx_persons_view_profile', 1, 'bx_persons', '', '_bx_persons_page_block_title_profile_actions', 13, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:14:\"entity_actions\";}', 0, 0, 1, 0),
-('bx_persons_view_profile', 1, 'bx_persons', '', '_bx_persons_page_block_title_profile_cover', 3, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:13:\"profile_cover\";}', 0, 0, 1, 1);
+('bx_persons_view_profile', 3, 'bx_persons', '', '_bx_persons_page_block_title_profile_friends', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:10:\"bx_persons\";s:6:\"method\";s:15:\"profile_friends\";}', 0, 0, 1, 0);
 
 -- PAGE: edit profile
 
@@ -170,7 +168,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: module sub-menu
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_persons_submenu', '_bx_persons_menu_title_submenu', 'bx_persons_submenu', 'bx_persons', 6, 0, 1, '', '');
+('bx_persons_submenu', '_bx_persons_menu_title_submenu', 'bx_persons_submenu', 'bx_persons', 8, 0, 1, '', '');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_persons_submenu', 'bx_persons', '_bx_persons_menu_set_title_submenu', 0);
@@ -183,7 +181,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: view submenu
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_persons_view_submenu', '_bx_persons_menu_title_view_profile_submenu', 'bx_persons_view_submenu', 'bx_persons', 6, 0, 1, 'BxPersonsMenuView', 'modules/boonex/persons/classes/BxPersonsMenuView.php'),
+('bx_persons_view_submenu', '_bx_persons_menu_title_view_profile_submenu', 'bx_persons_view_submenu', 'bx_persons', 8, 0, 1, 'BxPersonsMenuView', 'modules/boonex/persons/classes/BxPersonsMenuView.php'),
 ('bx_persons_view_submenu_cover', '_bx_persons_menu_title_view_profile_submenu_cover', 'bx_persons_view_submenu', 'bx_persons', 7, 0, 1, 'BxPersonsMenuView', 'modules/boonex/persons/classes/BxPersonsMenuView.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 

modules/boonex/posts/install/sql/enable.sql

@@ -184,7 +184,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: module sub-menu
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_posts_submenu', '_bx_posts_menu_title_submenu', 'bx_posts_submenu', 'bx_posts', 6, 0, 1, '', '');
+('bx_posts_submenu', '_bx_posts_menu_title_submenu', 'bx_posts_submenu', 'bx_posts', 8, 0, 1, '', '');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_posts_submenu', 'bx_posts', '_bx_posts_menu_set_title_submenu', 0);
@@ -197,7 +197,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: sub-menu for view entry
 
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 
-('bx_posts_view_submenu', '_bx_posts_menu_title_view_entry_submenu', 'bx_posts_view_submenu', 'bx_posts', 6, 0, 1, 'BxPostsMenuView', 'modules/boonex/posts/classes/BxPostsMenuView.php');
+('bx_posts_view_submenu', '_bx_posts_menu_title_view_entry_submenu', 'bx_posts_view_submenu', 'bx_posts', 8, 0, 1, 'BxPostsMenuView', 'modules/boonex/posts/classes/BxPostsMenuView.php');
 
 INSERT INTO `sys_menu_sets`(`set_name`, `module`, `title`, `deletable`) VALUES 
 ('bx_posts_view_submenu', 'bx_posts', '_bx_posts_menu_set_title_view_entry_submenu', 0);

modules/boonex/uni/data/template/system/_sub_header.html

@@ -30,13 +30,11 @@
 	
 	<bx_injection:injection_between_cover_top_menu />
 	
-	<div id="bx-menu-main-bar-wrapper" class="bx-menu-main-bar-wrapper">
-	    <div id="bx-menu-main-bar" class="bx-menu-main-bar bx-def-color-bg-sec">
-	        <div class="bx-def-centered bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
-	            <bx_injection:injection_top_menu_before />
-        	    <bx_menu:sys_site_submenu />
-	            <bx_injection:injection_top_menu_after />
-	        </div>
+	<div id="bx-menu-main-bar-wrapper" class="bx-menu-main-bar-wrapper bx-def-color-bg-sec">
+	    <div id="bx-menu-main-bar" class="bx-menu-main-bar bx-def-padding-sec-leftright bx-def-box-sizing">
+	        <bx_injection:injection_top_menu_before />
+        	<bx_menu:sys_site_submenu />
+	        <bx_injection:injection_top_menu_after />
 	    </div>
 	</div>
 	

template/_sub_header.html

@@ -42,7 +42,7 @@
 	
 	    <div id="bx-menu-main-bar" class="bx-def-color-bg-sec">
 	
-	        <div class="bx-def-centered bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
+	        <div class="bx-def-centered bx-def-padding-sec-leftright bx-def-box-sizing">
 
 	            <bx_injection:injection_top_menu_before />
 

template/css/general.css

@@ -88,13 +88,22 @@
     margin-top:-0.375rem;
 }
 
+/* --------------- submenu */
+
+.bx-menu-main-bar-wrapper {
+    text-align:center;
+    overflow-x:auto;
+}
+
 /* --------------- content */
+
 #bx-content-wrapper {
 	padding-bottom: 100px;
 	padding-bottom: 6.25rem;
 }
 
 /* --------------- footer */
+
 #bx-footer-wrapper {
 	position: absolute;
 

template/scripts/BxBaseMenuSubmenu.php

@@ -64,7 +64,13 @@ class BxBaseMenuSubmenu extends BxTemplMenu
 
         $this->_addJsCss();
 
-        $oMenuSubmenu = BxDolMenu::getObjectInstance($this->_sObjectSubmenu);
+        if ($oMenuSubmenu = BxDolMenu::getObjectInstance($this->_sObjectSubmenu))
+            return $oMenuSubmenu->getCode();
+
+        return '';
+        
+/*
+        TODO: remove unused files and code associated with this block
         $aVars = array (
             'object' => $this->_sObject,
             'id' => 'bx-menu-submenu-menu',
@@ -110,6 +116,7 @@ class BxBaseMenuSubmenu extends BxTemplMenu
         $sMenu = $this->_oTemplate->parseHtmlByName($this->_aObject['template'], $aVars);
 
         return $this->_oTemplate->parseHtmlByName('menu_main_submenu_wrapper.html', array('menu' => $sMenu));
+*/
     }
 
     protected function getSubmenuParams($aMenuItemSelected)