From 50bb90c9482971423414c8455c6bfcf92917d0d6 Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Mon, 22 Feb 2016 17:56:35 +0100 Subject: [PATCH 1/4] Inizio homepage; refactor image usate --- private/lib/gui/GUIHandler.php | 9 ++++++ {oth/img/minoImg => public/images}/fb.png | Bin .../minoImg => public/images}/fb_round.png | Bin {oth/img/minoImg => public/images}/google.png | Bin .../minoImg => public/images}/linkedin.png | Bin .../images}/linkedin_round.png | Bin .../minoImg => public/images}/logo_uff.png | Bin .../img/minoImg => public/images}/twitter.png | Bin .../images}/twitter_round.png | Bin .../img/minoImg => public/images}/youtube.png | Bin .../images}/youtube_round.png | Bin public/index.php | 29 ++++++++++++++++-- 12 files changed, 36 insertions(+), 2 deletions(-) rename {oth/img/minoImg => public/images}/fb.png (100%) rename {oth/img/minoImg => public/images}/fb_round.png (100%) rename {oth/img/minoImg => public/images}/google.png (100%) rename {oth/img/minoImg => public/images}/linkedin.png (100%) rename {oth/img/minoImg => public/images}/linkedin_round.png (100%) rename {oth/img/minoImg => public/images}/logo_uff.png (100%) rename {oth/img/minoImg => public/images}/twitter.png (100%) rename {oth/img/minoImg => public/images}/twitter_round.png (100%) rename {oth/img/minoImg => public/images}/youtube.png (100%) rename {oth/img/minoImg => public/images}/youtube_round.png (100%) diff --git a/private/lib/gui/GUIHandler.php b/private/lib/gui/GUIHandler.php index ed73e5c..61031b0 100644 --- a/private/lib/gui/GUIHandler.php +++ b/private/lib/gui/GUIHandler.php @@ -141,6 +141,15 @@ class GUIHandler { public static function addOnLoadJsEvent($script){ self::$onLoadEvents[] = $script; } + + public static function generateHeadPublic(){ + $mesi = array(1=>'Gennaio', 'Febbraio', 'Marzo', 'Aprile', + 'Maggio', 'Giugno', 'Luglio', 'Agosto', + 'Settembre', 'Ottobre', 'Novembre','Dicembre'); + $day = date("d"); + + $head = '
'; + } } ?> \ No newline at end of file diff --git a/oth/img/minoImg/fb.png b/public/images/fb.png similarity index 100% rename from oth/img/minoImg/fb.png rename to public/images/fb.png diff --git a/oth/img/minoImg/fb_round.png b/public/images/fb_round.png similarity index 100% rename from oth/img/minoImg/fb_round.png rename to public/images/fb_round.png diff --git a/oth/img/minoImg/google.png b/public/images/google.png similarity index 100% rename from oth/img/minoImg/google.png rename to public/images/google.png diff --git a/oth/img/minoImg/linkedin.png b/public/images/linkedin.png similarity index 100% rename from oth/img/minoImg/linkedin.png rename to public/images/linkedin.png diff --git a/oth/img/minoImg/linkedin_round.png b/public/images/linkedin_round.png similarity index 100% rename from oth/img/minoImg/linkedin_round.png rename to public/images/linkedin_round.png diff --git a/oth/img/minoImg/logo_uff.png b/public/images/logo_uff.png similarity index 100% rename from oth/img/minoImg/logo_uff.png rename to public/images/logo_uff.png diff --git a/oth/img/minoImg/twitter.png b/public/images/twitter.png similarity index 100% rename from oth/img/minoImg/twitter.png rename to public/images/twitter.png diff --git a/oth/img/minoImg/twitter_round.png b/public/images/twitter_round.png similarity index 100% rename from oth/img/minoImg/twitter_round.png rename to public/images/twitter_round.png diff --git a/oth/img/minoImg/youtube.png b/public/images/youtube.png similarity index 100% rename from oth/img/minoImg/youtube.png rename to public/images/youtube.png diff --git a/oth/img/minoImg/youtube_round.png b/public/images/youtube_round.png similarity index 100% rename from oth/img/minoImg/youtube_round.png rename to public/images/youtube_round.png diff --git a/public/index.php b/public/index.php index 0c1cdb9..afcdea7 100644 --- a/public/index.php +++ b/public/index.php @@ -10,10 +10,35 @@ try { AnalyticsHelper::logPageImpression(); GUIHandler::generateHtmlHeaders(); - echo "OK"; +// echo "OK"; +// var_dump(date("n")); + $mesi = array(1=>'Gennaio', 'Febbraio', 'Marzo', 'Aprile', + 'Maggio', 'Giugno', 'Luglio', 'Agosto', + 'Settembre', 'Ottobre', 'Novembre','Dicembre'); + $day = date("d"); } catch (Exception $ex){ echo $ex->getMessage(); } -?> \ No newline at end of file +?> +
+
+
+
- Aggiornato alle
+
LOGIN | REGISTER
+
+ + + + + +
+
+
+ +
+
+
+
+
\ No newline at end of file From 60fd15aa105b956b2eea0e5c9676bd131e8cb7e3 Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Tue, 23 Feb 2016 17:38:52 +0100 Subject: [PATCH 2/4] Aggiunto metodo al guihnadler per stampare head e menu; Iniziata la parte realtiva all'ansa --- .../lib/dao/mediaModels/DaoMediaHandler.php | 3 +- private/lib/dao/models/NotiziaModel.php | 2 +- private/lib/gui/GUIHandler.php | 68 +++++++++++++++++- private/lib/gui/html.inclusion.php | 14 +++- {oth/img/minoImg => public/images}/ads.png | Bin public/index.php | 46 +++++++----- public/style/public.css | 35 +++++++++ 7 files changed, 148 insertions(+), 20 deletions(-) rename {oth/img/minoImg => public/images}/ads.png (100%) create mode 100644 public/style/public.css 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").'
+
LOGIN | REGISTER
+
+ + + + + +
+
+
+
+ +
+
+
+ + */ + $head = '
+
+
'.$day." ".$mesi[date("n")]." ".date("Y").' - Aggiornato alle '.date("H:i").'
+
LOGIN | REGISTER
+
+ + + + + +
+
+
+
+ +
+
+
+
'; + 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 .= '
'.strtoupper($data["label"]).'
'; + } + else{ + $html .= '
'.strtoupper($data["label"]).'
'; + } + } + } + + + $menu = '
HOME
'.$html. + '
TUTTE LE SEZIONI
+
+
'; + 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
-
LOGIN | REGISTER
-
- - - - - -
-
-
- -
-
+ +
+
+ +
+
+ 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 From 3fad17b79e903240da07a1fd9c15f0cc8310a7eb Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Wed, 24 Feb 2016 13:13:06 +0100 Subject: [PATCH 3/4] finita parte ansa; inizio styling blocco delle categorie --- .../{youtube_round.png => google_round.png} | Bin {oth/img/minoImg => public/images}/icon.png | Bin .../minoImg => public/images}/title_small.png | Bin public/index.php | 12 ++++++++ public/style/public.css | 29 ++++++++++++++++-- 5 files changed, 39 insertions(+), 2 deletions(-) rename public/images/{youtube_round.png => google_round.png} (100%) rename {oth/img/minoImg => public/images}/icon.png (100%) rename {oth/img/minoImg => public/images}/title_small.png (100%) diff --git a/public/images/youtube_round.png b/public/images/google_round.png similarity index 100% rename from public/images/youtube_round.png rename to public/images/google_round.png diff --git a/oth/img/minoImg/icon.png b/public/images/icon.png similarity index 100% rename from oth/img/minoImg/icon.png rename to public/images/icon.png diff --git a/oth/img/minoImg/title_small.png b/public/images/title_small.png similarity index 100% rename from oth/img/minoImg/title_small.png rename to public/images/title_small.png diff --git a/public/index.php b/public/index.php index 17d4098..61d9636 100644 --- a/public/index.php +++ b/public/index.php @@ -51,8 +51,20 @@ catch (Exception $ex){
testo;?>
+
+ + + + +
+
+
+
Politica
+
+
+
\ No newline at end of file diff --git a/public/style/public.css b/public/style/public.css index 2a66446..53a7f2d 100644 --- a/public/style/public.css +++ b/public/style/public.css @@ -28,8 +28,33 @@ .rightBarNews{width:500px;margin-top:23px;border:solid #d6d6d6 1px;border-left:0px;border-right:0px;} +.ansaContainer{margin-bottom:25px; border:none;} .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 +.ansaImage{display:inline-block;margin:15px 7px;width:150px;overflow:hidden;text-align:center;} +.ansaNews{margin-top:2px;width:330px;} + +.socialBarAnsa{margin-top:3px;border:solid #d6d6d6 1px;border-left:0px;border-right:0px;border-top:0px;} +.socialBarAnsa > a{margin-right:3px;display:inline-block;} +.socialBarAnsa > a > div{display:inline-block;width:22px;height:22px;background-repeat:no-repeat;background-position:center;} + +.categoryNews{width:500px;} +.categoryBar{height:22px;} +.categoryTag{ + display: inline-block; + text-align: center; + color:white; + font-weight:bold; + font-size:20px; + background-color: #339cd5; + vertical-align: middle; + height: 22px; + width: 100px; + margin: 0px;} +.categoryLine{height: 3px; + display: inline-block; + background-color: #339cd5; + margin-top: 10px; + width: 390px; + margin-left: -5px;} \ No newline at end of file From 7398f2613a5a00c5a1ee1132db1517c1c4e180f4 Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Thu, 25 Feb 2016 18:06:06 +0100 Subject: [PATCH 4/4] =?UTF-8?q?Blocco=20di=20cronaca=20politica=20e=20spor?= =?UTF-8?q?t;=20Cambiati=20i=20Model=20Category=20in=20stringhe=20(prima?= =?UTF-8?q?=20erano=20int)perch=C3=A8=20dopo=20il=20dump=20me=20li=20sono?= =?UTF-8?q?=20ritrovati=20stringhe=20e=20non=20me=20li=20trovava=20come=20?= =?UTF-8?q?int;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- private/lib/dao/models/NotiziaModel.php | 12 ++--- public/index.php | 71 +++++++++++++++++++++++-- public/style/public.css | 18 +++++-- 3 files changed, 88 insertions(+), 13 deletions(-) diff --git a/private/lib/dao/models/NotiziaModel.php b/private/lib/dao/models/NotiziaModel.php index 0e7ef2a..ea6dd79 100644 --- a/private/lib/dao/models/NotiziaModel.php +++ b/private/lib/dao/models/NotiziaModel.php @@ -27,12 +27,12 @@ class NotiziaModel extends HasMediaModel{ self::STATUS_REJECTED=>array("label"=>"Respinta") ); - const CATEGORY_POLITICA = 1; - const CATEGORY_CRONACA = 2; - const CATEGORY_SPORT = 3; - const CATEGORY_CULTURA = 4; - const CATEGORY_GOSSIP = 5; - const CATEGORY_ANIMALI = 6; + const CATEGORY_POLITICA = "1"; + const CATEGORY_CRONACA = "2"; + const CATEGORY_SPORT = "3"; + const CATEGORY_CULTURA = "4"; + const CATEGORY_GOSSIP = "5"; + const CATEGORY_ANIMALI = "6"; public static $NOTIZIE_CATEGORY = array( self::CATEGORY_POLITICA=>array("label"=>"Politica","mainMenu"=>true), diff --git a/public/index.php b/public/index.php index 61d9636..dad9f9b 100644 --- a/public/index.php +++ b/public/index.php @@ -23,8 +23,25 @@ try { 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!!!!"; + + $politicaNews = GlobalVariables::get("dao")->query("NotiziaModel", + array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_POLITICA))), + array("sort"=>array("about.data"=>-1),"limit"=>3) + ); + + $cronacaNews = GlobalVariables::get("dao")->query("NotiziaModel", + array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_CRONACA))), + array("sort"=>array("about.data"=>-1),"limit"=>3) + ); + + $sportNews = GlobalVariables::get("dao")->query("NotiziaModel", + array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_SPORT))), + array("sort"=>array("about.data"=>-1),"limit"=>2) + ); + +// var_dump($politicaNews); + if(sizeof($politicaNews)<=0){ + echo "non trovateee!!!!"; } } catch (Exception $ex){ @@ -61,10 +78,56 @@ catch (Exception $ex){
-
Politica
+
POLITICA
+ +
+
renderMedia();?>
+ +
titolo;?>
+
sottotitolo;?>
+
Continua
 +
+ +
+ +
+
+
CRONACA
+
+
+ +
+
renderMedia();?>
+ +
titolo;?>
+
sottotitolo;?>
+
+
Continua
 + +
+ +
+
+
SPORT
+
+
+ +
+
renderMedia();?>
+ +
titolo;?>
+
sottotitolo;?>
+
Continua
 +
+
- \ No newline at end of file diff --git a/public/style/public.css b/public/style/public.css index 53a7f2d..d552d5a 100644 --- a/public/style/public.css +++ b/public/style/public.css @@ -1,4 +1,5 @@ @CHARSET "UTF-8"; +a{text-decoration:none;} /* TOP HEAD BAR (GUIHandler)*/ .upperBar{position:relative; border:solid #d6d6d6 1px; border-left:0px;border-right:0px;height:30px;font-size:12px;} @@ -39,7 +40,7 @@ .socialBarAnsa > a{margin-right:3px;display:inline-block;} .socialBarAnsa > a > div{display:inline-block;width:22px;height:22px;background-repeat:no-repeat;background-position:center;} -.categoryNews{width:500px;} +.categoryNews{width:500px;height:284px;margin-bottom:29px;position:relative;} .categoryBar{height:22px;} .categoryTag{ display: inline-block; @@ -51,10 +52,21 @@ vertical-align: middle; height: 22px; width: 100px; - margin: 0px;} + margin: 0px; +} + +.categoryTag > span{margin-top: 2px;} + .categoryLine{height: 3px; display: inline-block; background-color: #339cd5; margin-top: 10px; width: 390px; - margin-left: -5px;} \ No newline at end of file + margin-left: -5px; + } + +.newsSummary{width:145px;margin:10px 3px;display:inline-block;vertical-align:top;height:262px;} +.newsMainMedia{width:140px;height:100px;overflow:hidden;margin-bottom:25px;text-align:center;} +.newsTitle{font-weight:bold;margin-bottom:20px;} +.newsSubTitle{margin-bottom:10px;} +.continue{vertical-align:bottom;position:absolute;bottom:0;}