Commit 6985c0d2 authored by Nicholas Anderson's avatar Nicholas Anderson

Merge branch 'master' into execboardtablefix

parents 46fa2c6d f99551e0
...@@ -111,6 +111,17 @@ a[name] { ...@@ -111,6 +111,17 @@ a[name] {
padding-bottom: 10px; padding-bottom: 10px;
} }
/* can't you extend CSS classes? */ /* can't you extend CSS classes? */
.project-link {
/* Padding and margin business because of the static header */
padding-top:50px !important;
margin-top:-50px;
display:block;
color:#000;
}
.project-link:hover, .project-link:active, .project-link:focus {
text-decoration: none;
outline:0;
}
.project-icon-stacked { .project-icon-stacked {
font-size:65px; font-size:65px;
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -62,16 +62,49 @@ channel on <a href="https://www.freenode.net/">freenode</a>, #srct. More ways to ...@@ -62,16 +62,49 @@ channel on <a href="https://www.freenode.net/">freenode</a>, #srct. More ways to
get in touch are on our <a href="{{ url_for('contact') }}">contact page</a>.</p> get in touch are on our <a href="{{ url_for('contact') }}">contact page</a>.</p>
<legend><i class="fa fa-gavel fa-fw"></i>&nbsp;<strong>Next Meeting</strong></legend> <legend><i class="fa fa-gavel fa-fw"></i>&nbsp;<strong>Next Meeting</strong></legend>
<p>Our next meeting is scheduled for <strong><em>October <p id="meetingDate">Please wait while we fetch the upcoming meeting information...</p>
18th</em></strong>, at 2pm, <em>JC 239A</em>. For more information, check <!--<a href="{{ url_for('calendar') }}">calendar</a> or visit our
out our <a href="{{ url_for('calendar') }}">calendar</a>, or visit our
<a href="https://www.facebook.com/MasonSRCT">Facebook</a> or <a href="https://www.facebook.com/MasonSRCT">Facebook</a> or
<a href="https://www.twitter.com/MasonSRCT">Twitter</a> pages.</p> <a href="https://www.twitter.com/MasonSRCT">Twitter</a> pages.</p>-->
</div> </div>
{% endblock %}
{% block scripts %}
<!-- <script src="/static/js/parallax.min.js"></script> <!-- <script src="/static/js/parallax.min.js"></script>
var scene = document.getElementById('jumboparallax'); var scene = document.getElementById('jumboparallax');
var parallax = new Parallax(jumboparallax); --> var parallax = new Parallax(jumboparallax); -->
<script>
$(function() {
// Public API Key for Google Calendar access (Key from nander13's gmail account)
var apiKey = "AIzaSyDgaXDxmMEdtbIaq3TXmf4jxXZLG8CeoMs";
// Instead of loading the _entire_ Google API library, let's just make a GET request
$.getJSON("https://www.googleapis.com/calendar/v3/calendars/kaiuicpoki9p3u92eklent0eec%40group.calendar.google.com/events",
{
// Expand one recurring event to multiple events
"singleEvents":"true",
"orderBy":"startTime",
// Starting now until we hit the first event.
"timeMin":new Date().toISOString(),
"showDeleted":"false",
"maxResults":"1",
// Change this if the title of the weekly meeting on the calendar changes!
"q":"SRCT+Weekly+Meeting",
"key":apiKey
},
function(data) {
//console.log(data.items[0])
var d = new Date(data.items[0].start.dateTime),
monthName = d.toLocaleString("en-us", {month: "long"}),
dateOptions = { weekday: 'long', month: 'long', day: 'numeric' },
timeOptions = { hour: 'numeric', minute: 'numeric'},
dateString = d.toLocaleString("en-us", dateOptions),
timeString = d.toLocaleString("en-us", timeOptions);
$("#meetingDate").text("Join us for our next meeting in "+data.items[0].location+" at "+timeString+" on "+dateString +".")
});
});
</script>
{% endblock %} {% endblock %}
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, inital-scale=1.0"> <meta name="viewport" content="width=device-width, inital-scale=1.0">
<link href="/static/css/bootstrap.min.css" rel="stylesheet" media="screen"> <link href="/static/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="/static/css/bootstrap-theme.min.css" rel="stylesheet"> <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet"> <link href="/static/fonts/font-awesome.min.css" rel="stylesheet">
<link href="/static/css/style.css" rel="stylesheet"> <link href="/static/css/style.css" rel="stylesheet">
<link rel="icon" href="/static/img/favicon.ico"> <link rel="icon" href="/static/img/favicon.ico">
<script> <script>
...@@ -69,6 +69,8 @@ ...@@ -69,6 +69,8 @@
<script src="/static/js/jquery-2.0.3.min.js"></script> <script src="/static/js/jquery-2.0.3.min.js"></script>
<script src="/static/js/bootstrap.min.js"></script> <script src="/static/js/bootstrap.min.js"></script>
{% block scripts %}
{% endblock %}
<!-- Piwik --> <!-- Piwik -->
<script type="text/javascript"> <script type="text/javascript">
......
...@@ -13,9 +13,10 @@ ...@@ -13,9 +13,10 @@
<div class="collapse navbar-collapse navbar-ex1-collapse"> <div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="{{ url_for('projects')}}">Projects</a></li> <li><a href="{{ url_for('projects')}}">Projects</a></li>
<li><a href="{{ url_for('people')}}">People</a></li>
<li><a href=" //hackmason.org ">Events</a></li> <li><a href=" //hackmason.org ">Events</a></li>
<li><a href="{{ url_for('calendar')}}">Calendar</a> <li><a href="{{ url_for('calendar')}}">Calendar</a>
<li><a href="http://blog.srct.gmu.edu">Blog</a>
<li><a href="{{ url_for('people')}}">People</a></li>
<li class="dropdown"> <li class="dropdown">
<a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Documents <b class="caret"></b></a> <a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Documents <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="drop1"> <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
...@@ -29,7 +30,6 @@ ...@@ -29,7 +30,6 @@
</ul> </ul>
</li> </li>
<li><a href="{{ url_for('contact')}}">Contact</a> <li><a href="{{ url_for('contact')}}">Contact</a>
<li><a href="http://blog.srct.gmu.edu">Blog</a>
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
......
...@@ -24,45 +24,54 @@ The awesome people who make up this community of developers! ...@@ -24,45 +24,54 @@ The awesome people who make up this community of developers!
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'jrouly@gmu.edu' | gravatar }}" alt = "gravatar image"</td> <td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'mgauto@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><h5>Michel Rouly</h5></td> <td><h5>Manuel Gauto</h5></td>
<td> <td>
<a href="http://wiki.srct.gmu.edu/wiki/index.php/President"><h5>President</h5></a> <a href="http://wiki.srct.gmu.edu/wiki/index.php/President"><h5>President</h5></a>
</td> </td>
<td><h5><em>jrouly</em></h5></td> <td><h5><em>mgauto</em></h5></td>
</tr> </tr>
<tr> <tr>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'creffett@gmu.edu' | gravatar }}" alt = "gravatar image"</td> <td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'ksarkhel@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><h5>Chris Reffett</h5></td> <td><h5>Kunal Sarkhel</h5></td>
<td> <td>
<a href="http://wiki.srct.gmu.edu/wiki/index.php/Systems_Administrator"><h5>Systems Admininstrator</h5></a> <a href="http://wiki.srct.gmu.edu/wiki/index.php/Systems_Administrator"><h5>Systems Admininstrator</h5></a>
</td> </td>
<td><h5><em>creffett</em></h5></td> <td><h5><em>ksarkhel</em></h5></td>
</tr> </tr>
<tr> <tr>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'kmahone5@gmu.edu' | gravatar }}" alt = "gravatar image"</td> <td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'akarthik@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><h5>Kara Mahoney</h5></td> <td><h5>Akshay Karthik</h5></td>
<td> <td>
<a href="http://wiki.srct.gmu.edu/wiki/index.php/Vice_President"><h5>Vice President</h5></a> <a href="http://wiki.srct.gmu.edu/wiki/index.php/Vice_President"><h5>Vice President</h5></a>
</td> </td>
<td><h5><em>kmahone5</em></h5></td> <td><h5><em>akarthik</em></h5></td>
</tr> </tr>
<tr> <tr>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'bwaters3@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>Benjamin Waters</h5></td> <td><h5>Jason Yeomans</h5></td>
<td>
<a href="http://wiki.srct.gmu.edu/wiki/index.php/Treasurer"><h5>Treasurer</h5></a>
</td>
<td><h5><em>jyeomans2</em></h5></td>
</tr>
<tr>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'nlapier2@gmu.edu' | gravatar }}" alt = "gravatar image"</td>
<td><h5>Nathan Lapierre</h5></td>
<td> <td>
<a href="http://wiki.srct.gmu.edu/wiki/index.php/Secretary"><h5>Secretary</h5></a> <a href="http://wiki.srct.gmu.edu/wiki/index.php/Secretary"><h5>Secretary</h5></a>
</td> </td>
<td><h5><em>bwaters3</em></h5></td> <td><h5><em>nlapier2</em></h5></td>
</tr> </tr>
<tr> <tr>
<td><img class="img-circle gravatar img-responsive center center-block" src="{{ 'rharper2@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>Renfred Harper</h5></td> <td><h5>Audrey Sonntag</h5></td>
<td> <td>
<a href="http://wiki.srct.gmu.edu/wiki/index.php/Treasurer"><h5>Treasurer</h5></a> <a href="http://wiki.srct.gmu.edu/wiki/index.php/Historian"><h5>Historian</h5></a>
</td> </td>
<td><h5><em>rharper2</em></h5></td> <td><h5><em>asonntag</em></h5></td>
</tr> </tr>
<tr>
<tr> <tr>
<td><img class="img-circle gravatar 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><h5>Kinga Dobolyi</h5></td>
...@@ -130,6 +139,10 @@ The awesome people who make up this community of developers! ...@@ -130,6 +139,10 @@ The awesome people who make up this community of developers!
<td>Melissa Mahan</td> <td>Melissa Mahan</td>
<td><em>mmahan2</em></td> <td><em>mmahan2</em></td>
</tr> </tr>
<tr>
<td>Benjamin Ward</td>
<td><em>bward10</em></td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
...@@ -187,7 +200,15 @@ The awesome people who make up this community of developers! ...@@ -187,7 +200,15 @@ The awesome people who make up this community of developers!
<td>Akshay Karthik</td> <td>Akshay Karthik</td>
<td><em>akarthik</em></td> <td><em>akarthik</em></td>
</tr> </tr>
</tbody> <tr>
<td>Nathan LaPierre</td>
<td><em>nlapier2</em></td>
</tr>
<tr>
<td>Jason Yeomans</td>
<td><em>jyeoman2</em></td>
</tr>
<tbody>
</table> </table>
</div> </div>
{% endblock %} {% endblock %}
This diff is collapsed.
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