-
Notifications
You must be signed in to change notification settings - Fork 56
Added Registration #41
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
jarifibrahim
merged 1 commit into
OpenSourceHelpCommunity:develop
from
vaibhavsingh97:develop
Jul 3, 2017
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,58 @@ | ||
{% load static %} | ||
<!DOCTYPE html> | ||
<html> | ||
|
||
<head> | ||
{% include 'header.html' %} | ||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> | ||
{% if site.title %}<title>{% if title %}{{ title }} – {% endif %}{{ site.title }}{% if not title and site.subtitle %} – {{ site.subtitle }}{% endif %}</title>{% endif %} | ||
{% include 'header.html' %} | ||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> {% if site.title %} | ||
<title> | ||
{% if title %} {{ title }} – {% endif %} {{ site.title }} {% if not title and site.subtitle %} – {{ site.subtitle }} {% endif %} | ||
</title> | ||
{% endif %} | ||
</head> | ||
|
||
<body> | ||
<nav class="navbar navbar-inverse navbar-static-top navbar-fixed-top"> | ||
<div class="container"> | ||
<div class="navbar-header"> | ||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> | ||
<span class="sr-only">Toggle navigation</span> | ||
<span class="icon-bar"></span> | ||
<span class="icon-bar"></span> | ||
<span class="icon-bar"></span> | ||
</button> | ||
<a class="navbar-brand" href="#">Open Source Help Community</a> | ||
</div> | ||
<div id="navbar" class="navbar-collapse collapse"> | ||
<ul class="nav navbar-nav navbar-right"> | ||
<li><a href="https://www.youtube.com/channel/UC1_IAby-9me3iICtxuiDL5Q">Sessions</a></li> | ||
<li><a href="https://github.com/OpenSourceHelpCommunity">Resources</a></li> | ||
<li><a href="mailto:[email protected]">Contact</a></li> | ||
<li><a href="https://opensourcehelp.herokuapp.com/">Join Us!</a></li> | ||
</ul> | ||
</div> | ||
</div> | ||
</nav> | ||
<nav class="navbar navbar-inverse navbar-static-top navbar-fixed-top"> | ||
<div class="container"> | ||
<div class="navbar-header"> | ||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> | ||
<span class="sr-only">Toggle navigation</span> | ||
<span class="icon-bar"></span> | ||
<span class="icon-bar"></span> | ||
<span class="icon-bar"></span> | ||
</button> | ||
<a class="navbar-brand" href="{% url 'home' %}">Open Source Help Community</a> | ||
</div> | ||
<div id="navbar" class="navbar-collapse collapse"> | ||
<ul class="nav navbar-nav navbar-right"> | ||
<li><a href="https://www.youtube.com/channel/UC1_IAby-9me3iICtxuiDL5Q">Sessions</a></li> | ||
<li><a href="https://github.com/OpenSourceHelpCommunity">Resources</a></li> | ||
<li><a href="mailto:[email protected]">Contact</a></li> | ||
<li><a href="https://opensourcehelp.herokuapp.com/">Join Us!</a></li> | ||
{% if user.is_authenticated %} | ||
<li><a href="#!">Hey {{ user.username }}!</a></li> | ||
<li><a href="{% url 'auth_logout' %}">Logout</a></li> | ||
{% else %} | ||
<li><a href="{% url 'auth_login' %}">Sign In</a></li> | ||
<li><a href="{% url 'registration_register' %}">Sign Up</a></li> | ||
{% endif %} | ||
</ul> | ||
</div> | ||
</div> | ||
</nav> | ||
|
||
<div id="content"> | ||
{% block content %}{% endblock %} | ||
{% block footer %} | ||
<footer> | ||
<div class="container"> | ||
<div class="row"> | ||
<div class="col-xs-12"> | ||
<div class="social"> | ||
<ul> | ||
<span class="col-sm-6 left-align"> | ||
<div> | ||
{% block content %}{% endblock %} | ||
</div> | ||
|
||
{% block footer %} | ||
<footer class="footer"> | ||
<div class="container"> | ||
<div class="row"> | ||
<div class="col-xs-12"> | ||
<div class="social"> | ||
<ul> | ||
<span class="col-sm-6 left-align"> | ||
<li> | ||
<a href="https://www.facebook.com/opensourcehelpcommunity/"><i class="fa fa-facebook" aria-hidden="true"></i></a> | ||
</li> | ||
|
@@ -52,25 +66,25 @@ | |
<a href="https://www.youtube.com/channel/UC1_IAby-9me3iICtxuiDL5Q"><i class="fa fa-youtube-play" aria-hidden="true"></i></a> | ||
</li> | ||
</span> | ||
<span class="col-sm-6 backToTop right-align"> | ||
<span class="col-sm-6 back-to-top right-align"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Indentation error. |
||
<a id="toTop" name="Back to top!">Back to top</a> | ||
</span> | ||
</ul> | ||
</div> | ||
</div> | ||
</div> | ||
<div class="col-xs-12"> | ||
<div class="copyright"> | ||
© 2017 Open Source Help Community | ||
</div> | ||
</div> | ||
</div> | ||
</footer> | ||
{% endblock %} | ||
</div> | ||
</ul> | ||
</div> | ||
</div> | ||
</div> | ||
<div class="col-xs-12"> | ||
<div class="copyright"> | ||
© 2017 Open Source Help Community | ||
</div> | ||
</div> | ||
</div> | ||
</footer> | ||
{% endblock %} | ||
|
||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> | ||
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> | ||
<script src="{% static "main/js/script.js"%}"></script> | ||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> | ||
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> | ||
<script src="{% static "main/js/script.js" %}"></script> | ||
</body> | ||
|
||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
{% load static %} | ||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> | ||
<meta name="viewport" content="width=device-width, initial-scale=1"> | ||
{% if site.author %}<meta name="author" content="{{ site.author }}">{% endif %} | ||
{% if site.description %}<meta name="description" content="{{ site.description }}">{% endif %} | ||
<meta name="viewport" content="width=device-width, initial-scale=1"> {% if site.author %} | ||
<meta name="author" content="{{ site.author }}">{% endif %} {% if site.description %} | ||
<meta name="description" content="{{ site.description }}">{% endif %} | ||
<meta name="generator" content="mynt v{{ site.version }}"> | ||
<link rel="shortcut icon" href="{% static "main/images/favicon.ico"%}" type="image/x-icon"> | ||
<link rel="shortcut icon" href="{% static "main/images/favicon.ico" %}" type="image/x-icon"> | ||
<link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,500,700,900" rel="stylesheet"> | ||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> | ||
<link href="{% static "main/css/app.css"%}" rel="stylesheet"> | ||
<link href="{% static "main/css/app.css" %}" rel="stylesheet"> | ||
<script src="https://use.fontawesome.com/ae7ffc7b99.js"></script> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change breaks the layout. You might want to remove it.