Merge pull request openhatch#42 from daveeloo/ui

Commit to close issue openhatch#22 enhancements from user feedback
daveeloo · Sep 10, 2013 · 6c90160 · 6c90160
2 parents 3b732f5 + e0ac666
commit 6c90160
Show file tree

Hide file tree

Showing 67 changed files with 78 additions and 723 deletions.
diff --git a/greenhouse/.dotcloud/config → greenhouse-project/.dotcloud/config b/greenhouse/.dotcloud/config → greenhouse-project/.dotcloud/config
diff --git a/greenhouse/debian-emails → greenhouse-project/debian-emails b/greenhouse/debian-emails → greenhouse-project/debian-emails
diff --git a/greenhouse/greenhouse/__init__.py → ...t/greenhouse-project-settings/__init__.py b/greenhouse/greenhouse/__init__.py → ...t/greenhouse-project-settings/__init__.py
diff --git a/...house/greenhouse/local_settings.py.sample → ...project-settings/local_settings.py.sample b/...house/greenhouse/local_settings.py.sample → ...project-settings/local_settings.py.sample
diff --git a/greenhouse/greenhouse/settings.py → ...t/greenhouse-project-settings/settings.py b/greenhouse/greenhouse/settings.py → ...t/greenhouse-project-settings/settings.py
@@ -100,10 +100,10 @@
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
-ROOT_URLCONF = 'greenhouse.urls'
+ROOT_URLCONF = 'greenhouse-project-settings.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'greenhouse.wsgi.application'
+WSGI_APPLICATION = 'greenhouse-project-settings.wsgi.application'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates"

