Commit f6276477 authored by Nicholas J Anderson's avatar Nicholas J Anderson
Browse files

Revamped the look of headers, and the look of the Projects page. Branched due to major changes.

parent ec154f37
...@@ -82,3 +82,32 @@ a[name] { ...@@ -82,3 +82,32 @@ a[name] {
width: 100%; width: 100%;
height: 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: pink;
width: 100%;
margin-bottom: 15px
}
\ No newline at end of file
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
SRCT | Calendar SRCT | Calendar
{% endblock %} {% endblock %}
{% block pagetitle %}
Calendar
{% endblock %}
{% block description %}
Upcoming events and meetings!
{% endblock %}
{% block content %} {% 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="text-center">
<div class="visible-lg"> <div class="visible-lg">
......
...@@ -3,15 +3,14 @@ ...@@ -3,15 +3,14 @@
SRCT | Contact SRCT | Contact
{% endblock %} {% endblock %}
{% block content %} {% block pagetitle %}
<div class="page-header" id="banner"> Contact
<div class="row"> {% endblock %}
<div class="col-lg-12 text-center"> {% block description %}
<h1><strong>Contact</strong></h1> There are many ways to do so!
</div> {% endblock %}
</div>
</div>
{% block content %}
<h4><p>SRCT communicates through mailing lists, IRC on <a href="http://freenode.net/">freenode</a> (#srct), and via our <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>-- <a href="https://facebook.com/groups/gmu.srct">private Facebook group</a>--
just request to be added.</p></h4> just request to be added.</p></h4>
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
SRCT | Documents SRCT | Documents
{% endblock %} {% endblock %}
{% block pagetitle %}
Documents
{% endblock %}
{% block description %}
Our legal, philosophical, and branding information.
{% endblock %}
{% block content %} {% 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="row">
<div class="col-lg-offset-2 col-lg-8"> <div class="col-lg-offset-2 col-lg-8">
...@@ -43,5 +43,4 @@ SRCT | Documents ...@@ -43,5 +43,4 @@ SRCT | Documents
</table> </table>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
SRCT | Docs | Constitution SRCT | Docs | Constitution
{% endblock %} {% endblock %}
{% block pagetitle %}
Constitution
{% endblock %}
{% block description %}
{% endblock %}
{% block content %} {% 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="row">
<div class="col-sm-10"> <div class="col-sm-10">
......
...@@ -3,15 +3,14 @@ ...@@ -3,15 +3,14 @@
SRCT | Docs | Intellectual Property SRCT | Docs | Intellectual Property
{% endblock %} {% endblock %}
{% block content %} {% block pagetitle %}
<div class="page-header" id="banner"> Intellectual Property
<div class="row"> {% endblock %}
<div class="col-md-10 text-center"> {% block description %}
<h1><strong>Intellectual Property</strong></h1>
</div> {% endblock %}
</div>
</div>
{% block content %}
<div class="row"> <div class="row">
<div class="col-sm-10"> <div class="col-sm-10">
......
...@@ -3,11 +3,14 @@ ...@@ -3,11 +3,14 @@
SRCT | Docs | IRC Policy SRCT | Docs | IRC Policy
{% endblock %} {% endblock %}
{% block pagetitle %}
IRC Policy
{% endblock %}
{% block description %}
{% endblock %}
{% block content %} {% block content %}
<div class="row"> Hi!
<div class="col-lg-12 text-center">
<h1><strong>IRC Policy</strong></h1>
</div>
</div>
{% endblock %} {% endblock %}
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
SRCT | Docs | Logos SRCT | Docs | Logos
{% endblock %} {% endblock %}
{% block pagetitle %}
Logos
{% endblock %}
{% block description %}
{% endblock %}
{% block content %} {% 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="row">
<div class="col-sm-10"> <div class="col-sm-10">
......
...@@ -3,15 +3,14 @@ ...@@ -3,15 +3,14 @@
SRCT | Docs | Privacy Policy SRCT | Docs | Privacy Policy
{% endblock %} {% endblock %}
{% block content %} {% block pagetitle %}
<div class="page-header" id="banner"> Privacy Policy
<div class="row"> {% endblock %}
<div class="col-md-10 text-center"> {% block description %}
<h1><strong>Privacy Policy</strong></h1>
</div> {% endblock %}
</div>
</div>
{% block content %}
<div class="row"> <div class="row">
<div class="col-sm-10"> <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> <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 @@ ...@@ -3,20 +3,20 @@
SRCT | Docs | Software Freedom SRCT | Docs | Software Freedom
{% endblock %} {% endblock %}
{% block pagetitle %}
Software Freedom
{% endblock %}
{% block description %}
Not free as in free beer, but free as in free speech.
{% endblock %}
{% block content %} {% 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="row">
<div class="col-sm-10"> <div class="col-sm-10">
<p>The promotion of free software at GMU is best left to <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 <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> <blockquote>
<p>"Free software" means software that respects users' freedom and community. <p>"Free software" means software that respects users' freedom and community.
......
...@@ -3,15 +3,14 @@ ...@@ -3,15 +3,14 @@
SRCT | Docs | Terms of Service SRCT | Docs | Terms of Service
{% endblock %} {% endblock %}
{% block content %} {% block pagetitle %}
<div class="page-header" id="banner"> Terms of Service
<div class="row"> {% endblock %}
<div class="col-md-10 text-center"> {% block description %}
<h1><strong>Terms of Service</strong></h1>
</div> {% endblock %}
</div>
</div>
{% block content %}
<div class="row"> <div class="row">
<div class="col-sm-10"> <div class="col-sm-10">
......
...@@ -3,15 +3,14 @@ ...@@ -3,15 +3,14 @@
SRCT | Docs | Usage Policy SRCT | Docs | Usage Policy
{% endblock %} {% endblock %}
{% block content %} {% block pagetitle %}
<div class="page-header" id="banner"> Usage Policy
<div class="row"> {% endblock %}
<div class="col-md-10 text-center"> {% block description %}
<h1><strong>Usage Policy</strong></h1>
</div> {% endblock %}
</div>
</div>
{% block content %}
<div class="row"> <div class="row">
<div class="col-sm-10"> <div class="col-sm-10">
<p>All users of SRCT systems must agree to George Mason's University's <p>All users of SRCT systems must agree to George Mason's University's
......
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
SRCT | Events SRCT | Events
{% endblock %} {% endblock %}
{% block content %} {% block pagetitle %}
<div class="row"> Events
<div class="col-lg-12 text-center"> {% endblock %}
<h1><strong>Events</strong></h1> {% block description %}
</div> Upcoming events planned an organized by SRCT.
</div> {% endblock %}
{% block content %}
<!-- <p>Along the lines of Meetings- a form for creating events, pagination, RSS feed</p> --> <!-- <p>Along the lines of Meetings- a form for creating events, pagination, RSS feed</p> -->
<p>Will link to an as yet not created page on the wiki.</p> <p>Will link to an as yet not created page on the wiki.</p>
<p>The beginnings of setting it up on the wiki is there, but it's not there yet.</p> <p>The beginnings of setting it up on the wiki is there, but it's not there yet.</p>
{% endblock %} {% endblock %}
...@@ -6,88 +6,90 @@ SRCT ...@@ -6,88 +6,90 @@ SRCT
{% block content %} {% block content %}
<div id = "SRCTCarousel" class="carousel slide"> <div class="container">
<div id = "SRCTCarousel" class="carousel slide">
<ol class="carousel-indicators">
<li data-target = "#SRCTCarousel" data-slide-to = "0" class = "active"></li> <ol class="carousel-indicators">
<li data-target = "#SRCTCarousel" data-slide-to = "1"></li> <li data-target = "#SRCTCarousel" data-slide-to = "0" class = "active"></li>
<li data-target = "#SRCTCarousel" data-slide-to = "2"></li> <li data-target = "#SRCTCarousel" data-slide-to = "1"></li>
</ol> <li data-target = "#SRCTCarousel" data-slide-to = "2"></li>
</ol>
<div class = "carousel-inner">
<div class = "carousel-inner">
<div class = "item active"> <div class = "item active">
<img src = "/static/img/renfredhaxxor_large.png" alt = "Renfred Haxxor" class = "img-responsive visible-lg"> <img src = "/static/img/renfredhaxxor_large.png" alt = "Renfred Haxxor" class = "img-responsive visible-lg">
<img src = "/static/img/renfredhaxxor_medium.png" alt = "Renfred Haxxor" class = "img-responsive visible-md visible-sm visible-xs"> <img src = "/static/img/renfredhaxxor_medium.png" alt = "Renfred Haxxor" class = "img-responsive visible-md visible-sm visible-xs">
<div class = "carousel-caption"> <div class = "carousel-caption">
<h2>Renfred Haxxoring</h2> <h2>Renfred Haxxoring</h2>
<p class="visible-lg visible-md">Renfred hacking away at SRCT's most popular project: WhatsOpen.</p> <p class="visible-lg visible-md">Renfred hacking away at SRCT's most popular project: WhatsOpen.</p>
</div>
</div> </div>
</div>
<div class = "item"> <div class = "item">
<img src = "/static/img/2013firstmeet_large.png" alt = "First Meeting 2013-2014" class = "img-responsive visible-lg"> <img src = "/static/img/2013firstmeet_large.png" alt = "First Meeting 2013-2014" class = "img-responsive visible-lg">
<img src = "/static/img/2013firstmeet_medium.png" alt = "First Meeting 2013-2014" class = "img-responsive visible-md visible-sm visible-xs"> <img src = "/static/img/2013firstmeet_medium.png" alt = "First Meeting 2013-2014" class = "img-responsive visible-md visible-sm visible-xs">
<div class = "carousel-caption"> <div class = "carousel-caption">
<h2>First Meeting 2013-2014</h2> <h2>First Meeting 2013-2014</h2>
<p class="visible-lg visible-md">The first meeting of the school year.</p> <p class="visible-lg visible-md">The first meeting of the school year.</p>
</div>
</div> </div>
</div>
<div class = "item"> <div class = "item">
<img src = "/static/img/bradhaxxor_large.png" alt = "Renfred Haxxor" class = "img-responsive visible-lg"> <img src = "/static/img/bradhaxxor_large.png" alt = "Renfred Haxxor" class = "img-responsive visible-lg">
<img src = "/static/img/bradhaxxor_medium.png" alt = "Renfred Haxxor" class = "img-responsive visible-md visible-sm visible-xs"> <img src = "/static/img/bradhaxxor_medium.png" alt = "Renfred Haxxor" class = "img-responsive visible-md visible-sm visible-xs">
<div class = "carousel-caption"> <div class = "carousel-caption">
<h2>Server Troubleshooting</h2> <h2>Server Troubleshooting</h2>
<p class="visible-lg visible-md">Brad troubleshooting the server donated by the University.</p> <p class="visible-lg visible-md">Brad troubleshooting the server donated by the University.</p>
</div>
</div> </div>
</div>
</div> </div>
<a class = "carousel-control left" href = "#SRCTCarousel" data-slide = "prev"> <a class = "carousel-control left" href = "#SRCTCarousel" data-slide = "prev">
<span class = "icon-prev"></span> <span class = "icon-prev"></span>
</a> </a>
<a class = "carousel-control right" href = "#SRCTCarousel" data-slide = "next"> <a class = "carousel-control right" href = "#SRCTCarousel" data-slide = "next">
<span class = "icon-next"></span> <span class = "icon-next"></span>
</a> </a>
</div> </div>
<legend><strong>Misson</strong></legend> <legend><strong>Misson</strong></legend>
<p><strong>S</strong>tudent-<strong>R</strong>un <strong>C</strong>omputing and <p><strong>S</strong>tudent-<strong>R</strong>un <strong>C</strong>omputing and
<strong>T</strong>echnology (SRCT, pronounced "<em>circuit</em>") is a student <strong>T</strong>echnology (SRCT, pronounced "<em>circuit</em>") is a student
organization at <a href="https://www.gmu.edu/">George Mason University</a> which organization at <a href="https://www.gmu.edu/">George Mason University</a> which
enhances student computing at our school by establishing and maintaining systems enhances student computing at our school by establishing and maintaining systems
that provide specific services for Mason's community.</p> that provide specific services for Mason's community.</p>
<p>We were founded in 2011 to be a place where students could work together, <p>We were founded in 2011 to be a place where students could work together,
share their knowledge, and build really neat projects for the benefit of everyone share their knowledge, and build really neat projects for the benefit of everyone
at Mason. See some of the ways we've improved life on campus on the <a href="{{ url_for('projects') }}">projects page</a>.</p> at Mason. See some of the ways we've improved life on campus on the <a href="{{ url_for('projects') }}">projects page</a>.</p>
<p>This is a link to the <a href="{{ url_for('calendar') }}">calendar page</a>.</p> <p>This is a link to the <a href="{{ url_for('calendar') }}">calendar page</a>.</p>
<legend><strong>Getting Involved</strong></legend> <legend><strong>Getting Involved</strong></legend>
<p>To learn more about SRCT, check out our <p>To learn more about SRCT, check out our
<a href="{{ url_for('projects') }}">projects</a>, active, under development, or proposed, or talk to one of the <a href="{{ url_for('projects') }}">projects</a>, active, under development, or proposed, or talk to one of the
<a href="{{ url_for('people') }}">members</a>! Technical documentation is <a href="{{ url_for('people') }}">members</a>! Technical documentation is
available on our <a href="http://wiki.srct.gmu.edu">wiki</a>, and all of our available on our <a href="http://wiki.srct.gmu.edu">wiki</a>, and all of our
code is visible on the <a href="http://git.gmu.edu/public">public page</a> of code is visible on the <a href="http://git.gmu.edu/public">public page</a> of
our student git repository.</p> our student git repository.</p>
<p>You can come to any of our planned <a href="{{ url_for('events') }}">events</a>. We hold <p>You can come to any of our planned <a href="{{ url_for('events') }}">events</a>. We hold
numerous events each semester, from traveling to hackathons and conferences to numerous events each semester, from traveling to hackathons and conferences to
doing local outreach, holding large programming events, and hosting speakers.</p> doing local outreach, holding large programming events, and hosting speakers.</p>
<p>We're on <a href="https://www.facebook.com/MasonSRCT">Facebook</a> and <p>We're on <a href="https://www.facebook.com/MasonSRCT">Facebook</a> and
<a href="https://www.twitter.com/MasonSRCT">Twitter</a>, and have <a href="https://www.twitter.com/MasonSRCT">Twitter</a>, and have
<a href="http://lists.srct.gmu.edu/mailman/listinfo">active mailing lists</a> <a href="http://lists.srct.gmu.edu/mailman/listinfo">active mailing lists</a>
and an <a href="https://en.wikipedia.org/wiki/Internet_Relay_Chat">IRC</a> 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 channel on <a href="https://www.freenode.net/">freenode</a>, #srct. More ways to
contact us are on our <a href="{{ url_for('contact') }}">contact page</a>.</p> contact us are on our <a href="{{ url_for('contact') }}">contact page</a>.</p>
<legend><strong>Next Meeting</strong></legend> <legend><strong>Next Meeting</strong></legend>
<p>Our next meeting is scheduled for <em>TBA</em>. For more information, check <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 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>
{% endblock %} {% endblock %}
...@@ -39,15 +39,28 @@ ...@@ -39,15 +39,28 @@
<div id="wrap"> <div id="wrap">
{% include 'layouts/navbar.html' %} {% 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 %} {% block jumbotron %}
{% endblock %} {% endblock %}
<div class="container"> <div class="container">
{% block content %} {% block content %}
{% endblock %} {% endblock %}
</div>
</div> </div>
</div>
<div id="footer"> <div id="footer">
{% include 'layouts/footer.html' %} {% include 'layouts/footer.html' %}
......
...@@ -3,13 +3,14 @@ ...@@ -3,13 +3,14 @@
SRCT | Meetings SRCT | Meetings
{% endblock %}