This commit is contained in:
nikolark committed 2014-11-10 23:01:00 +01:00
1 parent 99874b1323
commit 46cacbfa59
10 files changed
+29 -128

No files matched your search

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

+8
View File
@@ -15,6 +15,14 @@ $(document).ready(function() {
});
$(".orgunit-list").append(ou_html);
/* Add listeners */
$(".orgunit-list a").on('click', function(e) {
e.preventDefault();
$(".orgunit-list li").removeClass('active');
$(this).parent().toggleClass('active');
// TODO: you are here
});
});
$.getJSON(api_urls.fwd_list, function(data) {
+2 -2
View File
@@ -32,14 +32,14 @@ html {
}
body {
/* Margin bottom by footer height */
margin-bottom: 60px;
margin-bottom: 100px;
}
.footer {
position: absolute;
bottom: 0;
width: 100%;
/* Set the fixed height of the footer here */
height: 60px;
height: 100px;
background-color: #f5f5f5;
padding-top: 20px;
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

+8
View File
@@ -15,6 +15,14 @@ $(document).ready(function() {
});
$(".orgunit-list").append(ou_html);
/* Add listeners */
$(".orgunit-list a").on('click', function(e) {
e.preventDefault();
$(".orgunit-list li").removeClass('active');
$(this).parent().toggleClass('active');
// TODO: you are here
});
});
$.getJSON(api_urls.fwd_list, function(data) {
+2 -2
View File
@@ -6550,7 +6550,7 @@ html {
body {
/* Margin bottom by footer height */
margin-bottom: 60px;
margin-bottom: 100px;
}
.footer {
@@ -6558,7 +6558,7 @@ body {
bottom: 0;
width: 100%;
/* Set the fixed height of the footer here */
height: 60px;
height: 100px;
background-color: #f5f5f5;
padding-top: 20px;
}
-115
View File
@@ -1,115 +0,0 @@
(function() {(window.nunjucksPrecompiled = window.nunjucksPrecompiled || {})["list.html"] = (function() {function root(env, context, frame, runtime, cb) {
var lineno = null;
var colno = null;
var output = "";
try {
frame = frame.push();
var t_3 = runtime.contextOrFrameLookup(context, frame, "lists");
if(t_3) {var t_1;
if(runtime.isArray(t_3)) {
var t_2 = t_3.length;
for(t_1=0; t_1 < t_3.length; t_1++) {
var t_4 = t_3[t_1][0]
frame.set("list", t_3[t_1][0]);
var t_5 = t_3[t_1][1]
frame.set("members", t_3[t_1][1]);
frame.set("loop.index", t_1 + 1);
frame.set("loop.index0", t_1);
frame.set("loop.revindex", t_2 - t_1);
frame.set("loop.revindex0", t_2 - t_1 - 1);
frame.set("loop.first", t_1 === 0);
frame.set("loop.last", t_1 === t_2 - 1);
frame.set("loop.length", t_2);
output += "\n<div class=\"fwdlist\">\n\t<div class=\"panel panel-default\">\n\t <div class=\"panel-heading\">";
output += runtime.suppressValue(t_4, env.autoesc);
output += " <span class=\"badge\">";
output += runtime.suppressValue(env.getFilter("length").call(context, t_5), env.autoesc);
output += "</span></div>\n\t\t<table class=\"table table-striped table-condensed\">\n\t\t\t<thead>\n\t\t <tr>\n\t\t\t <th>Medlem</th>\n\t\t\t <th class=\"text-center\">Slett</th>\n\t\t </tr>\n\t </thead>\n\t <tbody>\n\t\t\t";
frame = frame.push();
var t_8 = t_5;
if(t_8) {var t_7 = t_8.length;
for(var t_6=0; t_6 < t_8.length; t_6++) {
var t_9 = t_8[t_6];
frame.set("member", t_9);
frame.set("loop.index", t_6 + 1);
frame.set("loop.index0", t_6);
frame.set("loop.revindex", t_7 - t_6);
frame.set("loop.revindex0", t_7 - t_6 - 1);
frame.set("loop.first", t_6 === 0);
frame.set("loop.last", t_6 === t_7 - 1);
frame.set("loop.length", t_7);
output += "\n\t\t\t\t<tr><td>";
output += runtime.suppressValue(runtime.memberLookup((t_9),"forward", env.autoesc), env.autoesc);
output += "</td><td class=\"text-center\"><input type=\"checkbox\" name='fwd-delete' value=\"";
output += runtime.suppressValue(runtime.memberLookup((t_9),"uri_dest", env.autoesc), env.autoesc);
output += "=";
output += runtime.suppressValue(runtime.memberLookup((t_9),"uri_forward", env.autoesc), env.autoesc);
output += "\"></td></tr>\n\t\t\t";
;
}
}
frame = frame.pop();
output += "\n\t\t\t\t<tr><td colspan=\"2\">\n\t\t\t\t<div class=\"input-group\"><input type=\"email\" name=\"\" class=\"form-control\"><span class=\"input-group-btn\"><button class=\"btn btn-default\" type=\"button\">Legg til</button></span></div>\n\t\t\t\t</td></tr>\n\t\t\t</tbody>\n\t\t</table>\n\t</div>\n</div>\n";
;
}
} else {
t_1 = -1;
var t_2 = runtime.keys(t_3).length;
for(var t_10 in t_3) {
t_1++;
var t_11 = t_3[t_10];
frame.set("list", t_10);
frame.set("members", t_11);
frame.set("loop.index", t_1 + 1);
frame.set("loop.index0", t_1);
frame.set("loop.revindex", t_2 - t_1);
frame.set("loop.revindex0", t_2 - t_1 - 1);
frame.set("loop.first", t_1 === 0);
frame.set("loop.last", t_1 === t_2 - 1);
frame.set("loop.length", t_2);
output += "\n<div class=\"fwdlist\">\n\t<div class=\"panel panel-default\">\n\t <div class=\"panel-heading\">";
output += runtime.suppressValue(t_10, env.autoesc);
output += " <span class=\"badge\">";
output += runtime.suppressValue(env.getFilter("length").call(context, t_11), env.autoesc);
output += "</span></div>\n\t\t<table class=\"table table-striped table-condensed\">\n\t\t\t<thead>\n\t\t <tr>\n\t\t\t <th>Medlem</th>\n\t\t\t <th class=\"text-center\">Slett</th>\n\t\t </tr>\n\t </thead>\n\t <tbody>\n\t\t\t";
frame = frame.push();
var t_14 = t_11;
if(t_14) {var t_13 = t_14.length;
for(var t_12=0; t_12 < t_14.length; t_12++) {
var t_15 = t_14[t_12];
frame.set("member", t_15);
frame.set("loop.index", t_12 + 1);
frame.set("loop.index0", t_12);
frame.set("loop.revindex", t_13 - t_12);
frame.set("loop.revindex0", t_13 - t_12 - 1);
frame.set("loop.first", t_12 === 0);
frame.set("loop.last", t_12 === t_13 - 1);
frame.set("loop.length", t_13);
output += "\n\t\t\t\t<tr><td>";
output += runtime.suppressValue(runtime.memberLookup((t_15),"forward", env.autoesc), env.autoesc);
output += "</td><td class=\"text-center\"><input type=\"checkbox\" name='fwd-delete' value=\"";
output += runtime.suppressValue(runtime.memberLookup((t_15),"uri_dest", env.autoesc), env.autoesc);
output += "=";
output += runtime.suppressValue(runtime.memberLookup((t_15),"uri_forward", env.autoesc), env.autoesc);
output += "\"></td></tr>\n\t\t\t";
;
}
}
frame = frame.pop();
output += "\n\t\t\t\t<tr><td colspan=\"2\">\n\t\t\t\t<div class=\"input-group\"><input type=\"email\" name=\"\" class=\"form-control\"><span class=\"input-group-btn\"><button class=\"btn btn-default\" type=\"button\">Legg til</button></span></div>\n\t\t\t\t</td></tr>\n\t\t\t</tbody>\n\t\t</table>\n\t</div>\n</div>\n";
;
}
}
}
frame = frame.pop();
cb(null, output);
;
} catch (e) {
cb(runtime.handleError(e, lineno, colno));
}
}
return {
root: root
};
})();
})();
+7 -1
View File
@@ -3,7 +3,7 @@
<head lang="en">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block "title" %}Email admin{% endblock %}</title>
<title>{% block "title" %}lister.neuf.no - Epostlister på Det Norske Studentersamfund{% endblock %}</title>
<link rel="stylesheet" href="{% static 'dist/styles/main.css' %}" type="text/css">
<script type="text/javascript" src="{% static 'bower_components/jquery/dist/jquery.js' %}"></script>
<script type="text/javascript" src="{% static 'bower_components/underscore/underscore.js' %}"></script>
@@ -14,6 +14,12 @@
{% block "navigation" %}{% endblock %}
{% block "body" %}{% endblock %}
<footer class="footer">
<div class="container">
<a href="https://studentersamfundet.no"><img src="{% static 'dist/images/DNSlogo.png' %}" width="70" height="70"></a><!--<div class="credits">Laget med <span class="love" title="kærlighed">♥</span> av <a href="http://kak.studentersamfundet.no/" title="Kommunikasjonsavdelingen">KAK</a></div>-->
</div>
</footer>
<script type="text/javascript" src="{% static 'bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/alert.js' %}"></script>
<script type="text/javascript" src="{% static 'bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/dropdown.js' %}"></script>
<script type="text/javascript" src="{% static 'dist/scripts/templates.js' %}"></script>
+1 -7
View File
@@ -4,6 +4,7 @@
<div class="container">
<div class="row">
{% if not user.is_authenticated %}
<div class="col-md-12"><p>Her kan du administrere epostlistene på <a href="https://studentersamfundet.no">Det Norske Studentersamfund</a>.<br>Logg inn med din DNS-konto under.</p></div>
{% include "login_form.html" %}
{% else %}
<div class="row">
@@ -19,11 +20,4 @@
{% endif %}
</div>
</div>
<footer class="footer">
<div class="container">
<a href="https://edb.neuf.no">EDB-gjengen</a>
</div>
</footer>
</div>
{% endblock %}
+1 -1
View File
@@ -3,7 +3,7 @@
<form method="post">
{{ form|bootstrap }}
{% csrf_token %}
<a href="https://brukerinfo.neuf.no/">Glemt brukernavn eller passord?</a><br>
<a href="https://brukerinfo.neuf.no/accounts/password/reset">Glemt brukernavn eller passord?</a><br>
<input type="submit" value="Logg inn" class="btn btn-primary btn-lg">
</form>
</div>