diff --git a/greenhouse/greenhouse/urls.py → ...oject/greenhouse-project-settings/urls.py b/greenhouse/greenhouse/urls.py → ...oject/greenhouse-project-settings/urls.py
diff --git a/greenhouse/greenhouse/wsgi.py → ...oject/greenhouse-project-settings/wsgi.py b/greenhouse/greenhouse/wsgi.py → ...oject/greenhouse-project-settings/wsgi.py
@@ -15,7 +15,7 @@
 """
 import os
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "greenhouse.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "greenhouse-project.settings")
 
 # This application object is used by any WSGI server configured to use this
 # file. This includes Django's development server, if the WSGI_APPLICATION

diff --git a/greenhouse/manage.py~ → greenhouse-project/manage.py b/greenhouse/manage.py~ → greenhouse-project/manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "greenhouse-config.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "greenhouse-project-settings.settings")
 
     from django.core.management import execute_from_command_line
 

diff --git a/greenhouse/static/css/background-dotted.png → ...-project/static/css/background-dotted.png b/greenhouse/static/css/background-dotted.png → ...-project/static/css/background-dotted.png
diff --git a/greenhouse/static/css/base.css → greenhouse-project/static/css/base.css b/greenhouse/static/css/base.css → greenhouse-project/static/css/base.css
diff --git a/greenhouse/static/css/bootstrap.css → greenhouse-project/static/css/bootstrap.css b/greenhouse/static/css/bootstrap.css → greenhouse-project/static/css/bootstrap.css
diff --git a/...house/static/css/orangeheader-stripes.png → ...oject/static/css/orangeheader-stripes.png b/...house/static/css/orangeheader-stripes.png → ...oject/static/css/orangeheader-stripes.png
diff --git a/greenhouse/static/img/edit.png → greenhouse-project/static/img/edit.png b/greenhouse/static/img/edit.png → greenhouse-project/static/img/edit.png
diff --git a/greenhouse/static/img/favicon.ico → greenhouse-project/static/img/favicon.ico b/greenhouse/static/img/favicon.ico → greenhouse-project/static/img/favicon.ico
diff --git a/greenhouse/static/js/dat-overview.js → greenhouse-project/static/js/dat-overview.js b/greenhouse/static/js/dat-overview.js → greenhouse-project/static/js/dat-overview.js
diff --git a/greenhouse/templates/404.html → greenhouse-project/templates/404.html b/greenhouse/templates/404.html → greenhouse-project/templates/404.html
diff --git a/greenhouse/templates/500.html → greenhouse-project/templates/500.html b/greenhouse/templates/500.html → greenhouse-project/templates/500.html
diff --git a/greenhouse/templates/base.html → greenhouse-project/templates/base.html b/greenhouse/templates/base.html → greenhouse-project/templates/base.html
@@ -6,7 +6,7 @@
 
 <head>
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-	<title>{% block title %}{% trans "Greenhouse Overview" %}{% endblock %}</title>
+	<title>{% block title %}{% trans "Greenhouse" %}{% endblock %}</title>
 
 	<link rel="shortcut icon" href="{% static 'img/favicon.ico' %}" type="image/x-icon" />
 
@@ -25,18 +25,10 @@
 <div id="wrapper">
 
 <div id="header">
-	<div id="extheader">
-		<ul>
-		<li><a href="http://www.debian.org">Debian.org</a></li>
-		<li><a href="http://wiki.debian.org/Community">Community</a></li>
-		<li><a href="http://www.debian.org/support">Support</a></li>
-		<li><a href="http://www.debian.org/partners/">Partners</a></li>
-		</ul>
-	</div>
 
 	<div id="mainheader">
 		<a id="sitetitle" href="{% url 'home' %}" class="quiet">
-			<span id="sitename">{% trans "Greenhouse Overview" %}</span>
+			<span id="sitename">{% trans "Greenhouse" %}</span>
 		</a>
 
 		<span id="userdata">
@@ -72,30 +64,18 @@
 			{% block content %}{% endblock %}
 	</div>
 
-{% if in_allowed_group %}
-		{% include "sidebar.html" %}
-{% endif %}
-
 </div>
 
 <div class="bottom"></div>
 
 <div id="footer">
 	<div id="footnav">
 		<ul>
-		<li class="toplevel"><a href="{% url 'home' %}">{% trans "Greenhouse Overview" %}</a></li>
+		<li class="toplevel"><a href="{% url 'home' %}">{% trans "Greenhouse" %}</a></li>
 		<li><a href="https://github.com/openhatch/oh-greenhouse/issues?state=open" target="_blank">{% trans "Bugs" %}</a></li>
 		<li><a href="http://github.com/openhatch/oh-greenhouse" target="_blank">{% trans "Code" %}</a></li>
 		</ul>
-	</div>
-
-	<div id="copyright">
-		&copy; 2013 Debian Project
-
-	</div>
 </div>
-
+</div>
 </body>
-
 </html>
-
diff --git a/greenhouse/templates/dashboard.html → greenhouse-project/templates/dashboard.html b/greenhouse/templates/dashboard.html → greenhouse-project/templates/dashboard.html
@@ -1,38 +1,49 @@
 {% load custom_tags %}
 {% block dashboard %}
 
-<h2>Dashboard:</h2>
+<p>The purpose of this app is to help Debian Developer Advisory Team get in touch with new Debian contributors. 
+People who should get pinged are active contributors who become inactive as well as experienced people who should 
+be applying for developer status. 
+</p>
 <div id='content' class='row-fluid'>
 
 <div class='dashboard-box span4'>
-
     <h3>New comers not greeted yet:</h3>
-
     {% for p in first_timers|dictsortreversed:"first_upload.timestamp" %}
         <li><a href="contributors/{{ p.email }}">{{ p.name }}</a>, {{ p.first_upload.timestamp|date:"SHORT_DATE_FORMAT" }}</li>
     {% endfor %}
-
 </div>
 
 <div class='dashboard-box span4'>
-
     <h3>Have done 40 uploads but need to be contacted:</h3>
-
     {% for p in experienced|dictsortreversed:"last_upload.timestamp" %}
         <li><a href="contributors/{{ p.email }}">{{ p.name }}</a>, {{ p.total_uploads }} uploads</li>
     {% endfor %}
-
 </div>
 
 <div class='dashboard-box span4'>
-
     <h3>Haven't done an upload since being contacted:</h3>
-
     {% for p in inactive|dictsortreversed:"last_upload.timestamp" %}
-        <li><a href="contributors/{{ p.email }}">{{ p.name }}</a>  <b>{% ubu_dev_img p.ubuntu_dev %}</b>, {{ p.last_upload.timestamp|date:"SHORT_DATE_FORMAT" }}</li>
+        <li><a href="contributors/{{ p.email }}">{{ p.name }}</a>, {{ p.last_upload.timestamp|date:"SHORT_DATE_FORMAT" }}</li>
+    {% endfor %}
+</div>
+
+<div class='dashboard-box span4'>
+    <h3>Was recently contacted:</h3>
+    {% for p in contacted %}
+        <li><a href="contributors/{{ p.email }}">{{ p.name }}</a>, {{ p.last_upload.timestamp|date:"SHORT_DATE_FORMAT" }}</li>
     {% endfor %}
+</div>
 
 </div>
 
+<div id='action_log'>
+    <h2>Your Most Recent Actions:</h2>
+        <ul>{% for action in actions|slice:":20" %}
+            <li>{{ action.action_time|date:"D d M Y" }}:
+                <a href="/contributors/{{ action.object_repr }}">
+                    {{ action.change_message }}</a></li>
+            {% endfor %}
+        </ul>
 </div>
 {% endblock %}
diff --git a/greenhouse/templates/edit_person.html → ...nhouse-project/templates/edit_person.html b/greenhouse/templates/edit_person.html → ...nhouse-project/templates/edit_person.html
diff --git a/greenhouse/templates/index.html → greenhouse-project/templates/index.html b/greenhouse/templates/index.html → greenhouse-project/templates/index.html
@@ -2,14 +2,6 @@
 {% load custom_tags %}
 
 {% block content %}
-
-<h1>Welcome to Greenhouse</h1>
-<h3>The purpose of this app is to help Debian Developers get in touch with new Debian contributors. People who should 
-get pinged are active contributors who become inactive as well as experienced people who should be applying for 
-developer status. 
-</h3>
-<br/>
-
 <div class='main'>
 
 {% if not in_allowed_group %}

diff --git a/greenhouse/templates/person.html → greenhouse-project/templates/person.html b/greenhouse/templates/person.html → greenhouse-project/templates/person.html
@@ -51,6 +51,7 @@ <h1>{{ person.name }} </h1><p>{{ suggestion|safe }}</p>
         	| <a id="unify" title="If this person already exists under another identity
         	click here to merge the identities"> [unify duplicate identity] </a>
         </li>
+        <li><b>DDPO:</b><a href="http://qa.debian.org/developer.php?email={{person.email}}"> {{person.name}}</a></li>   
         <li><b>Debian Developer:</b> {{ person.ubuntu_dev|yesno:"Yes,No" }}</li>
         <li><b>Last Seen:</b> {{ person.last_upload.timestamp }}</li>
         <li><b>Last Contact:</b> {{ person|recent_contact }}</li>
@@ -82,6 +83,25 @@ <h1>{{ person.name }} </h1><p>{{ suggestion|safe }}</p>
 	</center>
 </div>
 
+<div id='recent_uploads'>
+<h2>Most recent uploads:</h2>
+
+<table>
+    <tr>
+        <th>Package</th>
+        <th>Version</th>
+        <th>Date</th>
+    </tr>
+    {% for ul in recent_uploads %}
+    <tr>
+        <td><a href="http://packages.qa.debian.org/{{ ul.package }}">{{ ul.package }}</a></td>
+        <td>{{ ul.version }}</td>
+        <td>{{ ul.timestamp }}</td>
+    </tr>
+    {% endfor %}
+</table>
+</div>
+
 
 <div id='whiteboard'>
     <h2>Whiteboard:</h2>
@@ -137,30 +157,13 @@ <h3>#{{ forloop.revcounter }}</h3>
     <h2>Uploads per release:</h2>
     <div id="uploads_per_release_chart"></div>
 </div>
-
-<div id='recent_ulpoads'>
-<h2>Most recent uploads:</h2>
-
-<table>
-    <tr>
-        <th>Package</th>
-        <th>Version</th>
-        <th>Date</th>
-    </tr>
-    {% for ul in recent_uploads %}
-    <tr>
-        <td><a href="https://launchpad.net/ubuntu/+source/{{ ul.package }}/{{ ul.version }}">{{ ul.package }}</a></td>
-        <td>{{ ul.version }}</d>
-        <td>{{ ul.timestamp }}</td>
-    </tr>
-    {% endfor %}
-</table>
-</div>
 </div>
 
 <script type="text/javascript">
 	var textarea = document.getElementById('id_comment');
-	textarea.setAttribute('placeholder', 'After you contact the person leave a comment here...');
+	textarea.setAttribute('placeholder', 'After you contact the person leave a comment here...' + 
+	'                                                                                         ' + 
+	'Example: Emailed this person and encouraged her to apply for Debian Developer status');
 
 	var textarea = document.getElementById('id_notes');
 	textarea.setAttribute('placeholder', 'Example: This person has skills in...');

diff --git a/greenhouse/templates/user_profile.html → ...house-project/templates/user_profile.html b/greenhouse/templates/user_profile.html → ...house-project/templates/user_profile.html
@@ -21,15 +21,6 @@ <h1>{{ profile.user.get_full_name}}</h1>
             </li>
         </ul>
     </div>
-    <br>
-    <div id='action_log'>
-        <h2>Most Recent Actions:</h2>
-        <ul>{% for action in actions|slice:":20" %}
-            <li>{{ action.action_time|date:"D d M Y" }}:
-                <a href="/contributors/{{ action.object_repr }}">
-                {{ action.change_message }}</a></li>
-        {% endfor %}</ul>
-    </div>
 </div>
 
 {% endblock %}
diff --git a/greenhouse/uploads/__init__.py → greenhouse-project/uploads/__init__.py b/greenhouse/uploads/__init__.py → greenhouse-project/uploads/__init__.py
diff --git a/greenhouse/uploads/common/__init__.py → ...nhouse-project/uploads/common/__init__.py b/greenhouse/uploads/common/__init__.py → ...nhouse-project/uploads/common/__init__.py
diff --git a/greenhouse/uploads/common/utils.py → greenhouse-project/uploads/common/utils.py b/greenhouse/uploads/common/utils.py → greenhouse-project/uploads/common/utils.py
diff --git a/greenhouse/uploads/context_processor.py → ...ouse-project/uploads/context_processor.py b/greenhouse/uploads/context_processor.py → ...ouse-project/uploads/context_processor.py
diff --git a/greenhouse/uploads/decorators.py → greenhouse-project/uploads/decorators.py b/greenhouse/uploads/decorators.py → greenhouse-project/uploads/decorators.py
diff --git a/greenhouse/uploads/forms.py → greenhouse-project/uploads/forms.py b/greenhouse/uploads/forms.py → greenhouse-project/uploads/forms.py
diff --git a/greenhouse/uploads/management/__init__.py → ...se-project/uploads/management/__init__.py b/greenhouse/uploads/management/__init__.py → ...se-project/uploads/management/__init__.py
diff --git a/...e/uploads/management/commands/__init__.py → ...t/uploads/management/commands/__init__.py b/...e/uploads/management/commands/__init__.py → ...t/uploads/management/commands/__init__.py
diff --git a/...ds/management/commands/build_people_db.py → ...ds/management/commands/build_people_db.py b/...ds/management/commands/build_people_db.py → ...ds/management/commands/build_people_db.py
diff --git a/...management/commands/create_user_groups.py → ...management/commands/create_user_groups.py b/...management/commands/create_user_groups.py → ...management/commands/create_user_groups.py
diff --git a/...loads/management/commands/get-udd-data.py → ...loads/management/commands/get-udd-data.py b/...loads/management/commands/get-udd-data.py → ...loads/management/commands/get-udd-data.py
diff --git a/...anagement/commands/migrate-upload-data.py → ...anagement/commands/migrate-upload-data.py b/...anagement/commands/migrate-upload-data.py → ...anagement/commands/migrate-upload-data.py
diff --git a/...uploads/management/commands/update-all.py → ...uploads/management/commands/update-all.py b/...uploads/management/commands/update-all.py → ...uploads/management/commands/update-all.py
diff --git a/...nhouse/uploads/migrations/0001_initial.py → ...roject/uploads/migrations/0001_initial.py b/...nhouse/uploads/migrations/0001_initial.py → ...roject/uploads/migrations/0001_initial.py
diff --git a/...nhouse/uploads/migrations/0002_initial.py → ...roject/uploads/migrations/0002_initial.py b/...nhouse/uploads/migrations/0002_initial.py → ...roject/uploads/migrations/0002_initial.py
diff --git a/...ons/0003_auto__add_unique_people_email.py → ...ons/0003_auto__add_unique_people_email.py b/...ons/0003_auto__add_unique_people_email.py → ...ons/0003_auto__add_unique_people_email.py
diff --git a/...tions/0004_auto__del_field_people_lpid.py → ...tions/0004_auto__del_field_people_lpid.py b/...tions/0004_auto__del_field_people_lpid.py → ...tions/0004_auto__del_field_people_lpid.py
diff --git a/...0005_auto__del_field_people_ubuntu_dev.py → ...0005_auto__del_field_people_ubuntu_dev.py b/...0005_auto__del_field_people_ubuntu_dev.py → ...0005_auto__del_field_people_ubuntu_dev.py
diff --git a/...0006_auto__add_field_people_debian_dev.py → ...0006_auto__add_field_people_debian_dev.py b/...0006_auto__add_field_people_debian_dev.py → ...0006_auto__add_field_people_debian_dev.py
diff --git a/...ponsor__del_field_uploads_lpid_changer.py → ...ponsor__del_field_uploads_lpid_changer.py b/...ponsor__del_field_uploads_lpid_changer.py → ...ponsor__del_field_uploads_lpid_changer.py
diff --git a/...8_auto__add_field_people_control_group.py → ...8_auto__add_field_people_control_group.py b/...8_auto__add_field_people_control_group.py → ...8_auto__add_field_people_control_group.py
diff --git a/...onsor__chg_field_uploads_email_changer.py → ...onsor__chg_field_uploads_email_changer.py b/...onsor__chg_field_uploads_email_changer.py → ...onsor__chg_field_uploads_email_changer.py
diff --git a/..._email_changer__add_field_people_origi.py → ..._email_changer__add_field_people_origi.py b/..._email_changer__add_field_people_origi.py → ..._email_changer__add_field_people_origi.py
diff --git a/.../0011_auto__del_field_people_is_active.py → .../0011_auto__del_field_people_is_active.py b/.../0011_auto__del_field_people_is_active.py → .../0011_auto__del_field_people_is_active.py
diff --git a/...uploads/migrations/0012_original_email.py → ...uploads/migrations/0012_original_email.py b/...uploads/migrations/0012_original_email.py → ...uploads/migrations/0012_original_email.py
diff --git a/...anger__chg_field_uploads_original_emai.py → ...anger__chg_field_uploads_original_emai.py b/...anger__chg_field_uploads_original_emai.py → ...anger__chg_field_uploads_original_emai.py
diff --git a/greenhouse/uploads/migrations/__init__.py → ...se-project/uploads/migrations/__init__.py b/greenhouse/uploads/migrations/__init__.py → ...se-project/uploads/migrations/__init__.py
diff --git a/greenhouse/uploads/models.py → greenhouse-project/uploads/models.py b/greenhouse/uploads/models.py → greenhouse-project/uploads/models.py
diff --git a/greenhouse/uploads/router.py → greenhouse-project/uploads/router.py b/greenhouse/uploads/router.py → greenhouse-project/uploads/router.py
diff --git a/greenhouse/uploads/templatetags/__init__.py → ...-project/uploads/templatetags/__init__.py b/greenhouse/uploads/templatetags/__init__.py → ...-project/uploads/templatetags/__init__.py
diff --git a/...house/uploads/templatetags/custom_tags.py → ...oject/uploads/templatetags/custom_tags.py b/...house/uploads/templatetags/custom_tags.py → ...oject/uploads/templatetags/custom_tags.py
diff --git a/greenhouse/uploads/tests.py → greenhouse-project/uploads/tests.py b/greenhouse/uploads/tests.py → greenhouse-project/uploads/tests.py
diff --git a/greenhouse/uploads/views.py → greenhouse-project/uploads/views.py b/greenhouse/uploads/views.py → greenhouse-project/uploads/views.py
@@ -7,12 +7,14 @@
 from django.contrib.auth.models import User
 from django.contrib.admin.models import LogEntry, ADDITION
 from django.contrib.contenttypes.models import ContentType
+from django.contrib.comments import Comment
 from django.contrib.comments.signals import comment_was_posted
 from django.shortcuts import render, get_object_or_404, get_list_or_404
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.dispatch import receiver
 from django.utils import timezone
+from django.db.models import Q
 
 from distro_info import UbuntuDistroInfo
 
@@ -176,7 +178,6 @@ def user_profile(request, user):
         "object_repr", flat=True).distinct()
     return render(request, 'user_profile.html',
                   {'profile': profile,
-                   'actions': actions,
                    'edited_contribs': edited_contribs})
 
 
@@ -194,45 +195,58 @@ def access_denied(request, redirect):
 
 
 def index(request):
-    return render(request, 'index.html', dashboard())
+    return render(request, 'index.html', dashboard(request))
 
 
-def dashboard():
+def dashboard(request):
+    MAX_PPL_IN_VIEW = 5
     first_timers = []
     experienced = []
     inactive = []
+    contacted_filter = set()
 
     first_timers_qs = group('first_timers').select_related(
         'contacts').order_by('last_upload__timestamp').reverse()
     experienced_qs = group('experienced').select_related(
         'contacts').order_by('last_upload__timestamp').reverse()
     inactive_qs = group('inactive').select_related(
         'contacts').order_by('last_upload__timestamp').reverse()
+    actions = LogEntry.objects.filter(user_id=request.user.id)
+    contacted_qs = Comment.objects.for_model(People).order_by('submit_date')
 
     for p in first_timers_qs:
-        if (len(first_timers) < 20 and not p.contacts.all()):
+        if len(first_timers) < MAX_PPL_IN_VIEW and not p.contacts.all():
             first_timers.append(p)
     for p in experienced_qs:
         if p.contacts.all():
             recent_c = p.contacts.all().reverse()[0].submit_date
         else:
             recent_c = None
-        if (len(experienced) < 20 and (recent_c is None or
+        if (len(experienced) < MAX_PPL_IN_VIEW and (recent_c is None or
             recent_c < Uploads.objects.filter(
                 email_changer=p.email).order_by("timestamp")[39].timestamp)):
             experienced.append(p)
-
     for p in inactive_qs:
         if p.contacts.all():
             recent_c = p.contacts.all().reverse()[0].submit_date
         else:
             recent_c = None
-        if len(inactive) < 20 and (recent_c is None or
+        if len(inactive) < MAX_PPL_IN_VIEW and (recent_c is None or
            recent_c < p.last_upload.timestamp):
                 inactive.append(p)
+    for c in contacted_qs:
+        if len(contacted_filter) < MAX_PPL_IN_VIEW:
+            contacted_filter.add(c.object_pk)
+    query = Q()
+    for object_pk in contacted_filter:
+        query |= Q(id=object_pk)
+    contacted = People.objects.filter(query) if query else []
     return {'first_timers': first_timers,
             'experienced': experienced,
-            'inactive': inactive}
+            'inactive': inactive,
+            'contacted': contacted,
+            'actions': actions,
+            }
 
 
 @receiver(comment_was_posted)

diff --git a/greenhouse/file.py~ b/greenhouse/file.py~