carom/carom-server
6
1
Fork 0
Code Issues Pull Requests Releases 2 Activity

update to bootstrap 4

Browse Source
This commit is contained in:
Robert Einsle
2018-02-10 13:44:14 +01:00
parent 9036e4b59a
commit e1d96b9b76
54 changed files with 2739 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
billard/templates/billard/accounting.html
View File

@@ -1,8 +1,14 @@
{% extends 'billard/base.html' %}
{% extends '_base.html' %}
{% load display_client %}
{% block title %}Abrechnung{% endblock %}
{% block breadcrumb %}
<li class="breadcrumb-item"><a href="{% url 'billard:location_index' %}">Standorte</a></li>
<li class="breadcrumb-item"><a href="{% url 'billard:location_detail' location.id %}">{{ location.code }}</a></li>
<li class="breadcrumb-item active">Abrechnung</li>
{% endblock %}
{% block content %}
<div class="alert alert-success" role="alert">Gesamt-Summe: {{ acc_sum }}</div>

69
billard/templates/billard/base.html
View File

@@ -1,69 +0,0 @@
{% load static %}
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>carom - {% block title %}TITLE SETZEN{% endblock %}</title>
<meta name="description" content="carom billard management">
<meta name="author" content="Robert Einsle <robert@einsle.de>">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
{% block header %}
{% endblock %}
<!-- Bootstrap -->
<link href="{% static 'billard/css/bootstrap.min.css' %}" rel="stylesheet" type="text/css">
<link href="{% static 'billard/css/billard.css' %}" rel="stylesheet" type="text/css">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="{% static 'billard/js/html5shiv.min.js' %}"></script>
<script src="{% static 'billard/js/respond.min.js' %}" type="text/javascript"></script>
<![endif]-->
</head>
<body>
<header class="navbar navbar-inverse 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">Navigation ein-/ausblenden</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">Billard</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li class="{% ifequal request.path '/billard/' %}active{% endifequal %}"><a href="{% url "billard:location_index" %}">Standorte</a></li>
{% if user.is_superuser %}
<li class="{% ifequal request.path '/logout/' %}active{% endifequal %}"><a href="/admin/">Administration</a></li>
{% endif %}
{% if user.is_authenticated %}
<li class="dropdown-toggle">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">({{ user.get_username }}) <span class="caret" /></a>
<ul class="dropdown-menu">
<li class="{% ifequal request.path '/logout/' %}active{% endifequal %}"><a href="{% url 'logout' %}">Abmelden</a></li>
</ul>
</li>
{% else %}
<li class="{% ifequal request.path '/login/' %}active{% endifequal %}"><a href="{% url 'login' %}">Anmelden</a></li>
{% endif %}
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="#">c@0.2.3</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</header>
<div class="container" id="content">
{% block content %}
{% endblock %}
</div><!-- /.container -->
<script src="{% static 'billard/js/jquery-3.3.1.min.js' %}" type="text/javascript"></script>
<script src="{% static 'billard/js/bootstrap.min.js' %}" type="text/javascript"></script>
<script src="{% static 'billard/js/carom.js' %}" type="text/javascript"></script>
{% block js %}
{% endblock %}
</body>
</html>

2
billard/templates/billard/index.html
View File

@@ -1,4 +1,4 @@
{% extends 'billard/base.html' %}
{% extends '_base.html' %}
{% load display_client %}
{% block title %}Location Data{% endblock %}

9
billard/templates/billard/location_detail.html
View File

@@ -1,9 +1,14 @@
{% extends 'billard/base.html' %}
{% extends '_base.html' %}
{% block title %}Standort{% endblock %}
{% block breadcrumb %}
<li class="breadcrumb-item"><a href="{% url 'billard:location_index' %}">Standorte</a></li>
<li class="breadcrumb-item active">{{ location.code }}</li>
{% endblock %}
{% block content %}
<div id="desk_data">
<div class="row">
{% include 'billard/location_detail_ajax.html' %}
</div>
<div id="modal-wrapper">

4
billard/templates/billard/location_detail_ajax.html
View File

@@ -6,7 +6,7 @@
{% endfor %}
{% endfor %}
{% else %}
<div class="col-md-12">
<div class="col-md-12 alert alert-danger">Keine Tische angelegt!</div>
<div class="col">
<div class="alert alert-danger">Keine Tische angelegt!</div>
</div>
{% endif %}

6
billard/templates/billard/location_index.html
View File

@@ -1,7 +1,11 @@
{% extends 'billard/base.html' %}
{% extends '_base.html' %}
{% block title %}Standortliste{% endblock %}
{% block breadcrumb %}
<li class="breadcrumb-item active">Standorte</li>
{% endblock %}
{% block content %}
{% if location_list %}

2
billard/templates/billard/locationdata_detail.html
View File

@@ -1,4 +1,4 @@
{% extends 'billard/base.html' %}
{% extends '_base.html' %}
{% block title %}Location Data{% endblock %}

2
billard/templates/billard/locationdata_list.html
View File

@@ -1,4 +1,4 @@
{% extends 'billard/base.html' %}
{% extends '_base.html' %}
{% block title %}Location Data{% endblock %}

2
billard/templates/billard/locationdata_list_ajax.html
View File

@@ -1,4 +1,4 @@
{% extends 'billard/base.html' %}
{% extends '_base.html' %}
{% block title %}Location Data{% endblock %}

16
billard/templates/registration/login.html
View File

@@ -1,16 +0,0 @@
{% extends 'billard/base.html' %}
{% load crispy_forms_tags %}
{% block title %}Login{% endblock %}
{% block content %}
<form action="{% url "login" %}" method="post" accept-charset="utf-8">
{% csrf_token %}
{{ form|crispy }}
<input type="hidden" name="next" value="{{ next }}" />
<input class="btn btn-default" type="submit" value="Login" />
</form>
{% endblock %}