diff --git a/app/css/app_mobile.css b/app/css/app_mobile.css index 5f3d88a4..2a55169f9 100644 --- a/app/css/app_mobile.css +++ b/app/css/app_mobile.css @@ -1272,4 +1272,21 @@ a.mobile_modal_action .tg_checkbox_label { } +.countries_modal_search { + padding: 3px 3px 12px; + margin: 0; + position: relative; +} +.countries_modal_col { + margin: 0 -9px; + max-height: none; +} +.countries_modal_members_list { + padding: 0 12px 0 12px; +} +.countries_scrollable_wrap a.countries_modal_country { + padding: 8px 8px; +} + + } diff --git a/app/js/controllers.js b/app/js/controllers.js index 84fb9d35..a9a8274b 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -40,10 +40,18 @@ angular.module('myApp.controllers', []) $scope.callPending = {}; $scope.selectCountry = function () { + var tUrl = 'partials/country_select_modal.html', + className = 'countries_modal_window page_modal'; + + if (Config.Navigator.mobile) { + tUrl = 'partials/mobile/country_select_modal.html'; + className += ' mobile_modal'; + } + var modal = $modal.open({ - templateUrl: 'partials/country_select_modal.html', + templateUrl: tUrl, controller: 'CountrySelectModalController', - windowClass: 'countries_modal_window' + windowClass: className }); modal.result.then(function (code) { diff --git a/app/js/directives.js b/app/js/directives.js index ea44b51a..baa125ec 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -398,7 +398,10 @@ angular.module('myApp.directives', ['myApp.filters']) function updateSizes () { $(element).css({ - height: $($window).height() - (panelWrap && panelWrap.offsetHeight || 0) - (searchWrap && searchWrap.offsetHeight || 0) - 200 + height: $($window).height() + - (panelWrap && panelWrap.offsetHeight || 0) + - (searchWrap && searchWrap.offsetHeight || 0) + - (Config.Navigator.mobile ? 46 + 18 : 200) }); $(countriesWrap).nanoScroller(); } diff --git a/app/partials/mobile/country_select_modal.html b/app/partials/mobile/country_select_modal.html new file mode 100644 index 00000000..0673c841 --- /dev/null +++ b/app/partials/mobile/country_select_modal.html @@ -0,0 +1,56 @@ +
+ +
+ +
+ + + +
\ No newline at end of file