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

Bugfixes

master
Igor Zhukov 11 years ago
parent
882f4009d5
commit
d1dcf06774
18 changed files with 328 additions and 179 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 123
      app/css/app.css
  2. 344
      app/css/app_mobile.css
  3. BIN
      app/img/T_LogoM_1x.png
  4. BIN
      app/img/icons/IconsetW.png
  5. BIN
      app/img/icons/IconsetW_1x.png
  6. BIN
      app/img/icons/mobile/Header_back.png
  7. BIN
      app/img/icons/mobile/Msg_attach.png
  8. BIN
      app/img/icons/mobile/Msg_attach_active.png
  9. BIN
      app/img/icons/mobile/Msg_send.png
  10. BIN
      app/img/icons/mobile/Msg_send_active.png
  11. BIN
      app/img/icons/mobile/Msg_smile.png
  12. BIN
      app/img/icons/mobile/Msg_smile_active.png
  13. BIN
      app/img/icons/mobile/T_LogoM.png
  14. 9
      app/js/directives.js
  15. 20
      app/js/services.js
  16. 2
      app/partials/login.html
  17. 7
      app/partials/message.html
  18. 2
      app/partials/message_attach_pending.html

123
app/css/app.css
Unescape View File

@ -204,9 +204,9 @@ input[type="number"] {
height: 30px; height: 30px;
vertical-align: text-top; vertical-align: text-top;
} }
/*.is_1x .tg_head_logo { .is_1x .tg_head_logo {
background-image: url(../img/TLogo_1x.png); background-image: url(../img/T_LogoM_1x.png);
}*/ }
@ -430,7 +430,7 @@ input[type="number"] {
.modal-close-button i { .modal-close-button i {
display: inline-block; display: inline-block;
background: url(../img/icons/IconsetW.png) -15px -320px no-repeat; background: url(../img/icons/IconsetW.png) -15px -320px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
width: 12px; width: 12px;
height: 12px; height: 12px;
margin: 21px; margin: 21px;
@ -904,7 +904,7 @@ a.tg_radio_on:hover i.icon-radio {
font-size: 12px; font-size: 12px;
line-height: normal; line-height: normal;
background: #F2F2F2 url(../img/icons/IconsetW.png) -6px -205px no-repeat; background: #F2F2F2 url(../img/icons/IconsetW.png) -6px -205px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
border: 1px solid #F2F2F2; border: 1px solid #F2F2F2;
border-radius: 3px; border-radius: 3px;
padding: 6px 20px 6px 30px; padding: 6px 20px 6px 30px;
@ -927,7 +927,7 @@ a.tg_radio_on:hover i.icon-radio {
height: 13px; height: 13px;
vertical-align: text-top; vertical-align: text-top;
background: url(../img/icons/IconsetW.png) -15px -192px no-repeat; background: url(../img/icons/IconsetW.png) -15px -192px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
opacity: 0.6; opacity: 0.6;
} }
.is_1x .im_dialogs_search_clear { .is_1x .im_dialogs_search_clear {
@ -1237,7 +1237,7 @@ a.im_dialog_selected .im_dialog_date {
margin-left: 6px; margin-left: 6px;
background: url(../img/icons/IconsetW.png) -17px -444px no-repeat; background: url(../img/icons/IconsetW.png) -17px -444px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
} }
.is_1x .icon-caret { .is_1x .icon-caret {
background-image: url(../img/icons/IconsetW_1x.png); background-image: url(../img/icons/IconsetW_1x.png);
@ -1346,55 +1346,55 @@ a.im_dialog_selected .im_dialog_date {
.non_osx .im_message_fwd_author { .non_osx .im_message_fwd_author {
font-size: 12px; font-size: 12px;
} }
.im_message_grouped1 .im_message_from_photo, .im_grouped_short .im_message_from_photo,
.im_message_grouped1 .im_message_author, .im_grouped_short .im_message_author,
.im_message_grouped2 .im_message_from_photo, .im_grouped .im_message_from_photo,
.im_message_grouped2 .im_message_author, .im_grouped .im_message_author,
.im_message_grouped3 .im_message_author, .im_grouped_fwd .im_message_author,
.im_message_grouped3 .im_message_from_photo, .im_grouped_fwd .im_message_from_photo,
.im_message_grouped4 .im_message_author, .im_grouped_fwd_short .im_message_author,
.im_message_grouped4 .im_message_from_photo { .im_grouped_fwd_short .im_message_from_photo {
display: none; display: none;
} }
.im_message_grouped1 .im_message_body, .im_grouped_short .im_message_body,
.im_message_grouped2 .im_message_body, .im_grouped .im_message_body,
.im_message_grouped3 .im_message_body, .im_grouped_fwd .im_message_body,
.im_message_grouped4 .im_message_body { .im_grouped_fwd_short .im_message_body {
margin-left: 46px; margin-left: 46px;
} }
.im_message_grouped1 .im_content_message_select_area, .im_grouped_short .im_content_message_select_area,
.im_message_grouped2 .im_content_message_select_area { .im_grouped .im_content_message_select_area {
height: 34px; height: 34px;
} }
.im_history_appending .im_content_message_select_area { .im_history_appending .im_content_message_select_area {
height: 52px; height: 52px;
} }
.im_message_grouped1 .icon-select-tick, .im_grouped_short .icon-select-tick,
.im_message_grouped4 .icon-select-tick { .im_grouped_fwd_short .icon-select-tick {
margin-top: 5px; margin-top: 5px;
} }
.im_message_grouped1 .icon-message-status, .im_grouped_short .icon-message-status,
.im_message_grouped4 .icon-message-status { .im_grouped_fwd_short .icon-message-status {
margin-top: 5px; margin-top: 5px;
} }
.im_message_grouped3 .im_message_fwd_from, .im_grouped_fwd .im_message_fwd_from,
.im_message_grouped4 .im_message_fwd_from { .im_grouped_fwd_short .im_message_fwd_from {
display: none; display: none;
} }
.im_message_grouped1 .im_message_fwd .im_message_date, .im_grouped_short .im_message_fwd .im_message_date,
.im_message_grouped2 .im_message_fwd .im_message_date, .im_grouped .im_message_fwd .im_message_date,
.im_message_grouped3 .im_message_fwd .im_message_date, .im_grouped_fwd .im_message_fwd .im_message_date,
.im_message_grouped4 .im_message_fwd .im_message_date { .im_grouped_fwd_short .im_message_fwd .im_message_date {
display: none; display: none;
} }
.im_message_grouped3 .im_message_fwd, .im_grouped_fwd .im_message_fwd,
.im_message_grouped4 .im_message_fwd { .im_grouped_fwd_short .im_message_fwd {
margin-top: 8px; margin-top: 8px;
} }
.im_message_grouped3 .im_message_fwd, .im_grouped_fwd .im_message_fwd,
.im_message_grouped4 .im_message_fwd { .im_grouped_fwd_short .im_message_fwd {
margin-top: 8px; margin-top: 8px;
} }
@ -1476,7 +1476,7 @@ div.im_message_video_thumb {
height: 42px; height: 42px;
background: url(../img/icons/IconsetW.png) 0 -590px no-repeat; background: url(../img/icons/IconsetW.png) 0 -590px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
z-index: 1; z-index: 1;
} }
.is_1x .icon-videoplay { .is_1x .icon-videoplay {
@ -1503,7 +1503,7 @@ div.im_message_video_thumb {
height: 19px; height: 19px;
background: url(../img/icons/IconsetW.png) -14px -389px no-repeat; background: url(../img/icons/IconsetW.png) -14px -389px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
} }
.is_1x .icon-geo-point { .is_1x .icon-geo-point {
background-image: url(../img/icons/IconsetW_1x.png); background-image: url(../img/icons/IconsetW_1x.png);
@ -1564,7 +1564,7 @@ div.im_message_video_thumb {
vertical-align: text-top; vertical-align: text-top;
background: #F2F2F2 url(../img/icons/IconsetW.png) -2px -229px no-repeat; background: #F2F2F2 url(../img/icons/IconsetW.png) -2px -229px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
border-radius: 3px; border-radius: 3px;
margin-right: 10px; margin-right: 10px;
} }
@ -1651,13 +1651,19 @@ img.im_message_document_thumb {
vertical-align: text-top; vertical-align: text-top;
background: #F2F2F2 url(../img/icons/IconsetW.png) -2px -277px no-repeat; background: #F2F2F2 url(../img/icons/IconsetW.png) -2px -277px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
border-radius: 3px; border-radius: 3px;
margin-right: 10px; margin-right: 10px;
} }
.is_1x .icon-audio { .is_1x .icon-audio {
background-image: url(../img/icons/IconsetW_1x.png); background-image: url(../img/icons/IconsetW_1x.png);
} }
.im_message_selected .icon-audio,
.im_history_selectable .im_message_outer_wrap:hover .icon-audio {
background-color: #dae6f0;
background-position: -2px -697px;
}
.im_message_audio_info { .im_message_audio_info {
float: left; float: left;
@ -1766,7 +1772,6 @@ img.im_message_document_thumb {
.im_content_message_wrap { .im_content_message_wrap {
/*margin: 10px 0px 5px 16px;*/
margin: 8px 0px 8px 16px margin: 8px 0px 8px 16px
} }
.icon-message-status { .icon-message-status {
@ -1851,14 +1856,13 @@ div.im_message_body {
display: block; display: block;
overflow: hidden; overflow: hidden;
} }
.im_message_fwd_title {
div.im_message_fwd_header { display: none;
color: #808080;
} }
.im_message_fwd_from { .im_message_fwd_from {
margin-top: 5px; margin-top: 5px;
} }
.im_message_grouped2 .im_message_fwd_from { .im_grouped .im_message_fwd_from {
margin-top: 0; margin-top: 0;
} }
.im_message_fwd { .im_message_fwd {
@ -2001,7 +2005,7 @@ textarea.im_message_field {
height: 23px; height: 23px;
vertical-align: text-top; vertical-align: text-top;
background: url(../img/icons/IconsetW.png) -12px -68px no-repeat; background: url(../img/icons/IconsetW.png) -12px -68px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
opacity: 0.8; opacity: 0.8;
} }
.is_1x .icon-paperclip { .is_1x .icon-paperclip {
@ -2029,7 +2033,7 @@ textarea.im_message_field {
height: 23px; height: 23px;
vertical-align: text-top; vertical-align: text-top;
background: url(../img/icons/IconsetW.png) -10px -4px no-repeat; background: url(../img/icons/IconsetW.png) -10px -4px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
opacity: 0.8; opacity: 0.8;
} }
.is_1x .icon-emoji { .is_1x .icon-emoji {
@ -2083,7 +2087,7 @@ textarea.im_message_field {
height: 21px; height: 21px;
vertical-align: text-top; vertical-align: text-top;
background: url(../img/icons/IconsetW.png) -9px -132px no-repeat; background: url(../img/icons/IconsetW.png) -9px -132px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
opacity: 0.8; opacity: 0.8;
} }
.is_1x .icon-camera { .is_1x .icon-camera {
@ -2499,7 +2503,7 @@ img.chat_modal_participant_photo {
.emoji-menu-tail { .emoji-menu-tail {
display: none; display: none;
background: url(../img/icons/IconsetW.png) -14px -268px no-repeat; background: url(../img/icons/IconsetW.png) -14px -268px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
width: 14px; width: 14px;
height: 7px; height: 7px;
margin: 0 83px; margin: 0 83px;
@ -2849,7 +2853,7 @@ a:hover .icon-twitter {
font-size: 12px; font-size: 12px;
line-height: normal; line-height: normal;
background: #F2F2F2 url(../img/icons/IconsetW.png) -6px -205px no-repeat; background: #F2F2F2 url(../img/icons/IconsetW.png) -6px -205px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
border: 1px solid #F2F2F2; border: 1px solid #F2F2F2;
border-radius: 3px; border-radius: 3px;
padding: 6px 15px 6px 30px; padding: 6px 15px 6px 30px;
@ -2872,7 +2876,7 @@ a:hover .icon-twitter {
height: 13px; height: 13px;
vertical-align: text-top; vertical-align: text-top;
background: url(../img/icons/IconsetW.png) -15px -192px no-repeat; background: url(../img/icons/IconsetW.png) -15px -192px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
opacity: 0.6; opacity: 0.6;
} }
.is_1x .contacts_modal_search_clear { .is_1x .contacts_modal_search_clear {
@ -2941,7 +2945,7 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status,
width: 25px; width: 25px;
height: 25px; height: 25px;
background: url(../img/icons/IconsetW.png) -9px -516px no-repeat; background: url(../img/icons/IconsetW.png) -9px -516px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
opacity: 0.5; opacity: 0.5;
} }
.is_1x .icon-contact-tick { .is_1x .icon-contact-tick {
@ -3037,7 +3041,7 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status,
height: 15px; height: 15px;
background: url(../img/icons/IconsetW.png) -15px -319px no-repeat; background: url(../img/icons/IconsetW.png) -15px -319px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
} }
.is_1x .icon-delete { .is_1x .icon-delete {
background-image: url(../img/icons/IconsetW_1x.png); background-image: url(../img/icons/IconsetW_1x.png);
@ -3055,16 +3059,19 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status,
} }
.im_message_selected .im_message_date, .im_message_selected .im_message_date,
.im_message_selected .im_message_fwd_header,
.im_message_selected .im_message_document_size, .im_message_selected .im_message_document_size,
.im_message_selected .im_message_audio_duration,
.im_message_selected .im_message_audio_size,
.im_message_selected .im_message_fwd_date, .im_message_selected .im_message_fwd_date,
.im_message_focus .im_message_date, .im_message_focus .im_message_date,
.im_message_focus .im_message_fwd_header,
.im_message_focus .im_message_document_size, .im_message_focus .im_message_document_size,
.im_message_focus .im_message_audio_duration,
.im_message_focus .im_message_audio_size,
.im_message_focus .im_message_fwd_date, .im_message_focus .im_message_fwd_date,
.im_history_selectable .im_message_outer_wrap:hover .im_message_date, .im_history_selectable .im_message_outer_wrap:hover .im_message_date,
.im_history_selectable .im_message_outer_wrap:hover .im_message_fwd_header,
.im_history_selectable .im_message_outer_wrap:hover .im_message_document_size, .im_history_selectable .im_message_outer_wrap:hover .im_message_document_size,
.im_history_selectable .im_message_outer_wrap:hover .im_message_audio_duration,
.im_history_selectable .im_message_outer_wrap:hover .im_message_audio_size,
.im_history_selectable .im_message_outer_wrap:hover .im_message_fwd_date { .im_history_selectable .im_message_outer_wrap:hover .im_message_fwd_date {
color: #68839c; color: #68839c;
} }
@ -3104,7 +3111,7 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status,
height: 26px; height: 26px;
margin: 13px 0 0 40px; margin: 13px 0 0 40px;
background: url(../img/icons/IconsetW.png) -9px -516px no-repeat; background: url(../img/icons/IconsetW.png) -9px -516px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
} }
.is_1x .icon-select-tick { .is_1x .icon-select-tick {
background-image: url(../img/icons/IconsetW_1x.png); background-image: url(../img/icons/IconsetW_1x.png);
@ -3307,7 +3314,7 @@ ce671b orange
font-size: 12px; font-size: 12px;
line-height: normal; line-height: normal;
background: #F2F2F2 url(../img/icons/IconsetW.png) -6px -205px no-repeat; background: #F2F2F2 url(../img/icons/IconsetW.png) -6px -205px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
border: 1px solid #F2F2F2; border: 1px solid #F2F2F2;
border-radius: 3px; border-radius: 3px;
padding: 6px 20px 6px 30px; padding: 6px 20px 6px 30px;
@ -3330,7 +3337,7 @@ ce671b orange
height: 13px; height: 13px;
vertical-align: text-top; vertical-align: text-top;
background: url(../img/icons/IconsetW.png) -15px -192px no-repeat; background: url(../img/icons/IconsetW.png) -15px -192px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
opacity: 0.6; opacity: 0.6;
} }
.is_1x .countries_modal_search_clear { .is_1x .countries_modal_search_clear {

344
app/css/app_mobile.css
Unescape View File

@ -126,12 +126,12 @@ html {
} }
.icon-back { .icon-back {
display: inline-block; display: inline-block;
width: 10px; width: 11px;
height: 18px; height: 19px;
vertical-align: text-top; vertical-align: text-top;
background: url(../img/icons/IconsetW.png) -15px -418px no-repeat; background: url(../img/icons/IconsetW.png) -15px -835px no-repeat;
background-size: 42px 710px; background-size: 42px 891px;
opacity: 0.8; opacity: 0.8;
} }
.is_1x .icon-back { .is_1x .icon-back {
@ -152,7 +152,7 @@ html {
} }
.tg_page_head .navbar-inverse .navbar-quick-nav > li > a { .tg_page_head .navbar-inverse .navbar-quick-nav > li > a {
padding-left: 15px; padding-left: 16px;
padding: 6px 10px 2px 28px; padding: 6px 10px 2px 28px;
color: #b9cfe3; color: #b9cfe3;
font-size: 13px; font-size: 13px;
@ -165,7 +165,7 @@ html {
.navbar-quick-nav .icon-back { .navbar-quick-nav .icon-back {
position: absolute; position: absolute;
margin-left: -18px; margin-left: -18px;
margin-top: 10px; margin-top: 8px;
} }
.navbar-quick-nav h4 { .navbar-quick-nav h4 {
font-size: 15px; font-size: 15px;
@ -302,9 +302,72 @@ html {
} }
.im_message_body,
.im_message_document {
padding: 7px 10px;
border-radius: 3px;
background: #f1f1f1;
}
.im_message_out .im_message_body,
.im_message_out .im_message_document {
background: #e4ecf2;
}
.im_message_body_media,
.im_message_out .im_message_body_media {
padding: 0;
border-radius: 0;
background: none;
}
.im_message_selected .im_message_body,
.im_message_selected .im_message_document {
background: #497495;
color: #FFF;
}
.im_message_selected .im_message_body_media {
background: none;
color: inherit;
}
.im_message_fwd .im_message_body,
.im_message_fwd .im_message_document {
padding: 7px 8px;
}
.im_grouped_fwd_start .im_message_body,
.im_grouped_fwd_short .im_message_body,
.im_grouped_fwd .im_message_body,
.im_grouped .im_message_fwd .im_message_body,
.im_grouped_fwd_start .im_message_document,
.im_grouped_fwd_short .im_message_document,
.im_grouped_fwd .im_message_document,
.im_grouped .im_message_fwd .im_message_document {
border-radius: 0;
}
.im_grouped_fwd_start .im_message_fwd .im_message_body,
.im_grouped_fwd_start .im_message_fwd .im_message_document {
border-radius: 3px 3px 0 0;
}
.im_grouped_fwd_end .im_message_fwd .im_message_body,
.im_grouped_fwd_end .im_message_fwd .im_message_document {
border-radius: 0 0 3px 3px;
}
.im_message_fwd .im_message_text {
min-height: 21px;
}
.im_grouped_fwd .im_message_text,
.im_grouped_fwd_short .im_message_text {
min-height: 0;
}
.im_service_message {
font-size: 13px;
}
.im_message_document { .im_message_document {
padding: 5px; padding: 5px;
width: 250px; width: auto;
max-width: 250px;
margin-top: 0;
} }
.im_message_audio, .im_message_audio,
.im_message_document { .im_message_document {
@ -316,6 +379,10 @@ html {
.im_message_document_thumb_wrap { .im_message_document_thumb_wrap {
position: absolute; position: absolute;
} }
.im_message_out .im_message_audio .icon-audio,
.im_message_out .im_message_document .icon-document {
background-color: #e4ecf2;
}
.im_message_document_thumb_wrap { .im_message_document_thumb_wrap {
background-color: transparent; background-color: transparent;
} }
@ -325,7 +392,7 @@ html {
.im_message_audio_info, .im_message_audio_info,
.im_message_document_info { .im_message_document_info {
float: none; float: none;
margin-left: 48px; margin-left: 43px;
width: auto; width: auto;
min-height: 38px; min-height: 38px;
} }
@ -339,7 +406,7 @@ html {
line-height: 38px; line-height: 38px;
} }
.im_message_audio_progress .im_message_audio_name, .im_message_audio_progress .im_message_audio_name,
.im_message_audio_progress .im_message_audio_duration, { .im_message_audio_progress .im_message_audio_duration {
line-height: 18px; line-height: 18px;
} }
.im_message_audio_done .im_message_audio_info { .im_message_audio_done .im_message_audio_info {
@ -407,25 +474,10 @@ a.im_message_video_thumb {
.im_message_document_thumb_wrap { .im_message_document_thumb_wrap {
position: absolute; position: absolute;
} }
/*.im_message_document, .im_grouped_short .im_message_body,
.im_message_audio, .im_grouped .im_message_body,
.im_message_upload_file { .im_grouped_fwd .im_message_body,
width: auto; .im_grouped_fwd_short .im_message_body {
}*/
/*.im_message_document_info {
float: none;
}
.im_message_document_thumb_wrap {
float: none;
}
.im_message_document_thumbed .im_message_document_name {
max-width: 100%;
}*/
.im_message_grouped1 .im_message_body,
.im_message_grouped2 .im_message_body,
.im_message_grouped3 .im_message_body,
.im_message_grouped4 .im_message_body {
margin-left: 0; margin-left: 0;
} }
@ -448,9 +500,6 @@ a.im_message_video_thumb {
} }
.im_content_message_wrap { .im_content_message_wrap {
font-size: 1.2em; font-size: 1.2em;
margin-right: 65px;
margin-left: 0;
/*margin-bottom: 0;*/
float: left; float: left;
position: relative; position: relative;
max-width: 80%; max-width: 80%;
@ -460,30 +509,47 @@ a.im_message_video_thumb {
margin-left: 80px; margin-left: 80px;
float: right; float: right;
} }
.im_message_in.im_content_message_wrap {
margin-right: 65px;
margin-left: 0;
}
.im_message_fwd.im_content_message_wrap { .im_message_fwd.im_content_message_wrap {
float: none; float: none;
} }
.im_history_messages_group .im_message_grouped1 .im_content_message_wrap, .im_history_messages_group .im_message_in.im_content_message_wrap,
.im_history_messages_group .im_message_grouped2 .im_content_message_wrap, .im_history_messages_group .im_grouped_short .im_message_in.im_content_message_wrap,
.im_history_messages_group .im_message_grouped3 .im_content_message_wrap, .im_history_messages_group .im_grouped .im_message_in.im_content_message_wrap,
.im_history_messages_group .im_message_grouped4 .im_content_message_wrap { .im_history_messages_group .im_grouped_fwd .im_message_in.im_content_message_wrap,
margin-top: 0; .im_history_messages_group .im_grouped_fwd_short .im_message_in.im_content_message_wrap {
/*margin-top: 0;*/
margin-left: 45px; margin-left: 45px;
} }
.im_message_grouped1 .im_message_out.im_content_message_wrap, .im_grouped_short .im_message_out.im_message_fwd,
.im_message_grouped2 .im_message_out.im_content_message_wrap, .im_grouped .im_message_out.im_message_fwd,
.im_message_grouped3 .im_message_out.im_content_message_wrap, .im_grouped_fwd .im_message_out.im_message_fwd,
.im_message_grouped4 .im_message_out.im_content_message_wrap { .im_grouped_fwd_short .im_message_out.im_message_fwd {
margin-left: 0;
}
.im_message_grouped1 .im_message_fwd.im_content_message_wrap,
.im_message_grouped2 .im_message_fwd.im_content_message_wrap,
.im_message_grouped3 .im_message_fwd.im_content_message_wrap,
.im_message_grouped4 .im_message_fwd.im_content_message_wrap {
margin-left: 80px; margin-left: 80px;
}
.im_grouped_short .im_content_message_wrap,
.im_grouped .im_content_message_wrap {
margin-top: 0;
}
.im_grouped_fwd_start .im_message_fwd.im_content_message_wrap,
.im_grouped_short .im_message_fwd.im_content_message_wrap,
.im_grouped .im_message_fwd.im_content_message_wrap,
.im_grouped_fwd .im_message_fwd.im_content_message_wrap,
.im_grouped_fwd_short .im_message_fwd.im_content_message_wrap {
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
} }
.im_grouped_fwd_start .im_message_fwd.im_content_message_wrap {
margin-top: 8px;
}
.im_grouped_fwd_end .im_message_fwd.im_content_message_wrap {
margin-bottom: 8px;
}
.im_message_meta { .im_message_meta {
float: none; float: none;
position: absolute; position: absolute;
@ -498,47 +564,67 @@ a.im_message_video_thumb {
left: -60px; left: -60px;
} }
.im_message_body, .im_grouped_fwd .im_message_meta,
.im_message_document { .im_grouped_fwd_short .im_message_meta,
padding: 7px 10px; .im_grouped_fwd_start .im_message_meta {
border-radius: 3px; display: none;
background: #f1f1f1;
} }
.im_message_out .im_message_body, .im_grouped_fwd_end .im_message_meta {
.im_message_out .im_message_document { display: block;
background: #e4ecf2;
} }
.im_message_body_media, .im_grouped_fwd_end .im_message_fwd .im_message_date {
.im_message_out .im_message_body_media { display: inline;
padding: 0;
border-radius: 0;
background: none;
} }
.im_message_selected .im_message_body, .im_message_out .im_message_fwd_date {
.im_message_selected .im_message_document { color: #93a2ae;
background: #497495;
color: #FFF;
} }
.im_message_selected .im_message_body_media {
background: none; .im_message_out .icon-document,
color: inherit; .im_message_out .icon-photo,
.im_message_out .icon-video {
background-color: #dae6f0;
background-position: -2px -542px;
} }
.im_message_selected .im_message_body a { .im_message_out .icon-audio,
color: #FFF; .im_history_selectable .im_message_outer_wrap:hover .icon-audio {
background-color: #dae6f0;
background-position: -2px -697px;
}
.im_message_out .im_message_document_size,
.im_message_out .im_message_audio_duration,
.im_message_out .im_message_audio_size,
.im_message_out .im_message_fwd_date,
.im_message_selected .im_message_document_size,
.im_message_selected .im_message_audio_duration,
.im_message_selected .im_message_audio_size,
.im_message_selected .im_message_fwd_date,
.im_message_focus .im_message_document_size,
.im_message_focus .im_message_audio_duration,
.im_message_focus .im_message_audio_size,
.im_message_focus .im_message_fwd_date,
.im_history_selectable .im_message_outer_wrap:hover .im_message_document_size,
.im_history_selectable .im_message_outer_wrap:hover .im_message_audio_duration,
.im_history_selectable .im_message_outer_wrap:hover .im_message_audio_size,
.im_history_selectable .im_message_outer_wrap:hover .im_message_fwd_date {
color: #68839c;
} }
.im_message_from_photo { .im_message_from_photo,
.im_message_fwd_photo {
width: 40px; width: 40px;
height: 40px; height: 40px;
} }
a.im_message_from_photo { a.im_message_from_photo {
margin-right: 5px; margin: 0;
display: none; display: none;
} }
.im_history_messages_group a.im_message_from_photo { .im_history_messages_group a.im_message_from_photo {
display: block; display: block;
position: absolute;
margin-left: -45px;
} }
.im_message_author { .im_message_author {
display: none; display: none;
@ -548,16 +634,17 @@ a.im_message_from_photo {
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
} }
.im_message_grouped1 a.im_message_from_photo, .im_grouped_short a.im_message_from_photo,
.im_message_grouped1 a.im_message_author, .im_grouped_short a.im_message_author,
.im_message_grouped2 a.im_message_from_photo, .im_grouped a.im_message_from_photo,
.im_message_grouped2 a.im_message_author, .im_grouped a.im_message_author,
.im_message_grouped3 a.im_message_author, .im_grouped_fwd a.im_message_author,
.im_message_grouped3 a.im_message_from_photo, .im_grouped_fwd a.im_message_from_photo,
.im_message_grouped4 a.im_message_author, .im_grouped_fwd_short a.im_message_author,
.im_message_grouped4 a.im_message_from_photo, .im_grouped_fwd_short a.im_message_from_photo,
.im_message_out a.im_message_author, .im_message_out a.im_message_author,
.im_message_out a.im_message_from_photo { .im_message_out a.im_message_from_photo,
.im_message_body_media a.im_message_author {
display: none; display: none;
} }
.im_message_wrap { .im_message_wrap {
@ -724,7 +811,7 @@ a.im_message_from_photo {
} }
.im_dialog_peer { .im_dialog_peer {
margin-bottom: 7px; margin-bottom: 7px;
margin-top: 6px; margin-top: 5px;
} }
.im_dialog_meta { .im_dialog_meta {
margin-top: 5px; margin-top: 5px;
@ -754,9 +841,50 @@ a.im_dialog_selected .im_dialog_unread {
color: #8f8f8f; color: #8f8f8f;
} }
.im_message_grouped4 .im_message_fwd.im_message_out .im_message_fwd_author_wrap, .im_message_fwd_from {
.im_message_grouped4 .im_message_fwd.im_message_out .im_message_text, margin-top: 0;
.im_message_grouped4 .im_message_fwd.im_message_out .im_message_media { }
.im_grouped_fwd_start .im_message_fwd_title {
display: block;
color: #8a8a8a;
font-size: 13px;
font-weight: normal;
margin-bottom: 5px;
}
.im_history_messages_group .im_message_in .im_message_fwd_title {
margin-top: 5px;
}
.im_message_out .im_message_fwd_title {
color: #798791;
}
.im_message_selected .im_message_body a,
.im_message_selected .im_message_fwd_title,
.im_message_selected .im_message_audio_name,
.im_message_selected .im_message_document_name,
.im_message_selected .im_message_document_size,
.im_message_selected .im_message_audio_duration,
.im_message_selected .im_message_audio_size,
.im_message_selected .im_message_fwd_date,
.im_history_selectable .im_message_selected:hover .im_message_document_size,
.im_history_selectable .im_message_selected:hover .im_message_audio_duration,
.im_history_selectable .im_message_selected:hover .im_message_audio_size,
.im_history_selectable .im_message_selected:hover .im_message_fwd_date {
color: #FFF;
}
a.im_message_fwd_author {
color: #323232;
}
.im_message_fwd .im_message_fwd_author_wrap,
.im_message_fwd .im_message_text,
.im_message_fwd .im_message_media {
margin-left: 50px;
}
.im_grouped_fwd_short .im_message_fwd.im_message_out .im_message_fwd_author_wrap,
.im_grouped_fwd_short .im_message_fwd.im_message_out .im_message_text,
.im_grouped_fwd_short .im_message_fwd.im_message_out .im_message_media {
/*margin-left: 0;*/ /*margin-left: 0;*/
} }
@ -846,25 +974,22 @@ a.im_dialog_selected .im_dialog_unread {
min-width: 0; min-width: 0;
height: 32px; height: 32px;
padding: 0; padding: 0;
background: url(../img/icons/mobile/Msg_send_active.png) 15px 3px no-repeat;
background-size: 24px 24px;
border: 0; border: 0;
color: transparent;
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
} }
.is_1x .im_submit { .im_submit,
background: url(../img/icons/mobile/Msg_send_active.png) 15px 3px no-repeat; .im_submit:active,
background-size: 24px 24px;
}
.im_submit:hover { .im_submit:hover {
background-color: transparent; background: url(../img/icons/IconsetW.png) 2px -860px no-repeat;
background-size: 42px 891px;
color: transparent; color: transparent;
}
.im_submit:active {
box-shadow: none; box-shadow: none;
} }
.is_1x .im_submit {
background-image: url(../img/icons/IconsetW_1x.png);
}
.im_submit_text { .im_submit_text {
display: none; display: none;
} }
@ -876,27 +1001,25 @@ a.im_dialog_selected .im_dialog_unread {
margin: 0; margin: 0;
width: 50px; width: 50px;
height: 32px; height: 32px;
padding: 4px 13px 4px 16px; padding: 3px 13px 4px 16px;
} }
.icon-camera { .icon-camera {
display: inline-block; display: inline-block;
width: 22px; width: 19px;
height: 22px; height: 23px;
vertical-align: text-top; vertical-align: text-top;
background: url(../img/icons/mobile/Msg_attach.png) 0 0 no-repeat; background: url(../img/icons/IconsetW.png) -12px -68px no-repeat;
background-size: 22px 22px; background-size: 42px 891px;
opacity: 1; opacity: 1;
margin: 0;
} }
.is_1x .icon-camera { .is_1x .icon-camera {
background-image: url(../img/icons/mobile/Msg_attach.png); background-image: url(../img/icons/IconsetW_1x.png);
} }
.im_media_attach:hover .icon-camera,
.im_media_attach:active .icon-camera, .im_media_attach:active .icon-camera {
.is_1x .im_media_attach:active .icon-camera { background-position: -12px -100px;
background-position: 0 0; opacity: 1;
background-image: url(../img/icons/mobile/Msg_attach_active.png);
} }
.im_media_attach, .im_media_attach,
@ -913,7 +1036,7 @@ a.im_dialog_selected .im_dialog_unread {
left: 0; left: 0;
top: 0; top: 0;
margin: 0; margin: 0;
padding: 5px 13px 4px 13px; padding: 3px 13px 4px 13px;
width: 48px; width: 48px;
height: 32px; height: 32px;
} }
@ -922,20 +1045,19 @@ a.im_dialog_selected .im_dialog_unread {
width: 22px; width: 22px;
height: 22px; height: 22px;
vertical-align: text-top; vertical-align: text-top;
background: url(../img/icons/mobile/Msg_smile.png) 0 0 no-repeat;
background-size: 22px 22px;
opacity: 1; opacity: 1;
margin: 0; margin: 0;
background: url(../img/icons/IconsetW.png) -10px -771px no-repeat;
background-size: 42px 891px;
} }
.is_1x .icon-emoji { .is_1x .icon-emoji {
background-image: url(../img/icons/mobile/Msg_smile.png); background-image: url(../img/icons/IconsetW_1x.png);
} }
.im_emoji_btn:active .icon-emoji, .im_emoji_btn:active .icon-emoji,
.is_1x .im_emoji_btn:active .icon-emoji, .is_1x .im_emoji_btn:active .icon-emoji,
.im_emoji_btn.on .icon-emoji, .im_emoji_btn.on .icon-emoji,
.is_1x .im_emoji_btn.on .icon-emoji { .is_1x .im_emoji_btn.on .icon-emoji {
background-position: 0 0; background-position: -10px -803px;
background-image: url(../img/icons/mobile/Msg_smile_active.png);
} }
.im_send_field_wrap { .im_send_field_wrap {

BIN
app/img/T_LogoM_1x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 24 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
app/img/icons/mobile/Header_back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/img/icons/mobile/Msg_attach.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/img/icons/mobile/Msg_attach_active.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/img/icons/mobile/Msg_send.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/img/icons/mobile/Msg_send_active.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/img/icons/mobile/Msg_smile.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
app/img/icons/mobile/Msg_smile_active.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
app/img/icons/mobile/T_LogoM.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.1 KiB

9
app/js/directives.js
Unescape View File

@ -32,6 +32,11 @@ angular.module('myApp.directives', ['myApp.filters'])
}; };
}) })
.directive('myServiceMessage', function() {
return {
templateUrl: 'partials/message_service.html'
};
})
.directive('myMessagePhoto', function() { .directive('myMessagePhoto', function() {
return { return {
templateUrl: 'partials/message_attach_photo.html' templateUrl: 'partials/message_attach_photo.html'
@ -710,7 +715,7 @@ angular.module('myApp.directives', ['myApp.filters'])
updateHeight(); updateHeight();
$scope.$apply(function () { $scope.$apply(function () {
$scope.draftMessage.text = richTextarea.innerText; $scope.draftMessage.text = richTextarea.textContent;
}); });
$timeout.cancel(updatePromise); $timeout.cancel(updatePromise);
@ -1614,7 +1619,7 @@ angular.module('myApp.directives', ['myApp.filters'])
} }
element.on('click', function (e) { element.on('click', function (e) {
$rootScope.openUser(userID); $rootScope.openUser($scope.userID);
}); });
if (attrs.imgClass) { if (attrs.imgClass) {

20
app/js/services.js
Unescape View File

@ -1788,7 +1788,8 @@ angular.module('myApp.services', [])
function regroupWrappedHistory (history, limit) { function regroupWrappedHistory (history, limit) {
var start = 0, var start = 0,
end = history.length, len = history.length,
end = len,
i, curDay, prevDay, curMessage, prevMessage; i, curDay, prevDay, curMessage, prevMessage;
if (limit > 0) { if (limit > 0) {
@ -1816,12 +1817,24 @@ angular.module('myApp.services', [])
var singleLine = curMessage.message && curMessage.message.length < 70 && curMessage.message.indexOf("\n") == -1; var singleLine = curMessage.message && curMessage.message.length < 70 && curMessage.message.indexOf("\n") == -1;
if (curMessage.fwd_from_id && curMessage.fwd_from_id == prevMessage.fwd_from_id) { if (curMessage.fwd_from_id && curMessage.fwd_from_id == prevMessage.fwd_from_id) {
curMessage.grouped = singleLine ? 4 : 3; curMessage.grouped = singleLine ? 'im_grouped_fwd_short' : 'im_grouped_fwd';
} else { } else {
curMessage.grouped = !curMessage.fwd_from_id && singleLine ? 1 : 2; curMessage.grouped = !curMessage.fwd_from_id && singleLine ? 'im_grouped_short' : 'im_grouped';
}
if (curMessage.fwd_from_id) {
if (!prevMessage.grouped) {
prevMessage.grouped = 'im_grouped_fwd_start';
}
if (curMessage.grouped && i == len - 1) {
curMessage.grouped += ' im_grouped_fwd_end';
}
} }
} else if (prevMessage || !i) { } else if (prevMessage || !i) {
delete curMessage.grouped; delete curMessage.grouped;
if (prevMessage && prevMessage.grouped && prevMessage.fwd_from_id) {
prevMessage.grouped += ' im_grouped_fwd_end';
}
} }
prevMessage = curMessage; prevMessage = curMessage;
prevDay = curDay; prevDay = curDay;
@ -1854,6 +1867,7 @@ angular.module('myApp.services', [])
case 'messageMediaPhoto': notificationMessage = 'Photo'; break; case 'messageMediaPhoto': notificationMessage = 'Photo'; break;
case 'messageMediaVideo': notificationMessage = 'Video'; break; case 'messageMediaVideo': notificationMessage = 'Video'; break;
case 'messageMediaDocument': notificationMessage = 'Document'; break; case 'messageMediaDocument': notificationMessage = 'Document'; break;
case 'messageMediaAudio': notificationMessage = 'Voice message'; break;
case 'messageMediaGeo': notificationMessage = 'Location'; break; case 'messageMediaGeo': notificationMessage = 'Location'; break;
case 'messageMediaContact': notificationMessage = 'Contact'; break; case 'messageMediaContact': notificationMessage = 'Contact'; break;
default: notificationMessage = 'Attachment'; break; default: notificationMessage = 'Attachment'; break;

2
app/partials/login.html
Unescape View File

@ -40,7 +40,7 @@
<div class="form-group" ng-class="{'has-error': error.field == 'phone_code'}"> <div class="form-group" ng-class="{'has-error': error.field == 'phone_code'}">
<label class="control-label" for="phone_code" ng-if="error.field == 'phone_code'">Incorrect SMS code</label> <label class="control-label" for="phone_code" ng-if="error.field == 'phone_code'">Incorrect SMS code</label>
<input type="number" my-focused maxlength="5" class="form-control" name="phone_code" ng-model="credentials.phone_code" placeholder="Enter your code" autocomplete="off" required> <input type="number" my-focused class="form-control" name="phone_code" ng-model="credentials.phone_code" placeholder="Enter your code" autocomplete="off" required>
</div> </div>
<button class="btn btn-primary btn-block" type="submit" ng-class="{disabled: progress.enabled}" ng-disabled="progress.enabled" ng-switch="progress.enabled"> <button class="btn btn-primary btn-block" type="submit" ng-class="{disabled: progress.enabled}" ng-disabled="progress.enabled" ng-switch="progress.enabled">

7
app/partials/message.html
Unescape View File

@ -6,14 +6,14 @@
<div class="im_service_message" ng-bind="historyMessage.date | myDate"></div> <div class="im_service_message" ng-bind="historyMessage.date | myDate"></div>
</div> </div>
<div class="im_message_outer_wrap" ng-class="[ selectedMsgs[historyMessage.id] &amp;&amp; 'im_message_selected', historyMessage.grouped &amp;&amp; ('im_message_grouped' + historyMessage.grouped) , historyFocus == historyMessage.id &amp;&amp; 'im_message_focus']" ng-click="toggleMessage(historyMessage.id, $event)"> <div class="im_message_outer_wrap" ng-class="[ selectedMsgs[historyMessage.id] &amp;&amp; 'im_message_selected', historyMessage.grouped, historyFocus == historyMessage.id ? 'im_message_focus' : '']" ng-click="toggleMessage(historyMessage.id, $event)">
<div class="im_message_wrap clearfix"> <div class="im_message_wrap clearfix">
<div class="im_service_message_wrap" ng-if="::historyMessage._ == 'messageService'"> <div class="im_service_message_wrap" ng-if="::historyMessage._ == 'messageService'">
<div class="im_service_message"> <div class="im_service_message">
<a class="im_message_author" my-user-link="historyMessage.from_id"></a> <a class="im_message_author" my-user-link="historyMessage.from_id" short="!historyMessage.to_id.chat_id" color="historyMessage.to_id.chat_id > 0"></a>
<span class="im_message_service" my-service-message></span> <span class="im_message_service" my-service-message></span>
</div> </div>
@ -27,7 +27,7 @@
</div> </div>
<div ng-if="::historyMessage._ != 'messageService'" class="im_content_message_wrap" ng-class="{im_message_unread: historyMessage.unread, im_message_out: historyMessage.out, im_message_error: historyMessage.error, im_message_pending: historyMessage.pending, im_message_fwd: historyMessage._ == 'messageForwarded'}"> <div ng-if="::historyMessage._ != 'messageService'" class="im_content_message_wrap" ng-class="{im_message_unread: historyMessage.unread, im_message_out: historyMessage.out, im_message_in: !historyMessage.out, im_message_error: historyMessage.error, im_message_pending: historyMessage.pending, im_message_fwd: historyMessage._ == 'messageForwarded'}">
<div class="im_content_message_select_area"> <div class="im_content_message_select_area">
<i class="icon icon-select-tick"></i> <i class="icon icon-select-tick"></i>
</div> </div>
@ -50,6 +50,7 @@
<a class="im_message_author" my-user-link="historyMessage.from_id" short="!historyMessage.to_id.chat_id" color="historyMessage.to_id.chat_id > 0"></a> <a class="im_message_author" my-user-link="historyMessage.from_id" short="!historyMessage.to_id.chat_id" color="historyMessage.to_id.chat_id > 0"></a>
<div ng-if="::historyMessage._ == 'messageForwarded'" class="im_message_fwd_from"> <div ng-if="::historyMessage._ == 'messageForwarded'" class="im_message_fwd_from">
<div class="im_message_fwd_title" ng-if="::historyMessage.grouped == 'im_grouped_fwd_start'">Forwarded message</div>
<a class="im_message_fwd_photo pull-left" my-user-photolink="historyMessage.fwd_from_id" img-class="im_message_fwd_photo"></a> <a class="im_message_fwd_photo pull-left" my-user-photolink="historyMessage.fwd_from_id" img-class="im_message_fwd_photo"></a>
<div class="im_message_fwd_author_wrap"> <div class="im_message_fwd_author_wrap">
<a class="im_message_fwd_author" my-user-link="historyMessage.fwd_from_id" short="true"></a><span class="im_message_fwd_date" ng-bind="historyMessage.fwd_date | dateOrTime"></span> <a class="im_message_fwd_author" my-user-link="historyMessage.fwd_from_id" short="true"></a><span class="im_message_fwd_date" ng-bind="historyMessage.fwd_date | dateOrTime"></span>

2
app/partials/message_attach_pending.html
Unescape View File

@ -1,4 +1,4 @@
<div class="im_message_upload_file" ng-class="::'im_message_upload_' + historyMessage.media.type"> <div class="im_message_document im_message_upload_file" ng-class="::'im_message_upload_' + historyMessage.media.type">
<i class="icon" ng-class="::'icon-' + historyMessage.media.type"></i> <i class="icon" ng-class="::'icon-' + historyMessage.media.type"></i>
<div class="im_message_document_info"> <div class="im_message_document_info">
<div class="im_message_document_name_wrap"> <div class="im_message_document_name_wrap">

Write Preview
Loading…
Cancel
Save