composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2060 [WIP] Initialisation of the portal application: Part of the "brick_collection" service refactoring

Browse Source
This commit is contained in:
Molkobain
2019-06-28 15:08:30 +02:00
parent d388086baa
commit 008261e918
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
datamodels/2.x/itop-portal-base/portal/src/Brick/BrickCollection.php
View File

@@ -96,6 +96,7 @@ class BrickCollection
{
$aRawBrickList = $this->GetRawBrickList();
// TODO: Are bricks_* still used? Didn't find any references in files. Maybe they could be deprecated.
$this->aAllowedBricksData = array(
'bricks' => array(),
'bricks_total_width' => 0,

2
datamodels/2.x/itop-portal-base/portal/templates/home/layout.html.twig
View File

@@ -10,7 +10,7 @@
<div class="row">
<div class="col-xs-12 col-sm-9 col-md-10 col-sm-offset-3 col-md-offset-2">
<section class="row tiles_wrapper">
{% for brick in app['combodo.portal.instance.conf'].bricks_ordering.home %}
{% for brick in app['brick_collection'].bricks_ordering.home %}
{% if brick.GetVisibleHome %}
{% if aTilesRendering[brick.GetId] is defined %}
{{ aTilesRendering[brick.GetId]|raw }}

4
datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
View File

@@ -195,7 +195,7 @@
{{ 'Page:Home'|dict_s }}
</a>
</li>
{% for brick in app['combodo.portal.instance.conf'].bricks_ordering.navigation_menu %}
{% for brick in app['brick_collection'].bricks_ordering.navigation_menu %}
{% if brick.GetActive and brick.GetVisibleNavigationMenu and brick.GetRouteName is not null %}
<li class="brick_menu_item {% if oBrick is defined and brick.id == oBrick.id %}active{% endif %}" data-brick-id="{{ brick.GetId }}">
<a href="{{ app.url_generator.generate(brick.GetRouteName, {sBrickId: brick.GetId}) }}{% if app['combodo.portal.instance.routes'][brick.GetRouteName]['hash'] is defined %}#{{ app['combodo.portal.instance.routes'][brick.GetRouteName]['hash'] }}{% endif %}" {% if app['combodo.portal.instance.routes'][brick.GetRouteName]['navigation_menu_attr'] is defined %}{% for key, value in app['combodo.portal.instance.routes'][brick.GetRouteName]['navigation_menu_attr'] %} {{ key }}="{{ value }}"{% endfor %}{% endif %} {% if brick.GetModal %}data-toggle="modal" data-target="#modal-for-all"{% endif %}>
@@ -272,7 +272,7 @@
{{ 'Page:Home'|dict_s }}
</a>
</li>
{% for brick in app['combodo.portal.instance.conf'].bricks_ordering.navigation_menu %}
{% for brick in app['brick_collection'].bricks_ordering.navigation_menu %}
{% if brick.GetActive and brick.GetVisibleNavigationMenu and brick.GetRouteName is not null %}
<li class="brick_menu_item {% if oBrick is defined and brick.id == oBrick.id %}active{% endif %}" data-brick-id="{{ brick.GetId }}">
<a href="{{ app.url_generator.generate(brick.GetRouteName, {sBrickId: brick.GetId}) }}{% if app['combodo.portal.instance.routes'][brick.GetRouteName]['hash'] is defined %}#{{ app['combodo.portal.instance.routes'][brick.GetRouteName]['hash'] }}{% endif %}" {% if app['combodo.portal.instance.routes'][brick.GetRouteName]['navigation_menu_attr'] is defined %}{% for key, value in app['combodo.portal.instance.routes'][brick.GetRouteName]['navigation_menu_attr'] %} {{ key }}="{{ value }}"{% endfor %}{% endif %} {% if brick.GetModal %}data-toggle="modal" data-target="#modal-for-all"{% endif %}>