harvest-dev team mailing list archive
-
harvest-dev team
-
Mailing list archive
-
Message #00277
[Merge] lp:~dholbach/harvest/release-prep into lp:harvest
Daniel Holbach has proposed merging lp:~dholbach/harvest/release-prep into lp:harvest with lp:~dylanmccall/harvest/shinier-landing-page as a prerequisite.
Requested reviews:
harvest-dev (harvest-dev)
--
https://code.launchpad.net/~dholbach/harvest/release-prep/+merge/34170
Your team harvest-dev is requested to review the proposed merge of lp:~dholbach/harvest/release-prep into lp:harvest.
=== renamed file 'harvest/templates/doc.html' => 'HACKING'
--- harvest/templates/doc.html 2010-08-24 09:44:59 +0000
+++ HACKING 2010-08-31 08:10:59 +0000
@@ -1,36 +1,47 @@
-{% extends "base.html" %}
-
-{% load i18n %}
-
-{% block content %}
-<div class="main">
-<h1>HACKING Harvest</h1>
-<p>The code of harvest lives in <a href="https://code.launchpad.net/harvest";>Launchpad</a> and makes use of <a href="http://python.org/";>python</a> and <a href="http://www.djangoproject.com/";>Django</a>.</p>
-<p>Harvest regularly pulls data from URLs stored in the <tt>opportunities</tt> file in <a href="https://code.launchpad.net/harvest-data";>this branch</a>. The file layout is pretty simple.</p>
-<p>Before attempting to download the CSV (comma-separated values) file, Harvest will check the <tt>Last-Modified</tt> entry in the HTTP header and see if any modifications were made. This is done to reduce traffic.</p>
-<h2>Opportunities?</h2>
-<p>The <tt>opportunities</tt> file is in CSV and of the following format:</p>
-<pre><url>,<description></pre>
-<p>The URLs to CSV files must be reachable via HTTP(s). The <tt>description</tt> is optional.</p>
-<p>The CSV file in turn needs to be of the following form:</p>
-<pre><sourcepackage>,<url>,<description></pre>
-<p>For example:</p>
-<pre>vdrift,http://launchpad.net/bugs/106854,106854</pre>
-<p>Opportunities can be anything:</p>
-<ul>
- <li>Easy bugs</li>
- <li>Suitable Upstream patches</li>
- <li>Patches of other distributions</li>
- <li>Problems in the CD builds that should be fixed</li>
- <li>etc.</li>
-</ul>
-<p>Let your imagination go wild. :-)</p>
-<p>To get new opportunities included, please <a href="https://help.launchpad.net/Code/UploadingABranch";>push a branch to Launchpad</a> and ask for it to be merged into <a href="https://launchpad.net/harvest-data/trunk";>harvest-data</a> trunk.</p>
-<h2>Setting it up</h2>
-<p>Just
-<ol>
- <li><tt>bzr branch lp:harvest</tt></li>
- <li><tt>less harvest/INSTALL</tt></li>
-</ol>
-</div>
-{% endblock %}
+HACKING Harvest
+
+The code of harvest lives in Launchpad and makes use of Python and Django:
+
+ https://code.launchpad.net/harvest
+
+
+Harvest regularly pulls data from URLs stored in the opportunities file in the https://code.launchpad.net/harvest-data branch. The file layout is pretty simple.
+
+Before attempting to download the CSV (comma-separated values) file, Harvest will check the Last-Modified entry in the HTTP header and see if any modifications were made. This is done to reduce traffic.
+
+
+Opportunities?
+
+The opportunities file is in CSV and of the following format:
+
+<url>(,<description>)(,<link to more documentation>)
+
+The URLs to CSV files must be reachable via HTTP(s). The description and link to more documentation are optional.
+
+The CSV file in turn needs to be of the following form:
+<sourcepackage>,<url>,<description>
+
+For example:
+vdrift,http://launchpad.net/bugs/106854,106854
+
+Opportunities can be anything:
+ * Easy bugs
+ * Suitable Upstream patches
+ * Patches of other distributions
+ * Problems in the CD builds that should be fixed
+ * etc.
+
+Let your imagination go wild. :-)
+
+
+To get new opportunities included, please push a branch to Launchpad and ask for it to be merged into harvest-data trunk.
+
+ https://help.launchpad.net/Code/UploadingABranch
+ https://launchpad.net/harvest-data/trunk
+
+
+Setting it up
+
+Just
+ * bzr branch lp:harvest
+ * less harvest/INSTALL
=== modified file 'harvest/common/templatetags/humanize_timediff.py'
--- harvest/common/templatetags/humanize_timediff.py 2010-08-12 03:30:02 +0000
+++ harvest/common/templatetags/humanize_timediff.py 2010-08-31 08:10:59 +0000
@@ -25,27 +25,26 @@
minutes = timeDiff.seconds%3600/60
seconds = timeDiff.seconds%3600%60
- str = ""
tStr = ""
if days > 0:
- str = ungettext('%(days)d day', '%(days)d days', days) % {
+ tStr = ungettext('%(days)d day', '%(days)d days', days) % {
'days' : days
}
- return str
+ return tStr
elif hours > 0:
- str = ungettext('%(hours)d hour', '%(hours)d hours', hours) % {
+ tStr = ungettext('%(hours)d hour', '%(hours)d hours', hours) % {
'hours' : hours
}
- return str
+ return tStr
elif minutes > 0:
- str = ungettext('%(minutes)d minute', '%(minutes)d minutes', minutes) % {
+ tStr = ungettext('%(minutes)d minute', '%(minutes)d minutes', minutes) % {
'minutes' : minutes
}
- return str
+ return tStr
elif seconds > 0:
- str = ungettext('%(seconds)d second', '%(seconds)d seconds', seconds) % {
+ tStr = ungettext('%(seconds)d second', '%(seconds)d seconds', seconds) % {
'seconds' : seconds
}
- return str
+ return tStr
else:
return None
=== modified file 'harvest/common/views.py'
--- harvest/common/views.py 2010-08-26 16:14:26 +0000
+++ harvest/common/views.py 2010-08-31 08:10:59 +0000
@@ -13,7 +13,6 @@
'opportunitylists': OpportunityList.objects.count(),
'opportunities': Opportunity.objects.count(),
'notes': Note.objects.count(),
- 'features': OpportunityList.objects.filter(featured=True),
}
return render_to_response('index.html', context,
context_instance=RequestContext(request))
=== modified file 'harvest/local_settings.py.sample'
--- harvest/local_settings.py.sample 2010-07-05 10:15:55 +0000
+++ harvest/local_settings.py.sample 2010-08-31 08:10:59 +0000
@@ -3,4 +3,7 @@
#DATABASE_USER = ''
#DATABASE_PASSWORD = ''
-SECRET_KEY = ''
+SECRET_KEY = ''
+ADMINS = (
+ ('',''),
+)
=== modified file 'harvest/locale/harvest.pot'
--- harvest/locale/harvest.pot 2010-08-23 15:30:03 +0000
+++ harvest/locale/harvest.pot 2010-08-31 08:10:59 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-23 10:29-0500\n"
+"POT-Creation-Date: 2010-08-31 03:07-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -18,28 +18,28 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: common/templatetags/humanize_timediff.py:31
+#: common/templatetags/humanize_timediff.py:30
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] ""
msgstr[1] ""
-#: common/templatetags/humanize_timediff.py:36
+#: common/templatetags/humanize_timediff.py:35
#, python-format
msgid "%(hours)d hour"
msgid_plural "%(hours)d hours"
msgstr[0] ""
msgstr[1] ""
-#: common/templatetags/humanize_timediff.py:41
+#: common/templatetags/humanize_timediff.py:40
#, python-format
msgid "%(minutes)d minute"
msgid_plural "%(minutes)d minutes"
msgstr[0] ""
msgstr[1] ""
-#: common/templatetags/humanize_timediff.py:46
+#: common/templatetags/humanize_timediff.py:45
#, python-format
msgid "%(seconds)d second"
msgid_plural "%(seconds)d seconds"
@@ -155,7 +155,7 @@
msgid "Action"
msgstr ""
-#: opportunities/views.py:113
+#: opportunities/views.py:108
msgid "Opportunity details could not be saved."
msgstr ""
@@ -175,60 +175,76 @@
msgid "A server error has occurred."
msgstr ""
-#: templates/base.html:7 templates/base.html.py:31 templates/base.html:60
-#: templates/base.html.py:71 templates/index.html:9
-#: templates/admin/base_site.html:7
+#: templates/base.html:7 templates/base.html.py:31 templates/base.html:61
+#: templates/base.html.py:71 templates/admin/base_site.html:7
msgid "Harvest"
msgstr ""
-#: templates/base.html:60
+#: templates/base.html:61
msgid "Help"
msgstr ""
-#: templates/base.html:60
+#: templates/base.html:61
msgid "Bugs"
msgstr ""
-#: templates/base.html:60
+#: templates/base.html:61
msgid "Code"
msgstr ""
-#: templates/base.html:73 templates/index.html:23
+#: templates/base.html:73
msgid "Translated by:"
msgstr ""
-#: templates/index.html:14
-#, python-format
-msgid "1 user, "
-msgid_plural "%(counter)s users, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: templates/index.html:15
-#, python-format
-msgid "1 source package, "
-msgid_plural "%(counter)s source packages, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: templates/index.html:16
-#, python-format
-msgid "1 opportunity, "
-msgid_plural "%(counter)s opportunities, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: templates/index.html:17
-#, python-format
-msgid "1 opportunity list, "
-msgid_plural "%(counter)s opportunity lists, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: templates/index.html:18
-#, python-format
-msgid "1 note."
-msgid_plural "%(counter)s notes."
+#: templates/index.html:12
+msgid "Welcome to Harvest"
+msgstr ""
+
+#: templates/index.html:13
+msgid ""
+"\n"
+"\t\t<p>Harvest makes it easy to find low-hanging opportunities in Ubuntu. It "
+"aggregates the mass of todo lists we use every day so it's simple to find "
+"and coordinate work.</p>\n"
+"\t\t"
+msgstr ""
+
+#: templates/index.html:19
+msgid "Find opportunities"
+msgstr ""
+
+#: templates/index.html:24
+#, python-format
+msgid "%(counter)s opportunity"
+msgid_plural "%(counter)s opportunities"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/index.html:24
+#, python-format
+msgid "in %(counter)s source package"
+msgid_plural "in %(counter)s source packages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/index.html:25
+#, python-format
+msgid "%(counter)s opportunity list"
+msgid_plural "%(counter)s opportunity lists"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/index.html:26
+#, python-format
+msgid "%(counter)s note"
+msgid_plural "%(counter)s notes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/index.html:27
+#, python-format
+msgid "%(counter)s user"
+msgid_plural "%(counter)s users"
msgstr[0] ""
msgstr[1] ""
=== modified file 'harvest/opportunities/views.py'
--- harvest/opportunities/views.py 2010-08-13 22:09:49 +0000
+++ harvest/opportunities/views.py 2010-08-31 08:10:59 +0000
@@ -1,20 +1,15 @@
# -*- coding: utf-8 -*-
from django.contrib.auth.decorators import login_required
-from django.core.paginator import Paginator, InvalidPage, EmptyPage
from django.utils.translation import ugettext as _
-from django.db.models import Count
from django.shortcuts import get_object_or_404
from django.shortcuts import render_to_response as render
from django.http import HttpResponseRedirect
from django.template import RequestContext
-from django.views.generic import list_detail
import models
import forms
-from models import Opportunity, Note # for form processing
-
from filters import HarvestFilters
from wrappers import PackageWrapper, PackageListWrapper
@@ -105,7 +100,7 @@
action="added note: '%s'" % note_log_text,
opportunity=opportunity)
- note = Note(opportunity=opportunity, author=request.user, text=note_text)
+ note = forms.Note(opportunity=opportunity, author=request.user, text=note_text)
note.save()
return HttpResponseRedirect(request.POST["next"])
=== modified file 'harvest/opportunities/wrappers.py'
--- harvest/opportunities/wrappers.py 2010-07-28 05:11:57 +0000
+++ harvest/opportunities/wrappers.py 2010-08-31 08:10:59 +0000
@@ -1,4 +1,3 @@
-from django.db.models import Count
from harvest.common.url_tools import update_url_with_parameters
class PackageWrapper(object):
=== modified file 'harvest/templates/base.html'
--- harvest/templates/base.html 2010-08-31 08:10:59 +0000
+++ harvest/templates/base.html 2010-08-31 08:10:59 +0000
@@ -63,9 +63,8 @@
<div id="smallprint" tabindex="3">
<span id="copyright">
- © 2008-2009 Canonical Ltd.
- <br />Ubuntu and Canonical are registered
- trademarks of Canonical Ltd.
+ © 2008-2010 Canonical Ltd., Ubuntu Community
+ <br />Ubuntu and Canonical are registered trademarks of Canonical Ltd.
</span>
<span id="techdetails">
=== modified file 'harvest/templates/index.html'
--- harvest/templates/index.html 2010-08-31 08:10:59 +0000
+++ harvest/templates/index.html 2010-08-31 08:10:59 +0000
@@ -27,32 +27,6 @@
<li>{% blocktrans count users as counter %}{{ counter }} user{% plural %}{{ counter }} users{% endblocktrans %}</li>
</ul>
</div>
-
- {% comment %}
- {% if features %}
- <div id="featured">
- <h2>{% trans "Featured Opportunities" %}</h2>
- <ul>
- {% for feature in features %}
- <li>
- <h3>
- {{ feature.name }}
- ({{feature.opportunity_set.all|length}} {% trans "opportunities"%})
- </h3>
- <ul>
- {% for opportunity in feature.opportunity_set.all|slice:":5" %}
- <li>
- <a href="{% url opportunity_edit opportunity.id %}">{{opportunity.description}}</a>
- ({{opportunity.sourcepackage}})
- </li>
- {% endfor %}
- </ul>
- </li>
- {% endfor %}
- </ul>
- </div>
- {% endif %}
- {% endcomment %}
</div>
<div id="faq">
@@ -85,7 +59,7 @@
<li>
<span class="question">I think I found a bug. What do I do?</span>
- <p>If it's about the UI or the functionality of the page, please file a bug on <a href="http://bugs.launchpad.net/harvest/+filebug";>harvest</a> in Launchpad. If it's about some piece of data that's on the harvest page, it's likely a bug in one of the scripts that fetches the data. In that case, please file it on <a href="https://bugs.launchpad.net/harvest-data/+filebug";>harvest-data</a> instead. The <a href="doc/">hacking guide</a> has more information about that.</p>
+ <p>If it's about the UI or the functionality of the page, please file a bug on <a href="http://bugs.launchpad.net/harvest/+filebug";>harvest</a> in Launchpad. If it's about some piece of data that's on the harvest page, it's likely a bug in one of the scripts that fetches the data. In that case, please file it on <a href="https://bugs.launchpad.net/harvest-data/+filebug";>harvest-data</a> instead. The <a href="http://bazaar.launchpad.net/~harvest-dev/harvest/trunk/annotate/head:/HACKING";>hacking guide</a> has more information about that.</p>
</li>
</ul>
</div>
=== modified file 'harvest/urls.py'
--- harvest/urls.py 2010-08-24 13:55:05 +0000
+++ harvest/urls.py 2010-08-31 08:10:59 +0000
@@ -6,7 +6,6 @@
urlpatterns = patterns('',
url(r'^$', 'common.views.index', name='home'),
- url(r'^doc/$', 'common.views.doc', name='doc'),
url(r'^opportunities/', include('opportunities.urls')),
url(r'^services/', include('services.urls')),
url(r'^openid/', include('django_openid_auth.urls')),
Follow ups
