diff --git a/htmlgenerators.py b/htmlgenerators.py index fa10d76..a7b4f67 100644 --- a/htmlgenerators.py +++ b/htmlgenerators.py @@ -70,12 +70,12 @@ def getTimeDesc(timestamp,short=False): if difference < 10: return "just now" if difference < 60: return str(difference) + " seconds ago" difference = int(difference/60) - if difference < 60: return str(difference) + " minutes ago" + if difference < 60: return str(difference) + " minutes ago" if difference>1 else str(difference) + " minute ago" difference = int(difference/60) - if difference < 24: return str(difference) + " hours ago" + if difference < 24: return str(difference) + " hours ago" if difference>1 else str(difference) + " hour ago" difference = int(difference/24) if difference < 7: return tim.strftime("%A") - if difference < 31: return str(difference) + " days ago" + if difference < 31: return str(difference) + " days ago" if difference>1 else str(difference) + " day ago" #if difference < 300 and tim.year == now.year: return tim.strftime("%B") #if difference < 300: return tim.strftime("%B %Y") diff --git a/website/maloja.css b/website/maloja.css index 35a51d1..ed584f9 100644 --- a/website/maloja.css +++ b/website/maloja.css @@ -305,7 +305,7 @@ table.tiles_3x3 td { */ - +@media (min-width: 1600px) { div.sidelist { position:absolute; right:0px; @@ -315,3 +315,4 @@ div.sidelist { background-color:#444447; padding-left:30px; } +}