From ab07892bfcfc8fe120a5062517bf17db50a76f8d Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Tue, 25 Mar 2014 20:33:23 +0400
Subject: [PATCH] Supported send_call_timeout

---
 app/js/controllers.js    | 2 +-
 app/js/directives.js     | 9 +++------
 app/partials/head.html   | 2 +-
 app/partials/login.html  | 6 +++---
 webogram.sublime-project | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/js/controllers.js b/app/js/controllers.js
index 0ed16438..2274e4b7 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -86,7 +86,7 @@ angular.module('myApp.controllers', [])
           $scope.credentials.phone_occupied = sentCode.phone_registered;
           $scope.error = {};
 
-          $scope.callPending.remaining = 60;
+          $scope.callPending.remaining = sentCode.send_call_timeout;
           callCheck();
 
         }, function (error) {
diff --git a/app/js/directives.js b/app/js/directives.js
index 70f17ef4..86753fa3 100644
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -1001,13 +1001,10 @@ angular.module('myApp.directives', ['myApp.filters'])
       var updateMargin = function () {
         var height = element[0].offsetHeight,
             contHeight = $($window).height(),
-            ratio = attrs.myVerticalPosition && parseFloat(attrs.myVerticalPosition) || 0.5;
+            ratio = attrs.myVerticalPosition && parseFloat(attrs.myVerticalPosition) || 0.5,
+            margin = height < contHeight ? parseInt((contHeight - height) * ratio) : '';
 
-        if (height < contHeight) {
-          element.css('marginTop', parseInt((contHeight - height) * ratio));
-        } else {
-          element.css('marginTop', '');
-        }
+        element.css({marginTop: margin, marginBottom: margin});
       };
 
       onContentLoaded(updateMargin);
diff --git a/app/partials/head.html b/app/partials/head.html
index 519473f2..668a54be 100644
--- a/app/partials/head.html
+++ b/app/partials/head.html
@@ -13,7 +13,7 @@
       </div>
 
 
-      <div class="navbar-collapsed collapse">
+      <div class="navbar-collapse collapse">
 
         <ul ng-if="offline" class="nav navbar-nav navbar-offline">
           <li ng-show="!offlineConnecting"><span class="navbar-offline-text">Waiting for network<span my-loading-dots></span></span></li>
diff --git a/app/partials/login.html b/app/partials/login.html
index b52c3b38..6743857f 100644
--- a/app/partials/login.html
+++ b/app/partials/login.html
@@ -1,7 +1,7 @@
 <div ng-include="'partials/head.html'"></div>
 
 
-<div class="login_form_wrap">
+<div class="login_form_wrap" my-vertical-position="0.4">
   <div class="error" ng-if="error.message">{{ error.message }}</div>
   <form name="mySendCodeForm" ng-if="!credentials.phone_code_hash" ng-submit="sendCode()">
     <h3 class="login_form_head">Sign in</h3>
@@ -9,7 +9,7 @@
 
     <div class="form-group" ng-class="{'has-error': error.field == 'phone'}">
       <label class="control-label" for="phone_number" ng-if="error.field == 'phone'">Incorrect phone number</label>
-      <input type="tel" class="form-control" name="phone_number" ng-model="credentials.phone_number" placeholder="Enter your phone" required>
+      <input type="tel" class="form-control" my-focused name="phone_number" ng-model="credentials.phone_number" placeholder="Enter your phone" required>
     </div>
     <button class="btn btn-success btn-block" ng-class="{disabled: progress.enabled}" ng-disabled="progress.enabled" type="submit">
       {{progress.enabled ? 'Generating keys...' : 'Next'}}
@@ -28,7 +28,7 @@
 
     <div class="form-group" ng-class="{'has-error': error.field == 'phone_code'}">
       <label class="control-label" for="phone_code" ng-if="error.field == 'phone_code'">Incorrect SMS code</label>
-      <input type="number" maxlength="5" class="form-control" name="phone_code" ng-model="credentials.phone_code" placeholder="Enter your code" required>
+      <input type="number" my-focused maxlength="5" class="form-control" name="phone_code" ng-model="credentials.phone_code" placeholder="Enter your code" required>
     </div>
 
     <button class="btn btn-success btn-block" type="submit" ng-class="{disabled: progress.enabled}" ng-disabled="progress.enabled">
diff --git a/webogram.sublime-project b/webogram.sublime-project
index 23cdfa29..b5b7952f 100644
--- a/webogram.sublime-project
+++ b/webogram.sublime-project
@@ -4,7 +4,7 @@
 		{
 			"follow_symlinks": true,
 			"path": ".",
-      "folder_exclude_patterns": ["*dist", "node_modules"],
+      "folder_exclude_patterns": ["*dist", "node_modules", "releases"],
       "file_exclude_patterns": ["*.zip"]
 		}
 	]