Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21 from cutls/WIP-(before-CI)

Browse Source 
THeDesk Miria (17.1.0) complete
This commit is contained in:
Cutls 2019-03-06 21:24:29 +09:00 committed by GitHub
commit 412791975c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/css/themes.css
View File

@ -22,7 +22,7 @@
--bg:#212121; --bg:#212121;
--drag:rgba(0, 0, 0, 0.8); --drag:rgba(0, 0, 0, 0.8);
--color:white; --color:white;
--beforehover:#e0e0e0; --beforehover:#9e9e9e;
--modal:black; --modal:black;
--subcolor:#212121; --subcolor:#212121;
--box:#424242; --box:#424242;
@ -42,7 +42,7 @@
--bg:#031833; --bg:#031833;
--drag:rgba(0, 0, 0, 0.8); --drag:rgba(0, 0, 0, 0.8);
--color:white; --color:white;
--beforehover:#e0e0e0; --beforehover:#9e9e9e;
--modal:#0d1351; --modal:#0d1351;
--subcolor:#0d1351; --subcolor:#0d1351;
--shared:#004d40; --shared:#004d40;
@ -62,7 +62,7 @@
--bg:#261411; --bg:#261411;
--drag:rgba(0, 0, 0, 0.8); --drag:rgba(0, 0, 0, 0.8);
--color:white; --color:white;
--beforehover:#e0e0e0; --beforehover:#9e9e9e;
--modal:#261411; --modal:#261411;
--subcolor:#4e342e; --subcolor:#4e342e;
--shared:#004d40; --shared:#004d40;

18
app/css/tl.css
View File

@ -229,6 +229,9 @@ grid-area: toot;
margin:2px; margin:2px;
grid-area: side; grid-area: side;
} }
.btn-flat{
color:var(--color);
}
.area-side i{ .area-side i{
margin-left:10px; margin-left:10px;
} }
@ -238,11 +241,13 @@ grid-area: toot;
.action i{ .action i{
font-size:1.2rem; font-size:1.2rem;
margin-right:2px; margin-right:2px;
}
.actct{
color:var(--beforehover); color:var(--beforehover);
} }
.action i:hover{ .actct:hover{
color:var(--color); color:var(--color);
transition: 1s; transition: 0.5s;
} }
.gray { .gray {
@ -426,9 +431,6 @@ p:not(:last-child){
bottom:0px; bottom:0px;
right:0px; right:0px;
} }
.btn-flat{
color:var(--color);
}
.toot a span.ellipsis:after{ .toot a span.ellipsis:after{
content:"..."; content:"...";
} }
@ -468,8 +470,8 @@ p:not(:last-child){
} }
.votebtn{ .votebtn{
border: 1px solid; border: 1px solid;
color: var(--color); color: var(--bg);
background-color: var(--modal); background-color: var(--beforehover);
cursor:pointer; cursor:pointer;
width: 50px; width: 50px;
padding: 2px; padding: 2px;
@ -480,7 +482,7 @@ p:not(:last-child){
transition-duration: 0.5s; transition-duration: 0.5s;
} }
.votebtn:hover{ .votebtn:hover{
background-color:transparent; background-color:var(--color);
} }
@keyframes fadeInDown { @keyframes fadeInDown {
from { from {

8
app/js/post/post.js
View File

@ -141,6 +141,11 @@ function post(mode,postvis) {
}else{ }else{
var mul=false; var mul=false;
} }
if($("#poll-until:checked").val()=="1"){
var htt=true;
}else{
var htt=false;
}
var exin=pollCalc(); var exin=pollCalc();
if(!exin){ if(!exin){
todc("Error: Poll expires_in param") todc("Error: Poll expires_in param")
@ -148,7 +153,8 @@ function post(mode,postvis) {
toot.poll={ toot.poll={
options: options, options: options,
expires_in: exin, expires_in: exin,
multiple: mul multiple: mul,
hide_totals: htt
} }
} }
console.log(toot); console.log(toot);

36
app/js/tl/parse.js
View File

@ -169,7 +169,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
Object.keys(toot.account.emojis).forEach(function(key5) { Object.keys(toot.account.emojis).forEach(function(key5) {
var emoji = toot.account.emojis[key5]; var emoji = toot.account.emojis[key5];
var shortcode = emoji.shortcode; var shortcode = emoji.shortcode;
var emoji_url = '<img src="' + emoji.url + var emoji_url = '<img draggable="false" src="' + emoji.url +
'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">'; '" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
var regExp = new RegExp(":" + shortcode + ":", "g"); var regExp = new RegExp(":" + shortcode + ":", "g");
dis_name = dis_name.replace(regExp, emoji_url); dis_name = dis_name.replace(regExp, emoji_url);
@ -185,7 +185,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
} }
noticeavatar='<a onclick="udg(\'' + toot.account.id + noticeavatar='<a onclick="udg(\'' + toot.account.id +
'\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' + '\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' +
'<img src="' + noticeavatar + '<img draggable="false" src="' + noticeavatar +
'" width="20" class="notf-icon prof-img" user="' + toot.account.acct + '" width="20" class="notf-icon prof-img" user="' + toot.account.acct +
'"></a>'; '"></a>';
if (toot.type == "mention") { if (toot.type == "mention") {
@ -294,7 +294,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
} }
noticeavatar='<a onclick="udg(\'' + toot.account.id + noticeavatar='<a onclick="udg(\'' + toot.account.id +
'\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' + '\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' +
'<img src="' + noticeavatar + '<img draggable="false" src="' + noticeavatar +
'" width="20" class="notf-icon prof-img" user="' + toot.account.acct + '" width="20" class="notf-icon prof-img" user="' + toot.account.acct +
'"></a>'; '"></a>';
var rebtxt = lang.lang_parse_btedsimple; var rebtxt = lang.lang_parse_btedsimple;
@ -321,7 +321,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
Object.keys(toot.account.emojis).forEach(function(key5) { Object.keys(toot.account.emojis).forEach(function(key5) {
var emoji = toot.account.emojis[key5]; var emoji = toot.account.emojis[key5];
var shortcode = emoji.shortcode; var shortcode = emoji.shortcode;
var emoji_url = '<img src="' + emoji.url + var emoji_url = '<img draggable="false" src="' + emoji.url +
'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">'; '" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
var regExp = new RegExp(":" + shortcode + ":", "g"); var regExp = new RegExp(":" + shortcode + ":", "g");
dis_name = dis_name.replace(regExp, emoji_url); dis_name = dis_name.replace(regExp, emoji_url);
@ -432,7 +432,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
Object.keys(toot.emojis).forEach(function(key5) { Object.keys(toot.emojis).forEach(function(key5) {
var emoji = toot.emojis[key5]; var emoji = toot.emojis[key5];
var shortcode = emoji.shortcode; var shortcode = emoji.shortcode;
var emoji_url = '<img src="' + emoji.url + var emoji_url = '<img draggable="false" src="' + emoji.url +
'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">'; '" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
var regExp = new RegExp(":" + shortcode + ":", "g"); var regExp = new RegExp(":" + shortcode + ":", "g");
content = content.replace(regExp, emoji_url); content = content.replace(regExp, emoji_url);
@ -450,7 +450,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
Object.keys(toot.profile_emojis).forEach(function(keynico) { Object.keys(toot.profile_emojis).forEach(function(keynico) {
var emoji = toot.profile_emojis[keynico]; var emoji = toot.profile_emojis[keynico];
var shortcode = emoji.shortcode; var shortcode = emoji.shortcode;
var emoji_url = '<img src="' + emoji.url + var emoji_url = '<img draggable="false" src="' + emoji.url +
'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">'; '" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
var regExp = new RegExp(":" + shortcode + ":", "g"); var regExp = new RegExp(":" + shortcode + ":", "g");
content = content.replace(regExp, emoji_url); content = content.replace(regExp, emoji_url);
@ -489,7 +489,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
} }
viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' + viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' +
acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url + acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url +
'" data-type="' + media.type + '" class="img-parsed"><img src="' + '" data-type="' + media.type + '" class="img-parsed"><img draggable="false" src="' +
purl + '" class="' + sense + purl + '" class="' + sense +
' toot-img pointer" style="width:' + cwdt + '%; height:'+imh+'px;"></a></span>'; ' toot-img pointer" style="width:' + cwdt + '%; height:'+imh+'px;"></a></span>';
}); });
@ -624,7 +624,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
var cards=toot.card; var cards=toot.card;
if (cards.provider_name=="Twitter"){ if (cards.provider_name=="Twitter"){
if(cards.image){ if(cards.image){
var twiImg='<br><img src="'+cards.image+'">'; var twiImg='<br><img draggable="false" src="'+cards.image+'">';
}else{ }else{
var twiImg=''; var twiImg='';
} }
@ -653,7 +653,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
for( var i=0; i<tickerdata.length; i++) { for( var i=0; i<tickerdata.length; i++) {
var value=tickerdata[i]; var value=tickerdata[i];
if(value.domain==thisdomain){ if(value.domain==thisdomain){
var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>'; var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img draggable="false" src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
break; break;
} }
} }
@ -668,7 +668,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
var result_hide=""; var result_hide="";
}else{ }else{
myvote='<a onclick="voteMastodon(\''+acct_id+'\',\''+toot.poll.id+'\')" class="votebtn">'+lang.lang_parse_vote+'</a><br>'; myvote='<a onclick="voteMastodon(\''+acct_id+'\',\''+toot.poll.id+'\')" class="votebtn">'+lang.lang_parse_vote+'</a><br>';
myvote=myvote+'<a onclick="showResult(\''+acct_id+'\',\''+toot.poll.id+'\')" class="pointer">'+lang.lang_parse_unvoted+"</a>"; if(choices[0].votes_count===0 || choices[0].votes_count>0){
myvote=myvote+'<a onclick="showResult(\''+acct_id+'\',\''+toot.poll.id+'\')" class="pointer">'+lang.lang_parse_unvoted+"</a>";
}
var result_hide="hide"; var result_hide="hide";
} }
Object.keys(choices).forEach(function(keyc) { Object.keys(choices).forEach(function(keyc) {
@ -694,7 +696,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
'</span></div>' + '</span></div>' +
'<div class="area-icon"><a onclick="udg(\'' + toot.account.id + '<div class="area-icon"><a onclick="udg(\'' + toot.account.id +
'\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' + '\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' +
'<img src="' + avatar + '<img draggable="false" src="' + avatar +
'" width="40" class="prof-img" user="' + toot.account.acct + '" width="40" class="prof-img" user="' + toot.account.acct +
'"></a>'+noticeavatar+'</div>' + '"></a>'+noticeavatar+'</div>' +
'<div class="area-display_name"><div class="flex-name"><span class="user">' + '<div class="area-display_name"><div class="flex-name"><span class="user">' +
@ -721,19 +723,19 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
'<div class="action '+disp["re"]+' '+noauth+'"><a onclick="re(\'' + toot.id + '<div class="action '+disp["re"]+' '+noauth+'"><a onclick="re(\'' + toot.id +
'\',\'' + toot.account.acct + '\',' + '\',\'' + toot.account.acct + '\',' +
acct_id + ',\''+visen+ acct_id + ',\''+visen+
'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i><span class="rep_ct">' + replyct + '\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i><span class="rep_ct">' + replyct +
'</a></span></a></div>' + '</a></span></a></div>' +
'<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="rt(\'' + toot.id + '\',' + acct_id + '<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="rt(\'' + toot.id + '\',' + acct_id +
',\'' + tlid + ',\'' + tlid +
'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_bt+'"><i class="text-darken-3 fa fa-retweet ' + '\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_bt+'"><i class="fa fa-retweet ' +
if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct">' + toot.reblogs_count + if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct">' + toot.reblogs_count +
'</span></a></div>' + '</span></a></div>' +
'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+'"><a onclick="qt(\'' + toot.id + '\',' + acct_id + '<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+'"><a onclick="qt(\'' + toot.id + '\',' + acct_id +
',\'' + toot.account.acct +'\',\''+toot.url+ ',\'' + toot.account.acct +'\',\''+toot.url+
'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_quote+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' + '\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_quote+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
'<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="fav(\'' + toot.id + '\',' + acct_id + '<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="fav(\'' + toot.id + '\',' + acct_id +
',\'' + tlid + ',\'' + tlid +
'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_fav+'"><i class="fa text-darken-3 fa-star' + '\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_fav+'"><i class="fa text-darken-3 fa-star' +
if_fav + ' fav_' + toot.id + '"></i><span class="fav_ct">' + toot.favourites_count + if_fav + ' fav_' + toot.id + '"></i><span class="fav_ct">' + toot.favourites_count +
'</a></span></div>' + '</a></span></div>' +
'<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' + '<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' +
@ -849,7 +851,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
Object.keys(toot.emojis).forEach(function(key5) { Object.keys(toot.emojis).forEach(function(key5) {
var emoji = toot.emojis[key5]; var emoji = toot.emojis[key5];
var shortcode = emoji.shortcode; var shortcode = emoji.shortcode;
var emoji_url = '<img src="' + emoji.url + var emoji_url = '<img draggable="false" src="' + emoji.url +
'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">'; '" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
var regExp = new RegExp(":" + shortcode + ":", "g"); var regExp = new RegExp(":" + shortcode + ":", "g");
dis_name = dis_name.replace(regExp, emoji_url); dis_name = dis_name.replace(regExp, emoji_url);
@ -869,7 +871,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
notftext + notftext +
'</div><div class="area-icon"><a onclick="udg(\'' + toot.id + '\',' + '</div><div class="area-icon"><a onclick="udg(\'' + toot.id + '\',' +
acct_id + ');" user="' + toot.acct + '" class="udg">' + acct_id + ');" user="' + toot.acct + '" class="udg">' +
'<img src="' + avatar + '" width="40" class="prof-img" user="' + toot '<img draggable="false" src="' + avatar + '" width="40" class="prof-img" user="' + toot
.acct + '"></a></div>' + .acct + '"></a></div>' +
'<div class="area-display_name"><div class="flex-name"><span class="user">' + '<div class="area-display_name"><div class="flex-name"><span class="user">' +
dis_name + '</span>' + dis_name + '</span>' +

6
app/js/tl/tl.js
View File

@ -53,14 +53,14 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
"user_" + acct_id) + "@" + domain + ")"); "user_" + acct_id) + "@" + domain + ")");
$("#notice_icon_" + tlid).text("notifications"); $("#notice_icon_" + tlid).text("notifications");
return; return;
}else if (type == "dm") { }/*else if (type == "dm") {
//DMなら飛ばす //DMなら飛ばす
dm(acct_id, tlid, "plus",delc,voice); dm(acct_id, tlid, "plus",delc,voice);
$("#notice_" + tlid).text(cap(type, data, acct_id) + "(" + localStorage.getItem( $("#notice_" + tlid).text(cap(type, data, acct_id) + "(" + localStorage.getItem(
"user_" + acct_id) + "@" + domain + ")"); "user_" + acct_id) + "@" + domain + ")");
$("#notice_icon_" + tlid).text("notifications"); $("#notice_icon_" + tlid).text("notifications");
return; return;
} }*/
localStorage.setItem("now", type); localStorage.setItem("now", type);
todo(cap(type) + " TL Loading..."); todo(cap(type) + " TL Loading...");
var at = localStorage.getItem("acct_"+ acct_id + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
@ -579,7 +579,7 @@ function com(type, data) {
}else if (type == "list") { }else if (type == "list") {
return "list/" + data + "?" return "list/" + data + "?"
}else if (type="dm") { }else if (type="dm") {
return "/api/v1/conversations?" return "direct?"
} }
} }
function misskeycom(type, data) { function misskeycom(type, data) {

33
app/view/en/index.html
View File

@ -32,7 +32,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script> <script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver="Miria (17.0.2)"; var ver="Miria (17.1.0) beta1";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@ -273,6 +273,8 @@ var tlid=0;
<input type="text" class="mastodon-choice" placeholder="Choice4"> <input type="text" class="mastodon-choice" placeholder="Choice4">
<input type="checkbox" class="filled-in" id="poll-multiple" value="1" /> <input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
<label for="poll-multiple">Multiple select</label><br> <label for="poll-multiple">Multiple select</label><br>
<input type="checkbox" class="filled-in" id="poll-until" value="1" />
<label for="poll-until">Hide 'votes' count until people vote it.</label><br>
<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">days <input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">days
<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">hours <input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">hours
<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">minutes <input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">minutes
@ -337,17 +339,17 @@ var tlid=0;
</ul> </ul>
Use other account(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>:unfav and unBT are disabled.)<br> Use other account(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>:unfav and unBT are disabled.)<br>
<div class="row"> <div class="row">
<div class="col s4"> <div class="col s6">
<select id="status-acct-sel" class="acct-sel"></select> <select id="status-acct-sel" class="acct-sel"></select>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share left"></i>Reply</button> <button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet left"></i>Boost</button> <button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
</div> </div>
<div class="col s3"> <div class="col s2">
<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star left"></i>Favourite</button> <button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
</div> </div>
</div> </div>
<div id="toot-tools"> <div id="toot-tools">
@ -580,22 +582,17 @@ var tlid=0;
<a href="https://thedesk.top" target="_blank">HP</a><br> <a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br> <br>
<div id="release-Miria_17-0-2" class="release-do" style="display:none; "> <div id="release-Miria_17-1-0" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br> <a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br> <a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br> Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Miria (17.0.2)</h5> <h5>Release Note Miria (17.1.0)</h5>
バグ修正<br> トゥートボックスがフロートタイプに。左下、右下以外にも自由においてください。<br>
ブーストを除外できる<br> いろいろとアニメーション入れた(硬派な方は設定「タイムラインの設定」からオフに)<br>
<u>17.0.1</u><br> アンケートができるように(OK:Mastodon (2.8~)/WIP: votedon./ NG: ニコフレ)<br>
バグ修正<br> フォント選択機能が復活<br>
(Mastodon 2.7)<b>時間指定投稿が利用できます。</b><br> WindowsからiTunesやAIMP、その他CAD系のNowPlayingができるように。要プラグインのソフトもある。<br>
(Mastodon 2.7)<b>「インスタンス」を「サーバー」に変更</b><br>
CW付きのトゥートの再編集に対応<br>
インストール場所が指定できるように<br>
トゥートのコピペができない不具合を修正<br>
TweetDeckの横幅だけ広げられる機能
</div> </div>
<br><br> <br><br>
<h3>Support TheDesk!</h3> <h3>Support TheDesk!</h3>

33
app/view/ja/index.html
View File

@ -32,7 +32,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script> <script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver="Miria (17.0.2)"; var ver="Miria (17.1.0) beta1";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@ -273,6 +273,8 @@ var tlid=0;
<input type="text" class="mastodon-choice" placeholder="選択肢4"> <input type="text" class="mastodon-choice" placeholder="選択肢4">
<input type="checkbox" class="filled-in" id="poll-multiple" value="1" /> <input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
<label for="poll-multiple">複数選択を許可</label><br> <label for="poll-multiple">複数選択を許可</label><br>
<input type="checkbox" class="filled-in" id="poll-until" value="1" />
<label for="poll-until">投票するまで票数を隠す</label><br>
<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">日 <input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">日
<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">時間 <input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">時間
<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">分 <input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">分
@ -337,17 +339,17 @@ var tlid=0;
</ul> </ul>
他のアカウントを使用(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>の解除はできません)<br> 他のアカウントを使用(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>の解除はできません)<br>
<div class="row"> <div class="row">
<div class="col s4"> <div class="col s6">
<select id="status-acct-sel" class="acct-sel"></select> <select id="status-acct-sel" class="acct-sel"></select>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share left"></i>返信</button> <button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet left"></i>ブースト</button> <button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
</div> </div>
<div class="col s3"> <div class="col s2">
<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star left"></i>お気に入り登録</button> <button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
</div> </div>
</div> </div>
<div id="toot-tools"> <div id="toot-tools">
@ -580,22 +582,17 @@ var tlid=0;
<a href="https://thedesk.top" target="_blank">HP</a><br> <a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br> <br>
<div id="release-Miria_17-0-2" class="release-do" style="display:none; "> <div id="release-Miria_17-1-0" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br> <a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br> <a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br> Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Miria (17.0.2)</h5> <h5>Release Note Miria (17.1.0)</h5>
バグ修正<br> トゥートボックスがフロートタイプに。左下、右下以外にも自由においてください。<br>
ブーストを除外できる<br> いろいろとアニメーション入れた(硬派な方は設定「タイムラインの設定」からオフに)<br>
<u>17.0.1</u><br> アンケートができるように(OK:Mastodon (2.8~)/WIP: votedon./ NG: ニコフレ)<br>
バグ修正<br> フォント選択機能が復活<br>
(Mastodon 2.7)<b>時間指定投稿が利用できます。</b><br> WindowsからiTunesやAIMP、その他CAD系のNowPlayingができるように。要プラグインのソフトもある。<br>
(Mastodon 2.7)<b>「インスタンス」を「サーバー」に変更</b><br>
CW付きのトゥートの再編集に対応<br>
インストール場所が指定できるように<br>
トゥートのコピペができない不具合を修正<br>
TweetDeckの横幅だけ広げられる機能
</div> </div>
<br><br> <br><br>
<h3>ご支援ください。</h3> <h3>ご支援ください。</h3>

31
app/view/make/index.sample.html
View File

@ -273,6 +273,8 @@ var tlid=0;
<input type="text" class="mastodon-choice" placeholder="{{choice}}4"> <input type="text" class="mastodon-choice" placeholder="{{choice}}4">
<input type="checkbox" class="filled-in" id="poll-multiple" value="1" /> <input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
<label for="poll-multiple">{{pollmulti}}</label><br> <label for="poll-multiple">{{pollmulti}}</label><br>
<input type="checkbox" class="filled-in" id="poll-until" value="1" />
<label for="poll-until">{{polluntil}}</label><br>
<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">{{days}} <input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">{{days}}
<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">{{hours}} <input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">{{hours}}
<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">{{mins}} <input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">{{mins}}
@ -337,17 +339,17 @@ var tlid=0;
</ul> </ul>
{{useOtherAcct1}}(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>{{useOtherAcct2}})<br> {{useOtherAcct1}}(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>{{useOtherAcct2}})<br>
<div class="row"> <div class="row">
<div class="col s4"> <div class="col s6">
<select id="status-acct-sel" class="acct-sel"></select> <select id="status-acct-sel" class="acct-sel"></select>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share left"></i>{{reply}}</button> <button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet left"></i>{{bt}}</button> <button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
</div> </div>
<div class="col s3"> <div class="col s2">
<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star left"></i>{{favRegist}}</button> <button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
</div> </div>
</div> </div>
<div id="toot-tools"> <div id="toot-tools">
@ -580,22 +582,17 @@ var tlid=0;
<a href="https://thedesk.top" target="_blank">HP</a><br> <a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br> <br>
<div id="release-Miria_17-0-2" class="release-do" style="display:none; "> <div id="release-Miria_17-1-0" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br> <a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br> <a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br> Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Miria (17.0.2)</h5> <h5>Release Note Miria (17.1.0)</h5>
バグ修正<br> トゥートボックスがフロートタイプに。左下、右下以外にも自由においてください。<br>
ブーストを除外できる<br> いろいろとアニメーション入れた(硬派な方は設定「タイムラインの設定」からオフに)<br>
<u>17.0.1</u><br> アンケートができるように(OK:Mastodon (2.8~)/WIP: votedon./ NG: ニコフレ)<br>
バグ修正<br> フォント選択機能が復活<br>
(Mastodon 2.7)<b>時間指定投稿が利用できます。</b><br> WindowsからiTunesやAIMP、その他CAD系のNowPlayingができるように。要プラグインのソフトもある。<br>
(Mastodon 2.7)<b>「インスタンス」を「サーバー」に変更</b><br>
CW付きのトゥートの再編集に対応<br>
インストール場所が指定できるように<br>
トゥートのコピペができない不具合を修正<br>
TweetDeckの横幅だけ広げられる機能
</div> </div>
<br><br> <br><br>
<h3>{{supportme}}</h3> <h3>{{supportme}}</h3>

1
app/view/make/language/index.en.json
View File

@ -47,6 +47,7 @@
"poll":"Poll", "poll":"Poll",
"pollDdisabled":"Polls: Disabled", "pollDdisabled":"Polls: Disabled",
"pollProvider":"Provider of Poll", "pollProvider":"Provider of Poll",
"polluntil":"Hide 'votes' count until people vote it.",
"choice":"Choice", "choice":"Choice",
"pollmulti":"Multiple select", "pollmulti":"Multiple select",
"expires_in":"Expires in...(sec)", "expires_in":"Expires in...(sec)",

1
app/view/make/language/index.ja.json
View File

@ -48,6 +48,7 @@
"pollDdisabled":"アンケートを使用しない", "pollDdisabled":"アンケートを使用しない",
"pollProvider":"アンケートのプロバイダ", "pollProvider":"アンケートのプロバイダ",
"choice":"選択肢", "choice":"選択肢",
"polluntil":"投票するまで票数を隠す",
"pollmulti":"複数選択を許可", "pollmulti":"複数選択を許可",
"expires_in":"有効期限(秒)", "expires_in":"有効期限(秒)",
"contextBefore":"これより前の会話", "contextBefore":"これより前の会話",

33
app/view/ps/index.html
View File

@ -32,7 +32,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script> <script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script> <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver="Miria (17.0.2)"; var ver="Miria (17.1.0) beta1";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html) //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta"; //var ver="beta";
@ -273,6 +273,8 @@ var tlid=0;
<input type="text" class="mastodon-choice" placeholder="{{choice}}4"> <input type="text" class="mastodon-choice" placeholder="{{choice}}4">
<input type="checkbox" class="filled-in" id="poll-multiple" value="1" /> <input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
<label for="poll-multiple">{{pollmulti}}</label><br> <label for="poll-multiple">{{pollmulti}}</label><br>
<input type="checkbox" class="filled-in" id="poll-until" value="1" />
<label for="poll-until">{{polluntil}}</label><br>
<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">crwdns507:0crwdne507:0 <input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">crwdns507:0crwdne507:0
<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">crwdns508:0crwdne508:0 <input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">crwdns508:0crwdne508:0
<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">crwdns509:0crwdne509:0 <input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">crwdns509:0crwdne509:0
@ -337,17 +339,17 @@ var tlid=0;
</ul> </ul>
crwdns430:0crwdne430:0(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>crwdns431:0crwdne431:0)<br> crwdns430:0crwdne430:0(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>crwdns431:0crwdne431:0)<br>
<div class="row"> <div class="row">
<div class="col s4"> <div class="col s6">
<select id="status-acct-sel" class="acct-sel"></select> <select id="status-acct-sel" class="acct-sel"></select>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share left"></i>crwdns432:0crwdne432:0</button> <button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
</div> </div>
<div class="col s2"> <div class="col s2">
<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet left"></i>crwdns433:0crwdne433:0</button> <button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
</div> </div>
<div class="col s3"> <div class="col s2">
<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star left"></i>crwdns434:0crwdne434:0</button> <button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
</div> </div>
</div> </div>
<div id="toot-tools"> <div id="toot-tools">
@ -580,22 +582,17 @@ var tlid=0;
<a href="https://thedesk.top" target="_blank">HP</a><br> <a href="https://thedesk.top" target="_blank">HP</a><br>
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
<br> <br>
<div id="release-Miria_17-0-2" class="release-do" style="display:none; "> <div id="release-Miria_17-1-0" class="release-do" style="display:none; ">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br> <a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br> <a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br> Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Miria (17.0.2)</h5> <h5>Release Note Miria (17.1.0)</h5>
バグ修正<br> トゥートボックスがフロートタイプに。左下、右下以外にも自由においてください。<br>
ブーストを除外できる<br> いろいろとアニメーション入れた(硬派な方は設定「タイムラインの設定」からオフに)<br>
<u>17.0.1</u><br> アンケートができるように(OK:Mastodon (2.8~)/WIP: votedon./ NG: ニコフレ)<br>
バグ修正<br> フォント選択機能が復活<br>
(Mastodon 2.7)<b>時間指定投稿が利用できます。</b><br> WindowsからiTunesやAIMP、その他CAD系のNowPlayingができるように。要プラグインのソフトもある。<br>
(Mastodon 2.7)<b>「インスタンス」を「サーバー」に変更</b><br>
CW付きのトゥートの再編集に対応<br>
インストール場所が指定できるように<br>
トゥートのコピペができない不具合を修正<br>
TweetDeckの横幅だけ広げられる機能
</div> </div>
<br><br> <br><br>
<h3>crwdns473:0crwdne473:0</h3> <h3>crwdns473:0crwdne473:0</h3>