From 22271bb1f9ed7a3b59e3f364b5a0206a97c1baac Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Mon, 8 Apr 2019 11:06:44 +0200
Subject: [PATCH] [fix] Menu: enable scroll on left menu, on small screen [fix]
Settings: change input-select [fix] Home: remove padding for small screen
---
www/i18n/locale-en-GB.json | 1 +
www/i18n/locale-en.json | 1 +
www/i18n/locale-fr-FR.json | 1 +
www/js/controllers/app-controllers.js | 1 +
www/templates/home/home.html | 2 +-
www/templates/menu.html | 4 +-
www/templates/settings/settings.html | 66 +++++++++++++--------------
7 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/www/i18n/locale-en-GB.json b/www/i18n/locale-en-GB.json
index ff67cb839..cdc049335 100644
--- a/www/i18n/locale-en-GB.json
+++ b/www/i18n/locale-en-GB.json
@@ -135,6 +135,7 @@
"STORAGE_DIVIDER": "Storage",
"NETWORK_SETTINGS": "Network",
"PEER": "Duniter peer address",
+ "PEER_SHORT": "Peer address",
"PEER_CHANGED_TEMPORARY": "Address used temporarily",
"USE_LOCAL_STORAGE": "Enable local storage",
"USE_LOCAL_STORAGE_HELP": "Allows you to save your settings",
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index e677925bd..1a2572489 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -135,6 +135,7 @@
"STORAGE_DIVIDER": "Storage",
"NETWORK_SETTINGS": "Network",
"PEER": "Duniter peer address",
+ "PEER_SHORT": "Peer address",
"PEER_CHANGED_TEMPORARY": "Address used temporarily",
"USE_LOCAL_STORAGE": "Enable local storage",
"USE_LOCAL_STORAGE_HELP": "Allows you to save your settings",
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 890764df4..f1adbc219 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -135,6 +135,7 @@
"STORAGE_DIVIDER": "Stockage",
"NETWORK_SETTINGS": "Réseau",
"PEER": "Adresse du nœud Duniter",
+ "PEER_SHORT": "Adresse du nœud",
"PEER_CHANGED_TEMPORARY": "Adresse utilisée temporairement",
"USE_LOCAL_STORAGE": "Activer le stockage local",
"USE_LOCAL_STORAGE_HELP": "Permet de sauvegarder vos paramètres",
diff --git a/www/js/controllers/app-controllers.js b/www/js/controllers/app-controllers.js
index 6da62e4b0..550402062 100644
--- a/www/js/controllers/app-controllers.js
+++ b/www/js/controllers/app-controllers.js
@@ -74,6 +74,7 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
$scope.login = csWallet.isLogin();
$scope.auth = csWallet.isAuth();
$scope.motion = UIUtils.motion.default;
+ $scope.smallscreen = UIUtils.screen.isSmall();
$scope.showHome = function() {
$ionicHistory.nextViewOptions({
diff --git a/www/templates/home/home.html b/www/templates/home/home.html
index 9ee1d7940..056a6fb7a 100644
--- a/www/templates/home/home.html
+++ b/www/templates/home/home.html
@@ -4,7 +4,7 @@
</ion-nav-title>
<ion-content
- class="has-header text-center padding-xs positive-900-bg circle-bg-dark">
+ class="has-header text-center no-padding-xs positive-900-bg circle-bg-dark">
<div id="helptip-home-logo" class="logo"></div>
diff --git a/www/templates/menu.html b/www/templates/menu.html
index 87db189eb..1af15f195 100644
--- a/www/templates/menu.html
+++ b/www/templates/menu.html
@@ -84,8 +84,8 @@
</div>
</ion-header-bar>
- <ion-content scroll="false">
- <ion-list class="list">
+ <ion-content scroll="false" class="scroll-content ionic-scroll" ng-class="{'overflow-scroll': smallscreen, 'scroll-content-false': !smallscreen}">
+ <ion-list class="list" ng-class="{'scroll': smallscreen}">
<!-- Home -->
<ion-item menu-close class="item-icon-left hidden-xs" ui-sref="app.home" active-link="active">
diff --git a/www/templates/settings/settings.html b/www/templates/settings/settings.html
index 035120009..149420d03 100644
--- a/www/templates/settings/settings.html
+++ b/www/templates/settings/settings.html
@@ -27,21 +27,17 @@
<div class="row no-padding responsive-sm responsive-md responsive-lg">
<!-- first column -->
- <div class="col col-50 list item-border-large padding-left padding-right no-padding-xs">
+ <div class="col col-50 list item-border-large padding-left padding-right no-padding-xs" style="margin-bottom: 2px;">
<span class="item item-divider" translate>SETTINGS.DISPLAY_DIVIDER</span>
- <div class="item item-select">
- <div class="input-label">
- {{'COMMON.LANGUAGE' | translate}}
- </div>
- <label>
- <select ng-model="formData.locale"
- ng-change="changeLanguage(formData.locale.id)"
- ng-options="l as l.label for l in locales track by l.id">
- </select>
- </label>
- </div>
+ <label class="item item-input item-select">
+ <div class="input-label" translate>COMMON.LANGUAGE</div>
+ <select ng-model="formData.locale"
+ ng-change="changeLanguage(formData.locale.id)"
+ ng-options="l as l.label for l in locales track by l.id">
+ </select>
+ </label>
<div class="item item-toggle dark">
<div class="input-label">
@@ -115,16 +111,17 @@
</label>
</div>
- <ion-item class="item-text-wrap item-select">
- <div class="input-label hidden-xs " translate>SETTINGS.KEEP_AUTH</div>
- <div class="visible-xs" translate>SETTINGS.KEEP_AUTH_SHORT</div>
- <h4 class="gray text-wrap hidden-xs" ng-bind-html="'SETTINGS.KEEP_AUTH_HELP' | translate"></h4>
- <label>
- <select ng-model="formData.keepAuthIdle"
- ng-options="i as (keepAuthIdleLabels[i].labelKey | translate:keepAuthIdleLabels[i].labelParams ) for i in keepAuthIdles track by i">
- </select>
- </label>
- </ion-item>
+ <label class="item item-input item-select item-text-wrap">
+ <div class="input-label hidden-xs">
+ <span class="hidden-xs" translate>SETTINGS.KEEP_AUTH</span>
+ <h4 class="gray text-wrap hidden-xs" ng-bind-html="'SETTINGS.KEEP_AUTH_HELP' | translate"></h4>
+ </div>
+ <span class="visible-xs" translate>SETTINGS.KEEP_AUTH_SHORT</span>
+
+ <select ng-model="formData.keepAuthIdle"
+ ng-options="i as (keepAuthIdleLabels[i].labelKey | translate:keepAuthIdleLabels[i].labelParams ) for i in keepAuthIdles track by i">
+ </select>
+ </label>
<div class="item item-input hidden-xs hidden-sm" ng-class="{'gray': (!formData.useLocalStorage || !formData.rememberMe)}" ng-if="::$root.device.isDesktop()">
<div class="input-label">
@@ -137,7 +134,7 @@
</div>
<!-- second column -->
- <div class="col col-50 list item-border-large padding-left padding-right no-padding-xs">
+ <div class="col col-50 list item-border-large padding-left padding-right no-padding-xs no-margin-xs">
<span class="item item-divider">
{{'SETTINGS.WALLETS_SETTINGS' | translate}}
@@ -200,7 +197,8 @@
<i class="icon ion-ios-arrow-right"></i>
</div>
<ion-item class="ink item-icon-right visible-xs visible-sm" ng-click="changeNode()">
- <div class="input-label" translate>SETTINGS.PEER</div>
+ <div class="input-label hidden-xs" translate>SETTINGS.PEER</div>
+ <div class="input-label visible-xs" translate>SETTINGS.PEER_SHORT</div>
<!-- node temporary changed -->
<ng-if ng-if="formData.node.temporary">
@@ -227,18 +225,16 @@
</div>
<!-- Block validity window-->
- <ion-item class="item-text-wrap item-select">
- <div class="input-label">
- <div class="hidden-xs" translate>SETTINGS.BLOCK_VALIDITY_WINDOW</div>
- <div class="visible-xs" translate>SETTINGS.BLOCK_VALIDITY_WINDOW_SHORT</div>
+ <label class="item item-input item-select item-text-wrap">
+ <div class="input-label hidden-xs">
+ <span translate>SETTINGS.BLOCK_VALIDITY_WINDOW</span>
+ <h4 class="gray text-wrap hidden-xs" ng-bind-html="'SETTINGS.BLOCK_VALIDITY_WINDOW_HELP' | translate"></h4>
</div>
- <h4 class="gray text-wrap hidden-xs" ng-bind-html="'SETTINGS.BLOCK_VALIDITY_WINDOW_HELP' | translate"></h4>
- <label>
- <select ng-model="formData.blockValidityWindow"
- ng-options="i as (blockValidityWindowLabels[i].labelKey | translate:blockValidityWindowLabels[i].labelParams ) for i in blockValidityWindows track by i">
- </select>
- </label>
- </ion-item>
+ <div class="input-label visible-xs" translate>SETTINGS.BLOCK_VALIDITY_WINDOW_SHORT</div>
+ <select ng-model="formData.blockValidityWindow"
+ ng-options="i as (blockValidityWindowLabels[i].labelKey | translate:blockValidityWindowLabels[i].labelParams ) for i in blockValidityWindows track by i">
+ </select>
+ </label>
<!-- Allow extension here -->
<cs-extension-point name="network"></cs-extension-point>
--
GitLab