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

modules/boonex/decorous/data/template/system/menu_account_popup.html

@@ -1,6 +1,6 @@
 <div id="bx-sliding-menu-account" class="bx-sliding-menu-main bx-sliding-menu-fullheight bx-def-z-index-nav bx-def-color-bg-block bx-def-border-bottom bx-def-box-sizing bx-search-site" style="display:none; opacity:1;">
 	<div class="bx-sliding-menu-main-cnt">
-        <a class="bx-sliding-menu-close bx-def-margin bx-def-font-h2" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
+        <a class="bx-sliding-menu-close bx-def-margin-sec-top bx-def-margin-right bx-def-font-h2" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
 	
         <div class="bx-menu-account-popup bx-menu-object-__object__">
 		     <div class="bx-menu-account-popup-profile bx-def-padding-sec-bottom bx-clearfix">__active_profile__</div>

modules/boonex/notifications/classes/BxNtfsMenuPreview.php

@@ -60,12 +60,17 @@ class BxNtfsMenuPreview extends BxTemplMenuCustom
 
     protected function getMenuItemsRaw ()
     {
-        $aItems = $this->_oModule->serviceGetNotifications(0, array('per_page' => $this->_oModule->_oConfig->getPerPage('preview')));
+        $aItems = $this->_oModule->serviceGetNotifications($this->_iOwnerId, array('per_page' => $this->_oModule->_oConfig->getPerPage('preview')));
         if(empty($aItems) || !is_array($aItems))
             return array();
 
-        foreach($aItems as $iKey => $aItem) 
+        $bFirst = true;
+        foreach($aItems as $iKey => $aItem) {
+            if($bFirst)
+    			$bFirst = !$this->_oModule->_oDb->markAsRead($this->_iOwnerId, $aItem['id']);
+
             $aItems[$iKey]['name'] = 'event';
+        }
 
         return array_merge($aItems, $this->_oQuery->getMenuItems());
     }

modules/boonex/notifications/template/menu_preview.html

@@ -1,2 +1,2 @@
-<div class="bx-def-font-h1 bx-def-padding-sec-bottom"><bx_text:_bx_ntfs_menu_item_title_notifications /></div>
+<div class="bx-def-font-h2 bx-def-padding-sec-bottom"><bx_text:_bx_ntfs_menu_item_title_notifications /></div>
 __content__

template/css/menu.css

@@ -310,6 +310,11 @@ ul.bx-menu-toolbar li a .bx-def-unit-alert-middle {
     overflow-y:auto;
 }
 
+.bx-sliding-menu > .bx-def-page-width,
+.bx-sliding-menu-main > .bx-def-page-width {
+    position: relative;
+}
+
 .bx-sliding-menu-main ul.bx-menu-floating-blocks-big {
     display:table;
     margin:0 auto;
@@ -533,10 +538,6 @@ ul.bx-menu-btns-hor li:last-child .bx-btn {
     text-align:center;
 }
 
-.bx-sliding-menu-main > .bx-def-page-width {
-    position:relative;
-}
-
 .bx-menu-account-popup-profile-switcher-link {
     text-align:center;
 }

template/menu_account_popup.html

@@ -1,7 +1,7 @@
 <div id="bx-sliding-menu-account" class="bx-sliding-menu-main bx-sliding-menu-fullheight bx-def-z-index-nav bx-def-color-bg-block bx-def-border-bottom bx-def-box-sizing bx-search-site" style="display:none; opacity:1;">
     <div class="bx-def-page-width bx-def-centered">
         <div class="bx-sliding-menu-main-cnt">
-	        <a class="bx-sliding-menu-close bx-def-margin bx-def-font-h1" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
+	        <a class="bx-sliding-menu-close bx-def-margin-sec-top bx-def-margin-right bx-def-font-h1" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-account')"><i class="sys-icon times"></i></a>
 
 	        <div class="bx-menu-account-popup bx-menu-object-__object__ bx-def-padding-top bx-def-padding-leftright">
 	            <div class="bx-menu-account-popup-profile bx-clearfix">__active_profile__</div>

template/menu_loading.html

@@ -1,6 +1,6 @@
 <div id="bx-sliding-menu-loading" class="bx-sliding-menu bx-sliding-menu-fullheight bx-def-z-index-nav bx-def-color-bg-block" style="display:none; opacity:1;">
     <div class="bx-def-page-width bx-def-centered">
-        <a class="bx-sliding-menu-close bx-def-margin bx-def-font-h1" href="javascript:void(0);" onclick="bx_menu_slide_inline($(this).parents('.bx-sliding-menu:visible:first'))"><i class="sys-icon times"></i></a>
+        <a class="bx-sliding-menu-close bx-def-margin-sec-top bx-def-margin-right bx-def-font-h1" href="javascript:void(0);" onclick="bx_menu_slide_inline($(this).parents('.bx-sliding-menu:visible:first'))"><i class="sys-icon times"></i></a>
         <div class="bx-sliding-menu-cnt bx-def-padding">
 			<div class="bx-sliding-menu-content"></div>
 			<div class="bx-sliding-menu-loading"></div>

template/search.html

@@ -1,8 +1,8 @@
 <div id="bx-sliding-menu-search" class="bx-sliding-menu-main bx-sliding-menu-fullheight bx-def-z-index-nav bx-def-color-bg-block bx-search-site" style="display:none; opacity:1;">
     <div class="bx-def-page-width bx-def-centered">
-        <a class="bx-sliding-menu-close bx-def-margin bx-def-font-h1" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-search')"><i class="sys-icon times"></i></a>
+        <a class="bx-sliding-menu-close bx-def-margin-sec-top bx-def-margin-right bx-def-font-h1" href="javascript:void(0);" onclick="bx_menu_slide_inline('#bx-sliding-menu-search')"><i class="sys-icon times"></i></a>
         <div class="bx-def-padding">
-            <div class="bx-def-font-h1 bx-menu-search-popup-title"><bx_text:_Search /></div>
+            <div class="bx-def-font-h2 bx-menu-search-popup-title"><bx_text:_Search /></div>
             __search_form__
             __results__
         </div>