From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SfFRt-0003QV-Hj for garchives@archives.gentoo.org; Thu, 14 Jun 2012 19:11:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 487E6E0595; Thu, 14 Jun 2012 19:11:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0770BE0595 for ; Thu, 14 Jun 2012 19:10:59 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14E331B4034 for ; Thu, 14 Jun 2012 19:10:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AD50FE5436 for ; Thu, 14 Jun 2012 19:10:56 +0000 (UTC) From: "Slava Bacherikov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slava Bacherikov" Message-ID: <1339701038.916f739f0cebc70f2c3d46852c822d6b584f389e.bacher09@gentoo> Subject: [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/main/, gpackages/apps/packages/, gpackages/template/ X-VCS-Repository: proj/gentoo-packages X-VCS-Files: gpackages/apps/packages/urls.py gpackages/apps/packages/views.py gpackages/main/urls.py gpackages/template/base.html gpackages/template/categories.html gpackages/template/first.html X-VCS-Directories: gpackages/main/ gpackages/apps/packages/ gpackages/template/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: 916f739f0cebc70f2c3d46852c822d6b584f389e X-VCS-Branch: master Date: Thu, 14 Jun 2012 19:10:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: bd67b6e1-fa6b-42af-ab69-4ab86bea87bd X-Archives-Hash: d5785a6649035aa0fbdf627043a44ce4 commit: 916f739f0cebc70f2c3d46852c822d6b584f389e Author: Slava Bacherikov bacher09 org> AuthorDate: Thu Jun 14 19:10:38 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Thu Jun 14 19:10:38 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3D916f739f Create view for categories --- gpackages/apps/packages/urls.py | 6 ++ gpackages/apps/packages/views.py | 21 ++++++- gpackages/main/urls.py | 12 ++-- gpackages/template/base.html | 105 +++++++++++-------------------= ----- gpackages/template/categories.html | 26 +++++++++ gpackages/template/first.html | 8 ++-- 6 files changed, 93 insertions(+), 85 deletions(-) diff --git a/gpackages/apps/packages/urls.py b/gpackages/apps/packages/ur= ls.py new file mode 100644 index 0000000..864da99 --- /dev/null +++ b/gpackages/apps/packages/urls.py @@ -0,0 +1,6 @@ +from django.conf.urls import patterns, include, url +from views import CategoriesListView + +urlpatterns =3D patterns('', + url(r'categories', CategoriesListView.as_view()), +) diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/v= iews.py index 58c6a5d..aebf3b0 100644 --- a/gpackages/apps/packages/views.py +++ b/gpackages/apps/packages/views.py @@ -1,4 +1,19 @@ -from django.views.generic import TemplateView +from django.views.generic import TemplateView, ListView +from django.template.loader import get_template +from django.template import TemplateDoesNotExist +from django.http import Http404 =20 -class BaseView(TemplateView): - template_name =3D "base.html" +from models import CategoryModel + +class CategoriesListView(ListView): + template_name =3D 'categories.html' + queryset =3D CategoryModel.objects.defer('metadata_hash').all() + context_object_name =3D 'categories' + +class TemplatesDebugView(TemplateView): + + def get_template_names(self): + templatename =3D self.kwargs.get('templatename') + if not templatename: + raise Http404 + return [templatename, templatename +'.html', templatename + '.ht= m'] diff --git a/gpackages/main/urls.py b/gpackages/main/urls.py index 6f01cd0..262300f 100644 --- a/gpackages/main/urls.py +++ b/gpackages/main/urls.py @@ -11,13 +11,13 @@ urlpatterns =3D patterns('', =20 # Uncomment the admin/doc line below to enable admin documentation: # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - url(r'^admin/', include(admin.site.urls)), + url(r'', include('packages.urls')), ) =20 if DEBUG: from django.contrib import databrowse - from packages.views import BaseView + from packages.views import TemplatesDebugView=20 from packages.models import EbuildModel, PackageModel, UseFlagModel,= \ LicensModel, CategoryModel, Keyword, \ ArchesModel, HomepageModel, HerdsModel, = \ @@ -30,8 +30,8 @@ if DEBUG: UseFlagDescriptionModel, RepositoryModel,=20 VirtualPackageModel) urlpatterns +=3D ( - url(r'^data/(.*)',databrowse.site.root), - url(r'^base/$',BaseView.as_view()), - url(r'^404/$','django.views.defaults.page_not_found', name =3D '= 404'), - url(r'^500/$','django.views.defaults.server_error', name =3D '50= 0'), + url(r'^data/(.*)', databrowse.site.root), + url(r'^templateview/(?P.*)/?$', TemplatesDebugView= .as_view()), + url(r'^404/$', 'django.views.defaults.page_not_found', name =3D = '404'), + url(r'^500/$', 'django.views.defaults.server_error', name =3D '5= 00'), ) diff --git a/gpackages/template/base.html b/gpackages/template/base.html index a40e97a..522d8c6 100644 --- a/gpackages/template/base.html +++ b/gpackages/template/base.html @@ -1,7 +1,7 @@ - + Gentoo Packages @@ -33,12 +33,12 @@ - + =20 - -
+{% block body %} +
@@ -76,64 +76,28 @@
-
+ =20
-
+ {% block container %} +
  • Categories
-
+
-
- - - - - - =20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CategoryDescription
app-accesebility (11/43)Some descr
app-adminAdmin utils
app-dictDictionarys
www-clientWeb clients
mail-clientMail User Agents
x11-themsX11 Thems
- - -
-
-
+
+ {% block content %} +Text + {% endblock content %} +
+ +
+
- Last update11 Jun 2012
10:47 UTC=20 -

+ Last update11 Jun 201= 2
10:47 UTC=20 +

Legend
    @@ -142,37 +106,34 @@
  • M - hardmask
-
    - =20 -
-
-
-
- -
-
+
+
+
+ +
+
=20 -
+

Copyright 2007-2= 012 Gentoo Foundation, Inc.

-
+
=20 + {% endblock container %} =20 - - +{% endblock body %} diff --git a/gpackages/template/categories.html b/gpackages/template/cate= gories.html new file mode 100644 index 0000000..f469a34 --- /dev/null +++ b/gpackages/template/categories.html @@ -0,0 +1,26 @@ +{% extends "base.html" %} + +{% block content %} + + + + + + + + + + + + + + {% for category in categories %} + + + + + {% endfor %} + +
CategoryDescription
{{ category.category }}{{ category.description|default_if_none:"" }}
+ +{% endblock content %} diff --git a/gpackages/template/first.html b/gpackages/template/first.htm= l index f173bf1..3e835ef 100644 --- a/gpackages/template/first.html +++ b/gpackages/template/first.html @@ -8,7 +8,7 @@ =20 - + - + =20 - - + + =20