Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift

Conflicts:
	ietf/doc/templatetags/ietf_filters.py
	ietf/doc/views_charter.py
	ietf/templates/doc/charter/edit_notify.html
	ietf/templates/doc/charter/edit_telechat_date.html
	ietf/templates/doc/document_ballot_content.html
	ietf/templates/doc/document_history.html
	ietf/templates/doc/edit_notify.html
	ietf/templates/doc/edit_telechat_date.html
	ietf/templates/doc/notify.html
	ietf/templates/group/concluded_groups.html
 - Legacy-Id: 8429

Author: larseggert

README

@@ -0,0 +1,25 @@
+This is the "facelift" datatracker branch that uses Twitter Bootstrap for
+the UI.
+
+You need to install a few new django extensions:
+	https://pypi.python.org/pypi/django-widget-tweaks
+	https://pypi.python.org/pypi/django-bootstrap3
+	https://pypi.python.org/pypi/django-typogrify
+
+The meta goal of this effort is: *** NO CHANGES TO THE PYTHON CODE ***
+
+Whenever changes to the python code are made, they can only fix HTML bugs,
+or add comments (tagged with "FACELIFT") about functionality that can be
+removed once the facelift templates become default. Or they need to add
+functionality that is only called from the new facelift templates.
+
+Javascript that is only used on one template goes into that template.
+Javascript that is used by more than one template goes into ietf.js.
+
+CSS that is only used on one template goes into that template.
+CSS that is used by more than one template goes into ietf.css. No CSS in the
+templates or - god forbid - style tags! (And no CSS or HTML styling in
+python code!!)
+
+Templates that use jquery or bootstrap plugins include the css in the pagehead
+block, and the js in the js block.

TODO

@@ -0,0 +1,11 @@
+Major pieces not facelifted: milestone editing, liaison editing, WG workflow customization
+
+Use affix for navigation on active_wgs.html
+
+Figure out why {% if debug %} does not work in the text templates under ietf/templates_facelift/community/public.
+
+Make django generate HTML5 date inputs or use a js-based datepicker.
+
+Deferring ballots does not work. (Seems to be an upstream bug.)
+
+Make tables that are too wide to usefully work on small screens responsive. See http://getbootstrap.com/css/#tables-responsive

ietf/community/templatetags/community_tags.py

@@ -1,5 +1,6 @@
 from django import template
 from django.template.loader import render_to_string
+from django.conf import settings
 
 from ietf.community.models import CommunityList
 from ietf.group.models import Role
@@ -9,7 +10,7 @@
 
 
 class CommunityListNode(template.Node):
-    
+
     def __init__(self, user, var_name):
         self.user = user
         self.var_name = var_name
@@ -57,13 +58,13 @@ def show_field(field, doc):
 
 
 class CommunityListViewNode(template.Node):
-    
+
     def __init__(self, clist):
         self.clist = clist
 
     def render(self, context):
         clist = self.clist.resolve(context)
-        if not clist.cached:
+        if settings.DEBUG or not clist.cached:
             clist.cached = render_to_string('community/raw_view.html',
                                             {'cl': clist,
                                              'dc': clist.get_display_config()})

ietf/doc/templatetags/ballot_icon.py

@@ -87,35 +87,32 @@ def sort_key(t):
     positions = list(doc.active_ballot().active_ad_positions().items())
     positions.sort(key=sort_key)
 
-    edit_position_url = ""
-    if has_role(user, "Area Director"):
-        edit_position_url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=doc.name, ballot_id=ballot.pk))
-
-    title = "IESG positions (click to show more%s)" % (", right-click to edit position" if edit_position_url else "")
-
-    res = ['<a href="%s" data-popup="%s" data-edit="%s" title="%s" class="ballot-icon"><table>' % (
-            urlreverse("doc_ballot", kwargs=dict(name=doc.name, ballot_id=ballot.pk)),
+    res = ['<a href="%s" data-toggle="modal" data-target="#modal-%d" title="IESG positions (click to show more)" class="ballot-icon"><table>' % (
             urlreverse("ietf.doc.views_doc.ballot_popup", kwargs=dict(name=doc.name, ballot_id=ballot.pk)),
-            edit_position_url,
-            title
-            )]
+            ballot.pk)]
 
     res.append("<tr>")
 
     for i, (ad, pos) in enumerate(positions):
         if i > 0 and i % 5 == 0:
-            res.append("</tr>")
-            res.append("<tr>")
+            res.append("</tr><tr>")
 
         c = "position-%s" % (pos.pos.slug if pos else "norecord")
 
         if user_is_person(user, ad):
             c += " my"
 
-        res.append('<td class="%s" />' % c)
+        res.append('<td class="%s"></td>' % c)
+
+    # add sufficient table calls to last row to avoid HTML validation warning
+    while (i + 1) % 5 != 0:
+        res.append('<td class="empty"></td>')
+        i = i + 1
 
-    res.append("</tr>")
-    res.append("</table></a>")
+    res.append("</tr></table></a>")
+    # XXX FACELIFT: Loading via href will go away in bootstrap 4.
+    # See http://getbootstrap.com/javascript/#modals-usage
+    res.append('<div id="modal-%d" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true"><div class="modal-dialog modal-lg"><div class="modal-content"></div></div></div>' % ballot.pk)
 
     return "".join(res)
 
@@ -137,7 +134,8 @@ def ballotposition(doc, user):
 
 
 @register.filter
-def state_age_colored(doc):
+# FACELIFT: added flavor argument for styling
+def state_age_colored(doc, flavor=""):
     if doc.type_id == 'draft':
         if not doc.get_state_slug() in ["active", "rfc"]:
             # Don't show anything for expired/withdrawn/replaced drafts
@@ -156,7 +154,7 @@ def state_age_colored(doc):
         except IndexError:
             state_date = datetime.date(1990,1,1)
         days = (datetime.date.today() - state_date).days
-        # loosely based on 
+        # loosely based on
         # http://trac.tools.ietf.org/group/iesg/trac/wiki/PublishPath
         if iesg_state == "lc":
             goal1 = 30
@@ -180,16 +178,26 @@ def state_age_colored(doc):
             goal1 = 14
             goal2 = 28
         if days > goal2:
-            class_name = "ietf-small ietf-highlight-r"
+            if flavor == "facelift":
+                class_name = "label label-danger"
+            else:
+                class_name = "ietf-small ietf-highlight-r"
         elif days > goal1:
-            class_name = "ietf-small ietf-highlight-y"
+            if flavor == "facelift":
+                class_name = "label label-warning"
+            else:
+                class_name = "ietf-small ietf-highlight-y"
         else:
             class_name = "ietf-small"
         if days > goal1:
             title = ' title="Goal is &lt;%d days"' % (goal1,)
         else:
             title = ''
-        return mark_safe('<span class="%s"%s>(for&nbsp;%d&nbsp;day%s)</span>' % (
-                class_name, title, days, 's' if days != 1 else ''))
+        # It's too bad that this function returns HTML; this makes it hard to
+        # style. For the facelift, I therefore needed to add a new "flavor"
+        # parameter, which is ugly.
+        return mark_safe('<span class="%s"%s>%sfor %d day%s%s</span>' % (
+                class_name, title, '(' if flavor != "facelift" else "", days,
+                's' if days != 1 else '', '(' if flavor != "facelift" else "" ))
     else:
         return ""

ietf/doc/templatetags/ietf_filters.py

@@ -9,7 +9,7 @@
 from ietf.doc.models import ConsensusDocEvent
 from django import template
 from django.utils.html import escape, fix_ampersands
-from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, urlize
+from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, urlize, striptags
 from django.template import resolve_variable
 from django.utils.safestring import mark_safe, SafeData
 from django.utils.html import strip_tags
@@ -48,12 +48,12 @@ def parse_email_list(value):
     u'<a href="mailto:joe@example.org">joe@example.org</a>, <a href="mailto:fred@example.com">fred@example.com</a>'
 
     Parsing a non-string should return the input value, rather than fail:
-    
+
     >>> parse_email_list(['joe@example.org', 'fred@example.com'])
     ['joe@example.org', 'fred@example.com']
-    
+
     Null input values should pass through silently:
-    
+
     >>> parse_email_list('')
     ''
 
@@ -87,7 +87,7 @@ def fix_angle_quotes(value):
     if "<" in value:
         value = re.sub("<([\w\-\.]+@[\w\-\.]+)>", "&lt;\1&gt;", value)
     return value
-    
+
 # there's an "ahref -> a href" in GEN_UTIL
 # but let's wait until we understand what that's for.
 @register.filter(name='make_one_per_line')
@@ -99,7 +99,7 @@ def make_one_per_line(value):
     'a\\nb\\nc'
 
     Pass through non-strings:
-    
+
     >>> make_one_per_line([1, 2])
     [1, 2]
 
@@ -110,7 +110,7 @@ def make_one_per_line(value):
         return re.sub(", ?", "\n", value)
     else:
         return value
-        
+
 @register.filter(name='timesum')
 def timesum(value):
     """
@@ -222,7 +222,7 @@ def rfclink(string):
     URL for that RFC.
     """
     string = str(string);
-    return "http://tools.ietf.org/html/rfc" + string;
+    return "//tools.ietf.org/html/rfc" + string;
 
 @register.filter(name='urlize_ietf_docs', is_safe=True, needs_autoescape=True)
 def urlize_ietf_docs(string, autoescape=None):
@@ -274,7 +274,7 @@ def truncate_ellipsis(text, arg):
         return escape(text[:num-1])+"&hellip;"
     else:
         return escape(text)
-    
+
 @register.filter
 def split(text, splitter=None):
     return text.split(splitter)
@@ -375,7 +375,7 @@ def linebreaks_lf(text):
 @register.filter(name='clean_whitespace')
 def clean_whitespace(text):
     """
-    Map all ASCII control characters (0x00-0x1F) to spaces, and 
+    Map all ASCII control characters (0x00-0x1F) to spaces, and
     remove unnecessary spaces.
     """
     text = re.sub("[\000-\040]+", " ", text)
@@ -384,7 +384,7 @@ def clean_whitespace(text):
 @register.filter(name='unescape')
 def unescape(text):
     """
-    Unescape &nbsp;/&gt;/&lt; 
+    Unescape &nbsp;/&gt;/&lt;
     """
     text = text.replace("&gt;", ">")
     text = text.replace("&lt;", "<")
@@ -423,7 +423,7 @@ def has_role(user, role_names):
 @register.filter
 def stable_dictsort(value, arg):
     """
-    Like dictsort, except it's stable (preserves the order of items 
+    Like dictsort, except it's stable (preserves the order of items
     whose sort key is the same). See also bug report
     http://code.djangoproject.com/ticket/12110
     """
@@ -448,10 +448,10 @@ def format_history_text(text):
     if text.startswith("This was part of a ballot set with:"):
         full = urlize_ietf_docs(full)
 
-    full = mark_safe(keep_spacing(linebreaksbr(urlize(sanitize_html(full)))))
+    full = mark_safe(keep_spacing(linebreaksbr(urlize_html(sanitize_html(full)))))
     snippet = truncatewords_html(full, 25)
     if snippet != full:
-        return mark_safe(u'<div class="snippet">%s<span class="show-all">[show all]</span></div><div style="display:none" class="full">%s</div>' % (snippet, full))
+        return mark_safe(u'<div class="snippet">%s<button class="btn btn-xs btn-default show-all"><span class="fa fa-caret-down"></span></button></div><div class="hidden full">%s</div>' % (snippet, full))
     return full
 
 @register.filter
@@ -512,3 +512,66 @@ def consensus(doc):
     else:
         return "Unknown"
 
+# FACELIFT: The following filters are only used by the facelift UI:
+
+@register.filter
+def pos_to_label(text):
+    """Return a valid Bootstrap3 label type for a ballot position."""
+    return {
+        'Yes':          'success',
+        'No Objection': 'info',
+        'Abstain':      'warning',
+        'Discuss':      'danger',
+        'Block':        'danger',
+        'Recuse':       'default',
+    }.get(str(text), 'blank')
+
+@register.filter
+def capfirst_allcaps(text):
+    from django.template import defaultfilters
+    """Like capfirst, except it doesn't lowercase words in ALL CAPS."""
+    result = text
+    i = False
+    for token in re.split("(\W+)", striptags(text)):
+        if not re.match("^[A-Z]+$", token):
+            if not i:
+                result = result.replace(token, token.capitalize())
+                i = True
+            else:
+                result = result.replace(token, token.lower())
+    return result
+
+@register.filter
+def lower_allcaps(text):
+    from django.template import defaultfilters
+    """Like lower, except it doesn't lowercase words in ALL CAPS."""
+    result = text
+    i = False
+    for token in re.split("(\W+)", striptags(text)):
+        if not re.match("^[A-Z]+$", token):
+            result = result.replace(token, token.lower())
+    return result
+
+# See https://djangosnippets.org/snippets/2072/ and
+# https://stackoverflow.com/questions/9939248/how-to-prevent-django-basic-inlines-from-autoescaping
+@register.filter
+def urlize_html(html, autoescape=False):
+    """
+    Returns urls found in an (X)HTML text node element as urls via Django urlize filter.
+    """
+    try:
+        from BeautifulSoup import BeautifulSoup
+        from django.utils.html import urlize
+    except ImportError:
+        if settings.DEBUG:
+            raise template.TemplateSyntaxError, "Error in urlize_html The Python BeautifulSoup libraries aren't installed."
+        return html
+    else:
+        soup = BeautifulSoup(html)
+
+        textNodes = soup.findAll(text=True)
+        for textNode in textNodes:
+            urlizedText = urlize(textNode, autoescape=autoescape)
+            textNode.replaceWith(BeautifulSoup(urlizedText))
+
+        return str(soup)

ietf/doc/templatetags/wg_menu.py

@@ -43,24 +43,32 @@
     'rai':'RAI'
     }
 
+# FACELIFT: Function is called with "facelift" flavor from the new UI code.
+# The old code (and flavoring) can be remove eventually.
 @register.simple_tag
-def wg_menu():
-    res = cache.get('base_left_wgmenu')
+def wg_menu(flavor=""):
+    res = cache.get('wgmenu' + flavor)
     if res:
         return res
 
     areas = Group.objects.filter(type="area", state="active").order_by('acronym')
-    groups = Group.objects.filter(type="wg", state="active", parent__in=areas).order_by("acronym")
+    wgs = Group.objects.filter(type="wg", state="active", parent__in=areas).order_by("acronym")
+    rgs = Group.objects.filter(type="rg", state="active").order_by("acronym")
 
     for a in areas:
         a.short_area_name = area_short_names.get(a.acronym) or a.name
         if a.short_area_name.endswith(" Area"):
             a.short_area_name = a.short_area_name[:-len(" Area")]
 
-        a.active_groups = [g for g in groups if g.parent_id == a.id]
+        a.active_groups = [g for g in wgs if g.parent_id == a.id]
 
     areas = [a for a in areas if a.active_groups]
 
-    res = render_to_string('base/wg_menu.html', {'areas':areas})
-    cache.set('base_left_wgmenu', res, 30*60)
+    if flavor == "facelift":
+        res = render_to_string('base/menu_wg.html', {'areas':areas, 'rgs':rgs})
+    elif flavor == "modal":
+        res = render_to_string('base/menu_wg_modal.html', {'areas':areas, 'rgs':rgs})
+    else:
+        res = render_to_string('base/wg_menu.html', {'areas':areas, 'rgs':rgs})
+    cache.set('wgmenu' + flavor, res, 30*60)
     return res