Ticket #3073

install/sql/system.sql

@@ -4243,11 +4243,10 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 
 -- studio: account menu
 INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `editable`, `order`) VALUES
-('sys_studio_account_popup', 'system', 'account', '_sys_menu_item_title_system_sa_account', '_sys_menu_item_title_sa_account', '{member_url}', '', '', 'user', '', 2147483647, 1, 0, 0, 1),
-('sys_studio_account_popup', 'system', 'edit', '_sys_menu_item_title_system_sa_edit', '_sys_menu_item_title_sa_edit', 'javascript:void(0)', '{js_object}.clickEdit(this);', '', 'magic', '', 2147483647, 1, 0, 0, 2),
-('sys_studio_account_popup', 'system', 'featured', '_sys_menu_item_title_system_sa_featured', '_sys_menu_item_title_sa_featured', 'javascript:void(0)', '{js_object}.clickFeatured(this);', '', 'star', '', 2147483647, 1, 0, 0, 3),
-('sys_studio_account_popup', 'system', 'language', '_sys_menu_item_title_system_sa_language', '_sys_menu_item_title_sa_language', 'javascript:void(0)', 'bx_menu_popup(''sys_switch_language_popup'', this);', '', 'language', '', 2147483647, 1, 0, 0, 4),
-('sys_studio_account_popup', 'system', 'logout', '_sys_menu_item_title_system_sa_logout', '_sys_menu_item_title_sa_logout', '{url_root}logout.php', '{js_object}.clickLogout(this);', '', 'sign-out-alt', '', 2147483647, 1, 0, 0, 5);
+('sys_studio_account_popup', 'system', 'account', '_sys_menu_item_title_system_sa_account', '_sys_menu_item_title_sa_account', '{member_url}', '', '', 'ami-account.svg', '', 2147483647, 1, 0, 0, 1),
+('sys_studio_account_popup', 'system', 'edit', '_sys_menu_item_title_system_sa_edit', '_sys_menu_item_title_sa_edit', 'javascript:void(0)', '{js_object}.clickEdit(this);', '', 'ami-edit.svg', '', 2147483647, 1, 0, 0, 2),
+('sys_studio_account_popup', 'system', 'language', '_sys_menu_item_title_system_sa_language', '_sys_menu_item_title_sa_language', 'javascript:void(0)', 'bx_menu_popup(''sys_switch_language_popup'', this);', '', 'ami-language.svg', '', 2147483647, 1, 0, 0, 3),
+('sys_studio_account_popup', 'system', 'logout', '_sys_menu_item_title_system_sa_logout', '_sys_menu_item_title_sa_logout', '{url_root}logout.php', '{js_object}.clickLogout(this);', '', 'ami-logout.svg', '', 2147483647, 1, 0, 0, 4);
 -- --------------------------------------------------------
 
 

modules/boonex/english/data/langs/system/en.xml

@@ -2866,10 +2866,8 @@ If it is not enabled then please consider implement this optimization, since it
     <string name="_sys_menu_set_title_studio_account_popup"><![CDATA[Account Popup (Studio)]]></string>
     <string name="_sys_menu_item_title_system_sa_account"><![CDATA[Account]]></string>
     <string name="_sys_menu_item_title_sa_account"><![CDATA[{member_display_name}]]></string>
-    <string name="_sys_menu_item_title_system_sa_edit"><![CDATA[Manage Launcher]]></string>
-    <string name="_sys_menu_item_title_sa_edit"><![CDATA[Manage Launcher]]></string>
-    <string name="_sys_menu_item_title_system_sa_featured"><![CDATA[Featured]]></string>
-    <string name="_sys_menu_item_title_sa_featured"><![CDATA[Featured Only]]></string>
+    <string name="_sys_menu_item_title_system_sa_edit"><![CDATA[Manage Apps]]></string>
+    <string name="_sys_menu_item_title_sa_edit"><![CDATA[Manage Apps]]></string>
     <string name="_sys_menu_item_title_system_sa_language"><![CDATA[Language]]></string>
     <string name="_sys_menu_item_title_sa_language"><![CDATA[Language]]></string>
     <string name="_sys_menu_item_title_system_sa_logout"><![CDATA[Sign out]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -2818,10 +2818,8 @@
     <string name="_sys_menu_set_title_studio_account_popup"><![CDATA[Аккаунт - Всплывающее меню (Студия)]]></string>
     <string name="_sys_menu_item_title_system_sa_account"><![CDATA[Аккаунт]]></string>
     <string name="_sys_menu_item_title_sa_account"><![CDATA[{member_display_name}]]></string>
-    <string name="_sys_menu_item_title_system_sa_edit"><![CDATA[Управление загрузчиком]]></string>
-    <string name="_sys_menu_item_title_sa_edit"><![CDATA[Управление загрузчиком]]></string>
-    <string name="_sys_menu_item_title_system_sa_favorite"><![CDATA[Избранное]]></string>
-    <string name="_sys_menu_item_title_sa_favorite"><![CDATA[Только избранное]]></string>
+    <string name="_sys_menu_item_title_system_sa_edit"><![CDATA[Управление приложениями]]></string>
+    <string name="_sys_menu_item_title_sa_edit"><![CDATA[Управление приложениями]]></string>
     <string name="_sys_menu_item_title_system_sa_language"><![CDATA[Язык]]></string>
     <string name="_sys_menu_item_title_sa_language"><![CDATA[Язык]]></string>
     <string name="_sys_menu_item_title_system_sa_logout"><![CDATA[Выйти]]></string>

studio/js/launcher.js

@@ -56,6 +56,21 @@ BxDolStudioLauncher.prototype.init = function() {
 BxDolStudioLauncher.prototype.browser = function(oLink) {
     var oDate = new Date();
 
+    var oBrowser = $('#bx-std-launcher-browser');
+    if(oBrowser.length > 0) {
+        if(oBrowser.is(':visible'))
+            oBrowser.dolPopupHide();
+        else
+            oBrowser.dolPopup({
+                closeOnOuterClick: true,
+                pointer: {
+                    el: '.bx-menu-breadcrumb .bx-menu-bc-home',
+                }
+            });
+
+        return true;
+    }
+
     $.get(
         this.sActionsUrl,
         {

studio/template/_sub_header.html

@@ -6,4 +6,4 @@
     </div>
     <div class="bx-std-page bx-def-page-margin">
         __menu_top__
-        <div class="bx-std-content">
+        <div class="bx-std-content bx-std-pc-stretch">

studio/template/css/default.less

@@ -12,9 +12,9 @@
 
 /* fonts */
 .bx-def-font {
-	font-family: sans-serif;
-	font-size: 1.0rem;
-	color: rgba(40, 60, 80, 0.9);
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+    font-size: 1.0rem;
+    color: rgba(40, 60, 80, 0.9);
 }
 
 /* widget */
@@ -29,7 +29,7 @@
     .min-height(@bx-size-widget);
 }
 .bx-def-widget-size-left-indent {
-	.margin-left(@bx-size-widget + @bx-margin);
+    .margin-left(@bx-size-widget + @bx-margin);
 }
 
 /* round corders */

studio/template/css/general.css

@@ -53,7 +53,7 @@ div.bx-std-content-wrp,
 div.bx-std-page-columns,
 div.bx-std-page-columns-cnt {
     position: relative;
-    height: 100%;
+    width: 100%;
 }
 
 /**
@@ -110,9 +110,6 @@ div.bx-std-pcap-mp-right div.bx-std-pcap-action {
 div.bx-std-pmen-item {
     position: relative;
     height: 2.5rem;
-    border-top: 1px solid transparent;
-    border-right: 3px solid transparent;
-    border-bottom: 1px solid transparent;
 
     line-height: 2.5rem;
     font-size: 0.875rem;
@@ -122,7 +119,7 @@ div.bx-std-pmen-item {
 }
 
 div.bx-std-pmen-item-cnt {
-    padding-left: 4rem;    
+    padding-left: 3rem;    
 
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -134,10 +131,10 @@ span.bx-std-pmen-ic-num {}
 div.bx-std-pmen-item img {
     position: absolute;
 
-    top: 0.25rem;
+    top: 0.5rem;
     left: 1rem;
-    width: 2rem;
-    height: 2rem;
+    width: 1.5rem;
+    height: 1.5rem;
 }
 
 div.bx-std-pmen-item a, 
@@ -146,23 +143,26 @@ div.bx-std-pmen-item .sys-icon {
 }
 
 div.bx-std-pmen-item a {
+    position: relative;
+    display: block;
+    width: 100%;
+    height: 100%;
+
     text-decoration: none;
 }
 
 div.bx-std-pmen-item .sys-icon {
     position: absolute;
-    left: 20px;
-    width: 2rem;
+    left: 1.0rem;
+    width: 1.5rem;
 
     font-size: 20px;
     text-align: center;
 }
 
 div.bx-std-pmen-item.bx-menu-tab-active {
-    border-right: 3px solid rgba(24, 144, 255, 1.0);
-    border-top-right-radius: 2px;
-    border-bottom-right-radius: 2px;
     background-color: rgba(24, 144, 255, 0.2);
+    box-shadow: inset -3px 0px 0px rgba(24, 144, 255, 1.0);
 
     font-weight: 600;
     
@@ -175,6 +175,7 @@ div.bx-std-pmen-item.bx-menu-tab-active .sys-icon {
     color: #1890ff;
 }
 
+
 /**
  * Footer
  */

studio/template/css/launcher.css

@@ -24,7 +24,6 @@ body.bx-std-bg.bx-std-page-launcher {
     color: rgba(255, 255, 255, 0.85);
 }
 
-
 /**
  * Launcher
  */
@@ -62,8 +61,8 @@ div.bx-std-widget {
     padding: 24px;
 }
 div.bx-std-widget-empty {
-    width: 96px;
-    height: 128px;
+    width: 5.0rem;
+    height: 6.25rem;
 }
 
 .bx-std-widget-dragging {
@@ -76,21 +75,21 @@ div.bx-std-widget-empty {
 .bx-std-widget-icon {
     position: relative;
     top:0px;
-    width: 96px;
-    height: 96px;
+    width: 5.0rem;
+    height: 5.0rem;
 
     background-color:transparent;
 
-    line-height: 96px;
+    line-height: 5.0rem;
 }
 
 .bx-std-widget-icon i.sys-icon {
     position: absolute;
     z-index: 2;
     left: 0px;
-    width: 96px;
+    width: 5.0rem;
 
-    font-size: 64px;
+    font-size: 48px;
     text-align: center;
     text-shadow: none;
     color: white;
@@ -119,8 +118,8 @@ div.bx-std-widget-empty {
     position:relative;
     z-index:2;
 
-    width: 96px;
-    height: 96px;
+    width: 5.0rem;
+    height: 5.0rem;
 
     background-color: transparent;
     background-position:0px 0px;
@@ -226,13 +225,18 @@ div.bx-std-widget-action i.sys-icon {
 }
 div.bx-std-widget-caption {
     position: relative;
-    width: 96px;
-    height: 32px;
-    line-height: 32px;
-    text-align: center; 
+    width: 5.0rem;
+    height: 1.25rem;
+
+    line-height: 1.25rem;
     white-space: nowrap;
-    overflow: hidden;
+    text-align: center; 
     text-overflow: ellipsis;
+    overflow: hidden;
+
+    font-stretch: condensed;
+    font-weight: 500;
+    font-size: 0.75rem;
 }
 div.bx-std-widget-caption-jitter {
     position: absolute;
@@ -267,6 +271,24 @@ body.shepherd-active .bx-std-widget-cont.shepherd-enabled {
 /**
  * Launcher Browser
  */
+#bx-std-launcher-browser{
+    overflow: visible;
+}
+
+#bx-std-launcher-browser::before {
+    position: absolute;
+    display: block;
+    content: '';
+
+    top: -0.125rem;
+    left: 1.5rem;
+    width: 0.5rem;
+    height: 0.5rem;
+
+    background: #001529;
+
+    transform: rotate(45deg);
+}
 .bx-std-launcher-browser {
     position: relative;
     width: 42rem;
@@ -350,3 +372,27 @@ body.shepherd-active .bx-std-widget-cont.shepherd-enabled {
 .bx-std-launcher-browser div.bx-std-widget-caption {
     width: 4rem;
 }
+
+
+/**
+ * Mobile Views
+ */
+.bx-media-tablet .bx-std-page-launcher .bx-std-page-column.bx-std-page-menu,
+.bx-media-phone .bx-std-page-launcher .bx-std-page-column.bx-std-page-menu {
+    -webkit-flex-basis: 3.5rem;
+    flex-basis: 3.5rem;
+    width: 3.5rem;
+}
+
+.bx-media-tablet .bx-std-page-launcher div.bx-std-pmen-item .bx-std-pmen-item-cnt,
+.bx-media-phone .bx-std-page-launcher div.bx-std-pmen-item .bx-std-pmen-item-cnt {
+    padding-left: 3.5rem;
+}
+
+.bx-media-tablet .bx-std-page-launcher div.bx-std-pmen-item a span,
+.bx-media-phone .bx-std-page-launcher div.bx-std-pmen-item a span {
+    display: none;
+}
+
+
+

studio/template/css/menu_top.css

@@ -45,8 +45,41 @@ div.bx-std-menu-top-right {
     text-align: right;
 }
 
+/*--- Breadcrumb (Center) ---*/
+.bx-menu-breadcrumb {
+    position: relative;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-flex-wrap: nowrap;
+    flex-wrap: nowrap;
+    -webkit-align-items: center;
+    align-items: center;
+}
+.bx-menu-breadcrumb li.bx-menu-bc-item {
+    position: relative;
+
+    height: 4.0rem;
+    min-width: 1.5rem;
+    
+    line-height: 4.0rem;
+}
+.bx-menu-breadcrumb li.bx-menu-bc-item > a {
+    position: relative;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-justify-content: center;
+    justify-content: center;
+    -webkit-align-items: center;
+    align-items: center;
+
+    width: 100%;
+    height: 100%;
+}
+
+
+/*--- Widgets (Center) ---*/
 div.bx-std-menu-top .bx-menu-floating-blocks li {
-    width: 4.5rem;
+    width: 5rem;
     height: 4rem;
 }
 
@@ -56,8 +89,12 @@ div.bx-std-menu-top .bx-menu-floating-blocks li.bx-menu-item-static + li.bx-menu
 
 div.bx-std-menu-top .bx-menu-floating-blocks li.bx-def-color-bg-active,
 div.bx-std-menu-top .bx-menu-floating-blocks li.bx-def-color-bg-hl-hover:hover {
-    background-color: #334455;   
+    background-color: rgba(24, 144, 255, 0.2);
 }
+div.bx-std-menu-top .bx-menu-floating-blocks li.bx-def-color-bg-active {
+    box-shadow: inset 0px -3px 0px rgba(24, 144, 255, 1.0);
+}
+
 div.bx-std-menu-top .bx-menu-floating-blocks li a {
     width: 100%;
     height: 100%;
@@ -65,6 +102,7 @@ div.bx-std-menu-top .bx-menu-floating-blocks li a {
 
     text-align: center;
 }
+
 div.bx-std-menu-top .bx-menu-floating-blocks li img,
 div.bx-std-menu-top .bx-menu-floating-blocks li .sys-icon {
     display: inline-block;
@@ -74,10 +112,12 @@ div.bx-std-menu-top .bx-menu-floating-blocks li .sys-icon {
 
     margin: 0;
 }
+
 div.bx-std-menu-top .bx-menu-floating-blocks li .sys-icon {
     font-size: 1.5rem;
     color: rgba(255, 255, 255, 0.7);
 }
+
 div.bx-std-menu-top .bx-menu-floating-blocks li .bx-mi-title {
     margin-top: 0.25rem;
 
@@ -90,7 +130,6 @@ div.bx-std-menu-top .bx-menu-floating-blocks li .bx-mi-title {
 }
 
 
-
 /*--- Toolbar (Right) ---*/
 div.bx-std-menu-top .bx-menu-toolbar {
     position: relative;
@@ -103,13 +142,27 @@ div.bx-std-menu-top .bx-menu-toolbar {
 }
 
 div.bx-std-menu-top .bx-menu-toolbar li {
+    position: relative;
     float: none;
     display: block;
+
+    height: 4.0rem;
+    min-width: 2.0rem;
+
+    line-height: 4.0rem;
 }
 
 div.bx-std-menu-top .bx-menu-toolbar li a {
-    height: 1.5rem;
-    line-height: 1.5rem;
+    position: relative;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-justify-content: center;
+    justify-content: center;
+    -webkit-align-items: center;
+    align-items: center;
+
+    width: 100%;
+    height: 100%;
 }
 
 div.bx-std-menu-top i.sys-icon {
@@ -123,6 +176,53 @@ div.bx-std-menu-top-right li.bx-menu-tab-active i.sys-icon {
 }
 
 /*--- Account popup ---*/
+#bx-popup-ajax-wrapper-sys_studio_account_popup {
+    overflow: visible;
+}
+#bx-popup-ajax-wrapper-sys_studio_account_popup::before {
+    position: absolute;
+    display: block;
+    content: '';
+
+    top: -0.125rem;
+    right: 1.5rem;
+    width: 0.5rem;
+    height: 0.5rem;
+
+    background: #001529;
+
+    transform: rotate(45deg);
+}
+#bx-popup-ajax-wrapper-sys_studio_account_popup .bx-popup {
+    background: #001529;
+}
+#bx-popup-ajax-wrapper-sys_studio_account_popup .bx-popup-content-indent {
+    padding: 0;
+}
+#bx-popup-ajax-wrapper-sys_studio_account_popup .bx-popup-color-bg li {
+    position: relative;
+    height: 2.5rem;
+    margin: 0;
+    padding: 0 1rem;
+
+    line-height: 2.5rem;
+    font-size: 0.875rem;
+    font-weight: 400;
+    overflow: hidden;
+}
+#bx-popup-ajax-wrapper-sys_studio_account_popup .bx-popup-color-bg li a,
+#bx-popup-ajax-wrapper-sys_studio_account_popup .bx-popup-color-bg li .sys-icon {
+    color: rgba(255, 255, 255, 0.7);
+}
+#bx-popup-ajax-wrapper-sys_studio_account_popup .bx-popup-color-bg li:hover a,
+#bx-popup-ajax-wrapper-sys_studio_account_popup .bx-popup-color-bg li:hover a .sys-icon {
+    color: rgba(255, 255, 255, 0.85);
+}
+#bx-popup-ajax-wrapper-sys_studio_account_popup .bx-popup-color-bg li.bx-menu-tab-active {
+    background-color: rgba(24, 144, 255, 0.2);
+    box-shadow: inset 3px 0px 0px rgba(24, 144, 255, 1.0);
+}
+
 .bx-menu-object-sys_studio_account_popup li {
     white-space: nowrap;
 }

studio/template/css/page_columns.css

@@ -6,6 +6,10 @@
     -webkit-align-items: stretch;
     align-items: stretch;
     box-sizing: border-box;
+}
+
+.bx-std-pc-stretch,
+.bx-std-pc-vstretch {
     width: 100%
 }
 
@@ -26,6 +30,12 @@ div.bx-std-page-column.bx-std-page-menu {
     background-color: #ffffff;
     box-shadow: inset -1px 0px 0px rgba(240, 240, 240, 0.2);
 }
+div.bx-std-page-column.bx-std-page-menu div.bx-std-page-column-cnt {
+    position: -webkit-sticky;
+    position: sticky;
+    top: 0;
+}
+    
 div.bx-std-page-column.bx-std-page-content {
     position: relative;
     -webkit-flex: 2 1 auto;

studio/template/images/icons/ami-account.svg

@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.7">
+<path d="M17.763 18.91L17.413 18.031C17.236 17.585 16.961 17.185 16.609 16.859L16.545 16.8C15.991 16.286 15.263 16 14.507 16H9.493C8.737 16 8.009 16.286 7.454 16.799L7.39 16.859C7.038 17.185 6.764 17.585 6.586 18.031L6.236 18.91" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.4749 7.44713C15.8417 8.81397 15.8417 11.03 14.4749 12.3969C13.1081 13.7637 10.892 13.7637 9.52515 12.3969C8.15831 11.03 8.15831 8.81397 9.52515 7.44713C10.892 6.08029 13.1081 6.08029 14.4749 7.44713" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.364 5.63604C21.8787 9.15076 21.8787 14.8492 18.364 18.3639C14.8493 21.8787 9.1508 21.8787 5.6361 18.3639C2.12138 14.8492 2.12138 9.15074 5.6361 5.63604C9.15082 2.12132 14.8493 2.12132 18.364 5.63604" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>

studio/template/images/icons/ami-edit.svg

@@ -0,0 +1,11 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.7">
+<path d="M18.63 5.36999L19.35 4.64999" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.37 14.39L18.61 13.62" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.36 5.36999L9.64 4.64999" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.205 21.207L2.793 19.794C2.402 19.403 2.402 18.77 2.793 18.379L12.37 8.798C12.761 8.407 13.394 8.407 13.784 8.798L15.196 10.211C15.587 10.602 15.587 11.235 15.196 11.626L5.619 21.207C5.229 21.598 4.596 21.598 4.205 21.207Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.2 13.62L10.37 10.8" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.49 3.52V2.5" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.48 9.50999H21.5" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>

studio/template/images/icons/ami-language.svg

@@ -0,0 +1,15 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.7">
+<path d="M14.0008 21.0035H19.0029C20.1079 21.0035 21.0037 20.1077 21.0037 19.0026V15.001" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.99916 2.99609H4.99708C3.89205 2.99609 2.99625 3.8919 2.99625 4.99693V9.99901" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="17.0021" cy="6.99818" r="5.00208" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.9979 22.0042V22.0042C4.23533 22.0042 1.99582 19.7647 1.99582 17.0021V17.0021C1.99582 14.2395 4.23533 12 6.9979 12V12C8.32454 12 9.59684 12.527 10.5349 13.4651C11.473 14.4031 12 15.6754 12 17.0021V17.0021C12 18.3287 11.473 19.601 10.5349 20.5391C9.59684 21.4772 8.32454 22.0042 6.9979 22.0042Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.46127 17.8322H8.54456" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.79867 18.5527L7.50213 14.9512H6.49371L5.19717 18.5527" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.5027 6.12228H17.0021" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.0021 4.95508V6.12256" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15.5015 6.12228H17.0021" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.3586 8.62409C17.5132 8.07286 17.0031 7.13228 17.0021 6.12305" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.0021 6.12305C17.0011 7.13228 16.4909 8.07286 15.6455 8.62409" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>

studio/template/images/icons/ami-logout.svg

@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.7">
+<path d="M12 11.9953H21.0037" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.7296 8.72168L21.0037 11.9958" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.7296 15.2702L21.0037 11.9961" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.5023 4.88253C13.8044 2.02079 8.531 2.46757 5.36729 5.91067C2.20358 9.35376 2.20358 14.6461 5.36729 18.0891C8.531 21.5322 13.8044 21.979 17.5023 19.1173" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>

studio/template/menu_side.html

@@ -6,7 +6,7 @@
                     <i class="sys-icon __icon__ bx-def-margin-sec-right"></i>
                 </bx_if:icon>
                 <bx_if:image><img src="__icon_url__" /></bx_if:image>
-                __title__
+                <span>__title__</span>
             </div>
         </a>                
     </div>                

studio/template/menu_top_toolbar.html

@@ -1,7 +1,7 @@
 <ul class="bx-menu-toolbar">
     <bx_repeat:menu_items>
         <li class="bx-menu-tab-__name__  __class_add__">
-            <a href="__link__" onclick="__onclick__" class="bx-def-margin-sec-left bx-def-font-contrasted" title="__title__"__attrs__><bx_if:icon><i class="sys-icon __icon__ bx-def-round-corners bx-def-font-contrasted"></i></bx_if:icon><bx_if:image><img src="__icon_url__" /></bx_if:image></a>
+            <a href="__link__" onclick="__onclick__" class="bx-def-font-contrasted" title="__title__"__attrs__><bx_if:icon><i class="sys-icon __icon__ bx-def-round-corners bx-def-font-contrasted"></i></bx_if:icon><bx_if:image><img src="__icon_url__" /></bx_if:image></a>
         </li>
     </bx_repeat:menu_items>
 </ul>

studio/template/page_3.html

@@ -1,5 +1,5 @@
 <bx_include_auto:_sub_header.html />
-<div class="bx-std-content-wrp">
+<div class="bx-std-content-wrp bx-std-pc-stretch">
     <script defer language="javascript">
     <!--
     var oBxDolStudioPage = new BxDolStudioPage({
@@ -8,7 +8,7 @@
     -->
     </script>
     __page_caption_code__
-    <div class="bx-std-page-columns" id="bx-std-page-columns" __page_attributes__>
+    <div class="bx-std-page-columns bx-std-pc-stretch" id="bx-std-page-columns" __page_attributes__>
         <bx_include_auto:page_content_2_col.html />
     </div>
 </div>

studio/template/page_4.html

@@ -1,5 +1,5 @@
 <bx_include_auto:_sub_header.html />
-<div class="bx-std-content-wrp">
+<div class="bx-std-content-wrp bx-std-pc-stretch">
     <script defer language="javascript">
     <!--
     var oBxDolStudioPage = new BxDolStudioPage({
@@ -8,7 +8,7 @@
     -->
     </script>
     __page_caption_code__
-    <div class="bx-std-page-content" id="bx-std-page-content" __page_attributes__>
+    <div id="bx-std-page-content" class="bx-std-page-content bx-std-pc-vstretch" __page_attributes__>
     	<div class="bx-std-page-content-cnt bx-def-padding">__page_main_code__</div>
     </div>
 </div>

studio/template/page_breadcrumb.html

@@ -4,7 +4,7 @@
             <li class="bx-menu-bc-div">
                 <img src="<bx_icon_url:bc-arrow.svg />" />
             </li>
-            <li class="bx-menu-bc-__name__  __class_add__">
+            <li class="bx-menu-bc-item bx-menu-bc-__name__  __class_add__">
                 <a href="__link__" onclick="__onclick__" class="bx-def-margin-sec-left bx-def-font-contrasted" title="__title_attr__"__attrs__><bx_if:icon><i class="sys-icon __icon__ bx-def-round-corners bx-def-font-contrasted"></i></bx_if:icon><bx_if:image><img src="__icon_url__" /></bx_if:image><bx_if:title><span class="bx-def-padding-thd-left">__title__</span></bx_if:title></a>
             </li>
         </bx_repeat:menu_items>

studio/template/scripts/BxBaseStudioWidgets.php

@@ -96,6 +96,9 @@ class BxBaseStudioWidgets extends BxDolStudioWidgets
             )
         );
 
+        if($this->_sType != BX_DOL_STUDIO_WTYPE_DEFAULT)
+            unset($aItemsRight['menu_items']['tour']);
+
         $oTopMenu = BxTemplStudioMenuTop::getInstance();
         $oTopMenu->setContent(BX_DOL_STUDIO_MT_RIGHT, $aItemsRight);
 

template/images/icons/favicon.svg

@@ -0,0 +1,9 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.75" y="0.75" width="22.5" height="22.5" rx="3.25" fill="white" stroke="#555555" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.3271 9.93627C19.9854 10.5946 19.9854 11.662 19.3271 12.3204C18.6687 12.9788 17.6013 12.9788 16.943 12.3204C16.2846 11.662 16.2846 10.5946 16.943 9.93627C17.6013 9.27791 18.6687 9.27791 19.3271 9.93627" stroke="#323232" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.8355 6.92697C14.8492 7.9407 14.8492 9.58429 13.8355 10.598C12.8218 11.6118 11.1782 11.6118 10.1644 10.598C9.1507 9.5843 9.1507 7.94071 10.1644 6.92697C11.1782 5.91323 12.8218 5.91323 13.8355 6.92697" stroke="#323232" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.05707 9.93627C7.71543 10.5946 7.71543 11.662 7.05707 12.3204C6.39871 12.9788 5.3313 12.9788 4.67294 12.3204C4.01458 11.662 4.01458 10.5946 4.67294 9.93627C5.3313 9.27791 6.39871 9.27791 7.05707 9.93627" stroke="#323232" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21.1667 17.8333V16.92C21.1667 15.7692 20.2342 14.8367 19.0833 14.8367H18.4158" stroke="#323232" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.83333 17.8333V16.92C2.83333 15.7692 3.76583 14.8367 4.91667 14.8367H5.58417" stroke="#323232" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16.4492 17.8333V16.4992C16.4492 14.8883 15.1433 13.5825 13.5325 13.5825H10.4667C8.85583 13.5825 7.55 14.8883 7.55 16.4992V17.8333" stroke="#323232" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

template/scripts/BxBaseFunctions.php

@@ -488,7 +488,7 @@ class BxBaseFunctions extends BxDolFactory implements iBxDolSingleton
         }
 
         if(empty($sImageUrlFav))
-            $sImageUrlFav = $this->_oTemplate->getIconUrl('favicon.png');
+            $sImageUrlFav = $this->_oTemplate->getIconUrl('favicon.svg');
 
         if(empty($sImageUrlFcb))
             $sImageUrlFcb = $this->_oTemplate->getIconUrl('facebook-icon.png');