Work/fdn2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

Browse Source
This commit is contained in:
Riccardo Di Dato
2016-03-22 17:46:31 +01:00
parent 1b0a3912d1 98e6a3cda5
commit 2f1df003c0
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
private/lib/gui/GUIHandler.php
+1 -1
View File
@@ -189,7 +189,7 @@ class GUIHandler {
<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?>
<!-- <div id="topLeftBan"><script type="text/javascript">$(document).ready(function () {bannerRoll('topLeftBan');});</script></div> -->
</div>
<div class="logo"><img src="images/logo_uff.png"></div>
<div class="logo"><a href="http://ifattidinapoli.com/index.php"><img src="images/logo_uff.png"></a></div>
<div class="rightBanner topBanner mediaContent">
<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?>
</div>
public/articolo.php
+5 -4
View File
@@ -275,7 +275,7 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
});
<?php if($articolo->hasProperty("sondaggio") && !is_null($articolo->sondaggio)){
$colori=array('#7cb5ec', '#434348', '#90ed7d', '#f7a35c', '#8085e9', '#f15c80', '#e4d354', '#2b908f', '#f45b5b', '#91e8e1');?>
$colori=array('#434348', '#90ed7d', '#f7a35c', '#8085e9', '#f15c80', '#e4d354', '#2b908f', '#f45b5b', '#91e8e1','#7cb5ec');?>
$("#sondaggioGraph").highcharts({
chart:{type:'bar'},
title:{text:'<?php echo trim(html_entity_decode($articolo->sondaggio->titolo)); ?>'},
@@ -283,10 +283,11 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
categories:[<?php $i =0; foreach($articolo->sondaggio->voci as $voce){
echo ($i++==0?"":", ")."\"".trim($voce->nome)."\"";
}
?>]
?>],
},
yAxis:{
title:{text:"Numero Voti"}
title:{text:"Numero Voti"},
tickInterval:1
},
legend: {
@@ -318,4 +319,4 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
});
</script>
<?php GUIHandler::generateGoogleAnalyticsScripts();?>
<?php GUIHandler::generateGoogleAnalyticsScripts();?>