diff --git a/www/js/config.js b/www/js/config.js index 6132bdb815dc5b1ad5b90ff284498adb0bd5ffff..ec820430ce3396629610655585cb92129f99f958 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -23,6 +23,7 @@ angular.module("cesium.config", []) "decimalCount": 2, "httpsMode": false, "shareBaseUrl": "https://g1.duniter.fr", + "demo": true, "helptip": { "enable": true, "installDocUrl": { @@ -98,8 +99,8 @@ angular.module("cesium.config", []) } }, "version": "1.6.5", - "build": "2020-04-22T17:36:59.565Z", + "build": "2020-04-30T16:11:11.201Z", "newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new" }) -; \ No newline at end of file +; diff --git a/www/plugins/es/templates/join/modal_join_extend.html b/www/plugins/es/templates/join/modal_join_extend.html index c0aa9749cc76615726193914225576e6bacbc0e4..16dbe7c95b6bbbf87da9c0a055e962d8d291a10a 100644 --- a/www/plugins/es/templates/join/modal_join_extend.html +++ b/www/plugins/es/templates/join/modal_join_extend.html @@ -1,6 +1,6 @@ <ng-if ng-if=":state:enable && extensionPoint === 'select-account-type'"> - <!-- ornigzation wallet --> + <!-- organization wallet --> <div class="item item-complex card stable-bg item-icon-left item-icon-right ink" ng-class="{ activated: accountTypeMember != null && !accountTypeMember }" ng-click="selectAccountType('organization')"> diff --git a/www/templates/join/modal_choose_account_type.html b/www/templates/join/modal_choose_account_type.html index 76b439b661d9e409ffb18935197170bc8863abaa..9b3056898c6fa1f57f45bfc803a7118c3022757a 100644 --- a/www/templates/join/modal_choose_account_type.html +++ b/www/templates/join/modal_choose_account_type.html @@ -80,29 +80,33 @@ <ion-content class="has-header padding"> <p translate>ACCOUNT.NEW.SELECT_ACCOUNT_TYPE</p> <div class="list"> - <!-- member account --> - <div class="item item-complex card stable-bg item-icon-left item-icon-right ink" - ng-click="selectAccountTypeAndClose('member')"> + <!-- simple wallet --> + <button class="item item-complex card stable-bg item-icon-left item-icon-right ink" + ng-click="selectAccountTypeAndClose('wallet')"> <div class="item-content item-text-wrap"> + <i class="item-image icon dark ion-card"></i> + <h2 translate>ACCOUNT.NEW.WALLET_ACCOUNT</h2> + <h4 class="gray" translate>ACCOUNT.NEW.WALLET_ACCOUNT_HELP</h4> + <i class="icon dark ion-ios-arrow-right"></i> </div> + </button> + + <!-- member account --> + <button class="item item-complex card stable-100-bg item-icon-left item-icon-right ink" + ng-click="selectAccountTypeAndClose('member')" + ng-disabled="$root.config.demo"> + <div class="item-content item-text-wrap dark"> <i class="item-image icon dark ion-person"></i> <h2 translate>ACCOUNT.NEW.MEMBER_ACCOUNT</h2> + + <h4 ng-if="$root.config.demo" style="color: red !important;"><b class="ion-android-warning"></b> <span translate>Not available on this instance</span></h4> + <h4 class="gray" ng-bind-html="'ACCOUNT.NEW.MEMBER_ACCOUNT_HELP'|translate:currency"></h4> - <i class="icon dark ion-ios-arrow-right"></i> + <i class="icon dark ion-ios-arrow-right" ng-if="!$root.config.demo"></i> </div> - </div> + </button> <!-- Allow extension here --> <cs-extension-point name="select-account-type"></cs-extension-point> - - <!-- simple wallet --> - <div class="item item-complex card stable-bg item-icon-left item-icon-right ink" - ng-click="selectAccountTypeAndClose('wallet')"> - <div class="item-content item-text-wrap"> - <i class="item-image icon dark ion-card"></i> - <h2 translate>ACCOUNT.NEW.WALLET_ACCOUNT</h2> - <h4 class="gray" translate>ACCOUNT.NEW.WALLET_ACCOUNT_HELP</h4> - <i class="icon dark ion-ios-arrow-right"></i> </div> - </div> </div> <div class="padding hidden-xs text-right"> <button class="button button-clear button-dark ink" ng-click="closeModal()" type="button" translate>COMMON.BTN_CANCEL