Skip to content

GitLab

srctweb
srctweb
Commit e24ab37f authored by Mark Stenglein's avatar Mark Stenglein
Browse files
Options

Initial sweep for template 

- broke down the home page into a default layout
- needs to be done for each additional page to find any additional
  layouts that are needed and to build the remaining includes that
  are needed.
- I'm not happy with the behavior of base_path since it makes
  absolute links, so I'm probably going to ditch it in favor of
  relative links for all the internal links.
- The goal here is to end up with a SRCT "Theme" of sorts that
  allows us to write all of the pages in pure markdown with liquid
  imports/includes
parent da385fe7
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 77 deletions
srctweb/_config.yml
View file @ e24ab37f
......@@ -49,3 +49,12 @@ exclude:
markdown: kramdown
gems:
- jekyll-feed
defaults:
# _pages
- scope:
path: ""
type: pages
values:
layout: default
srctweb/_includes/banner.html 0 → 100644
View file @ e24ab37f
{% include base_path %}
<div id="banner">
<div class="container">
<div class="row">
<div class="col-lg-12 page-header">
<h1><strong> {{ page.title }}</strong></h1>
<p class="lead"> {{ page.description }}</p>
</div>
</div>
</div>
</div>
srctweb/_includes/base_path 0 → 100644
View file @ e24ab37f
{% capture base_path %}{{ site.url }}{{ site.baseurl }}{% endcapture %}
srctweb/_includes/head.html 0 → 100644
View file @ e24ab37f
{% include base_path %}
<meta charset="utf-8">
<!-- TODO: make this file fully -->
{{ include seo.html }}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="{{ base_path }}/assets/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="{{ base_path }}/assets/css/bootstrap-theme.min.css" rel="stylesheet">
<link href="{{ base_path }}/assets/css/font-awesome.min.css" rel="stylesheet">
<link href="{{ base_path }}/assets/css/style.css" rel="stylesheet">
<link rel="icon" href="{{ base_path }}/assets/img/favicon.ico">
<script>
/*
@licstart The following is the entire license notice for the
JavaScript code in this page.
Copyright (C) 2014 Mason SRCT
The JavaScript code in this page is free software: you can
redistribute it and/or modify it under the terms of the GNU
General Public License (GNU GPL) as published by the Free Software
Foundation, either version 3 of the License, or (at your option)
any later version. The code is distributed WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
As additional permission under GNU GPL version 3 section 7, you
may distribute non-source (e.g., minimized or compacted) forms of
that code without the copy of the GNU GPL normally required by
section 4, provided you include this license notice and a URL
through which recipients can access the Corresponding Source.
@licend The above is the entire license notice
for the JavaScript code in this page.
*/
</script>
<meta name="description" content="{{ site.description }}">
<!-- TODO: make this jekyll compliant -->
<title> <!-- block title endblock --></title>
srctweb/_includes/jumbotron.html 0 → 100644
View file @ e24ab37f
{% include base_path %}
<!-- <ul id="jumboparallax">
<li class="layer" data-depth="0.50"> -->
<div class="jumbotron jumbostyle">
<div class="container">
<!-- <li class="layer" data-depth="0.00"> -->
<div class="row">
<div class="col-lg-offset-3 col-lg-2 col-md-offset-3 col-md-3 col-sm-offset-2 col-sm-3 col-xs-offset-2 col-xs-4">
<img src="/assets/img/SRCT_sq_white_shadow.png" class="img-responsive" alt="SRCT's logo" />
</div>
<div class="col-md-5">
<p class="xolonium srct-title">Student-Run<br />Computing&nbsp;+<br />Technology</p>
</div>
</div>
</div>
<!-- </li> -->
</div>
<!-- </li>
</ul> -->
srctweb/_templates/navbar.html → srctweb/_includes/navbar.html
View file @ e24ab37f
......@@ -7,15 +7,15 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand xolonium" href="/"><img src="/static/img/SRCT_square.svg" width=24 height=24 alt=""/>&nbsp;&nbsp;Mason SRCT</a>
<a class="navbar-brand xolonium" href="/"><img src="/assets/img/SRCT_square.svg" width=24 height=24 alt=""/>&nbsp;&nbsp;Mason SRCT</a>
</div>
<div class="navbar-right collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav">
<li><a href="{{ url_for('projects')}}">Projects</a></li>
<li><a href=" //hackmason.org ">Events</a></li>
<li><a href="{{ url_for('calendar')}}">Calendar</a>
<!-- <li><a href="http://blog.srct.gmu.edu">Blog</a> -->
<li><a href=" //hackmason.org ">Events</a></li>
<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">
<a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Documents <b class="caret"></b></a>
......@@ -29,7 +29,7 @@
<li role="presentation"><a role="menuitem" tabindex="-1" href="{{ url_for('logos')}}">Logos</a></li>
</ul>
</li>
<li><a href="{{ url_for('contact')}}">Contact</a>
<li><a href="/contact">Contact</a>
</ul>
</div><!--/.nav-collapse -->
</div>
......
srctweb/_includes/scripts.html 0 → 100644
View file @ e24ab37f
{% include base_path %}
<script src="/assets/js/jquery-2.0.3.min.js"></script>
<script src="/assets/js/bootstrap.min.js"></script>
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(["trackPageView"]);
_paq.push(["enableLinkTracking"]);
(function() {
var u="https://piwik.srct.gmu.edu/";
_paq.push(["setTrackerUrl", u+"piwik.php"]);
_paq.push(["setSiteId", "2"]);
var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Piwik Code -->
srctweb/_includes/seo.html 0 → 100644
View file @ e24ab37f
(% include base_path %)
<!-- begin SEO -->
{% if site.google_site_verification %}
<meta name="google-site-verification" content="{{ site.google_site_verification }}" />
{% endif %}
{% if site.bing_site_verification %}
<meta name="msvalidate.01" content="{{ site.bing_site_verification }}">
{% endif %}
{% if site.alexa_site_verification %}
<meta name="alexaVerifyID" content="{{ site.alexa_site_verification }}">
{% endif %}
{% if site.yandex_site_verification %}
<meta name="yandex-verification" content="{{ site.yandex_site_verification }}">
{% endif %}
<!-- end SEO -->
srctweb/_layouts/default.html 0 → 100644
View file @ e24ab37f
{% include base_path %}
<!doctype html>
<html lang="{{ site.locale | slice: 0,2 }}" class="no-js">
<head>
{% include head.html %}
</head>
<body>
<div id="wrap">
<header>
{% include browser-upgrade.html %}
{% include navbar.html %}
</header>
<main>
{{ content }}
</main>
<div id="footer">
{% include footer.html %}
</div>
</div>
{% include scripts.html %}
</body>
</html>
srctweb/_pages/home.html
View file @ e24ab37f
{% extends "layouts/base.html" %}
---
layout: default
permalink: /
title: SRCT
description: "test"
---
{% block title %}
SRCT
{% endblock %}
{% block jumbotron %}
<!-- <ul id="jumboparallax">
<li class="layer" data-depth="0.50"> -->
<div class="jumbotron jumbostyle">
<div class="container">
<!-- <li class="layer" data-depth="0.00"> -->
<div class="row">
<div class="col-lg-offset-3 col-lg-2 col-md-offset-3 col-md-3 col-sm-offset-2 col-sm-3 col-xs-offset-2 col-xs-4">
<img src="/static/img/SRCT_sq_white_shadow.png" class="img-responsive" alt="SRCT's logo" />
</div>
<div class="col-md-5">
<p class="xolonium srct-title">Student-Run<br />Computing&nbsp;+<br />Technology</p>
</div>
</div>
</div>
<!-- </li> -->
</div>
<!-- </li>
</ul> -->
{% endblock %}
{% block content %}
{% include jumbotron.html %}
<div class="row smidge">
<div class="col-md-12 text-center">
......@@ -43,7 +15,7 @@ SRCT
</span>&nbsp;&nbsp;
<span id="meetingDate">Please wait while we fetch the upcoming meeting information...</span>
</h4>
<!--<a href="{{ url_for('calendar') }}">calendar</a> or visit our
<!--<a href="https://example.com/REPLACEWITHCALENDAR">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>
......@@ -67,7 +39,7 @@ SRCT
<legend><i class="fa fa-child fa-fw"></i>&nbsp;<strong>Initiatives</strong></legend>
<div class="col-lg-3 col-lg-push-9 col-md-offset-0 col-md-4 col-md-push-8 col-sm-offset-3 col-sm-6 col-xs-offset-3 col-xs-6 smidge">
<img src="/static/img/openhatch.jpg" alt="Renfred and Daniel assist Heather, a student attending our Openhatch workshop in 2014." class="img-circle img-responsive center-block">
<img src="/assets/img/openhatch.jpg" alt="Renfred and Daniel assist Heather, a student attending our Openhatch workshop in 2014." class="img-circle img-responsive center-block">
</div>
<div class="col-lg-9 col-lg-pull-3 col-md-8 col-md-pull-4 col-sm-12 col-xs-12 smidge">
<h4><strong>Projects & Infrastructure</strong></h4>
......@@ -104,7 +76,7 @@ SRCT
</div>
<div class="col-lg-3 col-lg-push-9 col-md-offset-0 col-md-4 col-md-push-8 col-sm-offset-3 col-sm-6 col-xs-offset-3 col-xs-6 smidge">
<img src="/static/img/bitcamp.jpg" alt="Michel and Ben compete at Bitcamp, a hackathon held at the university of Maryland, in 2014." class="img-circle img-responsive center-block">
<img src="/assets/img/bitcamp.jpg" alt="Michel and Ben compete at Bitcamp, a hackathon held at the university of Maryland, in 2014." class="img-circle img-responsive center-block">
</div>
<div class="col-lg-9 col-lg-pull-3 col-md-8 col-md-pull-4 col-sm-12 col-xs-12 smidge">
<h4><strong>Events & Workshops</strong></h4>
......@@ -138,7 +110,7 @@ SRCT
</div>
<div class="col-lg-3 col-lg-push-9 col-md-offset-0 col-md-4 col-md-push-8 col-sm-offset-3 col-sm-6 col-xs-offset-3 col-xs-6 smidge">
<img src="/static/img/org-fair.jpg" alt="Chris, Melissa, and Luca stand at our table for Student Involvement's Get Connected student org fair in the beginning of fall 2014." class="img-circle img-responsive center-block">
<img src="/assets/img/org-fair.jpg" alt="Chris, Melissa, and Luca stand at our table for Student Involvement's Get Connected student org fair in the beginning of fall 2014." class="img-circle img-responsive center-block">
</div>
<div class="col-lg-9 col-lg-pull-3 col-md-8 col-md-pull-4 col-sm-12 col-xs-12 smidge">
<h4><strong>Outreach & Community</strong></h4>
......@@ -222,8 +194,7 @@ SRCT
<p>
You can also come to any of our major events: all-day workshops, travel to conferences,
hosting speakers, and more. Every event goes on our
<a href="{{ url_for('calendar') }}">calendar</a>, on our
<a href="https://facebook.com/MasonSRCT">Facebook page</a>,
<a href="https://example.com/REPLACEWITHCALENDAR">calendar</a>, on our <a href="https://facebook.com/MasonSRCT">Facebook page</a>,
and is announced on our
<a href="http://lists.srct.gmu.edu/listinfo/srct-general">mailing list</a>.
You can also join us representing Mason at <a href="https://mlh.io/">hackathons</a>.
......@@ -322,7 +293,7 @@ SRCT
is another great resource (ignore the intimidating title) to try things out
on your own machine. Once you have a little practice under your belt,
try following our documentation to deploy one of our
<a href="{{ url_for('projects') }}">projects</a>.
<a href="/projects/">projects</a>.
<a href="https://git.gmu.edu/srct/whats-open">What's Open</a>
is a good one to start with.
</p>
......@@ -332,10 +303,10 @@ SRCT
</div>
</div>
</div>
{% endblock %}
{% block scripts %}
<!-- <script src="/static/js/parallax.min.js"></script>
<!-- BREAK OUT INTO TEMPLATE BLOCK -->
<!-- <script src="/assets/js/parallax.min.js"></script>
var scene = document.getElementById('jumboparallax');
var parallax = new Parallax(jumboparallax); -->
......@@ -371,4 +342,3 @@ $(function() {
});
});
</script>
{% endblock %}
srctweb/_posts/2017-01-03-welcome-to-jekyll.markdown deleted 100644 → 0
View file @ da385fe7
---
layout: post
title: "Welcome to Jekyll!"
date: 2017-01-03 20:36:36 -0500
categories: jekyll update
---
You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
Jekyll also offers powerful support for code snippets:
{% highlight ruby %}
def print_hi(name)
puts "Hi, #{name}"
end
print_hi('Tom')
#=> prints 'Hi, Tom' to STDOUT.
{% endhighlight %}
Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk].
[jekyll-docs]: http://jekyllrb.com/docs/home
[jekyll-gh]: https://github.com/jekyll/jekyll
[jekyll-talk]: https://talk.jekyllrb.com/
srctweb/assets/css/style.css
View file @ e24ab37f
......@@ -35,7 +35,7 @@ a[name] {
text-shadow: 1px 1px 6px #333;
}
.jumbostyle {
background: url(/static/img/meeting.jpg) no-repeat;
background: url(/assets/img/meeting.jpg) no-repeat;
background-size: cover;
background-position: 20%;
box-shadow: inset 0px 0px 20px #333;
......
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