Display two rows of five orgs on the GCI homepage.
diff --git a/app/soc/content/css/v2/gci/style.css b/app/soc/content/css/v2/gci/style.css
index 96816cc..5e5e989 100644
--- a/app/soc/content/css/v2/gci/style.css
+++ b/app/soc/content/css/v2/gci/style.css
@@ -1463,9 +1463,17 @@
padding-right: 0;
text-align: center;
}
- .block-participating-orgs img {
- margin: 0 5px;
+ .block-participating-orgs .participating-orgs-table {
+ margin: auto;
+ }
+ .participating-orgs-table td {
vertical-align: middle;
+ text-align: center;
+ }
+ .block-participating-orgs img {
+ padding: 5px;
+ vertical-align: middle;
+ text-align: center;
max-height: 65px;
max-width: 65px;
}
diff --git a/app/soc/modules/gci/views/homepage.py b/app/soc/modules/gci/views/homepage.py
index bf98431..36fc688 100644
--- a/app/soc/modules/gci/views/homepage.py
+++ b/app/soc/modules/gci/views/homepage.py
@@ -114,8 +114,10 @@
class ParticipatingOrgs(Template):
- """Participating orgs template.
- """
+ """Participating orgs template."""
+
+ _TABLE_WIDTH = 5
+ _ORG_COUNT = 10
def __init__(self, data):
self.data = data
@@ -124,7 +126,8 @@
r = self.data.redirect
participating_orgs = []
- current_orgs = org_logic.participating(self.data.program)
+ current_orgs = org_logic.participating(
+ self.data.program, org_count=self._ORG_COUNT)
for org in current_orgs:
participating_orgs.append({
'link': r.orgHomepage(org.link_id).url(),
@@ -132,10 +135,21 @@
'name': org.short_name,
})
+ participating_orgs_table_rows = []
+ orgs = list(participating_orgs)
+ while True:
+ if len(orgs) <= self._TABLE_WIDTH:
+ participating_orgs_table_rows.append(orgs)
+ break
+ else:
+ row, orgs = orgs[:self._TABLE_WIDTH], orgs[self._TABLE_WIDTH:]
+ participating_orgs_table_rows.append(row)
+
accepted_orgs_url = r.program().urlOf('gci_accepted_orgs')
return {
'participating_orgs': participating_orgs,
+ 'participating_orgs_table_rows': participating_orgs_table_rows,
'org_list_url': accepted_orgs_url,
}
diff --git a/app/soc/templates/v2/modules/gci/homepage/_participating_orgs.html b/app/soc/templates/v2/modules/gci/homepage/_participating_orgs.html
index 7869eb5..4522d49 100644
--- a/app/soc/templates/v2/modules/gci/homepage/_participating_orgs.html
+++ b/app/soc/templates/v2/modules/gci/homepage/_participating_orgs.html
@@ -1,12 +1,20 @@
-{% if participating_orgs %}
- <div class="block block-participating-orgs">
- <div class="block-title">Participating Organizations</div>
- <div class="block-content">
- {% for org in participating_orgs %}
+{% if participating_orgs_table_rows %}
+ <div class="block block-participating-orgs">
+ <div class="block-title">Participating Organizations</div>
+ <div class="block-content">
+ <table class="participating-orgs-table">
+ {% for row in participating_orgs_table_rows %}
+ <tr>
+ {% for org in row %}
+ <td>
<a href="{{ org.link }}"><img src="{{ org.logo }}" alt="{{ org.name }} logo" title="{{ org.name }}"/></a>
+ </td>
{% endfor %}
- </div>
- <div class="block-footer"><a href="{{ org_list_url }}">See all participating organizations</a></div>
+ </tr>
+ {% endfor %}
+ </table>
</div>
+ <div class="block-footer"></div>
+ </div>
{% endif %}
<!-- end .block.block-home-participating-orgs -->
