alamin
/
djing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

changes for traf stat

devel
Dmitry Novikov 7 years ago
parent
5402b0fecc
commit
5bf5d606cc
7 changed files with 22 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      static/bad_ie.html
  2. 5
      static/css/bootstrap-datetimepicker.min.css
  3. 1
      static/css/chartist.min.css
  4. 2
      static/js/bootstrap-datetimepicker.min.js
  5. 10
      static/js/chartist.min.js
  6. 55
      static/js/cidr.js
  7. 15
      templates/all_base.html

11
static/bad_ie.html
View File

@ -1,11 +1,18 @@
<!DOCTYPE html>
<html>
<html lang="ru">
<head>
<title>Старый браузер</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
<h1>У вас старый ослик, обновитесь хотяб до IE10</h1>
<h1>Ваш InternetExplorer устарел, обновите ваш браузер на более современный</h1>
<p>Можете воспользоваться ссылками ниже:</p>
<ul>
<li><a href="https://www.google.ru/chrome/">Google Chrome</a></li>
<li><a href="https://www.opera.com/ru/download">Opera</a></li>
<li><a href="https://browser.yandex.ru/">Yandex Browser</a></li>
<li><a href="https://www.mozilla.org/ru/firefox/new/">Mozilla Firefox</a></li>
</ul>
</body>
</html>

5
static/css/bootstrap-datetimepicker.min.css
File diff suppressed because it is too large
View File

1
static/css/chartist.min.css
File diff suppressed because it is too large
View File

2
static/js/bootstrap-datetimepicker.min.js
File diff suppressed because it is too large
View File

10
static/js/chartist.min.js
File diff suppressed because it is too large
View File

55
static/js/cidr.js
View File

@ -1,55 +0,0 @@
(function ($){
$.fn.cidr_validator = function(opts){
var IP4_REG = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/s;
var IP6_REG = /^((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?$/s;
var settings = $.extend( {
res_label: this.find('.panel-title>span')
}, opts);
var net_inp = this.find('#id_network');
var mask_inp = this.find('#id_mask');
var validate_ip_by_key = function(){
var v = this.value;
if(v === undefined)
return;
var o = $(this).closest('.form-group-sm,.form-group');
o.removeClass('has-error has-success');
if(v.match(IP4_REG) !== null){
mask_inp.val('24');
o.addClass('has-success');
}else
if(v.match(IP6_REG) !== null){
mask_inp.val('64');
o.addClass('has-success');
}else
o.addClass('has-error');
};
var validate_ip_by_focus = function(){
var v = this.value;
if(v.includes('/')){
var chunks = v.split('/');
if(chunks[1] !== ""){
net_inp.val(chunks[0]);
mask_inp.val(chunks[1]);
settings.res_label.text(v);
}
}else {
settings.res_label.text(v + '/' + mask_inp.val());
}
$(this).trigger('keyup');
};
net_inp.on('keyup focusin', validate_ip_by_key);
net_inp.on('focusout', validate_ip_by_focus);
var validate_mask = function(){
};
mask_inp.on('change', validate_mask);
};
})(jQuery);
$(document).ready(function () {
$('div.cidr-contain').cidr_validator();
});

15
templates/all_base.html
View File

@ -46,21 +46,6 @@
<li{% if map_url == request.path %} class="active"{% endif %}><a href="{{ map_url }}" target="_blank">{% trans 'Map page' %}</a></li>
{% endif %}
{% comment %} <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans 'Language' %} <b class="caret"></b></a>
<ul class="dropdown-menu">
{% url 'set_language' as set_language_url %}
{% for lang in LANGUAGES %}
<li><a href="#" id="langfrm_{{ lang.0 }}" onclick="document.setLang{{ lang.0 }}.submit();">{{ lang.1 }}</a></li>
<form name="setLang{{ lang.0}}" action="{{ set_language_url }}" method="POST" class="hidden">{% csrf_token %}
<input type="hidden" name="language" value="{{ lang.0 }}">
</form>
{% endfor %}
</ul>
</li> {% endcomment %}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans 'Other' %} <b class="caret"></b></a>
<ul class="dropdown-menu">

Write Preview
Loading…
Cancel
Save