style="background: url('<%=community.CTR_browser_header%>')"<%}%>>
+ 
+
+
+
+ + <% community.description %> +
+<%= community.name %>
+
+
+
+
+
\ No newline at end of file
diff --git a/src/webfiles/ctr/communities.ejs b/src/webfiles/ctr/communities.ejs
index f945eac..94188d9 100644
--- a/src/webfiles/ctr/communities.ejs
+++ b/src/webfiles/ctr/communities.ejs
@@ -35,7 +35,7 @@
+
+
+
+
+
+ <% if(totalNumPosts === 0) {%>
+
+ No Posts
+ <%} else { %> + + <% newPosts.forEach(function(post) { %> + <%- include('post_template', { post: post, mii_image_CDN: mii_image_CDN, lang: lang, reply: false }); %> + <% }); %> + <%}%> +
- 
+ 
@@ -45,7 +45,7 @@
<%= popularCommunities[i].name %>
<%= popularCommunities[i].followers %> followers
-
+
diff --git a/src/webfiles/ctr/community.ejs b/src/webfiles/ctr/community.ejs
index 7f5ee8e..c5d3039 100644
--- a/src/webfiles/ctr/community.ejs
+++ b/src/webfiles/ctr/community.ejs
@@ -15,7 +15,7 @@
<% community.description %>
-
<%= popularCommunities[i].name %>
<%= popularCommunities[i].followers %> followers
<%= community.name %>
@@ -153,7 +153,7 @@
<% if(totalNumPosts === 0) {%>
3DS Testing
+
+
+
+
+
+
No Posts
<%} else { %> - + <% newPosts.forEach(function(post) { %> <%- include('post_template', { post: post, mii_image_CDN: mii_image_CDN, lang: lang, reply: false }); %> <% }); %> diff --git a/src/webfiles/ctr/css/juxt.css b/src/webfiles/ctr/css/juxt.css index 1cc0e7c..c3ba822 100644 --- a/src/webfiles/ctr/css/juxt.css +++ b/src/webfiles/ctr/css/juxt.css @@ -746,7 +746,7 @@ h4 { position: absolute; text-align: right; height: 33px; - margin-left: 180px; + right: 65px } .community-page-post-user-info-wrapper { diff --git a/src/webfiles/ctr/feed.ejs b/src/webfiles/ctr/feed.ejs index 302e365..d01bdcd 100644 --- a/src/webfiles/ctr/feed.ejs +++ b/src/webfiles/ctr/feed.ejs @@ -25,7 +25,7 @@ <% if(posts.length === 0) {%><%= lang.activity_feed.empty %>
<%} else { %> - + <% posts.forEach(function(post) { %> <%- include('post_template', { post: post, mii_image_CDN: mii_image_CDN, lang: lang, reply: false }); %> <% }); %> diff --git a/src/webfiles/ctr/js/juxt.js b/src/webfiles/ctr/js/juxt.js index d24c4a3..f5f61e0 100644 --- a/src/webfiles/ctr/js/juxt.js +++ b/src/webfiles/ctr/js/juxt.js @@ -710,6 +710,7 @@ function followCommunity(communityWrapper) { } } function yeah(postNode, postID) { + cave.transition_begin(); var yeahCountElement = document.getElementById('yeah-' + postID); var yeahcount = yeahCountElement.innerHTML.replace(' Yeahs', ''); if (postNode.className.indexOf("selected") !== -1) { @@ -719,8 +720,9 @@ function yeah(postNode, postID) { xhr.open("POST", '/posts/empathy', true); xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); xhr.send(params); - yeahCountElement.innerHTML = --yeahcount + ' Yeahs'; + yeahCountElement.innerHTML = --yeahcount + yeahCountElement.innerHTML.substr(yeahCountElement.innerHTML.indexOf(' ')); cave.snd_playSe('SE_OLV_CANCEL'); + cave.transition_end(); } else { postNode.className += " selected"; @@ -732,18 +734,21 @@ function yeah(postNode, postID) { xhttp.onreadystatechange = function() { if (this.readyState === 4 && this.status === 200) { - yeahCountElement.innerHTML = ++yeahcount + ' Yeahs'; + //yeahCountElement.innerHTML = ++yeahcount + ' Yeahs'; + yeahCountElement.innerHTML = ++yeahcount + yeahCountElement.innerHTML.substr(yeahCountElement.innerHTML.indexOf(' ')); cave.snd_playSe('SE_OLV_MII_ADD'); + cave.transition_end(); } if (this.readyState === 4 && this.status === 423) { - yeahCountElement.innerHTML = ++yeahcount + ' Yeahs'; + yeahCountElement.innerHTML = ++yeahcount + yeahCountElement.innerHTML.substr(yeahCountElement.innerHTML.indexOf(' ')); cave.snd_playSe('SE_OLV_MII_ADD'); + cave.transition_end(); } } xhttp.send(params); - } } + function loadPosts(type) { cave.transition_begin(); document.getElementById('recent-tab').className = 'community-page-posts-header-tab'; @@ -810,9 +815,9 @@ function loadUserPosts() { cave.snd_playSe("SE_OLV_OK"); cave.transition_end(); } -function loadCommunityPosts() { +function loadCommunityPosts(element) { cave.transition_begin(); - var postID = document.getElementsByClassName('post-user-info-wrapper')[document.getElementsByClassName('post-user-info-wrapper').length - 1].id + var offset = Number(element.getAttribute('data-offset')); var id = document.getElementsByClassName('community-page-follow-button')[0].id var xhttp = new XMLHttpRequest(); var type = 'null'; @@ -835,20 +840,22 @@ function loadCommunityPosts() { cave.error_callFreeErrorViewer(5983000 + this.status, 'Error: "' + this.statusText + '"\nPlease send code to Jemma on Discord with what you were doing'); } }; - xhttp.open("GET", '/communities/' + id + '/' + type + '/loadposts?postID=' + postID, true); + xhttp.open("GET", '/communities/' + id + '/' + type + '/loadposts?offset=' + offset, true); xhttp.send(); + element.setAttribute('data-offset', offset + 10); cave.snd_playSe("SE_OLV_OK"); cave.transition_end(); } -function loadFeedPosts() { + + +function loadFeedPosts(element) { cave.transition_begin(); - var postID = document.getElementsByClassName('post-user-info-wrapper')[document.getElementsByClassName('post-user-info-wrapper').length - 1].id + var offset = Number(element.getAttribute('data-offset')); var xhttp = new XMLHttpRequest(); xhttp.onreadystatechange = function() { if (this.readyState === 4 && this.status === 200) { - document.getElementsByClassName('community-page-posts-wrapper')[0].innerHTML += this.responseText; - initCommunityUsers(); + document.getElementById('community-posts-inner-body').innerHTML += this.responseText; } else if(this.readyState === 4 && this.status === 204) { @@ -858,12 +865,14 @@ function loadFeedPosts() { cave.error_callFreeErrorViewer(5983000 + this.status, 'Error: "' + this.statusText + '"\nPlease send code to Jemma on Discord with what you were doing'); } }; - xhttp.open("GET", '/activity-feed/loadposts?postID=' + postID, true); + xhttp.open("GET", '/activity-feed/loadposts?offset=' + offset, true); xhttp.send(); + element.setAttribute('data-offset', offset + 10); cave.snd_playSe("SE_OLV_OK"); cave.transition_end(); } + function newPainting(reset) { if(reset) cave.memo_clear() diff --git a/src/webfiles/ctr/me_page.ejs b/src/webfiles/ctr/me_page.ejs new file mode 100644 index 0000000..2f44f44 --- /dev/null +++ b/src/webfiles/ctr/me_page.ejs @@ -0,0 +1,76 @@ + + + + +
+
+ 
+
+
+
+ + +
+<%= user.user_id %>
+
+ <%if(user.profile_comment_visibility && user.profile_comment){%>
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/webfiles/ctr/notifications.ejs b/src/webfiles/ctr/notifications.ejs
index 1217a88..9a0ffdb 100644
--- a/src/webfiles/ctr/notifications.ejs
+++ b/src/webfiles/ctr/notifications.ejs
@@ -26,13 +26,14 @@
+
+ <%}%>
+ <%=user.profile_comment%>
+|
+
+
+ Country+<%if(user.country_visibility){%><%=user.country%><%}else {%>Private<%}%>+ |
+
+
+
+ Birthday+<%if(user.birthday_visibility){%><%=moment.utc(user.birthday).format("MMM Do")%><%}else {%>Private<%}%>+ |
+
|
+
+
+ Game experience++ <%if(user.game_skill === 0) {%> + Beginner + <%} else if(user.game_skill === 1) {%> + Intermediate + <%} else if(user.game_skill === 2) {%> + Expert + <%} else {%> + N/A + <%}%> ++ |
+
+
+
+ Yeahs+N/A+ |
+
+
+
+ User Posts
+<%= lang.notifications.none %>
<%} else { %> <% for(let i = user.notification_list.length - 1; i >= 0; i--) { %> + <% var content; if(user.notification_list[i].content.indexOf('NEW_FOLLOWER') !== -1) content = user.notification_list[i].content.replace('NEW_FOLLOWER', lang.notifications.new_follower); else content = user.notification_list[i].content %> <% if(i === user.notification_list.length - 1) { %> <%} else {%> @@ -41,7 +42,7 @@ <%if(!user.notification_list[i].read) {%><%}%>
- <%if(post.verified) {%>
-  {%>smile_open_mouth.png<%} else if(post.feeling_id === 2 ) {%>wink_left.png<%} else if(post.feeling_id === 3 ) {%>surprise_open_mouth.png<%} else if(post.feeling_id === 4 ) {%>frustrated.png<%} else if(post.feeling_id === 5 ) {%>sorrow.png<%} else {%>normal_face.png<%}%>)
-
- <%} else {%>
-
-
- <%}%>
-
-
+
diff --git a/src/webfiles/ctr/user_page.ejs b/src/webfiles/ctr/user_page.ejs
index e6c001e..32ceac4 100644
--- a/src/webfiles/ctr/user_page.ejs
+++ b/src/webfiles/ctr/user_page.ejs
@@ -36,7 +36,7 @@
@@ -67,10 +67,7 @@
diff --git a/src/webfiles/portal/js/juxt.js b/src/webfiles/portal/js/juxt.js
index 73913e7..c213c5a 100644
--- a/src/webfiles/portal/js/juxt.js
+++ b/src/webfiles/portal/js/juxt.js
@@ -485,7 +485,7 @@ function loadUserPosts(element, pid) {
xhttp.open("GET", "/users/loadPosts" + '?offset=' + offset + '&pid=' + pid, true);
xhttp.send();
- element.dataset.offset = offset + 20;
+ element.dataset.offset = offset + 10;
wiiuSound.playSoundByName("SE_WAVE_MENU", 1);
wiiuBrowser.showLoadingIcon(!1);
}
@@ -517,7 +517,7 @@ function loadCommunityPosts(element, typeCheck) {
xhttp.open("GET", '/communities/' + id + '/' + type + '/loadposts?offset=' + offset, true);
xhttp.send();
- element.dataset.offset = offset + 20;
+ element.dataset.offset = offset + 10;
wiiuSound.playSoundByName("SE_WAVE_MENU", 1);
wiiuBrowser.showLoadingIcon(!1);
}
@@ -540,7 +540,7 @@ function loadFeedPosts(element) {
xhttp.open("GET", '/activity-feed/loadposts?offset=' + offset, true);
xhttp.send();
- element.dataset.offset = offset + 20;
+ element.dataset.offset = offset + 10;
wiiuSound.playSoundByName("SE_WAVE_MENU", 1);
wiiuBrowser.showLoadingIcon(!1);
}
-
- <%} else {%>
-
-
- <%}%>
- <%= post.screen_name %>
-<%= moment(post.created_at).fromNow() %> - <%= communityMap.get(post.community_id) %>
- +
+ <%if(post.verified) {%>
+
+
+ <%} else {%>
+
+
+ <%}%>
+
diff --git a/src/webfiles/ctr/user_menu.ejs b/src/webfiles/ctr/user_menu.ejs
index 93b29a5..e338b3b 100644
--- a/src/webfiles/ctr/user_menu.ejs
+++ b/src/webfiles/ctr/user_menu.ejs
@@ -34,7 +34,7 @@
+
+ <%} else {%>
+
+
+ <%}%>
+ <%= post.screen_name %>
+<%= moment(post.created_at).fromNow() %> - <%= communityMap.get(post.community_id) %>
+Birthday
-<%if(user.birthday_visibility){%>N/A<%}else {%>Private<%}%>
+<%if(user.birthday_visibility){%><%=moment.utc(user.birthday).format("MMM Do")%><%}else {%>Private<%}%>
-
- Popular Places
-
-