Skip to content

GitLab

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
Show whitespace changes
Inline Side-by-side
srctweb/website/static/css/style.css
View file @ f6276477
......@@ -82,3 +82,32 @@ 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: pink;
width: 100%;
margin-bottom: 15px
}
\ No newline at end of file
srctweb/website/templates/calendar.html
View file @ f6276477
......@@ -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="visible-lg">
......
srctweb/website/templates/contact.html
View file @ f6276477
......@@ -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>
......
srctweb/website/templates/documents.html
View file @ f6276477
......@@ -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 %}
srctweb/website/templates/documents/constitution.html
View file @ f6276477
......@@ -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">
......
srctweb/website/templates/documents/intellectual_property.html
View file @ f6276477
......@@ -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">
......
srctweb/website/templates/documents/ircpolicy.html
View file @ f6276477
......@@ -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 %}
srctweb/website/templates/documents/logos.html
View file @ f6276477
......@@ -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">
......
srctweb/website/templates/documents/privacy_policy.html
View file @ f6276477
......@@ -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>
......
srctweb/website/templates/documents/software_freedom.html
View file @ f6276477
......@@ -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.
......
srctweb/website/templates/documents/terms_of_service.html
View file @ f6276477
......@@ -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">
......
srctweb/website/templates/documents/usage_policy.html
View file @ f6276477
......@@ -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
......
srctweb/website/templates/events.html
View file @ f6276477
......@@ -3,16 +3,16 @@
SRCT | Events
{% endblock %}
{% block content %}
<div class="row">
<div class="col-lg-12 text-center">
<h1><strong>Events</strong></h1>
</div>
</div>
{% block pagetitle %}
Events
{% endblock %}
{% block description %}
Upcoming events planned an organized by SRCT.
{% endblock %}
{% block content %}
<!-- <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>The beginnings of setting it up on the wiki is there, but it's not there yet.</p>
{% endblock %}
srctweb/website/templates/index.html
View file @ f6276477
......@@ -6,7 +6,8 @@ SRCT
{% 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>
......@@ -53,41 +54,42 @@ SRCT
<span class = "icon-next"></span>
</a>
</div>
</div>
<legend><strong>Misson</strong></legend>
<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
organization at <a href="https://www.gmu.edu/">George Mason University</a> which
enhances student computing at our school by establishing and maintaining systems
that provide specific services for Mason's community.</p>
<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
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>
<legend><strong>Getting Involved</strong></legend>
<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('people') }}">members</a>! Technical documentation is
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
our student git repository.</p>
<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
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
<a href="https://www.twitter.com/MasonSRCT">Twitter</a>, and have
<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>
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>
<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>Misson</strong></legend>
<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
organization at <a href="https://www.gmu.edu/">George Mason University</a> which
enhances student computing at our school by establishing and maintaining systems
that provide specific services for Mason's community.</p>
<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
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>
<legend><strong>Getting Involved</strong></legend>
<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('people') }}">members</a>! Technical documentation is
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
our student git repository.</p>
<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
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
<a href="https://www.twitter.com/MasonSRCT">Twitter</a>, and have
<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>
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>
<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>
</div>
{% endblock %}
srctweb/website/templates/layouts/base.html
View file @ f6276477
......@@ -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">
{% block content %}
{% endblock %}
</div>
</div>
</div>
<div id="footer">
{% include 'layouts/footer.html' %}
......
srctweb/website/templates/meetings.html
View file @ f6276477
......@@ -3,13 +3,14 @@
SRCT | Meetings
{% endblock %}
{% block content %}
<div class="row">
<div class="col-lg-12 text-center">
<h1><strong>Meetings</strong></h1>
</div>
</div>
{% block pagetitle %}
Meetings
{% endblock %}
{% block description %}
Upcoming SRCT club meetings!
{% endblock %}
{% block content %}
<p>Will link to an as yet not created page on the wiki with meeting minutes.</p>
<p>Page will need RSS support.</p>
......
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