composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1370 ManageBrick charts tile : integrate CSS in portal.scss

Browse Source 
SVN:trunk[5693]
This commit is contained in:
Pierre Goiffon
2018-04-18 15:16:04 +00:00
parent 182e644a33
commit 5d6ec4ce56
3 changed files with 390 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/tile-chart.html.twig
View File

@@ -1,7 +1,7 @@
{# itop-portal-dashlet-basic/tile.html.twig #} {# itop-portal-dashlet-basic/tile.html.twig #}
{# Image brick tile layout #} {# Image brick tile layout #}
<div class="col-xs-12 col-sm-{{ oBrick.GetWidth }}"> <div class="col-xs-12 col-sm-{{ oBrick.GetWidth }} tile-chart">
{% block pTileWrapper %} {% block pTileWrapper %}
<a href="{{ app.url_generator.generate('p_manage_brick', {'sBrickId': sBrickId, 'sDisplayType': oBrick.GetDisplayType}) }}{% if app['combodo.portal.instance.routes'][oBrick.GetRouteName]['hash'] is defined %}#{{ app['combodo.portal.instance.routes'][oBrick.GetRouteName]['hash'] }}{% endif %}" <a href="{{ app.url_generator.generate('p_manage_brick', {'sBrickId': sBrickId, 'sDisplayType': oBrick.GetDisplayType}) }}{% if app['combodo.portal.instance.routes'][oBrick.GetRouteName]['hash'] is defined %}#{{ app['combodo.portal.instance.routes'][oBrick.GetRouteName]['hash'] }}{% endif %}"
{% if app['combodo.portal.instance.routes'][oBrick.GetRouteName]['navigation_menu_attr'] is defined %}{% for key, value in app['combodo.portal.instance.routes'][oBrick.GetRouteName]['navigation_menu_attr'] %} {{ key }}="{{ value }}"{% endfor %}{% endif %} {% if app['combodo.portal.instance.routes'][oBrick.GetRouteName]['navigation_menu_attr'] is defined %}{% for key, value in app['combodo.portal.instance.routes'][oBrick.GetRouteName]['navigation_menu_attr'] %} {{ key }}="{{ value }}"{% endfor %}{% endif %}
@@ -9,9 +9,8 @@
class="tile{# vertical-center#}" class="tile{# vertical-center#}"
id="brick-{{ oBrick.GetId }}" id="brick-{{ oBrick.GetId }}"
data-brick-id="{{ oBrick.GetId }}"> data-brick-id="{{ oBrick.GetId }}">
<div style="background-color:#fff;padding:0.25em;"> <div>
<div class="tile_title"><span <div class="tile_title"><span class="icon fa fa-{{ oBrick.GetDisplayType }}"></span> {{ oBrick.GetTitle()|dict_s }}
class="icon fa fa-{{ oBrick.GetDisplayType }}"></span> {{ oBrick.GetTitle()|dict_s }}
({{ iCount }})</span> </div> ({{ iCount }})</span> </div>
{% include 'itop-portal-base/portal/src/views/bricks/manage/mode-' ~ oBrick.GetDisplayType ~ '.html.twig' with {'oBrick': oBrick, 'aColumns': aColumns, 'aNames': aNames, 'aUrls': aUrls, 'aDisplayValues': aDisplayValues} %} {% include 'itop-portal-base/portal/src/views/bricks/manage/mode-' ~ oBrick.GetDisplayType ~ '.html.twig' with {'oBrick': oBrick, 'aColumns': aColumns, 'aNames': aNames, 'aUrls': aUrls, 'aDisplayValues': aDisplayValues} %}
</div> </div>

792
datamodels/2.x/itop-portal-base/portal/web/css/portal.css
View File

File diff suppressed because it is too large Load Diff

4
datamodels/2.x/itop-portal-base/portal/web/css/portal.scss
View File

@@ -413,6 +413,10 @@ footer{
text-align: right; text-align: right;
} }
.home div.tile-chart > a > div {
padding: 0.25em;
}
@media (min-width: 768px) { @media (min-width: 768px) {
.home .tile{ .home .tile{