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

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

[Slava Bacherikov]

commit:     e2bda833f872ebae8b8d0496ea528c9fff36db32
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Thu Jun 14 21:20:34 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Thu Jun 14 21:20:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=e2bda833

Add HerdsListView

---
 gpackages/apps/packages/models.py  |    3 +++
 gpackages/apps/packages/urls.py    |    5 +++--
 gpackages/apps/packages/views.py   |   18 ++++++++++++++++--
 gpackages/template/base.html       |    7 ++++++-
 gpackages/template/categories.html |    6 +++---
 gpackages/template/herds.html      |   30 ++++++++++++++++++++++++++++++
 6 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/models.py
index e99a1a2..80ebc9e 100644
--- a/gpackages/apps/packages/models.py
+++ b/gpackages/apps/packages/models.py
@@ -116,6 +116,9 @@ class HerdsModel(AbstractDateTimeModel):
     def __unicode__(self):
         return self.name
 
+    class Meta:
+        ordering = ('name',)
+
 class VirtualPackageModel(models.Model):
     name = models.CharField(max_length = 254)
     category = models.ForeignKey(CategoryModel)

diff --git a/gpackages/apps/packages/urls.py b/gpackages/apps/packages/urls.py
index 864da99..d0e4f5c 100644
--- a/gpackages/apps/packages/urls.py
+++ b/gpackages/apps/packages/urls.py
@@ -1,6 +1,7 @@
 from django.conf.urls import patterns, include, url
-from views import CategoriesListView
+from views import CategoriesListView, HerdsListView
 
 urlpatterns = patterns('',
-    url(r'categories', CategoriesListView.as_view()),
+    url(r'categories/$', CategoriesListView.as_view()),
+    url(r'herds/$', HerdsListView.as_view()),
 )

diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.py
index aebf3b0..279aa06 100644
--- a/gpackages/apps/packages/views.py
+++ b/gpackages/apps/packages/views.py
@@ -3,13 +3,27 @@ from django.template.loader import get_template
 from django.template import TemplateDoesNotExist
 from django.http import Http404
 
-from models import CategoryModel
+from models import CategoryModel, HerdsModel
 
-class CategoriesListView(ListView):
+class ContextListView(ListView):
+    extra_context = {}
+    def get_context_data(self, **kwargs):
+        ret = super(ContextListView, self).get_context_data(**kwargs)
+        ret.update(self.extra_context)
+        return ret
+
+class CategoriesListView(ContextListView):
+    extra_context = {'page_name': 'Categories'}
     template_name = 'categories.html'
     queryset = CategoryModel.objects.defer('metadata_hash').all()
     context_object_name = 'categories'
 
+class HerdsListView(ContextListView):
+    extra_context = {'page_name': 'Herds'}
+    template_name = 'herds.html'
+    queryset = HerdsModel.objects.only('name', 'email', 'description').all()
+    context_object_name = 'herds'
+
 class TemplatesDebugView(TemplateView):
 
     def get_template_names(self):

diff --git a/gpackages/template/base.html b/gpackages/template/base.html
index 522d8c6..5242087 100644
--- a/gpackages/template/base.html
+++ b/gpackages/template/base.html
@@ -25,6 +25,11 @@
             padding: 8px 10px 8px 10px;
             margin: 0px 0px 20px 0px;
             background-color: #CCC;
+        }
+
+        .nowrap {
+            white-space: nowrap;
+        }
 
     </style>
     <link href="{{ STATIC_URL }}css/bootstrap-responsive.css" rel="stylesheet">
@@ -82,7 +87,7 @@
     {% block container %}
                             <div class="row"> <!-- Page type --><!--{{{-->
                                                         <ul class="breadcrumb">
-                                                        <li class="active">Categories</li>
+                                                        <li class="active">{{ page_name }}</li>
                                                       </ul>
                             </div> <!-- end page type --><!--}}}-->
         <div class="row">

diff --git a/gpackages/template/categories.html b/gpackages/template/categories.html
index f469a34..4163e90 100644
--- a/gpackages/template/categories.html
+++ b/gpackages/template/categories.html
@@ -4,8 +4,8 @@
 
 <table class='table table-striped table-hover'>
     <colgroup>
