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

[Slava Bacherikov]

commit:     e7b70215e10380d489b9532024edfd578826fd83
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Sat Jun 30 19:40:19 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Sat Jun 30 19:40:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=e7b70215

Add global use flags view

---
 gpackages/apps/packages/models.py   |    3 +++
 gpackages/apps/packages/urls.py     |    4 +++-
 gpackages/apps/packages/views.py    |    8 +++++++-
 gpackages/templates/base.html       |    1 +
 gpackages/templates/global_use.html |   27 +++++++++++++++++++++++++++
 5 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/models.py
index 1e50175..29a2d64 100644
--- a/gpackages/apps/packages/models.py
+++ b/gpackages/apps/packages/models.py
@@ -341,6 +341,9 @@ class UseFlagModel(models.Model):
     def __unicode__(self):
         return self.name
 
+    class Meta:
+        ordering = ('name',)
+
 class UseFlagDescriptionModel(models.Model):
     use_flag = models.ForeignKey(UseFlagModel, db_index = True)
     package = models.ForeignKey(VirtualPackageModel)

diff --git a/gpackages/apps/packages/urls.py b/gpackages/apps/packages/urls.py
index 0dccc06..4d47a08 100644
--- a/gpackages/apps/packages/urls.py
+++ b/gpackages/apps/packages/urls.py
@@ -1,11 +1,13 @@
 from django.conf.urls import patterns, include, url
 from views import CategoriesListView, HerdsListView, MaintainersListView, \
                   RepositoriesListView, LicenseGroupsView , EbuildsListView, \
-                  PackagesListsView, PackageDetailView, EbuildDetailView
+                  PackagesListsView, PackageDetailView, EbuildDetailView, \
+                  GlobalUseListView
 
 urlpatterns = patterns('',
     url(r'^categories/$', CategoriesListView.as_view(), name = 'categories'),
     url(r'^herds/$', HerdsListView.as_view(), name = 'herds'),
+    url(r'^use/$', GlobalUseListView.as_view(), name = 'global_uses'),
     url(r'^maintainers/$', MaintainersListView.as_view(), name = 'maintainers'),
     url(r'^repositories/$', RepositoriesListView.as_view(), name = 'repositories'),
     url(r'^license-groups/$', LicenseGroupsView.as_view(), name = 'license_groups'),

diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.py
index 45e1e55..97e54d6 100644
--- a/gpackages/apps/packages/views.py
+++ b/gpackages/apps/packages/views.py
@@ -3,7 +3,7 @@ from generic.views import ContextListView, ContextTemplateView, ContextView, \
                           MultipleFilterListViewMixin
 from models import CategoryModel, HerdsModel, MaintainerModel, \
                    RepositoryModel, LicenseGroupModel, EbuildModel, \
-                   PackageModel
+                   PackageModel, UseFlagModel
 
 from django.shortcuts import get_object_or_404
 
@@ -119,3 +119,9 @@ class PackageDetailView(ContextView, DetailView):
                                           category = category,
                                           repository__name = repository)
         return obj
+
+class GlobalUseListView(ContextListView):
+    extra_context = {'page_name': 'Global Use', }
+    template_name = 'global_use.html'
+    context_object_name = 'uses'
+    queryset = UseFlagModel.objects.exclude(description = '') 

diff --git a/gpackages/templates/base.html b/gpackages/templates/base.html
index a5998d0..172dd9d 100644
--- a/gpackages/templates/base.html
+++ b/gpackages/templates/base.html
@@ -138,6 +138,7 @@ Text
                             {% active_link 'herds' 'Herds' %}
                             {% active_link 'repositories' 'Repositories' %}
                             {% active_link 'license_groups' 'License Groups' %}
+                            {% active_link 'global_uses' 'Global Use Flags' %}
                         </ul>
                        </div>
             </div> <!-- span3 --><!--}}}-->

diff --git a/gpackages/templates/global_use.html b/gpackages/templates/global_use.html
new file mode 100644
index 0000000..266816f
--- /dev/null
+++ b/gpackages/templates/global_use.html
@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+{% load url from future %}
+
+{% block content %}
+
+<table class='table table-striped table-hover'>
+    <colgroup>
+        <col class="span1" >
+        <col class="span9" >
+    </colgroup>
+    <thead>
+            <tr>
+                <th>Use flag</th>
+                <th>Description</th>
+            </tr>
+    </thead>
+    <tbody>
+        {% for use in uses %}
+            <tr>
+                <td class="nowrap"><a href="#">{{ use.name }}</a></td>
+                <td>{{ use.description }}</td>
+            </tr>
+        {% endfor %}
+    </tbody>
+</table>
+
+{% endblock content %}