From 0498a13ababa34b165c9d9a653e049ed501b7b28 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 9 Apr 2012 20:46:28 +0200
Subject: [PATCH 1/4] development.ini: use debexpo_importer.py by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Arno Töll <arno@debian.org>
---
 development.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/development.ini b/development.ini
index 1c9b69de..fccab416 100644
--- a/development.ini
+++ b/development.ini
@@ -43,7 +43,7 @@ debexpo.upload.incoming = /tmp/debexpo/
 debexpo.repository = /tmp/debexpo/files/
 
 # Path to importer script
-debexpo.importer = %(here)s/bin/debexpo-importer
+debexpo.importer = %(here)s/bin/debexpo_importer.py
 
 # Whether to let debexpo handle the /debian/ directory
 debexpo.handle_debian = true
-- 
GitLab


From b8f6501124e48580bdadcf5dcbd9085dcc89a72e Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 9 Apr 2012 22:39:59 +0200
Subject: [PATCH 2/4] Bugfix: The filter links need to go to
 /sponsors/guidelines, not /sponsor

---
 debexpo/templates/sponsor/guidelines.mako | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debexpo/templates/sponsor/guidelines.mako b/debexpo/templates/sponsor/guidelines.mako
index 508e78b9..92f8c5d8 100644
--- a/debexpo/templates/sponsor/guidelines.mako
+++ b/debexpo/templates/sponsor/guidelines.mako
@@ -10,20 +10,20 @@ To help you find a sponsor interested in your package, they can formulate sponso
 
 <%def name="tag_helper(requirement)">
     % if not c.sponsor_filter:
-        <dt id="${requirement.tag}">${ requirement.label } (${ h.tags.link_to(  _('Filter'), h.url.current(action='index', t=requirement.tag))  })</dt>
+        <dt id="${requirement.tag}">${ requirement.label } (${ h.tags.link_to(  _('Filter'), h.url.current(action='guidelines', t=requirement.tag))  })</dt>
         <dd>${ requirement.long_description | n}</dd>
     % elif requirement.tag not in c.sponsor_filter:
         <%
         new_tag_list = c.sponsor_filter[:]
         new_tag_list.append(requirement.tag)
         %>
-        <dt><span id="${requirement.tag}" style="text-decoration: line-through;">${ requirement.label }</span> (${ h.tags.link_to(  _('Add to filter'), h.url.current(action='index', t=new_tag_list))  })</dt>
+        <dt><span id="${requirement.tag}" style="text-decoration: line-through;">${ requirement.label }</span> (${ h.tags.link_to(  _('Add to filter'), h.url.current(action='guidelines', t=new_tag_list))  })</dt>
     % else:
         <%
         new_tag_list = c.sponsor_filter[:]
         new_tag_list.remove(requirement.tag)
         %>
-        <dt id="${requirement.tag}">${ requirement.label } (${ h.tags.link_to(  _('Remove filter'), h.url.current(action='index', t=new_tag_list))  })</dt>
+        <dt id="${requirement.tag}">${ requirement.label } (${ h.tags.link_to(  _('Remove filter'), h.url.current(action='guidelines', t=new_tag_list))  })</dt>
         <dd>${ requirement.long_description | n}</dd>
     % endif
 </%def>
-- 
GitLab


From 4584327992691cfc4b220b0abfb3059f001b6b16 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 9 Apr 2012 22:39:59 +0200
Subject: [PATCH 3/4] Bugfix: The filter links need to go to
 /sponsors/guidelines, not /sponsor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Arno Töll <arno@debian.org>
---
 debexpo/templates/sponsor/guidelines.mako | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debexpo/templates/sponsor/guidelines.mako b/debexpo/templates/sponsor/guidelines.mako
index 508e78b9..92f8c5d8 100644
--- a/debexpo/templates/sponsor/guidelines.mako
+++ b/debexpo/templates/sponsor/guidelines.mako
@@ -10,20 +10,20 @@ To help you find a sponsor interested in your package, they can formulate sponso
 
 <%def name="tag_helper(requirement)">
     % if not c.sponsor_filter:
-        <dt id="${requirement.tag}">${ requirement.label } (${ h.tags.link_to(  _('Filter'), h.url.current(action='index', t=requirement.tag))  })</dt>
+        <dt id="${requirement.tag}">${ requirement.label } (${ h.tags.link_to(  _('Filter'), h.url.current(action='guidelines', t=requirement.tag))  })</dt>
         <dd>${ requirement.long_description | n}</dd>
     % elif requirement.tag not in c.sponsor_filter:
         <%
         new_tag_list = c.sponsor_filter[:]
         new_tag_list.append(requirement.tag)
         %>
-        <dt><span id="${requirement.tag}" style="text-decoration: line-through;">${ requirement.label }</span> (${ h.tags.link_to(  _('Add to filter'), h.url.current(action='index', t=new_tag_list))  })</dt>
+        <dt><span id="${requirement.tag}" style="text-decoration: line-through;">${ requirement.label }</span> (${ h.tags.link_to(  _('Add to filter'), h.url.current(action='guidelines', t=new_tag_list))  })</dt>
     % else:
         <%
         new_tag_list = c.sponsor_filter[:]
         new_tag_list.remove(requirement.tag)
         %>
-        <dt id="${requirement.tag}">${ requirement.label } (${ h.tags.link_to(  _('Remove filter'), h.url.current(action='index', t=new_tag_list))  })</dt>
+        <dt id="${requirement.tag}">${ requirement.label } (${ h.tags.link_to(  _('Remove filter'), h.url.current(action='guidelines', t=new_tag_list))  })</dt>
         <dd>${ requirement.long_description | n}</dd>
     % endif
 </%def>
-- 
GitLab


From eaf879cb3f0a1e2324bec276e064438bba26cf63 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 9 Apr 2012 23:55:08 +0200
Subject: [PATCH 4/4] sponsor guidelines: display terse page with toggle
 buttons (if JS is available)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Arno Töll <arno@debian.org>
---
 debexpo/public/style.css                  | 17 +++++++
 debexpo/templates/sponsor/guidelines.mako | 57 +++++++++++++++++++++--
 2 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/debexpo/public/style.css b/debexpo/public/style.css
index 287f2295..bc720d6a 100644
--- a/debexpo/public/style.css
+++ b/debexpo/public/style.css
@@ -1037,3 +1037,20 @@ ul.qa {
     margin-bottom: 1em;
     list-style-type: none;
 }
+
+/* User information */
+.userinfo p {
+    margin: 0.5em 0 0.5em 0;
+}
+
+/* Sponsor guidelines */
+table.sponsor-guidelines {
+    table-layout: fixed;
+}
+
+.sponsor-tags-abbrev {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+}
+
diff --git a/debexpo/templates/sponsor/guidelines.mako b/debexpo/templates/sponsor/guidelines.mako
index 92f8c5d8..c42e454a 100644
--- a/debexpo/templates/sponsor/guidelines.mako
+++ b/debexpo/templates/sponsor/guidelines.mako
@@ -73,7 +73,7 @@ To help you find a sponsor interested in your package, they can formulate sponso
 % endif
 </p>
 
-<table width="100%">
+<table width="100%" class="sponsor-guidelines">
     <tr>
         <th width="30%">Sponsor name and contact data</th>
         <th width="35%">Acceptable package traits</th>
@@ -101,10 +101,35 @@ To help you find a sponsor interested in your package, they can formulate sponso
         <% continue %>
     % endif
     <% sponsors_found = True %>
-    <tr>
+    <tr class="sponsor-guideline-short" data-sponsor="${ sponsor.user.name }">
         <td>
             <span style="font-size:120%"><strong>${ h.tags.link_to(sponsor.user.name, h.url(controller='sponsor', action='developer', id=sponsor.user.email)) }</strong></span>
-            <br />
+	</td>
+	<td class="sponsor-tags-abbrev">
+        <%
+    all_tags = sponsor.get_technical_tags_full()
+    positive_tags = [t for t in all_tags if t.weight > 0]
+    tool_tags = ['<span title="' + t.full_tag.label + '">' + t.tag + '</span>' for t in positive_tags]
+    taglist = ', '.join(tool_tags)
+        %>
+        % if taglist != '':
+        <span style="color: green">+${ taglist|n }</span>
+        % endif
+	</td>
+	<td class="sponsor-tags-abbrev">
+        <%
+    all_tags = sponsor.get_social_tags_full()
+    positive_tags = [t for t in all_tags if t.weight > 0]
+    tool_tags = ['<span title="' + t.full_tag.label + '">' + t.tag + '</span>' for t in positive_tags]
+    taglist = ', '.join(tool_tags)
+        %>
+        % if taglist != '':
+        <span style="color: green">+${ taglist|n }</span>
+        % endif
+	</td>
+    </tr>
+    <tr class="sponsor-guideline-long" data-sponsor="${ sponsor.user.name }">
+        <td>
             <ul>
             % if sponsor.user.email and sponsor.allowed(c.constants.SPONSOR_CONTACT_METHOD_EMAIL):
                 <li>Email: ${ sponsor.user.email } ${ preferred(sponsor.contact == c.constants.SPONSOR_CONTACT_METHOD_EMAIL) }</li>
@@ -166,3 +191,29 @@ To help you find a sponsor interested in your package, they can formulate sponso
 % if c.sponsor_filter:
     <p>${ h.tags.link_to(  _('Remove all filters'), h.url.current(action='clear'))  }</p>
 % endif
+
+<script type="text/javascript">
+$(function() {
+    $('.sponsor-guideline-long').hide();
+
+    // Add detail buttons. We do this in JavaScript instead of in the HTML so
+    // that there are no useless links when people without JavaScript view the
+    // page.
+    $('tr.sponsor-guideline-short td:first-child').each(function() {
+        var sponsor = $(this).parent().data('sponsor');
+        $(this).prepend($('<a href="#" class="guideline-toggle" data-sponsor="' + sponsor + '">[details]</a>'));
+    });
+
+    // Setup the click handler for the expand buttons.
+    $('.guideline-toggle').click(function() {
+        var sponsor = $(this).data('sponsor');
+        var details = $('.sponsor-guideline-long[data-sponsor="' + sponsor + '"]');
+        if (details.is(':visible')) {
+            details.hide('fast');
+        } else {
+            details.show('fast');
+        }
+        return false;
+    });
+});
+</script>
-- 
GitLab