Skip to content

Commit

Permalink
Ticket #4847 - Studio: Layout changes. Stage 3.
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonLV committed Dec 5, 2024
1 parent 4575bd5 commit b166692
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 26 deletions.
10 changes: 0 additions & 10 deletions studio/template/css/general.css
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ div.bx-std-pmen-item a,
div.bx-std-pmen-item .sys-icon {
color: #595959;
}

div.bx-std-pmen-item a {
position: relative;
display: block;
Expand All @@ -199,15 +198,10 @@ div.bx-std-pmen-item a {
text-decoration: none;
color: rgba(55, 65, 81, 1);
}

div.bx-std-pmen-item .sys-icon {
font-size: 1.0rem;
color: #ffffff;
}

div.bx-std-pmen-item svg g {
opacity: 0.7;
}
div.bx-std-pmen-item:hover,
div.bx-std-pmen-item.bx-menu-tab-active {
background-color: rgba(243, 244, 246, 1);
Expand All @@ -225,10 +219,6 @@ div.bx-std-pmen-item.bx-menu-tab-active a {
color: rgba(17, 24, 39, 1);
}

div.bx-std-pmen-item:hover svg g,
div.bx-std-pmen-item.bx-menu-tab-active svg g {
opacity: 0.85;
}
/*--- Icons ---*/
img.bx-item-icon,
svg.bx-item-icon{
Expand Down
2 changes: 1 addition & 1 deletion studio/template/images/icons/mi-qrcode.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion studio/template/images/icons/mi-wrench.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 11 additions & 14 deletions studio/template/scripts/BxBaseStudioBuilderPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -503,29 +503,29 @@ protected function actionBlockCreate()
)
);

$aMenu = array(
BX_DOL_STUDIO_BP_SKELETONS => array(
$aMenu = [
BX_DOL_STUDIO_BP_SKELETONS => [
'name' => BX_DOL_STUDIO_BP_SKELETONS,
'icon' => 'mi-qrcode.svg',
'icon_bg' => true,
'title' => '_sys_block_types_skeletons',
'selected' => $sSelected == BX_DOL_STUDIO_BP_SKELETONS,
),
BX_DOL_STUDIO_MODULE_SYSTEM => array(
],
BX_DOL_STUDIO_MODULE_SYSTEM => [
'name' => BX_DOL_STUDIO_MODULE_SYSTEM,
'icon' => 'mi-cog.svg',
'icon_bg' => true,
'title' => '_sys_block_types_system',
'selected' => $sSelected == BX_DOL_STUDIO_MODULE_SYSTEM,
),
BX_DOL_STUDIO_MODULE_CUSTOM => array(
],
BX_DOL_STUDIO_MODULE_CUSTOM => [
'name' => BX_DOL_STUDIO_MODULE_CUSTOM,
'icon' => 'mi-wrench.svg',
'icon_bg' => true,
'title' => '_sys_block_types_custom',
'selected' => $sSelected == BX_DOL_STUDIO_MODULE_CUSTOM,
)
);
]
];

$aModules = BxDolModuleQuery::getInstance()->getModulesBy(['type' => 'type', 'value' => [BX_DOL_MODULE_TYPE_MODULE, BX_DOL_MODULE_TYPE_TEMPLATE]]);
$aModulesWithBlocks = $this->oDb->getModulesWithCopyableBlocks();
Expand All @@ -546,16 +546,13 @@ protected function actionBlockCreate()
foreach($aMenu as $sKey => $aItem)
$aMenu[$sKey]['onclick'] = $sJsObject . '.onChangeModule(\'' . $aItem['name'] . '\', this);';

$oMenu = new BxTemplStudioMenu(array('template' => 'menu_side.html', 'menu_items' => $aMenu));
$oMenu->setInlineIcons(false);
$oMenu = new BxTemplStudioMenu(['template' => 'menu_side.html', 'menu_items' => $aMenu]);

$aTmplParams = array(
$aForm['inputs']['blocks']['content'] = $oTemplate->parseHtmlByName('bp_add_block_form.html', [
'menu' => $oMenu->getCode(),
'html_block_lists_id' => $this->aHtmlIds['block_lists_id'],
'blocks' => $this->getBlockList($sSelected)
);

$aForm['inputs']['blocks']['content'] = $oTemplate->parseHtmlByName('bp_add_block_form.html', $aTmplParams);
]);

$oForm = new BxTemplStudioFormView($aForm);
$oForm->initChecker();
Expand Down

0 comments on commit b166692

Please sign in to comment.