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

install/sql/system.sql

@@ -4294,7 +4294,7 @@ INSERT INTO `sys_objects_page` (`object`, `uri`, `title_system`, `title`, `modul
 ('sys_explore', 'explore', '_sys_page_title_sys_explore', '_sys_page_title_explore', 'system', 5, 'sys_homepage_submenu', 2147483647, 1, 'page.php?i=explore', '', '', '', 0, 1, 0, 'BxTemplPageHome', ''),
 ('sys_updates', 'updates', '_sys_page_title_sys_updates', '_sys_page_title_updates', 'system', 5, 'sys_homepage_submenu', 2147483647, 1, 'page.php?i=updates', '', '', '', 0, 1, 0, 'BxTemplPageHome', ''),
 ('sys_trends', 'trends', '_sys_page_title_sys_trends', '_sys_page_title_trends', 'system', 5, 'sys_homepage_submenu', 2147483647, 1, 'page.php?i=trends', '', '', '', 0, 1, 0, 'BxTemplPageHome', ''),
-('sys_dashboard', 'dashboard', '_sys_page_title_system_dashboard', '_sys_page_title_dashboard', 'system', 10, '', 2147483646, 1, 'page.php?i=dashboard', '', '', '', 0, 1, 0, 'BxTemplPageDashboard', ''),
+('sys_dashboard', 'dashboard', '_sys_page_title_system_dashboard', '_sys_page_title_dashboard', 'system', 12, '', 2147483646, 1, 'page.php?i=dashboard', '', '', '', 0, 1, 0, 'BxTemplPageDashboard', ''),
 ('sys_create_account', 'create-account', '_sys_page_title_system_create_account', '_sys_page_title_create_account', 'system', 5, '', 2147483647, 1, 'page.php?i=create-account', '', '', '', 0, 1, 0, '', ''),
 ('sys_login', 'login', '_sys_page_title_system_login', '_sys_page_title_login', 'system', 5, '', 2147483647, 1, 'page.php?i=login', '', '', '', 0, 1, 0, '', ''),
 ('sys_login_step2', 'login-step2', '_sys_page_title_system_login_step2', '_sys_page_title_login_step2', 'system', 5, '', 2147483647, 1, 'page.php?i=login-step2', '', '', '', 0, 1, 0, '', ''),

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

@@ -28,7 +28,7 @@ INSERT INTO `sys_pages_blocks` (`object`, `cell_id`, `module`, `title_system`, `
 
 
 -- PAGES: add page block on dashboard
-SET @iPBCellDashboard = 4;
+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, 1, @iPBOrderDashboard),

template/css/menu.css

@@ -393,9 +393,19 @@ ul.bx-menu-floating-blocks {
 .bx-media-phone .bx-menu-floating-blocks-dash li {
     width:49.5%;
 }
-.bx-menu-floating-blocks-dash-item {
-     height:3.35rem;
+.bx-menu-floating-blocks-dash-item A{
+    display:flex !important;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center
+}
+.bx-menu-floating-blocks-dash-title{
+    display:flex;
+    height:2.35rem;
+    flex-direction: column;
+    justify-content: center;
 }
+
 .bx-menu-floating-blocks-wide li {
     position:relative;
     width:100px;
@@ -517,9 +527,6 @@ ul.bx-menu-floating-blocks {
 	width: 2.2rem;
     display: inline-block;
 }
-.bx-menu-floating-blocks-dash .bx-menu-floating-blocks-icon {
-    float:left;
-}
 
 .bx-menu-floating-blocks-big li .bx-menu-floating-blocks-title,
 .bx-menu-floating-blocks-wide li .bx-menu-floating-blocks-title,

template/menu_floating_blocks_dash.html

@@ -4,11 +4,13 @@
             <div class="bx-menu-floating-blocks-dash-item bx-def-padding-sec bx-def-margin-sec-leftright bx-def-round-corners bx-def-color-bg-hl-hover bx-def-box bx-def-box-sizing __class_add__">
                 <a href="__link__" target="__target__" onclick="__onclick__">
                     <div class="bx-menu-floating-blocks-icon bx-def-margin-sec-right">
-                        <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
-                        <bx_if:image><img style="background-image:url(__icon_url__)" src="><bx_icon_url:spacer.gif />" /></bx_if:image>
+                            <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
+                            <bx_if:image><img style="background-image:url(__icon_url__)" src="><bx_icon_url:spacer.gif />" /></bx_if:image>
+                        </div>
+                    <div class="bx-menu-floating-blocks-dash-title">
+                        <div class="bx-menu-floating-blocks-title">__title__</div>
+                        <bx_if:addon>__addonf__</bx_if:addon>
                     </div>
-                    <div class="bx-menu-floating-blocks-title">__title__</div>
-                    <bx_if:addon>__addonf__</bx_if:addon>
                 </a>
             </div>
         </li>