diff --git a/app/css/app.css b/app/css/app.css index 619bb5f3..ff85fee2 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -642,32 +642,85 @@ a.tg_radio_on:hover i.icon-radio { /* Welcome */ - +.welcome_form { + background: #FFF; + padding: 45px 0 63px; + border-bottom: 1px solid #e9e9e9; +} .welcome_logo { - background: url(../img/logo_dogogram.png) 0 0 no-repeat; - background-size: 111px 112px; + background: url(../img/decentralization.png) 0 0 no-repeat; + background-size: 160px 160px; display: block; - width: 112px; - height: 112px; + width: 160px; + height: 160px; margin: 0 auto; } -.welcome_box_wrap { - max-width: 310px; - padding: 25px; - background: #FFF; - margin: 30px auto 0; - border-radius: 1px; - overflow: hidden; - - -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.1); +.welcome_header { + text-align: center; + font-size: 24px; + font-weight: normal; + margin: 20px 0 25px; } .welcome_text { - color: #999; text-align: center; - margin-bottom: 25px; + margin-bottom: 30px; font-size: 13px; + line-height: 16px; +} +.welcome_btn_wrap { + max-width: 206px; + margin: 0 auto; +} + +.welcome_footer { + background: #f8f8f8; + padding: 20px 0 65px; +} +.welcome_cards_wrap { + max-width: 870px; + margin: 0 auto; +} + +.welcome_footer_card_wrap { + width: 260px; + margin: 45px auto 0; + text-align: center; +} +.welcome_footer_card { + background: url(../img/WebIntro2_1x.png) 0 0 no-repeat; + background-size: 217px 178px; + width: 219px; + height: 180px; + border: 1px solid #e0e4e9; + margin: 0 auto 24px; +} + +.welcome_footer_card_messaging { + background-image: url(../img/WebIntro1.png); +} +.is_1x .welcome_footer_card_messaging { + background-image: url(../img/WebIntro1_1x.png); +} + +.welcome_footer_card_filesharing { + background-image: url(../img/WebIntro2.png); +} +.is_1x .welcome_footer_card_filesharing { + background-image: url(../img/WebIntro2_1x.png); +} + +.welcome_footer_card_powerful { + background-image: url(../img/WebIntro3.png); +} +.is_1x .welcome_footer_card_powerful { + background-image: url(../img/WebIntro3_1x.png); +} + +.welcome_footer_card_wrap h4 { + font-size: 16px; +} +.welcome_footer_card_wrap .welcome_footer_card_lead { + } @@ -2345,6 +2398,11 @@ img.chat_modal_participant_photo { padding: 15px 10px 0; text-align: center; } +.confirm_peer { + font-weight: bold; + padding: 15px 10px 0; + text-align: center; +} diff --git a/app/img/WebIntro1.png b/app/img/WebIntro1.png new file mode 100644 index 00000000..e6e1ef3c Binary files /dev/null and b/app/img/WebIntro1.png differ diff --git a/app/img/WebIntro1_1x.png b/app/img/WebIntro1_1x.png new file mode 100644 index 00000000..683a5872 Binary files /dev/null and b/app/img/WebIntro1_1x.png differ diff --git a/app/img/WebIntro2.png b/app/img/WebIntro2.png new file mode 100644 index 00000000..1a5019ec Binary files /dev/null and b/app/img/WebIntro2.png differ diff --git a/app/img/WebIntro2_1x.png b/app/img/WebIntro2_1x.png new file mode 100644 index 00000000..0d4cb190 Binary files /dev/null and b/app/img/WebIntro2_1x.png differ diff --git a/app/img/WebIntro3.png b/app/img/WebIntro3.png new file mode 100644 index 00000000..3e3f5991 Binary files /dev/null and b/app/img/WebIntro3.png differ diff --git a/app/img/WebIntro3_1x.png b/app/img/WebIntro3_1x.png new file mode 100644 index 00000000..ed904875 Binary files /dev/null and b/app/img/WebIntro3_1x.png differ diff --git a/app/img/decentralization.png b/app/img/decentralization.png new file mode 100644 index 00000000..32ba9b41 Binary files /dev/null and b/app/img/decentralization.png differ diff --git a/app/js/controllers.js b/app/js/controllers.js index 7d603f44..94da5082 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -679,7 +679,7 @@ angular.module('myApp.controllers', []) selectedMessageIDs.push(messageID); }); - PeersSelectService.selectPeer().then(function (peerString) { + PeersSelectService.selectPeer({confirm_type: 'FORWARD_PEER'}).then(function (peerString) { var peerID = AppPeersManager.getPeerID(peerString); AppMessagesManager.forwardMessages(peerID, selectedMessageIDs).then(function () { selectedCancel(); @@ -1009,7 +1009,7 @@ angular.module('myApp.controllers', []) $scope.forward = function () { var messageID = $scope.messageID; - PeersSelectService.selectPeer().then(function (peerString) { + PeersSelectService.selectPeer({confirm_type: 'PHOTO_SHARE_PEER'}).then(function (peerString) { var peerID = AppPeersManager.getPeerID(peerString); AppMessagesManager.forwardMessages(peerID, [messageID]).then(function () { $rootScope.$broadcast('history_focus', {peerString: peerString}); @@ -1058,7 +1058,7 @@ angular.module('myApp.controllers', []) $scope.forward = function () { var messageID = $scope.messageID; - PeersSelectService.selectPeer().then(function (peerString) { + PeersSelectService.selectPeer({confirm_type: 'VIDEO_SHARE_PEER'}).then(function (peerString) { var peerID = AppPeersManager.getPeerID(peerString); AppMessagesManager.forwardMessages(peerID, [messageID]).then(function () { $rootScope.$broadcast('history_focus', {peerString: peerString}); @@ -1149,7 +1149,7 @@ angular.module('myApp.controllers', []) }; $scope.shareContact = function () { - PeersSelectService.selectPeer().then(function (peerString) { + PeersSelectService.selectPeer({confirm_type: 'SHARE_CONTACT_PEER'}).then(function (peerString) { var peerID = AppPeersManager.getPeerID(peerString); AppMessagesManager.sendOther(peerID, { @@ -1576,12 +1576,25 @@ angular.module('myApp.controllers', []) }) - .controller('PeerSelectController', function ($scope, $modalInstance) { + .controller('PeerSelectController', function ($scope, $modalInstance, $q, AppPeersManager, ErrorService) { $scope.dialogSelect = function (peerString) { - $modalInstance.close(peerString); + var promise; + if ($scope.confirm_type) { + var peerID = AppPeersManager.getPeerID(peerString), + peerData = AppPeersManager.getPeer(peerID); + promise = ErrorService.confirm({ + type: $scope.confirm_type, + peer_id: peerID, + peer_data: peerData + }); + } else { + promise = $q.when(); + } + promise.then(function () { + $modalInstance.close(peerString); + }); }; - }) .controller('ChatCreateModalController', function ($scope, $modalInstance, $rootScope, MtpApiManager, AppUsersManager, AppChatsManager, ApiUpdatesManager) { diff --git a/app/js/services.js b/app/js/services.js index f843e52f..46934ac1 100644 --- a/app/js/services.js +++ b/app/js/services.js @@ -3270,9 +3270,11 @@ angular.module('myApp.services', []) .service('PeersSelectService', function ($rootScope, $modal) { - function selectPeer () { + function selectPeer (options) { var scope = $rootScope.$new(); - // angular.extend(scope, params); + if (options) { + angular.extend(scope, options); + } return $modal.open({ templateUrl: 'partials/peer_select.html', diff --git a/app/partials/confirm_modal.html b/app/partials/confirm_modal.html index 0f41e6c6..ed0588f4 100644 --- a/app/partials/confirm_modal.html +++ b/app/partials/confirm_modal.html @@ -20,6 +20,22 @@ Is this phone number correct?
+ Are you sure to forward message(s) to + user
+ group
+
+ Are you sure to forward photo to + user
+ group
+
+ Are you sure to forward video to + user
+ group
+
+ Are you sure to send contact to + user
+ group
+
@@ -35,7 +51,10 @@ Send Send Delete - Yes + Forward message + Forward photo + Forward video + Send contact OK diff --git a/app/partials/head.html b/app/partials/head.html index 124961e5..643ea79b 100644 --- a/app/partials/head.html +++ b/app/partials/head.html @@ -25,6 +25,7 @@
  • Contacts
  • Settings
  • Log Out
  • +
  • About
  • diff --git a/app/partials/login.html b/app/partials/login.html index 22bfe421..8571f9f8 100644 --- a/app/partials/login.html +++ b/app/partials/login.html @@ -24,7 +24,7 @@
    -

    {{ credentials.phone_number | phoneNumber }} (edit)

    +

    (edit)

    We have sent you a code via SMS.
    Please enter it below.

    diff --git a/app/partials/welcome.html b/app/partials/welcome.html index 0ae275cf..7f1c3bdc 100644 --- a/app/partials/welcome.html +++ b/app/partials/welcome.html @@ -3,17 +3,55 @@

    -
    +
    -
    -
    -

    Welcome to an unofficial web-client of mobile Telegram messenger.

    -

    It is an alpha, which means it is still not 200% secure and functional.

    -

    Visit telegram.org to learn more.

    +

    Telegram Web

    + +
    +

    Welcome to an unofficial web-prototype of Telegram.

    +

    It is an alpha, so it still may not be 200% reliable.

    +
    + +
    + + + +