-        <col class="span2" >
-        <col class="span7" >
+        <col class="span1" >
+        <col class="span8" >
     </colgroup>
     <thead>
             <tr>
@@ -16,7 +16,7 @@
     <tbody>
         {% for category in categories %}
             <tr>
-                <td><a href="#">{{ category.category }}</a></td>
+                <td class="nowrap"><a href="#">{{ category.category }}</a></td>
                 <td>{{ category.description|default_if_none:"" }}</td>
             </tr>
         {% endfor %}

diff --git a/gpackages/template/herds.html b/gpackages/template/herds.html
new file mode 100644
index 0000000..54157a3
--- /dev/null
+++ b/gpackages/template/herds.html
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<table class='table table-striped table-hover'>
+    <colgroup>
+        <col class="span1" >
+        <col class="span1" >
+        <col class="span7" >
+    </colgroup>
+    <thead>
+            <tr>
+                <th>Herd</th>
+                <th>Email</th>
+                <th>Description</th>
+            </tr>
+    </thead>
+    <tbody>
+        {% for herd in herds %}
+            <tr>
+                <td class="nowrap"><a href="#">{{ herd.name }}</a></td>
+                <!-- email should be obfuscated -->
+                <td class="nowrap"><a href="#">{{ herd.email }}</a></td>
+                <td>{{ herd.description|default_if_none:"" }}</td>
+            </tr>
+        {% endfor %}
+    </tbody>
+</table>
+
+{% endblock content %}

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

[Slava Bacherikov]

commit:     3b0ed7586c4b0f7a8cc98ccd098f7102727f7103
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Thu Jun 14 23:57:03 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Thu Jun 14 23:57:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=3b0ed758

Add maintainers view

---
 gpackages/apps/packages/urls.py     |    7 +++--
 gpackages/apps/packages/views.py    |    9 ++++++-
 gpackages/template/maintainers.html |   41 +++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/gpackages/apps/packages/urls.py b/gpackages/apps/packages/urls.py
index d0e4f5c..ee99858 100644
--- a/gpackages/apps/packages/urls.py
+++ b/gpackages/apps/packages/urls.py
@@ -1,7 +1,8 @@
 from django.conf.urls import patterns, include, url
-from views import CategoriesListView, HerdsListView
+from views import CategoriesListView, HerdsListView, MaintainersListView
 
 urlpatterns = patterns('',
-    url(r'categories/$', CategoriesListView.as_view()),
-    url(r'herds/$', HerdsListView.as_view()),
+    url(r'categories/$', CategoriesListView.as_view(), name = 'categories'),
+    url(r'herds/$', HerdsListView.as_view(), name = 'herds'),
+    url(r'maintainers/$', MaintainersListView.as_view(), name = 'maintainers'),
 )

diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.py
index 279aa06..7ae9a2d 100644
--- a/gpackages/apps/packages/views.py
+++ b/gpackages/apps/packages/views.py
@@ -3,7 +3,7 @@ from django.template.loader import get_template
 from django.template import TemplateDoesNotExist
 from django.http import Http404
 
-from models import CategoryModel, HerdsModel
+from models import CategoryModel, HerdsModel, MaintainerModel
 
 class ContextListView(ListView):
     extra_context = {}
@@ -24,6 +24,13 @@ class HerdsListView(ContextListView):
     queryset = HerdsModel.objects.only('name', 'email', 'description').all()
     context_object_name = 'herds'
 
+class MaintainersListView(ContextListView):
+    paginate_by = 40
+    extra_context = {'page_name': 'Maintainers'}
+    template_name = 'maintainers.html'
+    queryset = MaintainerModel.objects.only('name', 'email' ).all()
+    context_object_name = 'maintainers'
+
 class TemplatesDebugView(TemplateView):
 
     def get_template_names(self):

diff --git a/gpackages/template/maintainers.html b/gpackages/template/maintainers.html
new file mode 100644
index 0000000..ac87a0b
--- /dev/null
+++ b/gpackages/template/maintainers.html
@@ -0,0 +1,41 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<table class='table table-striped table-hover'>
+    <colgroup>
+        <col class="span3" >
+        <col class="span3" >
+    </colgroup>
+    <thead>
+            <tr>
+                <th>Name</th>
+                <th>Email</th>
+            </tr>
+    </thead>
+    <tbody>
+        {% for maintainer in maintainers %}
+            <tr>
+                <td class="nowrap"><a href="#">{{ maintainer.name|default:"Not represented" }}</a></td>
+                <!-- email should be obfuscated -->
+                <td class="nowrap"><a href="#">{{ maintainer.email }}</a></td>
+            </tr>
+        {% endfor %}
+    </tbody>
+</table>
+
+{% if is_paginated %}
+<div class="pagination pagination-centered">
+  <ul>
+        {% if page_obj.has_previous %}
+    <li><a href="?page={{ page_obj.previous_page_number }}">&larr; Prev</a></li>
+        {% endif %}
+    <li class="active"> <a href="#">{{ page_obj.number }}</a></li>
+    {% if page_obj.has_next %}
+    <li><a href="?page={{ page_obj.next_page_number }}">Next &rarr;</a></li>
+    {% endif %}
+  </ul>
+</div>
+{% endif %}
+
+{% endblock content %}

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

[Slava Bacherikov]

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

Add basic repositories view

---
 gpackages/apps/packages/urls.py      |    4 +++-
 gpackages/apps/packages/views.py     |    8 +++++++-
 gpackages/template/repositories.html |   26 ++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/gpackages/apps/packages/urls.py b/gpackages/apps/packages/urls.py
index ee99858..f101a02 100644
--- a/gpackages/apps/packages/urls.py
+++ b/gpackages/apps/packages/urls.py
@@ -1,8 +1,10 @@
 from django.conf.urls import patterns, include, url
-from views import CategoriesListView, HerdsListView, MaintainersListView
+from views import CategoriesListView, HerdsListView, MaintainersListView, \
+                  RepositoriesListView
 
 urlpatterns = patterns('',
     url(r'categories/$', CategoriesListView.as_view(), name = 'categories'),
     url(r'herds/$', HerdsListView.as_view(), name = 'herds'),
     url(r'maintainers/$', MaintainersListView.as_view(), name = 'maintainers'),
+    url(r'repositories/$', RepositoriesListView.as_view(), name = 'repositories'),
 )

diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.py
index 7ae9a2d..6975749 100644
--- a/gpackages/apps/packages/views.py
+++ b/gpackages/apps/packages/views.py
@@ -3,7 +3,7 @@ from django.template.loader import get_template
 from django.template import TemplateDoesNotExist
 from django.http import Http404
 
-from models import CategoryModel, HerdsModel, MaintainerModel
+from models import CategoryModel, HerdsModel, MaintainerModel, RepositoryModel
 
 class ContextListView(ListView):
     extra_context = {}
@@ -31,6 +31,12 @@ class MaintainersListView(ContextListView):
     queryset = MaintainerModel.objects.only('name', 'email' ).all()
     context_object_name = 'maintainers'
 
+class RepositoriesListView(ContextListView):
+    extra_context = {'page_name': 'Repsitories'}
+    template_name = 'repositories.html'
+    queryset = RepositoryModel.objects.only('name', 'description' ).all()
+    context_object_name = 'repositories'
+
 class TemplatesDebugView(TemplateView):
 
     def get_template_names(self):

diff --git a/gpackages/template/repositories.html b/gpackages/template/repositories.html
new file mode 100644
index 0000000..9088251
--- /dev/null
+++ b/gpackages/template/repositories.html
@@ -0,0 +1,26 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<table class='table table-striped table-hover'>
+    <colgroup>
+        <col class="span1" >
+        <col class="span8" >
+    </colgroup>
+    <thead>
+            <tr>
+                <th>Category</th>
+                <th>Description</th>
+            </tr>
+    </thead>
+    <tbody>
+        {% for repository in repositories %}
+            <tr>
+                <td class="nowrap"><a href="#">{{ repository.name }}</a></td>
+                <td>{{ repository.description|default_if_none:"" }}</td>
+            </tr>
+        {% endfor %}
+    </tbody>
+</table>
+
+{% endblock content %}

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

[Slava Bacherikov]

commit:     70c4b033c57841206842260288068d240cbf59e2
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Fri Jun 15 23:27:40 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Fri Jun 15 23:27:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=70c4b033

Add activity indicator

---
 gpackages/apps/packages/views.py |    8 ++++----
 gpackages/template/base.html     |   12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.py
index 6975749..9a42912 100644
--- a/gpackages/apps/packages/views.py
+++ b/gpackages/apps/packages/views.py
@@ -13,26 +13,26 @@ class ContextListView(ListView):
         return ret
 
 class CategoriesListView(ContextListView):
-    extra_context = {'page_name': 'Categories'}
+    extra_context = {'page_name': 'Categories', 'nav_name' : 'categories'}
     template_name = 'categories.html'
     queryset = CategoryModel.objects.defer('metadata_hash').all()
     context_object_name = 'categories'
 
 class HerdsListView(ContextListView):
-    extra_context = {'page_name': 'Herds'}
+    extra_context = {'page_name': 'Herds', 'nav_name': 'herds'}
     template_name = 'herds.html'
     queryset = HerdsModel.objects.only('name', 'email', 'description').all()
     context_object_name = 'herds'
 
 class MaintainersListView(ContextListView):
     paginate_by = 40
-    extra_context = {'page_name': 'Maintainers'}
+    extra_context = {'page_name': 'Maintainers', 'nav_name': 'maintainers'}
     template_name = 'maintainers.html'
     queryset = MaintainerModel.objects.only('name', 'email' ).all()
     context_object_name = 'maintainers'
 
 class RepositoriesListView(ContextListView):
-    extra_context = {'page_name': 'Repsitories'}
+    extra_context = {'page_name': 'Repsitories', 'nav_name': 'repositories'}
     template_name = 'repositories.html'
     queryset = RepositoryModel.objects.only('name', 'description' ).all()
     context_object_name = 'repositories'

diff --git a/gpackages/template/base.html b/gpackages/template/base.html
index 0dfccae..e6d097e 100644
--- a/gpackages/template/base.html
+++ b/gpackages/template/base.html
@@ -119,12 +119,12 @@ Text
                         <div class="well">
                         <ul class="nav nav-list">
                             <li class="nav-header">Navigation</li>
-                            <li><a href="{% url 'categories' %}">Categories</a></li>
-                            <li><a href="#">Ebuilds</a></li>
-                            <li><a href="#">Packages</a></li>
-                            <li><a href="{% url 'maintainers' %}">Maintainers</a></li>
-                            <li><a href="{% url 'herds' %}">Herds</a></li>
-                            <li><a href="{% url 'repositories' %}">Repositories</a></li>
+                            <li {% if nav_name == 'categories' %}class="active"{% endif %}><a href="{% url 'categories' %}">Categories</a></li>
+                            <li {% if nav_name == 'ebuilds' %}class="active"{% endif %}><a href="#">Ebuilds</a></li>
+                            <li {% if nav_name == 'packages' %}class="active"{% endif %}><a href="#">Packages</a></li>
+                            <li {% if nav_name == 'maintainers' %}class="active"{% endif %}><a href="{% url 'maintainers' %}">Maintainers</a></li>
+                            <li {% if nav_name == 'herds' %}class="active"{% endif %}><a href="{% url 'herds' %}">Herds</a></li>
+                            <li {% if nav_name == 'repositories' %}class="active"{% endif %}><a href="{% url 'repositories' %}">Repositories</a></li>
                         </ul>
                        </div>
             </div> <!-- span3 --><!--}}}-->

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

[Slava Bacherikov]

commit:     5d9f474a47722e8536e07b5863a572c8e47ec02d
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Mon Jun 25 22:52:40 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Mon Jun 25 22:52:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=5d9f474a

Add license groups view

---
 gpackages/apps/packages/models.py      |    3 +++
 gpackages/apps/packages/urls.py        |    3 ++-
 gpackages/apps/packages/views.py       |    9 ++++++++-
 gpackages/template/base.html           |    1 +
 gpackages/template/license_groups.html |   27 +++++++++++++++++++++++++++
 5 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/models.py
