merged with master

11 years ago · 11810d35a2
16 changed files with 168 additions and 105 deletions
--- a/app.manifest
+++ b/app.manifest
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Mon Dec 01 2014 08:16:37 GMT-0800 (PST)
+# Time: Wed Dec 10 2014 23:57:59 GMT-0800 (PST)


 CACHE:
@ -11,6 +11,8 @@ css/desktop.css
 css/mobile.css
 img/T_LogoM.png
 img/T_LogoM_1x.png
+img/Telegram72.png
+img/Telegram72_2x.png
 img/WebIntro1.png
 img/WebIntro1_1x.png
 img/WebIntro2.png
@ -49,6 +51,8 @@ img/icons/MobileIcons_1x.png
 img/icons/MobileIcons_2x.png
 img/icons/PhotoIcons.png
 img/icons/PhotoIcons_1x.png
+img/icons/ProfileIcons.png
+img/icons/ProfileIcons_2x.png
 img/placeholders/[email protected]
 img/placeholders/[email protected]
 img/placeholders/[email protected]
--- a/css/app.css
+++ b/css/app.css
--- a/css/desktop.css
+++ b/css/desktop.css
@ -159,13 +159,16 @@ a.footer_link.active:active {
  padding-bottom: 10px;
 }
 .im_dialogs_scrollable_wrap {
-  padding: 0 19px 0 12px;
+  padding: 0 7px 0 0;

  /* Hardware acceleration in Safari */
  -webkit-transform: translateZ(0);
  -webkit-perspective: 1000;
  -webkit-backface-visibility: hidden;
 }
