Browse Source

Verified tick for channels

master
Igor Zhukov 9 years ago
parent
commit
ed17c098de
  1. BIN
      app/img/icons/ProfileIcons.png
  2. BIN
      app/img/icons/ProfileIcons_2x.png
  3. 4
      app/js/directives.js
  4. 20
      app/less/app.less
  5. 2
      app/partials/desktop/channel_modal.html
  6. 2
      app/partials/desktop/dialog.html
  7. 2
      app/partials/desktop/im.html
  8. 2
      app/partials/desktop/peer_select.html
  9. 2
      app/partials/mobile/channel_modal.html
  10. 2
      app/partials/mobile/dialog.html
  11. 2
      app/partials/mobile/im.html
  12. 2
      app/partials/mobile/peer_select.html

BIN
app/img/icons/ProfileIcons.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
app/img/icons/ProfileIcons_2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

4
app/js/directives.js

@ -1279,6 +1279,7 @@ angular.module('myApp.directives', ['myApp.filters'])
}); });
$scope.$on('ui_panel_update', function (e, data) { $scope.$on('ui_panel_update', function (e, data) {
updateSizes();
onContentLoaded(function () { onContentLoaded(function () {
updateSizes(); updateSizes();
if (data && data.blur) { if (data && data.blur) {
@ -2639,7 +2640,8 @@ angular.module('myApp.directives', ['myApp.filters'])
var chat = AppChatsManager.getChat(-peerID); var chat = AppChatsManager.getChat(-peerID);
element.html( element.html(
(chat.rTitle || '').valueOf() (chat.rTitle || '').valueOf() +
(attrs.verified && chat.pFlags.verified ? ' <i class="icon-verified"></i>' : '')
); );
} }
}; };

20
app/less/app.less

@ -12,8 +12,7 @@ body {
color: #000; color: #000;
background: none; background: none;
font: 12px/18px 'Open Sans', "Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, Verdana, sans-serif; font: 12px/18px 'Open Sans', "Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, Verdana, sans-serif;
overflow: visible; overflow: hidden;
overflow-x: hidden;
&.non_osx { &.non_osx {
font: 13px/18px Tahoma, sans-serif, Arial, Helvetica; font: 13px/18px Tahoma, sans-serif, Arial, Helvetica;
@ -1119,6 +1118,23 @@ i.icon-search-clear {
background-position: -15px -192px; background-position: -15px -192px;
} }
i.icon-verified {
display: inline-block;
width: 17px;
height: 17px;
vertical-align: text-top;
.image-2x('../img/icons/ProfileIcons.png', 40px, 420px);
background-position: -10px -373px;
.im_dialogs_scrollable_wrap & {
display: none;
}
.im_dialogs_col_search & {
display: inline-block;
}
}
.im_dialogs_tabs_wrap { .im_dialogs_tabs_wrap {
display: none; display: none;
} }

2
app/partials/desktop/channel_modal.html

@ -17,7 +17,7 @@
<a ng-switch-default ng-click="openPhoto(chatFull.chat_photo.id, {p: -chatFull.chat.id})" class="peer_modal_photo" my-peer-photolink="::-chatFull.chat.id" img-class="peer_modal_photo" no-open="true" watch="true" ng-class="{disabled: !chatFull.chat.photo.photo_small}" ng-disabled="!chatFull.chat.photo.photo_small"></a> <a ng-switch-default ng-click="openPhoto(chatFull.chat_photo.id, {p: -chatFull.chat.id})" class="peer_modal_photo" my-peer-photolink="::-chatFull.chat.id" img-class="peer_modal_photo" no-open="true" watch="true" ng-class="{disabled: !chatFull.chat.photo.photo_small}" ng-disabled="!chatFull.chat.photo.photo_small"></a>
</div> </div>
<div class="peer_modal_profile"> <div class="peer_modal_profile">
<div class="peer_modal_profile_name" my-peer-link="-chatFull.chat.id"></div> <div class="peer_modal_profile_name" my-peer-link="-chatFull.chat.id" verified="true"></div>
<div class="peer_modal_profile_description" ng-if="chatFull.participants_count > 0"> <div class="peer_modal_profile_description" ng-if="chatFull.participants_count > 0">
<ng-pluralize count="chatFull.participants_count" <ng-pluralize count="chatFull.participants_count"
when="group_modal_pluralize_participants"> when="group_modal_pluralize_participants">

2
app/partials/desktop/dialog.html

@ -18,7 +18,7 @@
<div class="im_dialog_message_wrap"> <div class="im_dialog_message_wrap">
<div class="im_dialog_peer"> <div class="im_dialog_peer">
<span my-peer-link="dialogMessage.peerID"></span> <span my-peer-link="dialogMessage.peerID" verified="true"></span>
</div> </div>
<div ng-if="dialogMessage.typing > 0" class="im_dialog_message"> <div ng-if="dialogMessage.typing > 0" class="im_dialog_message">

2
app/partials/desktop/im.html

@ -4,7 +4,7 @@
<div class="im_page_split clearfix"> <div class="im_page_split clearfix">
<div class="im_dialogs_col_wrap noselect" ng-controller="AppImDialogsController" my-dialogs has-tabs="{{search.query.length > 0}}"> <div class="im_dialogs_col_wrap noselect" ng-controller="AppImDialogsController" my-dialogs has-tabs="{{search.query.length > 0}}" ng-class="search.query.length > 0 ? 'im_dialogs_col_search' : ''">
<div class="im_dialogs_panel"> <div class="im_dialogs_panel">
<div class="im_dialogs_search"> <div class="im_dialogs_search">
<input class="form-control im_dialogs_search_field no_outline" type="search" placeholder="{{'modal_search' | i18n}}" ng-model="search.query"/> <input class="form-control im_dialogs_search_field no_outline" type="search" placeholder="{{'modal_search' | i18n}}" ng-model="search.query"/>

2
app/partials/desktop/peer_select.html

@ -11,7 +11,7 @@
<div class="md_modal_body"> <div class="md_modal_body">
<div class="im_dialogs_modal_col_wrap" ng-controller="AppImDialogsController" my-dialogs> <div class="im_dialogs_modal_col_wrap" ng-controller="AppImDialogsController" my-dialogs ng-class="search.query.length > 0 ? 'im_dialogs_col_search' : ''">
<div class="im_dialogs_panel"> <div class="im_dialogs_panel">
<div class="im_dialogs_search"> <div class="im_dialogs_search">
<input my-focused class="form-control im_dialogs_search_field no_outline" type="search" placeholder="{{'modal_search' | i18n}}" ng-model="search.query"/> <input my-focused class="form-control im_dialogs_search_field no_outline" type="search" placeholder="{{'modal_search' | i18n}}" ng-model="search.query"/>

2
app/partials/mobile/channel_modal.html

@ -52,7 +52,7 @@
<a ng-click="openPhoto(chatFull.chat_photo.id, {p: -chatFull.chat.id})" class="mobile_user_modal_image_wrap pull-left" my-peer-photolink="::-chatFull.chat.id" img-class="mobile_user_modal_image mobile_chat_modal_image" no-open="true" watch="true" ng-class="{disabled: !chatFull.chat.photo.photo_small}" ng-disabled="!chatFull.chat.photo.photo_small"></a> <a ng-click="openPhoto(chatFull.chat_photo.id, {p: -chatFull.chat.id})" class="mobile_user_modal_image_wrap pull-left" my-peer-photolink="::-chatFull.chat.id" img-class="mobile_user_modal_image mobile_chat_modal_image" no-open="true" watch="true" ng-class="{disabled: !chatFull.chat.photo.photo_small}" ng-disabled="!chatFull.chat.photo.photo_small"></a>
<div class="mobile_user_modal_info_wrap clearfix"> <div class="mobile_user_modal_info_wrap clearfix">
<h4 class="mobile_user_modal_header" my-peer-link="-chatFull.chat.id"></h4> <h4 class="mobile_user_modal_header" my-peer-link="-chatFull.chat.id" verified="true"></h4>
<p class="mobile_user_modal_status" ng-if="chatFull.participants_count > 0"> <p class="mobile_user_modal_status" ng-if="chatFull.participants_count > 0">
<ng-pluralize count="chatFull.participants_count" <ng-pluralize count="chatFull.participants_count"
when="group_modal_pluralize_participants"> when="group_modal_pluralize_participants">

2
app/partials/mobile/dialog.html

@ -18,7 +18,7 @@
<div class="im_dialog_message_wrap"> <div class="im_dialog_message_wrap">
<div class="im_dialog_peer"> <div class="im_dialog_peer">
<span my-peer-link="dialogMessage.peerID"></span> <span my-peer-link="dialogMessage.peerID" verified="true"></span>
</div> </div>
<div ng-if="dialogMessage.typing > 0" class="im_dialog_message"> <div ng-if="dialogMessage.typing > 0" class="im_dialog_message">

2
app/partials/mobile/im.html

@ -4,7 +4,7 @@
<div class="im_page_split clearfix"> <div class="im_page_split clearfix">
<div ng-controller="AppImDialogsController" my-dialogs has-tabs="{{search.query.length > 0}}" class="im_dialogs_col_wrap"> <div ng-controller="AppImDialogsController" my-dialogs has-tabs="{{search.query.length > 0}}" class="im_dialogs_col_wrap" ng-class="search.query.length > 0 ? 'im_dialogs_col_search' : ''">
<div class="im_dialogs_panel"> <div class="im_dialogs_panel">
<div class="im_dialogs_search"> <div class="im_dialogs_search">
<input class="form-control im_dialogs_search_field no_outline" type="search" placeholder="{{'modal_search' | i18n}}" ng-model="search.query"/> <input class="form-control im_dialogs_search_field no_outline" type="search" placeholder="{{'modal_search' | i18n}}" ng-model="search.query"/>

2
app/partials/mobile/peer_select.html

@ -29,7 +29,7 @@
<div class="modal-body mobile_modal_body"> <div class="modal-body mobile_modal_body">
<div class="im_dialogs_modal_col_wrap" ng-controller="AppImDialogsController" my-dialogs> <div class="im_dialogs_modal_col_wrap" ng-controller="AppImDialogsController" my-dialogs ng-class="search.query.length > 0 ? 'im_dialogs_col_search' : ''">
<div class="im_dialogs_panel"> <div class="im_dialogs_panel">
<div class="im_dialogs_search"> <div class="im_dialogs_search">
<input my-focused class="form-control im_dialogs_search_field no_outline" type="search" placeholder="{{'modal_search' | i18n}}" ng-model="search.query"/> <input my-focused class="form-control im_dialogs_search_field no_outline" type="search" placeholder="{{'modal_search' | i18n}}" ng-model="search.query"/>

Loading…
Cancel
Save