index ee7851f..2b59deb 100644
--- a/gpackages/apps/packages/models.py
+++ b/gpackages/apps/packages/models.py
@@ -340,6 +340,9 @@ class LicenseGroupModel(models.Model):
     def __unicode__(self):
         return self.name
 
+    class Meta:
+        ordering = ('name',)
+
 class EbuildModel(AbstractDateTimeModel):
     package = models.ForeignKey(PackageModel, db_index = True)
     version = models.CharField(max_length = 26, db_index = True)

diff --git a/gpackages/apps/packages/urls.py b/gpackages/apps/packages/urls.py
index f101a02..a95de8b 100644
--- a/gpackages/apps/packages/urls.py
+++ b/gpackages/apps/packages/urls.py
@@ -1,10 +1,11 @@
 from django.conf.urls import patterns, include, url
 from views import CategoriesListView, HerdsListView, MaintainersListView, \
-                  RepositoriesListView
+                  RepositoriesListView, LicenseGroupsView
 
 urlpatterns = patterns('',
     url(r'categories/$', CategoriesListView.as_view(), name = 'categories'),
     url(r'herds/$', HerdsListView.as_view(), name = 'herds'),
     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 9a42912..0db39ba 100644
--- a/gpackages/apps/packages/views.py
+++ b/gpackages/apps/packages/views.py
@@ -3,7 +3,8 @@ from django.template.loader import get_template
 from django.template import TemplateDoesNotExist
 from django.http import Http404
 
-from models import CategoryModel, HerdsModel, MaintainerModel, RepositoryModel
+from models import CategoryModel, HerdsModel, MaintainerModel, \
+                   RepositoryModel, LicenseGroupModel
 
 class ContextListView(ListView):
     extra_context = {}
@@ -37,6 +38,12 @@ class RepositoriesListView(ContextListView):
     queryset = RepositoryModel.objects.only('name', 'description' ).all()
     context_object_name = 'repositories'
 
+class LicenseGroupsView(ContextListView):
+    extra_context = {'page_name': 'License Groups', 'nav_name': 'license_groups'}
+    queryset = LicenseGroupModel.objects.all().prefetch_related('licenses')
+    template_name = 'license_groups.html'
+    context_object_name = 'license_groups'
+
 class TemplatesDebugView(TemplateView):
 
     def get_template_names(self):

diff --git a/gpackages/template/base.html b/gpackages/template/base.html
index e6d097e..67e0b50 100644
--- a/gpackages/template/base.html
+++ b/gpackages/template/base.html
@@ -125,6 +125,7 @@ Text
                             <li {% if nav_name == 'maintainers' %}class="active"{% endif %}><a href="{% url 'maintainers' %}">Maintainers</a></li>
                             <li {% if nav_name == 'herds' %}class="active"{% endif %}><a href="{% url 'herds' %}">Herds</a></li>
                             <li {% if nav_name == 'repositories' %}class="active"{% endif %}><a href="{% url 'repositories' %}">Repositories</a></li>
+                            <li {% if nav_name == 'license_groups' %}class="active"{% endif %}><a href="{% url 'license_groups' %}">License Groups</a></li>
                         </ul>
                        </div>
             </div> <!-- span3 --><!--}}}-->

diff --git a/gpackages/template/license_groups.html b/gpackages/template/license_groups.html
new file mode 100644
index 0000000..af173e4
--- /dev/null
+++ b/gpackages/template/license_groups.html
@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<table class='table table-striped table-hover'>
+    <colgroup>
+        <col class="span1" >
+        <col class="span8" >
+    </colgroup>
+    <thead>
+            <tr>
+                <th>License group</th>
+                <th>Licenses</th>
+            </tr>
+    </thead>
+    <tbody>
+        {% for license_group in license_groups %}
+            <tr>
+                <td class="nowrap"><a href="#">{{ license_group.name }}</a></td>
+                <td>{% for license in license_group.licenses.all %}<a href="#">{{ license }}</a>, {% endfor %}</td>
+                <td>{{ herd.description|default_if_none:"" }}</td>
+            </tr>
+        {% endfor %}
+    </tbody>
+</table>
+
+{% endblock content %}