Browse Source

add post preview to #options's Post display section

master
Simon Grim 9 years ago
parent
commit
59fb0e9c19
  1. 6
      css/style.css
  2. 39
      js/interface_localization.js
  3. 8
      js/options.js
  4. 17
      options.html
  5. 6
      theme_calm/css/style.css
  6. 10
      theme_nin/css/style.css
  7. 7
      theme_nin/sass/style.sass

6
css/style.css

@ -665,6 +665,12 @@ textarea.splited-post { @@ -665,6 +665,12 @@ textarea.splited-post {
background-color: #F0EFCC;
}
#opt-form-post-preview #post-preview {
width: 76%;
margin-left: 16px;
padding: 8px;
}
.splited-post-counter {
color: rgba(0, 0, 0, 0.3);
font-weight: bold;

39
js/interface_localization.js

@ -107,6 +107,9 @@ if(preferredLanguage == "en"){ @@ -107,6 +107,9 @@ if(preferredLanguage == "en"){
"notify_desktop_perm_denied": "Twister cannot perform desktop notification: permission denied.\n\nIf you want to get notifications, allow them for %{this_domain} in settings of your browser.",
"notify_desktop_test": "All the twisters gonna twist.\nNow you are welcome too.",
"notify_desktop_title": "Watch out, it's twister over here!",
"post_preview_dummy": 'here is *bold*, ~italic~, -strike-trough- and _underlined_ text.\n'
+ 'same but escaped: `*bold*, ~italic~, -strike-trough- and _underlined_`.\n'
+ 'links to [our awesome logo](%{logo}) and our gorgeous site: %{site}.',
"Number of blocks in block chain:": "Number of blocks in block chain: ",
"Number of CPUs to use": "Number of CPUs to use ",
"Only alphanumeric and underscore allowed.": "Only alphanumeric and underscore allowed.",
@ -402,6 +405,9 @@ if(preferredLanguage == "es"){ @@ -402,6 +405,9 @@ if(preferredLanguage == "es"){
"notify_desktop_perm_denied": "Twister cannot perform desktop notification: permission denied.\n\nIf you want to get notifications, allow them for %{this_domain} in settings of your browser.",
"notify_desktop_test": "All the twisters gonna twist.\nNow you are welcome too.",
"notify_desktop_title": "Watch out, it's twister over here!",
"post_preview_dummy": 'here is *bold*, ~italic~, -strike-trough- and _underlined_ text.\n'
+ 'same but escaped: `*bold*, ~italic~, -strike-trough- and _underlined_`.\n'
+ 'links to [our awesome logo](%{logo}) and our gorgeous site: %{site}.',
"Number of blocks in block chain:": "Número de bloques en la cadena de bloques: ",
"Number of CPUs to use": "Número de CPUs para utilizar ",
"Only alphanumeric and underscore allowed.": "Sólo alfanuméricos y subrayados permitido.",
@ -682,6 +688,9 @@ if(preferredLanguage == "uk"){ @@ -682,6 +688,9 @@ if(preferredLanguage == "uk"){
"notify_desktop_perm_denied": "Twister не може створити сповіщення на робочому столі: доступ обмежено.\n\nЯкщо ви бажаєте отримувати сповіщення, дозвольте їх виконання в налаштуваннях браузера для %{this_domain}.",
"notify_desktop_test": "Є дещо новеньке у стрічці.",
"notify_desktop_title": "Погляньте сюди!",
"post_preview_dummy": 'here is *bold*, ~italic~, -strike-trough- and _underlined_ text.\n'
+ 'same but escaped: `*bold*, ~italic~, -strike-trough- and _underlined_`.\n'
+ 'links to [our awesome logo](%{logo}) and our gorgeous site: %{site}.',
"Number of blocks in block chain:": "Кількість блоків у ланцюгу: ",
"Number of CPUs to use": "Кількість CPU до використання ",
"Only alphanumeric and underscore allowed.": "Допустимі тільки латинські символи, числа та нижнє підкреслення.",
@ -959,6 +968,9 @@ if(preferredLanguage == "zh-CN"){ @@ -959,6 +968,9 @@ if(preferredLanguage == "zh-CN"){
"notify_desktop_perm_denied": "Twister 无法发出桌面提醒:权限被拒绝。\n\n如果你想收到提醒,请在你的浏览器设置中允许 %{this_domain} 发出提醒。",
"notify_desktop_test": "我们都在用 Twister。\n欢迎你的加入。",
"notify_desktop_title": "注意,Twister 在这里!",
"post_preview_dummy": 'here is *bold*, ~italic~, -strike-trough- and _underlined_ text.\n'
+ 'same but escaped: `*bold*, ~italic~, -strike-trough- and _underlined_`.\n'
+ 'links to [our awesome logo](%{logo}) and our gorgeous site: %{site}.',
"Number of blocks in block chain:": "区块链中的区块数:",
"Number of CPUs to use": "使用CPU数目",
"Only alphanumeric and underscore allowed.": "只允许字母和下划线。",
@ -1254,6 +1266,9 @@ if(preferredLanguage == "nl"){ @@ -1254,6 +1266,9 @@ if(preferredLanguage == "nl"){
"notify_desktop_perm_denied": "Twister cannot perform desktop notification: permission denied.\n\nIf you want to get notifications, allow them for %{this_domain} in settings of your browser.",
"notify_desktop_test": "All the twisters gonna twist.\nNow you are welcome too.",
"notify_desktop_title": "Watch out, it's twister over here!",
"post_preview_dummy": 'here is *bold*, ~italic~, -strike-trough- and _underlined_ text.\n'
+ 'same but escaped: `*bold*, ~italic~, -strike-trough- and _underlined_`.\n'
+ 'links to [our awesome logo](%{logo}) and our gorgeous site: %{site}.',
"Number of blocks in block chain:": "Aantal blocks in block chain: ",
"Number of CPUs to use": "Aantal CPUs om te gebruiken ",
"Only alphanumeric and underscore allowed.": "Alleen alphanumeriek en underscore toegestaan.",
@ -1533,6 +1548,9 @@ if(preferredLanguage == "it"){ @@ -1533,6 +1548,9 @@ if(preferredLanguage == "it"){
"notify_desktop_perm_denied": "Twister cannot perform desktop notification: permission denied.\n\nIf you want to get notifications, allow them for %{this_domain} in settings of your browser.",
"notify_desktop_test": "All the twisters gonna twist.\nNow you are welcome too.",
"notify_desktop_title": "Watch out, it's twister over here!",
"post_preview_dummy": 'here is *bold*, ~italic~, -strike-trough- and _underlined_ text.\n'
+ 'same but escaped: `*bold*, ~italic~, -strike-trough- and _underlined_`.\n'
+ 'links to [our awesome logo](%{logo}) and our gorgeous site: %{site}.',
"Number of blocks in block chain:": "Numero di blocchi nella catena: ",
"Number of CPUs to use": "Numero di processori da usare:",
"Only alphanumeric and underscore allowed.": "Sono permessi solo caratteri alfanumerici e '_'",
@ -1809,6 +1827,9 @@ if(preferredLanguage == "fr"){ @@ -1809,6 +1827,9 @@ if(preferredLanguage == "fr"){
"notify_desktop_perm_denied": "Impossible d'afficher les notifications: autorisation refusée.\n\nSi tu souhaites afficher les notifications, autorise le %{this_domain} dans les paramêtres de ton navigateur.",
"notify_desktop_test": "All the twisters gonna twist.\nBienvenue à toi!",
"notify_desktop_title": "Youhou! Ça bouge sur ton twister!",
"post_preview_dummy": 'here is *bold*, ~italic~, -strike-trough- and _underlined_ text.\n'
+ 'same but escaped: `*bold*, ~italic~, -strike-trough- and _underlined_`.\n'
+ 'links to [our awesome logo](%{logo}) and our gorgeous site: %{site}.',
"Number of blocks in block chain:": "Nombre de blocs dans la chaîne de blocs: ",
"Number of CPUs to use": "Nombre de processeurs à utiliser",
"Only alphanumeric and underscore allowed.": "Seuls les caractères alphanumériques et la barre de soulignement sont permis.",
@ -2090,6 +2111,9 @@ if(preferredLanguage == "ru"){ @@ -2090,6 +2111,9 @@ if(preferredLanguage == "ru"){
"notify_desktop_perm_denied": "Твистер не может выполнить уведомление: разрешение не получено.\n\nЧтобы получать уведомления, разрешите их для %{this_domain} в настройках вашего браузера.",
"notify_desktop_test": "Одна лягушка сказала:\n'если не буду квакать — лопну'.\nВы нужны нам, берегите себя.",
"notify_desktop_title": "Watch out, it's twister over here!",
"post_preview_dummy": 'это *полужирный*, ~курсивный~, -зачёркнутый- и _подчёркнутый_ текст.\n'
+ 'экранированный: `*полужирный*, ~курсивный~, -зачёркнутый- и _подчёркнутый_`.\n'
+ 'ссылки на [наш потрясный логотип](%{logo}) и наш великолепный сайт: %{site}.',
"Number of blocks in block chain:": "Количество блоков в цепочке: ",
"Number of CPUs to use": "Сколько использовать ядер процессора",
"Only alphanumeric and underscore allowed.": "Разрешены только латинские буквы, цифры и подчеркивания.",
@ -2375,6 +2399,9 @@ if(preferredLanguage == "de"){ @@ -2375,6 +2399,9 @@ if(preferredLanguage == "de"){
"notify_desktop_perm_denied": "Twister kann keine Desktop-Meldungen anzeigen: Keine Berechtigung.\n\nWenn Du Meldungen angezeigt haben möchtest, erlaube sie für %{this_domain} in den Einstellungen Deines Browsers.",
"notify_desktop_test": "All die Twisterer werden twisten..\nDu bist nun auch willkommen!",
"notify_desktop_title": "Achtung, hier ist Twister am Gange!",
"post_preview_dummy": 'here is *bold*, ~italic~, -strike-trough- and _underlined_ text.\n'
+ 'same but escaped: `*bold*, ~italic~, -strike-trough- and _underlined_`.\n'
+ 'links to [our awesome logo](%{logo}) and our gorgeous site: %{site}.',
"Number of blocks in block chain:": "Anzahl der Blöcke in der Block-Chain: ",
"Number of CPUs to use": "Anzahl der zu benutzenden CPU's ",
"Only alphanumeric and underscore allowed.": "Nur Buchstaben, Zahlen und Unterstrich erlaubt.",
@ -2655,6 +2682,9 @@ if(preferredLanguage == "ja"){ @@ -2655,6 +2682,9 @@ if(preferredLanguage == "ja"){
"notify_desktop_perm_denied": "Twister cannot perform desktop notification: permission denied.\n\nIf you want to get notifications, allow them for %{this_domain} in settings of your browser.",
"notify_desktop_test": "All the twisters gonna twist.\nNow you are welcome too.",
"notify_desktop_title": "Watch out, it's twister over here!",
"post_preview_dummy": 'here is *bold*, ~italic~, -strike-trough- and _underlined_ text.\n'
+ 'same but escaped: `*bold*, ~italic~, -strike-trough- and _underlined_`.\n'
+ 'links to [our awesome logo](%{logo}) and our gorgeous site: %{site}.',
"Number of blocks in block chain:": "全ブロック数: ",
"Number of CPUs to use": "利用するCPUの数",
"Only alphanumeric and underscore allowed.": "アルファベットとアンダースコア(_)が利用可能です",
@ -2932,6 +2962,9 @@ if(preferredLanguage == "pt-BR"){ @@ -2932,6 +2962,9 @@ if(preferredLanguage == "pt-BR"){
"notify_desktop_perm_denied": "Twister cannot perform desktop notification: permission denied.\n\nIf you want to get notifications, allow them for %{this_domain} in settings of your browser.",
"notify_desktop_test": "All the twisters gonna twist.\nNow you are welcome too.",
"notify_desktop_title": "Watch out, it's twister over here!",
"post_preview_dummy": 'here is *bold*, ~italic~, -strike-trough- and _underlined_ text.\n'
+ 'same but escaped: `*bold*, ~italic~, -strike-trough- and _underlined_`.\n'
+ 'links to [our awesome logo](%{logo}) and our gorgeous site: %{site}.',
"Number of blocks in block chain:": "Número de blocos: ",
"Number of CPUs to use": "Número de CPUs a serem utilizados ",
"Only alphanumeric and underscore allowed.": "Permitido apenas caracteres alfanuméricos e underscore '_'.",
@ -3213,6 +3246,9 @@ if(preferredLanguage == "tr"){ @@ -3213,6 +3246,9 @@ if(preferredLanguage == "tr"){
"notify_desktop_perm_denied": "Twister cannot perform desktop notification: permission denied.\n\nIf you want to get notifications, allow them for %{this_domain} in settings of your browser.",
"notify_desktop_test": "All the twisters gonna twist.\nNow you are welcome too.",
"notify_desktop_title": "Watch out, it's twister over here!",
"post_preview_dummy": 'here is *bold*, ~italic~, -strike-trough- and _underlined_ text.\n'
+ 'same but escaped: `*bold*, ~italic~, -strike-trough- and _underlined_`.\n'
+ 'links to [our awesome logo](%{logo}) and our gorgeous site: %{site}.',
"Number of blocks in block chain:": "Blok zincirindeki blok sayısı: ",
"Number of CPUs to use": "Kullanılacak CPU sayısı ",
"Only alphanumeric and underscore allowed.": "Sadece harf ve alt çizgi kullanılabilir.",
@ -3491,6 +3527,9 @@ if(preferredLanguage == "cs"){ @@ -3491,6 +3527,9 @@ if(preferredLanguage == "cs"){
"notify_desktop_perm_denied": "Twisteru se nepodařilo zobrazit upozornění na ploše: přístup byl odepřen.\n\nPokud chcete používat upozornění na ploše, povolte je pro %{this_domain} v nastavení vašeho prohlížeče.",
"notify_desktop_test": "Twister to umí pořádně roztočit.\nKaždý je tu vítán.",
"notify_desktop_title": "Twister",
"post_preview_dummy": 'here is *bold*, ~italic~, -strike-trough- and _underlined_ text.\n'
+ 'same but escaped: `*bold*, ~italic~, -strike-trough- and _underlined_`.\n'
+ 'links to [our awesome logo](%{logo}) and our gorgeous site: %{site}.',
"Number of blocks in block chain:": "Počet bloků v blockchainu: ",
"Number of CPUs to use": "Kolik jader procesoru použít? ",
"Only alphanumeric and underscore allowed.": "Povolena jsou jen písmena, čísla a podtržítko.",

8
js/options.js

@ -311,6 +311,9 @@ twisterOptions.prototype.initControls = function () { @@ -311,6 +311,9 @@ twisterOptions.prototype.initControls = function () {
$('#testDesktopNotif').on('click', function() {
$.MAL.showDesktopNotif(false, polyglot.t('notify_desktop_test'), false,'twister_notification_test', false, false, function() { alert(polyglot.t('notify_desktop_perm_denied', {'this_domain': document.domain})) })
});
tickOptionsPostPreview();
$('#opt-mod-posts-display').find('select').on('change', tickOptionsPostPreview);
};
function twisterOption(option) {
@ -362,3 +365,8 @@ function checkForNumeric(elem) { @@ -362,3 +365,8 @@ function checkForNumeric(elem) {
return false;
}
}
function tickOptionsPostPreview() {
$('#opt-mod-posts-display #post-preview').html(htmlFormatMsg(
polyglot.t('post_preview_dummy', {logo: '/img/twister_mini.png', site: 'http://twister.net.co'}), []));
}

17
options.html

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
<script src="js/twister_io.js"></script>
<script src="js/twister_network.js"></script>
<script src="js/twister_user.js"></script>
<script src="js/twister_formatpost.js"></script>
<script src="js/interface_common.js"></script>
<script src="js/interface_login.js"></script>
<script src="js/polyglot.min.js"></script>
@ -263,8 +264,13 @@ @@ -263,8 +264,13 @@
</form>
</div>
</div>
<div class="module">
<div id="opt-mod-posts-display" class="module">
<p class="label label-h"> Posts display </p>
<div id="opt-form-post-preview" class="container">
<p><span class="label">Post preview</span></p>
<div id="post-preview">
</div>
</div>
<div class="container">
<form action="" id="lineFeedsOpt">
<p class="label">Line feeds</p>
@ -448,6 +454,15 @@ @@ -448,6 +454,15 @@
</div><!-- /options -->
</div><!-- /options -->
<div id="templates" style="display:none;">
<!-- template for user links in message (open profile modal) -->
<a id="msg-user-link-template" class="open-profile-modal"></a>
<!-- template for user links in message (open profile modal) -->
<a id="external-page-link-template" rel="nofollow" target="_blank"></a>
<!-- template for user links in message (open profile modal) -->
<a id="hashtag-link-template" class="open-hashtag-modal"></a>
</div>
<audio id="player"></audio>
<audio id="playerSec"></audio>
</body>

6
theme_calm/css/style.css

@ -790,6 +790,12 @@ textarea.splited-post { @@ -790,6 +790,12 @@ textarea.splited-post {
background-color: #EEE;
}
#opt-form-post-preview #post-preview {
width: 76%;
margin-left: 16px;
padding: 8px;
}
.splited-post-counter {
color: rgba(0, 0, 0, 0.3);
font-weight: bold;

10
theme_nin/css/style.css

@ -2291,6 +2291,16 @@ textarea.splited-post { @@ -2291,6 +2291,16 @@ textarea.splited-post {
background-color: #EEE;
}
#opt-form-post-preview {
width: 100%;
}
#opt-form-post-preview #post-preview {
width: 76%;
margin-left: 16px;
padding: 8px;
}
/* line 384, ../sass/style.sass */
.splited-post-counter {
color: rgba(0, 0, 0, 0.3);

7
theme_nin/sass/style.sass

@ -368,6 +368,13 @@ ul.userMenu-search-profiles @@ -368,6 +368,13 @@ ul.userMenu-search-profiles
samp
background-color: #EEE
#opt-form-post-preview
width: 100%
#post-preview
width: 76%
margin-left: 16px
padding: 8px
#postboard-top
clear: both
position: relative

Loading…
Cancel
Save