Architecture:	{{ pkg.arch.name }}
Repository:	{{ pkg.repo.name\|capfirst }}
Split Packages:	{% for s in splits %}{% pkg_details_link s %}{% if not forloop.last %}, {% endif %}{% endfor %}
Base Package:	{% pkg_details_link base %}	{{ pkg.pkgbase }}
Description:	{{ pkg.pkgdesc\|default:"" }}
Upstream URL:	{% if pkg.url %}{{ pkg.url\|url_unquote }}{% endif %}
License(s):	{{ pkg.licenses.all\|join:", " }}
Groups:	{% for g in groups %} - {{ g.name }}{% if not forloop.last %}, {% endif %}{% endfor %} -
Provides:	{% include "packages/details_relatedto.html.jinja" %}
Replaces:	{% include "packages/details_relatedto.html.jinja" %}
Conflicts:	{% include "packages/details_relatedto.html.jinja" %}
Reverse Conflicts:	{% for conflict in rev_conflicts %} - {% pkg_details_link conflict %}{% if not forloop.last %}, {% endif %}{% endfor %}
Maintainers:	{% if maints %} - {% for m in maints %} - {% maintainer_link m %} - {% endfor %} - {% else %}Orphan{% endif %} -
Package Size:	{{ pkg.compressed_size\|filesizeformat }}
Installed Size:	{{ pkg.installed_size\|filesizeformat }}
Last Packager:	{% with pkg.packager as pkgr %}{% if pkgr %}{% packager_link pkgr %}{% else %}{{ pkg.packager_str }}{% endif %}{% endwith %}
Build Date:	{{ pkg.build_date\|date:"DATETIME_FORMAT" }} UTC
Signed By:	{% with pkg.signer as signer %}{% if signer %}{% pgp_key_link pkg.signature.key_id signer.get_full_name %}{% else %}Unknown ({% pgp_key_link pkg.signature.key_id %}){% endif %}{% endwith %}
Signature Date:	{{ pkg.signature.creation_time\|date:"DATETIME_FORMAT" }} UTC
Signed By:	Unsigned
Last Updated:	{{ pkg.last_update\|date:"DATETIME_FORMAT" }} UTC
Last Flag Request:	From {{ flag_request.who }} on {{ flag_request.created\|date }}: - {{ flag_request.message\|linebreaksbr\|default:"{no message}" }}

Architecture:	{{ pkg.arch.name }}
Repository:	{{ pkg.repo.name\|capfirst }}
Split Packages:	{% for s in splits %}{{ details.details_link(s) }}{% if not loop.last %}, {% endif %}{% endfor %}
Base Package:	{{ details.details_link(base) }}	{{ pkg.pkgbase }}
Description:	{{ pkg.pkgdesc\|default("") }}
Upstream URL:	{% if pkg.url %}{{ pkg.url\|url_unquote }}{% endif %}
License(s):	{{ pkg.licenses.all()\|join(", ") }}
Groups:	{% for g in groups %} + {{ g.name }}{% if not loop.last %}, {% endif %}{% endfor %} +
Provides:	{% include "packages/details_relatedto.html.jinja" %}
Replaces:	{% include "packages/details_relatedto.html.jinja" %}
Conflicts:	{% include "packages/details_relatedto.html.jinja" %}
Reverse Conflicts:	{% for conflict in rev_conflicts %} + {{ details.details_link(conflict) }}{% if not loop.last %}, {% endif %}{% endfor %}
Maintainers:	{% if maints %} + {% for m in maints %} + {{ maintainer_link(m)\|safe }} + {% endfor %} + {% else %}Orphan{% endif %} +
Package Size:	{{ pkg.compressed_size\|filesizeformat }}
Installed Size:	{{ pkg.installed_size\|filesizeformat }}
Last Packager:	{% with pkgr = pkg.packager %}{% if pkgr %}{{ packager_link(pkgr)\|safe }}{% else %}{{ pkg.packager_str }}{% endif %}{% endwith %}
Build Date:	{{ pkg.build_date\|date("DATETIME_FORMAT") }} UTC
Signed By:	{% with signer = pkg.signer %}{% if signer %}{{ pgp_key_link(pkg.signature.key_id, signer.get_full_name())\|safe }}{% else %}Unknown ({{ pgp_key_link(pkg.signature.key_id)\|safe }}){% endif %}{% endwith %}
Signature Date:	{{ pkg.signature.creation_time\|date("DATETIME_FORMAT") }} UTC
Signed By:	Unsigned
Last Updated:	{{ pkg.last_update\|date("DATETIME_FORMAT") }} UTC
Last Flag Request:	From {{ flag_request.who() }} on {{ flag_request.created\|date }}: + {{ flag_request.message\|linebreaksbr\|default("{no message}") }}

{% include "packages/search_paginator.html" %}

{% csrf_token %} - @@ -96,10 +91,8 @@

Package Search

{% endif %} - - - + {% else %}

We couldn't find any packages matching your query. Try searching again diff --git a/templates/packages/search_paginator.html b/templates/packages/search_paginator.html index 3c368b82..4c2bef03 100644 --- a/templates/packages/search_paginator.html +++ b/templates/packages/search_paginator.html @@ -22,6 +22,6 @@

{% else %} -

{{ package_list.count }} packages found.

{{ package_list|length }} packages found.

{% endif %} -- cgit v1.2.3-54-g00ecf From 061805aa73d3d5b418a61fa6d6591d1a7d03d9ed Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 18 Oct 2014 18:28:26 -0500 Subject: FS#30773: put exact matches at top There have been a few proposed solutions to this, but there really isn't anything without a drawback. Things break pagination, require loading the entire result set from the database, etc. Just plop a new table on the page if someone did a so-called "simple" search and we have a match. Only show on the first page of the search results. This results in a relatively fast experience for someone doing something like searching for the "perl" package. Signed-off-by: Dan McGee --- packages/views/search.py | 6 ++++++ templates/packages/search.html | 36 ++++++++++++++++++++++++++++++++ templates/packages/search_paginator.html | 4 ++-- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/packages/views/search.py b/packages/views/search.py index b3778172..0b776d79 100644 --- a/packages/views/search.py +++ b/packages/views/search.py @@ -45,6 +45,12 @@ def __init__(self, *args, **kwargs): [('', 'All'), ('unknown', 'Unknown')] + \ [(m.username, m.get_full_name()) for m in maints] + def exact_matches(self): + # only do exact match search if 'q' is sole parameter + if self.changed_data != ['q']: + return [] + return Package.objects.normal().filter(pkgname=self.cleaned_data['q']) + def parse_form(form, packages): if form.cleaned_data['repo']: diff --git a/templates/packages/search.html b/templates/packages/search.html index db86fb67..ca95c3f0 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -40,6 +40,42 @@

Package Search

+{% if not is_paginated or page_obj.number == 1 %}{% with search_form.exact_matches as exact_matches %}{% if exact_matches %} +

{{ exact_matches|length }} exact match{{ exact_matches|pluralize:"es" }} found.

+ + + + + + + + + + + + + {% for pkg in exact_matches %} + + + + {% if pkg.flag_date %} + + {% else %} + + {% endif %} + + + + {% endfor %} + +

Arch	Repo	Name	Version	Description	Last Updated	Flag Date
{{ pkg.arch.name }}	{{ pkg.repo.name\|capfirst }}	{% pkg_details_link pkg %}	{{ pkg.full_version }}	{{ pkg.full_version }}	{{ pkg.pkgdesc }}	{{ pkg.last_update\|date }}	{{ pkg.flag_date\|date }}

{% include "packages/search_paginator.html" %} diff --git a/templates/packages/search_paginator.html b/templates/packages/search_paginator.html index 4c2bef03..a748d26b 100644 --- a/templates/packages/search_paginator.html +++ b/templates/packages/search_paginator.html @@ -1,6 +1,6 @@

{% if is_paginated %} -

{{ paginator.count }} packages found. +

{{ paginator.count }} matching packages found. Page {{ page_obj.number }} of {{ paginator.num_pages }}.

@@ -22,6 +22,6 @@

{% else %} -

{{ package_list|length }} packages found.

{{ package_list|length }} matching package{{ package_list|pluralize }} found.

{% endif %}

-- cgit v1.2.3-54-g00ecf From 15a27036a51d71f6f0bc4f15ae4e79b5b4de6637 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 18 Oct 2014 18:43:24 -0500 Subject: Fix colspan values Signed-off-by: Dan McGee --- templates/packages/stale_relations.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html index 2b5af236..2dafc2be 100644 --- a/templates/packages/stale_relations.html +++ b/templates/packages/stale_relations.html @@ -37,7 +37,7 @@

Inactive User Relations ({{ inactive_user|length }})

{{ relation.created }} {% empty %} - No inactive user relations. + No inactive user relations. {% endfor %} @@ -66,7 +66,7 @@

Relations with Non-existent `pkgbase` ({{ missing_pkgbase|length }})< {{ relation.last_update.created }} {% empty %} - No non-existent pkgbase relations. + No non-existent pkgbase relations. {% endfor %} @@ -100,7 +100,7 @@

Maintainers with Wrong Permissions ({{ wrong_permissions|length }})

