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

Customer portal : Fixed home tiles disposition algo

Browse Source 
SVN:trunk[4067]
This commit is contained in:
Guillaume Lajarige
2016-05-12 10:19:30 +00:00
parent 9d8a2cb7bb
commit 6540c547a4
2 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
datamodels/2.x/itop-portal-base/portal/src/views/home/layout.html.twig
View File

@@ -24,20 +24,13 @@
<div class="container-fluid" id="main-wrapper"> <div class="container-fluid" id="main-wrapper">
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-9 col-md-10 col-sm-offset-3 col-md-offset-2"> <div class="col-xs-12 col-sm-9 col-md-10 col-sm-offset-3 col-md-offset-2">
{% for i in 1..(app['combodo.portal.instance.conf'].bricks_total_width / 12)|round(0, 'ceil') %} <section class="row tiles_wrapper">
<section class="row row-eq-height-sm tiles_wrapper" {% if loop.first %}id="top_tiles_row"{% endif %}> {% for brick in app['combodo.portal.instance.conf'].bricks %}
{% set iCurrentRowWidth = 0 %}
{% for brick in app['combodo.portal.instance.conf'].bricks|slice(iCurrentTileIndex, app['combodo.portal.instance.conf'].bricks|length) if iCurrentRowWidth < 12 %}
{% if brick.GetVisibleHome %} {% if brick.GetVisibleHome %}
{% set iCurrentRowWidth = iCurrentRowWidth + brick.GetWidth %}
{% set iCurrentTileIndex = iCurrentTileIndex + 1 %}
{% if iCurrentRowWidth <= 12 %}
{% include '' ~ brick.GetTileTemplatePath with {brick: brick} %} {% include '' ~ brick.GetTileTemplatePath with {brick: brick} %}
{% endif %} {% endif %}
{% endif %}
{% endfor %} {% endfor %}
</section> </section>
{% endfor %}
</div> </div>
</div> </div>
</div> </div>

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

@@ -115,7 +115,7 @@ footer{
/******************/ /******************/
/* Global classes */ /* Global classes */
/******************/ /******************/
@media (min-width: 768px) { /*@media (min-width: 768px) {
.row-eq-height-sm { .row-eq-height-sm {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
@@ -138,7 +138,7 @@ footer{
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
} }
} }*/
.vertical-center { .vertical-center {
/* Make it a flex container */ /* Make it a flex container */
@@ -295,12 +295,6 @@ label{
.home #main-wrapper{ .home #main-wrapper{
padding-top: 15px; padding-top: 15px;
} }
@media (min-width: 768px) {
.home .tiles_wrapper{
/*margin-bottom: 18px;*/
margin-bottom: 35px;
}
}
.home .tile{ .home .tile{
margin-bottom: 8px; margin-bottom: 8px;
@@ -332,7 +326,7 @@ label{
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.home .tile{ .home .tile{
margin-bottom: 0px; margin-bottom: 30px;
min-height: 10em; min-height: 10em;
} }
.home .tile .tile_decoration{ .home .tile .tile_decoration{