From 900f39a32c8ef72a138337a764c3375bfa16a007 Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Mon, 15 Sep 2014 22:32:33 +0200 Subject: [PATCH] more profile pages, should work --- .../themes/aktiv2014/app/scripts/main.js | 5 +++ .../themes/aktiv2014/dist/scripts/main.js | 2 +- wp-content/themes/aktiv2014/page-profile.php | 36 ++++++++++--------- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/wp-content/themes/aktiv2014/app/scripts/main.js b/wp-content/themes/aktiv2014/app/scripts/main.js index 436ea2e..e6ac957 100644 --- a/wp-content/themes/aktiv2014/app/scripts/main.js +++ b/wp-content/themes/aktiv2014/app/scripts/main.js @@ -345,6 +345,9 @@ jQuery(document).ready(function() { exact: true, _wpnonce: $('meta[name=x-inside-api-nonce]').attr('content') }; + if(getParameterByName('username') !== '') { + params.q = getParameterByName('username'); + } $.getJSON( user_search_endpoint, @@ -363,6 +366,8 @@ jQuery(document).ready(function() { } else { is_member_field.html('Du har ikke et gyldig medlemskap. Du kan forny medlemskapet ditt via SMS, via SnappOrder eller via nettbutikken i Inside.'); } + // if other profile, add link to profile + $('.js-inside-link').attr('href', 'https://inside.studentersamfundet.no/?page=display-user&userid='+u.id); } } ); diff --git a/wp-content/themes/aktiv2014/dist/scripts/main.js b/wp-content/themes/aktiv2014/dist/scripts/main.js index aec2f46..b5257cf 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="";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) { %> <% }); %>
NavnBrukernavnEpostTelefonHar medlemskapGrupper
<%= 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=-1!==s.indexOf(",")?s.split(","):[s];var r=!1,i=0;for(i=0;i<%= members.length %> stk
    <% _.each(members, function(m) { %>
  • <%= m %>
    • <% }); %>
',s=_.template(a,t);$(".list-members").html(s),$(".lists-list-wrap .meta").html('Vis medlemmer på '+t.meta.list+""),$("[data-list-name='"+e+"']").addClass("selected")})}function mailinglists_load_initial(){var e=getParameterByName("q");e&&e.length>0&&mailinglist_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='',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,{"do":"list",_wpnonce:e("meta[name=x-inside-api-nonce]").attr("content")},function(t){var a='<% _.each(lists, function(l) { %>
  • <%= l.name %>
    <%= l.num %> medlemmer
    • <% }); %>',s=_.template(a,t);e(".lists-list").html(s);var n={valueNames:["list-name","list-num-members"]};new List("mailinglists",n),mailinglists_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")};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");r.html("1"===a.is_member?"Gyldig medlemskap.":'Du har ikke et gyldig medlemskap. Du kan forny medlemskapet ditt via SMS, via SnappOrder eller via nettbutikken i Inside.')}}),a.q=e(".profile-details .user-email").text(),a.inherited=!0,e.getJSON(email_endpoint,a,function(t){var s='<% _.each(results, function(r) { %>
  • <%= r.name %>
    • <% }); %>',n=_.template(s,t);e(".account-details .email-list").html(n),a.inherited&&(t.results=t.inherited_results,n=_.template(s,t),e(".account-details .email-list-inherited").html(n))})}}); \ 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="";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) { %> <% }); %>
    NavnBrukernavnEpostTelefonHar medlemskapGrupper
    <%= 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=-1!==s.indexOf(",")?s.split(","):[s];var r=!1,i=0;for(i=0;i<%= members.length %> stk
      <% _.each(members, function(m) { %>
    • <%= m %>
      • <% }); %>
    ',s=_.template(a,t);$(".list-members").html(s),$(".lists-list-wrap .meta").html('Vis medlemmer på '+t.meta.list+""),$("[data-list-name='"+e+"']").addClass("selected")})}function mailinglists_load_initial(){var e=getParameterByName("q");e&&e.length>0&&mailinglist_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='',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,{"do":"list",_wpnonce:e("meta[name=x-inside-api-nonce]").attr("content")},function(t){var a='<% _.each(lists, function(l) { %>
  • <%= l.name %>
    <%= l.num %> medlemmer
    • <% }); %>',s=_.template(a,t);e(".lists-list").html(s);var n={valueNames:["list-name","list-num-members"]};new List("mailinglists",n),mailinglists_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");r.html("1"===a.is_member?"Gyldig medlemskap.":'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.q=e(".profile-details .user-email").text(),a.inherited=!0,e.getJSON(email_endpoint,a,function(t){var s='<% _.each(results, function(r) { %>
  • <%= r.name %>
    • <% }); %>',n=_.template(s,t);e(".account-details .email-list").html(n),a.inherited&&(t.results=t.inherited_results,n=_.template(s,t),e(".account-details .email-list-inherited").html(n))})}}); \ No newline at end of file diff --git a/wp-content/themes/aktiv2014/page-profile.php b/wp-content/themes/aktiv2014/page-profile.php index d6b8227..4a1a452 100644 --- a/wp-content/themes/aktiv2014/page-profile.php +++ b/wp-content/themes/aktiv2014/page-profile.php @@ -4,8 +4,8 @@ */ $user = null; $logged_in_user = true; -if( isset($_GET['username']) && get_user_by( 'user_login', $_GET['username']) ) { - $user = get_user_by('user_login', $_GET['username']); +if( isset($_GET['username']) && get_user_by( 'login', $_GET['username']) ) { + $user = get_user_by('login', $_GET['username']); $logged_in_user = false; } if( !isset($_GET['username']) ) { @@ -32,20 +32,24 @@ get_header();
  • Medlemskapsstatus:
  • Rolle på aktiv.neuf.no: roles[0]; ?>
    • -

    - Endre navn, epost, med mer via Inside. -

    -
    Profilbilde
    -

    Endre profilbilde

    -
    Passord
    -

    Endre passordet ditt via Brukerinfo.

    -

    -
    Annet
    - ID, 'feed_key'); - $feedurl = get_bloginfo('url').'/feed/?feedkey='.$feedkey; - ?> - Privat RSS-feed + +

    + Endre navn, epost, med mer via Inside. +

    +
    Profilbilde
    +

    Endre profilbilde

    +
    Passord
    +

    Endre passordet ditt via Brukerinfo.

    +

    +
    Annet
    + ID, 'feed_key'); + $feedurl = get_bloginfo('url').'/feed/?feedkey='.$feedkey; + ?> + Privat RSS-feed + + Vis i Inside +