From e2fb0d6d89f8f97f30b3593fbf7b8a9024953889 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Sun, 25 Sep 2022 18:46:44 +0200 Subject: [PATCH] #3 - Fatto, da testare --- app/os/webserver-entrypoint | 3 + app/private/lib/BannerHelper.php | 4 +- app/private/lib/gui/GUIHandler.php | 12 ++-- app/private/lib/gui/GUIHandlerMobile.php | 9 +-- app/public/admin/editBanner.php | 14 ++++- app/public/admin/index.php | 2 + app/public/admin/newBanner.php | 75 +----------------------- app/public/mobile/archivio.php | 5 +- app/public/mobile/articolo.php | 5 +- app/public/mobile/categorySummary.php | 7 ++- app/public/mobile/index.php | 5 +- app/public/mobile/searchResults.php | 5 +- app/public/style/public.css | 13 ++-- cicd/environments/common/webserver.env | 1 + 14 files changed, 54 insertions(+), 106 deletions(-) diff --git a/app/os/webserver-entrypoint b/app/os/webserver-entrypoint index c5102ca..4c04ede 100644 --- a/app/os/webserver-entrypoint +++ b/app/os/webserver-entrypoint @@ -12,5 +12,8 @@ mkdir -p "/tmp/${DDNINJA_AUTHOR}/${DDNINJA_BUILDNAME}" chown -R www-data:www-data "/tmp/${DDNINJA_AUTHOR}/${DDNINJA_BUILDNAME}" chown -R www-data:www-data /var/log/${DDNINJA_AUTHOR} +mkdir -p "/home/${DDNINJA_AUTHOR}/storage/${DDNINJA_BUILDNAME}/media/" +chown -R www-data:www-data "/home/${DDNINJA_AUTHOR}/storage/${DDNINJA_BUILDNAME}/media/" + asdphp-entrypoint & wait exit $? diff --git a/app/private/lib/BannerHelper.php b/app/private/lib/BannerHelper.php index 09bb54f..722de25 100644 --- a/app/private/lib/BannerHelper.php +++ b/app/private/lib/BannerHelper.php @@ -19,9 +19,7 @@ class BannerHelper { } public static function printBanner($position = BannerModel::POSITION_HEAD){ - $category = BannerModel::GENERAL_CATEGORY; - - $cur = self::getPlaceholderId(); + $cur = self::getPlaceholderId(); if (!array_key_exists($position, self::$positions)) { self::$positions[$position] = []; diff --git a/app/private/lib/gui/GUIHandler.php b/app/private/lib/gui/GUIHandler.php index 17c453f..bffa836 100644 --- a/app/private/lib/gui/GUIHandler.php +++ b/app/private/lib/gui/GUIHandler.php @@ -19,9 +19,7 @@ class GUIHandler { private static $onLoadEvents = array(); public static function generateHtmlHeaders(array $data = array(), $admin = false){ - if ($admin) { - ASDSessionHandler::getSessionId(); - } + ASDSessionHandler::getSessionId(); $conf = GlobalVariables::get("config"); $title = $conf->info->projectName; @@ -222,7 +220,10 @@ class GUIHandler { -
+
+ +
Home diff --git a/app/private/lib/gui/GUIHandlerMobile.php b/app/private/lib/gui/GUIHandlerMobile.php index 12cedb4..d36177d 100644 --- a/app/private/lib/gui/GUIHandlerMobile.php +++ b/app/private/lib/gui/GUIHandlerMobile.php @@ -343,12 +343,6 @@ class GUIHandlerMobile { public static function generateFooter(){ if (!self::hasSeenCookieMessage()){ ?> - - - - - -
-
-
+
;"> category]["label"]);?> diff --git a/app/public/mobile/categorySummary.php b/app/public/mobile/categorySummary.php index 78e1788..d4b8c05 100644 --- a/app/public/mobile/categorySummary.php +++ b/app/public/mobile/categorySummary.php @@ -65,9 +65,10 @@ try{ GUIHandlerMobile::generateHeadPublic(); GUIHandlerMobile::generateMenu();?>
-
-
-
+
+
0){ diff --git a/app/public/mobile/index.php b/app/public/mobile/index.php index 3bb8896..eaa2bee 100644 --- a/app/public/mobile/index.php +++ b/app/public/mobile/index.php @@ -144,8 +144,9 @@ catch (Exception $ex){ ?>
-
-
+
-
-
+
a > div{display:inline-block;width:22px;height:22px;background-repeat:no-repeat;} .middleBar{position:relative;height:138px;border:solid #d6d6d6 1px;border-top:0px;border-left:0px;border-right:0px;} +.banner img{ width: 100%; height: 100%; overflow: hidden; } .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;} .topBanner{width:180px;height:60px;} -.topBanner > *{max-widht:100%;max-height:100%;} +.topBanner > * { max-width:100%; max-height:100%; } +.subheadBanner { width:1000px; height:120px; } +.footerBanner { width:1000px; height:200px; } .menuContainer{position:relative;} @@ -312,23 +315,23 @@ display: inline-block; .meteo div span{font-weight:bold;} .middleRightBanner{width:210px;overflow: hidden;height: 157px;margin: 5px 0;} -.middleRightBanner img{width:100%; heigth:100%;} +.middleRightBanner img{width:100%; height:100%;} .middleRightLongBanner img{height:100%;width:100%;} .middleRightLongBanner{height:314px; width:210px;overflow: hidden;margin: 5px 0;} -.reader > .lastContainer, .lastContainer{/* max-height:120px */;display:block;padding:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;text-decoration:none;color:black;} +.reader > .lastContainer, .lastContainer{ display:block;padding:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;text-decoration:none;color:black;} .reader > .lastContainer:last-child, .lastContainer:last-child {border-bottom: none;} .reader > .lastData, .lastData{font-size:12px;} .reader > .lastTitle, .lastTitle{font-size:12px;font-weight:bold;} .reader > .lastContinua, .lastContinua{text-align:right; font-size:12px;font-weight:bold;padding-bottom:5px;} .reader > .lastContinua a, .lastContinua a{color:#64bff0;} -.gossipContainer{/* max-height:165px */;/* margin-top:5px */;margin-bottom:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;overflow:hidden;text-decoration:none;color:black;} +.gossipContainer{margin-bottom:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;overflow:hidden;text-decoration:none;color:black;} .gossipContainer#gossip_2{border-bottom:none;} .gossipTitle{margin-bottom:5px;font-weight:bold;font-size:20px;} .gossipSubtitle{margin-bottom:5px;color:#64bff0;font-weight:bold;font-size:15px;} -.animaliContainer,.viaggiContainer{/* max-height:165px; *//* margin-top:5px */;display:block;margin-bottom:5px;text-decoration:none;color:black;} +.animaliContainer,.viaggiContainer{display:block;margin-bottom:5px;text-decoration:none;color:black;} .animaliContainer > .culturaMainMedia,.viaggiContainer > .culturaMainMedia{text-align:left;} .animaliTitle,.viaggiTitle{cursor:pointer;margin-bottom:5px;font-weight:bold;font-size:17px;} diff --git a/cicd/environments/common/webserver.env b/cicd/environments/common/webserver.env index d4f7a3a..fb799ef 100644 --- a/cicd/environments/common/webserver.env +++ b/cicd/environments/common/webserver.env @@ -1,2 +1,3 @@ DDNINJA_PROJECTNAME=FDN2 DDNINJA_BUILDNAME=fdn2 +DDNINJA_AUTHOR=ddninja \ No newline at end of file