r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Improved styles for pinned conversations

Browse Source
This commit is contained in:
Igor Zhukov 2017-05-11 18:47:29 +03:00
parent abd9849f52
commit ba9550b619
8 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/img/icons/General.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
app/img/icons/General_2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 14 KiB

6
app/js/lib/mtproto_wrapper.js
View File

@ -805,9 +805,9 @@ angular.module('izhukov.mtproto.wrapper', ['izhukov.utils', 'izhukov.mtproto'])
// console.log(dT(), 'check instance', newInstance, curInstance, idleInstance)
if (!idle ||
!curInstance ||
curInstance.id == instanceID ||
curInstance.time < time - 60000) {
!curInstance ||
curInstance.id == instanceID ||
curInstance.time < time - 60000) {
if (idleInstance &&
idleInstance.id == instanceID) {
Storage.remove('xt_idle_instance')

17
app/js/locales/en-us.json
View File

@ -227,12 +227,13 @@
"confirm_modal_clipboard_file_send": "Are you sure to send file(s) from clipboard?",
"confirm_modal_clipboard_X_files_send": "{'one': 'Are you sure to send file from clipboard?', 'other': 'Are you sure to send {} files from clipboard?'}",
"confirm_modal_message_delete": "Are you sure you want to delete the message?",
"confirm_modal_X_messages_delete": "{'one': 'Are you sure you want to delete the message?', 'other': 'Are you sure you want to delete {} messages?'}",
"confirm_modal_delete_X_messages": "{'one': '{} message', 'other': '{} messages'}",
"confirm_modal_delete_messages": "Are you sure you want to delete {messages}?",
"confirm_modal_message_revoke": "Delete for {recipient}",
"confirm_modal_message_revoke_recipient_group": "everyone",
"confirm_modal_X_messages_non_configurable_for_everyone": "{'one': 'This will delete it for everyone in this chat.', 'other': 'This will delete them for everyone in this chat.'}",
"confirm_modal_X_messages_non_configurable_for_user_only": "{'one': 'This will delete it just for you, not for {{ userFirstName }}.', 'other': 'This will delete them just for you, not for {{ userFirstName }}.'}",
"confirm_modal_X_messages_non_configurable_for_user_only_in_group": "{'one': 'This will delete it just for you, not for other participants of the chat.', 'other': 'This will delete them just for you, not for other participants of the chat.'}",
"confirm_modal_message_revoke_recipient_chat": "everyone",
"confirm_modal_delete_messages_for_everyone_chat": "This will delete messages for everyone in this chat.",
"confirm_modal_delete_messages_for_you_only_pm": "This will delete messages just for you, not for {user}.",
"confirm_modal_delete_messages_for_you_only_chat": "This will delete messages just for you, not for other participants of the chat.",
"confirm_modal_photo_delete": "Are you sure you want to delete the photo?",
"confirm_modal_contacts_import": "Telegram will now sync your contacts in order to find your friends.",
"confirm_modal_login_phone_correct": "Is this phone number correct?",
@ -362,7 +363,7 @@
"message_service_phonecall_incoming": "Incoming Call",
"message_service_phonecall_outgoing": "Outgoing Call",
"message_service_phonecall_missed": "Missed Call",
"message_service_phonecall_canceled": "Canceled Call",
"message_service_phonecall_canceled": "Cancelled Call",
"message_service_phonecall": "Phone call {duration}",
"message_service_scored_game": "{scored} in {message}",
"message_service_unsupported_action": "unsupported action {action}",
@ -396,7 +397,7 @@
"error_modal_password_success_title": "Success!",
"error_modal_password_disabled_title": "Password deactivated",
"error_modal_media_not_supported_title": "Unsupported media",
"error_modal_phonecalls_not_supported_title": "Calls are not available",
"error_modal_phonecalls_not_supported_title": "Calls are not available yet",
"error_modal_recovery_na_title": "Sorry",
"error_modal_network_description": "Please check your internet connection.",
@ -414,7 +415,7 @@
"error_modal_username_occupied_description": "Sorry, this username is already taken.",
"error_modal_media_not_supported_description": "Your browser cannot play this media file. Try downloading the file and opening it in a standalone player.",
"error_modal_username_not_found_description": "There is no Telegram account with the username you provided.",
"error_modal_phonecalls_not_supported_description_md": "Unfortunately calls are not supported in Web App at the moment.\nYou can call {user} via mobile apps or native desktop applications.\n{download-link: Download »}",
"error_modal_phonecalls_not_supported_description_md": "Unfortunately calls are not supported in the Web App at the moment.\n\nYou can call {user} using our mobile apps or native desktop applications.\n{download-link: Download »}",
"error_modal_bad_request_description": "One of the params is missing or invalid.",
"error_modal_unauthorized_description": "This action requires authorization access. Please {login-link: log in}.",

16
app/js/messages_manager.js
View File

@ -975,8 +975,20 @@ angular.module('myApp.services')
var message = messagesStorage[messageID]
if (message._ != 'message' ||
message.deleted ||
!message.pFlags.out ||
message.deleted) {
return false
}
var peerID = getMessagePeer(message)
if (peerID < 0 && !AppChatsManager.isChannel(-peerID)) {
var chat = AppChatsManager.getChat(-peerID)
if (chat.pFlags.creator ||
chat.pFlags.admins_enabled && chat.pFlags.admin) {
return true
}
}
if (!message.pFlags.out ||
message.date < tsNow(true) - 2 * 86400) {
return false
}

8
app/js/services.js
View File

@ -648,8 +648,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
switch (action) {
case 'send':
if (chat._ == 'channel' &&
!chat.pFlags.megagroup &&
!chat.pFlags.editor) {
!chat.pFlags.megagroup &&
!chat.pFlags.editor) {
return false
}
break
@ -660,7 +660,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
if (chat._ == 'channel') {
if (chat.pFlags.megagroup) {
if (!chat.pFlags.editor &&
!(action == 'invite' && chat.pFlags.democracy)) {
!(action == 'invite' && chat.pFlags.democracy)) {
return false
}
} else {
@ -668,7 +668,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
}
} else {
if (chat.pFlags.admins_enabled &&
!chat.pFlags.admin) {
!chat.pFlags.admin) {
return false
}
}

14
app/less/app.less
View File

@ -1411,22 +1411,24 @@ a.im_dialog_selected {
}
.im_dialog_pinned {
background: red;
display: inline-block;
float: right;
width: 8px;
height: 8px;
border-radius: 5px;
width: 14px;
height: 14px;
overflow: hidden;
margin: 12px 0 0;
.image-2x('../img/icons/General.png', 40px, 948px);
background-position: -13px -916px;
// background-position: -13px -892px;
a.im_dialog:hover &,
a.im_dialog_selected & {
background: red;
background-position: -13px -916px;
}
.active & {
background-color: red;
background-position: -13px -916px;
}
}

15
app/partials/desktop/confirm_modal.html
View File

@ -22,22 +22,23 @@
</div>
<span ng-switch-when="MESSAGE_DELETE" my-i18n="confirm_modal_message_delete"></span>
<span ng-switch-when="MESSAGES_DELETE">
<ng-pluralize count="count"
when="confirm_modal_X_messages_delete">
</ng-pluralize>
<span my-i18n="confirm_modal_delete_messages">
<my-i18n-param name="messages"><strong><ng-pluralize when="confirm_modal_delete_X_messages" count="count"></ng-pluralize></strong></my-i18n-param>
</span>
<a class="tg_checkbox" ng-if="revocable" ng-click="data.revoke = !data.revoke" ng-class="data.revoke ? 'tg_checkbox_on' : ''">
<span class="icon icon-checkbox-outer"><i class="icon-checkbox-inner"></i></span>
<span class="tg_checkbox_label" my-i18n="confirm_modal_message_revoke">
<my-i18n-param name="recipient" ng-switch="isUser">
<span ng-switch-when="true" my-peer-link="peerID" short="true"></span>
<span ng-switch-default my-i18n="confirm_modal_message_revoke_recipient_group"></span>
<span ng-switch-default my-i18n="confirm_modal_message_revoke_recipient_chat"></span>
</my-i18n-param>
</span>
</a>
<p class="tg_checkbox" ng-if="!revocable && !isChannel" ng-switch="isUser ? 'user' : (isSupergroup ? 'supergroup' : (isUsualGroup ? 'group' : 'default'))">
<ng-pluralize ng-switch-when="user" count="count" when="confirm_modal_X_messages_non_configurable_for_user_only"></ng-pluralize>
<ng-pluralize ng-switch-when="supergroup" count="count" when="confirm_modal_X_messages_non_configurable_for_everyone"></ng-pluralize>
<ng-pluralize ng-switch-when="group" count="count" when="confirm_modal_X_messages_non_configurable_for_user_only_in_group"></ng-pluralize>
<span ng-switch-when="supergroup" my-i18n="confirm_modal_delete_messages_for_everyone_chat"></span>
<span ng-switch-when="group" my-i18n="confirm_modal_delete_messages_for_you_only_chat"></span>
<span ng-switch-when="user" my-i18n="confirm_modal_delete_messages_for_you_only_pm"><my-i18n-param name="user"><strong my-peer-link="peerID"></strong></my-i18n-param></span>
</p>
</span>
<span ng-switch-when="PHOTO_DELETE" my-i18n="confirm_modal_photo_delete"></span>