Closes issue openhatch#22 User Feedback Enhancements

-Changed "Greenhouse Overview" to "Greenhouse" -Moved purpose text and user_profile history to dashboard -Removed sidebar, Debian Developer swirl, top nav and copyright -Added description to contacts box and DDOP -Moved "most recent uploads" in person view to be right below stats
daveeloo · Aug 14, 2013 · 333fbc0 · 333fbc0
1 parent 3b732f5
commit 333fbc0
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 71 deletions.
diff --git a/greenhouse/templates/base.html b/greenhouse/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 b/greenhouse/templates/dashboard.html
@@ -1,38 +1,42 @@
 {% 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>
 
+<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/index.html b/greenhouse/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 b/greenhouse/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/[email protected]"> {{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_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 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 b/greenhouse/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 %}