From 03a9c661fb8dfb88243ca92d9426579bfa52ee81 Mon Sep 17 00:00:00 2001 From: Hedgehog Date: Sun, 16 Mar 2014 09:01:42 +0400 Subject: [PATCH 1/8] fixed timestamp margin fixed timestamp margin --- css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index b5ff404..bb8a33b 100644 --- a/css/style.css +++ b/css/style.css @@ -1038,7 +1038,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder { { float: right; font-size: 12px; - margin: 5px 10px; + margin-right: 5px; opacity: .5; text-decoration: none; } From e8dff5e23bdf57493327e3f1b56272a2713dd8de Mon Sep 17 00:00:00 2001 From: Yura Imashev Date: Sun, 16 Mar 2014 12:45:14 -0700 Subject: [PATCH 2/8] Fixed place with a rough translation into Russian --- js/interface_localization.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/js/interface_localization.js b/js/interface_localization.js index ba96310..49aa560 100644 --- a/js/interface_localization.js +++ b/js/interface_localization.js @@ -797,7 +797,7 @@ if(preferredLanguage == "ru"){ "followed_by": "%{username} подписан", "Followers": "Читателей", "Following": "Читаемых", - "Following users": "Подписанные пользователи", + "Following users": "Читаемые пользователи", "Force connection to peer:": "Принудительно подключиться к пиру:", "General information": "Основное", "Generate blocks (send promoted messages)": "Генерация блоков (отправка рекламных сообщений)", @@ -859,7 +859,7 @@ if(preferredLanguage == "ru"){ "time_ago": "%{time} назад", // 5 minutes ago "Time of the last block:": "Время последнего блока: ", "Top Trends": "Тенденции", - "Type message here": "Введите ваше сообщение тут", + "Type message here": "Введите здесь ваше сообщение", "Unfollow": "Отписаться", "Update": "Обновить", "Updating status...": "Обновление информации...", // status of block chain @@ -874,20 +874,20 @@ if(preferredLanguage == "ru"){ "twister'a).\n\n" + "Хозяйке на заметку: Сейчас вы можете выбрать аватар!", "users_mentions": "Ответ от @%{username}", - "users_profile": "%{username}'s профиль", + "users_profile": "Профиль пользователя %{username}", "username_undefined": "Имя пользователя не определено, требуется войти.", "View": "Просмотреть", - "View All": "Просмотреть Всё", + "View All": "Просмотреть всё", "Who to Follow": "Кого почитать", - "Your message was sent!": "Ваше сообщение было отправлено!", + "Your message was sent!": "Ваше сообщение отправлено!", "twister login": "Вход в twister", - "Existing local users": "Уже зарегистрированные", + "Existing local users": "Предыдущие аккаунты", "Or...": "Или...", - "Create a new user": "Зарегистрировать нового пользователя", + "Create a new user": "Создать новый аккаунт", "Login": "Войти", - "Check availability": "Проверить на доступность", - "Create this nickname": "Зарегистировать этот ник", - "Type nickname here": "Введите ваш ник тут", + "Check availability": "Проверить, занят ли ник", + "Create this nickname": "Создать аккаунт", + "Type nickname here": "Введите ник", "Import secret key": "Импортировать секретный ключ", "52-characters secret": "52-значный ключ", "With nickname": "С логином", From 4aac7a4793ad077ac828d78e149aeb3e4d8d9bc9 Mon Sep 17 00:00:00 2001 From: Yura Imashev Date: Sun, 16 Mar 2014 13:19:12 -0700 Subject: [PATCH 3/8] Fix login error When you import a private key, nickname was not converted to lowercase, which is why an error occurred. --- js/twister_user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/twister_user.js b/js/twister_user.js index 3e8d33f..e30308e 100644 --- a/js/twister_user.js +++ b/js/twister_user.js @@ -171,7 +171,7 @@ function sendNewUserTransaction(username, cbFunc) { function importSecretKeypress() { var secretKey = $(".secret-key-import").val(); - var username = $(".username-import").val(); + var username = $(".username-import").val().toLowerCase(); var $importButton = $(".import-secret-key"); if( secretKey.length == 52 && username.length ) { From a0242d87cbb2bfba0c500b4d995b420f36fce801 Mon Sep 17 00:00:00 2001 From: Hedgehog Date: Wed, 19 Mar 2014 23:20:40 +0400 Subject: [PATCH 4/8] update fixed english hashtag case dependency bug, expanding post by text select bug, some style fixes --- css/style.css | 6 +++--- jquery-emotions/jquery.emotions.js | 30 ++++++++++++++++++------------ js/calm.js | 1 - js/interface_common.js | 2 +- js/twister_actions.js | 1 + 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/css/style.css b/css/style.css index bb8a33b..86038dc 100644 --- a/css/style.css +++ b/css/style.css @@ -344,7 +344,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder { .userMenu li.userMenu-dhtindicator a { display: inline-block; font: 12px/25px "Open Sans", sans-serif; - padding: 0 0 0 45px; + padding: 0 5px 0 41px; width: 60px; height: 25px; opacity: .9; @@ -353,7 +353,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder { content: 'DHT:'; display: inline-block; position: absolute; - left: 10px; + left: 8px; width: 70px; height: 25px; } @@ -1150,7 +1150,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder { } .post-interactions { - margin: 2px 10px 10px 60px; + margin: -5px 10px 5px 60px; text-align: right; height: 25px; } diff --git a/jquery-emotions/jquery.emotions.js b/jquery-emotions/jquery.emotions.js index ed78c63..b91c78f 100644 --- a/jquery-emotions/jquery.emotions.js +++ b/jquery-emotions/jquery.emotions.js @@ -33,28 +33,34 @@ "0:-)": "angel", "o.O": "confused", "o_O": "confused", + ":'(": "cry", "3:)": "devil", + ":(": "frown", + "=(": "frown", + ":-(": "frown", + "8)": "glasses", + ":D": "grin", + ":-D": "grin", + ">:(": "grumpy", "<3": "heart", ":*": "kiss", ":-)": "smile", ":]": "smile", + ":)": "smile", + "=)": "smile", + "(:": "smile", + "(-:": "smile", + "[:": "smile", + "(=": "smile", "8|": "sunglasses", + ":p": "tongue", + ":P": "tongue", ":/": "unsure", ":\\": "unsure", ";)": "wink", ";-)": "wink", - ":'(": "cry", - ">:(": "grumpy", - ":(": "frown", - "=(": "frown", - ":-(": "frown", - "8)": "glasses", - ":p": "tongue", - ":P": "tongue", - ":)": "smile", - "=)": "smile", - ":D": "grin", - ":-D": "grin" + "(;": "wink", + "(-;": "wink" } }, shortcode: function(eId){ diff --git a/js/calm.js b/js/calm.js index b4545bf..391d6ef 100644 --- a/js/calm.js +++ b/js/calm.js @@ -6,7 +6,6 @@ $(function(){ $('.post-text').on('click', 'a', function(e){ e.stopPropagation(); }); - $('#showqr').on('click', function(){ if($('#qrcode img')[0]) return; var skey = document.getElementById('skey').innerText; diff --git a/js/interface_common.js b/js/interface_common.js index 2741d08..a33d443 100644 --- a/js/interface_common.js +++ b/js/interface_common.js @@ -459,7 +459,7 @@ function initInterfaceCommon() { $( ".userMenu-config-dropdown" ).bind( "click", dropDownMenu ); $( ".config-menu" ).clickoutside( closeThis ); $( ".module.post" ).bind( "click", function(e) { - postExpandFunction(e,$(this)); }); + if(window.getSelection() == 0)postExpandFunction(e,$(this)); }); $( ".post-area-new" ).bind( "click", function(e) { composeNewPost(e,$(this));} ); $( ".post-area-new" ).clickoutside( unfocusThis ); diff --git a/js/twister_actions.js b/js/twister_actions.js index 168f12e..37db743 100644 --- a/js/twister_actions.js +++ b/js/twister_actions.js @@ -191,6 +191,7 @@ function clearHashtagProcessed() { } function requestHashtag(postboard,hashtag,resource) { + if(/[a-z]/i.test(hashtag))hashtag = hashtag.toLowerCase(); //hed//fix english hashtag case dependentcy bug dhtget( hashtag, resource, "m", function(args, data) { processHashtag(args.postboard, args.hashtag, data); From 99f83d9ca3464315ae17a6bd66d576804850e41f Mon Sep 17 00:00:00 2001 From: Hedgehog Date: Thu, 20 Mar 2014 05:58:46 +0400 Subject: [PATCH 5/8] update added dynamic button in modal profile window instead static --- css/profile.css | 16 ++++++++++++---- css/style.css | 1 + following.html | 1 + js/calm.js | 19 ++++++++++--------- js/interface_common.js | 8 +++++++- js/twister_actions.js | 2 +- 6 files changed, 32 insertions(+), 15 deletions(-) diff --git a/css/profile.css b/css/profile.css index dcac5c7..0825ce5 100644 --- a/css/profile.css +++ b/css/profile.css @@ -66,7 +66,8 @@ } .profile-card .direct-messages, .profile-card .direct-messages-with-user, -.profile-card .follow +.profile-card .follow, +.profile-card .profileUnfollow { display: block; position: absolute; @@ -81,13 +82,15 @@ border: none; transition: all .2s linear; } -.profile-card .follow +.profile-card .follow, +.profile-card .profileUnfollow { right: 128px; } .profile-card .direct-messages:hover, .profile-card .direct-messages-with-user:hover, -.profile-card .follow:hover +.profile-card .follow:hover, +.profile-card .profileUnfollow:hover { background: rgba( 0, 0, 0, .3 ); } @@ -251,6 +254,10 @@ button.follow:hover { background: #b2d67b; color: #fff; } +.profile-card .profileUnfollow:hover { + background: #e18882; + color: #fff; +} .profile-modal button.direct-messages-with-user:hover { background: #b2d67b; color: #fff; @@ -305,7 +312,8 @@ button.follow:hover { */ .profile-modal .direct-messages, .profile-modal .direct-messages-with-user, -.profile-modal .follow +.profile-modal .follow, +.profile-card .profileUnfollow { bottom: 10px; } diff --git a/css/style.css b/css/style.css index 86038dc..344f82b 100644 --- a/css/style.css +++ b/css/style.css @@ -1984,6 +1984,7 @@ ul.dropdown-menu > li > a { clear: both; font: 13px/20px "Open Sans", sans-serif; white-space: nowrap; + cursor: pointer; -webkit-transition: all 200ms; -moz-transition: all 200ms; -ms-transition: all 200ms; diff --git a/following.html b/following.html index 70079ef..a57e6d4 100644 --- a/following.html +++ b/following.html @@ -22,6 +22,7 @@ +