diff options
| -rw-r--r-- | devel/views.py | 4 | ||||
| -rw-r--r-- | packages/templatetags/package_extras.py | 11 | ||||
| -rw-r--r-- | packages/urls.py | 1 | ||||
| -rw-r--r-- | releng/views.py | 16 | ||||
| -rw-r--r-- | templates/packages/details.html | 2 |
5 files changed, 23 insertions, 11 deletions
diff --git a/devel/views.py b/devel/views.py index c0d10285..89963d27 100644 --- a/devel/views.py +++ b/devel/views.py @@ -77,9 +77,7 @@ def clock(request): now = datetime.now() utc_now = datetime.utcnow().replace(tzinfo=pytz.utc) for dev in devs: - # Work around https://bugs.launchpad.net/pytz/+bug/718673 - timezone = str(dev.userprofile.time_zone) - tz = pytz.timezone(timezone) + tz = pytz.timezone(dev.userprofile.time_zone) dev.current_time = utc_now.astimezone(tz) page_dict = { diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py index afa29a7b..d4d0ca1a 100644 --- a/packages/templatetags/package_extras.py +++ b/packages/templatetags/package_extras.py @@ -64,4 +64,15 @@ def bug_report(package): 'title': '[%s]' % package.pkgname, } return "https://bugs.parabolagnulinux.org/bugs/issue?%s" % urlencode(data) + +@register.simple_tag +def flag_unfree(package): + data = { + '@template': 'item', + 'keyword': 'packages,unfree', + 'nosy': 'dev_list', + 'priority': 'critical', + 'title': '[%s] Please put your reasons here (register first if you haven\'t)' % package.pkgname, + } + return "https://bugs.parabolagnulinux.org/bugs/issue?%s" % urlencode(data) # vim: set ts=4 sw=4 et: diff --git a/packages/urls.py b/packages/urls.py index e0362fa2..c02a0ed7 100644 --- a/packages/urls.py +++ b/packages/urls.py @@ -8,7 +8,6 @@ package_patterns = patterns('packages.views', (r'^flag/done/$', 'flag_confirmed', {}, 'package-flag-confirmed'), (r'^unflag/$', 'unflag'), (r'^unflag/all/$', 'unflag_all'), - (r'^download/$', 'download'), ) urlpatterns = patterns('packages.views', diff --git a/releng/views.py b/releng/views.py index 3180a9ed..1d4a0b5e 100644 --- a/releng/views.py +++ b/releng/views.py @@ -24,12 +24,12 @@ class TestForm(forms.ModelForm): source = standard_field(Source) clock_choice = standard_field(ClockChoice) filesystem = standard_field(Filesystem, - help_text="verify /etc/fstab, `df -hT` output and commands like " \ - "lvdisplay for special modules") + help_text="Verify /etc/fstab, `df -hT` output and commands like " \ + "lvdisplay for special modules.") modules = forms.ModelMultipleChoiceField(queryset=Module.objects.all(), help_text="", widget=forms.CheckboxSelectMultiple(), required=False) bootloader = standard_field(Bootloader, - help_text="Verify that the entries in the bootloader config look ok") + help_text="Verify that the entries in the bootloader config looks OK.") rollback_filesystem = standard_field(Filesystem, help_text="If you did a rollback followed by a new attempt to setup " \ "your blockdevices/filesystems, select which option you took here.", @@ -38,9 +38,13 @@ class TestForm(forms.ModelForm): help_text="If you did a rollback followed by a new attempt to setup " \ "your blockdevices/filesystems, select which option you took here.", widget=forms.CheckboxSelectMultiple(), required=False) - success = forms.BooleanField(help_text="Only check this if everything went fine. " \ - "If you you ran into any errors please specify them in the " \ - "comments.", required=False) + success = forms.BooleanField( + help_text="Only check this if everything went fine. " \ + "If you ran into problems please create a ticket on <a " \ + "href=\"https://bugs.archlinux.org/index.php?project=6\">the " \ + "bugtracker</a> (or check that one already exists) and link to " \ + "it in the comments.", + required=False) website = forms.CharField(label='', widget=forms.TextInput(attrs={'style': 'display:none;'}), required=False) diff --git a/templates/packages/details.html b/templates/packages/details.html index f1b16e4c..d1e6eee9 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -17,6 +17,7 @@ <ul class="small"> <li><a href="{% bugs_list pkg %}" title="View existing bug tickets for {{ pkg.pkgname }}">Bug Reports</a></li> <li><a href="{% bug_report pkg %}" title="Report bug for {{ pkg.pkgname }}">Report a Bug</a></li> + <li><a href="{% flag_unfree pkg %}" title="Report {{ pkg.pkgname }} as unfree">Report as unfree</a></li> {% if pkg.flag_date %} <li><span class="flagged">Flagged out-of-date on {{ pkg.flag_date|date }}</span></li> {% with pkg.in_testing as tp %}{% if tp %} @@ -36,7 +37,6 @@ onclick="return !window.open('/packages/flaghelp/','FlagHelp', 'height=350,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');">(?)</a></li> {% endif %} - <li><a href="download/" title="Download {{ pkg.pkgname }} from mirror">Download From Mirror</a></li> </ul> {% if perms.main.change_package %} |