From 1e19b6af3e3ff29820b7b1cb8cfae875ad0f4f2e Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 15 May 2011 12:30:10 -0500 Subject: Use proper punctuation/grammar in help text Signed-off-by: Dan McGee --- releng/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/releng/views.py b/releng/views.py index 3180a9ed..e84bec71 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.", -- cgit v1.2.3-2-g168b From 009b3c0d97661e159cd0fe52be5407b72434ac70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sat, 21 May 2011 02:51:31 -0300 Subject: Don't download from repo --- packages/urls.py | 1 - templates/packages/details.html | 1 - 2 files changed, 2 deletions(-) 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/templates/packages/details.html b/templates/packages/details.html index f1b16e4c..5b6d4166 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -36,7 +36,6 @@ onclick="return !window.open('/packages/flaghelp/','FlagHelp', 'height=350,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');">(?) {% endif %} -
  • Download From Mirror
    • {% if perms.main.change_package %} -- cgit v1.2.3-2-g168b From c4e1f01417d0e24b85cb4465e850fba901e53820 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Tue, 24 May 2011 23:28:26 +0200 Subject: clarify that issues should still be reported on the bugtracker Signed-off-by: Dieter Plaetinck Signed-off-by: Dan McGee --- releng/views.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/releng/views.py b/releng/views.py index e84bec71..1d4a0b5e 100644 --- a/releng/views.py +++ b/releng/views.py @@ -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 the " \ + "bugtracker (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) -- cgit v1.2.3-2-g168b From cc4fef23e2b4da4744224f5b2c0dbb679834aa49 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 26 May 2011 17:54:14 -0500 Subject: Remove now uneeded pytz bug workaround --- devel/views.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/devel/views.py b/devel/views.py index 6c36742f..475376ad 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 = { -- cgit v1.2.3-2-g168b From 7dd2c8ea0a0264b86c49f3168dcb41a4337ccc73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Fri, 3 Jun 2011 21:08:08 -0300 Subject: Closed bug #16 --- packages/templatetags/package_extras.py | 11 +++++++++++ templates/packages/details.html | 1 + 2 files changed, 12 insertions(+) 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/templates/packages/details.html b/templates/packages/details.html index 5b6d4166..d1e6eee9 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -17,6 +17,7 @@