From a040d99473896e74e85b3a5593124423fcb662e5 Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Wed, 23 Mar 2016 15:47:48 +0100 Subject: [PATCH 1/2] eliminazione height e max-height da tutti i contenitori delle notizie (attenzione mantenuti per i contenitori di immagini,banner e iframe) --- public/style/public.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/style/public.css b/public/style/public.css index 4806e3f..e5d1885 100644 --- a/public/style/public.css +++ b/public/style/public.css @@ -164,7 +164,7 @@ display: inline-block; */ .ansaContainer{margin-bottom:25px; border:none;height:420px} -.ansa{border:solid #d6d6d6 1px;border-left:0px;border-right:0px;border-top:0px;height:180px;} +.ansa{border:solid #d6d6d6 1px;border-left:0px;border-right:0px;border-top:0px;/* height:180px; */} .ansa> div {display:inline-block;vertical-align:top;} .mediaContent{overflow:hidden;} @@ -211,8 +211,8 @@ display: inline-block; } -.news{position:relative;margin:10px 3px;display:inline-block;vertical-align:top;max-height:270px;/* height:270px; */} -.newsSport{position:relative;margin:10px 3px;display:inline-block;vertical-align:top;max-height:262px;/* height:262px; */} +.news{position:relative;margin:10px 3px;display:inline-block;vertical-align:top;/* max-height:270px; *//* height:270px; */} +.newsSport{position:relative;margin:10px 3px;display:inline-block;vertical-align:top;/* max-height:262px; *//* height:262px; */} .newsSummary{width:200px;display:inline-block;cursor:pointer;} .newsMainMedia{width:200px;height:112px;overflow:hidden;margin-bottom:25px;text-align:center;} .newsTitle{font-weight:bold;margin-bottom:5px;text-align:left;font-size:14px;} @@ -220,8 +220,8 @@ display: inline-block; .continue{vertical-align:bottom;position:absolute;bottom:0; left:0;} .newsContainer > .newsSport:first-child{border:0px;border-right:solid #d6d6d6 1px;} -.sportSummary{width:300px;margin:10px 3px;display:inline-block;vertical-align:top;/* height:262px; */max-height:262px;cursor:pointer;} - +.sportSummary{width:300px;margin:10px 3px;display:inline-block;vertical-align:top;/* height:262px; *//* max-height:262px; */cursor:pointer;} +.sportSummary .newsMainMedia{width:300px;height:168px;} .middleBarNews{ display:inline-block; width:150px; @@ -245,7 +245,7 @@ display: inline-block; border-top:0px; border-right:0px; border-left:0px; - max-height:165px; + /* max-height:165px; */ cursor:pointer; } .ristorantiBlock:last-child{border-bottom:none;} @@ -286,14 +286,14 @@ display: inline-block; .middleRightBanner{width: 220px;overflow: hidden;height: 165px;margin: 5px 0;} .middleRightBanner > img{max-width:220px; max-heigth:200px;} -.reader > .lastContainer, .lastContainer{max-height:120px;padding:5px;;border-bottom:dotted #C1B4B4 1px;cursor:pointer;} +.reader > .lastContainer, .lastContainer{/* max-height:120px */;padding:5px;;border-bottom:dotted #C1B4B4 1px;cursor:pointer;} .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;} +.gossipContainer{/* max-height:165px */;margin-top:5px;margin-bottom:5px;border-bottom:dotted #C1B4B4 1px;cursor:pointer;overflow:hidden;} .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;} From b81820271d25a394b295b625a043edbed0536846 Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Wed, 23 Mar 2016 18:15:44 +0100 Subject: [PATCH 2/2] incluse le librerie js e css di photoswipe; --- private/lib/gui/html.inclusion.php | 7 +- public/articolo.php | 19 +- public/images/default-skin.png | Bin 0 -> 547 bytes public/images/default-skin.svg | 1 + public/images/preloader.gif | Bin 0 -> 866 bytes public/js/photoswipe-ui-default.min.js | 4 + public/js/photoswipe.min.js | 4 + public/style/default-skin.css | 483 +++++++++++++++++++++++++ public/style/photoswipe.css | 177 +++++++++ public/style/public.css | 2 +- 10 files changed, 688 insertions(+), 9 deletions(-) create mode 100644 public/images/default-skin.png create mode 100644 public/images/default-skin.svg create mode 100644 public/images/preloader.gif create mode 100644 public/js/photoswipe-ui-default.min.js create mode 100644 public/js/photoswipe.min.js create mode 100644 public/style/default-skin.css create mode 100644 public/style/photoswipe.css diff --git a/private/lib/gui/html.inclusion.php b/private/lib/gui/html.inclusion.php index d177ccd..3a34676 100644 --- a/private/lib/gui/html.inclusion.php +++ b/private/lib/gui/html.inclusion.php @@ -18,6 +18,9 @@ GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "icons.css"); GUIHandler::addStylesheet(GUIHandler::STYLESHEET_ADMIN, "jquery.datetimepicker.css"); +GUIHandler::addStylesheet(GUIHandler::STYLESHEET_USER, "photoswipe.css"); + +GUIHandler::addStylesheet(GUIHandler::STYLESHEET_USER, "default-skin.css"); GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_GENERAL, "jquery-1.12.0.min.js"); @@ -41,6 +44,9 @@ GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_GENERAL,"highcharts.js"); GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_GENERAL,"functions.js?rev=".time()); +GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_USER,"photoswipe.min.js"); + +GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_USER,"photoswipe-ui-default.min.js"); /* ____ _ _ ____ _ ___ ____ | _ \| | | | __ )| | |_ _/ ___| @@ -51,5 +57,4 @@ GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_GENERAL,"functions.js?rev=". */ GUIHandler::addStylesheet(GUIHandler::STYLESHEET_USER, "public.css?rev=".time()); - ?> \ No newline at end of file diff --git a/public/articolo.php b/public/articolo.php index eb4a477..22a219b 100644 --- a/public/articolo.php +++ b/public/articolo.php @@ -108,12 +108,11 @@ try { GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders)); ?>
- - +
- $additionalHeaders));
-
renderMedia(array("size"=>MediaRenderer::SIZE_MINI,"clickable"=>true));?>
- +
+ + renderMedia(array("size"=>MediaRenderer::SIZE_MINI,"clickable"=>true));?> +
+
@@ -303,7 +308,8 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders)); ?>] }] }); - + // $("form#commentoForm").on('submit',function (){ // $.ajax({ // type:'post', @@ -317,7 +323,6 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders)); // } // }); // }); - }); diff --git a/public/images/default-skin.png b/public/images/default-skin.png new file mode 100644 index 0000000000000000000000000000000000000000..441c502c92fe66534f0ca07b1c639a02a9bfc6e8 GIT binary patch literal 547 zcmeAS@N?(olHy`uVBq!ia0y~yVB`R@BRE)q> zQzfg0DSPAQu=lA~!r-)AA>V`{IQs4>>BL>kcznXerunmlb=| zWcaU3Q?y({((8tixy!m+M^9AR2>U-@Q#M^%Df}$cvwDB2dmHkM!%s>?s`+*-6<*}b zC6z+Z%-w!koN!M(Vgcu$6vxWM6}@S%6da&YLklvPaws&rO=B5mA?S z`j1}n(OIHjt=UhUKbx#56!7%kz(zdN0WP!2crw3%tChOzkj<5G+?=I5j*G7gE&0rKP}eS!-QI|4{hH?XQwM7IF@KnRe$O+> z{=5>|J!M5a2Uz(xeHVC@V0bikU*S=2|Myc@XUBb*dfe5v>F)hwKM!2~;rOU>BEr>~ b?RAXa8OAS+-W5gzBcH+3)z4*}Q$iB}<;L|a literal 0 HcmV?d00001 diff --git a/public/images/default-skin.svg b/public/images/default-skin.svg new file mode 100644 index 0000000..9d5f0c6 --- /dev/null +++ b/public/images/default-skin.svg @@ -0,0 +1 @@ +default-skin 2 \ No newline at end of file diff --git a/public/images/preloader.gif b/public/images/preloader.gif new file mode 100644 index 0000000000000000000000000000000000000000..b8faa697c58d574f24ad1295e75f0d5acd807f5e GIT binary patch literal 866 zcmZ?wbhEHb6k!ly_{_o3-rjC+Zyz2WuCA_r{`~pv+qci3KR-V||NsC04A_9;e{Mh5 zkYH!W09PYD17=2`8pWS1tn3UN3_2k7AY&a^f(1@`u68|kN2-anp`@o>g(G~Sn2@7~ zvrSHk@6L6-E23jkXGSe|W^B}1J~?m6<|idKEbm%BM24;D%DJ|N(R9l~ccCqU+Q+*; zC5ucI@C@nw^6r%q!X8EjMg}1uWMJ_VIH~Eq&?0*FO2eyaf-K)^A9_r?%$cNpd!OXZ zyRr-qE*mIV$)11C{jT81{0Z$J3}?0<))hG5vRG1UYSC0B7N*W^r@l5FO#1Xzrq1ia zTn=1T^n$F=WVos(%8F{m-NFaLj%Zde9n3X=TfxLgq!o+{fL6S;ys9S2hHAxJg$Kcb zXjU{H=yiZw!NyFa73aYLC2&=Zkpb0;Sb+zV6Va?_KDagjZUqMmkyf;Ve38j;h?fCw1rHl`E7%!y z;3-1&&(c.onTap(),d=!0);if(d){a.stopPropagation&&a.stopPropagation(),r=!0;var h=b.features.isOldAndroid?600:30;s=setTimeout(function(){r=!1},h)}},B=function(){return!a.likelyTouchDevice||q.mouseUsed||screen.width>q.fitControlsWidth},C=function(a,c,d){b[(d?"add":"remove")+"Class"](a,"pswp__"+c)},D=function(){var a=1===q.getNumItemsFn();a!==p&&(C(d,"ui--one-slide",a),p=a)},E=function(){C(i,"share-modal--hidden",y)},F=function(){return y=!y,y?(b.removeClass(i,"pswp__share-modal--fade-in"),setTimeout(function(){y&&E()},300)):(E(),setTimeout(function(){y||b.addClass(i,"pswp__share-modal--fade-in")},30)),y||H(),!1},G=function(b){b=b||window.event;var c=b.target||b.srcElement;return a.shout("shareLinkClick",b,c),c.href?c.hasAttribute("download")?!0:(window.open(c.href,"pswp_share","scrollbars=yes,resizable=yes,toolbar=no,location=yes,width=550,height=420,top=100,left="+(window.screen?Math.round(screen.width/2-275):100)),y||F(),!1):!1},H=function(){for(var a,b,c,d,e,f="",g=0;g