Skip to content
Extraits de code Groupes Projets
Valider 2b91d10d rédigé par sgiehl's avatar sgiehl
Parcourir les fichiers

refs #3011 fixes bug with menu items flipping around on hover

git-svn-id: http://dev.piwik.org/svn/trunk@6229 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent b57f798a
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -419,12 +419,14 @@
var dashboardMenuList = $('#Dashboard > ul');
dashboardMenuList.empty();
if (dashboards.length > 1) {
$('#Dashboard > ul').show();
dashboardMenuList.show();
for (var i=0; i<dashboards.length; i++) {
dashboardMenuList.append('<li id="Dashboard_embeddedIndex_'+dashboards[i].iddashboard+'" class="dashboardMenuItem '+(dashboards[i].iddashboard == dashboardId ? 'sfHover' : '')+'"><a dashboardId="'+dashboards[i].iddashboard+'">'+dashboards[i].name+'</a></li>');
dashboardMenuList.append('<li id="Dashboard_embeddedIndex_'+dashboards[i].iddashboard+'" class="dashboardMenuItem"><a dashboardId="'+dashboards[i].iddashboard+'">'+dashboards[i].name+'</a></li>');
}
$('li a', dashboardMenuList).each(function(){$(this).css({width:$(this).width()+30, paddingLeft:0, paddingRight:0});});
$('#Dashboard_embeddedIndex_'+dashboardId).addClass('sfHover');
} else {
$('#Dashboard > ul').hide();
dashboardMenuList.hide();
}
$('.dashboardMenuItem').on('click', function() {
......
......@@ -34,21 +34,26 @@
}
#Dashboard > ul > li {
padding: 0 10px;
float: left;
text-align: center;
}
#Dashboard a {
color: #444;
text-decoration: none;
font-weight: normal;
display: block;
}
#Dashboard > ul > li:hover , #Dashboard > ul > li:hover a,
#Dashboard > ul > li.sfHover, #Dashboard > ul > li.sfHover a {
color: #e87500;
}
#Dashboard > ul > li.sfHover, #Dashboard > ul > li.sfHover a {
font-weight: bold;
}
</style>
{/literal}
</head>
......
......@@ -17,6 +17,8 @@ $(document).ready( function() {
$('#dashboardSettings').after($('#Dashboard'));
$('#Dashboard').css({left: $('#periodString')[0].offsetWidth+$('#dashboardSettings')[0].offsetWidth+43, top: 13});
$('#dashboardWidgetsArea').css({marginTop: 30});
$('#Dashboard > ul li a').each(function(){$(this).css({width:$(this).width()+30, paddingLeft:0, paddingRight:0});});
$('#Dashboard_embeddedIndex_{/literal}{$dashboardId}{literal}').addClass('sfHover');
}
$('#dashboardSettings').on('click', function(){
......
......@@ -3,7 +3,7 @@
{include file="CoreHome/templates/period_select.tpl"}
<div id="Dashboard"><ul>
{foreach from=$dashboards item=dashboard}
<li class="dashboardMenuItem {if $dashboardId == $dashboard.iddashboard}sfHover{/if}"><a href="javascript:$('#dashboardWidgetsArea').dashboard('loadDashboard', {$dashboard.iddashboard});">{$dashboard.name}</a></li>
<li class="dashboardMenuItem" id="Dashboard_embeddedIndex_{$dashboard.iddashboard}"><a href="javascript:$('#dashboardWidgetsArea').dashboard('loadDashboard', {$dashboard.iddashboard});">{$dashboard.name}</a></li>
{/foreach}
</ul></div>
{include file="Dashboard/templates/index.tpl"}
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter