Change: move user matching to More dropdown

This commit is contained in:
Cutls 2019-08-24 21:19:52 +09:00
parent 845c9a0f2e
commit 1b68cdf7db
10 changed files with 122 additions and 109 deletions

View File

@ -116,7 +116,11 @@
justify-content: center;
align-items: center;
font-size: 2rem;
width: 90%;
height: 100%;
position: absolute;
}
#hisdropdown{
background-color: var(--bg);
}
#hisdropdown li:hover{
background-color: var(--active);
}

View File

@ -622,12 +622,17 @@ function showMat() {
var templete = "";
Object.keys(json).forEach(function (key) {
var user = json[key];
if (user.avatar) {
var avatar = user.avatar
} else {
var avatar = "../../img/loading.svg"
}
templete = templete +
'<div class="" style="padding-top:5px;">' +
'<div style="padding:0; margin:0; width:400px; max-width:100%; display:flex; align-items:flex-end;">' +
'<div style="flex-basis:40px;"><a onclick="udgEx(\'' + user.user + '\',' +
acct_id + ');" user="' + user.user + '" class="udg">' +
'<img src="' + user.avatar + '" width="40" class="prof-img" user="' + user.user + '"></a></div>' +
'<img src="' + avatar + '" width="40" class="prof-img" user="' + user.user + '"></a></div>' +
'<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"><big>' +
escapeHTML(user.screen_name) + '</big></div>' +
'<div class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"> @' +

View File

@ -79,8 +79,10 @@ function udg(user, acct_id) {
}
//moved設定時
if (json.moved) {
M.toast({ html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' +
json.moved.id + '\',\'' + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>', displayLength: 4000 })
M.toast({
html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' +
json.moved.id + '\',\'' + acct_id + '\')">' + lang.lang_showontl_movebtn + '</button>', displayLength: 4000
})
}
$('#his-data').modal('open');
$('#his-data').attr("user-id", user);
@ -403,8 +405,9 @@ function relations(user, acct_id) {
}
//Blocked
if (json.blocked_by) {
$("#his-float-timeline").hide();
$("#his-float-blocked").show();
$("#my-data-nav .btn").addClass("disabled")
$(".his-var-content").hide();
$("#his-float-blocked").show()
$("#his-follow-btn").hide()
}
@ -430,6 +433,7 @@ function hisclose() {
function reset() {
$(".his-var-content:eq(0)").show();
$(".his-var-content:gt(0)").hide();
$("#my-data-nav .btn").removeClass("disabled")
$(".active-back").removeClass("active-back");
$(".column-first").addClass("active-back");
$("#his-name").text("Loading");

View File

@ -458,14 +458,6 @@
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data"
id="his-main-acct" onclick="setMain()"
style="width: calc(100% - 10px)">Set it an main account</a><br>
</div><br>
<div id="his-matching-list">
Намерете хора подобни на този потребител.<br>
Powered by <a href="https://vinayaka.distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()"
style="width:100%;">Намери</button>
</div>
</div>
</div>
@ -494,7 +486,7 @@
</li>
<li class="anc-link only-my-data" go="#his-domain-list">
<a href="#" title="Блок домейн"><i
class="material-icons">language</i>Блок домейн</a>
class="material-icons">cancel_schedule_send</i>Блок домейн</a>
</li>
<li class="anc-link only-my-data" go="#his-prof-list">
<a href="#" title="Редактиране на профила"><i
@ -511,8 +503,9 @@
<a href="#" title="Свързан-профил"><i
class="material-icons">account_box</i>Свързан-профил</a>
</li>
<li class="only-his-data">
<a href="#">Coming soon...</a>
<li class="anc-link" go="#his-matching-list">
<a href="#" title="Намерете хора подобни на този потребител."><i
class="material-icons">group_work</i>User Matching</a>
</li>
</ul>
</div>
@ -607,13 +600,20 @@
<div id="his-follow-recom-contents" class="cont-series">
</div>
</div>
<div id="his-matching-list" class="his-var-content">
Намерете хора подобни на този потребител.<br>
Powered by <a href="https://distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()" style="width:100%; padding:0;">Намери</button>
</div>
<div class="his-float" id="his-float-blocked">
<div id="his-float-blocked">
<div>Вие сте блокирани. Защо?</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn"
onclick="historyShow()">Назад</button>

View File

@ -458,14 +458,6 @@
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data"
id="his-main-acct" onclick="setMain()"
style="width: calc(100% - 10px)">Set it an main account</a><br>
</div><br>
<div id="his-matching-list">
Get people resembling this user.<br>
Powered by <a href="https://vinayaka.distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()"
style="width:100%;">Get</button>
</div>
</div>
</div>
@ -494,7 +486,7 @@
</li>
<li class="anc-link only-my-data" go="#his-domain-list">
<a href="#" title="Domain block"><i
class="material-icons">language</i>Domain block</a>
class="material-icons">cancel_schedule_send</i>Domain block</a>
</li>
<li class="anc-link only-my-data" go="#his-prof-list">
<a href="#" title="Edit profile"><i
@ -511,8 +503,9 @@
<a href="#" title="Cross-account"><i
class="material-icons">account_box</i>Cross-account</a>
</li>
<li class="only-his-data">
<a href="#">Coming soon...</a>
<li class="anc-link" go="#his-matching-list">
<a href="#" title="Get people resembling this user."><i
class="material-icons">group_work</i>User Matching</a>
</li>
</ul>
</div>
@ -607,13 +600,20 @@
<div id="his-follow-recom-contents" class="cont-series">
</div>
</div>
<div id="his-matching-list" class="his-var-content">
Get people resembling this user.<br>
Powered by <a href="https://distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()" style="width:100%; padding:0;">Get</button>
</div>
<div class="his-float" id="his-float-blocked">
<div id="his-float-blocked">
<div>You are blocked. Why?</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn"
onclick="historyShow()">Zpět</button>

View File

@ -458,14 +458,6 @@
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data"
id="his-main-acct" onclick="setMain()"
style="width: calc(100% - 10px)">Im Hauptkonto einstellen</a><br>
</div><br>
<div id="his-matching-list">
Get people resembling this user.<br>
Powered by <a href="https://vinayaka.distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()"
style="width:100%;">Holen</button>
</div>
</div>
</div>
@ -494,7 +486,7 @@
</li>
<li class="anc-link only-my-data" go="#his-domain-list">
<a href="#" title="Domain block"><i
class="material-icons">language</i>Domain block</a>
class="material-icons">cancel_schedule_send</i>Domain block</a>
</li>
<li class="anc-link only-my-data" go="#his-prof-list">
<a href="#" title="Profil bearbeiten"><i
@ -511,8 +503,9 @@
<a href="#" title="Cross-Account"><i
class="material-icons">account_box</i>Cross-Account</a>
</li>
<li class="only-his-data">
<a href="#">Coming soon...</a>
<li class="anc-link" go="#his-matching-list">
<a href="#" title="Get people resembling this user."><i
class="material-icons">group_work</i>User Matching</a>
</li>
</ul>
</div>
@ -607,13 +600,20 @@
<div id="his-follow-recom-contents" class="cont-series">
</div>
</div>
<div id="his-matching-list" class="his-var-content">
Get people resembling this user.<br>
Powered by <a href="https://distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()" style="width:100%; padding:0;">Holen</button>
</div>
<div class="his-float" id="his-float-blocked">
<div id="his-float-blocked">
<div>Sie sind blockiert. Warum?</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn"
onclick="historyShow()">Zurück</button>

View File

@ -458,14 +458,6 @@
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data"
id="his-main-acct" onclick="setMain()"
style="width: calc(100% - 10px)">Set it an main account</a><br>
</div><br>
<div id="his-matching-list">
Get people resembling this user.<br>
Powered by <a href="https://vinayaka.distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()"
style="width:100%;">Get</button>
</div>
</div>
</div>
@ -494,7 +486,7 @@
</li>
<li class="anc-link only-my-data" go="#his-domain-list">
<a href="#" title="Domain block"><i
class="material-icons">language</i>Domain block</a>
class="material-icons">cancel_schedule_send</i>Domain block</a>
</li>
<li class="anc-link only-my-data" go="#his-prof-list">
<a href="#" title="Edit profile"><i
@ -511,8 +503,9 @@
<a href="#" title="Cross-account"><i
class="material-icons">account_box</i>Cross-account</a>
</li>
<li class="only-his-data">
<a href="#">Coming soon...</a>
<li class="anc-link" go="#his-matching-list">
<a href="#" title="Get people resembling this user."><i
class="material-icons">group_work</i>User Matching</a>
</li>
</ul>
</div>
@ -607,13 +600,20 @@
<div id="his-follow-recom-contents" class="cont-series">
</div>
</div>
<div id="his-matching-list" class="his-var-content">
Get people resembling this user.<br>
Powered by <a href="https://distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()" style="width:100%; padding:0;">Get</button>
</div>
<div class="his-float" id="his-float-blocked">
<div id="his-float-blocked">
<div>You are blocked. Why?</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn"
onclick="historyShow()">Back</button>

View File

@ -458,14 +458,6 @@
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data"
id="his-main-acct" onclick="setMain()"
style="width: calc(100% - 10px)">メインアカウントに設定</a><br>
</div><br>
<div id="his-matching-list">
似ているユーザーを取得できます。<br>
Powered by <a href="https://vinayaka.distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()"
style="width:100%;">取得</button>
</div>
</div>
</div>
@ -494,7 +486,7 @@
</li>
<li class="anc-link only-my-data" go="#his-domain-list">
<a href="#" title="ドメインブロック"><i
class="material-icons">language</i>ドメインブロック</a>
class="material-icons">cancel_schedule_send</i>ドメインブロック</a>
</li>
<li class="anc-link only-my-data" go="#his-prof-list">
<a href="#" title="プロフィール編集"><i
@ -511,8 +503,9 @@
<a href="#" title="他のアカウントで操作"><i
class="material-icons">account_box</i>他のアカウントで操作</a>
</li>
<li class="only-his-data">
<a href="#">Coming soon...</a>
<li class="anc-link" go="#his-matching-list">
<a href="#" title="似ているユーザーを取得できます。"><i
class="material-icons">group_work</i>User Matching</a>
</li>
</ul>
</div>
@ -607,13 +600,20 @@
<div id="his-follow-recom-contents" class="cont-series">
</div>
</div>
<div id="his-matching-list" class="his-var-content">
似ているユーザーを取得できます。<br>
Powered by <a href="https://distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()" style="width:100%; padding:0;">取得</button>
</div>
<div class="his-float" id="his-float-blocked">
<div id="his-float-blocked">
<div>ブロックされています。なぜでしょう?</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn"
onclick="historyShow()">一つ前のユーザーデータ</button>

View File

@ -458,14 +458,6 @@
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data"
id="his-main-acct" onclick="setMain()"
style="width: calc(100% - 10px)">@@mainacct@@</a><br>
</div><br>
<div id="his-matching-list">
@@likeUserDes@@<br>
Powered by <a href="https://vinayaka.distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()"
style="width:100%;">@@get@@</button>
</div>
</div>
</div>
@ -494,7 +486,7 @@
</li>
<li class="anc-link only-my-data" go="#his-domain-list">
<a href="#" title="@@domainBlock@@"><i
class="material-icons">language</i>@@domainBlock@@</a>
class="material-icons">cancel_schedule_send</i>@@domainBlock@@</a>
</li>
<li class="anc-link only-my-data" go="#his-prof-list">
<a href="#" title="@@editProf@@"><i
@ -511,8 +503,9 @@
<a href="#" title="@@operateOtherAcct@@"><i
class="material-icons">account_box</i>@@operateOtherAcct@@</a>
</li>
<li class="only-his-data">
<a href="#">Coming soon...</a>
<li class="anc-link" go="#his-matching-list">
<a href="#" title="@@likeUserDes@@"><i
class="material-icons">group_work</i>User Matching</a>
</li>
</ul>
</div>
@ -607,13 +600,20 @@
<div id="his-follow-recom-contents" class="cont-series">
</div>
</div>
<div id="his-matching-list" class="his-var-content">
@@likeUserDes@@<br>
Powered by <a href="https://distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()" style="width:100%; padding:0;">@@get@@</button>
</div>
<div class="his-float" id="his-float-blocked">
<div id="his-float-blocked">
<div>@@blocked@@</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn"
onclick="historyShow()">@@historyBack@@</button>

View File

@ -458,14 +458,6 @@
<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data"
id="his-main-acct" onclick="setMain()"
style="width: calc(100% - 10px)">@@mainacct@@</a><br>
</div><br>
<div id="his-matching-list">
crwdns469:0crwdne469:0<br>
Powered by <a href="https://vinayaka.distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()"
style="width:100%;">crwdns470:0crwdne470:0</button>
</div>
</div>
</div>
@ -494,7 +486,7 @@
</li>
<li class="anc-link only-my-data" go="#his-domain-list">
<a href="#" title="crwdns450:0crwdne450:0"><i
class="material-icons">language</i>crwdns450:0crwdne450:0</a>
class="material-icons">cancel_schedule_send</i>crwdns450:0crwdne450:0</a>
</li>
<li class="anc-link only-my-data" go="#his-prof-list">
<a href="#" title="crwdns451:0crwdne451:0"><i
@ -511,8 +503,9 @@
<a href="#" title="crwdns443:0crwdne443:0"><i
class="material-icons">account_box</i>crwdns443:0crwdne443:0</a>
</li>
<li class="only-his-data">
<a href="#">Coming soon...</a>
<li class="anc-link" go="#his-matching-list">
<a href="#" title="crwdns469:0crwdne469:0"><i
class="material-icons">group_work</i>User Matching</a>
</li>
</ul>
</div>
@ -607,13 +600,20 @@
<div id="his-follow-recom-contents" class="cont-series">
</div>
</div>
<div id="his-matching-list" class="his-var-content">
crwdns469:0crwdne469:0<br>
Powered by <a href="https://distsn.org/" target="_blank">Mastodon User
Matching</a><br>
<div id="his-matching-list-contents" class="cont-series"></div>
<button class="btn waves-effect " onclick="showMat()" style="width:100%; padding:0;">crwdns470:0crwdne470:0</button>
</div>
<div class="his-float" id="his-float-blocked">
<div id="his-float-blocked">
<div>@@blocked@@</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button class="modal-action waves-effect waves-green btn-flat" id="his-history-btn"
onclick="historyShow()">crwdns471:0crwdne471:0</button>