arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 13:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Move rigboard templates up a level

Browse Source 
Also:
- Find and replace panel -> card
- Some base template work
- gulpfile things, added dep on django-gulp
This commit is contained in:
FreneticScribbler
2020-03-09 21:44:09 +00:00
parent 6c72f070f2
commit 1df1784d02
65 changed files with 225 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
templates/base.html
View File

@@ -16,7 +16,6 @@
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,700,300,400' rel='stylesheet'
type='text/css'>
<link rel="stylesheet" type="text/css" href="{% static "css/screen.css" %}">
{% block css %}
{% endblock %}
@@ -33,62 +32,53 @@
<body>
{% include "analytics.html" %}
<div class="navbar navbar-fixed-top navbar-inverse hidden-print" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
{% block titleheader %}
{% endblock %}
</div>
<div class="navbar-collapse">
<ul class="nav navbar-nav">
{% block titleelements %}
{% endblock %}
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown" id="user">
{% if user.is_authenticated %}
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<span class="glyphicon glyphicon-user"></span>
Hi {{ user.first_name }}
<b class="caret"></b>
</a>
<ul class="dropdown-menu nav media-list pull-right" id="userdropdown">
<li class="media">
<a href="{% url 'profile_detail' %}">
<div class="media-left">
<img src="{{ request.user.profile_picture }}" class="media-object"/>
</div>
<div class="media-body">
<b>{{ request.user.first_name }} {{ request.user.last_name }}</b>
<p class="muted">{{ request.user.email }}</p>
</div>
</a>
</li>
<li>
<div class="col-sm-12 text-right">
<a href="{% url 'logout' %}" class="btn btn-primary">Logout</a>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark" role="navigation">
{% block titleheader %}
{% endblock %}
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
{% block titleelements %}
{% endblock %}
<li class="dropdown" id="user">
{% if user.is_authenticated %}
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<span class="glyphicon glyphicon-user"></span>
Hi {{ user.first_name }}
<b class="caret"></b>
</a>
<ul class="dropdown-menu nav media-list pull-right" id="userdropdown">
<li class="media">
<a href="{% url 'profile_detail' %}">
<div class="media-left">
<img src="{{ request.user.profile_picture }}" class="media-object"/>
</div>
</li>
</ul>
{% else %}
<a href="{% url "login" %}">
<span class="icon-user"></span>
Login
</a>
{% endif %}
</li>
</ul>
</div>
</div>
</div>
<div class="media-body">
<b>{{ request.user.first_name }} {{ request.user.last_name }}</b>
<p class="muted">{{ request.user.email }}</p>
</div>
</a>
</li>
<li>
<div class="col-sm-12 text-right">
<a href="{% url 'logout' %}" class="btn btn-primary">Logout</a>
</div>
</li>
</ul>
{% else %}
<a href="{% url 'login' %}">
<span class="icon-user"></span>
Login
</a>
{% endif %}
</li>
</ul>
</div>
</nav>
<div class="container">
<div id="content" class="row">
@@ -112,6 +102,7 @@
</div>
<div id="sidebar" class="column">
test
{% block sidebar %}
{% endblock %}
</div>