From 5c58f2a7a3801457304c07337b0fd95e7d635176 Mon Sep 17 00:00:00 2001 From: Wenqi Zhang Date: Wed, 19 Feb 2014 14:43:08 -0800 Subject: [PATCH 01/15] Update index.html changed Google analytics tracking code to new domain. --- index.html | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/index.html b/index.html index 67f3562..1c83f8e 100755 --- a/index.html +++ b/index.html @@ -14,17 +14,14 @@ - From a94875961f2f4136ffe2217b8e11bfafbb783200 Mon Sep 17 00:00:00 2001 From: Henry Hu Date: Wed, 20 Nov 2013 12:33:51 -0500 Subject: [PATCH 02/15] handle connect errors --- js/jquery/jquery.xmpp.js | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/js/jquery/jquery.xmpp.js b/js/jquery/jquery.xmpp.js index 0153dd0..a149914 100644 --- a/js/jquery/jquery.xmpp.js +++ b/js/jquery/jquery.xmpp.js @@ -155,7 +155,13 @@ } } - }, 'text'); + }, 'text').fail(function(XMLHttpRequest, textStatus, errorThrown) { + console.log("initial connect() error: " + errorThrown); + if(xmpp.onError != null){ + xmpp.onError({error: errorThrown, data:textStatus}); + } + xmpp.errorCount = xmpp.errorCount + 1; + }); }, /** @@ -482,14 +488,38 @@ options.onConnect(data); } xmpp.listen(); - }, 'text'); - }, 'text'); - }, 'text'); + }, 'text').fail(function(XMLHttpRequest, textStatus, errorThrown) { + if(xmpp.onError != null){ + xmpp.onError({error: errorThrown, data:textStatus}); + } + console.log("session create error: " + errorThrown); + xmpp.errorCount = xmpp.errorCount + 1; + }); + }, 'text').fail(function(XMLHttpRequest, textStatus, errorThrown) { + if(xmpp.onError != null){ + xmpp.onError({error: errorThrown, data:textStatus}); + } + console.log("bind error: " + errorThrown); + xmpp.errorCount = xmpp.errorCount + 1; + }); + }, 'text').fail(function(XMLHttpRequest, textStatus, errorThrown) { + if(xmpp.onError != null){ + xmpp.onError({error: errorThrown, data:textStatus}); + } + console.log("restart after auth error: " + errorThrown); + xmpp.errorCount = xmpp.errorCount + 1; + }); }else{ if(options.onError != null) options.onError({error: "Invalid credentials", data:data}); } - }, 'text'); + }, 'text').fail(function(XMLHttpRequest, textStatus, errorThrown) { + if(xmpp.onError != null){ + xmpp.onError({error: errorThrown, data:textStatus}); + } + console.log("auth error: " + errorThrown); + xmpp.errorCount = xmpp.errorCount + 1; + }); }, From a849d8e01b5820dcbfceebbac18fe6455f195e2f Mon Sep 17 00:00:00 2001 From: Henry Hu Date: Wed, 7 May 2014 19:59:22 -0400 Subject: [PATCH 03/15] generate session key each time. support multi-tab coexist --- js/bbs/bbs_xmpp.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/js/bbs/bbs_xmpp.js b/js/bbs/bbs_xmpp.js index 57a47fa..b05bec3 100644 --- a/js/bbs/bbs_xmpp.js +++ b/js/bbs/bbs_xmpp.js @@ -9,6 +9,7 @@ var xmpp_panel_left = 0; var XMPP_TITLE_CHANGE_INTERVAL = 1000; var XMPP_CHAT_TITLE_ACTIVE_COLOR = '#5BB75B'; var XMPP_CHAT_TITLE_INACTIVE_COLOR = 'rgb(91, 191, 222)'; +var xmpp_session_key = ""; function xmpp_jid_normalize(jid) { return jid.replace(/[\.@\/]/g, '_'); @@ -72,7 +73,7 @@ function xmpp_connect() { $('#xmpp-panel').show(); xmpp_show_loading(bbs_string.xmpp_connecting); $.xmpp.connect({ - resource: bbs_query.xmpp_resource + bbs_session.substr(0, 4), + resource: bbs_query.xmpp_resource + xmpp_session_key, domain: bbs_query.xmpp_domain, token: bbs_session, url: bbs_query.bosh_url, @@ -394,7 +395,19 @@ function xmpp_chat_min_click(jid_bare) { } } +function xmpp_gen_session_key() { + var x = Math.random(); + var ret = ""; + for (var i = 0; i < 4; i ++) { + x = x * 10; + ret += String(Math.floor(x)); + x = x - Math.floor(x); + } + return ret; +} + function xmpp_ui_init() { + xmpp_session_key = xmpp_gen_session_key(); $('#xmpp-panel').hide(); $('#xmpp-panel-handle').click(xmpp_panel_toggle); xmpp_onresize(); From 68d86af644d758313b2dde3b69bb2d997a2502f2 Mon Sep 17 00:00:00 2001 From: Henry Hu Date: Wed, 7 May 2014 20:00:26 -0400 Subject: [PATCH 04/15] fix disconnectSync(), call it in onError --- js/bbs/bbs_xmpp.js | 1 + js/jquery/jquery.xmpp.js | 25 +++++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/js/bbs/bbs_xmpp.js b/js/bbs/bbs_xmpp.js index b05bec3..903d1f3 100644 --- a/js/bbs/bbs_xmpp.js +++ b/js/bbs/bbs_xmpp.js @@ -227,6 +227,7 @@ function xmpp_error(error) { xmpp_user_list = {} $('#xmpp-user-list').empty(); xmpp_show_loading(bbs_string.xmpp_error); + $.xmpp.disconnectSync(); setTimeout(function() { console.log("xmpp error. reconnecting..."); xmpp_connect(); diff --git a/js/jquery/jquery.xmpp.js b/js/jquery/jquery.xmpp.js index a149914..aff9ebd 100644 --- a/js/jquery/jquery.xmpp.js +++ b/js/jquery/jquery.xmpp.js @@ -248,14 +248,31 @@ xmpp.listening = false; //Do not listen anymore! //Two callbacks - if(callback != null) - callback(data); - if(xmpp.onDisconnect != null) + if(callback != null) { + callback(data); + } + if(xmpp.onDisconnect != null) { + xmpp.onDisconnect(data); + } xmpp.connected = false; - xmpp.onDisconnect(data); }, dataType: 'text', async:false + }).fail(function(XMLHttpRequest, textStatus, errorThrown) { +/* if(xmpp.onError != null){ + xmpp.onError({error: errorThrown, data:textStatus}); + }*/ + console.log("disconnectSync() error: " + errorThrown); + if (xmpp.__lastAjaxRequest != null) { + xmpp.__lastAjaxRequest.abort(); + } + xmpp.connections = xmpp.connections - 1; + if (xmpp.debug) { + console.log("connection-- = " + xmpp.connections + ": disconnectSync.error"); + } + xmpp.listening = false; + xmpp.connected = false; + xmpp.errorCount = xmpp.errorCount + 1; }); }, From 3345fa32d8f2368f308c6f11bf2fd99e55f9fe43 Mon Sep 17 00:00:00 2001 From: Henry Hu Date: Mon, 19 May 2014 17:26:28 -0400 Subject: [PATCH 05/15] also reset watchdog timer in sendCommand. fix disconnect problem --- js/jquery/jquery.xmpp.js | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/js/jquery/jquery.xmpp.js b/js/jquery/jquery.xmpp.js index aff9ebd..02bb54f 100644 --- a/js/jquery/jquery.xmpp.js +++ b/js/jquery/jquery.xmpp.js @@ -574,8 +574,7 @@ xmpp = this; if(xmpp.connections === 0) { //To detect networks problems - clearTimeout(xmpp._jsTimeout); - xmpp._jsTimeout = setTimeout(xmpp.__networkError,xmpp._timeoutMilis); + xmpp.refreshTimer(); // this.rid = this.rid+1; xmpp.connections = xmpp.connections + 1; @@ -631,6 +630,8 @@ sendCommand: function(rawCommand, callback){ var self = this; + self.refreshTimer(); + this.rid = this.rid + 1; this.listening = true; this.connections = this.connections + 1; @@ -817,6 +818,21 @@ ret += " type='result'/>"; xmpp.sendCommand(ret); + }, + + /** + * Reset the watchdog timer + */ + refreshTimer: function() { + var xmpp = this; + if (xmpp.debug) { + console.log("clear timeout " + xmpp._jsTimeout); + } + clearTimeout(xmpp._jsTimeout); + xmpp._jsTimeout = setTimeout(xmpp.__networkError,xmpp._timeoutMilis); + if (xmpp.debug) { + console.log("new timeout set " + xmpp._jsTimeout); + } } } })(jQuery); From b274e1e9539d5caf8d298422ff61296870c6866d Mon Sep 17 00:00:00 2001 From: mrroach9 Date: Mon, 19 Jan 2015 14:38:47 -0800 Subject: [PATCH 06/15] Fetch contributor list from Github automatically. --- css/style.css | 29 ++++++++++++++++++++++++++++- index.html | 27 ++++++--------------------- js/bbs/bbs_UI.js | 16 ++++++++++++++++ js/bbs/bbs_utility.js | 26 ++++++++++++++++++++++++++ js/bbs/bbs_widgets.js | 17 +++++++++++++++++ js/bbs/config.js | 2 ++ 6 files changed, 95 insertions(+), 22 deletions(-) diff --git a/css/style.css b/css/style.css index a100a92..6b7f837 100644 --- a/css/style.css +++ b/css/style.css @@ -738,4 +738,31 @@ input[type="file"].fileuploadbox { .unread-inside { display: block; position: relative; -} \ No newline at end of file +} + +.ctrbtr-list-panel { + padding: 0 10px 5px 10px; +} + +.github-author-container { + display: inline-block; + padding: 5px; + min-width: 160px; +} + +.github-avatar-container { + display: inline-block; +} + +.github-avatar { + width: 40px; + height: 40px; + border-radius: 20px; + box-shadow: 2px 2px 3px #CCC; +} + +.github-name-container { + display: inline-block; + margin-left: 10px; + font-size: 16px; +} diff --git a/index.html b/index.html index 1c83f8e..9025a71 100755 --- a/index.html +++ b/index.html @@ -426,27 +426,12 @@

发表新文章

Rowell开发者名单

-

按常用ID字母序排列。

- +
+ 抱歉，加载贡献者名单出现错误，请检查您与 + Github + 的连接是否畅通。 +
+
关闭 diff --git a/js/bbs/bbs_UI.js b/js/bbs/bbs_UI.js index 323e8a4..95c0ca9 100755 --- a/js/bbs/bbs_UI.js +++ b/js/bbs/bbs_UI.js @@ -514,6 +514,8 @@ function UI_init() { $('a#login-accounts9').attr('href', accounts9.server + accounts9.auth); $(document).attr("title", bbs_string.title); + loadContributorStat(UI_OnLoadContributors); + $('.unimplemented').popover({ trigger: 'hover', placement: 'bottom', @@ -737,3 +739,17 @@ function UI_onresize(){ function UI_onfocus() { xmpp_onfocus(); } + +function UI_OnLoadContributors(authorList) { + if (authorList == null) { + $('.ctrbtr-error').show(); + $('.ctrbtr-list-panel').hide(); + return; + } + $('.ctrbtr-error').hide(); + $('.ctrbtr-list-panel').show(); + for (var ind in authorList) { + $('.ctrbtr-list-panel').append( + Widgets.githubAuthorWidget(authorList[ind])); + } +} \ No newline at end of file diff --git a/js/bbs/bbs_utility.js b/js/bbs/bbs_utility.js index 6bf45c5..511dd97 100755 --- a/js/bbs/bbs_utility.js +++ b/js/bbs/bbs_utility.js @@ -82,4 +82,30 @@ function upload_file(file, node, callback_func, progress_func) { }); }; fr.readAsDataURL(file); +} + +function loadContributorStat(callback_func) { + var resp = $.ajax(github_stat_address); + + resp.success(function(response){ + var authorList = []; + for (var ind in response) { + authorList.push(response[ind].author); + } + + // BYVoid contributed to Rowell but his commits were not merged into this repo. + // add him as hard-coded. Figure out a better solution before similar cases + // go crazy. + var byvoid = { + html_url: 'https://github.com/BYVoid', + login: 'BYVoid', + avatar_url: 'https://avatars3.githubusercontent.com/u/245270?v=3&s=400', + }; + authorList.push(byvoid); + callback_func(authorList); + }); + + resp.fail(function(jqXHR, textStatus){ + callback_func(null); + }); } \ No newline at end of file diff --git a/js/bbs/bbs_widgets.js b/js/bbs/bbs_widgets.js index e1b79cf..5364742 100644 --- a/js/bbs/bbs_widgets.js +++ b/js/bbs/bbs_widgets.js @@ -265,4 +265,21 @@ Widgets.postMiniBar = function(entry) { dot.css('opacity', 0.1); }); return miniBar; +}; + +// Creates an author icon with avatar, name and link fetched from Github repo. +Widgets.githubAuthorWidget = function(profile) { + if (profile == null) { + return null; + } + + var avatarIcon = $('').addClass('github-avatar') + .attr('src', profile.avatar_url); + var avatar = $('').addClass('github-avatar-container').append(avatarIcon); + var authorNameAnchor = $('').addClass('github-name-anchor') + .attr('href', profile.html_url) + .attr('target', '_blank') + .append(profile.login); + var authorName = $('').addClass('github-name-container').append(authorNameAnchor); + return $('
').addClass('github-author-container').append(avatar).append(authorName); }; \ No newline at end of file diff --git a/js/bbs/config.js b/js/bbs/config.js index c135fe6..88b672a 100755 --- a/js/bbs/config.js +++ b/js/bbs/config.js @@ -1,4 +1,6 @@ var website_address = location.protocol + '//' + location.hostname + location.pathname; +var github_stat_address = + "https://api.github.com/repos/mrroach9/Rowell/stats/contributors"; var bbs_string = { favboard_name : '收藏夹', From 8d3917cad6d4acb86e9fbb9fce1127d2dff31efd Mon Sep 17 00:00:00 2001 From: mrroach9 Date: Mon, 19 Jan 2015 15:11:04 -0800 Subject: [PATCH 07/15] Remove the little dot for minibar, making the buttons easier to show. --- css/style.css | 1 + js/bbs/bbs_widgets.js | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/css/style.css b/css/style.css index 6b7f837..7912907 100644 --- a/css/style.css +++ b/css/style.css @@ -218,6 +218,7 @@ td.post-title-td { right: 8px; top: 4px; width: 210px; + opacity: 0.8; } .mini-bar-dot { diff --git a/js/bbs/bbs_widgets.js b/js/bbs/bbs_widgets.js index 5364742..8522363 100644 --- a/js/bbs/bbs_widgets.js +++ b/js/bbs/bbs_widgets.js @@ -103,6 +103,8 @@ Widgets.postEntry = function (entry, is_sticky) { markG = true; } + var miniBar = Widgets.postMiniBar(entry); + miniBar.hide(); var entryNode = $('').attr('href', '').addClass(class_name) .append($('').append((is_sticky ? bbs_string.entry_sticky : entry.id))) .append($('').addClass('board-table-center').append( @@ -114,12 +116,18 @@ Widgets.postEntry = function (entry, is_sticky) { .append(entry.attachment > 0 ? attachLogoNode : '') .append(markM ? mNode : '') .append(markG ? gNode : '') - .append(Widgets.postMiniBar(entry))); + .append(miniBar)); if (is_sticky) { entryNode.addClass('sticky'); } var postType = is_sticky ? bbs_type.post_list_mode.sticky : bbs_type.post_list_mode.normal; + entryNode.mouseenter(function(event) { + miniBar.fadeIn('fast'); + }); + entryNode.mouseleave(function(event) { + miniBar.hide(); + }); entryNode.click(function() { UI_set_loading(); view_post(entry.id, postType, UI_update, 'click'); @@ -214,7 +222,6 @@ Widgets.uploadFile = function (file) { // access to manipulating the post. Widgets.postMiniBar = function(entry) { var miniBar = $('
').addClass('mini-bar'); - var dot = $('').addClass('mini-bar-dot'); var btnList = $('
    ').addClass('mini-bar-ul'); var delBtn = $('
-
- +
+
- - + + @@ -490,6 +490,7 @@

Rowell开发者名单

+ diff --git a/js/bbs/bbs_UI.js b/js/bbs/bbs_UI.js index 95c0ca9..16c2c94 100755 --- a/js/bbs/bbs_UI.js +++ b/js/bbs/bbs_UI.js @@ -515,6 +515,7 @@ function UI_init() { $(document).attr("title", bbs_string.title); loadContributorStat(UI_OnLoadContributors); + $('#boardlist-table').stupidtable(); $('.unimplemented').popover({ trigger: 'hover', @@ -657,7 +658,7 @@ function UI_subnavbar_update(path) { function UI_maindiv_update(pathTerm) { $('#mailbox-table').hide(); - $('#boardlist-table').hide(); + $('#boardlist-table-container').hide(); $('#board-table').hide(); $('#post-view').hide(); $('#mail-view').hide(); @@ -682,8 +683,11 @@ function UI_maindiv_update(pathTerm) { var entryNode = Widgets.boardEntry(pathTerm.data[i], pathTerm.type); $('#boardlist-table-body').append(entryNode); } - $('#boardlist-table').show(); - bbs_topmost_stack.push('#boardlist-table'); + $('#boardlist-table-container').show(); + bbs_topmost_stack.push('#boardlist-table-container'); + + var tableSorter = $("#boardlist-table").stupidtable(); + tableSorter.find("thead th[col=unread]").stupidsort('asc'); } else if (pathTerm.type == bbs_type.path.board) { $('#board-table-body').empty(); diff --git a/js/bbs/bbs_widgets.js b/js/bbs/bbs_widgets.js index 9b87eb7..aa111b0 100644 --- a/js/bbs/bbs_widgets.js +++ b/js/bbs/bbs_widgets.js @@ -31,12 +31,14 @@ Widgets.mailEntry = function(entry, type) { Widgets.boardEntry = function(entry, type) { var newPostNode = Widgets.newMark(); var entryNode = $('').attr('href', ''); - var entryName = ''; if (type == bbs_type.path.allboard) { + var isRead = (entry.isdir || entry.read); + var sortValue = (isRead ? 1 : 0) + ',' + entry.name; entryNode.addClass('board-entry') .append($('').attr('href', ''); if (type == bbs_type.path.allboard) { var isRead = (entry.isdir || entry.read); - var sortValue = (isRead ? 1 : 0) + ',' + entry.name; + var sortValue = (isRead ? 1 : 0) + ',' + ('000' + index).slice(-3);; entryNode.addClass('board-entry') .append($('').attr('href', ''); if (type == bbs_type.path.allboard) { var isRead = (entry.isdir || entry.read); - var sortValue = (isRead ? 1 : 0) + ',' + ('000' + index).slice(-3);; + var sortValue = (isRead ? 1 : 0) + ',' + ('000' + index).slice(-3); + + var bmCell = $('
帖数未读版名未读版名 版面中文名 在线 版主
').append(entry.total)) .append($('').addClass('board-table-center') - .append(((entry.isdir || entry.read) ? '' : newPostNode))) + .append(isRead ? '' : newPostNode) + .attr('data-sort-value', sortValue)) .append($('').append(entry.name)) .append($('').append(entry.desc)) .append($('').append(entry.currentusers)) @@ -46,10 +48,12 @@ Widgets.boardEntry = function(entry, type) { UI_set_loading(); view_board(entry.name, -1, -1, UI_update, 'click'); }); - } else if (entry.type == bbs_type.entry.folder) { + } else if (entry.type == bbs_type.entry.folder) { + var sortValue = 1 + ',' + entry.name; entryNode.addClass('folder-entry') .append($('')) - .append($('').addClass('board-table-center')) + .append($('').addClass('board-table-center') + .attr('data-sort-value', sortValue)) .append($('').append(bbs_string.entry_folder)) .append($('').append(entry.name)) .append($('')).append($('')); @@ -60,12 +64,14 @@ Widgets.boardEntry = function(entry, type) { entry.name, UI_update); }); } else if (entry.type == bbs_type.entry.board) { - entryName = entry.binfo.name; + var entryName = entry.binfo.name; + var isRead = (typeof(entry.binfo.read) == 'undefined' || entry.binfo.read); + var sortValue = (isRead ? 1 : 0) + ',' + entryName; entryNode.addClass('board-entry') .append($('').append(entry.binfo.total)) .append($('').addClass('board-table-center') - .append(((typeof(entry.binfo.read) == 'undefined' || entry.binfo.read) - ? '' : newPostNode))) + .append(isRead ? '' : newPostNode) + .attr('data-sort-value', sortValue)) .append($('').append(entry.binfo.name)) .append($('').append(entry.binfo.desc)) .append($('').append(entry.binfo.currentusers)) diff --git a/js/jquery/stupidtable.min.js b/js/jquery/stupidtable.min.js new file mode 100644 index 0000000..bc7bfd3 --- /dev/null +++ b/js/jquery/stupidtable.min.js @@ -0,0 +1,4 @@ +(function(c){c.fn.stupidtable=function(b){return this.each(function(){var a=c(this);b=b||{};b=c.extend({},c.fn.stupidtable.default_sort_fns,b);a.data("sortFns",b);a.on("click.stupidtable","thead th",function(){c(this).stupidsort()})})};c.fn.stupidsort=function(b){var a=c(this),g=0,f=c.fn.stupidtable.dir,e=a.closest("table"),k=a.data("sort")||null;if(null!==k){a.parents("tr").find("th").slice(0,c(this).index()).each(function(){var a=c(this).attr("colspan")||1;g+=parseInt(a,10)});var d;1==arguments.length? +d=b:(d=b||a.data("sort-default")||f.ASC,a.data("sort-dir")&&(d=a.data("sort-dir")===f.ASC?f.DESC:f.ASC));e.trigger("beforetablesort",{column:g,direction:d});e.css("display");setTimeout(function(){var b=[],l=e.data("sortFns")[k],h=e.children("tbody").children("tr");h.each(function(a,e){var d=c(e).children().eq(g),f=d.data("sort-value");"undefined"===typeof f&&(f=d.text(),d.data("sort-value",f));b.push([f,e])});b.sort(function(a,b){return l(a[0],b[0])});d!=f.ASC&&b.reverse();h=c.map(b,function(a){return a[1]}); +e.children("tbody").append(h);e.find("th").data("sort-dir",null).removeClass("sorting-desc sorting-asc");a.data("sort-dir",d).addClass("sorting-"+d);e.trigger("aftertablesort",{column:g,direction:d});e.css("display")},10);return a}};c.fn.updateSortVal=function(b){var a=c(this);a.is("[data-sort-value]")&&a.attr("data-sort-value",b);a.data("sort-value",b);return a};c.fn.stupidtable.dir={ASC:"asc",DESC:"desc"};c.fn.stupidtable.default_sort_fns={"int":function(b,a){return parseInt(b,10)-parseInt(a,10)}, +"float":function(b,a){return parseFloat(b)-parseFloat(a)},string:function(b,a){return b.localeCompare(a)},"string-ins":function(b,a){b=b.toLocaleLowerCase();a=a.toLocaleLowerCase();return b.localeCompare(a)}}})(jQuery); From 6ab2f5099924694f6d259380f2a4f99a78491429 Mon Sep 17 00:00:00 2001 From: mrroach9 Date: Sat, 24 Jan 2015 16:27:37 -0800 Subject: [PATCH 10/15] Add user profile widget (with hard-coded data only for now). --- css/style.css | 107 +++++++++++++++++++++++++++++++ index.html | 2 +- js/bbs/bbs_UI.js | 143 +++++++++++++++++++++++++----------------- js/bbs/bbs_widgets.js | 48 +++++++++++++- 4 files changed, 242 insertions(+), 58 deletions(-) diff --git a/css/style.css b/css/style.css index 7912907..a7f36de 100644 --- a/css/style.css +++ b/css/style.css @@ -767,3 +767,110 @@ input[type="file"].fileuploadbox { margin-left: 10px; font-size: 16px; } + +.user-profile-topPanel { + border-bottom: solid 1px #DDD; + padding-bottom: 7px; +} + +.user-profile-bottomPanel { + padding-top: 5px; + font-size: 13px; +} + +.user-profile-avatar-container { + display: inline-block; +} + +.user-profile-avatar { + display: block; + width: 28px; + height: 28px; + font: bold 38px Arial; + color: white; + border-radius: 15px; + padding: 11px; + line-height: 0.8em; +} + +.user-profile-avatar.initial-A, +.user-profile-avatar.initial-F, +.user-profile-avatar.initial-K, +.user-profile-avatar.initial-P, +.user-profile-avatar.initial-U, +.user-profile-avatar.initial-Z { + background-color: #BF73CF; +} + +.user-profile-avatar.initial-B, +.user-profile-avatar.initial-G, +.user-profile-avatar.initial-L, +.user-profile-avatar.initial-Q, +.user-profile-avatar.initial-V { + background-color: #CB7872; +} + +.user-profile-avatar.initial-C, +.user-profile-avatar.initial-H, +.user-profile-avatar.initial-M, +.user-profile-avatar.initial-R, +.user-profile-avatar.initial-W { + background-color: #4BD55B; +} + +.user-profile-avatar.initial-D, +.user-profile-avatar.initial-I, +.user-profile-avatar.initial-N, +.user-profile-avatar.initial-S, +.user-profile-avatar.initial-X { + background-color: #D96881; +} + +.user-profile-avatar.initial-E, +.user-profile-avatar.initial-J, +.user-profile-avatar.initial-O, +.user-profile-avatar.initial-T, +.user-profile-avatar.initial-Y { + background-color: #996CD2; +} + +.user-profile-id { + font: 25px Arial; + color: #666; + letter-spacing: 0.04em; +} + +.user-profile-nickPanel { + margin-top: -2px; +} + +.user-profile-nick { + font-size: 14px; + color: #999; +} + +.user-profile-idAndNick { + display: inline-block; + padding: 2px 0 2px 12px; + vertical-align: bottom; +} + +.user-profile-container { + width: 225px; + height: 120px; +} + +.user-profile-statPanel { + display: inline-block; + min-width: 110px; +} + +.user-profile-allstats { + color: #666; +} + +.user-profile-lastLogin { + font-size: 11px; + font-family: Arial; + color: #BBB; +} \ No newline at end of file diff --git a/index.html b/index.html index 6a98456..c526260 100755 --- a/index.html +++ b/index.html @@ -71,7 +71,7 @@
  • 所有版面
  • 站内信
  • 设置
    • -
  • 已登录
    • +
  • 退出
    • ').append(entry.total)) .append($('').addClass('board-table-center') @@ -49,7 +49,7 @@ Widgets.boardEntry = function(entry, type) { view_board(entry.name, -1, -1, UI_update, 'click'); }); } else if (entry.type == bbs_type.entry.folder) { - var sortValue = 1 + ',' + entry.name; + var sortValue = 1 + ',' + ('000' + index).slice(-3); entryNode.addClass('folder-entry') .append($('')) .append($('').addClass('board-table-center') @@ -66,7 +66,7 @@ Widgets.boardEntry = function(entry, type) { } else if (entry.type == bbs_type.entry.board) { var entryName = entry.binfo.name; var isRead = (typeof(entry.binfo.read) == 'undefined' || entry.binfo.read); - var sortValue = (isRead ? 1 : 0) + ',' + entryName; + var sortValue = (isRead ? 1 : 0) + ',' + ('000' + index).slice(-3);; entryNode.addClass('board-entry') .append($('').append(entry.binfo.total)) .append($('').addClass('board-table-center') From 4cf963891327cf7c58544e396fd19596902b8601 Mon Sep 17 00:00:00 2001 From: mrroach9 Date: Sun, 25 Jan 2015 17:34:48 -0800 Subject: [PATCH 13/15] Add user profile API and render anchors for all BMs, self, post owners. Bugs: 1. Popover cannot show one at a time, confirmed as a Bootstrap 2.x bug, need to update to 3.x. 2. Click on popover will propogate to .postEntry/.boardEntry and therefore triggering post loading. 3. Hover will be triggered when touching on mobile devices. --- css/style.css | 9 ++++-- index.html | 2 +- js/bbs/bbs_UI.js | 46 +++++++++++------------------ js/bbs/bbs_utility.js | 38 ++++++++++++++++++++---- js/bbs/bbs_widgets.js | 68 ++++++++++++++++++++++++++++++++++++++----- js/bbs/config.js | 6 ++-- 6 files changed, 121 insertions(+), 48 deletions(-) diff --git a/css/style.css b/css/style.css index a7f36de..3b75b18 100644 --- a/css/style.css +++ b/css/style.css @@ -856,7 +856,7 @@ input[type="file"].fileuploadbox { } .user-profile-container { - width: 225px; + min-width: 225px; height: 120px; } @@ -867,10 +867,15 @@ input[type="file"].fileuploadbox { .user-profile-allstats { color: #666; + width: 225px; } .user-profile-lastLogin { font-size: 11px; font-family: Arial; color: #BBB; -} \ No newline at end of file +} + +.user-profile-anchor:not(:first-child) { + margin-left: 5px; +}; \ No newline at end of file diff --git a/index.html b/index.html index c526260..f1bd00d 100755 --- a/index.html +++ b/index.html @@ -71,7 +71,7 @@
  • 所有版面
  • 站内信
  • 设置
    • -
    • +
  • 退出
      • diff --git a/js/bbs/bbs_UI.js b/js/bbs/bbs_UI.js index fdcf75a..579e295 100755 --- a/js/bbs/bbs_UI.js +++ b/js/bbs/bbs_UI.js @@ -85,12 +85,18 @@ function UI_register_func() { clear_unread('', UI_update); }); - // Hide popovers when clicking outside. - $(document).on('click', '', function(e) { - if (typeof $(e.target).data('original-title') == 'undefined' && - !$(e.target).parents().is('.popover.in')) { - $('[data-original-title]').popover('hide'); - } + // If user clicks on anything outside this anchor or its popover, + // dismiss the popover. + // TODO: this has a bug in bootstrap 2.x that multiple popovers + // may show simultaneous. 3.x does not have this bug. + $(document).on('click', function (e) { + $('[data-original-title]').each(function () { + if (!$(this).is(e.target) && + $(this).has(e.target).length === 0 + && $('.popover').has(e.target).length === 0) { + $(this).popover('hide'); + } + }); }); UI_register_func_navigation(); @@ -533,29 +539,6 @@ function UI_init() { container: 'body' }); - $('.self-user-profile').popover({ - trigger: 'click', - html: true, - placement: 'bottom', - title: '', - content: function() { - return Widgets.userProfile({ - exp: 18759, - lasthost: "73.19.90.195", - lastlogin: 1421723287, - lastlogintime: "Tue Jan 20 11:08:07 2015", - life: 999, - nick: "分层设色地形图", - numlogins: 5239, - numposts: 15291, - perf: 51, - plan: "", - unread_mail: false, - userid: "Roach" - }); - } - }); - bbs_topmost_stack.splice(0); } @@ -574,6 +557,11 @@ function UI_login_finished(result) { view_boardlist(bbs_type.entry.favboard, -1, '', UI_update, 0); xmpp_connect(); + + load_user_profile('', function(response) { + $('#self-user-profile-container').empty(); + $('#self-user-profile-container').append(Widgets.userAnchor(response.userid)); + }); } else { $('#unlogged-navbar').show(); $('#unlogged-panel').show(); diff --git a/js/bbs/bbs_utility.js b/js/bbs/bbs_utility.js index 511dd97..7de1032 100755 --- a/js/bbs/bbs_utility.js +++ b/js/bbs/bbs_utility.js @@ -14,7 +14,7 @@ function clear_unread(board_name, callback_func) { var resp = $.ajax(request_settings); - resp.success(function(response){ + resp.success(function(response) { var msg = { type : 'info', content : (board_name == '') ? 'all_unread_cleared' : 'board_unread_cleared' @@ -27,7 +27,7 @@ function clear_unread(board_name, callback_func) { } }); - resp.fail(function(jqXHR, textStatus){ + resp.fail(function(jqXHR, textStatus) { var msg = { type : 'error', content : 'network_error' @@ -47,8 +47,8 @@ function upload_file(file, node, callback_func, progress_func) { type : 'POST', xhr: function() { myXhr = $.ajaxSettings.xhr(); - if(myXhr.upload && progress_func){ - myXhr.upload.addEventListener('progress', function(event){ + if(myXhr.upload && progress_func) { + myXhr.upload.addEventListener('progress', function(event) { progress_func(event, node, file.size); }, false); } @@ -87,7 +87,7 @@ function upload_file(file, node, callback_func, progress_func) { function loadContributorStat(callback_func) { var resp = $.ajax(github_stat_address); - resp.success(function(response){ + resp.success(function(response) { var authorList = []; for (var ind in response) { authorList.push(response[ind].author); @@ -105,7 +105,33 @@ function loadContributorStat(callback_func) { callback_func(authorList); }); - resp.fail(function(jqXHR, textStatus){ + resp.fail(function(jqXHR, textStatus) { callback_func(null); }); +} + +function load_user_profile(username, callback_func) { + var request_settings = { + url : bbs_query.server + bbs_query.utility.user_profile, + type: 'GET', + data: { + session: bbs_session, + id: username + } + }; + request_settings = setAjaxParam(request_settings); + var resp = $.ajax(request_settings); + + resp.success(function(response) { + var profile = JSON.parse(response); + callback_func(profile); + }); + + resp.fail(function(jqXHR, textStatus) { + var msg = { + type : 'error', + content : 'load_user_profile' + }; + UI_notify_update(msg); + }); } \ No newline at end of file diff --git a/js/bbs/bbs_widgets.js b/js/bbs/bbs_widgets.js index 4ad3965..493253a 100644 --- a/js/bbs/bbs_widgets.js +++ b/js/bbs/bbs_widgets.js @@ -16,7 +16,7 @@ Widgets.mailEntry = function(entry, type) { .append($('
    		').append(entry.id)) .append($('').addClass('board-table-center') .append((typeof(entry.read) == 'undefined' || entry.read) ? '' : newPostNode)) - .append($('').append(entry.owner)) + .append($('').append(Widgets.userAnchor(entry.owner))) .append($('').append(entry.posttime)) .append($('').append(entry.title)); @@ -28,12 +28,20 @@ Widgets.mailEntry = function(entry, type) { }; // Creates a table row for a board entry in the board lists. +// TODO: merge allboard entry and favboard entry (why were they separated!) Widgets.boardEntry = function(entry, type, index) { var newPostNode = Widgets.newMark(); var entryNode = $('
    '); + var bmAnchors = Widgets.__BMList(entry.BM); + for (var index in bmAnchors) { + bmCell.append(bmAnchors[index]); + } + entryNode.addClass('board-entry') .append($('').append(entry.total)) .append($('').addClass('board-table-center') @@ -42,7 +50,7 @@ Widgets.boardEntry = function(entry, type, index) { .append($('').append(entry.name)) .append($('').append(entry.desc)) .append($('').append(entry.currentusers)) - .append($('').append(entry.BM)); + .append(bmCell); entryNode.click(function() { UI_set_loading(); @@ -66,7 +74,14 @@ Widgets.boardEntry = function(entry, type, index) { } else if (entry.type == bbs_type.entry.board) { var entryName = entry.binfo.name; var isRead = (typeof(entry.binfo.read) == 'undefined' || entry.binfo.read); - var sortValue = (isRead ? 1 : 0) + ',' + ('000' + index).slice(-3);; + var sortValue = (isRead ? 1 : 0) + ',' + ('000' + index).slice(-3); + + var bmCell = $(''); + var bmAnchors = Widgets.__BMList(entry.binfo.BM); + for (var index in bmAnchors) { + bmCell.append(bmAnchors[index]); + } + entryNode.addClass('board-entry') .append($('').append(entry.binfo.total)) .append($('').addClass('board-table-center') @@ -75,7 +90,7 @@ Widgets.boardEntry = function(entry, type, index) { .append($('').append(entry.binfo.name)) .append($('').append(entry.binfo.desc)) .append($('').append(entry.binfo.currentusers)) - .append($('').append(entry.binfo.BM)); + .append(bmCell); entryNode.click(function() { UI_set_loading(); @@ -115,7 +130,7 @@ Widgets.postEntry = function (entry, is_sticky) { .append($('').append((is_sticky ? bbs_string.entry_sticky : entry.id))) .append($('').addClass('board-table-center').append( (typeof(entry.read) == 'undefined' || entry.read) ? '' : newPostNode)) - .append($('').append(entry.owner)) + .append($('').append(Widgets.userAnchor(entry.owner))) .append($('').append(entry.posttime)) .append($('').addClass('post-title-td') .append(entry.title) @@ -328,6 +343,43 @@ Widgets.userProfile = function(profile) { topPanel.append(avatar).append(idAndNickPanel); bottomPanel.append(statPanel).append(lastLoginPanel); - return $('
    ').addClass('user-profile-container') - .append(topPanel).append(bottomPanel); + return $('
    ').append(topPanel).append(bottomPanel); +} + +// Return a user anchor, which triggers a popover when clicked, +// loading the user's profile and render as a userProfile widget. +Widgets.userAnchor = function(userId) { + var anchor = $('').addClass('user-profile-anchor') + .attr('user-id', userId) + .append(userId); + anchor.click(function() { + var userId = $(this).attr('user-id'); + var container = $('
    ').addClass('user-profile-container') + .attr('user-id', userId); + $(this).popover({ + trigger: 'manual', + html: true, + placement: 'bottom', + content: container + }); + $(this).popover('toggle'); + load_user_profile(userId, function(response) { + container.empty(); + container.append(Widgets.userProfile(response)); + }); + // Stop propogation, otherwise it will trigger post/mail/board loading. + return false; + }); + return anchor; +} + +// Accepts a space-separated sequence of users (usually boardmasters), +// For each of them, render a user anchor and return a list of those. +Widgets.__BMList = function(bmStr) { + var bmAnchorList = []; + var bmList = bmStr.split(' '); + for (var index in bmList) { + bmAnchorList.push(Widgets.userAnchor(bmList[index])); + } + return bmAnchorList; } \ No newline at end of file diff --git a/js/bbs/config.js b/js/bbs/config.js index 88b672a..befa37d 100755 --- a/js/bbs/config.js +++ b/js/bbs/config.js @@ -64,7 +64,8 @@ var bbs_query = { }, utility : { clear_unread : '/board/clear_unread', - upload_file : '/store/new' + upload_file : '/store/new', + user_profile : '/user/query', } }; @@ -155,7 +156,8 @@ var bbs_msg = { cannot_reply : '此帖已被设置为不可回复。', cannot_post : '本版已被设置为只读。', invalid_sticky_op: '无法对置底贴进行该操作。', - cannot_delete_post : '您无权限删除该贴。' + cannot_delete_post : '您无权限删除该贴。', + load_user_profile : '获取用户信息失败。' }, warning : { class_name : 'alert alert-block', From 1f06477bb637e01eb06b423af4db1793f3dfd185 Mon Sep 17 00:00:00 2001 From: mrroach9 Date: Sun, 25 Jan 2015 23:14:17 -0800 Subject: [PATCH 14/15] Many fixes on user profile: 1. Fixed multi popover issue. 2. Remove animation to avoid render before popover. 3. CSS adjustment to avoid Ebonnov's super long nick crash. --- css/style.css | 5 +++++ js/bbs/bbs_UI.js | 22 +++++++++++----------- js/bbs/bbs_widgets.js | 7 +++++-- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/css/style.css b/css/style.css index 3b75b18..7538fc2 100644 --- a/css/style.css +++ b/css/style.css @@ -847,6 +847,9 @@ input[type="file"].fileuploadbox { .user-profile-nick { font-size: 14px; color: #999; + display: block; + overflow-x: hidden; + white-space: nowrap; } .user-profile-idAndNick { @@ -874,6 +877,8 @@ input[type="file"].fileuploadbox { font-size: 11px; font-family: Arial; color: #BBB; + margin-top: 3px; + display: block; } .user-profile-anchor:not(:first-child) { diff --git a/js/bbs/bbs_UI.js b/js/bbs/bbs_UI.js index 579e295..713e2e1 100755 --- a/js/bbs/bbs_UI.js +++ b/js/bbs/bbs_UI.js @@ -87,17 +87,7 @@ function UI_register_func() { // If user clicks on anything outside this anchor or its popover, // dismiss the popover. - // TODO: this has a bug in bootstrap 2.x that multiple popovers - // may show simultaneous. 3.x does not have this bug. - $(document).on('click', function (e) { - $('[data-original-title]').each(function () { - if (!$(this).is(e.target) && - $(this).has(e.target).length === 0 - && $('.popover').has(e.target).length === 0) { - $(this).popover('hide'); - } - }); - }); + $(document).on('click', UI_closeUnfocusedPopover); UI_register_func_navigation(); UI_register_func_post_modal(); @@ -775,4 +765,14 @@ function UI_OnLoadContributors(authorList) { $('.ctrbtr-list-panel').append( Widgets.githubAuthorWidget(authorList[ind])); } +} + +function UI_closeUnfocusedPopover(e) { + $('[data-original-title]').each(function () { + if (!$(this).is(e.target) && + $(this).has(e.target).length === 0 + && $('.popover').has(e.target).length === 0) { + $(this).popover('hide'); + } + }); } \ No newline at end of file diff --git a/js/bbs/bbs_widgets.js b/js/bbs/bbs_widgets.js index 493253a..b5c68ac 100644 --- a/js/bbs/bbs_widgets.js +++ b/js/bbs/bbs_widgets.js @@ -352,7 +352,7 @@ Widgets.userAnchor = function(userId) { var anchor = $('').addClass('user-profile-anchor') .attr('user-id', userId) .append(userId); - anchor.click(function() { + anchor.click(function(e) { var userId = $(this).attr('user-id'); var container = $('
    ').addClass('user-profile-container') .attr('user-id', userId); @@ -360,13 +360,16 @@ Widgets.userAnchor = function(userId) { trigger: 'manual', html: true, placement: 'bottom', - content: container + content: container, + container: 'body', + animation: false }); $(this).popover('toggle'); load_user_profile(userId, function(response) { container.empty(); container.append(Widgets.userProfile(response)); }); + UI_closeUnfocusedPopover(e); // Stop propogation, otherwise it will trigger post/mail/board loading. return false; }); From 81824b84ac00d0ddaff2027dbb8cace734c0bfde Mon Sep 17 00:00:00 2001 From: mrroach9 Date: Sun, 25 Jan 2015 23:17:53 -0800 Subject: [PATCH 15/15] Disconnect xmpp after logout. Version number changed to 0.3.3, ready to go! --- js/bbs/bbs_UI.js | 1 + js/bbs/bbs_xmpp.js | 3 +++ js/bbs/config.js | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/bbs/bbs_UI.js b/js/bbs/bbs_UI.js index 713e2e1..ba03e7c 100755 --- a/js/bbs/bbs_UI.js +++ b/js/bbs/bbs_UI.js @@ -564,6 +564,7 @@ function UI_login_finished(result) { function UI_logout() { removeSessionCookie(); Accounts9.removeSessionCookie(); + xmpp_disconnect(); bbs_topmost_stack.splice(0); $('#unlogged-navbar').show(); $('#unlogged-panel').show(); diff --git a/js/bbs/bbs_xmpp.js b/js/bbs/bbs_xmpp.js index 903d1f3..10438b9 100644 --- a/js/bbs/bbs_xmpp.js +++ b/js/bbs/bbs_xmpp.js @@ -85,7 +85,10 @@ function xmpp_connect() { onPresence: xmpp_presence, onError: xmpp_error }); +} +function xmpp_disconnect() { + $.xmpp.disconnect(null); } function xmpp_connected() { diff --git a/js/bbs/config.js b/js/bbs/config.js index befa37d..2a8052e 100755 --- a/js/bbs/config.js +++ b/js/bbs/config.js @@ -6,9 +6,9 @@ var bbs_string = { favboard_name : '收藏夹', allboard_name : '所有版面', mailbox_name : '站内信', - title : '9# BBS - Rowell v0.3.2', - version : '0.3.2', - send_source : '[Sent from Rowell v0.3.2]', + title : '9# BBS - Rowell v0.3.3', + version : '0.3.3', + send_source : '[Sent from Rowell v0.3.3]', unimpltd_title : '矮油', unimpltd_text : '此功能尚未实现，我们将在后续版本中添加，敬请谅解。', entry_folder : '[目录]',