fixed bug in perc bar order

django_projects/metrics/dashboard/views.py

@@ -83,9 +83,9 @@ def heatmap(request):
 			item.hover += '<div style="height: 4px;"></div>'
 			item.hover += '<div style="background-color:' + item_advanced.heat_perc() +'; height: 15px; width:' + str(advanced) + '; padding-left: 2px;">' + str(advanced) + '</div>'
 			item.hover += '<div style="height: 3px;"></div>'
-			item.hover += '<div style="background-color:' + item_intermediate.heat_perc() +'; height: 15px; width:' + str(beginner) + '; padding-left: 2px;">' + str(beginner) + '</div>'
+			item.hover += '<div style="background-color:' + item_intermediate.heat_perc() +'; height: 15px; width:' + str(intermediate) + '; padding-left: 2px;">' + str(intermediate) + '</div>'
 			item.hover += '<div style="height: 3px;"></div>'
-			item.hover += '<div style="background-color:' + item_beginner.heat_perc() +'; height: 15px; width:' + str(intermediate) + '; padding-left: 2px;">' + str(intermediate) + '</div>'						
+			item.hover += '<div style="background-color:' + item_beginner.heat_perc() +'; height: 15px; width:' + str(beginner) + '; padding-left: 2px;">' + str(beginner) + '</div>'						
 			item.hover += '</div>'
 			item.hover += '<div style="height: 0px; clear: both;"></div>'
 		else:
@@ -99,8 +99,6 @@ def heatmap(request):
 			item.hover += '</div>' 						
 			item.hover += '<div style="height: 0px; clear: both;"></div>'
 		
-		
-		
 		if data == 'freq':
 			item.stat = item.clicks_per_user
 			show_perc = False

django_templates/heatmap.html

@@ -7,7 +7,7 @@
 
 {% block filters %}
 	<ul>
-		<li><a href='heatmap?s={{ skill }}' class="button left {% if show_perc %}active{% endif %}">Used by x% of users</a></li>
+		<li><a href='heatmap?s={{ skill }}' class="button left {% if show_perc %}active{% endif %}">Percent used by</a></li>
 		<li><a href='?d=freq&s={{ skill }}' class="button right {% if not show_perc %}active{% endif %}">Clicks per user</a></li>
 	</ul>