+.im_dialogs_modal_col_wrap .im_dialogs_scrollable_wrap {
+  padding: 0;
+}
 .im_dialogs_col .nano > .nano-pane {
  background : rgba(0,0,0,0.0);
  width      : 12px;
@ -213,23 +216,14 @@ a.footer_link.active:active {
  transition            : none;
 }
 .contacts_modal_col .nano > .nano-pane {
-  width: 6px;
-  right: 7px;
+  width: 5px;
+  right: 4px;
 }

 .im_dialogs_modal_col .nano > .nano-pane {
  width: 6px;
  right: 2px;
 }
-.im_dialogs_modal_col .im_dialogs_scrollable_wrap {
-  padding: 0 12px 0 12px;
-}
-.contacts_modal_col {
-  margin-right: -17px;
-}
-.contacts_scrollable_wrap {
-  padding: 0 17px 0 0;
-}

 .im_history_col .nano > .nano-pane {
  top: 10px;
@ -323,38 +317,25 @@ a.footer_link.active:active {

 /* Contacts modal */
 .contacts_modal_window .modal-dialog {
-  max-width: 456px;
+  max-width: 420px;
 }
-.contacts_modal_header {
-  padding: 6px 0 18px;
+.contacts_modal_search {
+  padding: 15px 12px 12px;
+  position: relative;
 }
-.contacts_modal_edit_wrap {
-  position: absolute;
-  margin-top: -1px;
+.contacts_modal_members_list a.contacts_modal_contact {
+  padding: 8px 16px;
 }
-.contacts_modal_edit_link {
-  font-size: 14px;
-  padding: 5px 7px;
+.contacts_modal_members_list .active a.contacts_modal_contact,
+.contacts_modal_members_list .active a.contacts_modal_contact:hover {
+  background: #6490b1;
+  color: #FFF;
 }
-.contacts_modal_title {
-  font-size: 14px;
-  margin: 0;
-  text-align: center;
-  font-weight: bold;
+.contacts_modal_members_list .active a.contacts_modal_contact .md_modal_list_peer_description,
+.contacts_modal_members_list .active a.contacts_modal_contact:hover .md_modal_list_peer_description {
+  color: #FFF;
 }

-.icon-message-status {
-  background: #6ba2cb;
-  border: 0;
-  display: block;
-  width: 10px;
-  height: 10px;
-  border-radius: 7px;
-  position: absolute;
-  margin-left: -26px;
-  margin-top: 13px;
-  opacity: 0;
-}
 .im_message_unread .icon-message-status {
  opacity: 1.0;
 }
@ -448,10 +429,33 @@ a.footer_link.active:active {

 /* Dialogs modal */
 .peer_select_window .modal-dialog {
-  max-width: 506px;
+  max-width: 420px;
+}
+.peer_select_window .im_dialogs_panel {
+  padding-top: 15px;
+}
+.peer_select_modal_footer {
+  box-shadow: 0 -1px 0px rgba(0,0,0,0.05);
+  padding: 15px 10px 15px;
+}
+.peer_select_modal_recipients_wrap {
+  padding: 6px 0 0 10px;
+  white-space: nowrap;
+  max-width: 300px;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
-.peer_select_modal_wrap .modal-body {
-  padding: 0 2px 14px;
+.peer_select_modal_recipients_empty,
+.peer_select_modal_recipients_name {
+  color: #999;
+}
+.peer_select_modal_recipient {
+  display: inline-block;
+  white-space: nowrap;
+  max-width: 120px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  vertical-align: bottom;
 }


@ -513,10 +517,12 @@ a.footer_link.active:active {
 .im_panel_own_photo {
  width: 50px;
  height: 50px;
-  border-radius: 0;
+  line-height: 50px;
+  border-radius: 25px;
  overflow: hidden;
 }
-div.im_panel_peer_photo {
+div.im_panel_peer_photo,
+a.im_panel_peer_photo {
  cursor: pointer;
  margin-left: 12px;
  height: 55px;
@ -534,8 +540,8 @@ div.im_panel_own_photo {
  border-radius: 6px;
  overflow: hidden;
  position: absolute;
-  margin-top: -7px;
-  margin-left: 43px;
+  margin-top: -12px;
+  margin-left: 36px;
 }
 .emoji-wysiwyg-editor,
 .im_message_field {
@ -544,7 +550,7 @@ div.im_panel_own_photo {

 /* Peer modals */
 .user_modal_window .modal-dialog {
-  max-width: 506px;
+  max-width: 480px;
 }
 .user_modal_photo_profile_wrap {
  padding: 13px 12px;
@ -610,9 +616,8 @@ div.im_panel_own_photo {


 .chat_modal_window .modal-dialog {
-  max-width: 506px;
+  max-width: 480px;
 }
-
 .chat_modal_header {
  font-weight: bold;
  margin: 0 0 10px;
@ -698,7 +703,7 @@ div.im_panel_own_photo {
 }

 .settings_modal_window .modal-dialog {
-  max-width: 482px;
+  max-width: 480px;
 }
 .settings_modal_settings {
  padding: 4px 0;
@ -951,14 +956,36 @@ div.im_panel_own_photo {
  margin-bottom: 0;
 }

-
-
 .im_dialogs_panel_dropdown.open .dropdown-toggle {
  background: #6690b0;
 }
 .im_dialogs_panel_dropdown.open .dropdown-toggle .icon-bar {
  background: #fff;
 }
+.im_dialogs_scrollable_wrap a.im_dialog {
+  padding: 8px 16px;
+}
+.im_dialogs_scrollable_wrap .active a.im_dialog {
+  margin-right: -2px;
+  padding-right: 18px;
+}
+.im_dialog_photo {
+  width: 48px;
+  height: 48px;
+  line-height: 48px;
+  border-radius: 50%;
+}
+div.im_dialog_photo {
+  margin-right: 12px;
+}
+.im_dialog_message {
+  margin-top: 4px;
+}
+.active .im_dialog_date,
+.active a.im_dialog:hover .im_dialog_date,
+.active a.im_dialog_selected .im_dialog_date {
+  color: #FFF;
+}

 /* Import contact modal */
 .import_contact_modal_window .modal-dialog {
@ -974,10 +1001,6 @@ div.im_panel_own_photo {
  max-height: 350px;
 }

-.changelog_modal_window .modal-dialog {
-  max-width: 506px;
-}
-

 .modal_close_wrap {
  display: none;
@ -1106,19 +1129,41 @@ div.im_panel_own_photo {
 }
 .media_modal_info_wrap {
  line-height: 16px;
-  padding: 24px 20px;
+  padding: 15px 16px;
+  width: 200px;
  position: absolute;
  left: 0;
 }
-.media_modal_author {
+.media_modal_author_photo {
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  overflow: hidden;
+}
+.media_modal_author_photo .peer_initials {
+  line-height: 32px;  
+}
+a.media_modal_author_photo {
+  margin: 1px 10px 1px 0;
+}
+div.media_modal_author_name {
  font-size: 13px;
-  margin-right: 4px;
+  margin-top: 1px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .media_modal_date,
 a.media_modal_date:hover {
  font-size: 11px;
  color: rgba(255, 255, 255, 0.4);
 }
+div.media_modal_date {
+  margin-top: 2px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}

 .photo_modal_window,
 .video_modal_window,
@ -1132,7 +1177,6 @@ a.media_modal_date:hover {
  padding: 0;
 }
 .media_modal_bottom_actions {
-  width: 204px;
  position: absolute;
  right: 0;
 }
@ -1177,6 +1221,3 @@ a.media_modal_date:hover {
  height: 18px;
  margin: 23px 27px;
 }
-
-
-
--- a/css/mobile.css
+++ b/css/mobile.css
@ -510,13 +510,13 @@ img.im_message_video_thumb,
  max-width: 100%;
 }
 .im_message_out.im_content_message_wrap {
-  padding-left: 60px;
+  padding-left: 80px;
  padding-right: 0;
  float: right;
 }
 .im_message_in.im_content_message_wrap {
  padding-left: 0;
-  padding-right: 42px;
+  padding-right: 60px;
 }
 .im_history_messages_group .im_message_in.im_content_message_wrap,
 .im_history_messages_group .im_grouped_short .im_message_in.im_content_message_wrap,
@ -534,16 +534,25 @@ img.im_message_video_thumb,
 .im_message_meta {
  float: none;
  position: absolute;
-  bottom: 6px;
-  right: -12px;
+  bottom: 5px;
+  left: 100%;
+  white-space: nowrap;
+  margin-left: -60px;
+  width: 60px;
+  padding: 0 0 0 8px;
+  overflow: hidden;
 }
 .im_message_date {
-  font-size: 12px;
-  padding-left: 4px;
+  font-size: 10px;
+  /*font-size: 12px;*/
+  padding: 0;
 }
 .im_message_out .im_message_meta {
-  right: auto;
-  left: -12px;
+  width: 80px;
+  left: 0;
+  text-align: right;
+  margin-left: 0;
+  padding: 0 8px 0 0;
 }

 .im_message_out .im_message_fwd_date {
@ -627,7 +636,7 @@ a.im_message_from_photo {
  vertical-align: text-top;
  margin-right: 2px;
  opacity: 1;
-  margin-top: 5px;
+  margin-top: 6px;
 }
 .im_message_out .icon-message-status-tick,
 .is_1x .im_message_out .icon-message-status-tick {
@ -740,14 +749,6 @@ a.im_dialog_selected .im_dialog_date {
  font-size: 12px;
  margin-right: 3px;
 }
-.im_dialog_badge {
-  background: #64c270;
-  font-size: 11px;
-  padding: 5px;
-  border-radius: 10px;
-  min-width: 21px;
-  text-align: center;
-}
 .im_dialog_unread,
 .active .im_dialog_unread,
 a.im_dialog:hover .im_dialog_unread,
--- a/img/Telegram72.png
+++ b/img/Telegram72.png
--- a/img/Telegram72_2x.png
+++ b/img/Telegram72_2x.png
--- a/img/icons/ProfileIcons.png
+++ b/img/icons/ProfileIcons.png
--- a/img/icons/ProfileIcons_2x.png
+++ b/img/icons/ProfileIcons_2x.png
--- a/js/app.js
+++ b/js/app.js
--- a/js/background.js
+++ b/js/background.js
@ -1,5 +1,5 @@
 /*!
- * Webogram v0.3.6 - messaging web application for MTProto
+ * Webogram v0.3.7 - messaging web application for MTProto
 * https://github.com/zhukov/webogram
 * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
 * https://github.com/zhukov/webogram/blob/master/LICENSE
--- a/js/lib/bin_utils.js
+++ b/js/lib/bin_utils.js
@ -1,5 +1,5 @@
 /*!
- * Webogram v0.3.6 - messaging web application for MTProto
+ * Webogram v0.3.7 - messaging web application for MTProto
 * https://github.com/zhukov/webogram
 * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
 * https://github.com/zhukov/webogram/blob/master/LICENSE
--- a/js/lib/crypto_worker.js
+++ b/js/lib/crypto_worker.js
@ -1,5 +1,5 @@
 /*!
- * Webogram v0.3.6 - messaging web application for MTProto
+ * Webogram v0.3.7 - messaging web application for MTProto
 * https://github.com/zhukov/webogram
 * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
 * https://github.com/zhukov/webogram/blob/master/LICENSE
--- a/js/locales/en-us.json
+++ b/js/locales/en-us.json
@ -1,6 +1,9 @@
 {
 	"modal_search": "Search",
+	"modal_close": "Close",
+  "modal_edit": "Edit",
 	"modal_cancel": "Cancel",
+	"modal_more": "More...",
 	"modal_next": "Next",
 	"modal_ok": "OK",
 	"modal_done": "Done",
@ -14,13 +17,12 @@
 	"group_modal_menu_more": "More",
 	"group_modal_menu_delete_photo": "Delete photo",
 	"group_modal_menu_edit_group": "Edit group",
-	"group_modal_menu_leave_group": "Leave group",
+	"group_modal_menu_leave": "Leave",
 	"group_modal_menu_delete_chat": "Delete chat",
 	"group_modal_settings": "Settings",
 	"group_modal_notifications": "Notifications",
 	"group_modal_members": "Members",
 	"group_modal_members_kick": "Kick",
-	"group_modal_members_unavailable": "Group members list is unavailable.",

 	"country_select_modal_title": "Country",

@ -130,6 +132,7 @@
 	"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_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?",
 	"confirm_modal_forward_to_peer": "Forward to {peer}?",
@ -146,6 +149,7 @@
 	"confirm_modal_clipboard_files_send_submit": "Send",
 	"confirm_modal_clipboard_file_send_submit": "Send",
 	"confirm_modal_message_delete_submit": "Delete",
+	"confirm_modal_photo_delete_submit": "Delete",
 	"confirm_modal_forward_message_submit": "Forward message",
 	"confirm_modal_share_photo_submit": "Forward photo",
 	"confirm_modal_share_video_submit": "Forward video",
@ -160,6 +164,12 @@
 	"contacts_modal_new_contact": "New Contact",
 	"contacts_modal_empty_list": "Your contacts list is empty. You can {import-link: add new contact} by phone number.",

+	"conversations_modal_forward_title": "Forward",
+	"conversations_modal_forward_submit": "Forward",
+	"conversations_modal_select_recipients": "Select recipients",
+	"conversations_modal_recipients": "Recipients:",
+
+
 	"contact_edit_modal_first_name": "First name",
 	"contact_edit_modal_last_name": "Last name",
 	"contact_edit_modal_title": "Edit contact",
@ -353,6 +363,9 @@

 	"conversation_select_modal_title": "Select conversation",
 	"conversation_select_modal_contacts": "Contacts",
+	"conversation_one_selected": "{name1}",
+	"conversation_two_selected": "{name1} and {name2}",
+	"conversation_many_selected": "{name1}, {name2} and {count} more",

 	"phonebook_modal_title": "Phonebook",
 	"phonebook_modal_deselect_all": "Deselect all",
--- a/manifest.json
+++ b/manifest.json
@ -1,7 +1,7 @@
 {
  "name": "Telegram",
  "description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
-  "version": "0.3.6",
+  "version": "0.3.7",
  "short_name": "Webogram",
  "manifest_version": 2,
  "app": {
--- a/manifest.webapp
+++ b/manifest.webapp
@ -1,7 +1,7 @@
 {
  "name": "Telegram",
  "description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
-  "version": "0.3.6",
+  "version": "0.3.7",
  "type": "privileged",
  "launch_path": "/index.html",
  "developer": {
--- a/webogram.appcache
+++ b/webogram.appcache
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Mon Dec 01 2014 08:16:37 GMT-0800 (PST)
+# Time: Wed Dec 10 2014 23:57:59 GMT-0800 (PST)


 CACHE:
@ -11,6 +11,8 @@ css/desktop.css
 css/mobile.css
 img/T_LogoM.png
 img/T_LogoM_1x.png
+img/Telegram72.png
+img/Telegram72_2x.png
 img/WebIntro1.png
 img/WebIntro1_1x.png
 img/WebIntro2.png
@ -49,6 +51,8 @@ img/icons/MobileIcons_1x.png
 img/icons/MobileIcons_2x.png
 img/icons/PhotoIcons.png
 img/icons/PhotoIcons_1x.png
+img/icons/ProfileIcons.png
+img/icons/ProfileIcons_2x.png
 img/placeholders/[email protected]
 img/placeholders/[email protected]
 img/placeholders/[email protected]