flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity
nsupdate.info/nsupdate/templates/base.html

170 lines
9.4 KiB
HTML
Raw Normal View History

base template
2013-09-28 11:39:57 +02:00
{% load static from staticfiles %}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="nsupdate.info team">
use WWW_HOST in the titles
2013-10-07 20:06:41 +02:00
<title>{% block title %}{{ WWW_HOST }}{% endblock %}</title>
base template
2013-09-28 11:39:57 +02:00
use bootstrap 3.0.1
2013-11-06 03:42:07 +01:00
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.1/css/bootstrap.min.css" rel="stylesheet">
they have fontawesome 4.0.3, they just didn't tell...
2013-11-06 04:45:36 +01:00
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" rel="stylesheet">
base template
2013-09-28 11:39:57 +02:00
<link href="{% static 'css/nsupdate.css' %}" rel="stylesheet">
added fancy random color favicon
2013-09-28 15:34:24 +02:00
<link rel="icon" type="image/png" href="{% static 'favicon.png' %}" />
added javascript example for /myip and added a view OverviewView. JS fails for dev server, because of the Access-Control-Allow-Origin
2013-09-28 13:56:54 +02:00
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
add customization includes / templates for base template (add stuff to head and body)
2013-11-03 23:37:46 +01:00
{% include "includes/base_head.html" %}
add customization includes / templates for base template (add stuff to head and body)
2013-11-04 00:03:26 +01:00
{% block html_head %}{% endblock %}
base template
2013-09-28 11:39:57 +02:00
</head>
<body>
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
use WWW_HOST in the titles
2013-10-07 20:06:41 +02:00
<a class="navbar-brand" href="{% url 'home' %}"><span style="color: #00ba00">&#x2B25;</span> {{ WWW_HOST }}</a>
base template
2013-09-28 11:39:57 +02:00
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
about page
2013-09-29 17:06:39 +02:00
<li{% if nav_home %} class="active"{% endif %}>
add some icons to navbar / user menu
2013-11-06 04:33:17 +01:00
<a href="{% url 'home' %}"><i class="fa fa-home fa-fw"></i> Home</a>
about page
2013-09-29 17:06:39 +02:00
</li>
hide overview in nav if not logged in (thanks to asmaps)
2013-10-18 15:55:37 -07:00
{% if request.user.is_authenticated %}
about page
2013-09-29 17:06:39 +02:00
<li{% if nav_overview %} class="active"{% endif %}>
navibar: more icons
2013-11-06 13:14:03 +01:00
<a href="{% url 'overview' %}"><i class="fa fa-list fa-fw"></i> Hosts</a>
cleanup active nav tabs, have Hosts and Domains in navbar
2013-11-02 12:12:13 +01:00
</li>
<li{% if nav_domain_overview %} class="active"{% endif %}>
navibar: more icons
2013-11-06 13:14:03 +01:00
<a href="{% url 'domain_overview' %}"><i class="fa fa-list fa-fw"></i> Domains</a>
about page
2013-09-29 17:06:39 +02:00
</li>
implemented status view status: counts for domains (incl. domains flagged unavailable), hosts, users (incl. inactive users) statistics: usage for 2d / 2w / 2m / 2y
2013-11-03 04:29:14 +01:00
<li{% if nav_status %} class="active"{% endif %}>
navibar: more icons
2013-11-06 13:14:03 +01:00
<a href="{% url 'status' %}"><i class="fa fa-list fa-fw"></i> Status</a>
implemented status view status: counts for domains (incl. domains flagged unavailable), hosts, users (incl. inactive users) statistics: usage for 2d / 2w / 2m / 2y
2013-11-03 04:29:14 +01:00
</li>
hide overview in nav if not logged in (thanks to asmaps)
2013-10-18 15:55:37 -07:00
{% endif %}
about page
2013-09-29 17:06:39 +02:00
<li{% if nav_about %} class="active"{% endif %}>
add some icons to navbar / user menu
2013-11-06 04:33:17 +01:00
<a href="{% url 'about' %}"><i class="fa fa-comment fa-fw"></i> About</a>
about page
2013-09-29 17:06:39 +02:00
</li>
remove help view there was only a link to the rtd documentation (now directly linked from a "Documentation" navbar entry) and some duplicate router configuration that was also shown (even with the correct values) when adding a host. the help page html was not valid due to the values inserted into the router configuration help. help/documentation policy: add static help to the docs, add dynamic help directly at the places (in the views) where needed
2013-11-02 23:23:01 +01:00
<li>
<a href="http://nsupdateinfo.readthedocs.org/"
add some icons to navbar / user menu
2013-11-06 04:33:17 +01:00
class="navbar-link" title="Open docs in new window" target="_blank"><i class="fa fa-eye fa-fw"></i> Documentation</a>
Merge branch 'master' of github.com:asmaps/nsupdate.info Conflicts: nsupdate/main/templates/main/about.html nsupdate/main/urls.py nsupdate/nsupdate/templates/base.html
2013-09-29 17:12:32 +02:00
</li>
profile and password change.
2013-09-28 16:46:33 +02:00
</ul>
<ul class="nav navbar-nav pull-right">
{% if not request.user.is_authenticated %}
add some icons to navbar / user menu
2013-11-06 04:33:17 +01:00
<li{% if nav_register %} class="active"{% endif %}><a href="{% url 'registration_register' %}"><i class="fa fa-asterisk fa-fw"></i> Register</a></li>
<li{% if nav_login %} class="active"{% endif %}><a href="{% url 'auth_login' %}"><i class="fa fa-sign-in fa-fw"></i> Login</a></li>
profile and password change.
2013-09-28 16:46:33 +02:00
{% else %}
<li class="dropdown">
add some icons to navbar / user menu
2013-11-06 04:33:17 +01:00
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user fa-fw"></i> {{ request.user.username }} <b class="caret"></b></a>
profile and password change.
2013-09-28 16:46:33 +02:00
<ul class="dropdown-menu">
add some icons to navbar / user menu
2013-11-06 04:33:17 +01:00
<li><a href="{% url 'account_profile' %}"><i class="fa fa-cogs fa-fw"></i> Profile</a></li>
<li><a href="{% url 'password_change' %}"><i class="fa fa-key fa-fw"></i> Change password</a></li>
made home template and added admin link to nav
2013-09-29 14:08:22 +02:00
{% if request.user.is_staff %}
add some icons to navbar / user menu
2013-11-06 04:33:17 +01:00
<li><a href="/admin/"><i class="fa fa-wrench fa-fw"></i> Admin</a></li>
made home template and added admin link to nav
2013-09-29 14:08:22 +02:00
{% endif %}
add some icons to navbar / user menu
2013-11-06 04:33:17 +01:00
<li><a href="{% url 'auth_logout' %}?next={% url 'auth_login' %}"><i class="fa fa-sign-out fa-fw"></i> Logout</a></li>
profile and password change.
2013-09-28 16:46:33 +02:00
</ul>
</li>
{% endif %}
base template
2013-09-28 11:39:57 +02:00
</ul>
</div>
</div>
</div>
updated the home site
2013-09-30 01:12:05 +02:00
{% block header %}{% endblock %}
added footer
2013-09-28 23:13:36 +02:00
<div class="container content wrap">
fixed different width in templates
2013-09-29 00:28:31 +02:00
<div class="row">
<div class="col-lg-12">
<div id="message_box">
add a danger message if visitor is not using SSL
2013-11-02 01:09:24 +01:00
{% if not request.is_secure %}
<div class="alert alert-danger">
<button type="button" class="close" data-dismiss="alert">&times;</button>
new setting WE_HAVE_SSL to indicate whether the site also has https (not just http) we will offer using the https site if we have ssl, otherwise we will just warn about insecure http usage.
2013-11-03 05:24:54 +01:00
Your (http) connection is unencrypted and thus insecure.
{% if WE_HAVE_SSL %}
Please use our <a href="https://{{ WWW_HOST }}/">secure https site</a>.
{% endif %}
warn if cookies are limited to the secure site, but user is using the insecure site
2013-11-03 10:55:49 +01:00
{% if COOKIE_SECURE %}
At least some of the required cookies will only work on the secure https site,
expect malfunctioning on the http site.
{% endif %}
add a danger message if visitor is not using SSL
2013-11-02 01:09:24 +01:00
</div>
{% endif %}
fixed different width in templates
2013-09-29 00:28:31 +02:00
{% if messages %}
{% for message in messages %}
fix the message tags (== css classes) so they are meaningful to bootstrap3 note: tags can have multiple classes inside, so better use full class names
2013-11-06 01:25:28 +01:00
<div class="alert {{ message.tags }}">
fixed different width in templates
2013-09-29 00:28:31 +02:00
<button type="button" class="close" data-dismiss="alert">&times;</button>
{{ message }}
</div>
{% endfor %}
{% endif %}
</div>
</div>
messages
2013-09-28 23:03:34 +02:00
</div>
base template
2013-09-28 11:39:57 +02:00
{% block content %}
made home template and added admin link to nav
2013-09-29 14:08:22 +02:00
Here goes the content.
base template
2013-09-28 11:39:57 +02:00
{% endblock %}
</div>
added footer
2013-09-28 23:13:36 +02:00
<div class="footer">
<div class="container">
<p class="text-muted credit">
improved home view and footer deduplicate, group, better link texts the whole project lives at github
2013-10-03 03:09:09 +02:00
<a href="{% url 'legal' %}">Legal notice</a>
add CSS / HTML validation links (via referrer, so doesn't work on non-public URLs)
2013-10-03 22:43:44 +02:00
&nbsp;|&nbsp;
fix typo in w3c validator url
2013-10-17 23:11:15 -07:00
<a href="http://validator.w3.org/check/referer">Valid HTML</a>
add CSS / HTML validation links (via referrer, so doesn't work on non-public URLs)
2013-10-03 22:43:44 +02:00
&nbsp;|&nbsp;
<a href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS</a>
added footer
2013-09-28 23:13:36 +02:00
</p>
</div>
</div>
use bootstrap 3.0.1
2013-11-06 03:42:07 +01:00
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.1/js/bootstrap.min.js"></script>
make ip addr detection valid html5 the img tags we had were not valid due to (at first) missing src attribute (that was dynamically added by js later). new method now inserts the complete img tag, so no invalid tag is present at first and what is inserted later is a valid tag.
2013-11-03 00:46:46 +01:00
<div id="ip_detection" style="display: none">
document why ip detection is implemented like this
2013-11-07 03:09:53 +01:00
{% comment %}
Why IP detection it is implemented as it is
-------------------------------------------
a) we use javascript to insert the img tags after the document (DOM) is ready.
if we just have them in the html from the beginning, the browser would be visibly
"loading" until both "images" are loaded or timed out (if e.g. you don't have ip v6).
not nice.
b) we use fake img tags because doing it with jQuery.get() would be cross-domain:
WWW_HOST -> WWW_IPV4_HOST
WWW_HOST -> WWW_IPV6_HOST
c) yes, the setTimeout is rather unpretty and might not work for slow connections
(when loading the images take more than that timeout), making the IPs appear not
on the current view, but when the next view is loaded (or the current one reloaded).
if you have a better idea, this is something to improve.
d) we detect both ipv4 and v6 in the same way. this could be optimized to use the
REMOTE_ADDR we have from the view's http request and then only detect the other
kind of ip using the fake img approach.
OTOH, doing both IPs the same way is nicer as it is more symmetric.
{% endcomment %}
fix / simplify ip detection javascript use .ready() instead of first delay merge script blocks
2013-11-07 02:43:48 +01:00
{% if not request.session.ipv4 or not request.session.ipv6 %}
use AJAX to update view with current IPs, cosmetic changes, deal with v4 and v6 js separately
2013-11-01 06:03:36 +01:00
<script type="text/javascript">
fix / simplify ip detection javascript use .ready() instead of first delay merge script blocks
2013-11-07 02:43:48 +01:00
$(document).ready(function() {
{% if not request.session.ipv4 %}
make ip addr detection valid html5 the img tags we had were not valid due to (at first) missing src attribute (that was dynamically added by js later). new method now inserts the complete img tag, so no invalid tag is present at first and what is inserted later is a valid tag.
2013-11-03 00:46:46 +01:00
$('#ip_detection').add(
'<img src="//{{ WWW_IPV4_HOST }}/detectip/{{ request.session.session_key }}/" >');
fix / simplify ip detection javascript use .ready() instead of first delay merge script blocks
2013-11-07 02:43:48 +01:00
{% endif %}
{% if not request.session.ipv6 %}
make ip addr detection valid html5 the img tags we had were not valid due to (at first) missing src attribute (that was dynamically added by js later). new method now inserts the complete img tag, so no invalid tag is present at first and what is inserted later is a valid tag.
2013-11-03 00:46:46 +01:00
$('#ip_detection').add(
'<img src="//{{ WWW_IPV6_HOST }}/detectip/{{ request.session.session_key }}/" >');
fix / simplify ip detection javascript use .ready() instead of first delay merge script blocks
2013-11-07 02:43:48 +01:00
{% endif %}
only do 1 ajax call to get ipv4 and v6 at the same time
2013-11-03 04:58:28 +01:00
function insert_ips() {
use AJAX to update view with current IPs, cosmetic changes, deal with v4 and v6 js separately
2013-11-01 06:03:36 +01:00
$.getJSON("{% url 'ajax_get_ips' %}")
.done(function(data) {
only do 1 ajax call to get ipv4 and v6 at the same time
2013-11-03 04:58:28 +01:00
$('#ipv4').text(data['ipv4']);
use AJAX to update view with current IPs, cosmetic changes, deal with v4 and v6 js separately
2013-11-01 06:03:36 +01:00
$('#ipv6').text(data['ipv6']);
});
fix invalid html, remove unneeded semicolons from js
2013-11-03 05:57:13 +01:00
}
ajax get ips: increase delay for first call, add a second call later to update the view (again) sometimes those v6 tunnels are a bit slow...
2013-11-10 16:41:29 +01:00
setTimeout(insert_ips, 1500);
setTimeout(insert_ips, 3000);
fix / simplify ip detection javascript use .ready() instead of first delay merge script blocks
2013-11-07 02:43:48 +01:00
});
remove stale IPs from session, so we don't show outdated information could happen if there once was a IPv6 connection, but now is not any more. it now kills infos older than 3 minutes from the session. it also shows the age of the infos now on the hosts overview view (but not on home view due to cosmetic reasons). optimization: only request the fake images for ipv4/v6 detection if we don't have a fresh IP already. added example settings for using detectip on (ip6-)localhost
2013-11-01 04:03:34 +01:00
</script>
{% endif %}
prevent "endless loading"
2013-09-29 21:20:07 +02:00
</div>
add customization includes / templates for base template (add stuff to head and body)
2013-11-03 23:37:46 +01:00
{% include "includes/base_body.html" %}
base template
2013-09-28 11:39:57 +02:00
</body>
</html>
Reference in New Issue Copy Permalink