diff --git a/mailadmin/static/app/images/DNSlogo.png b/mailadmin/static/app/images/DNSlogo.png new file mode 100644 index 0000000..6898a3a Binary files /dev/null and b/mailadmin/static/app/images/DNSlogo.png differ diff --git a/mailadmin/static/app/scripts/main.js b/mailadmin/static/app/scripts/main.js index a7f4355..e27795d 100644 --- a/mailadmin/static/app/scripts/main.js +++ b/mailadmin/static/app/scripts/main.js @@ -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) { diff --git a/mailadmin/static/app/styles/main.scss b/mailadmin/static/app/styles/main.scss index 704cefe..18a6a99 100644 --- a/mailadmin/static/app/styles/main.scss +++ b/mailadmin/static/app/styles/main.scss @@ -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; } \ No newline at end of file diff --git a/mailadmin/static/dist/images/DNSlogo.png b/mailadmin/static/dist/images/DNSlogo.png new file mode 100644 index 0000000..6898a3a Binary files /dev/null and b/mailadmin/static/dist/images/DNSlogo.png differ diff --git a/mailadmin/static/dist/scripts/main.js b/mailadmin/static/dist/scripts/main.js index a7f4355..e27795d 100644 --- a/mailadmin/static/dist/scripts/main.js +++ b/mailadmin/static/dist/scripts/main.js @@ -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) { diff --git a/mailadmin/static/dist/styles/main.css b/mailadmin/static/dist/styles/main.css index 6be519a..df3a4a9 100644 --- a/mailadmin/static/dist/styles/main.css +++ b/mailadmin/static/dist/styles/main.css @@ -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; } diff --git a/mailadmin/static/dist/templates/list.js b/mailadmin/static/dist/templates/list.js deleted file mode 100644 index bfd5073..0000000 --- a/mailadmin/static/dist/templates/list.js +++ /dev/null @@ -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
\n\t
\n\t
"; -output += runtime.suppressValue(t_4, env.autoesc); -output += " "; -output += runtime.suppressValue(env.getFilter("length").call(context, t_5), env.autoesc); -output += "
\n\t\t\n\t\t\t\n\t\t \n\t\t\t \n\t\t\t \n\t\t \n\t \n\t \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\n\t\t\t"; -; -} -} -frame = frame.pop(); -output += "\n\t\t\t\t\n\t\t\t\n\t\t
MedlemSlett
"; -output += runtime.suppressValue(runtime.memberLookup((t_9),"forward", env.autoesc), env.autoesc); -output += "
\n\t\t\t\t
\n\t\t\t\t
\n\t
\n
\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
\n\t
\n\t
"; -output += runtime.suppressValue(t_10, env.autoesc); -output += " "; -output += runtime.suppressValue(env.getFilter("length").call(context, t_11), env.autoesc); -output += "
\n\t\t\n\t\t\t\n\t\t \n\t\t\t \n\t\t\t \n\t\t \n\t \n\t \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\n\t\t\t"; -; -} -} -frame = frame.pop(); -output += "\n\t\t\t\t\n\t\t\t\n\t\t
MedlemSlett
"; -output += runtime.suppressValue(runtime.memberLookup((t_15),"forward", env.autoesc), env.autoesc); -output += "
\n\t\t\t\t
\n\t\t\t\t
\n\t
\n
\n"; -; -} -} -} -frame = frame.pop(); -cb(null, output); -; -} catch (e) { - cb(runtime.handleError(e, lineno, colno)); -} -} -return { -root: root -}; -})(); -})(); diff --git a/mailadmin/templates/base.html b/mailadmin/templates/base.html index b4910b5..25f703a 100644 --- a/mailadmin/templates/base.html +++ b/mailadmin/templates/base.html @@ -3,7 +3,7 @@ - {% block "title" %}Email admin{% endblock %} + {% block "title" %}lister.neuf.no - Epostlister på Det Norske Studentersamfund{% endblock %} @@ -14,6 +14,12 @@ {% block "navigation" %}{% endblock %} {% block "body" %}{% endblock %} + diff --git a/mailadmin/templates/home.html b/mailadmin/templates/home.html index ef640a8..6fefa42 100644 --- a/mailadmin/templates/home.html +++ b/mailadmin/templates/home.html @@ -4,6 +4,7 @@
{% if not user.is_authenticated %} +

Her kan du administrere epostlistene på Det Norske Studentersamfund.
Logg inn med din DNS-konto under.

{% include "login_form.html" %} {% else %}
@@ -19,11 +20,4 @@ {% endif %}
- - -
{% endblock %} \ No newline at end of file diff --git a/mailadmin/templates/login_form.html b/mailadmin/templates/login_form.html index b187a59..e4031b9 100644 --- a/mailadmin/templates/login_form.html +++ b/mailadmin/templates/login_form.html @@ -3,7 +3,7 @@
{{ form|bootstrap }} {% csrf_token %} - Glemt brukernavn eller passord?
+ Glemt brukernavn eller passord?
\ No newline at end of file