Merge facelift-r8510 branch with trunk. The IPR tool still has some non-facelifted parts and ideosyncracies. Fix a couple of minor bugs (including infamous empty licensing choice) in the IPR code, and port the IPR views to use the render shortcut.

 - Legacy-Id: 8896

Author: OleLaursen

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/fields.py

@@ -0,0 +1,88 @@
+import json
+
+from django.utils.html import escape
+from django import forms
+from django.core.urlresolvers import reverse as urlreverse
+
+import debug                            # pyflakes:ignore
+
+from ietf.doc.models import Document, DocAlias
+
+def select2_id_doc_name_json(objs):
+    return json.dumps([{ "id": o.pk, "text": escape(o.name) } for o in objs])
+
+class SearchableDocumentsField(forms.CharField):
+    """Server-based multi-select field for choosing documents using
+    select2.js.
+
+    The field uses a comma-separated list of primary keys in a
+    CharField element as its API with some extra attributes used by
+    the Javascript part."""
+
+    def __init__(self,
+                 max_entries=None, # max number of selected objs
+                 model=Document,
+                 hint_text="Type in name to search for document",
+                 doc_type="draft",
+                 *args, **kwargs):
+        kwargs["max_length"] = 10000
+        self.max_entries = max_entries
+        self.doc_type = doc_type
+        self.model = model
+
+        super(SearchableDocumentsField, self).__init__(*args, **kwargs)
+
+        self.widget.attrs["class"] = "select2-field"
+        self.widget.attrs["data-placeholder"] = hint_text
+        if self.max_entries != None:
+            self.widget.attrs["data-max-entries"] = self.max_entries
+
+    def parse_select2_value(self, value):
+        return [x.strip() for x in value.split(",") if x.strip()]
+
+    def prepare_value(self, value):
+        if not value:
+            value = ""
+        if isinstance(value, basestring):
+            pks = self.parse_select2_value(value)
+            value = self.model.objects.filter(pk__in=pks)
+            filter_args = {}
+            if self.model == DocAlias:
+                filter_args["document__type"] = self.doc_type
+            else:
+                filter_args["type"] = self.doc_type
+            value = value.filter(**filter_args)
+        if isinstance(value, self.model):
+            value = [value]
+
+        self.widget.attrs["data-pre"] = select2_id_doc_name_json(value)
+
+        # doing this in the constructor is difficult because the URL
+        # patterns may not have been fully constructed there yet
+        self.widget.attrs["data-ajax-url"] = urlreverse("ajax_select2_search_docs", kwargs={
+            "doc_type": self.doc_type,
+            "model_name": self.model.__name__.lower()
+        })
+
+        return u",".join(unicode(o.pk) for o in value)
+
+    def clean(self, value):
+        value = super(SearchableDocumentsField, self).clean(value)
+        pks = self.parse_select2_value(value)
+
+        objs = self.model.objects.filter(pk__in=pks)
+
+        found_pks = [str(o.pk) for o in objs]
+        failed_pks = [x for x in pks if x not in found_pks]
+        if failed_pks:
+            raise forms.ValidationError(u"Could not recognize the following documents: {pks}. You can only input documents already registered in the Datatracker.".format(pks=", ".join(failed_pks)))
+
+        if self.max_entries != None and len(objs) > self.max_entries:
+            raise forms.ValidationError(u"You can select at most %s entries only." % self.max_entries)
+
+        return objs
+
+class SearchableDocAliasesField(SearchableDocumentsField):
+    def __init__(self, model=DocAlias, *args, **kwargs):
+        super(SearchableDocAliasesField, self).__init__(model=model, *args, **kwargs)
+    

ietf/doc/migrations/0022_fill_in_shepherd_email.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 from south.v2 import DataMigration
 
 class Migration(DataMigration):

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 ""