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

Improved desktop photo viewer

Browse Source 
Fixed delete left chat
This commit is contained in:
Igor Zhukov 2014-11-28 15:38:32 +00:00
parent ef28b1f933
commit 3513d65396
4 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/css/desktop.css
View File

@ -1014,7 +1014,6 @@ div.im_panel_own_photo {
.modal_prev_wrap,
.modal_next_wrap {
display: none;
cursor: pointer;
position: fixed;
top: 0;
left: 0;
@ -1025,13 +1024,17 @@ div.im_panel_own_photo {
left: auto;
right: 0;
}
.modal_prev_active_wrap,
.modal_next_active_wrap {
cursor: pointer;
}
.modal_prev,
.modal_next {
background: url(../img/icons/PhotoIcons.png) -12px -41px no-repeat;
background-size: 40px 200px;
width: 16px;
height: 24px;
opacity: 0.5;
opacity: 0.3;
position: absolute;
top: 50%;
pointer-events: none;
@ -1046,12 +1049,17 @@ div.im_panel_own_photo {
margin: 0 0 0 50px;
background-position: -14px -75px;
}
.modal_prev_wrap:hover,
.modal_next_wrap:hover {
.modal_prev_active_wrap .modal_prev,
.modal_next_active_wrap .modal_next {
opacity: 0.5;
}
.modal_prev_active_wrap:hover,
.modal_next_active_wrap:hover {
background-color: rgba(0,0,0,0.2);
}
.modal_prev_wrap:hover .modal_prev,
.modal_next_wrap:hover .modal_next {
.modal_prev_active_wrap:hover .modal_prev,
.modal_next_active_wrap:hover .modal_next {
opacity: 1;
}
@ -1087,7 +1095,8 @@ div.im_panel_own_photo {
max-width: 300px;
margin: 0 auto;
text-align: center;
font-size: 14px;
font-size: 13px;
font-weight: bold;
line-height: 16px;
padding: 24px 0;
overflow: hidden;
@ -1099,12 +1108,12 @@ div.im_panel_own_photo {
padding: 24px 20px;
}
.media_modal_author {
font-size: 14px;
font-size: 13px;
margin-right: 4px;
}
.media_modal_date,
a.media_modal_date:hover {
font-size: 12px;
font-size: 11px;
color: rgba(255, 255, 255, 0.4);
}

2
app/partials/desktop/chat_modal.html
View File

@ -27,7 +27,7 @@
<button ng-if="!chatFull.chat.left &amp;&amp; chatFull.participants.participants.length" class="btn btn-primary chat_modal_invite_btn" ng-click="inviteToGroup()" my-i18n="group_modal_add_member"></button>
<button ng-if="chatFull.chat._ != 'chatForbidden' &amp;&amp; chatFull.chat.left" class="btn btn-primary chat_modal_main_btn" ng-click="returnToGroup()" my-i18n="group_modal_return"></button>
<button ng-if="chatFull.chat._ == 'chatForbidden'" class="btn btn-danger chat_modal_delete_btn" ng-click="flushHistory()" my-i18n="group_modal_menu_delete_chat"></button>
<button ng-if="chatFull.chat._ == 'chatForbidden' || chatFull.chat.left" class="btn btn-danger chat_modal_delete_btn" ng-click="flushHistory()" my-i18n="group_modal_menu_delete_chat"></button>
<span ng-if="chatFull.chat._ != 'chatForbidden' &amp;&amp; !chatFull.chat.left &amp;&amp; !photo.updating" class="btn btn-primary chat_modal_main_btn" >
<input my-file-upload type="file" multiple="false" class="im_attach_input" size="120" multiple="false" accept="image/x-png, image/png, image/gif, image/jpeg" />

6
app/partials/desktop/photo_modal.html
View File

@ -1,10 +1,10 @@
<div class="modal_prev_wrap" ng-show="nav.hasPrev" ng-click="nav.prev($event)">
<div class="modal_prev_wrap" ng-class="{modal_prev_active_wrap: nav.hasPrev}" ng-click="nav.prev($event)">
<div class="modal_prev"></div>
</div>
<div class="modal_next_wrap" ng-show="nav.hasNext" ng-click="nav.next($event)">
<div class="modal_next_wrap" ng-class="{modal_next_active_wrap: nav.hasNext}" ng-click="nav.next($event)">
<div class="modal_next"></div>
</div>
<div class="modal_close_wrap" ng-class="{modal_close_wrap_wnext: nav.hasNext}" ng-click="$close()">
<div class="modal_close_wrap modal_close_wrap_wnext" ng-click="$close()">
<div class="modal_close"></div>
</div>

8
app/partials/mobile/chat_modal.html
View File

@ -4,20 +4,20 @@
<div class="navbar navbar-static-top navbar-inverse">
<div class="container">
<div class="navbar-toggle-wrap dropdown" ng-if="chatFull.chat._ != 'chatForbidden' &amp;&amp; !chatFull.chat.left" dropdown>
<div class="navbar-toggle-wrap dropdown" dropdown>
<a class="dropdown-toggle navbar-toggle" dropdown-toggle>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<ul class="dropdown-menu">
<li ng-if="chatFull.thumb.location">
<li ng-if="chatFull.thumb.location" ng-if="chatFull.chat._ != 'chatForbidden' &amp;&amp; !chatFull.chat.left">
<a ng-click="deletePhoto()" my-i18n="group_modal_menu_delete_photo"></a>
</li>
<li>
<li ng-if="chatFull.chat._ != 'chatForbidden' &amp;&amp; !chatFull.chat.left">
<a ng-click="editTitle()" my-i18n="group_modal_menu_edit_group"></a>
</li>
<li>
<li ng-if="chatFull.chat._ != 'chatForbidden' &amp;&amp; !chatFull.chat.left">
<a ng-click="leaveGroup()" my-i18n="group_modal_menu_leave_group"></a>
</li>
<li>