Parcourir la source

Ticket #4674 - Studio: Launcher.

AntonLV il y a 2 ans
Parent
commit
c403a8b27c
30 fichiers modifiés avec 301 ajouts et 177 suppressions
  1. 12 4
      install/sql/system.sql
  2. 18 0
      modules/boonex/english/data/langs/system/en.xml
  3. 10 0
      modules/boonex/russian/data/langs/system/ru.xml
  4. 0 0
      plugins_public/tailwind/css/tailwind.min.css
  5. 5 0
      studio/classes/BxDolStudioLauncher.php
  6. 12 4
      studio/classes/BxDolStudioMenuTop.php
  7. 6 0
      studio/classes/BxDolStudioPage.php
  8. 13 0
      studio/js/menu_top.js
  9. 2 1
      studio/launcher.php
  10. 0 4
      studio/template/css/launcher.css
  11. 90 46
      studio/template/css/menu_top.css
  12. 2 3
      studio/template/css/page_columns.css
  13. 11 5
      studio/template/images/icons/tmi-account.svg
  14. 0 2
      studio/template/images/icons/tmi-actions.svg
  15. 11 6
      studio/template/images/icons/tmi-help.svg
  16. 11 8
      studio/template/images/icons/tmi-site.svg
  17. 8 19
      studio/template/images/icons/wi-bld-forms.svg
  18. 12 28
      studio/template/images/icons/wi-dashboard.svg
  19. 26 10
      studio/template/images/icons/wi-launcher.svg
  20. 0 5
      studio/template/images/icons/wi-settings.svg
  21. 0 17
      studio/template/menu_floating_blocks.html
  22. 7 7
      studio/template/menu_top.html
  23. 9 0
      studio/template/menu_top_center.html
  24. 9 1
      studio/template/menu_top_toolbar.html
  25. 1 0
      studio/template/scripts/BxBaseStudioFunctions.php
  26. 5 0
      studio/template/scripts/BxBaseStudioLauncher.php
  27. 10 1
      studio/template/scripts/BxBaseStudioMenuTop.php
  28. 6 5
      studio/template/scripts/BxBaseStudioWidget.php
  29. 4 0
      studio/template/scripts/BxBaseStudioWidgets.php
  30. 1 1
      studio/template/widget.html

+ 12 - 4
install/sql/system.sql

