diff --git a/wp-content/themes/aktiv2014/app/scripts/main.js b/wp-content/themes/aktiv2014/app/scripts/main.js
index cc44fc6..91ad373 100644
--- a/wp-content/themes/aktiv2014/app/scripts/main.js
+++ b/wp-content/themes/aktiv2014/app/scripts/main.js
@@ -200,7 +200,7 @@ function mailing_list_show(source) {
'<%= destinations.length %> stk
<% _.each(destinations, function(d) { %>' +
' <%= d %> ' +
'<% }); %> ';
- var html = _.template(list, _list_data);
+ var html = _.template(list)(_list_data);
$('.list-members').html(html);
$('.lists-list-wrap .meta').html('Vis medlemmer på ' + _list_data.name + ' ');
@@ -320,7 +320,7 @@ jQuery(document).ready(function() {
return;
}
data.lists = _.filter(data.lists, function(l) { return l.num > 1; }); //{ lists: _.groupBy(data, function(x){ return x.source; }) };
- console.log(data);
+
var list_template = '<% _.each(lists, function(l) { %>' +
'<%= l.name %> ' +
'<%= l.num %> medlemmer '+
@@ -328,7 +328,7 @@ jQuery(document).ready(function() {
'edit<% } else { %>email<% } %>"> Endre'+
' ' +
'<% }); %>';
- var html = _.template(list_template, data);
+ var html = _.template(list_template)(data);
$('.lists-list').html(html);
/* Index list and make searchable and sortable */
@@ -389,7 +389,7 @@ jQuery(document).ready(function() {
$('.account-details .email-list').html(html);
/*if( params.inherited ) {
data.results = data.inherited_results; // reuse template
- html = _.template(list, data);
+ html = _.template(list)(data);
$('.account-details .email-list-inherited').html(html);
}*/
}
diff --git a/wp-content/themes/aktiv2014/dist/scripts/main.js b/wp-content/themes/aktiv2014/dist/scripts/main.js
index 4d9508b..116bcd3 100644
--- a/wp-content/themes/aktiv2014/dist/scripts/main.js
+++ b/wp-content/themes/aktiv2014/dist/scripts/main.js
@@ -1 +1 @@
-"use strict";function getParameterByName(e){e=e.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var t=new RegExp("[\\?&]"+e+"=([^]*)"),a=t.exec(location.search);return null===a?"":decodeURIComponent(a[1].replace(/\+/g," "))}function format_posts(e){var t="",a=0;if(0===e.length)return"Idag er det stille på huset :-/";for(a=0;a',t+=''+moment.unix(s.custom_fields._neuf_events_starttime).utc().format("HH.mm")+" : ",t+=''+s.title+" ",t+=' '+s.custom_fields._neuf_events_venue+" ",t+=""}return t}function format_results(e){var t="Navn Brukernavn Epost Telefon Har medlemskap Grupper ";if(e.error)return console.log(e.error),$(".search-result-list").html(""),void $(".search-results .meta").html("");if(0===e.meta.num_results)return $(".search-result-list").html("Uffda, ingen treff."),void $(".search-results .meta").html("");var a='<% _.each(results, function(u) { %><%= u.firstname %> <%= u.lastname %> <%= u.username %> <%= u.email %> <%= u.number %> <% if(u.is_member != 0) { %>Ja<% } else { %>Nei<% } %> <% _.each(u.groups, function(g, i) { %><%= g.name %><% if(u.groups.length !== i +1){ %>, <% } %><% }); %> <% }); %>
',s=t+_.template(a)(e);$(".search-result-list").html(s);var n="Antall treff: <%= meta.num_results %>";$(".search-results .meta").html(_.template(n)(e))}function do_search(){var e=$('.filters [data-search-filter="has_valid_membership"]'),t="",a=$(".groups-select").val();null!==a&&(t=a.join());var s={q:$(".search-field").val(),filter_groups:t};e.hasClass("active")&&(s.has_valid_membership=!0);var n=$.param(s);window.History.pushState(null,null,"?"+n),s._wpnonce=$("meta[name=x-inside-api-nonce]").attr("content"),$.getJSON(user_search_endpoint,s,format_results)}function user_search_load_initial_values(){var e=!1,t=getParameterByName("q");t&&t.length>0&&($(".search-field").val(t),e=!0);var a=getParameterByName("has_valid_membership");a&&"true"===a&&($('.filters [data-search-filter="has_valid_membership"]').addClass("active"),e=!0);var s=getParameterByName("filter_groups"),n=[];if(s&&s.length>0){n=s.indexOf(",")!==-1?s.split(","):[s];var r=!1,i=0;for(i=0;iVis medlemmer på '+a.name+""),$("[data-list-name='"+e+"']").addClass("selected")})}function mailing_lists_load_initial(){var e=getParameterByName("source");e&&e.length>0&&mailing_list_show(e)}var program_endpoint="https://studentersamfundet.no/api/events/get_today/",inside_url="https://inside.studentersamfundet.no",inside_groups_url=inside_url+"/api/groups.php",user_search_endpoint="/inside-api/",email_endpoint="/email-api/",user_profile_url="/profil/",query_params={};jQuery(document).ready(function(){moment.locale("nb");var e=jQuery;e("#menu .menu-toggle").on("click",function(t){t.preventDefault();var a=e("#menu .main-menu, #menu .user-menu-wrap");a.toggleClass("visible")}),e("#menu a.profile-badge").on("click",function(t){t.preventDefault();var a=e("#menu .user-menu");a.toggleClass("visible")}),e("[data-toggle-introduction]").on("click",function(){e(this).parent().fadeOut(600),save_user_meta("introduction_dismissed",!0)}),e(".front-page .introduction").length&&get_user_meta("introduction_dismissed",function(t){t.hasOwnProperty("result")&&"true"!==t.result&&(e(".introduction").show(),e(".introduction").addClass("fadein"))});var t=".program-list";if(e(t).length&&e.getJSON(program_endpoint+"?callback=?",query_params,function(a){if(a&&a.events){var s=format_posts(a.events);e(t).html(s)}}),e(".search-form").length&&(e.getJSON(inside_groups_url,function(t){var a=' <% _.each(results, function(g) { %><%= g.group_name %> <% }); %> ',s=_.template(a)(t);e(".groups-select-wrap").html(s),e(".groups-select").chosen({no_results_text:"Uffda, ingen treff!",allow_single_deselect:!0}).change(function(){do_search()}),user_search_load_initial_values()}),e(".search-field").on("keyup keypress",function(e){10!==e.keyCode&&13!==e.keyCode||e.preventDefault()}),e(".search-field").on("keyup keypress",_.debounce(function(){do_search()},300)),e(".roles a").on("click",function(t){t.preventDefault(),e(this).toggleClass("active"),do_search()})),e(".page-mailinglists").length&&e.getJSON(email_endpoint,{_wpnonce:e("meta[name=x-inside-api-nonce]").attr("content")},function(t){if(t.error)return void e(".lists-list").html(t.error);t.lists=_.filter(t.lists,function(e){return e.num>1}),console.log(t);var a='<% _.each(lists, function(l) { %><%= l.name %> <%= l.num %> medlemmer edit<% } else { %>email<% } %>"> Endre <% }); %>',s=_.template(a,t);e(".lists-list").html(s);var n={valueNames:["list-name","list-num-members"]};new List("mailinglists",n),mailing_lists_load_initial()}),e(".profile").length){var a={q:e("meta[name=x-username]").attr("content"),exact:!0,_wpnonce:e("meta[name=x-inside-api-nonce]").attr("content")};""!==getParameterByName("username")&&(a.q=getParameterByName("username")),e.getJSON(user_search_endpoint,a,function(t){if(t.hasOwnProperty("results")&&1===t.results.length){for(var a=t.results[0],s="",n=0;n"+a.groups[n].name+"";e(".group-list").html(s);var r=e(".is-member");"1"===a.is_member?r.html("Gyldig medlemskap."):r.html('Du har ikke et gyldig medlemskap. Du kan forny medlemskapet ditt via SMS, via SnappOrder eller via nettbutikken i Inside .'),e(".js-inside-link").attr("href","https://inside.studentersamfundet.no/?page=display-user&userid="+a.id)}}),a.destination=e(".profile-details .user-email").text(),e.getJSON(email_endpoint,a,function(t){var a='<% _.each(lists, function(r) { %><%= r.name %> edit<% } else { %>email<% } %>"> <% }); %>',s=_.template(a)(t);e(".account-details .email-list").html(s)})}});
\ No newline at end of file
+"use strict";function getParameterByName(e){e=e.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var t=new RegExp("[\\?&]"+e+"=([^]*)"),a=t.exec(location.search);return null===a?"":decodeURIComponent(a[1].replace(/\+/g," "))}function format_posts(e){var t="",a=0;if(0===e.length)return"Idag er det stille på huset :-/";for(a=0;a',t+=''+moment.unix(s.custom_fields._neuf_events_starttime).utc().format("HH.mm")+" : ",t+=''+s.title+" ",t+=' '+s.custom_fields._neuf_events_venue+" ",t+=""}return t}function format_results(e){var t="Navn Brukernavn Epost Telefon Har medlemskap Grupper ";if(e.error)return console.log(e.error),$(".search-result-list").html(""),void $(".search-results .meta").html("");if(0===e.meta.num_results)return $(".search-result-list").html("Uffda, ingen treff."),void $(".search-results .meta").html("");var a='<% _.each(results, function(u) { %><%= u.firstname %> <%= u.lastname %> <%= u.username %> <%= u.email %> <%= u.number %> <% if(u.is_member != 0) { %>Ja<% } else { %>Nei<% } %> <% _.each(u.groups, function(g, i) { %><%= g.name %><% if(u.groups.length !== i +1){ %>, <% } %><% }); %> <% }); %>
',s=t+_.template(a)(e);$(".search-result-list").html(s);var n="Antall treff: <%= meta.num_results %>";$(".search-results .meta").html(_.template(n)(e))}function do_search(){var e=$('.filters [data-search-filter="has_valid_membership"]'),t="",a=$(".groups-select").val();null!==a&&(t=a.join());var s={q:$(".search-field").val(),filter_groups:t};e.hasClass("active")&&(s.has_valid_membership=!0);var n=$.param(s);window.History.pushState(null,null,"?"+n),s._wpnonce=$("meta[name=x-inside-api-nonce]").attr("content"),$.getJSON(user_search_endpoint,s,format_results)}function user_search_load_initial_values(){var e=!1,t=getParameterByName("q");t&&t.length>0&&($(".search-field").val(t),e=!0);var a=getParameterByName("has_valid_membership");a&&"true"===a&&($('.filters [data-search-filter="has_valid_membership"]').addClass("active"),e=!0);var s=getParameterByName("filter_groups"),n=[];if(s&&s.length>0){n=s.indexOf(",")!==-1?s.split(","):[s];var r=!1,i=0;for(i=0;iVis medlemmer på '+a.name+""),$("[data-list-name='"+e+"']").addClass("selected")})}function mailing_lists_load_initial(){var e=getParameterByName("source");e&&e.length>0&&mailing_list_show(e)}var program_endpoint="https://studentersamfundet.no/api/events/get_today/",inside_url="https://inside.studentersamfundet.no",inside_groups_url=inside_url+"/api/groups.php",user_search_endpoint="/inside-api/",email_endpoint="/email-api/",user_profile_url="/profil/",query_params={};jQuery(document).ready(function(){moment.locale("nb");var e=jQuery;e("#menu .menu-toggle").on("click",function(t){t.preventDefault();var a=e("#menu .main-menu, #menu .user-menu-wrap");a.toggleClass("visible")}),e("#menu a.profile-badge").on("click",function(t){t.preventDefault();var a=e("#menu .user-menu");a.toggleClass("visible")}),e("[data-toggle-introduction]").on("click",function(){e(this).parent().fadeOut(600),save_user_meta("introduction_dismissed",!0)}),e(".front-page .introduction").length&&get_user_meta("introduction_dismissed",function(t){t.hasOwnProperty("result")&&"true"!==t.result&&(e(".introduction").show(),e(".introduction").addClass("fadein"))});var t=".program-list";if(e(t).length&&e.getJSON(program_endpoint+"?callback=?",query_params,function(a){if(a&&a.events){var s=format_posts(a.events);e(t).html(s)}}),e(".search-form").length&&(e.getJSON(inside_groups_url,function(t){var a=' <% _.each(results, function(g) { %><%= g.group_name %> <% }); %> ',s=_.template(a)(t);e(".groups-select-wrap").html(s),e(".groups-select").chosen({no_results_text:"Uffda, ingen treff!",allow_single_deselect:!0}).change(function(){do_search()}),user_search_load_initial_values()}),e(".search-field").on("keyup keypress",function(e){10!==e.keyCode&&13!==e.keyCode||e.preventDefault()}),e(".search-field").on("keyup keypress",_.debounce(function(){do_search()},300)),e(".roles a").on("click",function(t){t.preventDefault(),e(this).toggleClass("active"),do_search()})),e(".page-mailinglists").length&&e.getJSON(email_endpoint,{_wpnonce:e("meta[name=x-inside-api-nonce]").attr("content")},function(t){if(t.error)return void e(".lists-list").html(t.error);t.lists=_.filter(t.lists,function(e){return e.num>1});var a='<% _.each(lists, function(l) { %><%= l.name %> <%= l.num %> medlemmer edit<% } else { %>email<% } %>"> Endre <% }); %>',s=_.template(a)(t);e(".lists-list").html(s);var n={valueNames:["list-name","list-num-members"]};new List("mailinglists",n),mailing_lists_load_initial()}),e(".profile").length){var a={q:e("meta[name=x-username]").attr("content"),exact:!0,_wpnonce:e("meta[name=x-inside-api-nonce]").attr("content")};""!==getParameterByName("username")&&(a.q=getParameterByName("username")),e.getJSON(user_search_endpoint,a,function(t){if(t.hasOwnProperty("results")&&1===t.results.length){for(var a=t.results[0],s="",n=0;n"+a.groups[n].name+"";e(".group-list").html(s);var r=e(".is-member");"1"===a.is_member?r.html("Gyldig medlemskap."):r.html('Du har ikke et gyldig medlemskap. Du kan forny medlemskapet ditt via SMS, via SnappOrder eller via nettbutikken i Inside .'),e(".js-inside-link").attr("href","https://inside.studentersamfundet.no/?page=display-user&userid="+a.id)}}),a.destination=e(".profile-details .user-email").text(),e.getJSON(email_endpoint,a,function(t){var a='<% _.each(lists, function(r) { %><%= r.name %> edit<% } else { %>email<% } %>"> <% }); %>',s=_.template(a)(t);e(".account-details .email-list").html(s)})}});
\ No newline at end of file