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

Remove lingering use of 'page-header'

Browse Source 
BS removed that style
This commit is contained in:
FreneticScribbler
2020-10-17 17:59:23 +01:00
parent 0fee753284
commit 848e8c8ccd
6 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RIGS/rigboard.py
View File

@@ -310,8 +310,10 @@ class EventAuthorise(generic.UpdateView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(EventAuthorise, self).get_context_data(**kwargs) context = super(EventAuthorise, self).get_context_data(**kwargs)
context['event'] = self.event context['event'] = self.event
context['tos_url'] = settings.TERMS_OF_HIRE_URL context['tos_url'] = settings.TERMS_OF_HIRE_URL
context['page_title'] = "{}: {}".format(self.event.display_id, self.event.name)
if self.event.dry_hire:
context['page_title'] += ' <span class="badge badge-secondary align-top">Dry Hire</span>'
return context return context
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):

11
RIGS/templates/eventauthorisation.html
View File

@@ -17,18 +17,7 @@
</script> </script>
{% endblock %} {% endblock %}
{% block title %}
{% if event.is_rig %}N{{ event.pk|stringformat:"05d" }}{% else %}{{ event.pk }}{% endif %} | {{ event.name }}
{% endblock %}
{% block content %} {% block content %}
<div class="page-header my-3">
<h1>
{% if event.is_rig %}N{{ event.pk|stringformat:"05d" }}{% else %}{{ event.pk }}{% endif %}
| {{ event.name }} {% if event.dry_hire %}<span class="badge badge-secondary align-top">Dry Hire</span>{% endif %}
</h1>
</div>
<div class="row my-3"> <div class="row my-3">
{% include 'partials/client_eventdetails.html' %} {% include 'partials/client_eventdetails.html' %}
</div> </div>

6
assets/templates/asset_detail.html
View File

@@ -1,13 +1,7 @@
{% extends 'base_assets.html' %} {% extends 'base_assets.html' %}
{% load widget_tweaks %} {% load widget_tweaks %}
{% block title %}Asset {{ object.asset_id }}{% endblock %}
{% block content %} {% block content %}
<div class="page-header">
<h1>Asset: {{ object.asset_id }}</h1>
</div>
<div class="row"> <div class="row">
<div class="col-md-6 mb-3"> <div class="col-md-6 mb-3">
{% include 'partials/asset_detail_form.html' %} {% include 'partials/asset_detail_form.html' %}

11
assets/templates/cable_type_list.html
View File

@@ -1,15 +1,12 @@
{% extends 'base_assets.html' %} {% extends 'base_assets.html' %}
{% block title %}Supplier List{% endblock %}
{% load paginator from filters %} {% load paginator from filters %}
{% load button from filters %}
{% load widget_tweaks %} {% load widget_tweaks %}
{% block content %} {% block content %}
<div class="page-header"> <div class="row my-2">
<h1>Cable Type List</h1> <div class="col text-right pr-0">
</div> {% button 'new' 'cable_type_create' %}
<div class="row">
<div class="col px-0">
<a href="{% url 'cable_type_create' %}" class="btn btn-success float-right my-3">New <span class="fas fa-plus"></span></a>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

10
assets/views.py
View File

@@ -102,6 +102,11 @@ class AssetDetail(LoginRequiredMixin, AssetIDUrlMixin, generic.DetailView):
model = models.Asset model = models.Asset
template_name = 'asset_detail.html' template_name = 'asset_detail.html'
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["page_title"] = "Asset {}".format(self.object.display_id)
return context
class AssetEdit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView): class AssetEdit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView):
template_name = 'asset_form.html' template_name = 'asset_form.html'
@@ -298,6 +303,11 @@ class CableTypeList(generic.ListView):
paginate_by = 40 paginate_by = 40
# ordering = ['__str__'] # ordering = ['__str__']
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["page_title"] = "Cable Type List"
return context
class CableTypeDetail(generic.DetailView): class CableTypeDetail(generic.DetailView):
model = models.CableType model = models.CableType

4
templates/base.html
View File

@@ -7,7 +7,7 @@
xml:lang="{% firstof LANGUAGE_CODE 'en' %}" xml:lang="{% firstof LANGUAGE_CODE 'en' %}"
lang="{% firstof LANGUAGE_CODE 'en' %}"> lang="{% firstof LANGUAGE_CODE 'en' %}">
<head> <head>
<title>{% block title %}{{page_title}}{% endblock %} | Rig Information Gathering System</title> <title>{% block title %}{{page_title|striptags}}{% endblock %} | Rig Information Gathering System</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -71,7 +71,7 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% if page_title and not request.is_ajax %} {% if page_title and not request.is_ajax %}
<h2>{{page_title}}</h2> <h2>{{page_title|safe}}</h2>
{% endif %} {% endif %}
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>