Merge branch 'release/v9.58'

rowers/templates/list_workouts.html

@@ -280,7 +280,7 @@
     <div class="site-announcement-box">
       <div class="site-announcement">
         <em>{{ a.created }}:</em>
-        {{ a.announcement|urlize }}
+        {{ a.announcement|urlshorten:20 }}
       </div>
     </div>
   </li>

rowers/templatetags/rowerfilters.py

@@ -31,8 +31,20 @@ from rowers.opaque import encoder
 
 import arrow
 
+from django.utils.safestring import mark_safe
+from django.utils.html import urlize as urlize_impl
+from django.template.defaultfilters import stringfilter
+
 from six import string_types
 
+@register.filter(is_safe=True, needs_autoescape=True)
+@stringfilter
+def urlshorten(value, limit,autoescape=None):
+    return mark_safe(
+        urlize_impl(
+            value, trim_url_limit=int(limit),
+            nofollow=True, autoescape=autoescape).replace('<a', '<a target="_blank"'))
+
 @register.filter
 def nogoals(user):
     targets = TrainingTarget.objects.filter(rowers=user.rower,

static/css/rowsandall2.css

@@ -238,6 +238,8 @@ th.rotate > div > span {
 
 .site-announcement-box {
     padding: .2em .5em .2em 0em;
+    width: 100%;
+    max-width: 200px;
 }
 
 

static/css/styles2.css

@@ -659,7 +659,8 @@
         "ad     content content"
         "ad  footer footer"
         "ad  footer footer"
-   }
+  }
+
 
   nav ul {
       flex-direction: row;

templates/newbase.html

@@ -315,7 +315,7 @@
         <div class="site-announcement-box">
           <div class="site-announcement-white">
             <em>{{ a.created }}:</em>
-            {{ a.announcement|urlize }}
+            {{ a.announcement|urlshorten:20 }}
           </div>
         </div>