Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Created linking from hours to coords and modified the coords layout #125

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Created linking from hours to coords and modified the coords layout #125

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99ec8b7
Created linking from hours to coords and modified the coords layout
Sep 8, 2018
e038eee
updated JSON package, reverted to 3 column with link anchors, fixed R…
awlevin Sep 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions _data/hours.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
9:55AM: ''
11:00AM: 'Claire Jolly'
12:05PM: 'Roz Stengle'
1:20PM: 'Jonas klare'
1:20PM: 'Jonas Klare'
2:25PM: 'Jonas Klare'
3:30PM: 'Claire Jolly'
4:35PM: 'Andrew Geng'
Expand All @@ -42,9 +42,9 @@
11:00AM: 'Roz Stengle'
12:05PM: 'Claire Jolly'
1:20PM: 'David Chen'
2:25PM: 'Andew Petti'
2:25PM: 'Andrew Petti'
3:30PM: 'Maya Subramaniam'
4:35PM: 'Andew Geng'
4:35PM: 'Andrew Geng'
5:40PM: ''

- day: Friday
Expand All @@ -54,7 +54,7 @@
11:00AM: 'John Balis'
12:05PM: 'Harrison Brewton'
1:20PM: 'Aaron Levin'
2:25PM: 'Andew Petti'
2:25PM: 'Andrew Petti'
3:30PM: 'Harrison Brewton'
4:35PM: ''
5:40PM: ''
53 changes: 29 additions & 24 deletions coords.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,35 @@ <h2>Coordinators</h2>

<p>These are the people responsible for the daily operation and maintenance of the UPL. If you have any questions email us at: <a href="http://www.google.com/recaptcha/mailhide/d?k=01enlvO279JKQY5RDqwSAZng==&amp;c=27tAYEUKmtum-50yZuZ4fT4un5toOiloDmEWiGfH0go=" onclick="window.open('http://www.google.com/recaptcha/mailhide/d?k\07501enlvO279JKQY5RDqwSAZng\75\75\46c\07527tAYEUKmtum-50yZuZ4fT4un5toOiloDmEWiGfH0go\075', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;" title="Reveal this e-mail address">u...</a>@cs.wisc.edu.</p>

<ul class="coords-list">
<!-- <ul class="coords-list"> -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove commented code.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind.

{% assign coords = site.data.coords | sort: 'name' %}
{% for coord in coords %}
<li>
{% assign photo = coord.photo || 'default.png' %}
<div class="coord-mug"><img title="{{coord.name}}" src="{{'images/coords/' | append: photo | prepend: site.baseurl }}" /></div>
<h4>{{ coord.name }}</h4>
<div class="coord-info">
<p>
{{ coord.year }} majoring in {{ coord.major }}
<br />
{% if coord.emoji %}
<p>Favorite emoji:
<img class="emoji" title=":{{ coord.emoji }}:" alt=":{{ coord.emoji }}:" src="https://assets-cdn.github.com/images/icons/emoji/{{coord.emoji}}.png" height="20" width="20" align="absmiddle" />
</p>
{% endif %}
{% if coord.github %}
<a title="{{ coord.name }}: GitHub" href="{{ coord.github }}">GitHub</a>
{% endif %}
{% if coord.website %}
<a title="{{ coord.name }}: Website" href="{{ coord.website }}">Website</a>
{% endif %}
</p>
</div>
</li>

<ul class="coords-list" id="{{ coord.name }}">
<li>
{% assign photo = coord.photo || 'default.png' %}
<div><a href="#{{ coord.name }}"></a></div>
<div class="coord-mug"><img title="{{coord.name}}" src="{{'images/coords/' | append: photo | prepend: site.baseurl }}" /></div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put a line break in here somewhere.

<h4>{{ coord.name }}</h4>
<div class="coord-info">
<p>
{{ coord.year }} majoring in {{ coord.major }}
<br />
{% if coord.emoji %}
<p>Favorite emoji:
<img class="emoji" title=":{{ coord.emoji }}:" alt=":{{ coord.emoji }}:" src="https://assets-cdn.github.com/images/icons/emoji/{{coord.emoji}}.png" height="20" width="20" align="absmiddle" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here too. Attributes should be able to be across multiple lines.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically, 80 character limit please 😸

</p>
{% endif %}
{% if coord.github %}
<a title="{{ coord.name }}: GitHub" href="{{ coord.github }}">GitHub</a>
{% endif %}
{% if coord.website %}
<a title="{{ coord.name }}: Website" href="{{ coord.website }}">Website</a>
{% endif %}
</p>
</div>
</li>
</ul>

{% endfor %}
</ul>
<!-- </ul> -->
2 changes: 1 addition & 1 deletion hours.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{% for day in site.data.hours %}
{% for t in day.times %}
{% if forloop.index == t_index %}
<td>{{ t[1] }}</td>
<td><a href="/coords.html#{{ t[1] }}">{{ t[1] }}</a></td>
{% endif %}
{% endfor %}
{% endfor %}
Expand Down