Browse Source

New chat modal actions

TitanNano-voice_recorder
Igor Zhukov 11 years ago
parent
commit
e3643ffc73
  1. 44
      app/css/app.css
  2. 39
      app/partials/chat_modal.html

44
app/css/app.css

@ -1792,24 +1792,42 @@ img.img_fullsize {
color: #999; color: #999;
} }
.chat_modal_settings_wrap { .chat_modal_actions_wrap {
margin-top: 10px; margin-top: 8px;
} }
.chat_modal_notifications { .chat_modal_send_btn {
font-weight: bold; border: 0;
background: #4E9CD8;
font-size: 12px;
padding-left: 16px;
padding-right: 16px;
float: left;
} }
.chat_modal_clear { .chat_modal_send_btn:hover {
margin-top: 10px; background: #539BD1;
} }
.chat_modal_leave { .chat_modal_delete_btn {
margin-top: 10px; border: 0;
font-size: 12px;
padding-left: 16px;
padding-right: 16px;
float: left;
} }
.chat_modal_other_btn {
.chat_modal_invite_btn { margin-left: 10px;
padding-left: 0; float: left;
padding-right: 0; }
.chat_modal_other_btn .dropdown-toggle {
border: 0;
font-size: 12px; font-size: 12px;
margin-top: 8px; }
.chat_modal_settings_wrap {
margin-top: 10px;
}
.chat_modal_notifications {
margin-top: 25px;
font-weight: bold;
} }
.chat_modal_members_header { .chat_modal_members_header {

39
app/partials/chat_modal.html

@ -31,10 +31,7 @@
<div class="chat_modal_info_wrap clearfix"> <div class="chat_modal_info_wrap clearfix">
<h4 class="chat_modal_header"> <h4 class="chat_modal_header" ng-bind-html="chatFull.chat.rTitle"></h4>
<a href="" ng-if="chatFull.chat._ != 'chatForbidden' &amp;&amp; !chatFull.chat.left" ng-click="editTitle()" ng-bind-html="chatFull.chat.rTitle"></a>
<span ng-if="chatFull.chat._ == 'chatForbidden' || chatFull.chat.left" ng-bind-html="chatFull.chat.rTitle"></span>
</h4>
<p class="chat_modal_members_count" ng-if="chatFull.chat.participants_count > 0"> <p class="chat_modal_members_count" ng-if="chatFull.chat.participants_count > 0">
<ng-pluralize count="chatFull.chat.participants_count" <ng-pluralize count="chatFull.chat.participants_count"
when="{'0': 'No members', 'one': '1 member', 'other': '{} members'}"> when="{'0': 'No members', 'one': '1 member', 'other': '{} members'}">
@ -42,6 +39,30 @@
</p> </p>
<div class="chat_modal_settings_wrap"> <div class="chat_modal_settings_wrap">
<div class="chat_modal_actions_wrap clearfix">
<button ng-if="!chatFull.chat.left &amp;&amp; chatFull.participants.participants.length" class="btn btn-primary chat_modal_send_btn" ng-click="goToHistory()">Add member</button>
<button ng-if="chatFull.chat._ != 'chatForbidden' &amp;&amp; chatFull.chat.left" class="btn btn-primary chat_modal_send_btn" ng-click="returnToGroup()">Return to group</button>
<button ng-if="chatFull.chat._ == 'chatForbidden'" class="btn btn-danger chat_modal_delete_btn" ng-click="flushHistory()">Delete chat</button>
<div class="dropdown chat_modal_other_btn" ng-if="chatFull.chat._ != 'chatForbidden' &amp;&amp; !chatFull.chat.left">
<button class="btn btn-link dropdown-toggle">More<i class="icon icon-caret"></i></button>
<ul class="dropdown-menu">
<li>
<a ng-click="editTitle()">Edit group</a>
</li>
<li>
<a ng-click="leaveGroup()">Leave group</a>
</li>
<li>
<a ng-click="flushHistory()">Delete chat</a>
</li>
</ul>
</div>
</div>
<div class="chat_modal_notifications"> <div class="chat_modal_notifications">
Notifications: Notifications:
<a ng-click="settings.notifications = !settings.notifications"> <a ng-click="settings.notifications = !settings.notifications">
@ -49,20 +70,10 @@
</a> </a>
</div> </div>
<div class="chat_modal_leave_join" ng-if="chatFull.chat._ != 'chatForbidden'">
<div class="chat_modal_leave" ng-if="!chatFull.chat.left">
<a href="" ng-click="leaveGroup()">Leave group</a>
</div>
<div class="chat_modal_leave" ng-if="chatFull.chat.left">
<a href="" ng-click="returnToGroup()">Return to group</a>
</div>
</div>
</div> </div>
</div> </div>
<h5 class="chat_modal_members_header"> <h5 class="chat_modal_members_header">
<a href="" ng-click="inviteToGroup()" ng-if="!chatFull.chat.left &amp;&amp; chatFull.participants.participants.length" class="pull-right">Add participant</a>
Members Members
</h5> </h5>
<div class="chat_modal_members_list"> <div class="chat_modal_members_list">

Loading…
Cancel
Save