diff --git a/example/blog/templates/base.html b/example/blog/templates/base.html index 62f9c02..31d2fdf 100644 --- a/example/blog/templates/base.html +++ b/example/blog/templates/base.html @@ -1,4 +1,4 @@ -{% load i18n %} +{% load i18n static %} @@ -13,11 +13,7 @@
-
-
-

-
-
+ {% block content %}{% endblock content %}
diff --git a/example/blog/templates/blog/blog_detail.html b/example/blog/templates/blog/blog_detail.html index 56956a6..3626b7c 100644 --- a/example/blog/templates/blog/blog_detail.html +++ b/example/blog/templates/blog/blog_detail.html @@ -24,31 +24,8 @@ {% else %} -

Unpublished - publish it in admin2

+

Unpublished - Choose an admin tool and publish it.

{% endif %} - -
- -
-
-

The original Django Admin

- - - - - -

Powered by django.contrib.admin. This is just here for reference.

-
-
-

The new Admin2

- - - - - -

Powered by django-admin2.

-
-
{% endblock %} \ No newline at end of file diff --git a/example/blog/templates/blog/blog_list.html b/example/blog/templates/blog/blog_list.html index d356d90..4424eed 100644 --- a/example/blog/templates/blog/blog_list.html +++ b/example/blog/templates/blog/blog_list.html @@ -17,48 +17,15 @@ {{ post.body }}

{% else %} -

Unpublished - publish it in admin2

+

Unpublished - Choose an admin tool and publish it.

{% endif %} {% empty %} -

Imagine that this is a real site

+

No Content Yet!

-

Pretend that this is the homepage of a big Django site.

- -

Imagine lots of things are here:

- - -

In other words, these are items that we can introspect through the Django admin.

- -

Under the hood

- -

Now, explore the Django admin for example.com. Click on either of the following:

+

Choose an admin tool and add content.

{% endfor %} -
-
-

The original Django Admin

- - - - - -

Powered by django.contrib.admin. This is just here for reference.

-
-
-

The new Admin2

- - - - - -

Powered by django-admin2.

-
-
{% endblock %} \ No newline at end of file diff --git a/example/blog/templates/blog/home.html b/example/blog/templates/blog/home.html index 6d43d01..946c73d 100644 --- a/example/blog/templates/blog/home.html +++ b/example/blog/templates/blog/home.html @@ -24,25 +24,26 @@

{% trans "Now, explore the Django admin for example.com. Click on either of the following:" %}

-
-

{% blocktrans with admin_url="/admin/" %}The original Django Admin{% endblocktrans %}

+

The original Django Admin

- + -

{% trans "Powered by django.contrib.admin. This is just here for reference." %}

+

Powered by django.contrib.admin. This is just here for reference.

-

{% blocktrans with admin2_url="/admin2/" %}The new Admin2{% endblocktrans %}

+

The new Admin2

- + -

{% trans "Powered by django-admin2." %}

+

Powered by django-admin2.

+
+

See the Blog in Action

{% endblock %} diff --git a/example/example/urls.py b/example/example/urls.py index a8a3283..ad18380 100644 --- a/example/example/urls.py +++ b/example/example/urls.py @@ -13,6 +13,6 @@ urlpatterns = patterns('', url(r'^admin2/', include(djadmin2.default.urls)), url(r'^admin/', include(admin.site.urls)), url(r'^blog/', BlogListView.as_view(template_name="blog/blog_list.html"), name='blog_list'), - url(r'^blog_detail(?P\d+)/$', BlogDetailView.as_view(template_name="blog/blog_detail.html"), name='blog_detail'), - url(r'^$', BlogListView.as_view(template_name="blog/blog_list.html"), name='blog_list'), + url(r'^blog/detail(?P\d+)/$', BlogDetailView.as_view(template_name="blog/blog_detail.html"), name='blog_detail'), + url(r'^$', BlogListView.as_view(template_name="blog/home.html"), name='home'), ) diff --git a/example2/polls/templates/home.html b/example2/polls/templates/home.html index 25cdb80..3fc87c9 100644 --- a/example2/polls/templates/home.html +++ b/example2/polls/templates/home.html @@ -4,7 +4,7 @@

{% trans "Example Home" %}

{% endblock %}