twisterarmy
/
twister-html
mirror of https://github.com/twisterarmy/twister-html.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

tune 'shorten URL', add related localization

readme-update
Simon Grim 9 years ago
parent
085108cc58
commit
6cdc6cc511
9 changed files with 101 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      css/style.css
  2. 4
      home.html
  3. 63
      js/interface_common.js
  4. 26
      js/interface_localization.js
  5. 2
      js/tmobile.js
  6. 4
      network.html
  7. 10
      theme_calm/css/style.css
  8. 7
      theme_nin/css/style.css
  9. 14
      tmobile.html

10
css/style.css
Unescape View File

@ -675,7 +675,6 @@ button.follow:hover, button.unfollow:hover, .following-own-modal .following-list
border-radius: 3px; border-radius: 3px;
border: solid 1px rgba(0, 0, 0, .3 ); border: solid 1px rgba(0, 0, 0, .3 );
margin-left: 55px; margin-left: 55px;
margin-bottom: 10px;
padding: 4px; padding: 4px;
font-size: 13px; font-size: 13px;
} }
@ -755,14 +754,13 @@ textarea.splited-post {
transition: all .6s linear; transition: all .6s linear;
} }
.post-area-new .shorten-uri { .post-area-new .post-textarea-edit-bar {
font-size: 11px; font-size: 11px;
float: left; margin: 2px 0;
margin: 2px 4px;
} }
.postboard .post-area-new .shorten-uri, .modal-content .post-area-new .shorten-uri { .post-area-new .post-textarea-edit-bar > * {
margin-left: 56px; margin: 2px 4px;
} }
.post-area-remaining .post-area-remaining

4
home.html
Unescape View File

@ -313,6 +313,10 @@
</div> </div>
</div> </div>
<div id="template-post-textarea-edit-bar">
<div class="post-textarea-edit-bar"><!-- TODO add buttons to format text --></div>
</div>
<div id="template-shorten-uri"> <div id="template-shorten-uri">
<a class="shorten-uri">shorten URL</a> <a class="shorten-uri">shorten URL</a>
</div> </div>

63
js/interface_common.js
Unescape View File

