kopia lustrzana https://github.com/OpenDroneMap/WebODM
Added HTML insertion tags, CSS fixes
Piero Toffanin
rodzic
f71ddf6c2a
commit
c4484ef317
|
|
@ -0,0 +1,5 @@
|
|||
from app.models import Setting
|
||||
|
||||
# Make the SETTINGS object available to all templates
|
||||
def load(request):
|
||||
return {'SETTINGS': Setting.objects.first()}
|
||||
|
|
@ -3,10 +3,6 @@ html, body, section.main, .content, #wrapper, #page-wrapper{
|
|||
}
|
||||
|
||||
#navbar-top{
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
top: 0;
|
||||
height: 50px;
|
||||
min-height: 50px;
|
||||
background-color: #18bc9c;
|
||||
|
|
@ -77,7 +73,7 @@ ul#side-menu.nav{
|
|||
|
||||
.content{
|
||||
clear: both;
|
||||
padding-top: 60px;
|
||||
padding-top: 8px;
|
||||
|
||||
h1,h2,h3,h4,h5{
|
||||
padding-top: 4px;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[data-mapview]{
|
||||
height: calc(100vh);
|
||||
height: calc(100vh - 100px);
|
||||
}
|
||||
|
||||
.map-view{
|
||||
height: calc(100% - 54px);
|
||||
height: calc(100% - 20px);
|
||||
position: relative;
|
||||
|
||||
input[type="range"]{
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
<!-- Content -->
|
||||
<section class="main">
|
||||
<div class="content {% block coltype %}colM{% endblock %}">
|
||||
{{ SETTINGS.theme.html_after_header|safe }}
|
||||
{% block breadcrumbs %}
|
||||
<div class="breadcrumbs">
|
||||
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
<html lang="en">
|
||||
<head>
|
||||
{% load i18n static settings %}
|
||||
{% get_settings as settings %}
|
||||
|
||||
<meta charset="UTF-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
|
|
@ -23,8 +22,12 @@
|
|||
{% load render_bundle from webpack_loader %}
|
||||
{% render_bundle 'main' %}
|
||||
|
||||
<title>{{title|default:"Login"}} - {{ settings.app_name }}</title>
|
||||
<title>{{title|default:"Login"}} - {{ SETTINGS.app_name }}</title>
|
||||
|
||||
{% include "theme.html" %}
|
||||
<style type="text/css">
|
||||
{{ SETTINGS.theme.css|safe }}
|
||||
</style>
|
||||
</head>
|
||||
<body data-admin-utc-offset="{% now "Z" %}">
|
||||
<!--[if lt IE 8]>
|
||||
|
|
@ -48,6 +51,8 @@
|
|||
</ul>
|
||||
-->
|
||||
<div id="wrapper">
|
||||
{{ SETTINGS.theme.html_before_header|safe }}
|
||||
|
||||
<nav id="navbar-top" class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
||||
|
|
@ -57,14 +62,14 @@
|
|||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
{% block navbar-top-links %}{% endblock %}
|
||||
<a class="navbar-brand" href="/"><img src="{% settings_image_url 'app_logo_36' %}" alt="{{ settings.app_name }}" /></a>
|
||||
<a class="navbar-link" href="/"><p class="navbar-text">{{ settings.app_name }}</a></p>
|
||||
<a class="navbar-brand" href="/"><img src="{% settings_image_url 'app_logo_36' %}" alt="{{ SETTINGS.app_name }}" /></a>
|
||||
<a class="navbar-link" href="/"><p class="navbar-text">{{ SETTINGS.app_name }}</a></p>
|
||||
</div>
|
||||
|
||||
{% block navbar-sidebar %}{% endblock %}
|
||||
</nav>
|
||||
|
||||
{% block page-wrapper %}{% endblock %}
|
||||
|
||||
{% block page-wrapper %}{{ SETTINGS.theme.html_after_header|safe }}{% endblock %}
|
||||
</div>
|
||||
|
||||
{% autoescape off %}
|
||||
|
|
@ -110,4 +115,5 @@ $(function(){
|
|||
|
||||
</script>
|
||||
<script src="{% static 'app/js/vendor/bootstrap.min.js' %}"></script>
|
||||
{{ SETTINGS.theme.html_after_body|safe }}
|
||||
</html>
|
||||
|
|
@ -272,9 +272,7 @@
|
|||
<a href="/admin/"><i class="fa fa-gears fa-fw"></i> {% trans 'Administration' %}</a>
|
||||
</li>
|
||||
<li>
|
||||
{% load settings %}
|
||||
{% get_settings as settings %}
|
||||
<a href="{% url 'admin:app_setting_change' settings.id %}"><i class="fa fa-paint-brush"></i> {% trans 'Theme Settings' %}</a>
|
||||
<a href="{% url 'admin:app_setting_change' SETTINGS.id %}"><i class="fa fa-paint-brush"></i> {% trans 'Customization' %}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
<li>
|
||||
|
|
@ -295,6 +293,8 @@
|
|||
<div id="page-wrapper">
|
||||
<section class="main">
|
||||
<div class="content">
|
||||
{{ SETTINGS.theme.html_after_header|safe }}
|
||||
|
||||
{% block messages %}
|
||||
{% for message in messages %}
|
||||
<div class="alert alert-{{ message.tags }} alert-dismissible">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
<style type="text/css">
|
||||
*{
|
||||
color: blue;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -2,24 +2,17 @@ import datetime
|
|||
|
||||
from django import template
|
||||
|
||||
from app.models import Setting
|
||||
|
||||
register = template.Library()
|
||||
|
||||
|
||||
@register.assignment_tag()
|
||||
def get_settings():
|
||||
return Setting.objects.first()
|
||||
@register.assignment_tag(takes_context=True)
|
||||
def settings_image_url(context, image):
|
||||
return "/media/" + getattr(context['SETTINGS'], image).url
|
||||
|
||||
|
||||
@register.assignment_tag()
|
||||
def settings_image_url(image):
|
||||
return "/media/" + getattr(get_settings(), image).url
|
||||
|
||||
|
||||
@register.simple_tag()
|
||||
def get_footer():
|
||||
settings = get_settings()
|
||||
@register.simple_tag(takes_context=True)
|
||||
def get_footer(context):
|
||||
settings = context['SETTINGS']
|
||||
if settings.theme.html_footer == "": return ""
|
||||
|
||||
organization = ""
|
||||
|
|
|
|||
|
|
@ -106,6 +106,7 @@ TEMPLATES = [
|
|||
'django.template.context_processors.request',
|
||||
'django.contrib.auth.context_processors.auth',
|
||||
'django.contrib.messages.context_processors.messages',
|
||||
'app.contexts.settings.load',
|
||||
],
|
||||
},
|
||||
},
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue