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

8
home.html

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

9
js/interface_common.js

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

23
js/interface_home.js

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

65
js/interface_localization.js

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

2
options.html

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

6
theme_calm/css/style.css

@ -1041,7 +1041,11 @@ textarea.splited-post { @@ -1041,7 +1041,11 @@ textarea.splited-post {
.twistday-reminder .twisterday {
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 { @@ -2570,6 +2570,10 @@ ol.toptrends-list a:hover {
margin-left: 8%;
}
.twistday-reminder .twisterday:hover {
cursor: pointer;
}
/*********** POPUP PROMPT ************ */
/* line 558, ../sass/style.sass */
.prompt-wrapper {

2
theme_nin/sass/style.sass

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

Loading…
Cancel
Save