{{ relation.repositories|join:", " }} {% empty %} - No relations with wrong permissions. + No relations with wrong permissions. {% endfor %} -- cgit v1.2.3-54-g00ecf From 21b8ff5cf2b60f862e3fc3cfb43d8d8af0d6189f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 18 Oct 2014 19:21:26 -0500 Subject: Tweak search results page a bit more Signed-off-by: Dan McGee --- sitestatic/archweb.css | 4 ++++ templates/packages/search.html | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css index 53fa6274..edabcfb7 100644 --- a/sitestatic/archweb.css +++ b/sitestatic/archweb.css @@ -701,6 +701,10 @@ table.results { color: red; } + .results tr.empty td { + text-align: center; + } + /* pkglist: layout */ #pkglist-about { margin-top: 1.5em; diff --git a/templates/packages/search.html b/templates/packages/search.html index ca95c3f0..d4a47b26 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -58,7 +58,8 @@

Package Search

- {% for pkg in exact_matches %} + {% for pkg in exact_matches %} + {{ pkg.arch.name }} {{ pkg.repo.name|capfirst }} {% pkg_details_link pkg %} @@ -70,13 +71,13 @@

Package Search

{{ pkg.pkgdesc }} {{ pkg.last_update|date }} {{ pkg.flag_date|date }} - {% endfor %} + + {% endfor %}

{% include "packages/search_paginator.html" %}

We couldn't find any packages matching your query. Try searching again + +

Can't find what you are looking for? Try searching again using different criteria, or try {% if search_form.q.data %} searching the AUR {% else %}searching the AUR{% endif %} to see if the package can be found there.

-{% endif %} -

You are browsing the Arch Linux package database. From here you can find - detailed information about packages located in the official supported repositories. - For unsupported packages, browse the Arch User Repository (AUR).

+ detailed information about packages located in the official supported repositories.

{{ pkg.pkgname }} {{ pkg.full_version }} File List

Package has {{ files_count }} file{{ files_count|pluralize }} and {{ dir_count }} director{{ dir_count|pluralize:"y,ies" }}.

Back to Package

- {% include "packages/files_list.html" %} + {% include "packages/files_list.html.jinja" %}

diff --git a/templates/packages/files_list.html b/templates/packages/files_list.html deleted file mode 100644 index 93a2c847..00000000 --- a/templates/packages/files_list.html +++ /dev/null @@ -1,16 +0,0 @@ -{% if pkg.last_update > pkg.files_last_update %} -

Note: This file list was generated from a previous version -of the package; it may be out of date.

-{% endif %} -{% if pkg.files_last_update %} -{% if files|length %} -

{{ file.directory }}{{ file.filename|default:'' }}

-{% else %} -

Package has no files.

-{% endif %} -{% else %} -

No file list available.

-{% endif %} diff --git a/templates/packages/files_list.html.jinja b/templates/packages/files_list.html.jinja new file mode 100644 index 00000000..c8fc3b1a --- /dev/null +++ b/templates/packages/files_list.html.jinja @@ -0,0 +1,16 @@ +{% if pkg.last_update > pkg.files_last_update %} +

Note: This file list was generated from a previous version +of the package; it may be out of date.

+{% endif %} +{% if pkg.files_last_update %} +{% if files|length %} +

{{ file.directory }}{{ file.filename|default('') }}

+{% else %} +

Package has no files.

+{% endif %} +{% else %} +

No file list available.

+{% endif %} -- cgit v1.2.3-54-g00ecf From 7c26f6b7a4d29faede58d2feb13ef961e4725637 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 19 Oct 2014 14:08:15 -0500 Subject: Use raw DB query to fetch last modified date Signed-off-by: Dan McGee --- mirrors/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mirrors/views.py b/mirrors/views.py index 26b5b802..55c40c4d 100644 --- a/mirrors/views.py +++ b/mirrors/views.py @@ -6,6 +6,7 @@ from django import forms from django.forms.widgets import CheckboxSelectMultiple from django.core.serializers.json import DjangoJSONEncoder +from django.db import connection from django.db.models import Q from django.http import Http404, HttpResponse from django.shortcuts import get_object_or_404, redirect, render @@ -222,7 +223,9 @@ def url_details(request, name, url_id): def status_last_modified(request, *args, **kwargs): - return MirrorLog.objects.values_list('check_time', flat=True).latest() + cursor = connection.cursor() + cursor.execute("SELECT MAX(check_time) FROM mirrors_mirrorlog") + return cursor.fetchone()[0] @condition(last_modified_func=status_last_modified) -- cgit v1.2.3-54-g00ecf From 1ff2e37e049004852681794537417a1947bf6f18 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 19 Oct 2014 14:19:05 -0500 Subject: Simplify last modified and etags processing for feeds We had this elaborate system set up with caching and invalidation, which is overkill since we cache the result of the view anyway. Just hit the database when needed to find the last change to the respective model class and be done with it. Signed-off-by: Dan McGee --- feeds.py | 14 +++++++++----- main/models.py | 6 +----- main/utils.py | 42 ------------------------------------------ news/models.py | 7 ++----- 4 files changed, 12 insertions(+), 57 deletions(-) diff --git a/feeds.py b/feeds.py index feb8a84a..d1836178 100644 --- a/feeds.py +++ b/feeds.py @@ -4,11 +4,11 @@ from django.contrib.sites.models import Site from django.contrib.syndication.views import Feed +from django.db import connection from django.db.models import Q from django.utils.feedgenerator import Rss201rev2Feed from django.views.decorators.http import condition -from main.utils import retrieve_latest from main.models import Arch, Repo, Package from news.models import News from releng.models import Release @@ -64,13 +64,15 @@ def write(self, outfile, encoding): def package_etag(request, *args, **kwargs): - latest = retrieve_latest(Package) + latest = package_last_modified(request) if latest: return hashlib.md5(str(kwargs) + str(latest)).hexdigest() return None def package_last_modified(request, *args, **kwargs): - return retrieve_latest(Package) + cursor = connection.cursor() + cursor.execute("SELECT MAX(last_update) FROM packages") + return cursor.fetchone()[0] class PackageFeed(Feed): @@ -148,13 +150,15 @@ def item_categories(self, item): def news_etag(request, *args, **kwargs): - latest = retrieve_latest(News, 'last_modified') + latest = news_last_modified(request) if latest: return hashlib.md5(str(latest)).hexdigest() return None def news_last_modified(request, *args, **kwargs): - return retrieve_latest(News, 'last_modified') + cursor = connection.cursor() + cursor.execute("SELECT MAX(last_modified) FROM news") + return cursor.fetchone()[0] class NewsFeed(Feed): diff --git a/main/models.py b/main/models.py index 09b1adc0..1b95f3fa 100644 --- a/main/models.py +++ b/main/models.py @@ -443,12 +443,8 @@ class Meta: db_table = 'package_files' -# connect signals needed to keep cache in line with reality -from main.utils import refresh_latest -from django.db.models.signals import pre_save, post_save +from django.db.models.signals import pre_save -post_save.connect(refresh_latest, sender=Package, - dispatch_uid="main.models") # note: reporead sets the 'created' field on Package objects, so no signal # listener is set up here to do so pre_save.connect(set_created_field, sender=Donor, diff --git a/main/utils.py b/main/utils.py index 97cc540a..cf156566 100644 --- a/main/utils.py +++ b/main/utils.py @@ -12,11 +12,6 @@ from django.template.defaultfilters import slugify -CACHE_TIMEOUT = 1800 -INVALIDATE_TIMEOUT = 10 -CACHE_LATEST_PREFIX = 'cache_latest_' - - def cache_function_key(func, args, kwargs): raw = [func.__name__, func.__module__, args, kwargs] pickled = pickle.dumps(raw, protocol=pickle.HIGHEST_PROTOCOL) @@ -76,43 +71,6 @@ def format_http_headers(request): make_choice = lambda l: [(str(m), str(m)) for m in l] -# These are in here because we would be jumping around in some import circles -# and hoops otherwise. The only thing currently using these keys is the feed -# caching stuff. - -def refresh_latest(**kwargs): - '''A post_save signal handler to clear out the cached latest value for a - given model.''' - cache_key = CACHE_LATEST_PREFIX + kwargs['sender'].__name__ - # We could delete the value, but that could open a race condition - # where the new data wouldn't have been committed yet by the calling - # thread. Instead, explicitly set it to None for a short amount of time. - # Hopefully by the time it expires we will have committed, and the cache - # will be valid again. See "Scaling Django" by Mike Malone, slide 30. - cache.set(cache_key, None, INVALIDATE_TIMEOUT) - - -def retrieve_latest(sender, latest_by=None): - # we could break this down based on the request url, but it would probably - # cost us more in query time to do so. - cache_key = CACHE_LATEST_PREFIX + sender.__name__ - latest = cache.get(cache_key) - if latest: - return latest - try: - if latest_by is None: - latest_by = sender._meta.get_latest_by - latest = sender.objects.values(latest_by).latest(latest_by)[latest_by] - # Using add means "don't overwrite anything in there". What could be in - # there is an explicit None value that our refresh signal set, which - # means we want to avoid race condition possibilities for a bit. - cache.add(cache_key, latest, CACHE_TIMEOUT) - return latest - except sender.DoesNotExist: - pass - return None - - def set_created_field(sender, **kwargs): '''This will set the 'created' field on any object to the current UTC time if it is unset. diff --git a/news/models.py b/news/models.py index d51db7c7..985c1088 100644 --- a/news/models.py +++ b/news/models.py @@ -45,12 +45,9 @@ def set_news_fields(sender, **kwargs): news.guid = 'tag:%s,%s:%s' % (Site.objects.get_current(), current_time.strftime('%Y-%m-%d'), news.get_absolute_url()) -# connect signals needed to keep cache in line with reality -from main.utils import refresh_latest -from django.db.models.signals import pre_save, post_save -post_save.connect(refresh_latest, sender=News, - dispatch_uid="news.models") +from django.db.models.signals import pre_save + pre_save.connect(set_news_fields, sender=News, dispatch_uid="news.models") -- cgit v1.2.3-54-g00ecf From 7c46d07f6417382e560d32c361c94dd8f2b9ddb8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 19 Oct 2014 18:12:58 -0500 Subject: Use varied prime numbers for caching lengths Signed-off-by: Dan McGee --- devel/utils.py | 2 +- main/templatetags/pgp.py | 2 +- packages/views/__init__.py | 4 ++-- public/views.py | 14 +++++++------- urls.py | 17 ++++++++--------- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/devel/utils.py b/devel/utils.py index 340841f5..0cafbb59 100644 --- a/devel/utils.py +++ b/devel/utils.py @@ -9,7 +9,7 @@ from main.models import Package from packages.models import PackageRelation -@cache_function(300) +@cache_function(283) def get_annotated_maintainers(): maintainers = User.objects.filter(is_active=True).order_by( 'first_name', 'last_name') diff --git a/main/templatetags/pgp.py b/main/templatetags/pgp.py index cc080439..2417f688 100644 --- a/main/templatetags/pgp.py +++ b/main/templatetags/pgp.py @@ -44,7 +44,7 @@ def pgp_key_link(key_id, link_text=None): return '%s' % values -@cache_function(1800) +@cache_function(1741) def name_for_key(normalized): try: matching_key = DeveloperKey.objects.select_related( diff --git a/packages/views/__init__.py b/packages/views/__init__.py index 46c99985..6b44206a 100644 --- a/packages/views/__init__.py +++ b/packages/views/__init__.py @@ -35,7 +35,7 @@ def opensearch(request): @require_safe -@cache_control(public=True, max_age=300) +@cache_control(public=True, max_age=613) def opensearch_suggest(request): search_term = request.GET.get('q', '') if search_term == '': @@ -55,7 +55,7 @@ def opensearch_suggest(request): 'pkgname', flat=True).order_by('pkgname').distinct()[:10] results = [search_term, list(names)] to_json = json.dumps(results, ensure_ascii=False) - cache.set(cache_key, to_json, 300) + cache.set(cache_key, to_json, 613) return HttpResponse(to_json, content_type='application/x-suggestions+json') diff --git a/public/views.py b/public/views.py index 3b23bd42..62d1137a 100644 --- a/public/views.py +++ b/public/views.py @@ -17,7 +17,7 @@ from .utils import get_recent_updates -@cache_control(max_age=300) +@cache_control(max_age=307) def index(request): if request.user.is_authenticated(): def updates(): @@ -50,7 +50,7 @@ def updates(): } -@cache_control(max_age=300) +@cache_control(max_age=307) def userlist(request, user_type='devs'): users = User.objects.order_by( 'first_name', 'last_name').select_related('userprofile') @@ -70,7 +70,7 @@ def userlist(request, user_type='devs'): return render(request, 'public/userlist.html', context) -@cache_control(max_age=300) +@cache_control(max_age=307) def donate(request): context = { 'donors': Donor.objects.filter(visible=True).order_by('name'), @@ -88,7 +88,7 @@ def _mirror_urls(): return sorted(urls, key=sort_by) -@cache_control(max_age=300) +@cache_control(max_age=307) def download(request): try: release = Release.objects.filter(available=True).latest() @@ -104,7 +104,7 @@ def download(request): return render(request, 'public/download.html', context) -@cache_control(max_age=300) +@cache_control(max_age=307) def feeds(request): repos = Repo.objects.all() if not request.user.is_authenticated(): @@ -116,7 +116,7 @@ def feeds(request): return render(request, 'public/feeds.html', context) -@cache_control(max_age=300) +@cache_control(max_age=307) def keys(request): users = User.objects.filter(is_active=True).select_related( 'userprofile__pgp_key').order_by('first_name', 'last_name') @@ -153,7 +153,7 @@ def keys(request): return render(request, 'public/keys.html', context) -@cache_page(1800) +@cache_page(1789) def keys_json(request): node_list = [] diff --git a/urls.py b/urls.py index e7f2b24c..8f0bbe21 100644 --- a/urls.py +++ b/urls.py @@ -41,20 +41,19 @@ # Feeds patterns, used below feeds_patterns = patterns('', (r'^$', 'public.views.feeds', {}, 'feeds-list'), - (r'^news/$', cache_page(300)(NewsFeed())), - (r'^packages/$', cache_page(300)(PackageFeed())), + (r'^news/$', cache_page(311)(NewsFeed())), + (r'^packages/$', cache_page(313)(PackageFeed())), (r'^packages/(?P[A-z0-9]+)/$', - cache_page(300)(PackageFeed())), + cache_page(313)(PackageFeed())), (r'^packages/all/(?P[A-z0-9\-]+)/$', - cache_page(300)(PackageFeed())), + cache_page(313)(PackageFeed())), (r'^packages/(?P[A-z0-9]+)/(?P[A-z0-9\-]+)/$', - cache_page(300)(PackageFeed())), - (r'^releases/$', cache_page(300)(ReleaseFeed())), + cache_page(313)(PackageFeed())), + (r'^releases/$', cache_page(317)(ReleaseFeed())), ) # Includes and other remaining stuff urlpatterns += patterns('', - # cache this static JS resource for 1 week rather than default 5 minutes (r'^admin/', include(admin.site.urls)), (r'^devel/', include('devel.urls')), (r'^feeds/', include(feeds_patterns)), @@ -80,10 +79,10 @@ # Sitemaps urlpatterns += patterns('', (r'^sitemap.xml$', - cache_page(1800)(sitemap_views.index), + cache_page(1831)(sitemap_views.index), {'sitemaps': our_sitemaps, 'sitemap_url_name': 'sitemaps'}), (r'^sitemap-(?P

.+)\.xml$', - cache_page(1800)(sitemap_views.sitemap), + cache_page(1831)(sitemap_views.sitemap), {'sitemaps': our_sitemaps}, 'sitemaps'), ) -- cgit v1.2.3-54-g00ecf From f7d1940a731370ceee6e1c6eaae2cc2f5bab0432 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 19 Oct 2014 18:30:32 -0500 Subject: Remove usage of templates for RSS feeds Signed-off-by: Dan McGee --- feeds.py | 8 ++++++-- templates/feeds/news_description.html | 2 -- templates/feeds/packages_title.html | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 templates/feeds/news_description.html delete mode 100644 templates/feeds/packages_title.html diff --git a/feeds.py b/feeds.py index d1836178..0bbac270 100644 --- a/feeds.py +++ b/feeds.py @@ -79,7 +79,6 @@ class PackageFeed(Feed): feed_type = GuidNotPermalinkFeed link = '/packages/' - title_template = 'feeds/packages_title.html' def __call__(self, request, *args, **kwargs): wrapper = condition(etag_func=package_etag, last_modified_func=package_last_modified) @@ -142,6 +141,9 @@ def item_guid(self, item): def item_pubdate(self, item): return item.last_update + def item_title(self, item): + return '%s %s %s' % (item.pkgname, item.full_version, item.arch.name) + def item_description(self, item): return item.pkgdesc @@ -168,7 +170,6 @@ class NewsFeed(Feed): link = '/news/' description = 'The latest and greatest news from the Arch Linux distribution.' subtitle = description - description_template = 'feeds/news_description.html' def __call__(self, request, *args, **kwargs): wrapper = condition(etag_func=news_etag, last_modified_func=news_last_modified) @@ -192,6 +193,9 @@ def item_author_name(self, item): def item_title(self, item): return item.title + def item_description(self, item): + return item.html() + class ReleaseFeed(Feed): feed_type = GuidNotPermalinkFeed diff --git a/templates/feeds/news_description.html b/templates/feeds/news_description.html deleted file mode 100644 index 61ceedf3..00000000 --- a/templates/feeds/news_description.html +++ /dev/null @@ -1,2 +0,0 @@ -

{{obj.author.get_full_name}} wrote:

-{{ obj.html }} diff --git a/templates/feeds/packages_title.html b/templates/feeds/packages_title.html deleted file mode 100644 index f92ac684..00000000 --- a/templates/feeds/packages_title.html +++ /dev/null @@ -1 +0,0 @@ -{{ obj.pkgname }} {{ obj.full_version }} {{ obj.arch.name }} \ No newline at end of file -- cgit v1.2.3-54-g00ecf From f9f8683799ef96904a7165adcfdeb0d13cb7ff61 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 20 Oct 2014 07:55:24 -0500 Subject: Fix display of flag requests for non-logged-in users More Jinja2 conversion fallout, whoops. Signed-off-by: Dan McGee --- templates/packages/details.html.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/packages/details.html.jinja b/templates/packages/details.html.jinja index 21be80f5..2215f8dc 100644 --- a/templates/packages/details.html.jinja +++ b/templates/packages/details.html.jinja @@ -183,7 +183,7 @@

',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery) \ No newline at end of file diff --git a/sitestatic/homepage.js b/sitestatic/homepage.js new file mode 100644 index 00000000..48dab93f --- /dev/null +++ b/sitestatic/homepage.js @@ -0,0 +1,42 @@ +!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return e&&this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'',item:'

