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
+4 -4
View File
@@ -22,7 +22,7 @@ try{
$category = intval($category);
$notizie = GlobalVariables::get("dao")->query("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>$category))),
array("status"=>NotiziaModel::STATUS_ACCEPTED,"category"=>$category,"about.data"=>array('$lte'=>new MongoDate())),
array("sort"=>array("about.data"=>-1),"limit"=>10)
);
@@ -46,7 +46,7 @@ try{
?>
<div style="width:1000px;margin-left:auto;margin-right:auto;">
<?php
GUIHandler::generateHeadPublic();
GUIHandler::generateHeadPublic($category);
GUIHandler::generateMenu();?>
<div class="categorySummaryContainer">
<?php $i=0;
@@ -73,11 +73,11 @@ try{
?>
</div>
<div class="summaryRightBar">
<?php GUIHandler::generateRightBannerBlock();?>
<?php GUIHandler::generateRightBannerBlock($category);?>
</div>
<?php
GUIHandler::generateFooter();
GUIHandler::generateGoogleAnalyticsScripts();
?>
</div>
</div>