-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
nevermind. tabs changed to spaces in base_error.html
- Loading branch information
Showing
1 changed file
with
21 additions
and
21 deletions.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ | |
{% block extrahead %} | ||
<script src="https://code.jquery.com/jquery-2.2.0.min.js"></script> | ||
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" | ||
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script> | ||
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
|
@@ -17,36 +17,36 @@ | |
<nav class="navbar navbar-default" role="navigation"> | ||
<div class="container-fluid"> | ||
<div class="navbar-header"> | ||
<a href="/" class="navbar-brand" href="javascript:void(0)"><img src="/static/images/[email protected]" width="215" height="40" alt="MIT MicroMasters" /></a> | ||
<div class="nav-utility pull-right"> | ||
{% if authenticated %} | ||
<div class="dropdown btn-group"> | ||
<a href="/" class="navbar-brand" href="javascript:void(0)"><img src="/static/images/[email protected]" width="215" height="40" alt="MIT MicroMasters" /></a> | ||
<div class="nav-utility pull-right"> | ||
{% if authenticated %} | ||
<div class="dropdown btn-group"> | ||
<a class="btn btn-danger" href="/dashboard"><span>{{ name }}</span></a> | ||
<button aria-label="logout_label" id="user-menu" role="button" class="dropdown-toggle btn btn-danger" | ||
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" type="button"> | ||
<span><span class="caret"></span></span> | ||
</button> | ||
<ul class="dropdown-menu" aria-labelledby="user-menu"> | ||
<li role="presentation" class=""><a role="menuitem" href="/users/{{ username }}" tabindex="-1">Profile</a></li> | ||
<li role="presentation" class=""><a role="menuitem" href="/settings" tabindex="-1">Settings</a></li> | ||
<li role="presentation" class=""><a role="menuitem" href="/logout" tabindex="-1">Logout</a></li> | ||
</ul> | ||
</div> | ||
{% else %} | ||
<button aria-label="logout_label" id="user-menu" role="button" class="dropdown-toggle btn btn-danger" | ||
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" type="button"> | ||
<span><span class="caret"></span></span> | ||
</button> | ||
<ul class="dropdown-menu" aria-labelledby="user-menu"> | ||
<li role="presentation" class=""><a role="menuitem" href="/users/{{ username }}" tabindex="-1">Profile</a></li> | ||
<li role="presentation" class=""><a role="menuitem" href="/settings" tabindex="-1">Settings</a></li> | ||
<li role="presentation" class=""><a role="menuitem" href="/logout" tabindex="-1">Logout</a></li> | ||
</ul> | ||
</div> | ||
{% else %} | ||
<span>Get Started Today!</span> | ||
<a class="btn btn-danger" href="{% url 'social:begin' 'edxorg' %}"> | ||
Sign in with edX.org | ||
</a> | ||
{% endif %} | ||
</div> | ||
{% if authenticated %} | ||
</div> | ||
{% if authenticated %} | ||
<ul class="nav navbar-toolbar navbar-left"> | ||
<li class="active"> | ||
<a href="/dashboard">Dashboard</a> | ||
</li> | ||
</ul> | ||
{% endif %} | ||
</div> | ||
</div> | ||
</div> | ||
</nav> | ||
|
||
|
@@ -55,8 +55,8 @@ | |
|
||
<div> | ||
<div class="card-header"> | ||
{% block error_header %} | ||
{% endblock %} | ||
{% block error_header %} | ||
{% endblock %} | ||
</div> | ||
<div class="card-copy"> | ||
{% block error_content %} | ||
|