', + items: 10, + updater: function(item) { + $('#pkgsearch-field').val(item); + $('#pkgsearch-form').submit(); + return item; + } + }).attr('autocomplete', 'off'); + $('#pkgsearch-field').keyup(function(e) { + if (e.keyCode === 13 && + $('ul.pkgsearch-typeahead li.active').size() === 0) { + $('#pkgsearch-form').submit(); + } + }); +} + +function setupKonami(image_src) { + var konami = new Konami(function() { + $('#konami').html('

'); + setTimeout(function() { + $('#konami').fadeIn(500); + }, 500); + $('#konami').click(function() { + $('#konami').fadeOut(500); + }); + }); +} diff --git a/templates/public/index.html b/templates/public/index.html index 89486be8..d815363b 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -214,44 +214,8 @@

More Resources

{% load cdn %}{% jquery %} {% endblock %} -- cgit v1.2.3-54-g00ecf From fae6da4d69564f0172d14047b81c0d8a9acc45a5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 23 Oct 2014 07:27:07 -0500 Subject: Bump to Django 1.7.1 Signed-off-by: Dan McGee --- requirements.txt | 2 +- requirements_prod.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5d544e3c..4b111f06 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.7 +Django==1.7.1 IPy==0.81 Jinja2==2.7.3 Markdown==2.4.1 diff --git a/requirements_prod.txt b/requirements_prod.txt index e3bc0ae2..4f52ce3e 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,5 +1,5 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.7 +Django==1.7.1 IPy==0.81 Jinja2==2.7.3 Markdown==2.4.1 -- cgit v1.2.3-54-g00ecf From 651678be2b6208cbfb45e11f5f390d66cf3eb8a6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 24 Oct 2014 13:50:38 -0500 Subject: Reorganize sidebar links involving people Signed-off-by: Dan McGee --- templates/public/index.html | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/templates/public/index.html b/templates/public/index.html index d815363b..3b17803c 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -108,7 +108,6 @@

Recent Updates (
Documentation
-

Wiki
@@ -119,7 +118,6 @@
Documentation

Community
-

Mailing Lists
@@ -132,7 +130,6 @@
Community

Support
-

Donate

Support

Tools

Mirrorlist Updater

Tools

Mirror Status
Differences Reports

Development

Projects in Git

Development

Visualizations
Differences Reports

Package Search

You are browsing the {{ BRANDING_DISTRONAME }} package database. From here you can find detailed information about packages located in the official supported repositories. If you need the sourceball from where a package is built, you can look at our sources repo.

{% endblock %} diff --git a/templates/public/art.html b/templates/public/art.html index 80c5ac95..32acc172 100644 --- a/templates/public/art.html +++ b/templates/public/art.html @@ -10,7 +10,7 @@

{{ BRANDING_DISTRONAME }} Logos and Artwork

You can help by creating artwork for {{ BRANDING_DISTRONAME }}.

Send your designs to dev@lists.parabolagnulinux.org and state they are CC-by-sa +

Send your designs to dev@lists.parabola.nu and state they are CC-by-sa or another free culture friendly license.

{% comment %} diff --git a/templates/public/https.html b/templates/public/https.html index df3e2c73..88056346 100644 --- a/templates/public/https.html +++ b/templates/public/https.html @@ -11,7 +11,7 @@

'); + setTimeout(function() { + $('#konami').fadeIn(500); + }, 500); + $('#konami').click(function() { + $('#konami').fadeOut(500); + }); + }); +} diff --git a/Makefile.d/jquery-1.8.3.min.js.preamble b/Makefile.d/jquery-1.8.3.min.js.preamble new file mode 100644 index 00000000..ca451d71 --- /dev/null +++ b/Makefile.d/jquery-1.8.3.min.js.preamble @@ -0,0 +1 @@ +/*! jQuery v1.8.3 jquery.com | jquery.org/license */ \ No newline at end of file diff --git a/Makefile.d/jquery.tablesorter-2.7.min.js.preamble b/Makefile.d/jquery.tablesorter-2.7.min.js.preamble new file mode 100644 index 00000000..e57e2d88 --- /dev/null +++ b/Makefile.d/jquery.tablesorter-2.7.min.js.preamble @@ -0,0 +1,4 @@ +/*! +* TableSorter 2.7 min - Client-side table sorting with ease! +* Copyright (c) 2007 Christian Bach +*/ \ No newline at end of file diff --git a/Makefile.d/konami.js.patch b/Makefile.d/konami.js.patch new file mode 100644 index 00000000..f6df91c4 --- /dev/null +++ b/Makefile.d/konami.js.patch @@ -0,0 +1,46 @@ +--- ..//web-cache/www/https/raw.github.com/snaptortoise/konami-js/c0f686e647765860ff4d2fcb7b48122785432b75/konami.js 2015-04-14 17:46:09.372597458 -0400 ++++ sitestatic/konami.js 2015-04-14 22:39:28.549281737 -0400 +@@ -56,7 +56,7 @@ + load: function(link){ + this.orig_keys = this.keys; + konami.addEvent(document,"touchmove",function(e){ +- if(e.touches.length == 1 && konami.iphone.capture==true){ ++ if(e.touches.length == 1 && konami.iphone.capture===true){ + var touch = e.touches[0]; + konami.iphone.stop_x = touch.pageX; + konami.iphone.stop_y = touch.pageY; +@@ -66,7 +66,7 @@ + } + }); + konami.addEvent(document,"touchend",function(evt){ +- if (konami.iphone.tap==true) konami.iphone.check_direction(link); ++ if (konami.iphone.tap===true) konami.iphone.check_direction(link); + },false); + konami.addEvent(document,"touchstart", function(evt){ + konami.iphone.start_x = evt.changedTouches[0].pageX +@@ -76,12 +76,12 @@ + }); + }, + check_direction: function(link){ +- x_magnitude = Math.abs(this.start_x-this.stop_x) +- y_magnitude = Math.abs(this.start_y-this.stop_y) +- x = ((this.start_x-this.stop_x) < 0) ? "RIGHT" : "LEFT"; +- y = ((this.start_y-this.stop_y) < 0) ? "DOWN" : "UP"; +- result = (x_magnitude > y_magnitude) ? x : y; +- result = (this.tap==true) ? "TAP" : result; ++ var x_magnitude = Math.abs(this.start_x-this.stop_x) ++ var y_magnitude = Math.abs(this.start_y-this.stop_y) ++ var x = ((this.start_x-this.stop_x) < 0) ? "RIGHT" : "LEFT"; ++ var y = ((this.start_y-this.stop_y) < 0) ? "DOWN" : "UP"; ++ var result = (x_magnitude > y_magnitude) ? x : y; ++ result = (this.tap===true) ? "TAP" : result; + + if (result==this.keys[0]) this.keys = this.keys.slice(1,this.keys.length) + if (this.keys.length==0) { +@@ -99,4 +99,4 @@ + } + + return konami; +-} +\ No newline at end of file ++} -- cgit v1.2.3-54-g00ecf

Architecture:	Last Updated:	{{ pkg.last_update\|date("DATETIME_FORMAT") }} UTC
Last Flag Request:	From {{ flag_request.who() }} on {{ flag_request.created\|date }}: {{ flag_request.message\|linebreaksbr\|default("{no message}") }}

Maintainers with Wrong Permissions ({{ wrong_permissions|length }})

Versions Elsewhere

Versions Elsewhere

Dependencies ({{deps|length}})

Required By ({{rqdby|length}})

{{ pkg.pkgname }} {{ pkg.full_version }}

Package Actions

Versions Elsewhere

- Dependencies ({{deps|length}})

- Required By ({{rqdby|length}})

- Package Contents

{{ pkg.pkgname }} {{ pkg.full_version }}

Package Actions

Versions Elsewhere

+ Dependencies ({{deps|length}})

+ Required By ({{rqdby|length}})

+ Package Contents

Package Database

Package Search

Package Search

Package Search

Package Search

Package Search

Inactive User Relations ({{ inactive_user|length }})

Relations with Non-existent pkgbase ({{ missing_pkgbase|length }})< {{ relation.last_update.created }} {% empty %} - No non-existent pkgbase relations. + No non-existent pkgbase relations. {% endfor %} @@ -100,7 +100,7 @@

Maintainers with Wrong Permissions ({{ wrong_permissions|length }})

Package Search

Package Search

Package Search

Package Search

Package Search

{{ pkg.pkgname }} {{ pkg.full_version }} File List

More Resources

Recent Updates ( Documentation - Wiki @@ -119,7 +118,6 @@ Documentation Community - Mailing Lists @@ -132,7 +130,6 @@ Community Support - Donate Support

Documentation

Documentation

Community

Community

Support

Tools

Tools

Development

Development

More Resources

People

More Resources

Package Search

{{ BRANDING_DISTRONAME }} Logos and Artwork

This is the unsecure version of the website

Enter the secure site

Enter the secure site

But my browser says the secure site is untrusted

A fully free, simple, and lightweight operating system

Relations with Non-existent `pkgbase` ({{ missing_pkgbase|length }})< {{ relation.last_update.created }} {% empty %} - No non-existent pkgbase relations. + No non-existent pkgbase relations. {% endfor %} @@ -100,7 +100,7 @@

Recent Updates (
Documentation
-

Wiki
@@ -119,7 +118,6 @@
Documentation

Community
-

Mailing Lists
@@ -132,7 +130,6 @@
Community

Support
-

Donate

Support