Skip to content

Commit

Permalink
Make _includes/ consistent across TAC sites (#430)
Browse files Browse the repository at this point in the history
Signed-off-by: John Mertic <jmertic@linuxfoundation.org>
  • Loading branch information
jmertic authored Jul 13, 2023
1 parent 5bb72e7 commit 6bce13b
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 21 deletions.
5 changes: 5 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ gh_edit_repository: "https://github.com/AcademySoftwareFoundation/tac" # the git
gh_edit_branch: "main" # the branch that your docs is served from
gh_edit_view_mode: "tree"

landscape_url: 'https://landscape.aswf.io'
calendar_url: 'https://calendar.aswf.io'
slack_url: 'https://slack.aswf.io'
vote_of_tac_committee_title: "Industry Representative"

aux_links:
"Need help or have a question? Contact us here":
- "//servicedesk.aswf.io"
Expand Down
3 changes: 1 addition & 2 deletions _includes/calendar.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@

<iframe src="https://calendar.aswf.io" style="border: 0" width="800" height="600" frameborder="0" scrolling="no"></iframe>

<iframe src="{{ site.calendar_url }}" style="border: 0" width="800" height="600" frameborder="0" scrolling="no"></iframe>
40 changes: 25 additions & 15 deletions _includes/projectdetails.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,52 @@
<tr>
<td><img id="{{ project["Name"] }}" src="{{ project["Logo URL"] }}" /></td>
<td>
{%- if project["Website"] -%}
{%- if project["Github Org"] -%}
Repo: <a href="{{ project["Github Org"] }}">{{ project["Github Org"] }}</a><br />
{%- elsif project["Primary Github Repo"] -%}
Repo: <a href="{{ project["Primary Github Repo"] }}">{{ project["Primary Github Repo"] }}</a><br />
{%- endif -%}
{%- if project["Website"] and project["Website"] != 'none' -%}
Website: <a href="{{ project["Website"] }}">{{ project["Website"] }}</a><br />
{%- endif -%}
{%- if project["Dev Mailing List"] -%}
{%- if project["Dev Mailing List"] and project["Dev Mailing List"] != 'none' -%}
Dev Mailing List: <a href="{{ project["Dev Mailing List"] }}">{{ project["Dev Mailing List"] }}</a><br />
{%- endif -%}
{%- if project["User Mailing List"] -%}
{%- if project["User Mailing List"] and project["User Mailing List"] != 'none' -%}
User Mailing List: <a href="{{ project["User Mailing List"] }}">{{ project["User Mailing List"] }}</a><br />
{%- endif -%}
{%- if project["Mailing List"] -%}
{%- if project["Mailing List"] and project["Mailing List"] != 'none' -%}
Mailing List: <a href="{{ project["Mailing List"] }}">{{ project["Mailing List"] }}</a><br />
{%- endif -%}
{%- if project["Slug"] == "open-color-io" %}
Slack: <a href="https://slack.opencolorio.org/">slack.opencolorio.org</a><br />
{%- if project["Slack"] and project["Slack"] != 'none' -%}
{{ assign slackstart = project["Slack"] | slice: 0 }}
{%- if slackstart == "#" %}
Slack: <a href="{{ site.slack_url }}">{{ project["Slack"] }}</a><br />
{%- elsif project["Slack"] -%}
Slack: <a href="https://slack.aswf.io">{{ project["Slack"] }}</a><br />
Slack: <a href="{{ project["Slack"] }}">{{ project["Slack"] }}</a><br />
{%- endif -%}
{%- endif -%}
{%- if project["LFX Insights URL"] -%}
{%- if project["LFX Insights URL"] and project["LFX Insights URL"] != 'none' -%}
LFX Insights: <a href="{{ project["LFX Insights URL"] }}">{{ project["LFX Insights URL"] }}</a><br />
{%- endif -%}
{%- if project["LFX Security URL"] -%}
{%- if project["LFX Security URL"] and project["LFX Security URL"] != 'none' -%}
LFX Security: <a href="{{ project["LFX Security URL"] }}">{{ project["LFX Security URL"] }}</a><br />
{%- endif -%}
{%- if project["Documentation"] -%}
{%- if project["Documentation"] and project["Documentation"] != 'none' -%}
Documentation: <a href="{{ project["Documentation"] }}">{{ project["Documentation"] }}</a><br />
{%- endif -%}
{%- if project["Leads"] -%}
Leads: {{ project["Leads"] }}<br />
{%- if project["Leads"] and project["Leads"] != 'none' -%}
Lead(s): {{ project["Leads"] }}<br />
{%- endif -%}
{%- if project["Meeting Cadence"] -%}
Meeting Cadence: {{ project["Meeting Cadence"] }}<br />
{%- if project["Calendar"] and project["Calendar"] != 'none' -%}
Calendar: {{ project["Calendar"] }}<br />
{%- endif -%}
{%- if project["Best Practices Badge ID"] and project["Best Practices Badge ID"] != 'none' and project["Best Practices Badge ID"] != 'False' -%}
<a href="https://bestpractices.coreinfrastructure.org/projects/{{ project["Best Practices Badge ID"] }}"><img src="https://bestpractices.coreinfrastructure.org/projects/{{ project["Best Practices Badge ID"] }}/badge"></a>
{%- endif -%}
</td>
</tr>
{%- endif -%}
{%- endfor -%}
</tbody>
</table>

4 changes: 2 additions & 2 deletions _includes/projectlist.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

<iframe src="https://landscape.aswf.io/pages/hosted-projects?style=body{background-color:white;}%23embedded-footer{display:none;}" frameborder="0" id="landscape" scrolling="no" style="width: 1px; min-width: 100%; opacity: 1; visibility: visible; overflow: hidden;"></iframe>
<script src="https://landscape.aswf.io/iframeResizer.js"></script>
<iframe src="{{ site.landscape_url }}/pages/hosted-projects?style=body{background-color:white;}%23embedded-footer{display:none;}" frameborder="0" id="landscape" scrolling="no" style="width: 1px; min-width: 100%; opacity: 1; visibility: visible; overflow: hidden;"></iframe>
<script src="{{ site.landscape_url }}/iframeResizer.js"></script>
4 changes: 2 additions & 2 deletions _includes/tacmembers.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{%- if member["Appointed By"] == "Membership Entitlement" -%}
<tr>
<td>{{ member["Full Name"] }}</td>
<td>Premier Member Representative</td>
<td>{{ site.membership_top_tier | default: "Premier" }} Member Representative</td>
<td>{% if member["Special Role"] == "Chair" %}Chairperson - {% endif %}{{ member["Voting Status"] }}</td>
<td>{{ member["Account Name: Account Name"] }}</td>
</tr>
Expand Down Expand Up @@ -41,7 +41,7 @@
{%- if member["Appointed By"] == "Vote of TAC Committee" -%}
<tr>
<td>{{ member["Full Name"] }}</td>
<td>Industry Representative</td>
<td>{{ site.vote_of_tac_committee_title | default: "Other Representative" }}</td>
<td>{% if member["Special Role"] == "Chair" %}Chairperson - {% endif %}{{ member["Voting Status"] }}</td>
<td>{{ member["Account Name: Account Name"] }}</td>
</tr>
Expand Down

0 comments on commit 6bce13b

Please sign in to comment.