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

Merge branch 'master' into gh-pages

Browse Source
This commit is contained in:
Cutls 2019-09-12 23:28:02 +09:00
commit 467033a366
10 changed files with 106 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/css/master.css
View File

@ -220,6 +220,17 @@ blockquote:before,
right: 0;
top: 0;
}
#start {
display: none;
position: fixed;
width: 100vw;
height: calc(100vh - 40px);
background-color: var(--bg);
color: var(--color);
z-index: 99999;
justify-content: center;
align-items: center;
}
#drag {
display: none;
position: fixed;

10
app/css/tl.css
View File

@ -24,6 +24,10 @@
z-index: 500;
box-shadow: 10px 0 10px 10px rgba(0, 0, 0, 0.2);
}
#demobottom {
width: 500px;
display: flex;
}
#bottom.reverse {
padding-left: 0;
padding-right: 40px;
@ -41,7 +45,7 @@
#bottom .trendtag {
height: 40px;
}
#bottom #group {
#bottom #group, #demogroup {
margin-right: 40px;
}
#bottom .leftside {
@ -54,7 +58,7 @@
#bottom #tips img {
vertical-align: -3px;
}
#bottom a {
#bottom a, #demogroup a {
color: var(--color);
}
#bottom i {
@ -66,7 +70,7 @@
.exc-chb {
padding-left: 24px !important;
}
#bottom .btnsgroup {
.btnsgroup {
border: 1px solid;
padding-top: 1px;
padding-left: 5px;

14
app/js/common/version.js
View File

@ -1,5 +1,6 @@
//バージョンチェッカー
function verck(ver) {
localStorage.setItem("ver", ver);
console.log("%c Welcome😊", "color: red;font-size:200%;")
var date = new Date();
var show = false
@ -15,11 +16,12 @@ function verck(ver) {
}
}
//ちょっと削除とリンク解析の都合上アレ(e)
localStorage.setItem("ver", ver);
show = true
console.log("%c Thank you for your update🎉", "color: red;font-size:200%;");
$(document).ready(function () {
$('#releasenote').modal('open');
if (localStorage.getItem("winstore")) {
$('#releasenote').modal('open');
}
verp = ver.replace('(', '');
verp = verp.replace('.', '-');
verp = verp.replace('.', '-');
@ -59,7 +61,7 @@ function verck(ver) {
var platform = localStorage.getItem("platform");
console.log("Your platform:" + platform)
if (!localStorage.getItem("winstore")) {
storeDialog(platform, ver)
$("#start").css('display', 'flex');
}
if (localStorage.getItem("winstore") == "brewcask" || localStorage.getItem("winstore") == "snapcraft" || localStorage.getItem("winstore") == "winstore") {
var winstore = true;
@ -309,4 +311,10 @@ function storeDialog(platform, ver) {
}
});
})
}
function closeStart() {
$("#start").css('display', 'none');
var platform = localStorage.getItem("platform");
var ver = localStorage.getItem("ver");
storeDialog(platform, ver)
}

5
app/js/login/login.js
View File