@@ -377,7 +377,14 @@ INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `ex
 
 (@iCategoryId, 'sys_viewport_meta_tag', '_adm_stg_cpt_option_sys_viewport_meta_tag', 'width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0', 'digit', '', '', '', '', 250),
 
-(@iCategoryId, 'sys_form_lpc_enable', '_adm_stg_cpt_option_sys_form_lpc_enable', 'on', 'checkbox', '', '', '', '', 260);
+(@iCategoryId, 'sys_form_lpc_enable', '_adm_stg_cpt_option_sys_form_lpc_enable', 'on', 'checkbox', '', '', '', '', 260),
+
+(@iCategoryId, 'sys_std_show_header_left', '_adm_stg_cpt_option_sys_std_show_header_left', '', 'checkbox', '', '', '', '', 270),
+(@iCategoryId, 'sys_std_show_header_center', '_adm_stg_cpt_option_sys_std_show_header_center', 'on', 'checkbox', '', '', '', '', 271),
+(@iCategoryId, 'sys_std_show_header_right', '_adm_stg_cpt_option_sys_std_show_header_right', 'on', 'checkbox', '', '', '', '', 272),
+(@iCategoryId, 'sys_std_show_header_right_search', '_adm_stg_cpt_option_sys_std_show_header_right_search', 'on', 'checkbox', '', '', '', '', 275),
+(@iCategoryId, 'sys_std_show_header_right_site', '_adm_stg_cpt_option_sys_std_show_header_right_site', '', 'checkbox', '', '', '', '', 276),
+(@iCategoryId, 'sys_std_show_launcher_left', '_adm_stg_cpt_option_sys_std_show_launcher_left', '', 'checkbox', '', '', '', '', 280);
 
 --
 -- CATEGORY (HIDDEN): System
@@ -4870,9 +4877,10 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- 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}', '', '', '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'', window);', '', '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);
+('sys_studio_account_popup', 'system', 'site', '_sys_menu_item_title_system_sa_site', '_sys_menu_item_title_sa_site', '{url_root}', '', '', 'ami-site.svg', '', 2147483647, 1, 0, 0, 2),
+('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, 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'', window);', '', 'ami-language.svg', '', 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);', '', 'ami-logout.svg', '', 2147483647, 1, 0, 0, 5);
 -- --------------------------------------------------------
 
 

+ 18 - 0
modules/boonex/english/data/langs/system/en.xml

@@ -1779,6 +1779,21 @@
     <string name="_adm_stg_cpt_option_sys_sockets_secret"><![CDATA[App secret]]></string>
     <string name="_adm_stg_cpt_option_sys_sockets_type_sys_sockets_disabled"><![CDATA[Disabled]]></string>
     <string name="_adm_stg_cpt_option_sys_sockets_type_sys_sockets_soketi"><![CDATA[Soketi]]></string>
+    
+    <string name="_adm_stg_cpt_option_sys_std_show_header_left"><![CDATA[Studio: Show header left area]]></string>
+    <string name="_adm_stg_cpt_option_sys_std_show_header_center"><![CDATA[Studio: Show header center area]]></string>
+    <string name="_adm_stg_cpt_option_sys_std_show_header_right"><![CDATA[Studio: Show header right area]]></string>
+    <string name="_adm_stg_cpt_option_sys_std_show_header_right_search"><![CDATA[Studio: Show search in header]]></string>
+    <string name="_adm_stg_cpt_option_sys_std_show_header_right_site"><![CDATA[Studio: Show 'site' link in header]]></string>
+    <string name="_adm_stg_cpt_option_sys_std_show_launcher_left"><![CDATA[Studio: Show left area with menu in Launcher]]></string>
+    <string name=""><![CDATA[]]></string>
+    <string name=""><![CDATA[]]></string>
+    <string name=""><![CDATA[]]></string>
+    <string name=""><![CDATA[]]></string>
+
+    
+    
+    
 
 	<string name="_adm_stg_cpt_type_system"><![CDATA[System]]></string>
 	<string name="_adm_stg_scs_save"><![CDATA[Settings were successfully saved]]></string>
@@ -1870,6 +1885,7 @@
 	<string name="_adm_strg_err_height"><![CDATA[Height is essential. Please, fill in this field.]]></string>
         <string name="_adm_tmi_cpt_account"><![CDATA[Account]]></string>
 	<string name="_adm_tmi_cpt_site"><![CDATA[Go To Site]]></string>
+        <string name="_adm_tmi_cpt_search"><![CDATA[Search...]]></string>
 	<string name="_adm_tmi_cpt_tour"><![CDATA[Tour]]></string>
 	<string name="_adm_tmi_cpt_launcher"><![CDATA[Launcher]]></string>
         <string name="_adm_txt_active_api"><![CDATA[Available in App]]></string>
@@ -3250,6 +3266,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_site"><![CDATA[Go To Site]]></string>
+    <string name="_sys_menu_item_title_sa_site"><![CDATA[Go To Site]]></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>

+ 10 - 0
modules/boonex/russian/data/langs/system/ru.xml

@@ -1753,6 +1753,13 @@
     <string name="_adm_stg_cpt_option_sys_sockets_secret"><![CDATA[App secret]]></string>
     <string name="_adm_stg_cpt_option_sys_sockets_type_sys_sockets_disabled"><![CDATA[Выключена]]></string>
     <string name="_adm_stg_cpt_option_sys_sockets_type_sys_sockets_soketi"><![CDATA[Soketi]]></string>
+
+    <string name="_adm_stg_cpt_option_sys_std_show_header_left"><![CDATA[Студия: Показать левую область заголовка]]></string>
+    <string name="_adm_stg_cpt_option_sys_std_show_header_center"><![CDATA[Студия: Показать центральную область заголовка]]></string>
+    <string name="_adm_stg_cpt_option_sys_std_show_header_right"><![CDATA[Студия: Показать правую область заголовка]]></string>
+    <string name="_adm_stg_cpt_option_sys_std_show_header_right_search"><![CDATA[Студия: Показать поиск в заголовке]]></string>
+    <string name="_adm_stg_cpt_option_sys_std_show_header_right_site"><![CDATA[Студия: Показывать ссылку 'сайт' в заголовке]]></string>
+    <string name="_adm_stg_cpt_option_sys_std_show_launcher_left"><![CDATA[Студия: Показать левую область с меню в лаунчере]]></string>
     
     <string name="_adm_stg_cpt_type_system"><![CDATA[Система]]></string>
     <string name="_adm_stg_scs_save"><![CDATA[Настройки удачно сохранены]]></string>
@@ -1844,6 +1851,7 @@
 	<string name="_adm_strg_err_height"><![CDATA[Нужно указать высоту. Пожалуйста, заполните это поле.]]></string>
         <string name="_adm_tmi_cpt_account"><![CDATA[Учетная запись]]></string>
 	<string name="_adm_tmi_cpt_site"><![CDATA[Перейти на сайт]]></string>
+        <string name="_adm_tmi_cpt_search"><![CDATA[Искать...]]></string>
 	<string name="_adm_tmi_cpt_tour"><![CDATA[Инструкции]]></string>
 	<string name="_adm_tmi_cpt_launcher"><![CDATA[Загрузчик]]></string>
         <string name="_adm_txt_active_api"><![CDATA[Доступно в приложении]]></string>
@@ -3204,6 +3212,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_site"><![CDATA[Перейти на сайт]]></string>
+    <string name="_sys_menu_item_title_sa_site"><![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>

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
plugins_public/tailwind/css/tailwind.min.css


+ 5 - 0
studio/classes/BxDolStudioLauncher.php

@@ -93,6 +93,11 @@ class BxDolStudioLauncher extends BxTemplStudioWidgets implements iBxDolSingleto
 
         return $aResult;
     }
+
+    public function isLeftColumn()
+    {
+        return getParam('sys_std_show_launcher_left') == 'on';
+    }
 }
 
 /** @} */

+ 12 - 4
studio/classes/BxDolStudioMenuTop.php

@@ -22,6 +22,7 @@ class BxDolStudioMenuTop extends BxDol implements iBxDolSingleton
     public static $iHistoryLength = 5;
     public static $iToolbarLength = 10;
 
+    protected $sPageName;
     protected $aItems;
     protected $aVisible;
     protected $aSelected;
@@ -33,10 +34,12 @@ class BxDolStudioMenuTop extends BxDol implements iBxDolSingleton
 
         parent::__construct();
 
+        $this->sPageName = '';
+
         $this->aVisible = array(
-            BX_DOL_STUDIO_MT_LEFT => true,
-            BX_DOL_STUDIO_MT_CENTER => true,
-            BX_DOL_STUDIO_MT_RIGHT => true
+            BX_DOL_STUDIO_MT_LEFT => getParam('sys_std_show_header_left') == 'on',
+            BX_DOL_STUDIO_MT_CENTER => getParam('sys_std_show_header_center') == 'on',
+            BX_DOL_STUDIO_MT_RIGHT => getParam('sys_std_show_header_right') == 'on',
         );
 
         $this->aSelected = array(
@@ -54,7 +57,7 @@ class BxDolStudioMenuTop extends BxDol implements iBxDolSingleton
         $this->aItems[BX_DOL_STUDIO_MT_LEFT] = BxTemplStudioFunctions::getInstance()->getLogo();
 
         $this->aItems[BX_DOL_STUDIO_MT_CENTER] = array(
-            'template' => 'menu_floating_blocks.html',
+            'template' => 'menu_top_center.html',
             'menu_items' => array(
                 'launcher' => array(
                     'name' => 'launcher',
@@ -179,6 +182,11 @@ class BxDolStudioMenuTop extends BxDol implements iBxDolSingleton
         $oSession->setValue(self::$sHistorySessionKey, $aHistory);
     }
 
+    public function setPageName($sName)
+    {
+        $this->sPageName = $sName;
+    }
+
     public function setContent($sPosition, $mixedContent)
     {
         $this->aItems[$sPosition] = $mixedContent;

+ 6 - 0
studio/classes/BxDolStudioPage.php

@@ -32,6 +32,9 @@ class BxDolStudioPage extends BxDol
     protected $aMarkers;
 
     protected $sError;
+    
+    protected $_bShowHeaderRightSearch;
+    protected $_bShowHeaderRightSite;
 
     function __construct($mixedPageName)
     {
@@ -56,6 +59,9 @@ class BxDolStudioPage extends BxDol
 
         $this->sError = false;
 
+        $this->_bShowHeaderRightSearch = getParam('sys_std_show_header_right_search') == 'on';
+        $this->_bShowHeaderRightSite = getParam('sys_std_show_header_right_site') == 'on';
+
         if(is_string($mixedPageName)) {
             $this->aPage = $this->oDb->getPages(array('type' => 'by_page_name_full', 'value' => $mixedPageName));
             if(empty($this->aPage) || !is_array($this->aPage))

+ 13 - 0
studio/js/menu_top.js

@@ -43,4 +43,17 @@ BxDolStudioMenuTop.prototype.clickFeatured = function(oItem) {
 BxDolStudioMenuTop.prototype.clickLogout = function(oItem) {
     $(oItem).parent().toggleClass('bx-menu-tab-active');
 };
+
+BxDolStudioMenuTop.prototype.searchWidget = function(oEvent) {
+    setTimeout(function () {
+        var sSearch = $(oEvent.target).val().toLowerCase(); 
+        if(!!sSearch.length) {
+            $('.bx-std-widgets > .bx-std-widget:not([data-name^="' + sSearch + '"])').hide();
+            $('.bx-std-widgets > .bx-std-widget[data-name^="' + sSearch + '"]:hidden').show();
+        }
+        else
+            $('.bx-std-widgets > .bx-std-widget:hidden').show();
+    }, 100);
+};
+
 /** @} */

+ 2 - 1
studio/launcher.php

@@ -36,7 +36,8 @@ $oTemplate->setPageNameIndex($oPage->getPageIndex());
 $oTemplate->setPageHeader($oPage->getPageHeader());
 $oTemplate->setPageContent('page_caption_code', $oPage->getPageCaption());
 $oTemplate->setPageContent('page_attributes', $oPage->getPageAttributes());
-$oTemplate->setPageContent('page_menu_code', $oPage->getPageMenu());
+if($oPage->isLeftColumn())
+    $oTemplate->setPageContent('page_menu_code', $oPage->getPageMenu());
 $oTemplate->setPageContent('page_main_code', $sPageCode);
 $oTemplate->addCss($oPage->getPageCss());
 $oTemplate->addJs($oPage->getPageJs());

+ 0 - 4
studio/template/css/launcher.css

@@ -1,10 +1,6 @@
 /**
  * Overwrite
  */
-body.bx-std-bg.bx-std-page-launcher {
-    background: #001529;
-}
-
 .bx-std-page-launcher div.bx-std-page-column.bx-std-page-menu,
 .bx-std-page-launcher div.bx-std-page-column.bx-std-page-content {
     background-color: transparent;

+ 90 - 46
studio/template/css/menu_top.css

@@ -2,37 +2,44 @@ div.bx-std-menu-top-wrp {
     position: relative;
     display: -webkit-flex;
     display: flex;
-    -webkit-flex-wrap: nowrap;
-    flex-wrap: nowrap;
+    -webkit-justify-content: space-between;
+    justify-content: space-between;
     -webkit-align-items: center;
     align-items: center;
+    -webkit-flex-wrap: nowrap;
+    flex-wrap: nowrap;
 
     width: 100%;
-    min-height: 4rem;
+    height: 5rem;
 
-    background: #001529;
-    box-shadow: inset 0px -1px 0px rgba(240, 240, 240, 0.2);
+    background: rgba(3, 7, 18, 0.8);
 }
+div.bx-std-menu-top-wrp .bx-std-menu-top.bx-std-menu-top-center:first-child {
+    padding-left: 0.75rem;
+}
+
 div.bx-std-menu-top {
     position: relative;
 }
 div.bx-std-menu-top.bx-std-menu-top-left,
+div.bx-std-menu-top.bx-std-menu-top-center,
 div.bx-std-menu-top.bx-std-menu-top-right {
     -webkit-flex: 0 1 auto;
     flex: 0 1 auto;
-    
-    min-width: 15%;
-}
-div.bx-std-menu-top.bx-std-menu-top-center {
-    -webkit-flex: 2 1 auto;
-    flex: 2 1 auto;
 }
-div.bx-std-menu-top-center {
-    height: 4rem;
+div.bx-std-menu-top.bx-std-menu-top-left,
+div.bx-std-menu-top.bx-std-menu-top-right {    
+    min-width: 15%;
 }
 div.bx-std-menu-top-center ul {
-    text-align: center;
-    white-space: nowrap;
+    position: relative;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-align-items: stretch;
+    align-items: stretch;
+    -webkit-flex-wrap: nowrap;
+    flex-wrap: nowrap;
+    
 }
 div.bx-std-menu-top-left {
     padding-left: 1rem;
@@ -45,7 +52,7 @@ div.bx-std-menu-top-right {
     text-align: right;
 }
 
-/*--- Breadcrumb (Center) ---*/
+/*--- Breadcrumb (Left) ---*/
 .bx-menu-breadcrumb {
     position: relative;
     display: -webkit-flex;
@@ -92,55 +99,68 @@ div.bx-std-menu-top-right {
 }
 
 /*--- Widgets (Center) ---*/
-div.bx-std-menu-top .bx-menu-floating-blocks li {
-    width: 5rem;
-    height: 4rem;
+div.bx-std-menu-top .bx-menu-top-center {
+    padding: 0;
+    margin: 0;
+
+    list-style: none;
+}
+
+div.bx-std-menu-top .bx-menu-top-center li {
+    position: relative;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-justify-content: center;
+    justify-content: center;
+    -webkit-align-items: center;
+    align-items: center;
+
+    width: 4.5rem;
+    height: 4.5rem;
 }
 
 /*
  * Vertical divider between static and dynamic menu items.
  *
-div.bx-std-menu-top .bx-menu-floating-blocks li.bx-menu-item-static + li.bx-menu-item-dynamic {
+div.bx-std-menu-top .bx-menu-top-center li.bx-menu-item-static + li.bx-menu-item-dynamic {
     border-left: 1px solid rgba(240, 240, 240, 0.2);
 }
 */
 
-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: 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-top-center li.bx-menu-tab-active a,
+div.bx-std-menu-top .bx-menu-top-center li a:hover {
+    border-color: rgba(37, 99, 235, 0.8);
 }
 
-div.bx-std-menu-top .bx-menu-floating-blocks li a {
-    width: 100%;
-    height: 100%;
-    padding: 0.25rem;
-
-    text-align: center;
-}
+div.bx-std-menu-top .bx-menu-top-center li a {
+    display: block;
+    box-sizing: content-box;
 
-div.bx-std-menu-top .bx-menu-floating-blocks li .bx-mi-icon {
-    margin-top: 0.125rem;
+    width: 3.25rem;
+    height: 3.25rem;
+    
+    border: 0.25rem solid transparent;
+    border-radius: 0.625rem;
 }
+div.bx-std-menu-top .bx-menu-top-center li img,
+div.bx-std-menu-top .bx-menu-top-center li .sys-icon {
+    display: block;
+    box-sizing: content-box;
 
-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;
-
-    width: 2rem;
-    height: 2rem;
+    width: 3rem;
+    height: 3rem;
 
     margin: 0;
+
+    border: 0.125rem solid transparent;
 }
 
-div.bx-std-menu-top .bx-menu-floating-blocks li .sys-icon {
+div.bx-std-menu-top .bx-menu-top-center 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 {
+div.bx-std-menu-top .bx-menu-top-center li .bx-mi-title {
     margin-top: 0.25rem;
 
     font-size: 0.75rem;
@@ -168,12 +188,36 @@ div.bx-std-menu-top .bx-menu-toolbar li {
     float: none;
     display: block;
 
-    height: 4.0rem;
-    min-width: 2.0rem;
+    height: 3.0rem;
+    min-width: 3.0rem;
+    
+    border-radius: 1.5rem;
 
-    line-height: 4.0rem;
+    line-height: 3.0rem;
+    overflow: hidden;
+}
+div.bx-std-menu-top .bx-menu-toolbar li.bx-menu-tab-search {
+    position: relative;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-align-items: center;
+    align-items: center;
+    -webkit-flex-wrap: nowrap;
+    flex-wrap: nowrap;
+
+    background-color: rgba(55, 65, 81, 1);
+    border-radius: 1.5rem;
 }
+div.bx-std-menu-top .bx-menu-toolbar li.bx-menu-tab-search .bx-form-input-text {
+    height: 3rem;
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+
+    border-width: 0;
+    background-color: transparent;
 
+    color: rgba(255, 255, 255, 1);
+}
 div.bx-std-menu-top .bx-menu-toolbar li a {
     position: relative;
     display: -webkit-flex;

+ 2 - 3
studio/template/css/page_columns.css

@@ -1,5 +1,5 @@
 .bx-std-bg {
-    background-color: rgba(228, 228, 231, 1);
+    background: rgba(3, 7, 18, 1);
 }
 
 /*--- 2 columns ---*/
@@ -35,8 +35,7 @@ div.bx-std-page-column.bx-std-page-menu {
     height: 100%;
 
     background-color: #ffffff;
-    box-shadow: inset -1px 0px 0px rgba(240, 240, 240, 0.2);
-    
+
     overflow-y: auto;
 }
 div.bx-std-page-column.bx-std-page-menu::-webkit-scrollbar {

+ 11 - 5
studio/template/images/icons/tmi-account.svg

@@ -1,7 +1,13 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g opacity="0.7">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6 18.584C7.569 17.059 9.692 16.121 12.023 16.121C14.331 16.121 16.431 17.04 18 18.537C16.431 20.062 14.308 21 11.977 21C9.669 21 7.569 20.081 6 18.584Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.975 16.025C3.365 14.811 3 13.452 3 12C3 7.026 7.026 3 12 3C16.974 3 21 7.026 21 12C21 13.45 20.637 14.81 20.023 16.023" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14.1213 7.87868C15.2929 9.05025 15.2929 10.9497 14.1213 12.1213C12.9497 13.2929 11.0502 13.2929 9.87868 12.1213C8.70711 10.9497 8.70711 9.05025 9.87868 7.87868C11.0502 6.70711 12.9497 6.70711 14.1213 7.87868" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" rx="24" fill="#374151"/>
+<g clip-path="url(#clip0_57_2071)">
+<path d="M13.3333 16H34.6666" stroke="#E5E7EB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.3333 24H34.6666" stroke="#E5E7EB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.3333 32H34.6666" stroke="#E5E7EB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </g>
+<defs>
+<clipPath id="clip0_57_2071">
+<rect width="32" height="32" fill="white" transform="translate(8 8)"/>
+</clipPath>
+</defs>
 </svg>

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2
studio/template/images/icons/tmi-actions.svg


+ 11 - 6
studio/template/images/icons/tmi-help.svg

@@ -1,8 +1,13 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g opacity="0.7">
-<circle cx="12.0003" cy="12" r="9.00375" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.68506 9.6847C9.92208 8.66314 10.8525 7.95484 11.9003 7.99832C13.073 7.93337 14.0783 8.82697 14.1512 9.99916C14.1512 11.5037 12.0004 12 12.0004 13.0004" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.1253 15.7516C12.1253 15.8206 12.0693 15.8766 12.0002 15.8766C11.9311 15.8766 11.8752 15.8206 11.8752 15.7516C11.8752 15.6825 11.9311 15.6265 12.0002 15.6265" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.0002 15.6265C12.0692 15.6265 12.1252 15.6825 12.1252 15.7516" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" rx="24" fill="#374151"/>
+<g clip-path="url(#clip0_57_2059)">
+<path d="M12 24C12 25.5759 12.3104 27.1363 12.9134 28.5922C13.5165 30.0481 14.4004 31.371 15.5147 32.4853C16.629 33.5996 17.9519 34.4835 19.4078 35.0866C20.8637 35.6896 22.4241 36 24 36C25.5759 36 27.1363 35.6896 28.5922 35.0866C30.0481 34.4835 31.371 33.5996 32.4853 32.4853C33.5996 31.371 34.4835 30.0481 35.0866 28.5922C35.6896 27.1363 36 25.5759 36 24C36 20.8174 34.7357 17.7652 32.4853 15.5147C30.2348 13.2643 27.1826 12 24 12C20.8174 12 17.7652 13.2643 15.5147 15.5147C13.2643 17.7652 12 20.8174 12 24Z" stroke="#E5E7EB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M24 29.3333V29.3467" stroke="#E5E7EB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M24 25.3333C24.5997 25.3351 25.1824 25.1348 25.6542 24.7646C26.126 24.3944 26.4592 23.876 26.6001 23.2931C26.7409 22.7102 26.6812 22.0968 26.4306 21.5521C26.1799 21.0073 25.753 20.5629 25.2187 20.2907C24.6882 20.0189 24.0815 19.9347 23.4971 20.0516C22.9127 20.1685 22.385 20.4798 22 20.9347" stroke="#E5E7EB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </g>
+<defs>
+<clipPath id="clip0_57_2059">
+<rect width="32" height="32" fill="white" transform="translate(8 8)"/>
+</clipPath>
+</defs>
 </svg>

+ 11 - 8
studio/template/images/icons/tmi-site.svg

@@ -1,10 +1,13 @@
-<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="M8 20.064V11C8 9.895 8.895 9 10 9H20.487" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 14H20.776" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.0049 11.49C11.0019 11.49 10.9999 11.492 10.9999 11.495C10.9999 11.498 11.0019 11.5 11.0049 11.5C11.0079 11.5 11.0099 11.498 11.0099 11.495C11.0099 11.492 11.0079 11.49 11.0049 11.49" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.5479 11.49C13.5449 11.49 13.5429 11.492 13.5429 11.495C13.5429 11.498 13.5449 11.5 13.5479 11.5C13.5509 11.5 13.5529 11.498 13.5529 11.495C13.5529 11.492 13.5509 11.49 13.5479 11.49" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 21V21C16.971 21 21 16.971 21 12V12C21 7.029 16.971 3 12 3V3C7.029 3 3 7.029 3 12V12C3 16.971 7.029 21 12 21Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M16.0879 11.49C16.0849 11.49 16.0829 11.492 16.0829 11.495C16.0829 11.498 16.0849 11.5 16.0879 11.5C16.0909 11.5 16.0929 11.498 16.0929 11.495C16.0929 11.492 16.0899 11.49 16.0879 11.49" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="48" height="48" rx="24" fill="#374151"/>
+<g clip-path="url(#clip0_57_2065)">
+<path d="M20 28L28 20" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M22.6667 16L23.2841 15.2853C24.5345 14.0351 26.2303 13.3328 27.9986 13.3329C29.7668 13.333 31.4625 14.0356 32.7127 15.286C33.963 16.5364 34.6653 18.2322 34.6652 20.0005C34.665 21.7687 33.9625 23.4644 32.7121 24.7147L32.0001 25.3333" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M25.3334 32L24.8041 32.712C23.5391 33.9629 21.8318 34.6645 20.0528 34.6645C18.2737 34.6645 16.5664 33.9629 15.3014 32.712C14.6779 32.0955 14.1829 31.3614 13.8451 30.5522C13.5072 29.743 13.3333 28.8749 13.3333 27.998C13.3333 27.1211 13.5072 26.253 13.8451 25.4438C14.1829 24.6346 14.6779 23.9005 15.3014 23.284L16.0001 22.6667" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </g>
+<defs>
+<clipPath id="clip0_57_2065">
+<rect width="32" height="32" fill="white" transform="translate(8 8)"/>
+</clipPath>
+</defs>
 </svg>

+ 8 - 19
studio/template/images/icons/wi-bld-forms.svg

@@ -1,26 +1,15 @@
-<svg width="320" height="320" viewBox="0 0 320 320" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_910_6107)">
-<path d="M160 0C281.326 0 320 38.6737 320 160C320 281.326 281.326 320 160 320C38.6736 320 0 281.326 0 160C0 38.6737 38.6736 0 160 0Z" fill="url(#paint0_linear_910_6107)"/>
-<g opacity="0.8">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M85.6454 166.2C82.9605 165.32 79.9953 165.384 77.5976 166.879C65.0031 174.73 60 186.633 60 203.883C60 241.797 84.171 253.883 160 253.883C235.829 253.883 260 241.797 260 203.883C260 186.633 254.997 174.73 242.402 166.879C240.005 165.384 237.04 165.32 234.355 166.2C217.261 171.8 193.106 174.085 160 174.085C126.894 174.085 102.739 171.8 85.6454 166.2ZM122 203C122 211.284 115.284 218 107 218C98.7157 218 92 211.284 92 203C92 194.716 98.7157 188 107 188C115.284 188 122 194.716 122 203ZM142 218C150.284 218 157 211.284 157 203C157 194.716 150.284 188 142 188C133.716 188 127 194.716 127 203C127 211.284 133.716 218 142 218ZM192 203C192 211.284 185.284 218 177 218C168.716 218 162 211.284 162 203C162 194.716 168.716 188 177 188C185.284 188 192 194.716 192 203ZM212 218C220.284 218 227 211.284 227 203C227 194.716 220.284 188 212 188C203.716 188 197 194.716 197 203C197 211.284 203.716 218 212 218Z" fill="url(#paint1_linear_910_6107)"/>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M260 115C260 77.0855 235.829 65 160 65C84.171 65 60 77.0855 60 115C60 152.914 84.171 165 160 165C235.829 165 260 152.914 260 115ZM107 100C98.7157 100 92 106.716 92 115C92 123.284 98.7157 130 107 130H212C220.284 130 227 123.284 227 115C227 106.716 220.284 100 212 100H107Z" fill="url(#paint2_linear_910_6107)"/>
+<svg width="96" height="96" viewBox="0 0 96 96" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_69_695)">
+<path d="M80 0H16C7.16344 0 0 7.16344 0 16V80C0 88.8366 7.16344 96 16 96H80C88.8366 96 96 88.8366 96 80V16C96 7.16344 88.8366 0 80 0Z" fill="url(#paint0_linear_69_695)"/>
+<path d="M43 20.5C42.337 20.5 41.701 20.7634 41.2322 21.2322C40.7634 21.701 40.5 22.337 40.5 23V28H15.5C14.1739 28 12.9021 28.5268 11.9645 29.4644C11.0268 30.4022 10.5 31.674 10.5 33V63C10.5 64.326 11.0268 65.5978 11.9645 66.5356C12.9021 67.4732 14.1739 68 15.5 68H40.5V73C40.5 73.663 40.7634 74.299 41.2322 74.7678C41.701 75.2366 42.337 75.5 43 75.5C43.663 75.5 44.299 75.2366 44.7678 74.7678C45.2366 74.299 45.5 73.663 45.5 73V23C45.5 22.337 45.2366 21.701 44.7678 21.2322C44.299 20.7634 43.663 20.5 43 20.5ZM15.5 63V33H40.5V63H15.5ZM85.5 33V63C85.5 64.326 84.9732 65.5978 84.0356 66.5356C83.0978 67.4732 81.826 68 80.5 68H53C52.337 68 51.701 67.7366 51.2322 67.2678C50.7634 66.799 50.5 66.163 50.5 65.5C50.5 64.837 50.7634 64.201 51.2322 63.7322C51.701 63.2634 52.337 63 53 63H80.5V33H53C52.337 33 51.701 32.7366 51.2322 32.2678C50.7634 31.799 50.5 31.163 50.5 30.5C50.5 29.837 50.7634 29.201 51.2322 28.7322C51.701 28.2634 52.337 28 53 28H80.5C81.826 28 83.0978 28.5268 84.0356 29.4644C84.9732 30.4022 85.5 31.674 85.5 33ZM35.5 43C35.5 43.663 35.2366 44.299 34.7678 44.7678C34.299 45.2366 33.663 45.5 33 45.5H30.5V53C30.5 53.663 30.2366 54.299 29.7678 54.7678C29.299 55.2366 28.663 55.5 28 55.5C27.337 55.5 26.701 55.2366 26.2322 54.7678C25.7634 54.299 25.5 53.663 25.5 53V45.5H23C22.337 45.5 21.701 45.2366 21.2322 44.7678C20.7634 44.299 20.5 43.663 20.5 43C20.5 42.337 20.7634 41.701 21.2322 41.2322C21.701 40.7634 22.337 40.5 23 40.5H33C33.663 40.5 34.299 40.7634 34.7678 41.2322C35.2366 41.701 35.5 42.337 35.5 43Z" fill="white"/>
 </g>
 <defs>
-<linearGradient id="paint0_linear_910_6107" x1="160" y1="0" x2="160" y2="320" gradientUnits="userSpaceOnUse">
-<stop stop-color="#60A5FA"/>
+<linearGradient id="paint0_linear_69_695" x1="48" y1="0" x2="48" y2="96" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3B82F6"/>
 <stop offset="1" stop-color="#2563EB"/>
 </linearGradient>
-<linearGradient id="paint1_linear_910_6107" x1="160" y1="165.627" x2="160" y2="253.883" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#BFDBFE"/>
-</linearGradient>
-<linearGradient id="paint2_linear_910_6107" x1="160" y1="65" x2="160" y2="165" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#BFDBFE"/>
-</linearGradient>
-<clipPath id="clip0_910_6107">
-<rect width="320" height="320" fill="white"/>
+<clipPath id="clip0_69_695">
+<rect width="96" height="96" fill="white"/>
 </clipPath>
 </defs>
 </svg>

+ 12 - 28
studio/template/images/icons/wi-dashboard.svg

@@ -1,34 +1,18 @@
-<svg width="320" height="320" viewBox="0 0 320 320" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_922_6503)">
-<path d="M160 0C281.326 0 320 38.6737 320 160C320 281.326 281.326 320 160 320C38.6736 320 0 281.326 0 160C0 38.6737 38.6736 0 160 0Z" fill="url(#paint0_linear_922_6503)"/>
-<g clip-path="url(#clip1_922_6503)">
-<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M226.749 68.5519C229.836 66.4247 229.709 61.8008 226.281 60.2841C209.903 53.0386 188.198 50 160 50C76.5881 50 50 76.5882 50 160C50 230.094 68.7756 260.061 124.269 267.844C127.694 268.324 130.537 265.135 130.252 261.688C130.081 259.625 130 257.399 130 255C130 250.88 130.238 247.269 130.762 244.116C131.283 240.99 129.339 237.733 126.24 237.069C91.8825 229.713 80 207.554 80 160C80 99.3368 99.3368 80 160 80C176.765 80 190.373 81.4768 201.29 84.8947C202.958 85.4169 204.785 85.1131 206.148 84.0188C213.175 78.3763 220.152 73.0976 226.749 68.5519ZM260.007 94.3847C258.514 90.9257 253.862 90.7736 251.721 93.8737C247.152 100.49 241.852 107.484 236.191 114.524C235.106 115.873 234.796 117.68 235.298 119.336C238.579 130.145 240 143.554 240 160C240 207.554 228.117 229.713 193.76 237.069C190.661 237.733 188.717 240.99 189.238 244.116C189.762 247.269 190 250.88 190 255C190 257.399 189.919 259.625 189.749 261.688C189.463 265.135 192.306 268.324 195.731 267.844C251.224 260.061 270 230.094 270 160C270 132.182 267.043 110.684 260.007 94.3847Z" fill="url(#paint1_linear_922_6503)"/>
-<path opacity="0.8" d="M160 235C175.166 235 180 239.834 180 255C180 270.166 175.166 275 160 275C144.834 275 140 270.166 140 255C140 239.834 144.834 235 160 235Z" fill="url(#paint2_linear_922_6503)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M188.738 156.018C188.514 154.331 188.968 152.609 190.155 151.391C217.545 123.285 258.678 76.6613 251.216 69.199C243.843 61.826 198.239 101.893 170.041 129.271C168.722 130.551 166.825 130.972 165.024 130.605C163.078 130.208 161.063 130 159 130C142.431 130 129 143.431 129 160C129 176.569 142.431 190 159 190C175.569 190 189 176.569 189 160C189 158.65 188.911 157.321 188.738 156.018Z" fill="url(#paint3_linear_922_6503)"/>
-</g>
+<svg width="96" height="96" viewBox="0 0 96 96" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_69_113)">
+<path d="M80 0H16C7.16344 0 0 7.16344 0 16V80C0 88.8366 7.16344 96 16 96H80C88.8366 96 96 88.8366 96 80V16C96 7.16344 88.8366 0 80 0Z" fill="url(#paint0_linear_69_113)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.5628 17.9739C39.5058 16.3406 43.732 15.5 48 15.5C52.268 15.5 56.4942 16.3406 60.4372 17.9739C64.3802 19.6072 67.963 22.0012 70.981 25.019C73.9988 28.037 76.3928 31.6198 78.026 35.5628C79.6594 39.5058 80.5 43.732 80.5 48C80.5 52.268 79.6594 56.4942 78.026 60.4372C76.3928 64.3802 73.9988 67.963 70.981 70.981C67.963 73.9988 64.3802 76.3928 60.4372 78.026C56.4942 79.6594 52.268 80.5 48 80.5C43.732 80.5 39.5058 79.6594 35.5628 78.026C31.6198 76.3928 28.037 73.9988 25.019 70.981C22.0012 67.963 19.6072 64.3802 17.9739 60.4372C16.3406 56.4942 15.5 52.268 15.5 48C15.5 43.732 16.3406 39.5058 17.9739 35.5628C19.6072 31.6198 22.0012 28.037 25.019 25.019C28.037 22.0012 31.6198 19.6072 35.5628 17.9739ZM48 20.5C44.3886 20.5 40.8126 21.2114 37.4762 22.5934C34.1398 23.9754 31.1082 26.001 28.5546 28.5546C26.001 31.1082 23.9754 34.1398 22.5934 37.4762C21.2114 40.8126 20.5 44.3886 20.5 48C20.5 51.6114 21.2114 55.1874 22.5934 58.5238C23.9754 61.8602 26.001 64.8918 28.5546 67.4454C31.1082 69.999 34.1398 72.0246 37.4762 73.4066C40.8126 74.7886 44.3886 75.5 48 75.5C51.6114 75.5 55.1874 74.7886 58.5238 73.4066C61.8602 72.0246 64.8918 69.999 67.4454 67.4454C69.999 64.8918 72.0246 61.8602 73.4066 58.5238C74.7886 55.1874 75.5 51.6114 75.5 48C75.5 44.3886 74.7886 40.8126 73.4066 37.4762C72.0246 34.1398 69.999 31.1082 67.4454 28.5546C64.8918 26.001 61.8602 23.9754 58.5238 22.5934C55.1874 21.2114 51.6114 20.5 48 20.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M43.8752 43.8752C44.9692 42.7812 46.453 42.1666 48 42.1666C49.5472 42.1666 51.0308 42.7812 52.1248 43.8752C53.2188 44.9692 53.8334 46.453 53.8334 48C53.8334 49.5472 53.2188 51.0308 52.1248 52.1248C51.0308 53.2188 49.5472 53.8334 48 53.8334C46.453 53.8334 44.9692 53.2188 43.8752 52.1248C42.7812 51.0308 42.1666 49.5472 42.1666 48C42.1666 46.453 42.7812 44.9692 43.8752 43.8752ZM48 47.1666C47.779 47.1666 47.567 47.2544 47.4108 47.4108C47.2544 47.567 47.1666 47.779 47.1666 48C47.1666 48.221 47.2544 48.433 47.4108 48.5892C47.567 48.7456 47.779 48.8334 48 48.8334C48.221 48.8334 48.433 48.7456 48.5892 48.5892C48.7456 48.433 48.8334 48.221 48.8334 48C48.8334 47.779 48.7456 47.567 48.5892 47.4108C48.433 47.2544 48.221 47.1666 48 47.1666Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M63.101 32.8988C64.0774 33.8752 64.0774 35.4582 63.101 36.4344L54.4678 45.0678C53.4914 46.044 51.9086 46.044 50.9322 45.0678C49.956 44.0914 49.956 42.5086 50.9322 41.5322L59.5656 32.8988C60.5418 31.9226 62.1248 31.9226 63.101 32.8988Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48 33.8334C44.2428 33.8334 40.6394 35.3258 37.9826 37.9826C35.3258 40.6394 33.8334 44.2428 33.8334 48C33.8334 49.3808 32.714 50.5 31.3334 50.5C29.9526 50.5 28.8334 49.3808 28.8334 48C28.8334 42.9166 30.8526 38.0416 34.4472 34.4472C38.0416 30.8526 42.9166 28.8334 48 28.8334C49.3808 28.8334 50.5 29.9526 50.5 31.3334C50.5 32.714 49.3808 33.8334 48 33.8334Z" fill="white"/>
 </g>
 <defs>
-<linearGradient id="paint0_linear_922_6503" x1="160" y1="0" x2="160" y2="320" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FB7185"/>
-<stop offset="1" stop-color="#E11D48"/>
-</linearGradient>
-<linearGradient id="paint1_linear_922_6503" x1="160" y1="50" x2="160" y2="267.892" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#FECDD3"/>
-</linearGradient>
-<linearGradient id="paint2_linear_922_6503" x1="160" y1="235" x2="160" y2="275" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#FECDD3"/>
+<linearGradient id="paint0_linear_69_113" x1="48" y1="0" x2="48" y2="96" gradientUnits="userSpaceOnUse">
+<stop stop-color="#71717A"/>
+<stop offset="1" stop-color="#52525B"/>
 </linearGradient>
-<linearGradient id="paint3_linear_922_6503" x1="190.553" y1="68.3091" x2="190.553" y2="190" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#FECDD3"/>
-</linearGradient>
-<clipPath id="clip0_922_6503">
-<rect width="320" height="320" fill="white"/>
-</clipPath>
-<clipPath id="clip1_922_6503">
-<rect width="240" height="240" fill="white" transform="translate(40 40)"/>
+<clipPath id="clip0_69_113">
+<rect width="96" height="96" fill="white"/>
 </clipPath>
 </defs>
 </svg>

+ 26 - 10
studio/template/images/icons/wi-launcher.svg

@@ -1,12 +1,28 @@
-<svg width="33" height="32" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="33" height="32">
-<path d="M16.5 32C23.5111 32 27.4087 32 29.9543 29.4543C32.5 26.9087 32.5 23.0111 32.5 16C32.5 8.98889 32.5 5.09132 29.9543 2.54566C27.4087 0 23.5111 0 16.5 0C9.48889 0 5.59132 0 3.04566 2.54566C0.5 5.09132 0.5 8.98889 0.5 16C0.5 23.0111 0.5 26.9087 3.04566 29.4543C5.59132 32 9.48889 32 16.5 32Z" fill="white"/>
-</mask>
-<g mask="url(#mask0)" opacity="0.7">
-<path d="M29.6008 29.1008C28.4309 30.2707 26.9369 30.8779 24.8291 31.1871C22.7046 31.4988 20.0198 31.5 16.5 31.5C12.9802 31.5 10.2954 31.4988 8.17086 31.1871C6.06315 30.8779 4.56907 30.2707 3.39921 29.1008C2.22935 27.9309 1.62213 26.4369 1.31291 24.3291C1.00122 22.2046 1 19.5198 1 16C1 12.4802 1.00122 9.79544 1.31291 7.67086C1.62213 5.56315 2.22935 4.06907 3.39921 2.89921C4.56907 1.72935 6.06315 1.12213 8.17086 0.812912C10.2954 0.50122 12.9802 0.5 16.5 0.5C20.0198 0.5 22.7046 0.50122 24.8291 0.812912C26.9369 1.12213 28.4309 1.72935 29.6008 2.89921C30.7707 4.06907 31.3779 5.56315 31.6871 7.67086C31.9988 9.79544 32 12.4802 32 16C32 19.5198 31.9988 22.2046 31.6871 24.3291C31.3779 26.4369 30.7707 27.9309 29.6008 29.1008Z" stroke="white" stroke-width="2.0" />
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.25 13.75H9.5C8.395 13.75 7.5 12.855 7.5 11.75V9C7.5 7.895 8.395 7 9.5 7H12.25C13.355 7 14.25 7.895 14.25 9V11.75C14.25 12.855 13.355 13.75 12.25 13.75Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.5 13.75H20.75C19.645 13.75 18.75 12.855 18.75 11.75V9C18.75 7.895 19.645 7 20.75 7H23.5C24.605 7 25.5 7.895 25.5 9V11.75C25.5 12.855 24.605 13.75 23.5 13.75Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.25 25H9.5C8.395 25 7.5 24.105 7.5 23V20.25C7.5 19.145 8.395 18.25 9.5 18.25H12.25C13.355 18.25 14.25 19.145 14.25 20.25V23C14.25 24.105 13.355 25 12.25 25Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.5 25H20.75C19.645 25 18.75 24.105 18.75 23V20.25C18.75 19.145 19.645 18.25 20.75 18.25H23.5C24.605 18.25 25.5 19.145 25.5 20.25V23C25.5 24.105 24.605 25 23.5 25Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_57_1596)">
+<rect width="48" height="48" rx="8" fill="url(#paint0_linear_57_1596)"/>
+<g clip-path="url(#clip0_57_1596)">
+<path d="M13.3333 14.6667C13.3333 14.3131 13.4738 13.9739 13.7238 13.7239C13.9739 13.4738 14.313 13.3333 14.6666 13.3333H20C20.3536 13.3333 20.6927 13.4738 20.9428 13.7239C21.1928 13.9739 21.3333 14.3131 21.3333 14.6667V20C21.3333 20.3536 21.1928 20.6928 20.9428 20.9428C20.6927 21.1929 20.3536 21.3333 20 21.3333H14.6666C14.313 21.3333 13.9739 21.1929 13.7238 20.9428C13.4738 20.6928 13.3333 20.3536 13.3333 20V14.6667Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M26.6667 14.6667C26.6667 14.3131 26.8072 13.9739 27.0572 13.7239C27.3073 13.4738 27.6464 13.3333 28 13.3333H33.3334C33.687 13.3333 34.0261 13.4738 34.2762 13.7239C34.5262 13.9739 34.6667 14.3131 34.6667 14.6667V20C34.6667 20.3536 34.5262 20.6928 34.2762 20.9428C34.0261 21.1929 33.687 21.3333 33.3334 21.3333H28C27.6464 21.3333 27.3073 21.1929 27.0572 20.9428C26.8072 20.6928 26.6667 20.3536 26.6667 20V14.6667Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.3333 28C13.3333 27.6464 13.4738 27.3072 13.7238 27.0572C13.9739 26.8071 14.313 26.6667 14.6666 26.6667H20C20.3536 26.6667 20.6927 26.8071 20.9428 27.0572C21.1928 27.3072 21.3333 27.6464 21.3333 28V33.3333C21.3333 33.6869 21.1928 34.0261 20.9428 34.2761C20.6927 34.5262 20.3536 34.6667 20 34.6667H14.6666C14.313 34.6667 13.9739 34.5262 13.7238 34.2761C13.4738 34.0261 13.3333 33.6869 13.3333 33.3333V28Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M26.6667 28C26.6667 27.6464 26.8072 27.3072 27.0572 27.0572C27.3073 26.8071 27.6464 26.6667 28 26.6667H33.3334C33.687 26.6667 34.0261 26.8071 34.2762 27.0572C34.5262 27.3072 34.6667 27.6464 34.6667 28V33.3333C34.6667 33.6869 34.5262 34.0261 34.2762 34.2761C34.0261 34.5262 33.687 34.6667 33.3334 34.6667H28C27.6464 34.6667 27.3073 34.5262 27.0572 34.2761C26.8072 34.0261 26.6667 33.6869 26.6667 33.3333V28Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </g>
+</g>
+<defs>
+<filter id="filter0_d_57_1596" x="0" y="0" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_57_1596"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_57_1596" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_57_1596" x1="24" y1="0" x2="24" y2="48" gradientUnits="userSpaceOnUse">
+<stop stop-color="#71717A"/>
+<stop offset="1" stop-color="#52525B"/>
+</linearGradient>
+<clipPath id="clip0_57_1596">
+<rect width="32" height="32" fill="white" transform="translate(8 8)"/>
+</clipPath>
+</defs>
 </svg>

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 5
studio/template/images/icons/wi-settings.svg


+ 0 - 17
studio/template/menu_floating_blocks.html

@@ -1,17 +0,0 @@
-<ul class="bx-menu-floating-blocks bx-menu-object-__object__ bx-clearfix">
-    <bx_repeat:menu_items><li id="bx-menu-item-__name__" class="__class__ bx-def-color-bg-hl-hover bx-def-box-sizing __class_add__">
-        <a class="bx-def-box-sizing" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
-            <div class="bx-mi-icon">
-                <bx_include_auto:menu_icon.html />
-            </div>
-            <div class="bx-mi-title">__title__</div>
-        </a>
-    </li></bx_repeat:menu_items>
-</ul>
-
-<script language="javascript">
-    $(document).ready(function () {
-        // add default class to active menu items
-        $('.bx-menu-floating-blocks > li.bx-menu-tab-active').not('.bx-def-color-bg-active').addClass('bx-def-color-bg-active');
-    });
-</script>

+ 7 - 7
studio/template/menu_top.html

@@ -1,11 +1,11 @@
+<script defer language="javascript">
+<!--
+var oBxDolStudioMenuTop = new BxDolStudioMenuTop({
+    sActionUrl: '<bx_url_studio />ajax.php'
+});
+-->
+</script>
 <div class="bx-std-menu-top-wrp">
-    <script defer language="javascript">
-    <!--
-    var oBxDolStudioMenuTop = new BxDolStudioMenuTop({
-        sActionUrl: '<bx_url_studio />ajax.php'
-    });
-    -->
-    </script>
     <bx_repeat:menus>
         <div id="bx-std-menu-top bx-std-menu-top-__name__" class="bx-std-menu-top bx-std-menu-top-__name__ bx-def-font-contrasted bx-def-box-sizing">__content__</div>
     </bx_repeat:menus>

+ 9 - 0
studio/template/menu_top_center.html

@@ -0,0 +1,9 @@
+<ul class="bx-menu-top-center bx-menu-object-__object__ bx-clearfix">
+    <bx_repeat:menu_items><li id="bx-menu-item-__name__" class="__class__ bx-def-box-sizing __class_add__">
+        <a href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
+            <div class="bx-mi-icon">
+                <bx_include_auto:menu_icon.html />
+            </div>
+        </a>
+    </li></bx_repeat:menu_items>
+</ul>

+ 9 - 1
studio/template/menu_top_toolbar.html

@@ -1,4 +1,12 @@
-<ul class="bx-menu-toolbar">
+<ul class="bx-menu-toolbar gap-x-4">
+    <bx_if:show_search>
+        <li class="bx-menu-tab-search">
+            <img class="ml-2" src="<bx_icon_url:tmi-search.svg />" />
+            <div class="bx-form-input-wrapper bx-form-input-wrapper-text">
+                <input type="text" name="search" value="" placeholder="<bx_text_attribute:_adm_tmi_cpt_search />" class="bx-def-font-inputs bx-form-input-text" onkeydown="return oBxDolStudioMenuTop.searchWidget(event)" />
+            </div>
+        </li>
+    </bx_if:show_search>
     <bx_repeat:menu_items>
         <li class="bx-menu-tab-__name__  __class_add__">
             <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><bx_if:image_inline>__image__</bx_if:image_inline></a>

+ 1 - 0
studio/template/scripts/BxBaseStudioFunctions.php

@@ -135,6 +135,7 @@ class BxBaseStudioFunctions extends BxBaseFunctions implements iBxDolSingleton
         
         return $oTemplate->parseHtmlByName('widget.html', array(
             'id' => $mixedWidget['id'],
+            'name' => strtolower($sCaption),
             'url' => !empty($mixedWidget['url']) ? bx_replace_markers($mixedWidget['url'], $aMarkers) : 'javascript:void(0)',
             'bx_if:show_click_icon' => array(
                 'condition' => !empty($mixedWidget['click']),

+ 5 - 0
studio/template/scripts/BxBaseStudioLauncher.php

@@ -20,6 +20,11 @@ class BxBaseStudioLauncher extends BxDolStudioLauncher
         $this->sPageUrl = BX_DOL_URL_STUDIO . 'launcher.php';
     }
 
+    public function getPageIndex()
+    {
+        return $this->isLeftColumn() ? parent::getPageIndex() : 4;
+    }
+
     public function getPageCss()
     {
         $aCss = array(

+ 10 - 1
studio/template/scripts/BxBaseStudioMenuTop.php

@@ -32,6 +32,8 @@ class BxBaseStudioMenuTop extends BxDolStudioMenuTop
 
     function getCode()
     {
+        $oTemplate = BxDolStudioTemplate::getInstance();
+
         $aTmplVars = array();
         foreach($this->aItems as $sPosition => $mixedItems) {
             if(!$this->aVisible[$sPosition])
@@ -49,6 +51,14 @@ class BxBaseStudioMenuTop extends BxDolStudioMenuTop
                 ));
 
                 $sContent = $oMenu->getCode();
+                if($sPosition == BX_DOL_STUDIO_MT_RIGHT) {
+                    $sContent = $oTemplate->parseHtmlByContent($sContent, [
+                        'bx_if:show_search' => [
+                            'condition' => $this->sPageName == 'home' && getParam('sys_std_show_header_right_search') == 'on',
+                            'content' => []
+                        ]
+                    ]);
+                }
             }
 
             $aTmplVars[] = array(
@@ -60,7 +70,6 @@ class BxBaseStudioMenuTop extends BxDolStudioMenuTop
         if(empty($aTmplVars))
             return '';
 
-        $oTemplate = BxDolStudioTemplate::getInstance();
         $oTemplate->addJs($this->getJs());
         $oTemplate->addCss($this->getCss());
         return $oTemplate->parseHtmlByName('menu_top.html', array('bx_repeat:menus' => $aTmplVars));

+ 6 - 5
studio/template/scripts/BxBaseStudioWidget.php

@@ -56,14 +56,14 @@ class BxBaseStudioWidget extends BxDolStudioWidget
         $oTemplate->addInjection('injection_header', 'text', $sActions . $sHelp);
 
         //--- Menu Right ---//
-        $aItemsRight = array(
-            'site' => array(
+        $aItemsRight = [];
+        if($this->_bShowHeaderRightSite)
+            $aItemsRight['site'] = [
                 'name' => 'site',
                 'icon' => 'tmi-site.svg',
                 'link' => '{url_root}',
                 'title' => '_adm_tmi_cpt_site'
-            ),
-        );
+            ];
 
         if($bHelp)
             $aItemsRight['help'] = array(
@@ -90,6 +90,7 @@ class BxBaseStudioWidget extends BxDolStudioWidget
         );
 
         $oTopMenu = BxTemplStudioMenuTop::getInstance();
+        $oTopMenu->setPageName($this->aPage['name']);
         $oTopMenu->setContent(BX_DOL_STUDIO_MT_LEFT, $this->getPageBreadcrumb());
         $oTopMenu->setSelected(BX_DOL_STUDIO_MT_CENTER, $this->aPage['name']);
         $oTopMenu->setContent(BX_DOL_STUDIO_MT_RIGHT, array(
@@ -269,7 +270,7 @@ class BxBaseStudioWidget extends BxDolStudioWidget
         );
 
         foreach($this->aActions as $aAction) {
-            if($aAction['name'] == 'rearrange' && empty($iWidgetId))
+            if($aAction['name'] == 'rearrange' && (empty($iWidgetId) || getParam('sys_std_show_launcher_left') != 'on'))
                 continue;
 
             $aInput = array(

+ 4 - 0
studio/template/scripts/BxBaseStudioWidgets.php

@@ -96,10 +96,14 @@ class BxBaseStudioWidgets extends BxDolStudioWidgets
             )
         );
 
+        if(!$this->_bShowHeaderRightSite)
+            unset($aItemsRight['menu_items']['site']);
+
         if($this->_sType != BX_DOL_STUDIO_WTYPE_DEFAULT || getParam('site_tour_studio') != 'on')
             unset($aItemsRight['menu_items']['tour']);
 
         $oTopMenu = BxTemplStudioMenuTop::getInstance();
+        $oTopMenu->setPageName($this->aPage['name']);
         $oTopMenu->setContent(BX_DOL_STUDIO_MT_RIGHT, $aItemsRight);
 
         return '';

+ 1 - 1
studio/template/widget.html

@@ -1,4 +1,4 @@
-<div id="bx-std-widget-__id__" class="bx-std-widget __widget_disabled_class__ __widget_featured_class__" style="__widget_styles__">
+<div id="bx-std-widget-__id__" class="bx-std-widget __widget_disabled_class__ __widget_featured_class__" style="__widget_styles__" data-name="__name__">
     <div class="bx-std-widget-cont">
         <div class="bx-std-widget-icon bx-std-widget-icon-trans">
             <a class="bx-std-widget-link" href="__url__" <bx_if:show_click_icon>onClick="__content__"</bx_if:show_click_icon>>

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff