Merge pull request #23 from takeflight/wagtail2

Convert to wagtail 2

wagtailvideos/templates/wagtailvideos/videos/edit.html

-{% extends "wagtailadmin/base.html" %} {% load staticfiles i18n wagtailvideos_tags %} {% block titletag %}{% blocktrans with title=video.title %}Editing video {{ title }}{% endblocktrans %}{% endblock %} {% block extra_css %}
+{% extends "wagtailadmin/base.html" %} {% load staticfiles wagtailadmin_tags i18n wagtailvideos_tags %} {% block titletag %}{% blocktrans with title=video.title %}Editing video {{ title }}{% endblocktrans %}{% endblock %} {% block extra_css %}
 <link rel="stylesheet" href="{% static 'wagtailvideos/css/edit-video.css' %}" type="text/css" /> {% endblock %} {% block extra_js %} {{ block.super }} {% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
 <script>
     $(function() {
@@ -9,7 +9,7 @@
         });
     });
 </script>
-{% endblock %} {% block content %} {% trans "Editing" as editing_str %} {% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=video.title icon="media" usage_object=video %}
+{% endblock %} {% block content %} {% trans "Editing" as editing_str %} {% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=video.title icon="media" %}
 
 <div class="row row-flush nice-padding">
 
@@ -70,6 +70,13 @@
             {% if video.duration %}
             <dt>{% trans "Duration" %}</dt>
             <dd>{{ video.formatted_duration }}</dd>
+            {% usage_count_enabled as uc_enabled %}
+            {% if uc_enabled %}
+                <dt>{% trans "Usage" %}</dt>
+                <dd>
+                    <a href="{{ video.usage_url }}">{% blocktrans count usage_count=video.get_usage.count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}</a>
+                </dd>
+            {% endif %}
             {% endif %}
         </dl>
     </div>

wagtailvideos/templatetags/wagtailvideos_tags.py

-from __future__ import absolute_import, print_function, unicode_literals
-
 from django import template
 
 register = template.Library()

wagtailvideos/urls.py

-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.conf.urls import url
 
 from wagtailvideos.views import chooser, multiple, videos
 
+app_name = 'wagtailvideos'
 urlpatterns = [
-
     url(r'^$', videos.index, name='index'),
     url(r'^(\d+)/$', videos.edit, name='edit'),
     url(r'^(\d+)/delete/$', videos.delete, name='delete'),

wagtailvideos/views/chooser.py

-from __future__ import absolute_import, print_function, unicode_literals
-
 import json
 
-from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, render
+from django.urls import reverse
+from wagtail.admin.forms import SearchForm
+from wagtail.admin.modal_workflow import render_modal_workflow
+from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model
+from wagtail.core.models import Collection
+from wagtail.search import index as search_index
 from wagtail.utils.pagination import paginate
-from wagtail.wagtailadmin.forms import SearchForm
-from wagtail.wagtailadmin.modal_workflow import render_modal_workflow
-from wagtail.wagtailadmin.utils import (
-    PermissionPolicyChecker, popular_tags_for_model)
-from wagtail.wagtailcore.models import Collection
-from wagtail.wagtailsearch import index as search_index
 
 from wagtailvideos.forms import get_video_form
 from wagtailvideos.models import Video

wagtailvideos/views/multiple.py

-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.http import HttpResponseBadRequest, JsonResponse
 from django.shortcuts import get_object_or_404, render
 from django.template.loader import render_to_string
 from django.utils.encoding import force_text
 from django.views.decorators.http import require_POST
 from django.views.decorators.vary import vary_on_headers
-from wagtail.wagtailadmin.utils import PermissionPolicyChecker
-from wagtail.wagtailsearch.backends import get_search_backends
+from wagtail.admin.utils import PermissionPolicyChecker
+from wagtail.search.backends import get_search_backends
 
 from wagtailvideos.forms import get_video_form
 from wagtailvideos.models import Video

wagtailvideos/views/videos.py

-from __future__ import absolute_import, print_function, unicode_literals
-
-from django.core.urlresolvers import reverse
 from django.http import HttpResponseNotAllowed
 from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
+from wagtail.admin import messages
+from wagtail.admin.forms import SearchForm
+from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model
+from wagtail.core.models import Collection
+from wagtail.search.backends import get_search_backends
 from wagtail.utils.pagination import paginate
-from wagtail.wagtailadmin import messages
-from wagtail.wagtailadmin.forms import SearchForm
-from wagtail.wagtailadmin.utils import (
-    PermissionPolicyChecker, popular_tags_for_model)
-from wagtail.wagtailcore.models import Collection
-from wagtail.wagtailsearch.backends import get_search_backends
 
 from wagtailvideos import ffmpeg
 from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form

wagtailvideos/wagtail_hooks.py

-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.conf.urls import include, url
 from django.contrib.staticfiles.templatetags.staticfiles import static
-from django.core import urlresolvers
+from django.urls import reverse
 from django.utils.html import format_html, format_html_join
 from django.utils.translation import ugettext_lazy as _
-from wagtail.wagtailadmin.menu import MenuItem
-from wagtail.wagtailcore import hooks
+from wagtail.admin.menu import MenuItem
+from wagtail.core import hooks
 
 from wagtailvideos import urls
 from wagtailvideos.forms import GroupVideoPermissionFormSet
@@ -15,7 +13,7 @@ from wagtailvideos.forms import GroupVideoPermissionFormSet
 @hooks.register('register_admin_urls')
 def register_admin_urls():
     return [
-        url(r'^videos/', include(urls, namespace='wagtailvideos', app_name='wagtailvideos')),
+        url(r'^videos/', include(urls)),
     ]
 
 
@@ -34,7 +32,7 @@ def editor_js():
             window.chooserUrls.videoChooser = '{0}';
         </script>
         """,
-        urlresolvers.reverse('wagtailvideos:chooser')
+        reverse('wagtailvideos:chooser')
     )
 
 
@@ -46,6 +44,6 @@ def register_video_permissions_panel():
 @hooks.register('register_admin_menu_item')
 def register_images_menu_item():
     return MenuItem(
-        _('Videos'), urlresolvers.reverse('wagtailvideos:index'),
+        _('Videos'), reverse('wagtailvideos:index'),
         name='videos', classnames='icon icon-media', order=300
     )

wagtailvideos/widgets.py

-from __future__ import absolute_import, print_function, unicode_literals
-
 import json
 
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
-from wagtail.wagtailadmin.widgets import AdminChooser
+from wagtail.admin.widgets import AdminChooser
 
 from wagtailvideos.models import Video