@ -822,7 +822,7 @@ function openRequestShortURIForm(event) {
return; return;
} }
var uri = prompt('enter a link, watch yourself carefully'); // FIXME var uri = prompt(polyglot.t('shorten_URI_enter_link')); // FIXME replace native prompt
if (event && event.data && typeof event.data.cbFunc === 'function') if (event && event.data && typeof event.data.cbFunc === 'function')
newShortURI(uri, event.data.cbFunc, event.data.cbReq); newShortURI(uri, event.data.cbFunc, event.data.cbReq);
@ -1359,7 +1359,7 @@ function composeNewPost(e, postAreaNew) {
if (!postAreaNew.hasClass('open')) { if (!postAreaNew.hasClass('open')) {
postAreaNew.addClass('open'); postAreaNew.addClass('open');
//se o usuário clicar fora é pra fechar //se o usuário clicar fora é pra fechar
postAreaNew.clickoutside(unfocusThis); postAreaNew.clickoutside(unfocusPostAreaNew);
if ($.Options.splitPosts.val === 'enable') if ($.Options.splitPosts.val === 'enable')
usePostSpliting = true; usePostSpliting = true;
@ -1380,21 +1380,26 @@ function composeNewPost(e, postAreaNew) {
var textArea = postAreaNew.find('textarea'); var textArea = postAreaNew.find('textarea');
if (textArea.attr('data-reply-to') && !textArea.val().length) { if (textArea.attr('data-reply-to') && !textArea.val().length) {
textArea.val(textArea.attr('data-reply-to')); textArea.val(textArea.attr('data-reply-to'));
posPostPreview(textArea); poseTextareaPostTools(textArea);
} }
if (!postAreaNew.find('textarea:focus').length) if (!postAreaNew.find('textarea:focus').length)
postAreaNew.find('textarea:last').focus(); postAreaNew.find('textarea:last').focus();
} }
function posPostPreview(event) { function poseTextareaPostTools(event) {
if (event.jquery)
var textArea = event;
else
var textArea = $(event.target);
posePostPreview(textArea);
poseTextareaEditBar(textArea);
}
function posePostPreview(textArea) {
if (!$.Options.postPreview.val) if (!$.Options.postPreview.val)
return; return;
if (event.jquery) {
var textArea = event;
} else {
var textArea = $(event.target);
}
var postPreview = textArea.siblings('#post-preview'); var postPreview = textArea.siblings('#post-preview');
if (!postPreview.length) { if (!postPreview.length) {
postPreview = $('#post-preview-template').children().clone() postPreview = $('#post-preview-template').children().clone()
@ -1412,10 +1417,23 @@ function posPostPreview(event) {
textArea.before(postPreview); textArea.before(postPreview);
} }
function poseTextareaEditBar(textArea) {
var editBar = textArea.siblings('.post-textarea-edit-bar');
if (!editBar.length) {
editBar = twister.tmpl.postTextareaEditBar.clone(true)
.css('margin-left', textArea.css('margin-left'))
.css('margin-right', textArea.css('margin-right'))
;
editBar.find('.shorten-uri').text(polyglot.t('shorten_URI'));
}
editBar.insertAfter(textArea).show();
}
// Reduz Área do Novo post // Reduz Área do Novo post
function unfocusThis() { function unfocusPostAreaNew() {
$(this).removeClass('open') var postAreaNew = $(this).removeClass('open');
.find('#post-preview').slideUp('fast'); postAreaNew.find('#post-preview').slideUp('fast');
postAreaNew.find('.post-textarea-edit-bar').hide();
} }
function checkPostForMentions(post, mentions, max) { function checkPostForMentions(post, mentions, max) {
@ -2222,10 +2240,10 @@ function initInterfaceCommon() {
}); });
$('.post-area-new') $('.post-area-new')
.on('click', function(e) {composeNewPost(e, $(this));}) .on('click', function(e) {composeNewPost(e, $(this));})
.clickoutside(unfocusThis) .clickoutside(unfocusPostAreaNew)
.children('textarea') .children('textarea')
.on({ .on({
'focus': posPostPreview, 'focus': poseTextareaPostTools,
'input': replyTextInput, // input event fires in modern browsers (IE9+) on any changes in textarea (and copypasting with mouse too) 'input': replyTextInput, // input event fires in modern browsers (IE9+) on any changes in textarea (and copypasting with mouse too)
'input focus': replyTextUpdateRemaining, 'input focus': replyTextUpdateRemaining,
'keyup': replyTextKeySend 'keyup': replyTextKeySend
@ -2298,12 +2316,6 @@ function initInterfaceCommon() {
.on('focus', .on('focus',
function (event) { function (event) {
twister.focus.textareaPostCur = $(event.target); twister.focus.textareaPostCur = $(event.target);
// FIXME that's a hack, need to implement complete toolbar with buttons of text formatting
var xtrs = twister.focus.textareaPostCur.siblings('.post-area-extras');
if (!xtrs.find('.shorten-uri').length)
xtrs.prepend(twister.tmpl.shortenUri.clone(true));
if ($.fn.textcomplete) { // because some pages don't have that. // network.html if ($.fn.textcomplete) { // because some pages don't have that. // network.html
event.data = {req: getMentionsForAutoComplete}; event.data = {req: getMentionsForAutoComplete};
setTextcompleteOnEventTarget(event); setTextcompleteOnEventTarget(event);
@ -2447,16 +2459,19 @@ $(document).ready(function () {
function (event) { function (event) {
muteEvent(event); muteEvent(event);
var formPost = $(event.target).closest('.post-area-new'); var postAreaNew = $(event.target).closest('.post-area-new');
var textArea = formPost.find(twister.focus.textareaPostCur); var textArea = postAreaNew.find(twister.focus.textareaPostCur);
if (!textArea.length) textArea = formPost.find(twister.focus.textareaPostPrev); if (!textArea.length) textArea = postAreaNew.find(twister.focus.textareaPostPrev);
if (!textArea.length) textArea = formPost.find('textarea:last'); if (!textArea.length) textArea = postAreaNew.find('textarea:last');
event.data.cbReq = textArea; event.data.cbReq = textArea;
openRequestShortURIForm(event); openRequestShortURIForm(event);
} }
) )
; ;
twister.tmpl.postTextareaEditBar = extractTemplate('#template-post-textarea-edit-bar')
.append(twister.tmpl.shortenUri.clone(true))
;
twister.tmpl.postRtReference = extractTemplate('#template-post-rt-reference') twister.tmpl.postRtReference = extractTemplate('#template-post-rt-reference')
.on('mouseup', {feeder: '.post-rt-reference'}, openConversationClick) .on('mouseup', {feeder: '.post-rt-reference'}, openConversationClick)
.on('click', muteEvent) // to prevent post expanding or collapsing .on('click', muteEvent) // to prevent post expanding or collapsing

26
js/interface_localization.js
Unescape View File

@ -170,6 +170,8 @@ if(preferredLanguage == "en"){
"send_DM": "Send direct message", "send_DM": "Send direct message",
"Sent Post to @": "Sent Post to @", "Sent Post to @": "Sent Post to @",
"Setup account": "Setup account", "Setup account": "Setup account",
"shorten_URI": "Shorten URL",
"shorten_URI_enter_link": "Enter the long link (be careful!):",
"The File APIs are not fully supported in this browser.": "The File APIs are not fully supported in this browser.", "The File APIs are not fully supported in this browser.": "The File APIs are not fully supported in this browser.",
"time_ago": "%{time} ago", // 5 minutes ago "time_ago": "%{time} ago", // 5 minutes ago
"Time of the last block:": "Time of the last block: ", "Time of the last block:": "Time of the last block: ",
@ -499,6 +501,8 @@ if(preferredLanguage == "es"){
"send_DM": "Mensaje directo", "send_DM": "Mensaje directo",
"Sent Post to @": "El Post enviado a @", "Sent Post to @": "El Post enviado a @",
"Setup account": "Configuración de la cuenta", "Setup account": "Configuración de la cuenta",
"shorten_URI": "Acortar URL",
"shorten_URI_enter_link": "Introducir el enlace largo (¡ten cuidado!):",
"The File APIs are not fully supported in this browser.": "Las API de archivos no son totalmente compatibles con este navegador.", "The File APIs are not fully supported in this browser.": "Las API de archivos no son totalmente compatibles con este navegador.",
"time_ago": "hace %{time}", // 5 minutes ago "time_ago": "hace %{time}", // 5 minutes ago
"Time of the last block:": "Hora del último bloque: ", "Time of the last block:": "Hora del último bloque: ",
@ -813,6 +817,8 @@ if(preferredLanguage == "uk"){
"send_DM": "Надіслати особисте повідомлення", "send_DM": "Надіслати особисте повідомлення",
"Sent Post to @": "Надіслати твіст @", "Sent Post to @": "Надіслати твіст @",
"Setup account": "Обліковий запис", "Setup account": "Обліковий запис",
"shorten_URI": "Shorten URL",
"shorten_URI_enter_link": "Enter the long link (be careful!):",
"The File APIs are not fully supported in this browser.": "File APIs не повністю підтримується браузером.", "The File APIs are not fully supported in this browser.": "File APIs не повністю підтримується браузером.",
"time_ago": "%{time} тому", // 5 minutes ago "time_ago": "%{time} тому", // 5 minutes ago
"Time of the last block:": "Час останнього блоку: ", "Time of the last block:": "Час останнього блоку: ",
@ -1124,6 +1130,8 @@ if(preferredLanguage == "zh-CN"){
"send_DM": "发送私信", "send_DM": "发送私信",
"Sent Post to @": "发送推文 @", "Sent Post to @": "发送推文 @",
"Setup account": "设置账号", "Setup account": "设置账号",
"shorten_URI": "Shorten URL",
"shorten_URI_enter_link": "Enter the long link (be careful!):",
"The File APIs are not fully supported in this browser.": "这个浏览器不能完全支持 File API。", "The File APIs are not fully supported in this browser.": "这个浏览器不能完全支持 File API。",
"time_ago": "%{time} 之前", // 5 minutes ago "time_ago": "%{time} 之前", // 5 minutes ago
"Time of the last block:": "最新区块的时间：", "Time of the last block:": "最新区块的时间：",
@ -1453,6 +1461,8 @@ if(preferredLanguage == "nl"){
"send_DM": "Verstuur privébericht", "send_DM": "Verstuur privébericht",
"Sent Post to @": "Verstuur bericht naar @", "Sent Post to @": "Verstuur bericht naar @",
"Setup account": "Account instellingen", "Setup account": "Account instellingen",
"shorten_URI": "Shorten URL",
"shorten_URI_enter_link": "Enter the long link (be careful!):",
"The File APIs are not fully supported in this browser.": "The File APIs are not fully supported in this browser.", "The File APIs are not fully supported in this browser.": "The File APIs are not fully supported in this browser.",
"time_ago": "%{time} geleden", // 5 minutes ago "time_ago": "%{time} geleden", // 5 minutes ago
"Time of the last block:": "Tijd van de laatste block: ", "Time of the last block:": "Tijd van de laatste block: ",
@ -1766,6 +1776,8 @@ if(preferredLanguage == "it"){
"send_DM": "Messaggi Diretti inviati", "send_DM": "Messaggi Diretti inviati",
"Sent Post to @": "Messaggi inviati a @", "Sent Post to @": "Messaggi inviati a @",
"Setup account": "Configurazione Utente", "Setup account": "Configurazione Utente",
"shorten_URI": "Shorten URL",
"shorten_URI_enter_link": "Enter the long link (be careful!):",
"The File APIs are not fully supported in this browser.": "Le API File non sono interamente supportate da questo browser.", "The File APIs are not fully supported in this browser.": "Le API File non sono interamente supportate da questo browser.",
"time_ago": "%{time} fa", // 5 minutes ago "time_ago": "%{time} fa", // 5 minutes ago
"Time of the last block:": "Orario del blocco più recente: ", "Time of the last block:": "Orario del blocco più recente: ",
@ -2077,6 +2089,8 @@ if(preferredLanguage == "fr"){
"send_DM": "Message privé envoyé", "send_DM": "Message privé envoyé",
"Sent Post to @": "Envoyer un billet à @", "Sent Post to @": "Envoyer un billet à @",
"Setup account": "Configuration du compte", "Setup account": "Configuration du compte",
"shorten_URI": "Shorten URL",
"shorten_URI_enter_link": "Enter the long link (be careful!):",
"The File APIs are not fully supported in this browser.": "L'API de fichier n'est pas entièrement pris en charge dans votre navigateur.", "The File APIs are not fully supported in this browser.": "L'API de fichier n'est pas entièrement pris en charge dans votre navigateur.",
"time_ago": "Il y a %{time}", // 5 minutes ago "time_ago": "Il y a %{time}", // 5 minutes ago
"Time of the last block:": "Heure du dernier bloc: ", "Time of the last block:": "Heure du dernier bloc: ",
@ -2392,6 +2406,8 @@ if(preferredLanguage == "ru"){
"send_DM": "Отправить личное сообщение", "send_DM": "Отправить личное сообщение",
"Sent Post to @": "Отправить сообщение для @", "Sent Post to @": "Отправить сообщение для @",
"Setup account": "Настроить аккаунт", "Setup account": "Настроить аккаунт",
"shorten_URI": "Сокр. URL",
"shorten_URI_enter_link": "Введи длинную ссылку (очень осторожно!):",
"The File APIs are not fully supported in this browser.": "File APIs не полностью поддерживается этим браузером.", "The File APIs are not fully supported in this browser.": "File APIs не полностью поддерживается этим браузером.",
"time_ago": "%{time} назад", // 5 minutes ago "time_ago": "%{time} назад", // 5 minutes ago
"Time of the last block:": "Время последнего блока: ", "Time of the last block:": "Время последнего блока: ",
@ -2710,6 +2726,8 @@ if(preferredLanguage == "de"){
"send_DM": "Direktnachricht senden", "send_DM": "Direktnachricht senden",
"Sent Post to @": "Sende Post an @", "Sent Post to @": "Sende Post an @",
"Setup account": "Accounteinstellungen", "Setup account": "Accounteinstellungen",
"shorten_URI": "Shorten URL",
"shorten_URI_enter_link": "Enter the long link (be careful!):",
"The File APIs are not fully supported in this browser.": "Die File-API's werden von diesem Browser nicht vollständig unterstützt.", "The File APIs are not fully supported in this browser.": "Die File-API's werden von diesem Browser nicht vollständig unterstützt.",
"time_ago": "vor %{time}", // 5 minutes ago "time_ago": "vor %{time}", // 5 minutes ago
"Time of the last block:": "Zeit des letzten Blocks: ", "Time of the last block:": "Zeit des letzten Blocks: ",
@ -3024,6 +3042,8 @@ if(preferredLanguage == "ja"){
"send_DM": "ダイレクトメッセージを送る", "send_DM": "ダイレクトメッセージを送る",
"Sent Post to @": "メンションを投稿する", "Sent Post to @": "メンションを投稿する",
"Setup account": "アカウント設定", "Setup account": "アカウント設定",
"shorten_URI": "Shorten URL",
"shorten_URI_enter_link": "Enter the long link (be careful!):",
"The File APIs are not fully supported in this browser.": "ご使用のブラウザーは完全にファイルAPIに対応していません。", "The File APIs are not fully supported in this browser.": "ご使用のブラウザーは完全にファイルAPIに対応していません。",
"time_ago": "%{time}前", // 5 minutes ago "time_ago": "%{time}前", // 5 minutes ago
"Time of the last block:": "最新ブロックの生成日時: ", "Time of the last block:": "最新ブロックの生成日時: ",
@ -3336,6 +3356,8 @@ if(preferredLanguage == "pt-BR"){
"send_DM": "Mensagens Diretas trocadas", "send_DM": "Mensagens Diretas trocadas",
"Sent Post to @": "Postagens enviadas para @", "Sent Post to @": "Postagens enviadas para @",
"Setup account": "Configurar conta", "Setup account": "Configurar conta",
"shorten_URI": "Shorten URL",
"shorten_URI_enter_link": "Enter the long link (be careful!):",
"The File APIs are not fully supported in this browser.": "O gerenciamento de arquivos não é completamente suportado neste navegador.", "The File APIs are not fully supported in this browser.": "O gerenciamento de arquivos não é completamente suportado neste navegador.",
"time_ago": "%{time} atrás", // 5 minutes ago "time_ago": "%{time} atrás", // 5 minutes ago
"Time of the last block:": "Horário do último bloco: ", "Time of the last block:": "Horário do último bloco: ",
@ -3650,6 +3672,8 @@ if(preferredLanguage == "tr"){
"send_DM": "Direk Mesaj Gönder", "send_DM": "Direk Mesaj Gönder",
"Sent Post to @": "@ Kullanıcıya Gönder", "Sent Post to @": "@ Kullanıcıya Gönder",
"Setup account": "Hesap ayarları", "Setup account": "Hesap ayarları",
"shorten_URI": "Shorten URL",
"shorten_URI_enter_link": "Enter the long link (be careful!):",
"The File APIs are not fully supported in this browser.": "Dosya API'si tarayıcınızda tam olarak desteklenmiyor.", "The File APIs are not fully supported in this browser.": "Dosya API'si tarayıcınızda tam olarak desteklenmiyor.",
"time_ago": "%{time} önce", // 5 minutes ago "time_ago": "%{time} önce", // 5 minutes ago
"Time of the last block:": "Son blok saati: ", "Time of the last block:": "Son blok saati: ",
@ -3963,6 +3987,8 @@ if(preferredLanguage == "cs"){
"send_DM": "Poslat přímou zprávu", "send_DM": "Poslat přímou zprávu",
"Sent Post to @": "Poslat veřejný příspěvek pro @", "Sent Post to @": "Poslat veřejný příspěvek pro @",
"Setup account": "Upravit profil", "Setup account": "Upravit profil",
"shorten_URI": "Shorten URL",
"shorten_URI_enter_link": "Enter the long link (be careful!):",
"The File APIs are not fully supported in this browser.": "Upozornění: váš webový prohlížeč nepodporuje File API.", "The File APIs are not fully supported in this browser.": "Upozornění: váš webový prohlížeč nepodporuje File API.",
"time_ago": "před %{time}", // 5 minutes ago "time_ago": "před %{time}", // 5 minutes ago
"Time of the last block:": "Čas posledního bloku: ", "Time of the last block:": "Čas posledního bloku: ",

2
js/tmobile.js
Unescape View File

@ -26,7 +26,7 @@ function initializeTwister( redirectNetwork, redirectLogin, cbFunc, cbArg ) {
// reply text counter both newmsg and dmchat // reply text counter both newmsg and dmchat
$('.post-area-new textarea') $('.post-area-new textarea')
.off('input keyup') .off('input keyup')
.on('focus', posPostPreview) .on('focus', poseTextareaPostTools)
.on('keyup', replyTextInput) .on('keyup', replyTextInput)
.on('keyup', function() { replyTextUpdateRemaining(this); }) .on('keyup', function() { replyTextUpdateRemaining(this); })
; ;

4
network.html
Unescape View File

@ -251,6 +251,10 @@
</div> </div>
</div> </div>
<div id="template-post-textarea-edit-bar">
<div class="post-textarea-edit-bar"></div>
</div>
<div id="template-shorten-uri"> <div id="template-shorten-uri">
<a class="shorten-uri">shorten URL</a> <a class="shorten-uri">shorten URL</a>
</div> </div>

10
theme_calm/css/style.css
Unescape View File

@ -796,7 +796,6 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
border-radius: 3px; border-radius: 3px;
border: solid 1px rgba(0, 0, 0, .3 ); border: solid 1px rgba(0, 0, 0, .3 );
margin-left: 55px; margin-left: 55px;
margin-bottom: 10px;
padding: 4px; padding: 4px;
font-size: 13px; font-size: 13px;
} }
@ -928,14 +927,13 @@ textarea.splited-post {
transition: all .6s linear; transition: all .6s linear;
} }
.post-area-new .shorten-uri { .post-area-new .post-textarea-edit-bar {
font-size: 11px; font-size: 11px;
float: left; margin: 2px 0;
margin: 2px 4px;
} }
.postboard .post-area-new .shorten-uri, .modal-content .post-area-new .shorten-uri { .post-area-new .post-textarea-edit-bar > * {
margin-left: 56px; margin: 2px 4px;
} }
.post-area-remaining .post-area-remaining

7
theme_nin/css/style.css
Unescape View File

@ -2077,9 +2077,12 @@ textarea.splited-post {
transition: all 0.6s linear; transition: all 0.6s linear;
} }
.post-area-new .shorten-uri { .post-area-new .post-textarea-edit-bar {
font-size: 11px; font-size: 11px;
float: left; margin: 2px 0;
}
.post-area-new .post-textarea-edit-bar > * {
margin: 2px 4px; margin: 2px 4px;
} }

14
tmobile.html
Unescape View File

@ -76,6 +76,16 @@
.content {padding:15px 20px 20px 20px;} .content {padding:15px 20px 20px 20px;}
.footer {position:fixed;z-index:10;bottom:0;width:100%} .footer {position:fixed;z-index:10;bottom:0;width:100%}
.post-textarea-edit-bar {
font-weight: lighter;
font-size: 12px;
margin: 2px 0;
}
.post-area-new .post-textarea-edit-bar > * {
margin: 2px 4px;
}
.post-info-time { .post-info-time {
font-weight: lighter; font-weight: lighter;
font-size: 12px; font-size: 12px;
@ -756,6 +766,10 @@
</div> </div>
</div> </div>
<div id="template-post-textarea-edit-bar">
<div class="post-textarea-edit-bar"></div>
</div>
<div id="template-shorten-uri"> <div id="template-shorten-uri">
<a class="shorten-uri">shorten URL</a> <a class="shorten-uri">shorten URL</a>
</div> </div>

Write Preview
Loading…
Cancel
Save