Commit 4c6b3bae authored by Daniel W Bond's avatar Daniel W Bond
Browse files

oh yay, merge conflicts

parents 20e1a68c c8d63967
...@@ -93,7 +93,7 @@ a[name] { ...@@ -93,7 +93,7 @@ a[name] {
.project-icon { .project-icon {
text-align:center; text-align:center;
display: block; display: block;
font-size:130px; font-size:100px;
margin:0 auto; margin:0 auto;
padding-bottom: 10px; padding-bottom: 10px;
} }
...@@ -110,7 +110,7 @@ a[name] { ...@@ -110,7 +110,7 @@ a[name] {
outline:0; outline:0;
} }
.project-icon-stacked { .project-icon-stacked {
font-size:65px; font-size:55px;
} }
.project-role { .project-role {
width: 150px; width: 150px;
......
{% extends "layouts/base.html" %} {% extends "layouts/base.html" %}
{% block title %} {% block title %}
SRCT | Projects SRCT | Projects
{% endblock %} {% endblock %}
{% block pagetitle %} {% block pagetitle %}
...@@ -12,50 +12,59 @@ Projects created and maintained by SRCT's members. ...@@ -12,50 +12,59 @@ Projects created and maintained by SRCT's members.
{% block content %} {% block content %}
<h4>Make sure to check on <a href="http://wiki.srct.gmu.edu">our wiki</a> for the most up-to date information about SRCT's projects!</h4> <!--
<p class="text-center">
<legend>Deployed</legend> <i class="fa fa-exclamation-circle fa-fw fa-lg"></i>
We are currently restructuring documentation. Some links to docs, issues,
Trello, or mailing lists may not yet be added.
</p>
-->
<legend><strong><a class="project-link" name="deployed" href="#deployed">Deployed</a></strong>
<small><font color="gray">Stable and hosted on SRCT servers for the use of the
Mason community.</font></small></legend>
<div class="row"> <div class="row">
<div class="col-lg-6 project-entry"> <div class="col-lg-6 project-entry">
<a class="project-link" name="git" href="#git"><i class="fa fa-code-fork project-icon"></i></a> <a class="project-link" name="git" href="#git"><i class="fa fa-code-fork project-icon"></i></a>
<legend><strong><a href="http://wiki.srct.gmu.edu/Git">Git</a></strong> <legend><strong>Git</strong>
| <a href="https://git.gmu.edu">git.gmu.edu</a></legend> | <a href="https://git.gmu.edu">git.gmu.edu</a></legend>
<a href="https://git.gmu.edu/srct/gitlabhq/blob/master/README.md">Docs</a> | <a href="http://git.gmu.edu/srct/gitlabhq/issues/">Issues</a> |
<a href="https://trello.com/b/oiyR0UUq/gitlab">Trello</a>
<br><br>
<strong class="project-role">Project Manager:</strong> <strong class="project-role">Project Manager:</strong>
Chris Reffett<br> Nicolas Anderson<br>
<strong class="project-role">Developer:</strong>
<br>
<strong class="project-role">Repository:</strong> <strong class="project-role">Repository:</strong>
<a href="http://github.com/gitlabhq">github.com/gitlabhq</a> <a href="https://github.com/gitlabhq/gitlabhq">github.com/gitlabhq/gitlabhq</a>
<p class="project-text"> <p class="project-text">
GitLab is a central host for Git repositories. It's like GitHub, but GitLab is a central host for Git repositories. It's like GitHub, but
operated by Mason for Mason. Any student or member of the community may operated by Mason for Mason. Any student or member of the community may
log into it with their Mason NetID. Users may upload code either for log into it with their Mason NetID. Users may upload code either for
private work or public viewing, and may allow others to contribute to their private work or public viewing, and may allow others to contribute to their
projects.</p> projects.
</p>
</div> </div>
<div class="col-lg-6 project-entry"> <div class="col-lg-6 project-entry">
<a class="project-link" name="go" href="#go"><i class="fa fa-link project-icon"></i></a> <a class="project-link" name="go" href="#go"><i class="fa fa-link project-icon"></i></a>
<legend><strong><a href="http://wiki.srct.gmu.edu/Go">Go</a></strong> <legend><strong>Go</strong>
| <a href="http://go.gmu.edu">go.gmu.edu</a></legend> | <a href="http://go.gmu.edu">go.gmu.edu</a></legend>
<a href="https://git.gmu.edu/srct/go/blob/master/README.md">Docs</a> | <a href="http://git.gmu.edu/srct/go/issues/">Issues</a> |
<a href="https://trello.com/b/f3b3Cesv/go">Trello</a> |
<a href="mailto:go-signups@lists.srct.gmu.edu">Email</a>
<br><br>
<strong class="project-role">Project Manager:</strong> <strong class="project-role">Project Manager:</strong>
Michel Rouly<br> David Haynes<br>
<strong class="project-role">Developer:</strong>
Chris Reffett<br>
<strong class="project-role"></strong>
Akshay Karthik<br>
<strong class="project-role"></strong>
Melissa Mahan<br>
<strong class="project-role">Repository:</strong> <strong class="project-role">Repository:</strong>
<a href="https://git.gmu.edu/srct/go">git.gmu.edu/srct/go</a><br> <a href="https://git.gmu.edu/srct/go">git.gmu.edu/srct/go</a>
<p class="project-text"> <p class="project-text">
Providing URL shortening would enhance branding when used by Providing URL shortening would enhance branding when used by
...@@ -63,116 +72,105 @@ Projects created and maintained by SRCT's members. ...@@ -63,116 +72,105 @@ Projects created and maintained by SRCT's members.
gmu.edu website would appear as go.gmu.edu/nHU8oPm instead of bit.ly/nHU8oPm. gmu.edu website would appear as go.gmu.edu/nHU8oPm instead of bit.ly/nHU8oPm.
</p> </p>
</div> </div>
</div>
<div class="row"> </div>
<div class="row">
<div class="col-lg-6 project-entry"> <div class="col-lg-6 project-entry">
<a class="project-link" name="roomlist" href="#roomlist"><i class="fa fa-users project-icon"></i></a>
<a class="project-link" name="whatsopen" href="#whatsopen"><i class="fa fa-clock-o project-icon"></i></a>
<legend><strong><a href="http://wiki.srct.gmu.edu/Whatsopen">Whatsopen</a></strong> <legend><strong>Roomlist</strong>
| <a href="http://whatsopen.gmu.edu">whatsopen.gmu.edu</a></legend> | <a href="http://roomlist.srct.gmu.edu">roomlist.srct.gmu.edu</a></legend>
<strong class="project-role">Project Manager:</strong> <a href="https://git.gmu.edu/srct/roomlist/blob/master/README.md">Docs</a> |
Renfred Harper<br> <a href="http://git.gmu.edu/srct/roomlist/issues/">Issues</a> |
<strong class="project-role">Developer:</strong> <a href="mailto:roomlist@lists.srct.gmu.edu">Email</a><!--| <a href="#">Trello</a> -->
Tyler Hallada<br> <br><br>
<strong class="project-role"></strong>
Ben Waters<br>
<strong class="project-role"></strong>
Daniel Bond<br>
<strong class="project-role">Repository:</strong>
<a href="https://git.gmu.edu/srct/whatsopen">git.gmu.edu/srct/whatsopen</a>
<p class="project-text">
Provides a list of all currently open dining options in/around campus,
kept updated with holidays, etc. Expanding to cover more than dining locations.</p>
</div>
<div class="col-lg-6 project-entry">
<a class="project-link" name="pgp" href="#pgp"><i class="fa fa-key project-icon"></i></a>
<legend><strong><a href="http://wiki.srct.gmu.edu/PGP">PGP</a></strong>
| <a href="http://pgp.srct.gmu.edu">pgp.srct.gmu.edu</a></legend>
<strong class="project-role">Project Manager:</strong> <strong class="project-role">Project Manager:</strong>
Kunal Sarkhel<br> Jason Yeomans<br>
<strong class="project-role">Developer:</strong>
Chris Reffett<br>
<strong class="project-role">Repository:</strong> <strong class="project-role">Repository:</strong>
<a href="https://git.gmu.edu/srct/pgp">git.gmu.edu/srct/pgp</a><br> <a href="https://git.gmu.edu/srct/roomlist">git.gmu.edu/srct/roomlist</a><br>
<p class="project-text"> <p class="project-text">
Student organization would manage a GMU public key server. This would A voluntary, privacy-focused Mason student housing directory. Foster community
start as a proof of concept, but would allow for future exploration to by seeing who else lives on your floor or in your building. Find other
deploy a public key infrastructure for encrypted email or digital signatures students who share your major. Link to your social media accounts.
for general institutional purposes.
</p> </p>
</div> </div>
</div>
<div class="row">
<div class="col-lg-6 project-entry"> <div class="col-lg-6 project-entry">
<a class="project-link" name="schedules" href="#schedules">
<a class="project-link" name="bookshare" href="#bookshare"><i class="fa fa-book project-icon"></i></a> <span class="fa-stack project-icon project-icon-stacked">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-calendar fa-stack-1x"></i>
</span>
</a>
<legend><strong>Schedules</a></strong>
| <a href="http://schedules.gmu.edu">schedules.gmu.edu</a></legend>
<legend><strong><a href="http://wiki.srct.gmu.edu/Bookshare">Bookshare</a></strong> <a href="https://git.gmu.edu/srct/schedules/blob/master/readme.md">Docs</a> | <a href="http://git.gmu.edu/srct/schedules/issues/">Issues</a> |
| <a href="http://bookshare.srct.gmu.edu">bookshare.srct.gmu.edu</a></legend> <a href="https://trello.com/b/LPI2eoPz/schedules-project">Trello</a>
<br><br>
<strong class="project-role">Project Manager:</strong> <strong class="project-role">Project Manager:</strong>
Eric Cawi<br> Mark Stenglein<br>
<strong class="project-role">Developer:</strong>
Michel Rouly<br>
<strong class="project-role"></strong>
Jonathan Horton<br>
<strong class="project-role">Repository:</strong> <strong class="project-role">Repository:</strong>
<a href="https://git.gmu.edu/srct/bookshare">git.gmu.edu/srct/bookshare</a><br> <a href="https://git.gmu.edu/srct/schedules">git.gmu.edu/srct/schedules</a><br>
<p class="project-text"> <p class="project-text">
Bookshare is a platform for textbook transactions, with books searchable A simple application to add your class schedule to calendar applications like
by Name, Author, ISBN, and Class. Outlook and Google Calendar. This project is currently undergoing a significant
rewrite and the live version does not reflect the ongoing development on the
linked git repository.
</p> </p>
</div> </div>
</div>
<div class="row">
<div class="col-lg-6 project-entry"> <div class="col-lg-6 project-entry">
<a class="project-link" name="whatsopen" href="#whatsopen"><i class="fa fa-clock-o project-icon"></i></a>
<a class="project-link" name="srctweb" href="#srctweb"><i class="fa fa-globe project-icon"></i></a>
<legend><strong>What's Open</strong>
| <a href="http://whatsopen.gmu.edu">whatsopen.gmu.edu</a></legend>
<legend><strong><a href="http://wiki.srct.gmu.edu/SRCTweb">SRCTweb</a></strong> <a href="https://git.gmu.edu/srct/whats-open/blob/master/README.md">Docs</a> | <a href="http://git.gmu.edu/srct/whats-open/issues/">Issues</a> |
| <a href="/">srct.gmu.edu</a></legend> <a href="https://trello.com/b/rpxKtlSn/whatsopen">Trello</a>
<br><br>
<strong class="project-role">Project Manager:</strong> <strong class="project-role">Project Manager:</strong>
Daniel Bond<br> Michael Bailey<br>
<strong class="project-role">Developer:</strong>
Nicholas Anderson<br>
<strong class="project-role"></strong>
Tyler Hallada<br>
<strong class="project-role">Repository:</strong> <strong class="project-role">Repository:</strong>
<a href="https://git.gmu.edu/srct/SRCTweb">git.gmu.edu/srct/SRCTweb</a><br> <a href="https://git.gmu.edu/srct/whatsopen">git.gmu.edu/srct/whatsopen</a>
<p class="project-text"> <p class="project-text">
SRCT's very own homepage! Help edit this site. Provides a list of all currently open dining options in/around campus,
kept updated with holidays, etc. Expanding to cover more than dining locations.
</p> </p>
</div> </div>
</div> </div>
<legend>Active</legend> <legend><strong><a class="project-link" name="active" href="#active">Active</a></strong>
<font color="gray"><small>Projects in active development in preparation for
stable deployment.</small></font></legend>
<div class="row"> <div class="row">
<div class="col-lg-6 project-entry"> <div class="col-lg-6 project-entry">
<a class="project-link" name="advisor" href="#advisor"><i class="fa fa-graduation-cap project-icon"></i></a> <a class="project-link" name="advisor" href="#advisor"><i class="fa fa-graduation-cap project-icon"></i></a>
<legend><strong><a href="http://wiki.srct.gmu.edu/Advisor">Advisor</a></strong> <legend><strong>Advisor</strong></legend>
| <a href="http://advisor.srct.gmu.edu">advisor.srct.gmu.edu</a></legend>
<a href="https://git.gmu.edu/srct/advisor/blob/master/README.md">Docs</a> | <a href="http://git.gmu.edu/srct/advisor/issues/">Issues</a> |
<a href="https://trello.com/b/0iyYdhS5/advisor">Trello</a>
<br><br>
<strong class="project-role">Project Manager:</strong> <strong class="project-role">Project Manager:</strong>
Daniel Bond<br> Daniel Bond<br>
<strong class="project-role">Developer:</strong>
Ben Waters<br>
<strong class="project-role"></strong>
Renfred Harper<br>
<strong class="project-role"></strong>
Chris Reffett<br>
<strong class="project-role">Repository:</strong> <strong class="project-role">Repository:</strong>
<a href="https://git.gmu.edu/srct/advisor">git.gmu.edu/srct/advisor</a><br> <a href="https://git.gmu.edu/srct/advisor">git.gmu.edu/srct/advisor</a><br>
...@@ -184,53 +182,34 @@ Projects created and maintained by SRCT's members. ...@@ -184,53 +182,34 @@ Projects created and maintained by SRCT's members.
as a replacement for in-person academic advisor meetings. as a replacement for in-person academic advisor meetings.
</p> </p>
</div> </div>
<div class="col-lg-6 project-entry"> <div class="col-lg-6 project-entry">
<a class="project-link" name="bookshare" href="#bookshare"><i class="fa fa-book project-icon"></i></a>
<a class="project-link" name="hackmason" href="#hackmason"><i class="fa fa-cogs project-icon"></i></a>
<legend><strong>Bookshare</strong>
| <a href="http://bookshare.gmu.edu">bookshare.gmu.edu</a></legend>
<legend><strong><a href="http://wiki.srct.gmu.edu/HackMason">HackMason</a></strong> <a href="https://git.gmu.edu/srct/bookshare/blob/master/README.md">Docs</a> | <a href="http://git.gmu.edu/srct/bookshare/issues/">Issues</a> |
| <a href="http://hackmason.org">hackmason.org</a></legend> <a href="https://trello.com/b/dSUBVUmj/bookshare">Trello</a> |
<a href="mailto:bookshare@lists.srct.gmu.edu">Email</a>
<br><br>
<strong class="project-role">Project Manager:</strong> <strong class="project-role">Project Manager:</strong>
Manuel Gauto<br> Daniel Bond<br>
<strong class="project-role">Developer:</strong>
Michel Rouly<br>
<strong class="project-role"></strong>
Melissa Mahan<br>
<strong class="project-role">Repository:</strong> <strong class="project-role">Repository:</strong>
<a href="https://git.gmu.edu.srct/hackmason">git.gmu.edu/srct/hackmason</a><br> <a href="https://git.gmu.edu/srct/bookshare">git.gmu.edu/srct/bookshare</a><br>
<p class="project-text"> <p class="project-text">
HackMason is our site for event information and registration. Bookshare is a platform for textbook transactions, with books searchable
by Name, Author, ISBN, and Class.
</p> </p>
</div> </div>
</div>
<div class="row">
<div class="col-lg-6 project-entry">
<a class="project-link" name="roomlist" href="#roomlist"><i class="fa fa-users project-icon"></i></a>
<legend><strong><a href="#">RoomList</a></strong>
| <a href="#">roomlist.srct.gmu.edu</a></legend>
<strong class="project-role">Project Manager:</strong>
Akshay Karthik<br>
<strong class="project-role">Developer:</strong>
Jason Yeomans<br>
<strong class="project-role"></strong>
Daniel Bond<br>
<strong class="project-role">Repository:</strong>
<a href="https://git.gmu.edu/srct/roomlist">git.gmu.edu/srct/roomlist</a><br>
<p class="project-text">
For on campus-students, find out who's living on your floor.
</p>
</div> </div>
<div class="row">
<div class="col-lg-6 project-entry"> <div class="col-lg-6 project-entry">
<a class="project-link" name="laundry" href="#laundry"> <a class="project-link" name="laundry" href="#laundry">
<span class="fa-stack project-icon project-icon-stacked"> <span class="fa-stack project-icon project-icon-stacked">
<i class="fa fa-archive fa-stack-2x"></i> <i class="fa fa-archive fa-stack-2x"></i>
...@@ -238,107 +217,282 @@ Projects created and maintained by SRCT's members. ...@@ -238,107 +217,282 @@ Projects created and maintained by SRCT's members.
</span> </span>
</a> </a>
<legend><strong><a href="#">Laundry</a></strong> <legend><strong>Laundry</strong></legend>
| <a href="#">laundry.srct.gmu.edu</a></legend>
<a href="https://git.gmu.edu/srct/laundry/blob/master/README.md">Docs</a> | <a href="http://git.gmu.edu/srct/laundry/issues/">Issues</a> <!-- | <a href="#">Trello</a> -->
<br><br>
<strong class="project-role">Project Manager:</strong> <strong class="project-role">Project Manager:</strong>
Manuel Gauto<br> Manuel Gauto<br>
<strong class="project-role">Developer:</strong>
Tyler Hallada<br>
<strong class="project-role"></strong>
Daniel Taylor<br>
<strong class="project-role">Repository:</strong> <strong class="project-role">Repository:</strong>
<a href="https://git.gmu.edu.srct/laundry">git.gmu.edu/srct/laundry</a><br> <a href="https://git.gmu.edu.srct/laundry">git.gmu.edu/srct/laundry</a><br>
<p class="project-text"> <p class="project-text">
Live on-campus laundry machine usage and trends. Live on-campus laundry machine usage and trends.
</p> </p>
</div> </div>
</div>
<div class="row">
<div class="col-lg-6 project-entry"> <div class="col-lg-6 project-entry">
<a class="project-link" name="talks" href="#talks"><i class="fa fa-microphone project-icon"></i></a> <a class="project-link" name="photos" href="#photos"><i class="fa fa-camera-retro project-icon"></i></a>
<legend><strong>Photos</strong>
| <a href="https://flickr.com/masonsrct">flickr.com/masonsrct</a></legend>
<!--
<a href="#">Docs</a> | <a href="#">Issues</a> | <a href="#">Trello</a>
<br><br>
-->
<strong class="project-role">Project Manager:</strong>
Mark Stenglein<br>
<p class="project-text">
Creative-commons licensed photographs of Mason locations and community.
(Offical Mason photographs <a href="http://gmu.smugmug.com/">"are
protected by copyright and the property of George Mason University."</a>)
</p>
</div>
</div>
<div class="row">
<div class="col-lg-6 project-entry">
<a class="project-link" name="pgp" href="#pgp"><i class="fa fa-key project-icon"></i></a>
<legend><strong>PGP</a></strong>
| <a href="http://pgp.srct.gmu.edu">pgp.gmu.edu</a></legend>
<legend><strong><a href="#">Talks</a></strong> <a href="https://git.gmu.edu/srct/pgp/blob/master/README.md">Docs</a> | <a href="http://git.gmu.edu/srct/pgp/issues/">Issues</a> <!-- |
| <a href="#">talks.srct.gmu.edu</a></legend> <a href="https://trello.com/b/EqdF3o9p/pgp">Trello</a> |
<a href=#">Email</a> -->
<br><br>
<strong class="project-role">Project Manager:</strong> <strong class="project-role">Project Manager:</strong>
Kunal Sarkhel<br> Kunal Sarkhel<br>
<strong class="project-role">Developer:</strong> <strong class="project-role">Repository:</strong>
<br> <a href="https://git.gmu.edu/srct/pgp">git.gmu.edu/srct/pgp</a><br>
<p class="project-text"> <p class="project-text">
Hosts easily navigable pages of talk videos, slideshows, and notes. A Mason public key server. Allows for future exploration to deploy a
public key infrastructure for encrypted email or digital signatures
for general institutional purposes.
</p> </p>
</div> </div>
<div class="col-lg-6 project-entry"> <div class="col-lg-6 project-entry">
<a class="project-link" name="toolbox" href="#toolbox"><i class="fa fa-wrench project-icon"></i></a> <a class="project-link" name="talks" href="#talks"><i class="fa fa-microphone project-icon"></i></a>
<legend><strong><a href="http://wiki.srct.gmu.edu/Toolbox">Toolbox</a></strong> <legend><strong>Talks</strong></legend>
| <a href="http://toolbox.srct.gmu.edu">toolbox.srct.gmu.edu</a></legend>
<!--
<a href="#">Docs</a> | <a href="#">Issues</a> | <a href="#">Trello</a>
<br><br>
-->
<strong class="project-role">Project Manager:</strong> <strong class="project-role">Project Manager:</strong>
Kunal Sarkhel<br> Kunal Sarkhel<br>
<strong class="project-role">Developer:</strong>
Ben Waters<br>
<strong class="project-role"></strong>
Ross Bragg<br>
<p class="project-text"> <p class="project-text">
Toolbox will provide several services to GMU SRCT for managing various Hosts easily navigable pages of talk videos, slideshows, and notes.
systems and services.
</p> </p>
</div> </div>
</div>
<legend>Proposed</legend> </div>
<div class="row">
<div class="row">
<div class="col-lg-6 project-entry"> <div class="col-lg-6 project-entry">
<a class="project-link" name="userspace" href="#userspace"><i class="fa fa-cloud-upload project-icon"></i></a>
<a class="project-link" name="etherpad" href="#etherpad"><i class="fa fa-file-text-o project-icon"></i></a>
<legend><strong><a href="http://wiki.srct.gmu.edu/Etherpad">Etherpad</a></strong> <legend><strong>Userspace</strong>
| <a href="http://pad.srct.gmu.edu">pad.srct.gmu.edu</a></legend> | userspace.srct.gmu.edu</legend>
<strong class="project-role">Project Manager:</strong> <!--
Chris Reffett<br> <a href="#">Docs</a> | <a href="#">Issues</a> | <a href="#">Trello</a>
<br><br>
-->
<strong class="project-role">Project Manager:</strong>
Manuel Gauto<br>
<p class="project-text"> <p class="project-text">
Etherpad is a realtime collaboration tool recently acquired by Google (http://etherpad.org/). The tool is open source, and is used at schools like MIT, MSU, RIT, and UCLA. This tool would allow members of the Mason community to easily edit documents with their peers, similar to Google Docs. Quick, Mason-hosted deployment of student development projects using
<a href="https://www.openstack.org/software/">Openstack</a> to foster
<a href="http://masonidea.gmu.edu/the-mason-idea-our-core-institutional-characteristics/">
Innovation and Entrepreneurship</a>.
</p> </p>
</div> </div>
<div class="col-lg-6 project-entry"> <div class="col-lg-6 project-entry">
<a class="project-link" name="weather" href="#weather"><i class="fa fa-umbrella project-icon"></i></a>
<a class="project-link" name="maps" href="#maps"><i class="fa fa-map-marker project-icon"></i></a>
<legend><strong>Weather</strong>
| weather.gmu.edu</legend>
<legend><strong><a href="http://wiki.srct.gmu.edu/Maps">Maps</a></strong> <a href="https://git.gmu.edu/srct/weather/blob/master/README.md">Docs</a> | <a href="http://git.gmu.edu/srct/weather/issues/">Issues</a> <!--| <a href="#">Trello</a> -->
| maps.srct.gmu.edu</legend> <br><br>
<strong class="project-role">Project Manager:</strong>