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.77) (envelope-from ) id 1SkmeO-00064f-Ac for garchives@archives.gentoo.org; Sat, 30 Jun 2012 01:39:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 865F3E083B; Sat, 30 Jun 2012 00:22:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3DAABE083B for ; Sat, 30 Jun 2012 00:22:46 +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 51D411B4016 for ; Sat, 30 Jun 2012 00:22:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F112EE543C for ; Sat, 30 Jun 2012 00:22:42 +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: <1341012149.920d1c111d7331be349cde41798c715e520799a5.bacher09@gentoo> Subject: [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/templates/ X-VCS-Repository: proj/gentoo-packages X-VCS-Files: gpackages/apps/packages/urls.py gpackages/apps/packages/views.py gpackages/templates/ebuild.html gpackages/templates/ebuild_object.html gpackages/templates/ebuilds.html gpackages/templates/keywords_table.html X-VCS-Directories: gpackages/apps/packages/ gpackages/templates/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: 920d1c111d7331be349cde41798c715e520799a5 X-VCS-Branch: master Date: Sat, 30 Jun 2012 00:22:42 +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: fce3a335-9414-4213-923b-7cc2a774a519 X-Archives-Hash: 592cdb3499797f7162b20ce84aa5e8f7 commit: 920d1c111d7331be349cde41798c715e520799a5 Author: Slava Bacherikov bacher09 org> AuthorDate: Fri Jun 29 23:22:29 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Fri Jun 29 23:22:29 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3D920d1c11 Add simple ebuild view --- gpackages/apps/packages/urls.py | 3 ++- gpackages/apps/packages/views.py | 10 ++++++++++ gpackages/templates/ebuild.html | 5 +++++ gpackages/templates/ebuild_object.html | 9 +++++++++ gpackages/templates/ebuilds.html | 9 +-------- gpackages/templates/keywords_table.html | 3 ++- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/gpackages/apps/packages/urls.py b/gpackages/apps/packages/ur= ls.py index 045a5ea..0dccc06 100644 --- a/gpackages/apps/packages/urls.py +++ b/gpackages/apps/packages/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, include, url from views import CategoriesListView, HerdsListView, MaintainersListView= , \ RepositoriesListView, LicenseGroupsView , EbuildsListV= iew, \ - PackagesListsView, PackageDetailView + PackagesListsView, PackageDetailView, EbuildDetailView =20 urlpatterns =3D patterns('', url(r'^categories/$', CategoriesListView.as_view(), name =3D 'catego= ries'), @@ -10,6 +10,7 @@ urlpatterns =3D patterns('', url(r'^repositories/$', RepositoriesListView.as_view(), name =3D 're= positories'), url(r'^license-groups/$', LicenseGroupsView.as_view(), name =3D 'lic= ense_groups'), url(r'^$', EbuildsListView.as_view(), name =3D 'ebuilds'), + url(r'^ebuild/(?P\d+)/$', EbuildDetailView.as_view(), name =3D '= ebuild'), url(r'^packages/{0}$'.format(PackagesListsView.get_url_part()), Pack= agesListsView.as_view(), name =3D 'packages'), =20 # In Future I will write my onw URL Resolver !!! diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/v= iews.py index d04acd3..45e1e55 100644 --- a/gpackages/apps/packages/views.py +++ b/gpackages/apps/packages/views.py @@ -51,6 +51,16 @@ class EbuildsListView(ContextListView): 'package__virtual_package__category'). \ prefetch_keywords(arches) =20 +class EbuildDetailView(ContextView, DetailView): + template_name =3D 'ebuild.html' + extra_context =3D {'page_name': 'Ebuild', 'arches': arches} + context_object_name =3D 'ebuild' + queryset =3D EbuildModel.objects.all(). \ + select_related('package', + 'package__virtual_package', + 'package__virtual_package__category'). \ + prefetch_keywords(arches) + class PackagesListsView(MultipleFilterListViewMixin, ContextListView): allowed_filter =3D { 'category':'virtual_package__category__category= ', 'repo':'repository__name', diff --git a/gpackages/templates/ebuild.html b/gpackages/templates/ebuild= .html new file mode 100644 index 0000000..2b7198a --- /dev/null +++ b/gpackages/templates/ebuild.html @@ -0,0 +1,5 @@ +{% extends "base.html" %} + +{% block content %} +{% include 'ebuild_object.html' %} +{% endblock content %} diff --git a/gpackages/templates/ebuild_object.html b/gpackages/templates= /ebuild_object.html new file mode 100644 index 0000000..f75b427 --- /dev/null +++ b/gpackages/templates/ebuild_object.html @@ -0,0 +1,9 @@ +{% load packages %} +
+
+ {{ ebuild.cpv }} + {{ ebuild.updated_dateti= me }} +
+
{{ ebuild.descript= ion }}
+ {% render_keywords_table ebuild arches %} +
diff --git a/gpackages/templates/ebuilds.html b/gpackages/templates/ebuil= ds.html index 94e1ecd..aa28c09 100644 --- a/gpackages/templates/ebuilds.html +++ b/gpackages/templates/ebuilds.html @@ -3,14 +3,7 @@ =20 {% block content %} {% for ebuild in ebuilds %} -
-
- {{ ebuild.cpv }} - {{ ebuild.updated_da= tetime }} -
-
{{ ebuild.desc= ription }}
- {% render_keywords_table ebuild arches %} -
+ {% include 'ebuild_object.html' %} {% endfor %} {% include 'paginator.html' %} {% endblock content %} diff --git a/gpackages/templates/keywords_table.html b/gpackages/template= s/keywords_table.html index 38cba68..dcef1a2 100644 --- a/gpackages/templates/keywords_table.html +++ b/gpackages/templates/keywords_table.html @@ -1,3 +1,4 @@ +{% load url from future %} @@ -17,7 +18,7 @@ {% for ebuild in ebuilds %} - + {% for keyword in ebuild.keywords %} {% endfor %}
{{ ebuild.fullversion }}{{ ebuild.fullversion }}{{ keyword.status_r= epr }}