[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/templates/

[Slava Bacherikov]

commit:     920d1c111d7331be349cde41798c715e520799a5
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Fri Jun 29 23:22:29 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Fri Jun 29 23:22:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=920d1c11

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/urls.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 , EbuildsListView, \
-                  PackagesListsView, PackageDetailView
+                  PackagesListsView, PackageDetailView, EbuildDetailView
 
 urlpatterns = patterns('',
     url(r'^categories/$', CategoriesListView.as_view(), name = 'categories'),
@@ -10,6 +10,7 @@ urlpatterns = patterns('',
     url(r'^repositories/$', RepositoriesListView.as_view(), name = 'repositories'),
     url(r'^license-groups/$', LicenseGroupsView.as_view(), name = 'license_groups'),
     url(r'^$', EbuildsListView.as_view(), name = 'ebuilds'),
+    url(r'^ebuild/(?P<pk>\d+)/$', EbuildDetailView.as_view(), name = 'ebuild'),
     url(r'^packages/{0}$'.format(PackagesListsView.get_url_part()), PackagesListsView.as_view(), name = 'packages'),
 
     # In Future I will write my onw URL Resolver !!!

diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.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)
 
+class EbuildDetailView(ContextView, DetailView):
+    template_name = 'ebuild.html'
+    extra_context = {'page_name': 'Ebuild', 'arches': arches}
+    context_object_name = 'ebuild'
+    queryset = EbuildModel.objects.all(). \
+        select_related('package',
+                       'package__virtual_package',
+                       'package__virtual_package__category'). \
+                       prefetch_keywords(arches)
+
 class PackagesListsView(MultipleFilterListViewMixin, ContextListView):
     allowed_filter = { '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 %}
+<div class="well package-well">
+    <div class="package-name">
+        <span>{{ ebuild.cpv }}</span>
+        <span class="package_update_datetime">{{ ebuild.updated_datetime }}</span>
+    </div>
+    <div style="padding-bottom: 10px; margin 10px;">{{ ebuild.description }}</div>
+    {% render_keywords_table ebuild arches %}
+</div>

diff --git a/gpackages/templates/ebuilds.html b/gpackages/templates/ebuilds.html
index 94e1ecd..aa28c09 100644
--- a/gpackages/templates/ebuilds.html
+++ b/gpackages/templates/ebuilds.html
@@ -3,14 +3,7 @@
 
 {% block content %}
 {% for ebuild in ebuilds %}
-    <div class="well package-well">
-        <div class="package-name">
-            <span>{{ ebuild.cpv }}</span>
-            <span class="package_update_datetime">{{ ebuild.updated_datetime }}</span>
-        </div>
-        <div style="padding-bottom: 10px; margin 10px;">{{ ebuild.description }}</div>
-        {% render_keywords_table ebuild arches %}
-    </div>
+    {% include 'ebuild_object.html' %}
 {% endfor %}
 {% include 'paginator.html' %}
 {% endblock content %}

diff --git a/gpackages/templates/keywords_table.html b/gpackages/templates/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 %}
 <table class="keywords table table-bordered table-condensed">
     <colgroup>
         <col class="span2">
@@ -17,7 +18,7 @@
     <tbody>
         {% for ebuild in ebuilds %}
         <tr>
-            <td class="ebuild">{{ ebuild.fullversion }}</td>
+            <td class="ebuild"><a href="{% url 'ebuild' pk=ebuild.pk %}">{{ ebuild.fullversion }}</a></td>
             {% for keyword in ebuild.keywords %}
             <td class="{{ keyword.status_class }}">{{ keyword.status_repr }}</td>
             {% endfor %}