From 460efea09176251a5a930bfda676ace2d3670970 Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Tue, 1 Mar 2016 14:12:00 +0100 Subject: [PATCH] La funzione di DaoMediaHandler::addMedia ora setta il MainMedia alla news quando aggiungo il media se la news non ha un MainMedia; addMultimedia dopo aver aggiunto un media ora rimanda alla homeNotizia; homePage in progress --- .../lib/dao/mediaModels/DaoMediaHandler.php | 9 +- private/lib/gui/GUIHandler.php | 1 + public/admin/addMultimedia.php | 2 +- public/index.php | 88 +++++++++++-------- public/style/public.css | 48 +++++----- 5 files changed, 85 insertions(+), 63 deletions(-) diff --git a/private/lib/dao/mediaModels/DaoMediaHandler.php b/private/lib/dao/mediaModels/DaoMediaHandler.php index 826f27b..4af990f 100644 --- a/private/lib/dao/mediaModels/DaoMediaHandler.php +++ b/private/lib/dao/mediaModels/DaoMediaHandler.php @@ -45,7 +45,10 @@ class DaoMediaHandler implements MediaHandlerInterface{ if(!in_array($media->getReference(), $mediaArr)){ $mediaArr[] = $media->getReference(); $model->setMediaReferences($mediaArr); - + + if(!DaoMediaHandler::hasMainMedia($model)){ + $model->setMainMedia($media); + } GlobalVariables::get("dao")->save($model); self::setOwnerToMedia($model, $media); @@ -58,7 +61,7 @@ class DaoMediaHandler implements MediaHandlerInterface{ } /** - * Elimina l'id del media dal model e deleta il media. + * Elimina l'id del media dal model e deleta il media. Se il media รจ il main media della news lo unsetta * * @param HasMediaInterface $model * @param MediaInterface $media @@ -141,7 +144,7 @@ class DaoMediaHandler implements MediaHandlerInterface{ } /** - * Prende in ingresso un HasMediaInterface ritorna un array di un elemento array("mainMedia"=>"&value"); + * Prende in ingresso un HasMediaInterface ritorna un MediaModel o null; * * @param HasMediaInterface $model * @return MediaModel diff --git a/private/lib/gui/GUIHandler.php b/private/lib/gui/GUIHandler.php index 1cddda0..129bacf 100644 --- a/private/lib/gui/GUIHandler.php +++ b/private/lib/gui/GUIHandler.php @@ -47,6 +47,7 @@ class GUIHandler { echo "\n"; echo ""; echo ''."\n"; + echo ''."\n"; foreach (self::$STYLESHEETS[self::STYLESHEET_GENERAL] as $file){ echo '$notiziaId)); + GUIHandler::redirectPost("admin/homeMultimedia.php",array("id"=>$notiziaId)); } } diff --git a/public/index.php b/public/index.php index 1b77d15..97eadd1 100644 --- a/public/index.php +++ b/public/index.php @@ -40,9 +40,9 @@ try { ); // var_dump($politicaNews); - if(sizeof($politicaNews)<=0){ - echo "non trovateee!!!!"; - } +// if(sizeof($politicaNews)<=0){ +// echo "non trovateee!!!!"; +// } } catch (Exception $ex){ echo $ex->getMessage(); @@ -52,9 +52,10 @@ catch (Exception $ex){ -
+
- + testo) > 53) ? substr($ansa->testo,0,50).'...' : $ansa->testo;?>
@@ -65,7 +66,7 @@ catch (Exception $ex){
titolo;?>
sottotitolo;?>
-
testo;?>
+
@@ -81,19 +82,22 @@ catch (Exception $ex){
POLITICA
-
-
-
renderMedia();?>
- -
titolo;?>
-
sottotitolo;?>
-
-
Continua
 + sottotitolo) > 53) ? substr($politica->sottotitolo,0,50).'...' : $politica->sottotitolo;?> +
+
+
renderMedia();?>
+ +
titolo;?>
+
+
+
Continua
 +
+
-
@@ -101,19 +105,22 @@ catch (Exception $ex){
CRONACA
-
-
-
renderMedia();?>
- -
titolo;?>
-
sottotitolo;?>
-
-
Continua
 -
+ sottotitolo) > 53) ? substr($cronaca->sottotitolo,0,50).'...' : $cronaca->sottotitolo;?> +
+
+
renderMedia();?>
+ +
titolo;?>
+
+
+
Continua
 +
+
@@ -121,19 +128,22 @@ catch (Exception $ex){
SPORT
-
-
-
renderMedia();?>
- -
titolo;?>
-
sottotitolo;?>
-
-
Continua
 + sottotitolo) > 53) ? substr($sport->sottotitolo,0,50).'...' : $sport->sottotitolo;?> +
+
+
renderMedia();?>
+ +
titolo;?>
+
+
+
Continua
 +
+
-
diff --git a/public/style/public.css b/public/style/public.css index 055254f..3f421ee 100644 --- a/public/style/public.css +++ b/public/style/public.css @@ -1,5 +1,6 @@ @CHARSET "UTF-8"; a{text-decoration:none;} +body{font-family:lato, arial;} /* TOP HEAD BAR (GUIHandler)*/ .upperBar{position:relative; border:solid #d6d6d6 1px; border-left:0px;border-right:0px;height:30px;font-size:12px;} @@ -28,17 +29,17 @@ a{text-decoration:none;} .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;display:inline-block;} +.leftBarNews{width:500px;margin-top:23px;border:solid #d6d6d6 1px;border-left:2px;border-right:2px;display:inline-block;} .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 7px;width:150px;overflow:hidden;text-align:center;} .ansaNews{margin-top:2px;width:330px;} -.ansaTitolo{font-weight:bold;font-size:23px;} -.ansaSottotitolo{font-size:17px;color:#767676;} -.ansaTesto{color:#5aa8d8;font-weight:bold;} -.ansaTesto > p{margin:0px;} +.ansaTitolo{font-weight:bold;font-size:23px;text-align:justify;} +.ansaSottotitolo{font-size:17px;color:#767676;text-align:justify;} +.ansaTesto{color:#5aa8d8;font-weight:bold;text-align:justify;} +.ansaTesto > p{margin:0px;text-align:justify;} .socialBarAnsa{margin-top:3px;border:solid #d6d6d6 1px;border-left:0px;border-right:0px;border-top:0px;} @@ -50,41 +51,48 @@ a{text-decoration:none;} .categoryTag{ display: inline-block; text-align: center; - color:white; - font-weight:bold; - font-size:20px; + color: white; + font-weight: bold; + font-size: 20px; background-color: #339cd5; vertical-align: middle; - height: 22px; - width: 100px; + min-width: 130px; margin: 0px; + z-index: 2; + position: relative; } -.categoryTag > span{margin-top: 2px;} -.categoryLine{height: 3px; - display: inline-block; +.categoryLine{ + height: 3px; background-color: #339cd5; margin-top: 10px; - width: 390px; - margin-left: -5px; + margin-left: 0; + top: -23px; + position: relative; + z-index: 1; + } -.newsContainer{position:relative;margin:10px 3px;display:inline-block;vertical-align:top;height:262px;} +.news{position:relative;margin:10px 3px;display:inline-block;vertical-align:top;height:270px;} +.newsSport{position:relative;margin:10px 3px;display:inline-block;vertical-align:top;height:262px;} .newsSummary{width:145px;display:inline-block;} .newsMainMedia{width:140px;height:100px;overflow:hidden;margin-bottom:25px;text-align:center;} -.newsTitle{font-weight:bold;margin-bottom:20px;} -.newsSubTitle{margin-bottom:10px;} +.newsTitle{font-weight:bold;margin-bottom:20px;text-align:left;font-size:14px;} +.newsSubTitle{margin-bottom:10px;text-align:left;font-size:13px;} .continue{vertical-align:bottom;position:absolute;bottom:0; left:0;} + +.newsContainer > .newsSport:first-child{border:0px;border-right:solid #d6d6d6 1px;} .sportSummary{width:230px;margin:10px 3px;display:inline-block;vertical-align:top;height:262px;} .middleBarNews{ display:inline-block; width:220px; - border:solid #d1d1d1 1px; - background-color:#f4f4f4; +/* border:solid #d1d1d1 1px; */ + background-color:#f4f4f4; border-top:0px; border-bottom:0px; vertical-align:top; text-align:center; + height:1000px; }