Commit 0ef67bfa authored by Nicholas J Anderson's avatar Nicholas J Anderson

Hopefully conflicts are resolved this time

parents 5c864220 e4cda882
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -75,3 +75,38 @@ a[name] {
width: 100%;
height: 100%;
}
/** Projects Page **/
.project-entry {
margin-bottom:10px;
}
.project-icon {
margin: 0 auto;
display: block;
height: 200px
}
.project-role {
width: 150px;
display: inline-block;
color: #3c4042;
font-weight: bold;
display: inline-block;
text-align: left;
background: transparent;
font-size: 0.9em;
}
.project-text {
margin-top:10px;
padding-bottom:15px;
}
#banner {
background:#FBFCCA;
/*background: #ffcc33;*/
/*background: #27AE60;*/
width: 100%;
margin-bottom: 15px;
}
.page-header {
margin-top:0;
border-bottom:none;
}
......@@ -3,14 +3,14 @@
SRCT | Calendar
{% endblock %}
{% block pagetitle %}
Calendar
{% endblock %}
{% block description %}
Upcoming events and meetings!
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-12 text-center">
<h1><strong>Calendar</strong></h1>
</div>
</div>
</div>
<div class="text-center">
<div class="googlecal-container">
......
......@@ -3,15 +3,14 @@
SRCT | Contact
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-12 text-center">
<h1><strong>Contact</strong></h1>
</div>
</div>
</div>
{% block pagetitle %}
Contact
{% endblock %}
{% block description %}
There are many ways to do so!
{% endblock %}
{% block content %}
<h4><p>SRCT communicates through mailing lists, 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>
......
......@@ -3,14 +3,14 @@
SRCT | Documents
{% endblock %}
{% block pagetitle %}
Documents
{% endblock %}
{% block description %}
Our legal, philosophical, and branding information.
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-12 text-center">
<h1><strong>Documents</strong></h1>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-offset-2 col-lg-8">
......@@ -43,5 +43,4 @@ SRCT | Documents
</table>
</div>
</div>
{% endblock %}
......@@ -3,14 +3,14 @@
SRCT | Docs | Constitution
{% endblock %}
{% block pagetitle %}
Constitution
{% endblock %}
{% block description %}
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-10 text-center">
<h1><strong>Constitution</strong></h1>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-10">
......
......@@ -3,15 +3,14 @@
SRCT | Docs | Intellectual Property
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-10 text-center">
<h1><strong>Intellectual Property</strong></h1>
</div>
</div>
</div>
{% block pagetitle %}
Intellectual Property
{% endblock %}
{% block description %}
{% endblock %}
{% block content %}
<div class="row">
<div class="col-sm-10">
......
......@@ -3,11 +3,14 @@
SRCT | Docs | IRC Policy
{% endblock %}
{% block pagetitle %}
IRC Policy
{% endblock %}
{% block description %}
{% endblock %}
{% block content %}
<div class="row">
<div class="col-lg-12 text-center">
<h1><strong>IRC Policy</strong></h1>
</div>
</div>
Hi!
{% endblock %}
......@@ -3,14 +3,14 @@
SRCT | Docs | Logos
{% endblock %}
{% block pagetitle %}
Logos
{% endblock %}
{% block description %}
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-10 text-center">
<h1><strong>Logos</strong></h1>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-10">
......
......@@ -3,15 +3,14 @@
SRCT | Docs | Privacy Policy
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-10 text-center">
<h1><strong>Privacy Policy</strong></h1>
</div>
</div>
</div>
{% block pagetitle %}
Privacy Policy
{% endblock %}
{% block description %}
{% endblock %}
{% block content %}
<div class="row">
<div class="col-sm-10">
<p>SRCT's projects are very diverse, just like fellow GMU students who write them for our school's benefit. Sometimes, additional provisions may apply for a project, or may need to provide additional clarity from the policy laid out here. In that case, those rules build on top of or over these. This privacy policy is part of Mason SRCT's Terms of Service.</p>
......
......@@ -3,20 +3,20 @@
SRCT | Docs | Software Freedom
{% endblock %}
{% block pagetitle %}
Software Freedom
{% endblock %}
{% block description %}
Not free as in free beer, but free as in free speech.
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-10 text-center">
<h1><strong>Software Freedom</strong></h1>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-10">
<p>The promotion of free software at GMU is best left to
<a href="http://gmulug.com/">Mason Linux User Group</a>, but we explain here
what free software is and why it's import to SRCT.</p>
what free software is and why it's important to SRCT.</p>
<blockquote>
<p>"Free software" means software that respects users' freedom and community.
......
......@@ -3,15 +3,14 @@
SRCT | Docs | Terms of Service
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-10 text-center">
<h1><strong>Terms of Service</strong></h1>
</div>
</div>
</div>
{% block pagetitle %}
Terms of Service
{% endblock %}
{% block description %}
{% endblock %}
{% block content %}
<div class="row">
<div class="col-sm-10">
......
......@@ -3,15 +3,14 @@
SRCT | Docs | Usage Policy
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-10 text-center">
<h1><strong>Usage Policy</strong></h1>
</div>
</div>
</div>
{% block pagetitle %}
Usage Policy
{% endblock %}
{% block description %}
{% endblock %}
{% block content %}
<div class="row">
<div class="col-sm-10">
<p>All users of SRCT systems must agree to George Mason's University's
......
......@@ -61,12 +61,12 @@ and an <a href="https://en.wikipedia.org/wiki/Internet_Relay_Chat">IRC</a>
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>
<legend><strong>Next Meeting</strong></legend>
<p>Our next meeting is scheduled for <em>TBA</em>. For more information, check
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.twitter.com/MasonSRCT">Twitter</a> pages.</p>
<legend><strong>Next Meeting</strong></legend>
<p>Our next meeting is scheduled for <em>TBA</em>. For more information, check
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.twitter.com/MasonSRCT">Twitter</a> pages.</p>
<!-- <script src="/static/js/parallax.min.js"></script>
var scene = document.getElementById('jumboparallax');
......
......@@ -39,15 +39,28 @@
<div id="wrap">
{% include 'layouts/navbar.html' %}
{% if renderHead %}
<div id="banner">
<div class="container">
<div class="row">
<div class="col-lg-12 page-header">
<h1><strong> {% block pagetitle %} {% endblock %}</strong></h1>
<p class="lead"> {% block description %} {% endblock %} </p>
</div>
</div>
</div>
</div>
{% endif %}
{% block jumbotron %}
{% endblock %}
<div class="container">
<div class="container">
{% block content %}
{% endblock %}
</div>
</div>
</div>
<div id="footer">
{% include 'layouts/footer.html' %}
......
......@@ -2,16 +2,13 @@
{% block title %}
SRCT | People
{% endblock %}
{% block pagetitle %}
People
{% endblock %}
{% block description %}
The people who make up this community of developers!
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-12 text-center">
<h1><strong>People</strong></h1>
</div>
</div>
</div>
<legend><strong>
<a href="http://wiki.srct.gmu.edu/wiki/index.php/Executive_Board">Executive Board</a>
</strong></legend>
......@@ -98,7 +95,7 @@ SRCT | People
<td>Samer Masterson</td>
<td>smasters</td>
</tr>
<tbody>
</tbody>
</table>
</div>
......@@ -126,5 +123,4 @@ SRCT | People
<tbody>
</table>
</div>
{% endblock %}
......@@ -3,151 +3,227 @@
SRCT | Projects
{% endblock %}
{% block pagetitle %}
Projects
{% endblock %}
{% block description %}
Projects maintaned and created by SRCT and its members.
{% endblock %}
{% block content %}
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-12 text-center">
<h1><strong>Projects</strong></h1>
</div>
</div>
</div>
<div class="row">
<h2>Deployed</h2>
</div>
<div class="col-lg-6 project-entry">
<img src="/static/img/gitlab.png" class="project-icon">
<div class="row">
<legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Git">Git</a></strong>
<legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Git">Git</a></strong>
| <a href="http://git.gmu.edu">git.gmu.edu</a></legend>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Project Manager</strong></span> Chris Reffett
</div>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Developers</strong></span> Chris Reffett
</div>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Repository</strong></span>
<a href="http://github.com/gitlabhq">github.com/gitlabhq</a>
</div>
<p>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
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
projects.</p>
</div>
<div class="row">
<legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Whatsopen">Whatsopen</a></strong>
| <a href="http://whatsopen.gmu.edu">whatsopen.gmu.edu</a></legend>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Project Manager</strong></span> Renfred Harper
</div>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Developers</strong></span> Renfred Harper, Tyler Hallada, Daniel Bond
</div>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Repository</strong></span>
<a href="http://git.gmu.edu/srct/whatsopen">git.gmu.edu/srct/whatsopen</a>
</div>
<!-- STOPGAP MEASURE
(no pun intended)
CHANGE LATER -->
<br><br>
<p> Provide 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>
<strong class="project-role">Project Manager:</strong>
Chris Reffett<br>
<strong class="project-role">Developer:</strong>
Chris Reffett<br>
<strong class="project-role">Repository:</strong>
<a href="http://github.com/gitlabhq">github.com/gitlabhq</a><br>
<strong class="project-role">Status:</strong>
<strong class="text-success">Stable</strong>
<div class="row">
<legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Go">Go</a></strong>
| <a href="http://go.gmu.edu">go.gmu.edu</a></legend>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Project Manager:</strong></span> Michel Rouly
</div>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Developers:</strong></span> Michel Rouly
</div>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Repository</strong></span>
<a href="http://git.gmu.edu/srct/go">git.gmu.edu/srct/go</a>
</div>
<p>Providing URL shortening would enhance branding when used by
organizations in ULife and elsewhere. For example, all shortened links to a
gmu.edu website would appear as go.gmu.edu/nHU8oPm instead of bit.ly/nHU8oPm.</p>
</div>
<div class="row">
<h2>Active</h2>
</div>
<p class="project-text">
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
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
projects.</p>
</div>
<div class="col-lg-6 project-entry">
<img src="/static/img/whatsopen.png" class="project-icon">
<div class="row">
<legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Bookshare">Bookshare</a></strong>
| <a href="http://bookshare.srct.gmu.edu">bookshare.srct.gmu.edu</a></legend>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Project Manager</strong></span> Eric Cawi
</div>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Developers</strong></span> Michel Rouly, Eric Cawi, Jonathan Horton
</div>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Repository</strong></span>
<a href="http://git.gmu.edu/srct/bookshare">git.gmu.edu/srct/bookshare</a>
</div>
<p>Bookshare is a platform for textbook transactions, with books searchable
by Name, Author, ISBN, and Class.</p>
<legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Whatsopen">Whatsopen</a></strong>
| <a href="http://whatsopen.gmu.edu">whatsopen.gmu.edu</a></legend>
<strong class="project-role">Project Manager:</strong>
Renfred Harper<br>
<strong class="project-role">Developer:</strong>
Renfred Harper<br>
<strong class="project-role">Developer:</strong>
Tyler Hallada<br>
<strong class="project-role">Developer:</strong>
Daniel Bond<br>
<strong class="project-role">Repository:</strong>
<a href="http://git.gmu.edu/srct/whatsopen">git.gmu.edu/srct/whatsopen</a><br>
<strong class="project-role">Status:</strong>
<strong class="text-success">Stable</strong>
<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>
<div class="row">
<legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Advisor">Advisor</a></strong>
| <a href="http://advisor.srct.gmu.edu">advisor.srct.gmu.edu</a></legend>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Project Manager</strong></span> Daniel Bond
</div>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Developers</strong></span> Daniel Bond
</div>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Repository</strong></span>
<a href="http://git.gmu.edu/srct/advisor">git.gmu.edu/srct/advisor</a>
</div>
<p> Advisor is an automatic academic advising system. The goal is to allow
students to enter their academic history in a standard form and receive an
interactive list of coursework they are required to complete for graduation,
as well as possible electives and prerequisite trees. This would not serve
as a replacement for in-person academic advisor meetings.</p>
<div class="col-lg-6 project-entry">
<img src="/static/img/placeholder.png" class="project-icon">
<legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Go">Go</a></strong>
| <a href="http://go.gmu.edu">go.gmu.edu</a></legend>
<strong class="project-role">Project Manager:</strong>
Michel Rouly<br>
<strong class="project-role">Developer:</strong>
Michel Rouly<br>
<strong class="project-role">Repository:</strong>
<a href="http://git.gmu.edu/srct/go">git.gmu.edu/srct/go</a><br>
<strong class="project-role">Status:</strong>
<strong class="text-success">Stable</strong>
<p class="project-text">
Providing URL shortening would enhance branding when used by
organizations in ULife and elsewhere. For example, all shortened links to a
gmu.edu website would appear as go.gmu.edu/nHU8oPm instead of bit.ly/nHU8oPm.
</p>
</div>
<div class="col-lg-6 project-entry">
<img src="/static/img/placeholder.png" class="project-icon">
<legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Bookshare">Bookshare</a></strong>
| <a href="http://bookshare.srct.gmu.edu">bookshare.srct.gmu.edu</a></legend>
<strong class="project-role">Project Manager:</strong>
Eric Cawi<br>
<strong class="project-role">Developer:</strong>
Michel Rouly<br>
<strong class="project-role">Developer:</strong>
Eric Cawi<br>
<strong class="project-role">Developer:</strong>
Jonathan Horton<br>
<strong class="project-role">Repository:</strong>
<a href="http://git.gmu.edu/srct/bookshare">git.gmu.edu/srct/bookshare</a><br>
<strong class="project-role">Status:</strong>
<strong class="text-primary">In Development</strong>
<p class="project-text">
Bookshare is a platform for textbook transactions, with books searchable
by Name, Author, ISBN, and Class.
</p>
</div>
</div>
<div class="row">
<legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/SRCTweb">SRCTweb</a></strong>
| <a href="/">srct.gmu.edu</a></legend>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Project Manager</strong></span> Daniel Bond
</div>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Developers</strong></span> Daniel Bond
</div>
<div class="col-lg-4 text-center">
<span class="label label-default"><strong>Repository</strong></span>
<a href="http://git.gmu.edu/srct/SRCTweb">git.gmu.edu/srct/SRCTweb</a>
</div>
<p>Improve this site.</p>
</div>
<div class="col-lg-6 project-entry">
<img src="/static/img/placeholder.png" class="project-icon">
<legend><strong><a href="http://wiki.srct.gmu.edu/wiki/index.php/Advisor">Advisor</a></strong>
| <a href="http://advisor.srct.gmu.edu">advisor.srct.gmu.edu</a></legend>
<strong class="project-role">Project Manager:</strong>
Daniel Bond<br>
<strong class="project-role">Developer:</strong>
Daniel Bond<br>
<strong class="project-role">Repository:</strong>