Verified Commit 85bfcdf8 authored by David Haynes's avatar David Haynes 🙆
Browse files

Begin the bootstrap 4 conversion

- general cleanup a coming
- less <br>
- more pedantic css
parent 0cdcb7db
<!-- include the base html template --> <!-- include the base html template -->
{% extends 'layouts/base.html' %} {% extends 'layouts/base.html' %}
<!-- Tell Django to load static files -->
{% load staticfiles %} {% load staticfiles %}
<!-- define the page title block -->
{% block title %} {% block title %}
SRCT Go &bull; About SRCT Go &bull; About
{% endblock %} {% endblock %}
<!-- define the content block for the page -->
{% block content %} {% block content %}
<!-- define the page header div --> <!-- page header -->
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
...@@ -26,41 +23,32 @@ SRCT Go &bull; About ...@@ -26,41 +23,32 @@ SRCT Go &bull; About
</div> </div>
</div> </div>
<!-- define the terms of use div --> <!-- terms of use -->
<div class="row" id="terms"> <div class="row" id="terms">
<div class="col-md-12"> <div class="col-md-12">
<h4>Terms of Use</h4> <h2>Terms of Use</h2>
<legend></legend>
<p> <p>
By using Go you acknowledge that you are a current George Mason Student or faculty By using Go you acknowledge that you are a current George Mason Student or faculty
member. member.
<br></br>
Additionally, any link that you create is subject to removal by Go admins if it is Additionally, any link that you create is subject to removal by Go admins if it is
deemed to associate the univeristy with any deemed to associate the univeristy with any derogatory or controversial matters.
<br /> derogatory or controversial matters.
<br></br>
Go admins also reserve the right to remove and ban any users who attempt to abuse Go admins also reserve the right to remove and ban any users who attempt to abuse
the link creation system in any manner. the link creation system in any manner.
<br></br>
Since Go falls under the gmu.edu domain, users who use this service will act in compliance Since Go falls under the gmu.edu domain, users who use this service will act in compliance
with the GMU <a href="https://universitypolicy.gmu.edu/policies/responsible-use-of-computing/"> with the GMU <a href="https://universitypolicy.gmu.edu/policies/responsible-use-of-computing/">Responsible Use of Computing</a> policies.
Responsible Use of Computing</a> policies.
</p> </p>
<br />
</div> </div>
</div> </div>
<!-- define the who made go? div --> <!-- who made go? -->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h4>Who made Go?</h4> <h2>Who made Go?</h2>
<legend></legend>
<p> <p>
Members of the Members of the
<a href="//srct.gmu.edu">Student-Run Computing and Technology</a> registered <a href="//srct.gmu.edu">Student-Run Computing and Technology</a> registered
student organization at <a href="//gmu.edu">George Mason University</a> are student organization at <a href="//gmu.edu">George Mason University</a> are
the clever, the clever, talented student developers behind Go.
<br /> talented student developers behind Go.
</p> </p>
<p> <p>
We are a group of creative people that like making software and want to give back We are a group of creative people that like making software and want to give back
...@@ -68,22 +56,18 @@ SRCT Go &bull; About ...@@ -68,22 +56,18 @@ SRCT Go &bull; About
</p> </p>
<p> <p>
<a href="//srct.gmu.edu/contact/">Contact us</a> to get involved! <a href="//srct.gmu.edu/contact/">Contact us</a> to get involved!
<p> </p>
<br />
</div> </div>
</div> </div>
<!-- define the thanks! div --> <!-- define the thanks! div -->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h4>Thanks!</h4> <h2>Thanks!</h2>
<legend></legend>
<p> <p>
This project was made possible through the collective contributions of multiple Mason This project was made possible through the collective contributions of
SRCT members. multiple Mason SRCT members.
<br></br>
<a href="https://git.gmu.edu/srct/go/milestones/3">Go 2.2</a>: <a href="https://git.gmu.edu/srct/go/milestones/3">Go 2.2</a>:
<br />
<a href="https://github.com/dhaynespls">David Haynes</a>, <a href="https://github.com/dhaynespls">David Haynes</a>,
<a href="https://github.com/ocelotsloth">Mark Stenglein</a>, <a href="https://github.com/ocelotsloth">Mark Stenglein</a>,
<a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ">Andres Villogas</a>, <a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ">Andres Villogas</a>,
...@@ -97,9 +81,7 @@ SRCT Go &bull; About ...@@ -97,9 +81,7 @@ SRCT Go &bull; About
<a href="https://github.com/nanderson94">Nicholas Anderson</a>, <a href="https://github.com/nanderson94">Nicholas Anderson</a>,
<a href="">Kevin Mckigney</a>, <a href="">Kevin Mckigney</a>,
and <a href="https://github.com/dwbond">Daniel Bond</a>. and <a href="https://github.com/dwbond">Daniel Bond</a>.
<br></br>
<a href="https://git.gmu.edu/srct/go/milestones/2">Go 2.1</a>: <a href="https://git.gmu.edu/srct/go/milestones/2">Go 2.1</a>:
<br />
<a href="https://github.com/dhaynespls">David Haynes</a>, <a href="https://github.com/dhaynespls">David Haynes</a>,
<a href="https://github.com/zosman1">Zach Osman</a>, <a href="https://github.com/zosman1">Zach Osman</a>,
<a href="https://github.com/roberthitt">Robert Hitt</a>, <a href="https://github.com/roberthitt">Robert Hitt</a>,
...@@ -109,85 +91,23 @@ SRCT Go &bull; About ...@@ -109,85 +91,23 @@ SRCT Go &bull; About
<a href="https://github.com/mdsecurity">Mattias Duffy</a>, <a href="https://github.com/mdsecurity">Mattias Duffy</a>,
<a href="https://github.com/IAmEyad">Eyad Hasan</a>, <a href="https://github.com/IAmEyad">Eyad Hasan</a>,
and <a href="https://github.com/danielkim1">Danny Kim</a>. and <a href="https://github.com/danielkim1">Danny Kim</a>.
<br></br>
<a href="https://git.gmu.edu/srct/go/milestones/1">Go 2.0</a>: <a href="https://git.gmu.edu/srct/go/milestones/1">Go 2.0</a>:
<br />
<a href="https://github.com/dhaynespls">David Haynes</a>, <a href="https://github.com/dhaynespls">David Haynes</a>,
<a href="">Matthew Rodgers</a>, <a href="">Matthew Rodgers</a>,
<a href="https://github.com/nanderson94">Nicholas Anderson</a>, <a href="https://github.com/nanderson94">Nicholas Anderson</a>,
and <a href="https://github.com/dwbond">Daniel Bond</a>. and <a href="https://github.com/dwbond">Daniel Bond</a>.
<br></br>
Go 1.0: Go 1.0:
<br />
<a href="https://github.com/jrouly">Michel Rouly</a>, <a href="https://github.com/jrouly">Michel Rouly</a>,
<a href="https://github.com/creffett">Chris Reffett</a>, <a href="https://github.com/creffett">Chris Reffett</a>,
<a href="https://github.com/nanderson94">Nicholas Anderson</a>, and <a href="https://github.com/akshaykarthik">Akshay Karthik</a>. <a href="https://github.com/nanderson94">Nicholas Anderson</a>, and <a href="https://github.com/akshaykarthik">Akshay Karthik</a>.
<br></br>
</p> </p>
<p> <p>
Additional thanks are due to the <a href="https://wiki.srct.gmu.edu/Executive_Board"> Additional thanks are due to the <a href="https://wiki.srct.gmu.edu/Executive_Board">
Student-Run Computing and Technology executive Student-Run Computing and Technology executive
board from 2014-present</a>, and our academic advisor, board from 2014-present</a>,and our academic advisor,
<a href="https://cs.gmu.edu/~kdobolyi/">Professor Kinga Dobolyi</a>. <a href="https://cs.gmu.edu/~kdobolyi/">Professor Kinga Dobolyi</a>.
</p> </p>
</div> </div>
</div> </div>
<!-- define the LibreJS License Table -->
<div class="row">
<div class="col-md-12">
<h4>JavaScript License Information</h4>
<legend></legend>
<table class="table" id="jslicense-labels1">
<thead>
<tr>
<th>Source File</th>
<th>License</th>
<th>Uncompressed Source</th>
</tr>
</thead>
<tr>
<td><a href="{% static "js/jquery.min.js" %}">jquery.min.js</a></td>
<td><a href="http://jquery.org/license">Expat</a></td>
<td><a href="http://code.jquery.com/jquery-2.1.1.js">jquery-2.1.1.js</a></td>
</tr>
<tr>
<td><a href="{% static "js/bootstrap.min.js" %}">bootstrap.js</a></td>
<td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></td>
<td><a href="{% static "js/bootstrap.js" %}">bootstrap.js</a></td>
</tr>
<tr>
<td><a href="{% static "js/clipboard.min.js" %}">clipboard.min.js</a></td>
<td><a href="https://zenorocha.mit-license.org/">Expat</a></td>
<td><a href="{% static "js/clipboard.js" %}">clipboard.js</a></td>
</tr>
<tr>
<td><a href="{% static "js/copy.js" %}">copy.js</a></td>
<td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></td>
<td><a href="{% static "js/copy.js" %}">copy.js</a></td>
</tr>
<tr>
<td><a href="{% static "js/new_link.js" %}">new_link.js</a></td>
<td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></td>
<td><a href="{% static "js/new_link.js" %}">new_link.js</a></td>
</tr>
<tr>
<td><a href="{% static "js/tab.js" %}">tab.js</a></td>
<td><a href="https://github.com/twbs/bootstrap/blob/master/LICENSE">Expat</a></td>
<td><a href="{% static "js/tab.js" %}">tab.js</a></td>
</tr>
<tr>
<td><a href="{% static "js/tooltip.js" %}">tooltip.js</a></td>
<td><a href="https://github.com/twbs/bootstrap/blob/master/LICENSE">Expat</a></td>
<td><a href="{% static "js/tooltip.js" %}">tooltip.js</a></td>
</tr>
<tr>
<td><a href="{% static "js/useradmin.js" %}">useradmin.js</a></td>
<td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></td>
<td><a href="{% static "js/useradmin.js" %}">useradmin.js</a></td>
</tr>
</table>
</div>
</div>
{% endblock %} {% endblock %}
<!-- inline css for just this page -->
<style>
.navbar-brand {
padding: 12px 15px !important;
}
banner,.page-header,#banner {
border-bottom: none;
margin-bottom: 0;
}
.fix a:link{
color: #FFFFFF;
}
</style>
<!-- include the base html template -->
{% extends 'layouts/base.html' %} {% extends 'layouts/base.html' %}
<!-- define the page title block -->
{% block title %} {% block title %}
SRCT Go &bull; Welcome SRCT Go &bull; Welcome
{% endblock %} {% endblock %}
<!-- define the content block for the page -->
{% block content %} {% block content %}
<!-- define the page header div --> <div class="page-header">
<div class="page-header" id="banner">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h1><i class="fa fa-link"></i> Go</h1> <h1><i class="fa fa-link"></i> Go</h1>
...@@ -33,9 +15,7 @@ SRCT Go &bull; Welcome ...@@ -33,9 +15,7 @@ SRCT Go &bull; Welcome
</div> </div>
</div> </div>
<!-- the main content row -->
<div class="row"> <div class="row">
<!-- what is go? -->
<div class="col-md-4"> <div class="col-md-4">
<h3>What is Go?</h3> <h3>What is Go?</h3>
<legend></legend> <legend></legend>
...@@ -51,32 +31,30 @@ SRCT Go &bull; Welcome ...@@ -51,32 +31,30 @@ SRCT Go &bull; Welcome
</p> </p>
</div> </div>
<!-- why should I use Go? -->
<div class="col-md-4"> <div class="col-md-4">
<h3>Why should I use Go?</h3> <h3>Why should I use Go?</h3>
<legend></legend> <legend></legend>
<p>Go features:</p> <p>Go features:</p>
<ul class="fa-ul"> <ul class="fa-ul">
<li> <li>
<i class="fa-li fa fa-check-square"></i> <i class="fas fa-check-square"></i>
Data tracking on the number of clicks a Go link gets. Data tracking on the number of clicks a Go link gets.
</li> </li>
<li> <li>
<i class="fa-li fa fa-check-square"></i> <i class="fas fa-check-square"></i>
Options to share Go links across various social media platforms. Options to share Go links across various social media platforms.
</li> </li>
<li> <li>
<i class="fa-li fa fa-check-square"></i> <i class="fas fa-check-square"></i>
QR Code generation at various resolutions, ready to be shared. QR Code generation at various resolutions, ready to be shared.
</li> </li>
<li> <li>
<i class="fa-li fa fa-check-square"></i> <i class="fas fa-check-square"></i>
Optional expiration for links after particular times. Optional expiration for links after particular times.
</li> </li>
</ul> </ul>
</div> </div>
<!-- how do I access Go? -->
<div class="col-md-4"> <div class="col-md-4">
<h3>How do I access Go?</h3> <h3>How do I access Go?</h3>
<legend></legend> <legend></legend>
...@@ -91,16 +69,13 @@ SRCT Go &bull; Welcome ...@@ -91,16 +69,13 @@ SRCT Go &bull; Welcome
</div> </div>
</div> </div>
<br />
<hr /> <hr />
<!-- carefully formatted login and signup buttons --> <div class="row">
<!-- https://files.slack.com/files-pri/T025B796J-F0KPTCTD3/spin-dhaynes-buttons.gif --> <div class="col-md-4">
<div class="fix row">
<div class="col-md-offset-1 col-md-4">
<a href="{% url 'go_login' %}" class="btn btn-primary btn-block">Log In</a> <a href="{% url 'go_login' %}" class="btn btn-primary btn-block">Log In</a>
</div> </div>
<div class="col-md-offset-1 col-md-4"> <div class="col-md-4">
<a href="{% url 'signup' %}" class="btn btn-primary btn-block">Sign Up</a> <a href="{% url 'signup' %}" class="btn btn-primary btn-block">Sign Up</a>
</div> </div>
</div> </div>
......
<!-- Tell Django to load static files --> <!-- Tell Django to load static files -->
{% load staticfiles %} {% load staticfiles %}
<!-- HTML 5 definition -->
<!DOCTYPE html>
<!-- Start the HTML page for Go -->
<html> <html>
<!-- load in our header content for every page -->
<head> <head>
<!-- load in the title block defined on each html page --> <!-- title block defined on each html page -->
<title> <title>
{% block title %} {% block title %}
{% endblock %} {% endblock %}
</title> </title>
<!-- Metatags -->
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<!-- Chrome on Android navbar color --> <!-- Chrome on Android navbar color -->
<meta name="theme-color" content="#006633"> <meta name="theme-color" content="#006633">
<!-- FB/Opengraph tags --> <!-- FB/Opengraph tags -->
<meta property="og:url" content="https://go.gmu.edu/"> <meta property="og:url" content="https://go.gmu.edu/">
<meta property="og:type" content="website"> <meta property="og:type" content="website">
<meta property="og:title" content="SRCT Go"> <meta property="og:title" content="SRCT Go">
<!--<meta property="og:image" content="https://git.gmu.edu/uploads/project/avatar/10/noun_534670_cc.png">-->
<meta property="og:description" content="University-branded URL shortening."> <meta property="og:description" content="University-branded URL shortening.">
<meta property="og:site_name" content="SRCT Go"> <meta property="og:site_name" content="SRCT Go">
<meta property="og:locale" content="en_US"> <meta property="og:locale" content="en_US">
...@@ -34,38 +27,31 @@ ...@@ -34,38 +27,31 @@
<meta name="twitter:site" content="@MasonSRCT"> <meta name="twitter:site" content="@MasonSRCT">
<meta name="twitter:creator" content="@MasonSRCT"> <meta name="twitter:creator" content="@MasonSRCT">
<meta name="twitter:url" content="https://go.gmu.edu/"> <meta name="twitter:url" content="https://go.gmu.edu/">
<meta name="twitter:title" content="SRCT Gp"> <meta name="twitter:title" content="SRCT Go">
<meta name="twitter:description" content="University-branded URL shortening."> <meta name="twitter:description" content="University-branded URL shortening.">
<!--<meta name="twitter:image" content="https://git.gmu.edu/uploads/project/avatar/10/noun_534670_cc.png">-->
<!-- Load in our icon --> <!-- Global favicon -->
<link rel="icon" type="image/ico" href="{% static "img/favicon.ico" %}" /> <link rel="icon" type="image/ico" href="{% static "img/favicon.ico" %}" />
<!-- Load in global CSS --> <!-- Global CSS -->
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" <link href="https://srct.gmu.io/masonstrap/css/masonstrap.min.css" rel="stylesheet">
rel="stylesheet" type="text/css"> <link rel="stylesheet" href="{% static "css/global.css" %}" />
<link rel="stylesheet" href="{% static "css/bootswatch.min.css" %}" />
<link rel="stylesheet" href="{% static "css/styles.css" %}" />
<!-- Load in global JS -->
<script src="{% static "js/jquery.min.js" %}"></script>
<script src="{% static "js/bootstrap.min.js" %}"></script>
<script src="{% static "js/clipboard.min.js" %}"></script>
</head> </head>
<!-- Load in the body of a Go page -->
<body> <body>
<!-- Load in the navbar template --> <!-- Load in the navbar -->
{% include 'layouts/navigation.html' %} {% include 'layouts/navbar.html' %}
<!-- Wrap the page content in a bootstrap container --> <div class="container begin">
<div class="container">
<!-- Load in the main page content --> <!-- Load in the main page content -->
{% block content %} {% block content %}
{% endblock %} {% endblock %}
</div> </div>
<!-- Load in the footer template -->
{% include 'layouts/footer.html' %}
</body> </body>
<!-- Load in the footer template -->
{% include 'layouts/footer.html' %}
<!-- Global JS -->
<script src="https://srct.gmu.io/masonstrap/js/masonstrap.min.js"></script>
</html> </html>
\ No newline at end of file
<!-- load in go templatetags -->
{% load go_extras %}
<header class="navbar fixed-top navbar-expand-lg navbar-dark bg-primary" role="navigation">
<div class="container">
<!-- Brand -->
<a class="navbar-brand" href="/">
<i class="fas fa-link"></i> Go
</a>
<!-- Collapse button -->
<button class="navbar-toggler collapsed" type="button" data-toggle="collapse" data-target="#collapse" aria-controls="collapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<!-- -->
<div class="collapse navbar-collapse" id="collapse">
<!-- -->
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="{% url 'about' %}">About</a>
</li>
<!-- -->
{% if user.is_authenticated %}
{% if user.registereduser.approved %}
<li class="nav-item">
<a class="nav-link" href="{% url 'new_link' %}">New Link</a>
</li>
{% endif %}
{% if not user.registereduser.registered %}
<li class="nav-item">
<a href="{% url 'signup' %}">Register</a>
</li>
{% endif %}
{% endif %}
</ul>
<!-- -->
<ul class="navbar-nav ml-auto">
<!-- -->
{% if user.is_authenticated %}
<li class="nav-item">
<a class="nav-link" href="{% url 'go_logout' %}">
Log Out <i class="fa fa-sign-out fa-fw"></i>
</a>
</li>
{% else %}
<li class="nav-item">
<a class="nav-link" href="{% url 'go_login' %}">
Log In <i class="fa fa-sign-in fa-fw"></i>
</a>
</li>
{% endif %}
<!-- -->
{% if user.is_staff %}
<li class="nav-item">
<a class="nav-link" href="{% url 'useradmin' %}">
User Moderation <i class="fa fa-users fa-fw"></i>
</a>
</li>
{% endif %}
</ul>
</div>
</div>
</header>
\ No newline at end of file
<!-- load in go templatetags -->
{% load go_extras %}
<!-- define our navbar -->
<div class="navbar navbar-default">
<!-- define the main "header" of the navbar -->
<div class="navbar-header" style="margin-left:5%;">
<!-- responsive hamburger menu -->
<button type="button" class="navbar-toggle" data-toggle="collapse"
data-target=".navbar-responsive-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- Go brand logo -->
<a class="navbar-brand" href="{% url 'index' %}">
<i class="fa fa-link"></i> Go
</a>
</div>
<!-- define the parts of the navbar that collapse b/c responsiveness -->
<div class="navbar-collapse collapse navbar-responsive-collapse">
<!-- The left side -->
<ul class="nav navbar-nav navbar-left">
<li><a href="{% url 'about' %}" data-jslicense="1">About</a></li>
<!-- only show if the current user is authenticated -->
{% if user.is_authenticated %}
<!-- only if they are an approved user -->
{% if user.registereduser.approved %}
<li><a href="{% url 'new_link' %}">New Link</a></li>
{% endif %}
<!-- only if the current user has not registered to use go -->
{% if not user.registereduser.registered %}
<li><a href="{% url 'signup' %}">Register</a></li>
{% endif %}
{% endif %}
</ul>
<!-- The right side -->
<ul class="nav navbar-nav navbar-right" style="margin-right:5%;">
<!-- only show if the user is authenticated -->
{% if user.is_authenticated %}
<!-- logout -->
<li>
<a href="{% url 'go_logout' %}">
Log Out <i class="fa fa-sign-out fa-fw"></i>