Skip to content
Snippets Groups Projects
Commit 523c91c0 authored by Tim Fechner's avatar Tim Fechner Committed by Tim Fechner
Browse files

Modify gulpfile, rename so_extras

and introduce jdenticon :)
parent aa0ae876
No related branches found
No related tags found
No related merge requests found
Showing with 48 additions and 18 deletions
......@@ -14,11 +14,11 @@ gulp.task('build:custom-javascript', buildCustomJavascript);
gulp.task('cleanup', cleanup);
gulp.task('default', [
'compile:less',
'build:contrib-javascript',
'build:custom-javascript',
'collect:images',
'collect:fonts',
'build:contrib-javascript',
'build:custom-javascript'
'compile:less'
]);
gulp.task('watch', ['default'], function() {
......@@ -30,10 +30,10 @@ gulp.task('watch', ['default'], function() {
// Actually the tasks
function compileLess() {
return gulp.src(src + 'less/main.less')
return gulp.src(src + 'less/_init.less')
.pipe(plugins.less())
.pipe(plugins.cssmin())
.pipe(plugins.rename({suffix: '.min'}))
.pipe(plugins.rename('main.min.css'))
.pipe(gulp.dest(dst + 'css'));
};
......@@ -50,7 +50,9 @@ function buildContribJavascript() {
'jquery/dist/jquery.js',
'bootstrap/dist/js/bootstrap.js',
'tablesorter/dist/js/jquery.tablesorter.combined.js',
'filtertable/jquery.filtertable.js'
'filtertable/jquery.filtertable.js',
'jdenticon/dist/jdenticon.js',
'vis/dist/vis.js'
], {cwd: 'node_modules'})
.pipe(plugins.uglify())
.pipe(plugins.concat('main.min.js'))
......
......@@ -18,9 +18,11 @@
"gulp-load-plugins": "^1.2.4",
"gulp-rename": "^1.2.2",
"gulp-uglify": "^1.5.3",
"jdenticon": "^1.3.2",
"jquery": "^2.2.4",
"napa": "^2.3.0",
"tablesorter": "^2.26.2"
"tablesorter": "^2.26.2",
"vis": "^4.16.1"
},
"scripts": {
"install": "napa sunnywalker/jQuery.FilterTable:filtertable",
......
salt_observer/assets/img/blank_user.gif

1.56 KiB

......@@ -2,6 +2,7 @@
@import (once) "../../../node_modules/bootstrap/less/bootstrap.less";
@import (inline) "../../../node_modules/tablesorter/dist/css/theme.bootstrap.min.css";
@import (inline) "../../../node_modules/vis/dist/vis.css";
/* Now import own styles */
@import "base.less";
......
......@@ -34,8 +34,7 @@
margin: -20px -20px 20px -20px;
padding: 15px;
img {
border-radius: 50%;
canvas {
float: left;
width: 20%;
}
......
Source diff could not be displayed: it is too large. Options to address this: view the blob.
This diff is collapsed.
{% extends '_layout/base.html' %}
{% load staticfiles %}
{% load utils %}
{% block body %}
......@@ -13,7 +14,7 @@
{% block sidebar %}
<div class="profile-bar">
<img src="{% static 'img/blank_user.gif' %}"/>
<canvas width="150" height="150" data-jdenticon-hash="{{ request.user.username|md5 }}"></canvas>
<div class="info">
<span class="name">{{ request.user.username }}</span>
<span class="logout"><a href="{% url 'logout' %}">Log out <i class="fa fa-sign-out"></i></a></span>
......
{% extends '_layout/navbar.html' %}
{% load so_extras %}
{% load utils %}
{% block nav-domains %}class="active"{% endblock %}
{% block title-extra %}{{ domain.fqdn }}{% endblock %}
......
{% extends '_layout/navbar.html' %}
{% load so_extras %}
{% load utils %}
{% block nav-minions %}class="active"{% endblock %}
{% block title-extra %}{{ minion.fqdn }}{% endblock %}
......
{% extends '_layout/navbar.html' %}
{% load staticfiles %}
{% load so_extras %}
{% load utils %}
{% block nav-minions %}class="active"{% endblock %}
{% block title-extra %}Minions{% endblock %}
......
{% extends '_layout/navbar.html' %}
{% load so_extras %}
{% load utils %}
{% block nav-networks %}class="active"{% endblock %}
{% block title-extra %}{{ network.ipv4 }}{% endblock %}
......
......@@ -5,8 +5,6 @@
{% block title-extra %}Networks{% endblock %}
{% block post-script %}
<script type="text/javascript" src="{% static 'js/tablesorter.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/filtertable.min.js' %}"></script>
<script>
$(function() {
$.tablesorter.themes.bootstrap = {
......
from django import template
from django.utils.safestring import mark_safe
import hashlib
from markdown import Markdown
register = template.Library()
......@@ -13,3 +14,8 @@ def get(value, arg):
@register.filter
def markdownify(value):
return mark_safe(Markdown().convert(value))
@register.filter
def md5(value):
return hashlib.md5(value.encode('utf-8')).hexdigest()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment