diff --git a/app/css/app.css b/app/css/app.css index 9ca0d4b0..8f69c1c2 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -2129,7 +2129,7 @@ div.im_panel_own_photo { margin-top: -7px; margin-left: 43px; } -.status_online { +.icon-online { background: #6DBF69; border: 1px solid #FFF; display: block; diff --git a/app/css/app_mobile.css b/app/css/app_mobile.css index 85ca2f50..bb87412c 100644 --- a/app/css/app_mobile.css +++ b/app/css/app_mobile.css @@ -181,14 +181,21 @@ html { .navbar-quick-media-back h4 { margin: 9px 0 12px 0; } +.navbar-quick-profile-back h4, +.navbar-quick-group-back h4 { + font-weight: bold; +} .navbar-quick-profile-back small, .navbar-quick-group-back small { - font-size: 12px; - color: #FFF; + font-size: 13px; white-space: nowrap; overflow: hidden; margin-left: 0; } +.navbar-quick-profile-back .status_online, +.navbar-quick-group-back .status_online { + color: #FFF; +} .navbar-menu { display: none; @@ -499,7 +506,7 @@ a.im_message_video_thumb { padding: 0 8px; } .im_content_message_wrap { - font-size: 1.2em; + font-size: 15px; float: left; position: relative; max-width: 80%; @@ -795,6 +802,7 @@ a.im_message_from_photo { border-radius: 0 !important; padding-right: 11px; } + .im_dialog_wrap:last-child a.im_dialog { border-bottom: 0; } @@ -807,20 +815,20 @@ a.im_message_from_photo { .im_dialog_peer, .im_dialog_message { - font-size: 1.2em; + font-size: 1.3em; } .im_dialog_peer { margin-bottom: 7px; margin-top: 5px; } .im_dialog_meta { - margin-top: 5px; + margin-top: 6px; } .im_dialog_date, a.im_dialog:hover .im_dialog_date, a.im_dialog_selected .im_dialog_date { color: #b3b3b3; - font-size: 13px; + font-size: 12px; margin-right: 3px; } .im_dialog_badge { @@ -837,7 +845,9 @@ a.im_dialog:hover .im_dialog_unread, a.im_dialog_selected .im_dialog_unread { background: #7cacc7; } -.im_dialog_message_text { +.im_dialog_message_text, +a.im_dialog:hover .im_dialog_message_text, +a.im_dialog_selected .im_dialog_message_text { color: #8f8f8f; } @@ -1011,7 +1021,7 @@ a.im_message_fwd_author { vertical-align: text-top; background: url(../img/icons/IconsetW.png) -12px -68px no-repeat; background-size: 42px 891px; - opacity: 1; + opacity: 0.8; } .is_1x .icon-camera { background-image: url(../img/icons/IconsetW_1x.png); @@ -1071,11 +1081,14 @@ a.im_message_fwd_author { min-height: 32px; max-height: 150px; margin-bottom: 0; + font-size: 15px; } .emoji-wysiwyg-editor:empty { background: #f1f1f1; border-color: #f1f1f1; - content: attr(placeholder); +} +.emoji-wysiwyg-editor:empty:before { + color: #999; } .emoji-wysiwyg-editor:active, .emoji-wysiwyg-editor:focus { diff --git a/app/img/iphone_home120.png b/app/img/iphone_home120.png new file mode 100644 index 00000000..50ab80d6 Binary files /dev/null and b/app/img/iphone_home120.png differ diff --git a/app/img/iphone_startup.png b/app/img/iphone_startup.png new file mode 100644 index 00000000..0aa1abf0 Binary files /dev/null and b/app/img/iphone_startup.png differ diff --git a/app/index.html b/app/index.html index 91d41db2..503713d9 100644 --- a/app/index.html +++ b/app/index.html @@ -2,7 +2,7 @@ - + Webogram @@ -15,15 +15,16 @@ - - - + + + - + + diff --git a/app/js/directives.js b/app/js/directives.js index 6196c647..563b1c61 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -1584,7 +1584,7 @@ angular.module('myApp.directives', ['myApp.filters']) } }) - .directive('myUserStatus', function ($filter, AppUsersManager) { + .directive('myUserStatus', function ($filter, $rootScope, AppUsersManager) { var statusFilter = $filter('userStatus'); @@ -1593,10 +1593,24 @@ angular.module('myApp.directives', ['myApp.filters']) }; function link($scope, element, attrs) { - var userID = $scope.$eval(attrs.myUserStatus), - user = AppUsersManager.getUser(userID); + var userID, + update = function () { + var user = AppUsersManager.getUser(userID); + element + .html(statusFilter(user)) + .toggleClass('status_online', user.status && user.status._ == 'userStatusOnline'); + }; - element.html(statusFilter(user)); + $scope.$watch(attrs.myUserStatus, function (newUserID) { + console.log(attrs.myUserStatus, newUserID); + userID = newUserID; + update(); + }); + $rootScope.$on('user_update', function (e, updUserID) { + if (userID == updUserID) { + update(); + } + }); } }) @@ -1608,7 +1622,7 @@ angular.module('myApp.directives', ['myApp.filters']) scope: { userID: '=myUserPhotolink' }, - template: '' + template: '' }; function link($scope, element, attrs) { @@ -1618,9 +1632,11 @@ angular.module('myApp.directives', ['myApp.filters']) $scope.user = AppUsersManager.getUser($scope.userID); } - element.on('click', function (e) { - $rootScope.openUser($scope.userID); - }); + if (element[0].tagName == 'A') { + element.on('click', function (e) { + $rootScope.openUser($scope.userID); + }); + } if (attrs.imgClass) { $(element[0].firstChild).addClass(attrs.imgClass) diff --git a/app/partials/chat_modal.html b/app/partials/chat_modal.html index 90d456ce..b6cc69e4 100644 --- a/app/partials/chat_modal.html +++ b/app/partials/chat_modal.html @@ -88,7 +88,7 @@
-
+
diff --git a/app/partials/contacts_modal.html b/app/partials/contacts_modal.html index 54232890..1c9eb1e3 100644 --- a/app/partials/contacts_modal.html +++ b/app/partials/contacts_modal.html @@ -44,17 +44,9 @@ -
- - -
- +
-
+
diff --git a/app/partials/head.html b/app/partials/head.html index 70c4d900..2ccee573 100644 --- a/app/partials/head.html +++ b/app/partials/head.html @@ -75,10 +75,10 @@

- + typing - +
@@ -92,13 +92,13 @@ - + is typing - + , - + +{{historyState.typing.length - 1}} diff --git a/app/partials/im.html b/app/partials/im.html index 3443cd0e..8bab53ab 100644 --- a/app/partials/im.html +++ b/app/partials/im.html @@ -69,7 +69,7 @@
- +
@@ -132,7 +132,7 @@

- +
diff --git a/app/partials/peer_select.html b/app/partials/peer_select.html index 51da0b07..7402fdd7 100644 --- a/app/partials/peer_select.html +++ b/app/partials/peer_select.html @@ -36,7 +36,7 @@
- +
diff --git a/app/partials/settings_modal.html b/app/partials/settings_modal.html index 1b6a7eb4..818784a7 100644 --- a/app/partials/settings_modal.html +++ b/app/partials/settings_modal.html @@ -17,7 +17,7 @@

-

+

diff --git a/app/partials/user_modal.html b/app/partials/user_modal.html index 9c082930..45d06acc 100644 --- a/app/partials/user_modal.html +++ b/app/partials/user_modal.html @@ -16,7 +16,7 @@

-

+

diff --git a/app/webogram.appcache b/app/webogram.appcache index f623d043..0b7c5e7e 100644 --- a/app/webogram.appcache +++ b/app/webogram.appcache @@ -1,6 +1,6 @@ CACHE MANIFEST -# 26 +# 28 NETWORK: *