Browse Source

twistday reminder strings fix and reply popup

master
Simon Grim 10 years ago
parent
commit
d45f8e9376
  1. 6
      css/style.css
  2. 8
      home.html
  3. 9
      js/interface_common.js
  4. 23
      js/interface_home.js
  5. 65
      js/interface_localization.js
  6. 2
      options.html
  7. 6
      theme_calm/css/style.css
  8. 4
      theme_nin/css/style.css
  9. 2
      theme_nin/sass/style.sass

6
css/style.css

@ -858,7 +858,11 @@ ol.toptrends-list {
.twistday-reminder .twisterday { .twistday-reminder .twisterday {
font-size: 80%; font-size: 80%;
margin: 0 11%; margin-left: 11%;
}
.twistday-reminder .twisterday:hover {
cursor: pointer;
} }
/*********************************** /***********************************

8
home.html

@ -244,17 +244,17 @@
<!-- TEMPLATE DE TWISTDAY REMINDER MODULE --> <!-- TEMPLATE DE TWISTDAY REMINDER MODULE -->
<div id="twistday-reminder-template"> <div id="twistday-reminder-template">
<div> <div>
<h3 class="label">Twistday Reminder</h3> <h3 class="label">Who's celebrating Twistday</h3>
<small>.</small> <small>.</small>
<a class="refresh">Refresh</a> <a class="refresh label">Refresh</a>
<div class="current"> <div class="current">
<h4>Today's luckies:</h4> <h4 class="label">Today's luckies:</h4>
<ol class="list"> <ol class="list">
<!-- use "twistday-reminder-suggestion-template" here --> <!-- use "twistday-reminder-suggestion-template" here -->
</ol> </ol>
</div> </div>
<div class="upcoming"> <div class="upcoming">
<h4>Upcoming ones:</h4> <h4 class="label">Upcoming ones:</h4>
<ol class="list"> <ol class="list">
<!-- use "twistday-reminder-suggestion-template" here --> <!-- use "twistday-reminder-suggestion-template" here -->
</ol> </ol>

9
js/interface_common.js

@ -525,16 +525,15 @@ var replyInitPopup = function(e, post)
openPrompt( replyClass ); openPrompt( replyClass );
//título do modal //título do modal
var fullname = post.find(".post-info-name").text(); $('.reply h3').html(polyglot.t('reply_to', { 'fullname': '<span class="fullname">'+post.userpost.n+'</span>' }));
$( ".reply h3" ).text( polyglot.t("reply_to", { fullname: fullname }) ); getFullname(post.userpost.n, $('.reply h3 .fullname'));
//para poder exibir a thread selecionada... //para poder exibir a thread selecionada...
var replyModalContent = $(".reply .modal-content").hide(); var replyModalContent = $(".reply .modal-content").hide();
var retweetContent = $( "#reply-modal-template" ).children().clone(true); var retweetContent = $( "#reply-modal-template" ).children().clone(true);
retweetContent.appendTo(replyModalContent); retweetContent.appendTo(replyModalContent);
var postdata = post.find(".post-data").attr("data-userpost"); var postElem = postToElem(post,"");
var postElem = postToElem($.evalJSON(postdata),"");
postElem.appendTo(replyModalContent); postElem.appendTo(replyModalContent);
var replyArea = $(".reply .post-area .post-area-new"); var replyArea = $(".reply .post-area .post-area-new");
@ -693,7 +692,7 @@ var postReplyClick = function( e )
} }
var post = $(this).closest(".post"); var post = $(this).closest(".post");
if( !post.hasClass( "original" ) ) { if( !post.hasClass( "original" ) ) {
replyInitPopup(e, post); replyInitPopup(e, $.evalJSON(post.find(".post-data").attr("data-userpost")));
} else { } else {
var postLiOpen = post.parents(".post.open"); var postLiOpen = post.parents(".post.open");
if( !postLiOpen.length ) { if( !postLiOpen.length ) {

23
js/interface_home.js

@ -210,23 +210,24 @@ function refreshTwistdayReminder() {
for (var i = 0; i < suggests.length; i++) { for (var i = 0; i < suggests.length; i++) {
suggests[i] = {'username': suggests[i], 'max_id': 0}; suggests[i] = {'username': suggests[i], 'max_id': 0};
} }
twisterRpc("getposts", [suggests.length + 1,suggests], twisterRpc('getposts', [suggests.length + 1,suggests],
function(arg, posts) { function(arg, posts) {
function addLuckyToList(list, post, time) { function addLuckyToList(list, post, time) {
var lucky = post.userpost.n; var lucky = post.userpost.n;
if (list.find('[data-screen-name='+lucky+']').length < 1) { if (list.find('[data-screen-name='+lucky+']').length < 1) {
var item = $("#twistday-reminder-suggestion-template").clone(true); var item = $('#twistday-reminder-suggestion-template').clone(true);
item.removeAttr("id"); item.removeAttr('id');
item.find(".twister-user-info").attr("data-screen-name", lucky); item.find('.twister-user-info').attr('data-screen-name', lucky);
item.find(".twister-user-name").attr("href", $.MAL.userUrl(lucky)); item.find('.twister-user-name').attr('href', $.MAL.userUrl(lucky));
item.find(".twister-user-tag").text("@" +lucky); item.find('.twister-user-tag').text('@' +lucky);
if (typeof(time) !== 'undefined') if (typeof(time) !== 'undefined')
item.find(".twisterday").text(timeGmtToText(time)); item.find('.twisterday').text(timeGmtToText(time));
else else
item.find(".twisterday").text(timeGmtToText(post.userpost.time)); item.find('.twisterday').text(timeGmtToText(post.userpost.time));
item.find('.twisterday').bind('click', (function(e) { replyInitPopup(e, post); }).bind(post));
getAvatar(lucky, item.find(".twister-user-photo")); getAvatar(lucky, item.find('.twister-user-photo'));
getFullname(lucky, item.find(".twister-user-full")); getFullname(lucky, item.find('.twister-user-full'));
list.append(item); list.append(item);
} }
@ -281,7 +282,7 @@ function refreshTwistdayReminder() {
$module.find('.refresh').show(); $module.find('.refresh').show();
$module.find('.loading-roller').hide(); $module.find('.loading-roller').hide();
}, null, }, null,
function(arg, ret) { console.log("ajax error:" + ret); }, null); function(arg, ret) { console.log('ajax error:' + ret); }, null);
} }
} }
if ($.Options.getTwistdayReminderAutoUpdateOpt() === 'enable' && $.Options.getTwistdayReminderAutoUpdateTimerOpt() > 0) if ($.Options.getTwistdayReminderAutoUpdateOpt() === 'enable' && $.Options.getTwistdayReminderAutoUpdateTimerOpt() > 0)

65
js/interface_localization.js

@ -276,6 +276,11 @@ if(preferredLanguage == "en"){
"Messages": "Messages", "Messages": "Messages",
"Edit profile": "Edit profile", "Edit profile": "Edit profile",
"Top Trends": "Top Trends", "Top Trends": "Top Trends",
"Twistday Reminder": "Twistday Reminder",
"Show upcoming in near future": "Show upcoming in near future",
"Who's celebrating Twistday": "Who's celebrating Twistday",
"Today's luckies:": "Today's luckies:",
"Upcoming ones:": "Upcoming ones:",
"twisted again by": "twisted again by", "twisted again by": "twisted again by",
"undo": "undo", "undo": "undo",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.", "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.",
@ -559,6 +564,11 @@ if(preferredLanguage == "es"){
"Messages": "Mensajes", "Messages": "Mensajes",
"Edit profile": "Editar perfil", "Edit profile": "Editar perfil",
"Top Trends": "Tendencias principales", "Top Trends": "Tendencias principales",
"Twistday Reminder": "Twistday Reminder",
"Show upcoming in near future": "Show upcoming in near future",
"Who's celebrating Twistday": "Who's celebrating Twistday",
"Today's luckies:": "Today's luckies:",
"Upcoming ones:": "Upcoming ones:",
"twisted again by": "twisted again by", "twisted again by": "twisted again by",
"undo": "deshacer", "undo": "deshacer",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.", "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.",
@ -826,6 +836,11 @@ if(preferredLanguage == "uk"){
"Messages": "Повідомлення", "Messages": "Повідомлення",
"Edit profile": "Редагувати профіль", "Edit profile": "Редагувати профіль",
"Top Trends": "Тренди", "Top Trends": "Тренди",
"Twistday Reminder": "Twistday Reminder",
"Show upcoming in near future": "Show upcoming in near future",
"Who's celebrating Twistday": "Who's celebrating Twistday",
"Today's luckies:": "Today's luckies:",
"Upcoming ones:": "Upcoming ones:",
"twisted again by": "twisted again by", "twisted again by": "twisted again by",
"undo": "відмінити", "undo": "відмінити",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Ви впевнені, що бажаєте зупинити системний демон? \nУ такому разі, клієнт Twister буде зупинено допоки ви не запустите його знову.", "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Ви впевнені, що бажаєте зупинити системний демон? \nУ такому разі, клієнт Twister буде зупинено допоки ви не запустите його знову.",
@ -1092,6 +1107,11 @@ if(preferredLanguage == "zh-CN"){
"Messages": "消息", "Messages": "消息",
"Edit profile": "编辑个人简介", "Edit profile": "编辑个人简介",
"Top Trends": "热门趋势", "Top Trends": "热门趋势",
"Twistday Reminder": "Twistday Reminder",
"Show upcoming in near future": "Show upcoming in near future",
"Who's celebrating Twistday": "Who's celebrating Twistday",
"Today's luckies:": "Today's luckies:",
"Upcoming ones:": "Upcoming ones:",
"twisted again by": "转推由", "twisted again by": "转推由",
"undo": "撤销", "undo": "撤销",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "你确定要退出后台进程?\nTwister 客户端将停止工作。", "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "你确定要退出后台进程?\nTwister 客户端将停止工作。",
@ -1376,6 +1396,11 @@ if(preferredLanguage == "nl"){
"Messages": "Messages", "Messages": "Messages",
"Edit profile": "Edit profile", "Edit profile": "Edit profile",
"Top Trends": "Top Trends", "Top Trends": "Top Trends",
"Twistday Reminder": "Twistday Reminder",
"Show upcoming in near future": "Show upcoming in near future",
"Who's celebrating Twistday": "Who's celebrating Twistday",
"Today's luckies:": "Today's luckies:",
"Upcoming ones:": "Upcoming ones:",
"twisted again by": "twisted again by", "twisted again by": "twisted again by",
"undo": "undo", "undo": "undo",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.", "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.",
@ -1640,6 +1665,11 @@ if(preferredLanguage == "it"){
"Messages": "Messages", "Messages": "Messages",
"Edit profile": "Edit profile", "Edit profile": "Edit profile",
"Top Trends": "Top Trends", "Top Trends": "Top Trends",
"Twistday Reminder": "Twistday Reminder",
"Show upcoming in near future": "Show upcoming in near future",
"Who's celebrating Twistday": "Who's celebrating Twistday",
"Today's luckies:": "Today's luckies:",
"Upcoming ones:": "Upcoming ones:",
"twisted again by": "twisted again by", "twisted again by": "twisted again by",
"undo": "undo", "undo": "undo",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.", "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.",
@ -1908,6 +1938,11 @@ if(preferredLanguage == "fr"){
"Messages": "Messages", "Messages": "Messages",
"Edit profile": "Edit profile", "Edit profile": "Edit profile",
"Top Trends": "Top Trends", "Top Trends": "Top Trends",
"Twistday Reminder": "Twistday Reminder",
"Show upcoming in near future": "Show upcoming in near future",
"Who's celebrating Twistday": "Who's celebrating Twistday",
"Today's luckies:": "Today's luckies:",
"Upcoming ones:": "Upcoming ones:",
"twisted again by": "twisted again by", "twisted again by": "twisted again by",
"undo": "undo", "undo": "undo",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.", "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.",
@ -2177,6 +2212,11 @@ if(preferredLanguage == "ru"){
"Messages": "Сообщения", "Messages": "Сообщения",
"Edit profile": "Изменить профиль", "Edit profile": "Изменить профиль",
"Top Trends": "Топ Трендов", "Top Trends": "Топ Трендов",
"Twistday Reminder": "Твистоденный Календарь",
"Show upcoming in near future": "Показывать намечающиеся юбиляров",
"Who's celebrating Twistday": "Кто празднует Твистодень",
"Today's luckies:": "Сегодняшные счастливчики", // няшные, ок?
"Upcoming ones:": "Намечающиеся вскоре",
"twisted again by": "Перепостил", "twisted again by": "Перепостил",
"undo": "отменить", "undo": "отменить",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Вы уверены, что хотите "+ "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Вы уверены, что хотите "+
@ -2450,6 +2490,11 @@ if(preferredLanguage == "de"){
"Messages": "Messages", "Messages": "Messages",
"Edit profile": "Edit profile", "Edit profile": "Edit profile",
"Top Trends": "Top Trends", "Top Trends": "Top Trends",
"Twistday Reminder": "Twistday Reminder",
"Show upcoming in near future": "Show upcoming in near future",
"Who's celebrating Twistday": "Who's celebrating Twistday",
"Today's luckies:": "Today's luckies:",
"Upcoming ones:": "Upcoming ones:",
"twisted again by": "twisted again by", "twisted again by": "twisted again by",
"undo": "undo", "undo": "undo",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.", "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.",
@ -2714,6 +2759,11 @@ if(preferredLanguage == "ja"){
"Messages": "Messages", "Messages": "Messages",
"Edit profile": "Edit profile", "Edit profile": "Edit profile",
"Top Trends": "Top Trends", "Top Trends": "Top Trends",
"Twistday Reminder": "Twistday Reminder",
"Show upcoming in near future": "Show upcoming in near future",
"Who's celebrating Twistday": "Who's celebrating Twistday",
"Today's luckies:": "Today's luckies:",
"Upcoming ones:": "Upcoming ones:",
"twisted again by": "twisted again by", "twisted again by": "twisted again by",
"undo": "undo", "undo": "undo",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.", "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.",
@ -2984,6 +3034,11 @@ if(preferredLanguage == "pt-BR"){
"Messages": "Messages", "Messages": "Messages",
"Edit profile": "Edit profile", "Edit profile": "Edit profile",
"Top Trends": "Top Trends", "Top Trends": "Top Trends",
"Twistday Reminder": "Twistday Reminder",
"Show upcoming in near future": "Show upcoming in near future",
"Who's celebrating Twistday": "Who's celebrating Twistday",
"Today's luckies:": "Today's luckies:",
"Upcoming ones:": "Upcoming ones:",
"twisted again by": "twisted again by", "twisted again by": "twisted again by",
"undo": "undo", "undo": "undo",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.", "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.",
@ -3250,6 +3305,11 @@ if(preferredLanguage == "tr"){
"Messages": "Messages", "Messages": "Messages",
"Edit profile": "Edit profile", "Edit profile": "Edit profile",
"Top Trends": "Top Trends", "Top Trends": "Top Trends",
"Twistday Reminder": "Twistday Reminder",
"Show upcoming in near future": "Show upcoming in near future",
"Who's celebrating Twistday": "Who's celebrating Twistday",
"Today's luckies:": "Today's luckies:",
"Upcoming ones:": "Upcoming ones:",
"twisted again by": "twisted again by", "twisted again by": "twisted again by",
"undo": "undo", "undo": "undo",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.", "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Are you sure you want to exit the daemon?\nThe Twister client will stop working.",
@ -3515,6 +3575,11 @@ if(preferredLanguage == "cs"){
"Messages": "Zprávy", "Messages": "Zprávy",
"Edit profile": "Upravit profil", "Edit profile": "Upravit profil",
"Top Trends": "Hlavní trendy", "Top Trends": "Hlavní trendy",
"Twistday Reminder": "Twistday Reminder",
"Show upcoming in near future": "Show upcoming in near future",
"Who's celebrating Twistday": "Who's celebrating Twistday",
"Today's luckies:": "Today's luckies:",
"Upcoming ones:": "Upcoming ones:",
"twisted again by": "přeposlal(a)", "twisted again by": "přeposlal(a)",
"undo": "zpět", "undo": "zpět",
"Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Skutečně chcete ukončit server?\nTwister tím vypnete.", "Are you sure you want to exit the daemon?\nThe Twister client will stop working.": "Skutečně chcete ukončit server?\nTwister tím vypnete.",

2
options.html

@ -354,7 +354,7 @@
<div id="TwistdayReminderAutoUpdateOpt" class="container"> <div id="TwistdayReminderAutoUpdateOpt" class="container">
<input type="text" id="TwistdayReminderAutoUpdateTimer" maxlength="6" size="6"/> <span class="label">second(s)</span> <input type="text" id="TwistdayReminderAutoUpdateTimer" maxlength="6" size="6"/> <span class="label">second(s)</span>
</div> </div>
<p class="label">Show upcoming in next hours</p> <p class="label">Show upcoming in near future</p>
<select id="TwistdayReminderShowUpcoming" class="container"> <select id="TwistdayReminderShowUpcoming" class="container">
<option value="enable">Enable</option> <option value="enable">Enable</option>
<option value="disable">Disable</option> <option value="disable">Disable</option>

6
theme_calm/css/style.css

@ -1041,7 +1041,11 @@ textarea.splited-post {
.twistday-reminder .twisterday { .twistday-reminder .twisterday {
font-size: 80%; font-size: 80%;
margin: 0 11%; margin-left: 11%;
}
.twistday-reminder .twisterday:hover {
cursor: pointer;
} }
/*********************************** /***********************************

4
theme_nin/css/style.css

@ -2570,6 +2570,10 @@ ol.toptrends-list a:hover {
margin-left: 8%; margin-left: 8%;
} }
.twistday-reminder .twisterday:hover {
cursor: pointer;
}
/*********** POPUP PROMPT ************ */ /*********** POPUP PROMPT ************ */
/* line 558, ../sass/style.sass */ /* line 558, ../sass/style.sass */
.prompt-wrapper { .prompt-wrapper {

2
theme_nin/sass/style.sass

@ -603,6 +603,8 @@ ol.toptrends-list
.twisterday .twisterday
font-size: 80% font-size: 80%
margin-left: 8% margin-left: 8%
&.hover
cursor: pointer
/*********** POPUP PROMPT *************/ /*********** POPUP PROMPT *************/
.prompt-wrapper .prompt-wrapper

Loading…
Cancel
Save