Add "menu" and remove bottom-bar's 8 icons
This commit is contained in:
@@ -54,7 +54,7 @@ var tlid=0;
|
||||
</div>
|
||||
</div>
|
||||
<div id="post-box" class="z-depth-5">
|
||||
<div id="post-bar">{{post-new}}</div>
|
||||
<div id="post-bar" class="drag-bar">{{post-new}}</div>
|
||||
<!--トゥートボックス-->
|
||||
<div id="left-side">
|
||||
<div class="row" style="margin-bottom:0;">
|
||||
@@ -588,6 +588,7 @@ var tlid=0;
|
||||
Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
|
||||
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
|
||||
<h5>Release Note Miria (17.2.1)</h5>
|
||||
多くの機能を「メニュー」に集約。結局何のボタンかわからないアイコンの羅列から解放。<br>
|
||||
Alt+Enterでセカンダリートゥートボタン<br>
|
||||
引用ボタンを表示しない設定(引用形式設定を「使用しない」)<br>
|
||||
実況機能をまともに書き直した。<br>
|
||||
@@ -624,125 +625,147 @@ var tlid=0;
|
||||
<i class="material-icons pointer" onclick="endPip()">close</i>
|
||||
<div id="pip-content">
|
||||
</div>
|
||||
</div>
|
||||
<!--カラム追加-->
|
||||
<div id="add-box" class="hide z-depth-4 notf-box">
|
||||
<div class="input-field"><span data-trans="your_acct">{{selectAcct}}</span>
|
||||
<br>
|
||||
<select id="add-acct-sel" class="acct-sel" style="color:black" onchange="addselCk()"></select>
|
||||
<label></label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<div id="auth">
|
||||
<select id="type-sel" style="color:black">
|
||||
<option value="local" data-trans="local">{{local}}</option>
|
||||
<option value="local-media" data-trans="local-media">{{localMedia}}</option>
|
||||
<option value="home" data-trans="home">{{home}}</option>
|
||||
<option value="pub" data-trans="public">{{fed}}</option>
|
||||
<option value="pub-media" data-trans="public-media">{{fedMedia}}</option>
|
||||
<option value="dm" data-trans="dm">{{dm}}</option>
|
||||
<option value="mix" data-trans="integrated">{{integratedTLDes}}</option>
|
||||
<option value="plus" data-trans="plus">{{localPlusDes}}</option>
|
||||
<option value="notf" data-trans="notification">{{notf}}</option>
|
||||
</select>
|
||||
<label data-trans="show_tl">{{showThisTL}}</label>
|
||||
</div>
|
||||
<div id="noauth" class="hide">{{showThisTL}}
|
||||
<input id="noauth-url" type="text" class="validate" style="width:calc( 70% - 40px);" placeholder="e.g:mstdn.jp">
|
||||
</div>
|
||||
<div id="webview-add" class="hide">{{webviewWarn}}
|
||||
</div>
|
||||
</div>
|
||||
<button class="btn waves-effect blue " style="width:calc( 100% - 10px);" onclick="addColumn()" data-trans-i="add">
|
||||
<i class="material-icons left">add</i>{{add}}
|
||||
</button>
|
||||
<br>
|
||||
<br>
|
||||
</div>
|
||||
<!--検索-->
|
||||
<div id="src-box" class="hide notf-box z-depth-4" style="width:500px">
|
||||
<div class="input-field">
|
||||
<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
|
||||
</div><div class="input-field">
|
||||
<i class="material-icons prefix">search</i>
|
||||
<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
|
||||
<label for="src" data-trans="src">{{search}}</label>
|
||||
<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
|
||||
<i class="material-icons left">search</i>{{search}}
|
||||
</button>
|
||||
<br>
|
||||
<br>
|
||||
</div>
|
||||
<div id="search">
|
||||
<div id="src-contents">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--並べ替え-->
|
||||
<div id="sort-box" class="hide">
|
||||
<ul id="sort"></ul>
|
||||
<div>
|
||||
<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
|
||||
<i class="material-icons left">sort</i>{{sortSet}}
|
||||
</button>
|
||||
<button onclick="sortToggle()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="close">
|
||||
<i class="material-icons left">close</i>{{close}}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<!--リスト-->
|
||||
<div id="list-box" class="hide notf-box z-depth-4">
|
||||
<div class="input-field" style="width:calc( 100% - 100px);float:left">
|
||||
<select id="list-acct-sel" class="acct-sel"></select>
|
||||
<label>{{selectAcct}}</label>
|
||||
</div>
|
||||
<!--menu-->
|
||||
<div id="menu" class="z-depth-5" style="display:none">
|
||||
<div id="menu-bar" class="drag-bar"></div>
|
||||
<span class="cancel">
|
||||
<i class="material-icons waves-effect" onclick="menu()" title="{{closeThisBox}}(X)">cancel</i>
|
||||
</span>
|
||||
<div id="menu-wrapper">
|
||||
<div id="left-menu">
|
||||
<div class="waves-effect active" onclick="addColumnMenu()" id="addColumnMenu"><i class="material-icons">add</i><span>{{addColumn}}</span></div>
|
||||
<div class="waves-effect" onclick="sortMenu()" id="sortMenu"><i class="material-icons">sort</i><span>{{sortColumns}}</span></div>
|
||||
<div class="waves-effect" onclick="searchMenu()" id="searchMenu"><i class="material-icons">search</i><span>{{search}}</span></div>
|
||||
<div class="waves-effect" onclick="listMenu()" id="listMenu"><i class="material-icons">view_headline</i><span>{{list}}</span></div>
|
||||
<div class="waves-effect" onclick="filterMenu()" id="filterMenu"><i class="material-icons">filter_list</i><span>{{filter}}</span></div>
|
||||
<div class="waves-effect" onclick="help()"><i class="material-icons">help_outline</i><span>{{help}}</span></div>
|
||||
</div>
|
||||
<div id="right-menu">
|
||||
<!--カラム追加-->
|
||||
<div id="add-box" class="hide menu-content">
|
||||
<div class="input-field"><span data-trans="your_acct">{{selectAcct}}</span>
|
||||
<br>
|
||||
<select id="add-acct-sel" class="acct-sel" style="color:black" onchange="addselCk()"></select>
|
||||
<label></label>
|
||||
</div>
|
||||
<div style="float:left; padding-top:8px; padding-bottom:28px;">
|
||||
<button class="btn waves-effect indigo" style="width:80px;" onclick="list()" data-trans-i="lists">
|
||||
{{listLocale}}
|
||||
</button>
|
||||
<div class="input-field">
|
||||
<div id="auth">
|
||||
<select id="type-sel" style="color:black">
|
||||
<option value="local" data-trans="local">{{local}}</option>
|
||||
<option value="local-media" data-trans="local-media">{{localMedia}}</option>
|
||||
<option value="home" data-trans="home">{{home}}</option>
|
||||
<option value="pub" data-trans="public">{{fed}}</option>
|
||||
<option value="pub-media" data-trans="public-media">{{fedMedia}}</option>
|
||||
<option value="dm" data-trans="dm">{{dm}}</option>
|
||||
<option value="mix" data-trans="integrated">{{integratedTLDes}}</option>
|
||||
<option value="plus" data-trans="plus">{{localPlusDes}}</option>
|
||||
<option value="notf" data-trans="notification">{{notf}}</option>
|
||||
</select>
|
||||
<label data-trans="show_tl">{{showThisTL}}</label>
|
||||
</div>
|
||||
<div id="noauth" class="hide">{{showThisTL}}
|
||||
<input id="noauth-url" type="text" class="validate" style="width:calc( 70% - 40px);" placeholder="e.g:mstdn.jp">
|
||||
</div>
|
||||
<div id="webview-add" class="hide">{{webviewWarn}}
|
||||
</div>
|
||||
</div>
|
||||
<button class="btn waves-effect blue " style="width:calc( 100% - 10px);" onclick="addColumn()" data-trans-i="add">
|
||||
<i class="material-icons left">add</i>{{add}}
|
||||
</button>
|
||||
<br>
|
||||
<br>
|
||||
</div>
|
||||
<!--検索-->
|
||||
<div id="src-box" class="hide menu-content">
|
||||
<div class="input-field">
|
||||
<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
|
||||
</div><div class="input-field">
|
||||
<i class="material-icons prefix">search</i>
|
||||
<input id="src" type="text" class="validate" style="width:calc( 60% - 40px);">
|
||||
<label for="src" data-trans="src">{{search}}</label>
|
||||
<button class="btn waves-effect indigo" style="width:calc( 40% - 40px);" onclick="src()" data-trans-i="src">
|
||||
<i class="material-icons left">search</i>{{search}}
|
||||
</button>
|
||||
<br>
|
||||
<br>
|
||||
</div>
|
||||
<div id="search">
|
||||
<div id="src-contents">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--並べ替え-->
|
||||
<div id="sort-box" class="hide menu-content">
|
||||
<ul id="sort"></ul>
|
||||
<div>
|
||||
<button onclick="sort()" class="btn waves-effect nex" style="width:100%; max-width:300px;" data-trans-i="sort">
|
||||
<i class="material-icons left">sort</i>{{sortSet}}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<!--リスト-->
|
||||
<div id="list-box" class="hide menu-content">
|
||||
<div class="input-field" style="width:calc( 100% - 100px);float:left">
|
||||
<select id="list-acct-sel" class="acct-sel"></select>
|
||||
<label>{{selectAcct}}</label>
|
||||
</div>
|
||||
<div style="float:left; padding-top:8px; padding-bottom:28px;">
|
||||
<button class="btn waves-effect indigo" style="width:80px;" onclick="list()" data-trans-i="lists">
|
||||
{{listLocale}}
|
||||
</button>
|
||||
</div>
|
||||
<br><br>
|
||||
<div id="lists"></div>
|
||||
<div id="lists-user"></div>
|
||||
<input type="text" style="width:150px" id="list-add" placeholder="{{name}}">
|
||||
<button class="btn waves-effect" style="width:120px;" onclick="makeNewList()">{{makeNew}}</button>
|
||||
</div>
|
||||
<!--フィルター-->
|
||||
<div id="filter-box" class="hide menu-content">
|
||||
<div class="input-field" style="width:calc( 100% - 100px);float:left">
|
||||
<select id="filter-acct-sel" class="acct-sel"></select>
|
||||
<label>{{selectAcct}}</label>
|
||||
</div>
|
||||
<div style="float:left; padding-top:8px; padding-bottom:28px;">
|
||||
<button class="btn waves-effect indigo" style="width:80px;" onclick="filter()" data-trans-i="filters">
|
||||
{{listLocale}}
|
||||
</button>
|
||||
</div>
|
||||
<div id="filtered-words"></div>
|
||||
<input type="hidden" id="filter-edit-id">
|
||||
<input type="text" style="width:150px" id="filter-add-word" placeholder="{{filterWord}}"><br>
|
||||
{{degree}}<br>
|
||||
<input type="checkbox" class="filled-in" id="home_filter" value="home" />
|
||||
<label for="home_filter">{{home}}</label>
|
||||
<input type="checkbox" class="filled-in" id="local_filter" value="public" />
|
||||
<label for="local_filter">{{local}}</label>
|
||||
<input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
|
||||
<label for="notf_filter">{{notf}}</label>
|
||||
<input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
|
||||
<label for="conv_filter">{{conver}}</label><br>
|
||||
{{option}}<br>
|
||||
<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
|
||||
<label for="wholeword_filter">{{matchWord}}</label><br>
|
||||
<span class="sml">{{warnMatchWord}}</span><br>
|
||||
<input type="checkbox" class="filled-in" id="except_filter" value="1" />
|
||||
<label for="except_filter">{{except}}</label><br>
|
||||
<span class="sml">{{exceptWorn}}</span><br>
|
||||
{{avalableBefore}}<span class="sml">{{warnAvBefore}}<b>{{warnAvBefore2}}</b></span><br><br>
|
||||
<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">{{days}}
|
||||
<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">{{hours}}
|
||||
<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">{{mins}}
|
||||
<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">{{add}}</button><br>
|
||||
<span class="sml">{{warnOnIntegratedTL}}</span>
|
||||
</div>
|
||||
<br><br>
|
||||
<div id="lists"></div>
|
||||
<div id="lists-user"></div>
|
||||
<input type="text" style="width:150px" id="list-add" placeholder="{{name}}">
|
||||
<button class="btn waves-effect" style="width:120px;" onclick="makeNewList()">{{makeNew}}</button>
|
||||
</div>
|
||||
<!--フィルター-->
|
||||
<div id="filter-box" class="hide notf-box z-depth-4">
|
||||
<div class="input-field" style="width:calc( 100% - 100px);float:left">
|
||||
<select id="filter-acct-sel" class="acct-sel"></select>
|
||||
<label>{{selectAcct}}</label>
|
||||
</div>
|
||||
<div style="float:left; padding-top:8px; padding-bottom:28px;">
|
||||
<button class="btn waves-effect indigo" style="width:80px;" onclick="filter()" data-trans-i="filters">
|
||||
{{listLocale}}
|
||||
</button>
|
||||
</div>
|
||||
<div id="filtered-words"></div>
|
||||
<input type="hidden" id="filter-edit-id">
|
||||
<input type="text" style="width:150px" id="filter-add-word" placeholder="{{filterWord}}"><br>
|
||||
{{degree}}<br>
|
||||
<input type="checkbox" class="filled-in" id="home_filter" value="home" />
|
||||
<label for="home_filter">{{home}}</label>
|
||||
<input type="checkbox" class="filled-in" id="local_filter" value="public" />
|
||||
<label for="local_filter">{{local}}</label>
|
||||
<input type="checkbox" class="filled-in" id="notf_filter" value="notifications" />
|
||||
<label for="notf_filter">{{notf}}</label>
|
||||
<input type="checkbox" class="filled-in" id="conv_filter" value="thread" />
|
||||
<label for="conv_filter">{{conver}}</label><br>
|
||||
{{option}}<br>
|
||||
<input type="checkbox" class="filled-in" id="wholeword_filter" value="1" />
|
||||
<label for="wholeword_filter">{{matchWord}}</label><br>
|
||||
<span class="sml">{{warnMatchWord}}</span><br>
|
||||
<input type="checkbox" class="filled-in" id="except_filter" value="1" />
|
||||
<label for="except_filter">{{except}}</label><br>
|
||||
<span class="sml">{{exceptWorn}}</span><br>
|
||||
{{avalableBefore}}<span class="sml">{{warnAvBefore}}<b>{{warnAvBefore2}}</b></span><br><br>
|
||||
<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">{{days}}
|
||||
<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">{{hours}}
|
||||
<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">{{mins}}
|
||||
<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">{{add}}</button><br>
|
||||
<span class="sml">{{warnOnIntegratedTL}}</span>
|
||||
</div>
|
||||
<a href="index.html" class="waves-effect">
|
||||
<i class="material-icons" style="font-size: 1rem;">refresh</i>{{f5}}
|
||||
</a> |
|
||||
<a onclick="bottomReverse()" class="nex waves-effect">
|
||||
<i class="material-icons" style="font-size: 1rem;">swap_horiz</i>{{reverse}}
|
||||
</a>
|
||||
</div>
|
||||
<div id="main">
|
||||
<!--TLのTL-->
|
||||
@@ -758,52 +781,23 @@ var tlid=0;
|
||||
<button id="posttgl" class="btn waves-effect indigo" style="width: 100%;height: 2.5rem;line-height: 0;margin: 0;">
|
||||
<i class="material-icons" style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>{{toot}}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="leftside reverse" id="group">
|
||||
<div class="btnsgroup"><span class="grouptitle">Columns:</span>
|
||||
<a onclick="addToggle()" class="nex waves-effect" data-trans-i="add" id="add-tgl">
|
||||
<i class="material-icons nex" title="{{addColumn}}" data-trans-title="column_add">add</i>
|
||||
</a>
|
||||
<a onclick="sortToggle()" class="nex waves-effect">
|
||||
<i class="material-icons nex big-icon" title="{{sortColumns}}" data-trans-title="sort">sort</i>
|
||||
</a>
|
||||
</div>
|
||||
<div class="btnsgroup"><span class="grouptitle">Accounts:</span>
|
||||
<a href="acct.html" class="nex waves-effect">
|
||||
<i class="material-icons nex big-icon" title="{{acctMan}}(Ctrl+Shift+M)" data-trans-title="manager">account_circle</i>
|
||||
</a>
|
||||
<a onclick="srcToggle()" class="nex waves-effect" id="src-tgl">
|
||||
<i class="material-icons" title="{{search}}" data-trans-title="src">search</i>
|
||||
</a>
|
||||
<a onclick="listToggle()" class="nex waves-effect" id="list-tgl">
|
||||
<i class="material-icons" title="{{list}}" data-trans-title="list">view_headline</i>
|
||||
</a>
|
||||
<a onclick="filterToggle()" class="nex waves-effect" id="filter-tgl">
|
||||
<i class="material-icons" title="{{filter}}" data-trans-title="filter">filter_list</i>
|
||||
</a>
|
||||
</div>
|
||||
<div class="btnsgroup"><span class="grouptitle">Preferences:</span>
|
||||
<a onclick="bottomReverse()" class="nex waves-effect">
|
||||
<i class="material-icons nex" title="{{reverse}}" data-trans-title="reverse">swap_horiz</i>
|
||||
</a>
|
||||
<a href="setting.html" class="nex waves-effect">
|
||||
<i class="material-icons nex" title="{{setting}}(Ctrl+Shift+S)" data-trans-title="setting">settings</i>
|
||||
</a>
|
||||
<a href="index.html" class="nex mize waves-effect">
|
||||
<i class="material-icons nex" title="{{f5}}(F5/⌘+R)" data-trans-title="reload">refresh</i>
|
||||
</a>
|
||||
<a onclick="nano()" class="nex waves-effect">
|
||||
<i class="material-icons" title="{{nanoDes}}TheDesk Nano" data-trans-title="nano_desp">remove_from_queue</i>
|
||||
</a>
|
||||
<a onclick="window.open('https://astarte.thedesk.top');" class="setting nex waves-effect" target="_blank" id="ranking-btn" style="display:none;">
|
||||
<i class="material-icons nex" title="アスタルテランキング">timeline</i>
|
||||
</a>
|
||||
<a href="https://docs.thedesk.top" class="setting nex waves-effect" target="_blank">
|
||||
<i class="material-icons nex" title="{{help}}">help_outline</i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="btnsgroup">
|
||||
<a href="acct.html" class="nex waves-effect">
|
||||
<i class="material-icons nex big-icon" title="{{acctMan}}(Ctrl+Shift+M)">account_circle</i>
|
||||
</a>
|
||||
<a href="setting.html" class="nex waves-effect">
|
||||
<i class="material-icons nex" title="{{setting}}(Ctrl+Shift+S)">settings</i>
|
||||
</a>
|
||||
<a onclick="nano()" class="nex waves-effect">
|
||||
<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>
|
||||
</div>
|
||||
</div></div>
|
||||
<div>
|
||||
<div id="tips-menu">
|
||||
<div class="btnsgroup" style="height:34px"><span class="grouptitle">Tips:</span>
|
||||
@@ -881,4 +875,4 @@ var tlid=0;
|
||||
<script type="text/javascript" src="../../js/emoji/emojipack.js"></script>
|
||||
<script type="text/javascript" src="../../js/emoji/default-emoji.js"></script>
|
||||
<script type="text/javascript" src="../../js/platform/end.js"></script>
|
||||
<script type="text/javascript" src="../../js/ui/menubar.js"></script>
|
||||
<script type="text/javascript" src="../../js/ui/menu.js"></script>
|
Reference in New Issue
Block a user