manager: move list of pages to management homepage

combo/manager/templates/combo/manager_base.html

@@ -7,6 +7,7 @@
 
 {% block homepage-url %}{% url 'combo-manager-homepage' %}{% endblock %}
 {% block logout-url %}{% url 'auth_logout' %}{% endblock %}
+{% block homepage-title %}Management{% endblock %}
 
 {% block extrascripts %}
 <script src="{% static "ckeditor/ckeditor/ckeditor.js" %}"></script>

combo/manager/templates/combo/manager_home.html

@@ -1,7 +1,18 @@
 {% extends "combo/manager_base.html" %}
 
+{% block appbar %}
+<h2>Pages</h2>
+<a rel="popup" href="{% url 'combo-manager-page-add' %}">New</a>
+{% endblock %}
+
 {% block content %}
 
-<a href="{% url 'combo-manager-pages-list' %}">Pages</a>
+<div id="pages-list" data-page-order-url="{% url 'combo-manager-page-order' %}">
+ {% for page in object_list %}
+ <div class="level-{{page.level}}" data-page-id="{{page.id}}" data-level="{{page.level}}">
+ <a href="{% url 'combo-manager-page-view' pk=page.id %}">{{ page.title }}</a>
+ </div>
+ {% endfor %}
+</div>
 
 {% endblock %}

combo/manager/templates/combo/page_add.html

@@ -19,7 +19,7 @@
     {% if object.id %}
     <a class="cancel" href="{{ object.get_absolute_url }}">{% trans 'Cancel' %}</a>
     {% else %}
-    <a class="cancel" href="{% url 'combo-manager-pages-list' %}">{% trans 'Cancel' %}</a>
+    <a class="cancel" href="{% url 'combo-manager-homepage' %}">{% trans 'Cancel' %}</a>
     {% endif %}
   </div>
 </form>

combo/manager/templates/combo/pages_list.html

@@ -1,15 +0,0 @@
-{% extends "combo/manager_base.html" %}
-
-{% block content %}
-
-<div id="pages-list" data-page-order-url="{% url 'combo-manager-page-order' %}">
- {% for page in object_list %}
- <div class="level-{{page.level}}" data-page-id="{{page.id}}" data-level="{{page.level}}">
- <a href="{% url 'combo-manager-page-view' pk=page.id %}">{{ page.title }}</a>
- </div>
- {% endfor %}
-</div>
-
-<a rel="popup" href="{% url 'combo-manager-page-add' %}">+</a>
-
-{% endblock %}

combo/manager/urls.py

@@ -21,7 +21,6 @@ from . import views
 
 urlpatterns = patterns('combo.views',
         url(r'^$', views.homepage, name='combo-manager-homepage'),
-        url(r'^pages/$', views.pages_list, name='combo-manager-pages-list'),
         url(r'^pages/add/$', views.page_add, name='combo-manager-page-add'),
         url(r'^pages/(?P<pk>\w+)/$', views.page_view,
             name='combo-manager-page-view'),

combo/manager/views.py

@@ -33,23 +33,16 @@ from combo.data.models import Page, CellBase, UnlockMarkerCell
 from .forms import PageForm, PageEditForm, PageVisibilityForm
 
 
-class HomepageView(TemplateView):
-    template_name = 'combo/manager_home.html'
-
-homepage = HomepageView.as_view()
-
-
-class PagesListView(ListView):
+class HomepageView(ListView):
     model = Page
-    template_name = 'combo/pages_list.html'
+    template_name = 'combo/manager_home.html'
 
     def get_context_data(self, **kwargs):
         self.object_list = Page.get_as_reordered_flat_hierarchy(self.object_list)
-        context = super(PagesListView, self).get_context_data(**kwargs)
+        context = super(HomepageView, self).get_context_data(**kwargs)
         return context
 
-
-pages_list = PagesListView.as_view()
+homepage = HomepageView.as_view()
 
 
 class PageAddView(CreateView):
@@ -206,4 +199,4 @@ def page_order(request):
     for page in Page.objects.filter(parent_id=moved_page.parent_id):
         page.order = new_order.index(page.id)+1
         page.save()
-    return redirect(reverse('combo-manager-pages-list'))
+    return redirect(reverse('combo-manager-homepage'))