@ -520,13 +520,12 @@ function ticker() {
'content-type': 'application/json'
},
}).then(function (response) {
return response.json();
}).catch(function (error) {
console.error(error);
}).then(function (json) {
if (json.error) {
return;
}
console.log(json)
if (json) {
localStorage.setItem("ticker", JSON.stringify(json));
}

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

@ -29,9 +29,7 @@
var ver = "@@versionLetter@@";
var gitHash = "@@gitHash@@"
//betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta";
//WinstoreではバージョンCK・言語・Misskeyトークンの機能が排除
var acct_id = 0;
var tlid = 0;
</script>
@ -39,11 +37,46 @@
<canvas id="canvas" style="top:-100px; position:fixed;width:32px;height:32px" width="32" height="32"></canvas>
<div id="tl">
<!--TL-->
<!--スターター-->
<div id="start">
<div id="start-content"><h3 class="center">@@demoBottomBtns@@</h3>
@@lookAtBottom@@
<div id="demobottom">
<button class="btn waves-effect"
style="width: 300px;height: 2.5rem;line-height: 0;margin: 0; background-color: var(--accentbtn);">
<i class="material-icons"
style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>@@toot@@
</button>
<div class="leftside reverse" id="demogroup">
<div class="btnsgroup" style="margin-left: 5px;">
<a href="#" class="nex waves-effect">
<i class="material-icons nex big-icon" title="@@acctMan@@(Ctrl+Shift+M)">account_circle</i>
</a>
<a href="#" class="nex waves-effect">
<i class="material-icons nex" title="@@setting@@(Ctrl+Shift+S)">settings</i>
</a>
<a class="nex waves-effect">
<i class="material-icons" title="@@nanoDes@@TheDesk Nano">remove_from_queue</i>
</a>
<aside class="nex waves-effect" id="list-tgl">
<i class="material-icons" title="@@menu@@">apps</i>
</a>
</div>
</div>
</div><br>
<i class="material-icons nex big-icon">account_circle</i>: @@acctMan@@<br>　　@@acctManDesc@@<hr>
<i class="material-icons nex">settings</i>: @@setting@@<br>　　@@settingDesc@@<hr>
<i class="material-icons nex">remove_from_queue</i>: TheDesk Nano @@nanoDes@@<br>　　@@nanoDescPlus@@<hr>
<i class="material-icons nex">apps</i>: @@menu@@<br>　　@@menuDesc@@<br>
<br>
<button class="btn waves-effect" onclick="closeStart()" style="width: 300px;">@@close@@</button>
</div>
</div>
<!--ドラッグハンドラ-->
<div id="drag">
<div id="drag-content" data-trans="drag_here">@@draghere@@
<div id="drag-content">@@draghere@@
<br>
<button class="btn waves-effect" onclick="closedrop()" data-trans="close">@@close@@</button>
<button class="btn waves-effect" onclick="closedrop()">@@close@@</button>
</div>
</div>
</div>
@ -1011,8 +1044,8 @@
<i class="material-icons" title="@@nanoDes@@TheDesk Nano"
data-trans-title="nano_desp">remove_from_queue</i>
</a>
<a onclick="menu()" class="nex waves-effect" id="list-tgl">
<i class="material-icons" title="@@list@@">apps</i>
<a onclick="menu()" class="nex waves-effect">
<i class="material-icons" title="@@menu@@">apps</i>
</a>
<span id="fukidashi">@@hereAddColumns@@</span>
</div>

8
app/view/make/language/bg/index.json
View File

@ -168,5 +168,11 @@
"directory": "Directory",
"active": "Recently active",
"newcomer": "New arrivals",
"local_only": "Local only"
"local_only": "Local only",
"demoBottomBtns": "Welcome guide",
"lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
"acctManDesc": "Add more accounts and logout them.",
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}

8
app/view/make/language/cs/index.json
View File

@ -168,5 +168,11 @@
"directory": "Directory",
"active": "Recently active",
"newcomer": "New arrivals",
"local_only": "Local only"
"local_only": "Local only",
"demoBottomBtns": "Welcome guide",
"lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
"acctManDesc": "Add more accounts and logout them.",
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}

8
app/view/make/language/de/index.json
View File

@ -168,5 +168,11 @@
"directory": "Directory",
"active": "Recently active",
"newcomer": "New arrivals",
"local_only": "Local only"
"local_only": "Local only",
"demoBottomBtns": "Welcome guide",
"lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
"acctManDesc": "Add more accounts and logout them.",
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}

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

@ -8,7 +8,6 @@
"nsfwDes":"Mark media as sensitive",
"cwDes":"Hide text behind warning",
"selfile":"Attach..",
"insertEmoji":"Emojis",
"NPSpotify":"NowPlaying(Spotify)",
"NPiTunes":"NowPlaying(macOS)",
@ -169,5 +168,11 @@
"directory": "Directory",
"active": "Recently active",
"newcomer": "New arrivals",
"local_only": "Local only"
"local_only": "Local only",
"demoBottomBtns": "Welcome guide",
"lookAtBottom": "Look at the bottom of this window. Here is some tips about it.",
"acctManDesc": "Add more accounts and logout them.",
"settingDesc": "Many and many preferences here. You will couldn't check it all!",
"nanoDescPlus": "Mini window client(experimental)",
"listDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
}

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

@ -168,5 +168,12 @@
"directory": "ディレクトリ",
"active": "最新活動順",
"newcomer": "新規順",
"local_only": "ローカルのみ"
"local_only": "ローカルのみ",
"menu": "メニュー",
"demoBottomBtns": "チュートリアル",
"lookAtBottom": "画面下のアイコン群を見てください。簡単な説明をします。次のようなものがあると思います。",
"acctManDesc": "アカウントに関する全てのことはここでできます。例えば複数アカウントの管理やログアウトなどです。各アカウントに独自のカラーを設定できます。",
"settingDesc": "数えきれないほどの設定項目がここにあります。(フィルターの管理などMastodon本体の設定はここにはありません)",
"nanoDescPlus": "小さなMastodonクライアントです。(実験的)",
"menuDesc": "<u>カラム追加や並び変え</u>、<u>リストやフィルター</u>、<u>検索</u>などがコンパクトにまとまっています。全てはここから始まると言っても過言ではありません。"
}