* [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/main/, gpackages/apps/packages/, gpackages/template/
@ 2012-06-14 19:10 Slava Bacherikov
0 siblings, 0 replies; only message in thread
From: Slava Bacherikov @ 2012-06-14 19:10 UTC (permalink / raw
To: gentoo-commits
commit: 916f739f0cebc70f2c3d46852c822d6b584f389e
Author: Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Thu Jun 14 19:10:38 2012 +0000
Commit: Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Thu Jun 14 19:10:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=916f739f
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/urls.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 = patterns('',
+ url(r'categories', CategoriesListView.as_view()),
+)
diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.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
-class BaseView(TemplateView):
- template_name = "base.html"
+from models import CategoryModel
+
+class CategoriesListView(ListView):
+ template_name = 'categories.html'
+ queryset = CategoryModel.objects.defer('metadata_hash').all()
+ context_object_name = 'categories'
+
+class TemplatesDebugView(TemplateView):
+
+ def get_template_names(self):
+ templatename = self.kwargs.get('templatename')
+ if not templatename:
+ raise Http404
+ return [templatename, templatename +'.html', templatename + '.htm']
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 = patterns('',
# 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')),
)
if DEBUG:
from django.contrib import databrowse
- from packages.views import BaseView
+ from packages.views import TemplatesDebugView
from packages.models import EbuildModel, PackageModel, UseFlagModel, \
LicensModel, CategoryModel, Keyword, \
ArchesModel, HomepageModel, HerdsModel, \
@@ -30,8 +30,8 @@ if DEBUG:
UseFlagDescriptionModel, RepositoryModel,
VirtualPackageModel)
urlpatterns += (
- url(r'^data/(.*)',databrowse.site.root),
- url(r'^base/$',BaseView.as_view()),
- url(r'^404/$','django.views.defaults.page_not_found', name = '404'),
- url(r'^500/$','django.views.defaults.server_error', name = '500'),
+ url(r'^data/(.*)', databrowse.site.root),
+ url(r'^templateview/(?P<templatename>.*)/?$', TemplatesDebugView.as_view()),
+ url(r'^404/$', 'django.views.defaults.page_not_found', name = '404'),
+ url(r'^500/$', 'django.views.defaults.server_error', name = '500'),
)
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 @@
<!DOCTYPE html>
<html lang="en">
<head>
- <meta charset="utf-8">
+ <meta charset="utf-8"><!--{{{-->
<title>Gentoo Packages</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
@@ -33,12 +33,12 @@
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
-
+<!--}}}-->
</head>
<body>
-
- <div class="navbar navbar-fixed-top">
+{% block body %}
+ <div class="navbar navbar-fixed-top"><!--{{{-->
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -76,64 +76,28 @@
</div><!--/.nav-collapse -->
</div>
</div>
- </div>
+ </div><!--}}}-->
<div class="container">
- <div class="row">
+ {% block container %}
+ <div class="row"> <!-- Page type --><!--{{{-->
<ul class="breadcrumb">
<li class="active">Categories</li>
</ul>
- </div>
+ </div> <!-- end page type --><!--}}}-->
<div class="row">
- <div class="span9">
- <table class='table table-striped table-hover'>
- <colgroup>
- <col class="span2" >
- <col class="span7" >
- </colgroup>
-
- <thead>
- <tr>
- <th>Category</th>
- <th>Description</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>app-accesebility (11/43)</td>
- <td>Some descr</td>
- </tr>
- <tr>
- <td>app-admin</td>
- <td>Admin utils</td>
- </tr>
- <tr>
- <td>app-dict</td>
- <td>Dictionarys</td>
- </tr>
- <tr>
- <td>www-client</td>
- <td>Web clients</td>
- </tr>
- <tr>
- <td>mail-client</td>
- <td>Mail User Agents</td>
- </tr>
- <tr>
- <td>x11-thems</td>
- <td>X11 Thems</td>
- </tr>
- </tbody>
- </table>
-
-
- </div>
- <div class="span3">
- <div class="well">
+ <div class="span9" id="content">
+ {% block content %}
+Text
+ {% endblock content %}
+ </div> <!-- span9 -->
+
+ <div class="span3"><!--{{{-->
+ <div class="well">
<div id="rightcontent">
<div>
- <span class="label label-info" style="display: block"> Last update</span>11 Jun 2012<br/> 10:47 UTC
- </div><br/>
+ <span class="label label-info" style="display: block"> Last update</span>11 Jun 2012<br/> 10:47 UTC
+ </div><br/>
<div>
<span class="left-legend label label-info" style="display: block;">Legend</span>
<ul class="legend left-bar-list">
@@ -142,37 +106,34 @@
<li><span class="hardmask">M</span> - hardmask</li>
</ul>
</div>
- <ul class="nav nav-list" id="tab">
-
- </ul>
- </div>
- </div> <!-- /well -->
- <div class="well">
- <ul class="nav nav-list">
- <li class="nav-header">Navigation</li>
- <li><a href="#">Categories</a></li>
- <li><a href="#">Ebuilds</a></li>
- <li><a href="#">Packages</a></li>
- </ul>
- </div>
- </div>
+ </div>
+ </div> <!-- /well -->
+ <div class="well">
+ <ul class="nav nav-list">
+ <li class="nav-header">Navigation</li>
+ <li><a href="#">Categories</a></li>
+ <li><a href="#">Ebuilds</a></li>
+ <li><a href="#">Packages</a></li>
+ </ul>
+ </div>
+ </div> <!-- span3 --><!--}}}-->
- <div class="row-fluid">
+ <div class="row-fluid"><!--{{{-->
<div class="span12">
<hr>
<footer class="footer">
<p class="pull-right">Copyright 2007-2012 Gentoo Foundation, Inc.</p>
</footer>
</div>
- </div>
+ </div><!--}}}-->
+ {% endblock container %}
</div> <!-- /container -->
<!-- Le javascript
================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
<script src="{{ STATIC_URL }}js/jquery.js"></script>
<script src="{{ STATIC_URL }}js/bootstrap.js"></script>
-
+{% endblock body %}
</body>
</html>
diff --git a/gpackages/template/categories.html b/gpackages/template/categories.html
new file mode 100644
index 0000000..f469a34
--- /dev/null
+++ b/gpackages/template/categories.html
@@ -0,0 +1,26 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<table class='table table-striped table-hover'>
+ <colgroup>
+ <col class="span2" >
+ <col class="span7" >
+ </colgroup>
+ <thead>
+ <tr>
+ <th>Category</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for category in categories %}
+ <tr>
+ <td><a href="#">{{ category.category }}</a></td>
+ <td>{{ category.description|default_if_none:"" }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+</table>
+
+{% endblock content %}
diff --git a/gpackages/template/first.html b/gpackages/template/first.html
index f173bf1..3e835ef 100644
--- a/gpackages/template/first.html
+++ b/gpackages/template/first.html
@@ -8,7 +8,7 @@
<meta name="author" content="">
<!-- Le styles -->
- <link href="./css/style.css" rel="stylesheet">
+ <link href="{{ STATIC_URL }}/css/style.css" rel="stylesheet">
<style>
.well {
border-top-left-radius: 10px;
@@ -32,7 +32,7 @@
}
</style>
- <link href="./css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="{{ STATIC_URL }}/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
@@ -479,8 +479,8 @@
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <script src="./js/jquery.js"></script>
- <script src="./js/bootstrap.js"></script>
+ <script src="{{ STATIC_URL }}js/jquery.js"></script>
+ <script src="{{ STATIC_URL }}js/bootstrap.js"></script>
</body>
</html>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-14 19:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-14 19:10 [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/main/, gpackages/apps/packages/, gpackages/template/ Slava Bacherikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox