* [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/templates/includes/, gpackages/apps/packages/templatetags/, ...
@ 2012-08-07 0:10 Slava Bacherikov
0 siblings, 0 replies; only message in thread
From: Slava Bacherikov @ 2012-08-07 0:10 UTC (permalink / raw
To: gentoo-commits
commit: 94d06eaa0b0f0f69f1c674ec96a518017466683c
Author: Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Mon Aug 6 23:33:16 2012 +0000
Commit: Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Mon Aug 6 23:48:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=94d06eaa
Organized templates hierarchy
---
gpackages/apps/packages/templatetags/packages.py | 12 ++++++------
gpackages/templates/ebuild.html | 4 ++--
gpackages/templates/ebuilds.html | 2 +-
.../templates/{ => includes}/ebuild_object.html | 0
.../templates/{ => includes}/ebuild_table.html | 0
.../templates/{ => includes}/ebuild_use_flag.html | 0
.../templates/{ => includes}/keywords_table.html | 0
.../templates/{ => includes}/last_updated.html | 0
.../templates/{ => includes}/package_object.html | 0
.../{ => includes}/portage_news_object.html | 0
.../templates/{ => includes}/recent_ebuilds.html | 0
gpackages/templates/package.html | 4 ++--
gpackages/templates/packages.html | 2 +-
gpackages/templates/portage_news.html | 2 +-
gpackages/templates/portage_news_item.html | 2 +-
15 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/gpackages/apps/packages/templatetags/packages.py b/gpackages/apps/packages/templatetags/packages.py
index d0d8835..212cc52 100644
--- a/gpackages/apps/packages/templatetags/packages.py
+++ b/gpackages/apps/packages/templatetags/packages.py
@@ -14,8 +14,8 @@ from generic.utils import inclusion_cached_tag
def last_updated_key():
return 'last_updated_th'
-@inclusion_cached_tag('last_updated.html', register, last_updated_key, \
- time_zone = False)
+@inclusion_cached_tag('includes/last_updated.html', register,
+ last_updated_key, time_zone = False)
def last_updated():
updated = cache.get('last_updated_t')
if not updated:
@@ -30,7 +30,7 @@ def last_updated():
return {'last_updated': updated}
-@register.inclusion_tag('keywords_table.html')
+@register.inclusion_tag('includes/keywords_table.html')
def render_keywords_table(obj, arch_list):
ebuilds = obj.get_ebuilds_and_keywords(arch_list)
return {'arches': arch_list, 'ebuilds' : ebuilds}
@@ -51,7 +51,7 @@ register.filter('license_urlize', license_urlize)
def recent_ebuilds_cache_key(num = 10):
return 'recent_ebuilds_th_' + str(num)
-@inclusion_cached_tag('recent_ebuilds.html', register, \
+@inclusion_cached_tag('includes/recent_ebuilds.html', register, \
recent_ebuilds_cache_key, time_zone = False)
def recent_ebuilds(num = 10):
query = EbuildModel.objects.order_by('-updated_datetime').all().\
@@ -90,8 +90,8 @@ def use_flag_table_key(ebuild):
else:
return 'use_flag_table_ebuild' + str(ebuild)
-@inclusion_cached_tag('ebuild_use_flag.html', register, use_flag_table_key,
- time_zone = False)
+@inclusion_cached_tag('includes/ebuild_use_flag.html', register,
+ use_flag_table_key, time_zone = False)
def use_flag_table(ebuild):
use_flags = []
if ebuild is not None:
diff --git a/gpackages/templates/ebuild.html b/gpackages/templates/ebuild.html
index 20df4cf..b4b639d 100644
--- a/gpackages/templates/ebuild.html
+++ b/gpackages/templates/ebuild.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% block content %}
- {% include 'ebuild_object.html' %}
- {% include 'ebuild_table.html' with ebuild=ebuild package=None only %}
+ {% include 'includes/ebuild_object.html' %}
+ {% include 'includes/ebuild_table.html' with ebuild=ebuild package=None only %}
{% endblock content %}
diff --git a/gpackages/templates/ebuilds.html b/gpackages/templates/ebuilds.html
index 3995554..7f6e5ed 100644
--- a/gpackages/templates/ebuilds.html
+++ b/gpackages/templates/ebuilds.html
@@ -4,7 +4,7 @@
{% block content %}
{% for ebuild in ebuilds %}
- {% include 'ebuild_object.html' %}
+ {% include 'includes/ebuild_object.html' %}
{% endfor %}
{% paginator page_obj 3 2 %}
{% endblock content %}
diff --git a/gpackages/templates/ebuild_object.html b/gpackages/templates/includes/ebuild_object.html
similarity index 100%
rename from gpackages/templates/ebuild_object.html
rename to gpackages/templates/includes/ebuild_object.html
diff --git a/gpackages/templates/ebuild_table.html b/gpackages/templates/includes/ebuild_table.html
similarity index 100%
rename from gpackages/templates/ebuild_table.html
rename to gpackages/templates/includes/ebuild_table.html
diff --git a/gpackages/templates/ebuild_use_flag.html b/gpackages/templates/includes/ebuild_use_flag.html
similarity index 100%
rename from gpackages/templates/ebuild_use_flag.html
rename to gpackages/templates/includes/ebuild_use_flag.html
diff --git a/gpackages/templates/keywords_table.html b/gpackages/templates/includes/keywords_table.html
similarity index 100%
rename from gpackages/templates/keywords_table.html
rename to gpackages/templates/includes/keywords_table.html
diff --git a/gpackages/templates/last_updated.html b/gpackages/templates/includes/last_updated.html
similarity index 100%
rename from gpackages/templates/last_updated.html
rename to gpackages/templates/includes/last_updated.html
diff --git a/gpackages/templates/package_object.html b/gpackages/templates/includes/package_object.html
similarity index 100%
rename from gpackages/templates/package_object.html
rename to gpackages/templates/includes/package_object.html
diff --git a/gpackages/templates/portage_news_object.html b/gpackages/templates/includes/portage_news_object.html
similarity index 100%
rename from gpackages/templates/portage_news_object.html
rename to gpackages/templates/includes/portage_news_object.html
diff --git a/gpackages/templates/recent_ebuilds.html b/gpackages/templates/includes/recent_ebuilds.html
similarity index 100%
rename from gpackages/templates/recent_ebuilds.html
rename to gpackages/templates/includes/recent_ebuilds.html
diff --git a/gpackages/templates/package.html b/gpackages/templates/package.html
index 1a17ef3..9126921 100644
--- a/gpackages/templates/package.html
+++ b/gpackages/templates/package.html
@@ -2,6 +2,6 @@
{% load packages %}
{% block content %}
- {% include 'package_object.html' %}
- {% include 'ebuild_table.html' with ebuild=package.latest_ebuild package=package only %}
+ {% include 'includes/package_object.html' %}
+ {% include 'includes/ebuild_table.html' with ebuild=package.latest_ebuild package=package only %}
{% endblock content %}
diff --git a/gpackages/templates/packages.html b/gpackages/templates/packages.html
index f66dca5..0a9741d 100644
--- a/gpackages/templates/packages.html
+++ b/gpackages/templates/packages.html
@@ -5,7 +5,7 @@
{% block content %}
{% for package in packages %}
- {% include 'package_object.html' %}
+ {% include 'includes/package_object.html' %}
{% endfor %}
{% paginator page_obj 3 2 %}
{% endblock content %}
diff --git a/gpackages/templates/portage_news.html b/gpackages/templates/portage_news.html
index ee0bfc2..f217857 100644
--- a/gpackages/templates/portage_news.html
+++ b/gpackages/templates/portage_news.html
@@ -5,7 +5,7 @@
{% block content %}
{% for news_item in news %}
- {% include 'portage_news_object.html' %}
+ {% include 'includes/portage_news_object.html' %}
{% endfor %}
{% paginator page_obj 3 1 %}
diff --git a/gpackages/templates/portage_news_item.html b/gpackages/templates/portage_news_item.html
index 9f4c711..c490a6d 100644
--- a/gpackages/templates/portage_news_item.html
+++ b/gpackages/templates/portage_news_item.html
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% block content %}
- {% include 'portage_news_object.html' %}
+ {% include 'includes/portage_news_object.html' %}
{% endblock content %}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-07 0:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-07 0:10 [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/templates/includes/, gpackages/apps/packages/templatetags/, Slava Bacherikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox