Work/fdn2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

Browse Source
This commit is contained in:
Riccardo Di Dato
2016-04-04 13:37:27 +02:00
parent 9bbae5cc23 96b0fb4eec
commit bc4bae618a
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/index.php
+1 -1
View File
@@ -67,7 +67,7 @@ try {
$ristorantiNews = GlobalVariables::get("dao")->query("NotiziaModel",
array('$and'=>array(array("status"=>NotiziaModel::STATUS_ACCEPTED),array("category"=>NotiziaModel::CATEGORY_RISTORANTI),array('_id'=>array('$nin'=>$ansaIds)))),
array("sort"=>array("about.data"=>-1),"limit"=>4)
array("sort"=>array("about.data"=>-1),"limit"=>3)
);
if (sizeof($ristorantiNews)>0){
$ristorantiNews = array_map(function($ele){$ele->testo = strip_tags($ele->testo);$ele->sottotitolo = strip_tags($ele->sottotitolo); return $ele; }, $ristorantiNews);
public/searchResults.php
+2
View File
@@ -116,6 +116,7 @@ try {
<div id ="page_first" class="page">
Inizio
</div>
<div class="page noSelection">...</div>
<script type="text/javascript">
$(document).ready(function(){
$("#page_first").click(function(){
@@ -176,6 +177,7 @@ try {
if($page+2<$numPages){
?>
<div class="page noSelection">...</div>
<div id ="page_last" class="page">
Ultima
</div>
public/style/public.css
+4 -5
View File
@@ -194,9 +194,7 @@ display: inline-block;
.categoryNews{width:100%;/* height:285px;*/ margin-bottom:29px;position:relative;}
.categoryBar{height:27px;}
.categoryTag{
padding-top:5px;
display: inline-block;
text-align: center;
color: white;
font-size: 20px;
background-color: #339cd5;
@@ -207,6 +205,7 @@ display: inline-block;
position: relative;
font-family:"Bebas Neue";
padding-top:5px;
padding-left:5px;
}
@@ -269,12 +268,12 @@ display: inline-block;
margin-bottom:10px;
/* max-height: 100px; */
}
.culturaMainMedia > img{max-height: 100px;}
.culturaMainMedia > img{max-height: 200px;}
.culturaMainMedia.mediaContent > iframe{min-height:150px;max-height:180px;}
.culturaTitle{text-align: left;font-size: 12px;font-weight:bold;}
.ristorantiBlock .ristorantiLink > a, .culturaNews .culturaLink > a{color:#3498d4;font-size:13px;}
.middleBanner{height:142px; width:190px;}
.middleBanner > img{max-height:100px;max-width:220px;}
.middleBanner img{height:100%;width:100%;}
.ristorantiCol{margin-top:10px;text-align:center;}
.ristorantiTitle{margin-top:10px;font-size:12px;}
@@ -300,7 +299,7 @@ display: inline-block;
.meteo div span{font-weight:bold;}
.middleRightBanner{width:190px;overflow: hidden;height: 142px;margin: 5px 0;}
.middleRightBanner > img{max-width:220px; max-heigth:200px;}
.middleRightBanner img{width:100%; heigth:100%;}
.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;}