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

This commit is contained in:
Lorenzo Giacomelli
2016-05-04 18:11:01 +02:00
11 changed files with 87 additions and 25 deletions
+8 -8
View File
@@ -169,7 +169,7 @@ class GUIHandler {
self::$onLoadEvents[] = $script;
}
public static function generateHeadPublic(){
public static function generateHeadPublic($bannerCategory = BannerModel::GENERAL_CATEGORY){
$mesi = array(1=>'Gennaio', 'Febbraio', 'Marzo', 'Aprile',
'Maggio', 'Giugno', 'Luglio', 'Agosto',
'Settembre', 'Ottobre', 'Novembre','Dicembre');
@@ -218,12 +218,12 @@ class GUIHandler {
</div>
<div class="middleBar">
<div class="leftBanner topBanner mediaContent">
<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?>
<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD,$bannerCategory);?>
<!-- <div id="topLeftBan"><script type="text/javascript">$(document).ready(function () {bannerRoll('topLeftBan');});</script></div> -->
</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);?>
<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD,$bannerCategory);?>
</div>
</div>
<div class="bottomBar" style="height:40px;width:1000px;"></div>
@@ -372,7 +372,7 @@ class GUIHandler {
}
public static function generateRightBannerBlock(){
public static function generateRightBannerBlock($category = BannerModel::GENERAL_CATEGORY){
$stats = GlobalVariables::get("dao")->aggregate("StatisticModel",PipelineHelper::getMostViewedOfLastDays(strtotime("-7 days"),5));
$idArray = array_map(function ($ele){ return new MongoId($ele["_id"]["notizia"]);}, $stats);
@@ -405,8 +405,8 @@ class GUIHandler {
?>
<div id="rightBarContainer" class="">
<div class="rotoBanner">
<div class="bannerContainer mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY);?></div>
<div class="bannerContainer mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY);?></div>
<div class="bannerContainer mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY,$category);?></div>
<div class="bannerContainer mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY,$category);?></div>
</div>
<div class="reader">
<div class="lastNews">
@@ -429,8 +429,8 @@ class GUIHandler {
</div>
</div>
<div class="rotoBanner not">
<div class="bannerContainer mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY);?></div>
<div class="bannerContainer mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY);?></div>
<div class="bannerContainer mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY,$category);?></div>
<div class="bannerContainer mediaContent"><?php BannerHelper::printBanner(BannerModel::POSITION_BODY,$category);?></div>
</div>
</div>
<?php