Commit 1f8c99a0 authored by Daniel W Bond's avatar Daniel W Bond

yay merge conflicts... now up to date with master

parents dfb782d6 688d3207
*.sw*
*.pyc
*~
srctweb/website/build/
.venv
.virtualevn
image: python:2
pages:
script:
- pip install -r requirements.txt
- python srctweb/srctweb.py build
- mv srctweb/website/build/ public/
artifacts:
paths:
- public/
only:
- master
......@@ -7,3 +7,4 @@ argparse==1.2.1
gunicorn==18.0
itsdangerous==0.23
wsgiref==0.1.2
Frozen-Flask==0.11
#!flask/bin/python
import sys
from website import website
from website import freezer
if __name__ == '__main__': ## This is for debugging use only.
if len(sys.argv) > 1 and sys.argv[1] == "build":
freezer.freeze()
sys.exit();
website.run(debug=True)
## This is for execution via gunicorn.
......
from flask import Flask
from flask.ext.gravatar import Gravatar
from flask_frozen import Freezer
website = Flask(__name__)
freezer = Freezer(website)
from website import views
# initialize gravatar defaults
......
......@@ -54,6 +54,8 @@ a[name] {
.smidge-4x {
padding-bottom: 40px;
}
/** People Page **/
.people-left {
padding-left:0;
padding-right:0;
......@@ -62,6 +64,27 @@ a[name] {
padding-right:0;
padding-left:0;
}
.gravatar {
width:80px;
height:80px;
}
.devs tr > td:first-of-type, .devs2 tr > td:first-of-type {
width:50%;
}
#executive td {
vertical-align: middle;
}
@media(max-width:992px) {
#executive td:first-of-type, #executive th:first-of-type {
display:none;
}
.devs2 thead {
display: none;
}
.devs {
margin-bottom:0;
}
}
@media(min-width:992px){
.people-left {
padding-right:15px;
......@@ -70,6 +93,7 @@ a[name] {
padding-left:15px;
}
}
/** Calendar Page **/
/**
* A cool little hack I found to try to allow a responsive Google Cal:
* http://themeloom.com/2013/02/tips-embed-google-maps-and-calendars-in-a-responsive-wordpress-theme/
......
......@@ -11,13 +11,13 @@ Drop us a line!
{% endblock %}
{% block content %}
<h4><p>SRCT communicates through mailing lists, our <a href="Slack team"></a>, IRC on <a href="http://freenode.net/">freenode</a> (#srct), and via our
<a href="https://facebook.com/groups/gmu.srct">private Facebook group</a>--
just request to be added.</p></h4>
<h4><p>SRCT communicates through mailing lists, <a href="https://srct.slack.com/" target="_blank">Slack</a>,
<a href="https://facebook.com/MasonSRCT" target="_blank">Facebook</a>, and <a href="https://twitter.com/MasonSRCT" target="_blank">Twitter</a>.
</p></h4>
<legend><i class="fa fa-envelope-o fa-fw"></i>&nbsp;<strong>Mailing Lists</strong></legend>
<p>Please see <a href="http://lists.srct.gmu.edu/">this page</a> to sign up for mailing lists.</p>
<p>Please see <a href="http://lists.srct.gmu.edu/" target="_blank">this page</a> to sign up for mailing lists.</p>
<address>
<strong>Members and interested members of the community</strong><br>
......@@ -38,32 +38,35 @@ srct-devs@lists.srct.gmu.edu
<div class="row smidge">
<div class="col-sm-4">
<i class="fa fa-slack fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://srct.slack.com">srct.slack.com</a>
<i class="fa fa-slack fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://srct.slack.com" target="_blank">srct.slack.com</a>
</div>
<div class="col-sm-4 centered">
<i class="fa fa-facebook fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://facebook.com/MasonSRCT">facebook.com/MasonSRCT</a>
<i class="fa fa-facebook fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://facebook.com/MasonSRCT" target="_blank">facebook.com/MasonSRCT</a>
</div>
<div class="col-sm-4">
<i class="fa fa-twitter fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://twitter.com/MasonSRCT">twitter.com/MasonSRCT</a>
<i class="fa fa-twitter fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://twitter.com/MasonSRCT" target="_blank">twitter.com/MasonSRCT</a>
</div>
</div>
<div class="row smidge">
<div class="col-sm-4">
<i class="fa fa-github fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://github.com/srct">github.com/srct</a>
<i class="fa fa-gitlab fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://git.gmu.edu" target="_blank">git.gmu.edu/srct</a>
</div>
<div class="col-sm-4">
<i class="fa fa-trello fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://trello.com/srct">trello.com/srct</a>
<i class="fa fa-github fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://github.com/srct" target="_blank">github.com/srct</a>
</div>
<div class="col-sm-4">
<i class="fa fa-instagram fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://www.instagram.com/masonsrct/">instagram.com/masonsrct</a>
<i class="fa fa-trello fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://trello.com/srct" target="_blank">trello.com/srct</a>
</div>
</div>
<div class="row smidge">
<div class="col-sm-4">
<i class="fa fa-tumblr fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://masonsrct.tumblr.com/">masonsrct.tumblr.com</a>
<i class="fa fa-instagram fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://www.instagram.com/masonsrct/" target="_blank">instagram.com/masonsrct</a>
</div>
<div class="col-sm-4">
<a href="https://gmu.collegiatelink.net/organization/srct">CollegiateLink</a>
<i class="fa fa-tumblr fa-fw fa-lg"></i>&nbsp;&nbsp;<a href="https://masonsrct.tumblr.com/" target="_blank">masonsrct.tumblr.com</a>
</div>
<div class="col-sm-4">
<a href="https://gmu.collegiatelink.net/organization/srct" target="_blank">CollegiateLink</a>
</div>
</div>
......@@ -80,6 +83,6 @@ Fairfax, VA 22030<br>
<legend><i class="fa fa-question-circle fa-fw"></i>&nbsp;<strong>Direct Contact</strong></legend>
<p>The Mason email usernames of our board and developers are on our <a href="{{ url_for('people') }}">people</a> page for directly emailing SRCT members through <a href="peoplefinder.gmu.edu">peoplefinder</a>.</p>
<p>The Mason email usernames of our board and developers are on our <a href="{{ url_for('people') }}" target="_blank">people</a> page for directly emailing SRCT members through <a href="https://peoplefinder.gmu.edu" target="_blank">peoplefinder</a>.</p>
{% endblock %}
......@@ -6,7 +6,7 @@ SRCT | People
People
{% endblock %}
{% block description %}
The people who make up this community of developers!
The awesome people who make up this community of developers!
{% endblock %}
{% block content %}
<div class="row">
......@@ -14,7 +14,7 @@ The people who make up this community of developers!
<a href="http://wiki.srct.gmu.edu/Executive_Board">Executive Board</a>
</strong></legend>
<table class="table table-hover">
<table class="table table-hover" id="executive">
<thead>
<tr>
<th></th>
......@@ -25,7 +25,7 @@ The people who make up this community of developers!
</thead>
<tbody>
<tr>
<td><img class="img-circle img-responsive center center-block" src="{{ 'jyeoman2@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'jyeoman2@gmu.edu' | gravatar }}" alt="gravatar image"</td>
<td><h5>Jason Yeomans</h5></td>
<td>
<a href="http://wiki.srct.gmu.edu/President"><h5>President</h5></a>
......@@ -33,7 +33,7 @@ The people who make up this community of developers!
<td><h5><em>jyeoman2</em></h5></td>
</tr>
<tr>
<td><img class="img-circle img-responsive center center-block" src="{{ 'mbaile18@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'mbaile18@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><h5>Michael Bailey</h5></td>
<td>
<a href="http://wiki.srct.gmu.edu/Systems_Administrator"><h5>Systems Admininstrator</h5></a>
......@@ -41,7 +41,7 @@ The people who make up this community of developers!
<td><h5><em>mbaile18</em></h5></td>
</tr>
<tr>
<td><img class="img-circle img-responsive center center-block" src="{{ 'dhaynes3@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'dhaynes3@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><h5>David Haynes</h5></td>
<td>
<a href="http://wiki.srct.gmu.edu/Vice_President"><h5>Vice President</h5></a>
......@@ -49,7 +49,7 @@ The people who make up this community of developers!
<td><h5><em>dhaynes3</em></h5></td>
</tr>
<tr>
<td><img class="img-circle img-responsive center center-block" src="{{ 'tkegel@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'tkegel@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><h5>Thomas Kegel</h5></td>
<td>
<a href="http://wiki.srct.gmu.edu/Treasurer"><h5>Treasurer</h5></a>
......@@ -57,7 +57,7 @@ The people who make up this community of developers!
<td><h5><em>tkegel</em></h5></td>
</tr>
<tr>
<td><img class="img-circle img-responsive center center-block" src="{{ 'mstengle@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'mstengle@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><h5>Mark Stenglein</h5></td>
<td>
<a href="http://wiki.srct.gmu.edu/Secretary"><h5>Secretary</h5></a>
......@@ -66,7 +66,7 @@ The people who make up this community of developers!
</tr>
<!--
<tr>
<td><img class="img-circle img-responsive center center-block" src="{{ 'asonntag@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'asonntag@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><h5>Audrey Sonntag</h5></td>
<td>
<a href="http://wiki.srct.gmu.edu/Historian"><h5>Historian</h5></a>
......@@ -76,7 +76,7 @@ The people who make up this community of developers!
<tr>
-->
<tr>
<td><img class="img-circle img-responsive center center-block" src="{{ 'kdobolyi@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'kdobolyi@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><h5>Kinga Dobolyi</h5></td>
<td>
<a href="http://wiki.srct.gmu.edu/Faculty_Advisor"><h5>Faculty Advisor</h5></a>
......@@ -92,7 +92,7 @@ The people who make up this community of developers!
<a href="http://wiki.srct.gmu.edu/Developers">Developers</a>
</strong></legend>
<div class="col-md-6 people-left">
<table class="table table-hover">
<table class="devs table table-hover">
<thead>
<tr>
<th><h4>Name</h4></th>
......@@ -136,6 +136,14 @@ The people who make up this community of developers!
<td>Jakob Kressel</td>
<td><em>jkressel</em></td>
</tr>
<tr>
<td>Eyad Hasan</td>
<td><em>ehasan3</em></td>
</tr>
<tr>
<td>Mattias Duffy</td>
<td><em>mduffy8</em></td>
</tr>
</tbody>
</table>
</div>
......@@ -181,6 +189,18 @@ The people who make up this community of developers!
<td>Thomas Kegel</td>
<td><em>tkegel</em></td>
</tr>
<tr>
<td>Robert Hitt</td>
<td><em>rhitt</em></td>
</tr>
<tr>
<td>Zach Osman</td>
<td><em>zosman</em></td>
</tr>
<tr>
<td>Danny Kim</td>
<td><em>dkim74</em></td>
</tr>
<tbody>
</table>
</div>
......@@ -191,7 +211,7 @@ The people who make up this community of developers!
Alumni
</strong></legend>
<div class="col-md-6 people-left">
<table class="table table-hover">
<table class="devs2 table table-hover">
<thead>
<tr>
<th><h4>Name</h4></th>
......@@ -239,6 +259,10 @@ The people who make up this community of developers!
<td>Akshay Karthik</td>
<td><em>akarthik</em></td>
</tr>
<tr>
<td>Patrick Murray</td>
<td><em>pmurray8</em></td>
</tr>
<tbody>
</table>
</div>
......
......@@ -374,12 +374,12 @@ or advertising.</small></font></legend>
<a class="project-link" name="Masonstrap" href="#masonstrap"><i class="fa fa-paint-brush project-icon"></i></a>
<legend><strong>Masonstrap</strong>
| <a href="https://github.com/srct/bootswatch">github.com/srct/bootswatch</a></legend>
| <a href="https://git.gmu.edu/srct/masonstrap">git.gmu.edu/srct/masonstrap</a></legend>
<strong class="project-role">Project Manager:</strong>
David Haynes<br>
<strong class="project-role">Repository:</strong>
<a href="https://github.com/srct/bootswatch">github.com/srct/bootswatch</a>
<a href="https://git.gmu.edu/srct/masonstrap">git.gmu.edu/srct/masonstrap</a>
<p class="project-text">
Unified, common design language across all SRCT-developed projects
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment