- Fixed incorect fallback in date formaters

- User avatar on profile page rounded corners are more visible

misago/template/templatetags/django2jinja.py

@@ -5,7 +5,7 @@ from coffin.template import Library
 from django.utils.dateformat import format, time_format
 from django.utils.timezone import is_aware, utc
 from django.utils.translation import pgettext, ungettext, ugettext as _
-from misago.utils import formats
+from misago.utils import slugify, formats
 
 register = Library()
 
@@ -63,7 +63,7 @@ def reldate(date, arg=""):
         return _("%(day)s, %(hour)s") % {'day': format(date, 'l'), 'hour': time_format(date, formats['TIME_FORMAT'])}
     
     # Fallback to custom      
-    return date(date, arg)
+    return date[1](date, arg)
 
 
 @register.filter(name='reltimesince')
@@ -87,7 +87,7 @@ def reltimesince(date, arg=""):
             if minutes > 0:
                 return ungettext(
                     "Hour and %(minutes)s ago",
-                    "%(hours)s  and %(minutes)s ago",
+                    "%(hours)s hours and %(minutes)s ago",
                 hours) % {'hours': hours, 'minutes': ungettext(
                         "%(minutes)s minute",
                         "%(minutes)s minutes",
@@ -98,5 +98,10 @@ def reltimesince(date, arg=""):
                     "%(hours)s hours ago",
                 hours) % {'hours': hours}
         
-    # Fallback to reldate  
-    return reldate(date, arg)
+    # Fallback to reldate
+    return reldate[1](date, arg)
+
+
+@register.filter(name="slugify")
+def slugify_tag(format_string):
+    return slugify(format_string)

misago/utils/templatetags/misago_filters.py

@@ -1,14 +0,0 @@
-from django import template
-from django.template.defaultfilters import stringfilter
-from misago.utils import slugify
-
-register = template.Library()
-
-@register.filter(name="slugify", is_safe=True)
-@stringfilter
-def slugify_tag(format_string):
-    return slugify(format_string)
-
-@register.filter(name='klass', is_safe=True)
-def class_tag(obj):
-    return obj.__class__.__name__

static/sora/css/sora.css

@@ -927,7 +927,7 @@ th.table-sort.sort-desc a:hover{border-bottom:3px solid #eca09a;padding-bottom:5
 .nav-tabs .tab-search.tab-search-no-tabs{position:relative;bottom:12px;}
 .nav-tabs button{padding-left:7px;padding-right:3px;}
 .clickable{cursor:pointer;}
-.profile-header{overflow:auto;border-bottom:none;margin-bottom:30px;}.profile-header .avatar-height{overflow:auto;}.profile-header .avatar-height .avatar{margin-right:24px;width:125px;height:125px;}
+.profile-header{overflow:auto;border-bottom:none;margin-bottom:30px;}.profile-header .avatar-height{overflow:auto;}.profile-header .avatar-height .avatar{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;margin-right:24px;width:125px;height:125px;}
 .profile-header .avatar-height h1{font-size:300%;}
 .profile-header .avatar-height .lead{color:#555555;}.profile-header .avatar-height .lead .muted{color:#959595;}
 .profile-header .nav-tabs{margin-top:-22px;margin-bottom:0px;padding-left:142px;}

static/sora/css/sora/utilities.less

@@ -13,6 +13,7 @@
     overflow: auto;
   
     .avatar {
+      .border-radius(6px);
       margin-right: 24px;
       width: 125px;
       height: 125px;