diff --git a/private/lib/dao/mediaModels/DaoMediaHandler.php b/private/lib/dao/mediaModels/DaoMediaHandler.php
index fd9973f..826f27b 100644
--- a/private/lib/dao/mediaModels/DaoMediaHandler.php
+++ b/private/lib/dao/mediaModels/DaoMediaHandler.php
@@ -150,7 +150,8 @@ class DaoMediaHandler implements MediaHandlerInterface{
$mainMedia = $model->getMainMediaReference();
$tmp = null;
if(!is_null($mainMedia)){
- $tmp = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$mainMedia));
+ $mainMediaId = new MongoId($mainMedia);
+ $tmp = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$mainMediaId));
}
// var_dump($tmp);
return $tmp;
diff --git a/private/lib/dao/models/NotiziaModel.php b/private/lib/dao/models/NotiziaModel.php
index e024a63..0e7ef2a 100644
--- a/private/lib/dao/models/NotiziaModel.php
+++ b/private/lib/dao/models/NotiziaModel.php
@@ -38,7 +38,7 @@ class NotiziaModel extends HasMediaModel{
self::CATEGORY_POLITICA=>array("label"=>"Politica","mainMenu"=>true),
self::CATEGORY_CRONACA=>array("label"=>"Cronaca","mainMenu"=>true),
self::CATEGORY_SPORT=>array("label"=>"Sport","mainMenu"=>true),
- self::CATEGORY_CULTURA=>array("label"=>"Cultura","mainMenu"=>true),
+ self::CATEGORY_CULTURA=>array("label"=>"Cultura&Spettacolo","mainMenu"=>true),
self::CATEGORY_GOSSIP=>array("label"=>"Gossip","mainMenu"=>true),
self::CATEGORY_ANIMALI=>array("label"=>"Mondo Animale","mainMenu"=>false)
);
diff --git a/private/lib/gui/GUIHandler.php b/private/lib/gui/GUIHandler.php
index 61031b0..39dc675 100644
--- a/private/lib/gui/GUIHandler.php
+++ b/private/lib/gui/GUIHandler.php
@@ -148,7 +148,73 @@ class GUIHandler {
'Settembre', 'Ottobre', 'Novembre','Dicembre');
$day = date("d");
- $head = '
';
+ /*
+ *
+
+
'.$day." ".$mesi[date("n")]." ".date("Y").' - Aggiornato alle <'.date("H:i").'
+
+
+
+
+
+
+ */
+ $head = '
+
+
'.$day." ".$mesi[date("n")]." ".date("Y").' - Aggiornato alle '.date("H:i").'
+
+
+
+
+
+
';
+ echo $head;
+ }
+
+ public static function generateMenu($pageSelected = "home"){
+ $html = "";
+ $homeSelected = "";
+ if(strcasecmp($pageSelected, "home")==0){
+ $homeSelected ="selected";
+ }
+
+ foreach (NotiziaModel::$NOTIZIE_CATEGORY as $category=>$data){
+ if($data["mainMenu"]){
+ if(strcmp($data["label"],$pageSelected)==0){
+ $html .= '';
+ }
+ else{
+ $html .= '';
+ }
+ }
+ }
+
+
+ $menu = '';
+ echo $menu;
}
}
diff --git a/private/lib/gui/html.inclusion.php b/private/lib/gui/html.inclusion.php
index 76f7c11..c844416 100644
--- a/private/lib/gui/html.inclusion.php
+++ b/private/lib/gui/html.inclusion.php
@@ -40,4 +40,16 @@ GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"datetimepicker-master
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"highcharts.js");
GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_ADMIN,"functions.js");
-?>
+
+/*
+ ____ _ _ ____ _ ___ ____
+| _ \| | | | __ )| | |_ _/ ___|
+| |_) | | | | _ \| | | | |
+| __/| |_| | |_) | |___ | | |___
+|_| \___/|____/|_____|___\____|
+
+ */
+
+GUIHandler::addStylesheet(GUIHandler::STYLESHEET_USER, "public.css?rev=".time());
+
+?>
\ No newline at end of file
diff --git a/oth/img/minoImg/ads.png b/public/images/ads.png
similarity index 100%
rename from oth/img/minoImg/ads.png
rename to public/images/ads.png
diff --git a/public/index.php b/public/index.php
index afcdea7..17d4098 100644
--- a/public/index.php
+++ b/public/index.php
@@ -17,28 +17,42 @@ try {
'Maggio', 'Giugno', 'Luglio', 'Agosto',
'Settembre', 'Ottobre', 'Novembre','Dicembre');
$day = date("d");
+ $pageSelected="home";
+
+ $ansaNews = GlobalVariables::get("dao")->query("NotiziaModel",
+ array('$and'=>array(array("isAnsa"=>true),array("status"=>NotiziaModel::STATUS_ACCEPTED))),
+ array("sort"=>array("about.data"=>-1),"limit"=>2)
+ );
+ if(sizeof($ansaNews)<=0){
+ echo "pene!!!!";
+ }
}
catch (Exception $ex){
echo $ex->getMessage();
}
?>
-
-
-
- Aggiornato alle
-
-
-
-
-
-
-
+
+
+
+
+
+
+ renderMedia();?>
+
+
+
+
titolo;?>
+
sottotitolo;?>
+
testo;?>
+
+
+
+
\ No newline at end of file
diff --git a/public/style/public.css b/public/style/public.css
new file mode 100644
index 0000000..2a66446
--- /dev/null
+++ b/public/style/public.css
@@ -0,0 +1,35 @@
+@CHARSET "UTF-8";
+
+/* TOP HEAD BAR (GUIHandler)*/
+.upperBar{position:relative; border:solid #d6d6d6 1px; border-left:0px;border-right:0px;height:30px;font-size:12px;}
+.dateBar{text-align:center;margin:7px 0px;color:#999999;font-weight:bold;}
+
+.loginReg{position:absolute;right:0;top:7px;margin-right:210px;color:#3397d3}
+.loginReg > a{text-decoration:none;color:#3397d3;}
+
+.socialBar{position:absolute;right:50px;top:3px;}
+.socialBar > a{margin-right:3px;display:inline-block;}
+.socialBar > a > div{display:inline-block;width:22px;height:22px;}
+
+.middleBar{position:relative;height:138px;border:solid #d6d6d6 1px;border-top:0px;border-left:0px;border-right:0px;}
+.leftBanner{position:absolute;top:45px;left:10px;}
+.logo{display:inline-block;width:50%;text-align:center;margin:12px 250px;}
+.rightBanner{position:absolute;top:45px;right:10px;}
+
+
+
+.menuBar{background-color:#139be5;font-weight:bold;height:45px;margin-top:2px;color:white;overflow:hidden;}
+.menuTab{display:inline-block;padding:15px 17px 15px 16px;font-size:12px;}
+.menuTab.selected{display:inline-block;padding:15px 17px 15px 16px;font-size:12px;background-color:#0069a3;}
+.menuTab > a {text-decoration:none;color:white;}
+
+.searchBar{display:inline-block;margin:10px;}
+.searchBar > input{border-radius:6px;border:none;padding:5px;}
+
+
+.rightBarNews{width:500px;margin-top:23px;border:solid #d6d6d6 1px;border-left:0px;border-right:0px;}
+.ansa{border:solid #d6d6d6 1px;border-left:0px;border-right:0px;border-top:0px;}
+.ansa> div {display:inline-block;vertical-align:top;}
+
+.ansaImage{display:inline-block;margin:15px;width:150px;overflow:hidden;text-align:center;}
+.ansaNews{margin-top:2px;}
\ No newline at end of file