diff --git a/app/css/tl.css b/app/css/tl.css index 972d394b..f28bd8ca 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -57,6 +57,12 @@ #bottom i{ font-size:30px; } +.exc-icons{ + font-size:20px; +} +.exc-chb{ + padding-left:24px !important; +} #bottom .btnsgroup{ border:1px solid; padding:1px; diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js index 179d1a33..3d01916b 100644 --- a/app/js/ui/layout.js +++ b/app/js/ui/layout.js @@ -78,14 +78,14 @@ function parseColumn() { var if_notf=""; } if(localStorage.getItem("notification_" + acct.domain)){ - var unique_notf=lang_layout_thisacct[lang].replace("{{notf}}" ,localStorage.getItem("notification_" + acct.domain)); + var unique_notf=lang.lang_layout_thisacct.replace("{{notf}}" ,localStorage.getItem("notification_" + acct.domain)); }else{ - if(lang=="ja"){ + if(lang.language=="ja"){ var notflocale="通知"; - }else if(lang=="en"){ + }else if(lang.language=="en"){ var notflocale="Notification"; } - var unique_notf=lang_layout_thisacct[lang].replace("{{notf}}" ,notflocale); + var unique_notf=lang.lang_layout_thisacct.replace("{{notf}}" ,notflocale); } var insert=""; var icnsert=""; @@ -119,29 +119,38 @@ function parseColumn() { var html =webview("https://tweetdeck.twitter.com",key,insert,icnsert); $("#timeline-container").append(html); }else{ + if(acct.type=="notf"){ + var exclude=':
'+ + ' '+ + ' '+ + ' '+ + '
'; + }else{ + var exclude=""; + } var html = '
'+ '
settings
'+ + ')" class="setting nex" title="'+lang.lang_layout_setthis +'"'+icnsert+'>settings'+ '
perm_mediaOn'+lang_layout_mediafil[lang]+'
linkOn'+lang_layout_linkana[lang]+'
hearingOn'+lang_layout_tts[lang]+'TL
low_priority'+lang_layout_reconnect[lang]+'
'+lang_layout_headercolor[lang]+'
'+lang_layout_nodata[lang]+'
'; + '" style="padding:5px;">'+exclude+'perm_mediaOn'+lang.lang_layout_mediafil +'
linkOn'+lang.lang_layout_linkana +'
hearingOn'+lang.lang_layout_tts +'TL
low_priority'+lang.lang_layout_reconnect[lang]+'
'+lang.lang_layout_headercolor +'
'+lang.lang_layout_nodata +'
'; $("#timeline-container").append(html); localStorage.removeItem("pool_" + key); if (acct.data) { @@ -267,7 +276,7 @@ function addselCk(){ $("#webview-add").addClass("hide"); } if(domain=="knzk.me" || domain=="mstdn.y-zu.org"){ - $("#type-sel").append(''); + $("#type-sel").append(''); $('#type-sel').material_select('update'); }else{ $("#direct-add").remove(); @@ -385,14 +394,14 @@ function webview(url,key,insert,icnsert){ '">'+ '
settings
'+ + ')" class="setting nex" title="'+lang.lang_layout_setthis +'"'+icnsert+'>settings'+ '
'+lang_layout_headercolor[lang]+'
'+lang.lang_layout_headercolor +'
'; return html;