Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
go
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
21
Issues
21
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SRCT
go
Commits
85bfcdf8
Verified
Commit
85bfcdf8
authored
Jan 13, 2018
by
David Haynes
🙆
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Begin the bootstrap 4 conversion
- general cleanup a coming - less <br> - more pedantic css
parent
0cdcb7db
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
101 additions
and
227 deletions
+101
-227
go/go/templates/core/about.html
go/go/templates/core/about.html
+13
-93
go/go/templates/core/edit.html
go/go/templates/core/edit.html
+0
-0
go/go/templates/core/new.html
go/go/templates/core/new.html
+0
-0
go/go/templates/landing.html
go/go/templates/landing.html
+8
-33
go/go/templates/layouts/base.html
go/go/templates/layouts/base.html
+16
-30
go/go/templates/layouts/navbar.html
go/go/templates/layouts/navbar.html
+64
-0
go/go/templates/layouts/navigation.html
go/go/templates/layouts/navigation.html
+0
-71
go/go/templates/manage.html
go/go/templates/manage.html
+0
-0
No files found.
go/go/templates/core/about.html
View file @
85bfcdf8
<!-- include the base html template -->
{% extends 'layouts/base.html' %}
<!-- Tell Django to load static files -->
{% load staticfiles %}
<!-- define the page title block -->
{% block title %}
SRCT Go
•
About
{% endblock %}
<!-- define the content block for the page -->
{% block content %}
<!--
define the page header div
-->
<!--
page header
-->
<div
class=
"page-header"
id=
"banner"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
...
...
@@ -26,41 +23,32 @@ SRCT Go • About
</div>
</div>
<!--
define the terms of use div
-->
<!--
terms of use
-->
<div
class=
"row"
id=
"terms"
>
<div
class=
"col-md-12"
>
<h4>
Terms of Use
</h4>
<legend></legend>
<h2>
Terms of Use
</h2>
<p>
By using Go you acknowledge that you are a current George Mason Student or faculty
member.
<br></br>
Additionally, any link that you create is subject to removal by Go admins if it is
deemed to associate the univeristy with any
<br
/>
derogatory or controversial matters.
<br></br>
deemed to associate the univeristy with any derogatory or controversial matters.
Go admins also reserve the right to remove and ban any users who attempt to abuse
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
with the GMU
<a
href=
"https://universitypolicy.gmu.edu/policies/responsible-use-of-computing/"
>
Responsible Use of Computing
</a>
policies.
with the GMU
<a
href=
"https://universitypolicy.gmu.edu/policies/responsible-use-of-computing/"
>
Responsible Use of Computing
</a>
policies.
</p>
<br
/>
</div>
</div>
<!--
define the who made go? div
-->
<!--
who made go?
-->
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<h4>
Who made Go?
</h4>
<legend></legend>
<h2>
Who made Go?
</h2>
<p>
Members of the
<a
href=
"//srct.gmu.edu"
>
Student-Run Computing and Technology
</a>
registered
student organization at
<a
href=
"//gmu.edu"
>
George Mason University
</a>
are
the clever,
<br
/>
talented student developers behind Go.
the clever, talented student developers behind Go.
</p>
<p>
We are a group of creative people that like making software and want to give back
...
...
@@ -68,22 +56,18 @@ SRCT Go • About
</p>
<p>
<a
href=
"//srct.gmu.edu/contact/"
>
Contact us
</a>
to get involved!
<p>
<br
/>
</p>
</div>
</div>
<!-- define the thanks! div -->
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<h4>
Thanks!
</h4>
<legend></legend>
<h2>
Thanks!
</h2>
<p>
This project was made possible through the collective contributions of multiple Mason
SRCT members.
<br></br>
This project was made possible through the collective contributions of
multiple Mason SRCT members.
<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/ocelotsloth"
>
Mark Stenglein
</a>
,
<a
href=
"https://www.youtube.com/watch?v=dQw4w9WgXcQ"
>
Andres Villogas
</a>
,
...
...
@@ -97,9 +81,7 @@ SRCT Go • About
<a
href=
"https://github.com/nanderson94"
>
Nicholas Anderson
</a>
,
<a
href=
""
>
Kevin Mckigney
</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>
:
<br
/>
<a
href=
"https://github.com/dhaynespls"
>
David Haynes
</a>
,
<a
href=
"https://github.com/zosman1"
>
Zach Osman
</a>
,
<a
href=
"https://github.com/roberthitt"
>
Robert Hitt
</a>
,
...
...
@@ -109,85 +91,23 @@ SRCT Go • About
<a
href=
"https://github.com/mdsecurity"
>
Mattias Duffy
</a>
,
<a
href=
"https://github.com/IAmEyad"
>
Eyad Hasan
</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>
:
<br
/>
<a
href=
"https://github.com/dhaynespls"
>
David Haynes
</a>
,
<a
href=
""
>
Matthew Rodgers
</a>
,
<a
href=
"https://github.com/nanderson94"
>
Nicholas Anderson
</a>
,
and
<a
href=
"https://github.com/dwbond"
>
Daniel Bond
</a>
.
<br></br>
Go 1.0:
<br
/>
<a
href=
"https://github.com/jrouly"
>
Michel Rouly
</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>
.
<br></br>
</p>
<p>
Additional thanks are due to the
<a
href=
"https://wiki.srct.gmu.edu/Executive_Board"
>
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>
.
</p>
</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 %}
go/go/templates/core/edit
_link
.html
→
go/go/templates/core/edit.html
View file @
85bfcdf8
File moved
go/go/templates/core/new
_link
.html
→
go/go/templates/core/new.html
View file @
85bfcdf8
File moved
go/go/templates/
public_
landing.html
→
go/go/templates/landing.html
View file @
85bfcdf8
<!-- 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' %}
<!-- define the page title block -->
{% block title %}
SRCT Go
•
Welcome
{% endblock %}
<!-- define the content block for the page -->
{% block content %}
<!-- define the page header div -->
<div
class=
"page-header"
id=
"banner"
>
<div
class=
"page-header"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<h1><i
class=
"fa fa-link"
></i>
Go
</h1>
...
...
@@ -33,9 +15,7 @@ SRCT Go • Welcome
</div>
</div>
<!-- the main content row -->
<div
class=
"row"
>
<!-- what is go? -->
<div
class=
"col-md-4"
>
<h3>
What is Go?
</h3>
<legend></legend>
...
...
@@ -51,32 +31,30 @@ SRCT Go • Welcome
</p>
</div>
<!-- why should I use Go? -->
<div
class=
"col-md-4"
>
<h3>
Why should I use Go?
</h3>
<legend></legend>
<p>
Go features:
</p>
<ul
class=
"fa-ul"
>
<li>
<i
class=
"fa
-li fa
fa-check-square"
></i>
<i
class=
"fa
s
fa-check-square"
></i>
Data tracking on the number of clicks a Go link gets.
</li>
<li>
<i
class=
"fa
-li fa
fa-check-square"
></i>
<i
class=
"fa
s
fa-check-square"
></i>
Options to share Go links across various social media platforms.
</li>
<li>
<i
class=
"fa
-li fa
fa-check-square"
></i>
<i
class=
"fa
s
fa-check-square"
></i>
QR Code generation at various resolutions, ready to be shared.
</li>
<li>
<i
class=
"fa
-li fa
fa-check-square"
></i>
<i
class=
"fa
s
fa-check-square"
></i>
Optional expiration for links after particular times.
</li>
</ul>
</div>
<!-- how do I access Go? -->
<div
class=
"col-md-4"
>
<h3>
How do I access Go?
</h3>
<legend></legend>
...
...
@@ -91,16 +69,13 @@ SRCT Go • Welcome
</div>
</div>
<br
/>
<hr
/>
<!-- carefully formatted login and signup buttons -->
<!-- https://files.slack.com/files-pri/T025B796J-F0KPTCTD3/spin-dhaynes-buttons.gif -->
<div
class=
"fix row"
>
<div
class=
"col-md-offset-1 col-md-4"
>
<div
class=
"row"
>
<div
class=
"col-md-4"
>
<a
href=
"{% url 'go_login' %}"
class=
"btn btn-primary btn-block"
>
Log In
</a>
</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>
</div>
</div>
...
...
go/go/templates/layouts/base.html
View file @
85bfcdf8
<!-- Tell Django to load static files -->
{% load staticfiles %}
<!-- HTML 5 definition -->
<!DOCTYPE html>
<!-- Start the HTML page for Go -->
<html>
<!-- load in our header content for every page -->
<head>
<!--
load in the
title block defined on each html page -->
<!-- title block defined on each html page -->
<title>
{% block title %}
{% endblock %}
</title>
<!-- Metatags -->
<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
http-equiv=
"X-UA-Compatible"
content=
"IE=edge"
/>
<!-- Chrome on Android navbar color -->
<meta
name=
"theme-color"
content=
"#006633"
>
<!-- FB/Opengraph tags -->
<meta
property=
"og:url"
content=
"https://go.gmu.edu/"
>
<meta
property=
"og:type"
content=
"website"
>
<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:site_name"
content=
"SRCT Go"
>
<meta
property=
"og:locale"
content=
"en_US"
>
...
...
@@ -34,38 +27,31 @@
<meta
name=
"twitter:site"
content=
"@MasonSRCT"
>
<meta
name=
"twitter:creator"
content=
"@MasonSRCT"
>
<meta
name=
"twitter:url"
content=
"https://go.gmu.edu/"
>
<meta
name=
"twitter:title"
content=
"SRCT G
p
"
>
<meta
name=
"twitter:title"
content=
"SRCT G
o
"
>
<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 fav
icon -->
<link
rel=
"icon"
type=
"image/ico"
href=
"{% static "
img
/
favicon.ico
"
%}"
/>
<!-- Load in global CSS -->
<link
href=
"https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
rel=
"stylesheet"
type=
"text/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>
<!-- Global CSS -->
<link
href=
"https://srct.gmu.io/masonstrap/css/masonstrap.min.css"
rel=
"stylesheet"
>
<link
rel=
"stylesheet"
href=
"{% static "
css
/
global.css
"
%}"
/>
</head>
<!-- Load in the body of a Go page -->
<body>
<!-- Load in the navbar
template
-->
{% include 'layouts/nav
igation
.html' %}
<!-- Load in the navbar -->
{% include 'layouts/nav
bar
.html' %}
<!-- Wrap the page content in a bootstrap container -->
<div
class=
"container"
>
<div
class=
"container begin"
>
<!-- Load in the main page content -->
{% block content %}
{% endblock %}
</div>
<!-- Load in the footer template -->
{% include 'layouts/footer.html' %}
</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>
\ No newline at end of file
go/go/templates/layouts/navbar.html
0 → 100644
View file @
85bfcdf8
<!-- 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
go/go/templates/layouts/navigation.html
deleted
100644 → 0
View file @
0cdcb7db
<!-- 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>
</a>
</li>
{% else %}
<!-- login -->
<li>
<a
href=
"{% url 'go_login' %}"
>
Log In
<i
class=
"fa fa-sign-in fa-fw"
></i>
</a>
</li>
{% endif %}
<!-- if the user is a staff member -->
{% if user.is_staff %}
<li
class=
"dropdown"
>
<a
href=
"#"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
>
Administration
<i
class=
"fa fa-caret-down fa-fw"
></i></a>
<ul
class=
"dropdown-menu dropdown-menu-left"
>
<li><a
href=
"{% url 'useradmin' %}"
>
User Moderation
<i
class=
"fa fa-users fa-fw"
></i></a></li>
</ul>
</li>
{% endif %}
</ul>
</div>
</div>
go/go/templates/
admin/useradmin
.html
→
go/go/templates/
manage
.html
View file @
85bfcdf8
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment