From 3a33810dc3b59fd21838f871982c15c46ac612f0 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Tue, 14 Jun 2016 08:49:52 +0200
Subject: [PATCH] - Fix browser title to "Cesium" - fix #53 - Fix playstore
deployment error
---
hooks/after_build/090_deploy_to_playstore.js | 4 +-
www/i18n/locale-en.json | 1 +
www/i18n/locale-fr-FR.json | 1 +
www/index.html | 2 +-
www/templates/currency/charts/ud.html | 18 +-
www/templates/currency/lookup.html | 7 -
www/templates/currency/lookup_form.html | 22 --
www/templates/currency/view_currency.html | 9 +-
www/templates/currency/view_currency_lg.html | 8 +-
www/templates/currency/view_peer.html | 8 +-
www/templates/market/edit_record.html | 8 +-
www/templates/market/lookup.html | 266 ++++++++++---------
www/templates/market/view_record.html | 132 ++++-----
www/templates/registry/edit_record.html | 50 ++--
www/templates/registry/view_record.html | 122 +++++----
www/templates/settings/settings.html | 137 +++++-----
www/templates/wallet/new_transfer.html | 9 +-
www/templates/wallet/view_wallet.html | 4 +-
www/templates/wot/lookup.html | 6 +-
19 files changed, 417 insertions(+), 397 deletions(-)
delete mode 100644 www/templates/currency/lookup.html
delete mode 100644 www/templates/currency/lookup_form.html
diff --git a/hooks/after_build/090_deploy_to_playstore.js b/hooks/after_build/090_deploy_to_playstore.js
index ff766da6..8d9344d6 100755
--- a/hooks/after_build/090_deploy_to_playstore.js
+++ b/hooks/after_build/090_deploy_to_playstore.js
@@ -9,7 +9,7 @@ var rootdir = process.argv[2];
var argv = require('yargs').argv;
var skip = true;
-if (cmd.indexOf("--release") > -1 || cmd.indexOf("--useref") > -1) {
+if (/*cmd.indexOf("--release") > -1 || */cmd.indexOf("--playstore") > -1) {
skip = false;
}
@@ -30,7 +30,7 @@ if (rootdir && !skip) {
console.log('Publishing APK file [' + apkFileLocation + '] to playstore...');
- var config = JSON.parse(fs.readFileSync('../playstore-config.json', 'utf8'));
+ var config = require('../playstore-config.json');
if(!config) {
gutil.log(gutil.colors.red("ERROR => Could not load `hooks/playstore-config.json` file!"));
diff --git a/www/i18n/locale-en.json b/www/i18n/locale-en.json
index 01c7dc53..64028433 100644
--- a/www/i18n/locale-en.json
+++ b/www/i18n/locale-en.json
@@ -100,6 +100,7 @@
}
},
"PEER": {
+ "TITLE": "Peer",
"PEERS": "Peers",
"KNOWN_PEERS": "Known peers",
"SIGNED_ON_BLOCK": "Signed on block"
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index c0869ae0..b5bc0e99 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -100,6 +100,7 @@
}
},
"PEER": {
+ "TITLE": "Noeud",
"PEERS": "Noeuds",
"KNOWN_PEERS": "Noeuds connus",
"SIGNED_ON_BLOCK": "Signé sur le bloc"
diff --git a/www/index.html b/www/index.html
index d3a7ee04..a09182e7 100644
--- a/www/index.html
+++ b/www/index.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
- <title></title>
+ <title>Cesium</title>
<!-- build:css dist_css/cesium.css -->
<link href="css/ionic.app.css" rel="stylesheet">
diff --git a/www/templates/currency/charts/ud.html b/www/templates/currency/charts/ud.html
index 8a3273ab..90ce67e3 100644
--- a/www/templates/currency/charts/ud.html
+++ b/www/templates/currency/charts/ud.html
@@ -1,13 +1,13 @@
-<ion-view view-title="UD" left-buttons="leftButtons" class="pane">
- <ion-nav-buttons side="secondary">
- <button class="button button-icon button-clear icon ion-loop" ng-click="refresh()">
- </button>
- </ion-nav-buttons>
+<ion-view left-buttons="leftButtons" class="pane">
+ <ion-nav-title>
+
+ </ion-nav-title>
+
+ <ion-nav-buttons side="secondary">
+ <button class="button button-icon button-clear icon ion-loop" ng-click="refresh()">
+ </button>
+ </ion-nav-buttons>
<ion-content class="has-header">
- <div class="scroll">
- <!-- TODO -->
- </div>
- <div class="scroll-bar scroll-bar-v"></div>
</ion-content>
</ion-view>
diff --git a/www/templates/currency/lookup.html b/www/templates/currency/lookup.html
deleted file mode 100644
index 3424c1aa..00000000
--- a/www/templates/currency/lookup.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<ion-view view-title="{{'CURRENCY.SELECT.TITLE' | translate}}">
- <ion-content class="padding no-padding-xs">
- <h4 class="content double-padding-x" translate>CURRENCY.SELECT.CURRENCIES</h4>
-
- <ng-include src="'templates/currency/lookup_form.html'"/>
- </ion-content>
-</ion-view>
diff --git a/www/templates/currency/lookup_form.html b/www/templates/currency/lookup_form.html
deleted file mode 100644
index e59e6e04..00000000
--- a/www/templates/currency/lookup_form.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-<ion-list>
-
- <div class="item center" ng-if="search.looking">
- <ion-spinner icon="android"></ion-spinner>
- </div>
-
- <div ng-repeat="currency in knownCurrencies"
- ng-class="{ selected: selectedCurrency == currency }">
- <a class="item hidden-xs hidden-sm ink" ng-click="selectCurrency(currency.name, true)"
- ng-class="{ selected: selectedCurrency == currency }">
- <h3>{{currency.name}}</h3>
- <h4 class="gray">{{currency.peer}}</h4>
- </a>
- <a class="item item-text-wrap visible-xs visible-sm ink" ng-click="selectCurrency(currency.name, false)"
- ng-class="{ selected: selectedCurrency == currency }">
- <h3>{{::currency.name}}</h3>
- <h4 class="gray">{{::currency.peer}}</h4>
- </a>
- </div>
-</ion-list>
diff --git a/www/templates/currency/view_currency.html b/www/templates/currency/view_currency.html
index 6a395c61..c0bae04c 100644
--- a/www/templates/currency/view_currency.html
+++ b/www/templates/currency/view_currency.html
@@ -1,4 +1,11 @@
-<ion-view view-title="{{id}}" left-buttons="leftButtons" class="pane">
+<ion-view
+ left-buttons="leftButtons" class="pane"
+ cache-view="false"
+ >
+ <ion-nav-title>
+ {{id}}
+ </ion-nav-title>
+
<ion-nav-buttons side="secondary">
<button class="button button-icon button-clear icon ion-loop" ng-click="refresh()">
</button>
diff --git a/www/templates/currency/view_currency_lg.html b/www/templates/currency/view_currency_lg.html
index a6e8f35e..f85eb6aa 100644
--- a/www/templates/currency/view_currency_lg.html
+++ b/www/templates/currency/view_currency_lg.html
@@ -1,4 +1,10 @@
-<ion-view view-title="{{'CURRENCY.VIEW.TITLE' | translate}} {{id}}" left-buttons="leftButtons" class="pane">
+<ion-view left-buttons="leftButtons"
+ cache-view="false"
+ class="pane">
+ <ion-nav-title>
+ {{'CURRENCY.VIEW.TITLE' | translate}} {{id}}
+ </ion-nav-title>
+
<ion-nav-buttons side="secondary">
<button class="button button-icon button-clear icon ion-loop" ng-click="refresh()">
</button>
diff --git a/www/templates/currency/view_peer.html b/www/templates/currency/view_peer.html
index 23951f3b..ac190dbf 100644
--- a/www/templates/currency/view_peer.html
+++ b/www/templates/currency/view_peer.html
@@ -1,5 +1,9 @@
-<ion-view view-title="Peer">
- <ion-content class="has-header padding">
+<ion-view>
+ <ion-nav-title>
+ <span translate>PEER.TITLE</span>
+ </ion-nav-title>
+
+ <ion-content class="has-header padding">
<div class="list">
<div class="item item-divider">
diff --git a/www/templates/market/edit_record.html b/www/templates/market/edit_record.html
index f2dfba46..0b183b3a 100644
--- a/www/templates/market/edit_record.html
+++ b/www/templates/market/edit_record.html
@@ -1,5 +1,9 @@
-<ion-view view-title="{{'MARKET.EDIT.TITLE'|translate}}" left-buttons="leftButtons">
- <ion-nav-buttons side="secondary">
+<ion-view left-buttons="leftButtons">
+ <ion-nav-title>
+ <span translate>MARKET.EDIT.TITLE</span>
+ </ion-nav-title>
+
+ <ion-nav-buttons side="secondary">
<button class="button button-clear button-icon icon visible-xs visible-sm"
ng-class="{'ion-android-send':!id, 'ion-android-done': id}"
ng-click="save()">
diff --git a/www/templates/market/lookup.html b/www/templates/market/lookup.html
index 68879572..1225bfca 100644
--- a/www/templates/market/lookup.html
+++ b/www/templates/market/lookup.html
@@ -1,147 +1,151 @@
-<ion-view view-title="{{'MARKET.SEARCH.TITLE'|translate}}" left-buttons="leftButtons">
- <ion-nav-buttons side="secondary">
- <button class="button button-icon button-clear visible-xs"
- ui-sref="app.market_add_record">
- <i class="icon ion-plus"></i>
- </button>
- </ion-nav-buttons>
-
- <ion-content class="lookupForm padding no-padding-xs">
-
-
- <form ng-submit="doSearch()">
- <label class="item item-input">
- <i class="icon ion-search placeholder-icon"></i>
- <input type="text" placeholder="{{'MARKET.SEARCH.SEARCH_HELP'|translate}}"
- ng-model="search.text"
- ng-model-options="{ debounce: 350 }"
- ng-change="doSearch()" id="searchText">
- </label>
-
- <div class="item item-toggle dark" ng-if="!search.lastRecords">
- <span translate>MARKET.SEARCH.BTN_OPTIONS</span>
- <label class="toggle toggle-royal">
- <input type="checkbox" ng-model="search.options">
- <div class="track">
- <div class="handle"></div>
- </div>
- </label>
- </div>
+<ion-view left-buttons="leftButtons">
+ <ion-nav-title>
+ <span translate>MARKET.SEARCH.TITLE</span>
+ </ion-nav-title>
- <span class="item item-button-right" ng-click="openCategoryModal()" ng-if="search.options">
- <span translate>MARKET.COMMON.CATEGORY</span>
- <span class="badge badge-royal">{{search.category.name}}</span>
- <i class="button button-clear ion-chevron-right"></i>
- </span>
-
- <span class="item item-button-right" ng-if="search.options && location.enable">
- <span translate>MARKET.SEARCH.BTN_AROUND_ME</span>
- <label class="toggle toggle-royal">
- <input type="checkbox" ng-model="search.localize">
- <div class="track">
- <div class="handle"></div>
- </div>
- </label>
- </span>
-
- <span class="item item-button-right" ng-if="search.options && !location.enable">
- <span translate>MARKET.SEARCH.LOCATION</span>
- <div class="item-input-inset">
- <label class="item-input-wrapper">
- <input type="text" placeholder="{{'MARKET.SEARCH.LOCATION_HELP'|translate}}"
- ng-model="search.location"
- ng-model-options="{ debounce: 350 }"
- ng-change="doSearch()"/>
- </label>
- </div>
- </span>
- </form>
-
- <div class="row no-padding">
- <div class="col">
- <h4
- ng-if="!search.looking && search.lastRecords && search.results.length > 0" translate>
- MARKET.SEARCH.LAST_RECORDS
- </h4>
- <h4
- ng-if="!search.looking && !search.lastRecords && search.results.length > 0" translate>
- MARKET.SEARCH.RESULTS
- </h4>
- </div>
+ <ion-nav-buttons side="secondary">
+ <button class="button button-icon button-clear visible-xs"
+ ui-sref="app.market_add_record">
+ <i class="icon ion-plus"></i>
+ </button>
+ </ion-nav-buttons>
- <div class="col col-25 hidden-xs hidden-sm padding" style="text-align:right">
- <button class="button button-raised button-full button-calm ink"
- ui-sref="app.market_add_record">
- {{'MARKET.COMMON.BTN_NEW_AD' | translate}}
- </button>
- </div>
- </div>
+ <ion-content class="lookupForm padding no-padding-xs">
- <label class="center" ng-if="search.looking">
- <ion-spinner icon="android"></ion-spinner>
- </label>
- <label class="center assertive animate-fade-slide-in-right" ng-if="!search.looking && search.results.length===0 && search.options != null" translate>
- COMMON.SEARCH_NO_RESULT
+ <form ng-submit="doSearch()">
+ <label class="item item-input">
+ <i class="icon ion-search placeholder-icon"></i>
+ <input type="text" placeholder="{{'MARKET.SEARCH.SEARCH_HELP'|translate}}"
+ ng-model="search.text"
+ ng-model-options="{ debounce: 350 }"
+ ng-change="doSearch()" id="searchText">
</label>
- <div class="list animate-fade-slide-in-right"
- ng-if="!search.looking && search.results && search.results.length > 0">
+ <div class="item item-toggle dark" ng-if="!search.lastRecords">
+ <span translate>MARKET.SEARCH.BTN_OPTIONS</span>
+ <label class="toggle toggle-royal">
+ <input type="checkbox" ng-model="search.options">
+ <div class="track">
+ <div class="handle"></div>
+ </div>
+ </label>
+ </div>
- <a ng-repeat="found in search.results"
- class="item item-record ink padding-xs"
- ui-sref="app.market_view_record({id: found.id, title: found.title})"
- >
+ <span class="item item-button-right" ng-click="openCategoryModal()" ng-if="search.options">
+ <span translate>MARKET.COMMON.CATEGORY</span>
+ <span class="badge badge-royal">{{search.category.name}}</span>
+ <i class="button button-clear ion-chevron-right"></i>
+ </span>
+
+ <span class="item item-button-right" ng-if="search.options && location.enable">
+ <span translate>MARKET.SEARCH.BTN_AROUND_ME</span>
+ <label class="toggle toggle-royal">
+ <input type="checkbox" ng-model="search.localize">
+ <div class="track">
+ <div class="handle"></div>
+ </div>
+ </label>
+ </span>
+
+ <span class="item item-button-right" ng-if="search.options && !location.enable">
+ <span translate>MARKET.SEARCH.LOCATION</span>
+ <div class="item-input-inset">
+ <label class="item-input-wrapper">
+ <input type="text" placeholder="{{'MARKET.SEARCH.LOCATION_HELP'|translate}}"
+ ng-model="search.location"
+ ng-model-options="{ debounce: 350 }"
+ ng-change="doSearch()"/>
+ </label>
+ </div>
+ </span>
+ </form>
+
+ <div class="row no-padding">
+ <div class="col">
+ <h4
+ ng-if="!search.looking && search.lastRecords && search.results.length > 0" translate>
+ MARKET.SEARCH.LAST_RECORDS
+ </h4>
+ <h4
+ ng-if="!search.looking && !search.lastRecords && search.results.length > 0" translate>
+ MARKET.SEARCH.RESULTS
+ </h4>
+ </div>
- <div class="visible-xs item-text-wrap" ng-class="{'item-thumbnail-left': (found.pictures && found.pictures.length > 0)}">
- <img ng-src="{{found.pictures[0].src}}" ng-if="found.pictures && found.pictures.length > 0"></img>
+ <div class="col col-25 hidden-xs hidden-sm padding" style="text-align:right">
+ <button class="button button-raised button-full button-calm ink"
+ ui-sref="app.market_add_record">
+ {{'MARKET.COMMON.BTN_NEW_AD' | translate}}
+ </button>
+ </div>
+ </div>
+
+ <label class="center" ng-if="search.looking">
+ <ion-spinner icon="android"></ion-spinner>
+ </label>
+
+ <label class="center assertive animate-fade-slide-in-right" ng-if="!search.looking && search.results.length===0 && search.options != null" translate>
+ COMMON.SEARCH_NO_RESULT
+ </label>
+
+ <div class="list animate-fade-slide-in-right"
+ ng-if="!search.looking && search.results && search.results.length > 0">
+
+ <a ng-repeat="found in search.results"
+ class="item item-record ink padding-xs"
+ ui-sref="app.market_view_record({id: found.id, title: found.title})"
+ >
+
+ <div class="visible-xs item-text-wrap" ng-class="{'item-thumbnail-left': (found.pictures && found.pictures.length > 0)}">
+ <img ng-src="{{found.pictures[0].src}}" ng-if="found.pictures && found.pictures.length > 0"></img>
+ <h2 ng-bind-html="found.title"></h2>
+ <h4 class="gray">
+ <span ng-if="found.location">
+ <i class="icon ion-location"></i>
+ <span ng-bind-html="found.location"></span>
+ </span>
+ <span ng-show="found.time">
+ <span ng-show="found.location">|</span>
+ {{::found.time | formatFromNow}}
+ </span>
+ </h4>
+ </div>
+ <!--<div class="visible-xs item-text-wrap">
+ <p ng-bind-html="found.description"></p>
+ </div>-->
+
+ <div class="row row-record hidden-xs">
+ <div class="col item-text-wrap item-thumbnail-left-padding"
+ ng-class="{'item-thumbnail-left': (found.pictures && found.pictures.length > 0)}">
+ <img ng-src="{{found.pictures[0].src}}"
+ ng-if="found.pictures && found.pictures.length > 0">
<h2 ng-bind-html="found.title"></h2>
<h4 class="gray">
- <span ng-if="found.location">
- <i class="icon ion-location"></i>
- <span ng-bind-html="found.location"></span>
- </span>
- <span ng-show="found.time">
- <span ng-show="found.location">|</span>
- {{::found.time | formatFromNow}}
- </span>
+ <i class="icon ion-location" ng-if="found.location"></i>
+ <span ng-bind-html="found.location"></span>
+ </h4>
+ <h4 class="gray" ng-if="found.time">
+ <i class="icon ion-clock" ></i>
+ {{::found.time | formatFromNow}}
</h4>
+ <span ng-if="found.pictures && found.pictures.length > 1"
+ class="badge badge-balanced badge-picture-count">{{::found.pictures.length}} <i class="icon ion-camera"></i></span>
</div>
- <!--<div class="visible-xs item-text-wrap">
- <p ng-bind-html="found.description"></p>
- </div>-->
-
- <div class="row row-record hidden-xs">
- <div class="col item-text-wrap item-thumbnail-left-padding"
- ng-class="{'item-thumbnail-left': (found.pictures && found.pictures.length > 0)}">
- <img ng-src="{{found.pictures[0].src}}"
- ng-if="found.pictures && found.pictures.length > 0">
- <h2 ng-bind-html="found.title"></h2>
- <h4 class="gray">
- <i class="icon ion-location" ng-if="found.location"></i>
- <span ng-bind-html="found.location"></span>
- </h4>
- <h4 class="gray" ng-if="found.time">
- <i class="icon ion-clock" ></i>
- {{::found.time | formatFromNow}}
- </h4>
- <span ng-if="found.pictures && found.pictures.length > 1"
- class="badge badge-balanced badge-picture-count">{{::found.pictures.length}} <i class="icon ion-camera"></i></span>
- </div>
- <div class="col col-20">
- <h3 class="gray" ng-if="found.category">{{::found.category.name|formatCategory}}</h3>
- <h2 class="badge badge-price badge-calm" ng-bind-html="found.price" ng-if="found.price"></h2>
- </div>
- <div class="col">
- <h3 class="gray text-wrap" ng-bind-html="found.description" ng-if="found.description"></h3>
- </div>
+ <div class="col col-20">
+ <h3 class="gray" ng-if="found.category">{{::found.category.name|formatCategory}}</h3>
+ <h2 class="badge badge-price badge-calm" ng-bind-html="found.price" ng-if="found.price"></h2>
</div>
- </a>
+ <div class="col">
+ <h3 class="gray text-wrap" ng-bind-html="found.description" ng-if="found.description"></h3>
+ </div>
+ </div>
+ </a>
- </div>
- </ion-content>
+ </div>
+ </ion-content>
- <button class="button button-fab button-fab-bottom-right button-assertive icon ion-plus hidden-md hidden-lg"
- ui-sref="app.market_add_record">
- </button>
+ <button class="button button-fab button-fab-bottom-right button-assertive icon ion-plus hidden-md hidden-lg"
+ ui-sref="app.market_add_record">
+ </button>
</ion-view>
diff --git a/www/templates/market/view_record.html b/www/templates/market/view_record.html
index 9eb78835..05392303 100644
--- a/www/templates/market/view_record.html
+++ b/www/templates/market/view_record.html
@@ -1,85 +1,89 @@
-<ion-view left-buttons="leftButtons" view-title="{{'MARKET.VIEW.TITLE'|translate}}">
- <ion-nav-buttons side="secondary">
- <button class="button button-positive button-clear button-icon ion-android-create" ng-click="edit()" ng-if="canEdit">
- </button>
- </ion-nav-buttons>
+<ion-view left-buttons="leftButtons">
+ <ion-nav-title>
+ <span translate>MARKET.VIEW.TITLE</span>
+ </ion-nav-title>
- <ion-content class="viewRecord item-text-wrap">
+ <ion-nav-buttons side="secondary">
+ <button class="button button-positive button-clear button-icon ion-android-create" ng-click="edit()" ng-if="canEdit">
+ </button>
+ </ion-nav-buttons>
- <div class="scroll">
- <div class="row no-padding">
- <div class="col-20 visible-lg">
- </div>
- <div class="col-10 visible-md">
- </div>
+ <ion-content class="viewRecord item-text-wrap">
- <div class="col no-padding">
- <div class="list">
-
- <div class="item" ng-class="{'item-thumbnail-left': pictures && pictures.length>0}">
- <img ng-src="{{pictures[0].src}}" nf-if="pictures && pictures.length>0">
- <h2 ng-bind-html="formData.title"></h2>
- <h4 class="gray">
- <i class="icon ion-location" ng-show="formData.location"></i>
- <span ng-bind-html="formData.location"></span>
- <span ng-shwo="formData.location && formData.time"> </span>
- <i class="icon ion-calendar" ng-show="formData.time"></i>
- {{formData.time|formatDate}}
- </h4>
- </div>
+ <div class="scroll">
+ <div class="row no-padding">
+ <div class="col-20 visible-lg">
+ </div>
+ <div class="col-10 visible-md">
+ </div>
- <div class="item" style="margin-top:10px">
- <p ng-bind-html="formData.description"></p>
- </div>
+ <div class="col no-padding">
+ <div class="list">
- <span class="item item-icon-left item-button-right" >
- <i class="icon ion-pricetag" ng-show="formData.price"></i>
- <span class="dark">{{formData.price}}</span>
- <button class="button button-raised button-calm ink-dark"
- ng-click="transfer(formData.issuer, null, formData.price)">
- {{'MARKET.COMMON.BTN_BUY' | translate}}
- </button>
- </span>
+ <div class="item" ng-class="{'item-thumbnail-left': pictures && pictures.length>0}">
+ <img ng-src="{{pictures[0].src}}" nf-if="pictures && pictures.length>0">
+ <h2 ng-bind-html="formData.title"></h2>
+ <h4 class="gray">
+ <i class="icon ion-location" ng-show="formData.location"></i>
+ <span ng-bind-html="formData.location"></span>
+ <span ng-shwo="formData.location && formData.time"> </span>
+ <i class="icon ion-calendar" ng-show="formData.time"></i>
+ {{formData.time|formatDate}}
+ </h4>
+ </div>
- <div class="hidden-xs hidden-sm padding">
+ <div class="item" style="margin-top:10px">
+ <p ng-bind-html="formData.description"></p>
+ </div>
- </div>
+ <span class="item item-icon-left item-button-right" >
+ <i class="icon ion-pricetag" ng-show="formData.price"></i>
+ <span class="dark">{{formData.price}}</span>
+ <button class="button button-raised button-calm ink-dark"
+ ng-click="transfer(formData.issuer, null, formData.price)">
+ {{'MARKET.COMMON.BTN_BUY' | translate}}
+ </button>
+ </span>
+
+ <div class="hidden-xs hidden-sm padding">
- <div class="item-divider visible-xs visible-sm"> </div>
+ </div>
- <a class="item item-icon-left ink" ui-sref="app.view_identity({pub:formData.issuer})">
- <i class="icon ion-person"></i>
- <span translate>MARKET.COMMON.ISSUER</span>
- <span class="badge" ng-class="{'badge-positive': isMember, 'badge-assertive': !isMember}">{{formData.issuer | formatPubkey}}</span>
- </a>
+ <div class="item-divider visible-xs visible-sm"> </div>
- <div class="item item-icon-left">
- <i class="icon ion-flag"></i>
- <span translate>MARKET.COMMON.CATEGORY</span>
- <span class="badge badge-positive">{{category.name}}</span>
- </div>
+ <a class="item item-icon-left ink" ui-sref="app.view_identity({pub:formData.issuer})">
+ <i class="icon ion-person"></i>
+ <span translate>MARKET.COMMON.ISSUER</span>
+ <span class="badge" ng-class="{'badge-positive': isMember, 'badge-assertive': !isMember}">{{formData.issuer | formatPubkey}}</span>
+ </a>
+
+ <div class="item item-icon-left">
+ <i class="icon ion-flag"></i>
+ <span translate>MARKET.COMMON.CATEGORY</span>
+ <span class="badge badge-positive">{{category.name}}</span>
</div>
+ </div>
- <div class="list gallery" ng-if="pictures && pictures.length>0" >
- <div ng-repeat="picture in pictures"
- class="item card card-gallery">
- <div class="ink">
- <h2 ng-if="picture.title">{{::picture.title}}</h2>
- <img ng-src="{{::picture.src}}" ></img>
- </div>
+ <div class="list gallery" ng-if="pictures && pictures.length>0" >
+ <div ng-repeat="picture in pictures"
+ class="item card card-gallery">
+ <div class="ink">
+ <h2 ng-if="picture.title">{{::picture.title}}</h2>
+ <img ng-src="{{::picture.src}}" ></img>
</div>
</div>
</div>
+ </div>
- <div class="col-20 visible-lg">
- </div>
- <div class="col-10 visible-md">
- </div>
+ <div class="col-20 visible-lg">
+ </div>
+ <div class="col-10 visible-md">
</div>
</div>
+ </div>
- <div class="scroll-bar scroll-bar-v"></div>
- </div>
- </ion-content>
+ <div class="scroll-bar scroll-bar-v"></div>
+ </div>
+ </ion-content>
</ion-view>
diff --git a/www/templates/registry/edit_record.html b/www/templates/registry/edit_record.html
index 4d6e3f5f..af8d28b0 100644
--- a/www/templates/registry/edit_record.html
+++ b/www/templates/registry/edit_record.html
@@ -1,28 +1,30 @@
-<ion-view view-title="{{'REGISTRY.EDIT.TITLE'|translate}}" left-buttons="leftButtons">
- <ion-nav-buttons side="secondary">
- <button class="button button-icon button-clear" ng-click="save()">
- <i class="icon ion-android-send" ng-if="!id"></i>
- <i class="icon ion-android-done" ng-if="id"></i>
- </button>
- </ion-nav-buttons>
-
- <ion-content>
- <div class="scroll">
- <ng-include src="'templates/registry/record_form.html'"></ng-include>
- <div class="scroll-bar scroll-bar-v"></div>
- </div>
+<ion-view left-buttons="leftButtons">
+ <ion-nav-title>
+ <span translate>REGISTRY.EDIT.TITLE</span>
+ </ion-nav-title>
- <div class="padding hidden-xs hidden-sm text-right">
- <button class="button button-clear button-dark ink" ng-click="goBack()" type="button" translate>COMMON.BTN_CANCEL
- </button>
- <button class="button button-positive button-raised ink" ng-click="save()" ng-show="!id">
- {{'REGISTRY.EDIT.BTN_PUBLISH' | translate}}
- </button>
- <button class="button button-positive button-raised ink" ng-click="save()" ng-show="id">
- {{'REGISTRY.EDIT.BTN_SAVE' | translate}}
- </button>
- </div>
- </ion-content>
+ <ion-nav-buttons side="secondary">
+ <button class="button button-icon button-clear" ng-click="save()">
+ <i class="icon ion-android-send" ng-if="!id"></i>
+ <i class="icon ion-android-done" ng-if="id"></i>
+ </button>
+ </ion-nav-buttons>
+ <ion-content>
+ <div class="scroll">
+ <ng-include src="'templates/registry/record_form.html'"></ng-include>
+ <div class="scroll-bar scroll-bar-v"></div>
+ </div>
+ <div class="padding hidden-xs hidden-sm text-right">
+ <button class="button button-clear button-dark ink" ng-click="goBack()" type="button" translate>COMMON.BTN_CANCEL
+ </button>
+ <button class="button button-positive button-raised ink" ng-click="save()" ng-show="!id">
+ {{'REGISTRY.EDIT.BTN_PUBLISH' | translate}}
+ </button>
+ <button class="button button-positive button-raised ink" ng-click="save()" ng-show="id">
+ {{'REGISTRY.EDIT.BTN_SAVE' | translate}}
+ </button>
+ </div>
+ </ion-content>
</ion-view>
diff --git a/www/templates/registry/view_record.html b/www/templates/registry/view_record.html
index d9ed8601..9956a87d 100644
--- a/www/templates/registry/view_record.html
+++ b/www/templates/registry/view_record.html
@@ -1,74 +1,78 @@
-<ion-view left-buttons="leftButtons" view-title="{{'REGISTRY.VIEW.TITLE'|translate}}">
- <ion-nav-buttons side="secondary">
- <button class="button button-icon button-clear ion-android-create" ng-click="edit()" ng-if="canEdit">
- </button>
- </ion-nav-buttons>
-
- <ion-content class="item-text-wrap">
-
- <div class="scroll">
-
- <div class="positive-900-bg hero">
- <div class="content">
- <div class="avatar"
- ng-if="pictures && pictures.length > 0"
- style="background-image: url({{pictures[0].src}});"></div>
- <i class="avatar avatar-member" ng-if="!pictures || pictures.length === 0"></i>
- <h3 class="light">{{formData.title}}</h3>
- <h4 class="gray">
- <i class="icon ion-location" ng-show="formData.location"></i>
- <span ng-bind-html="formData.location"></span>
- <span ng-shwo="formData.location && formData.time"> </span>
- <i class="icon ion-calendar" ng-show="formData.time"></i>
- {{formData.time|formatDate}}
- </h4>
- </div>
+<ion-view left-buttons="leftButtons">
+ <ion-nav-title>
+ <span translate>REGISTRY.VIEW.TITLE</span>
+ </ion-nav-title>
+
+ <ion-nav-buttons side="secondary">
+ <button class="button button-icon button-clear ion-android-create" ng-click="edit()" ng-if="canEdit">
+ </button>
+ </ion-nav-buttons>
+
+ <ion-content class="item-text-wrap">
+
+ <div class="scroll">
+
+ <div class="positive-900-bg hero">
+ <div class="content">
+ <div class="avatar"
+ ng-if="pictures && pictures.length > 0"
+ style="background-image: url({{pictures[0].src}});"></div>
+ <i class="avatar avatar-member" ng-if="!pictures || pictures.length === 0"></i>
+ <h3 class="light">{{formData.title}}</h3>
+ <h4 class="gray">
+ <i class="icon ion-location" ng-show="formData.location"></i>
+ <span ng-bind-html="formData.location"></span>
+ <span ng-shwo="formData.location && formData.time"> </span>
+ <i class="icon ion-calendar" ng-show="formData.time"></i>
+ {{formData.time|formatDate}}
+ </h4>
</div>
+ </div>
- <div class="hidden-xs hidden-sm padding" style="text-align:center">
- <button class="button button-raised button-assertive ink-dark"
- ng-click="transfer(formData.issuer, formData.title)">
- {{'ACCOUNT.BTN_SEND_MONEY' | translate}}
- </button>
+ <div class="hidden-xs hidden-sm padding" style="text-align:center">
+ <button class="button button-raised button-assertive ink-dark"
+ ng-click="transfer(formData.issuer, formData.title)">
+ {{'ACCOUNT.BTN_SEND_MONEY' | translate}}
+ </button>
- <button class="button button-raised button-icon icon ion-ribbon-b" ng-click="certifyIdentity()" ng-if="hasSelf">
- {{'WOT.BTN_CERTIFY' | translate}}
- </button>
- </div>
+ <button class="button button-raised button-icon icon ion-ribbon-b" ng-click="certifyIdentity()" ng-if="hasSelf">
+ {{'WOT.BTN_CERTIFY' | translate}}
+ </button>
+ </div>
- <div class="list">
+ <div class="list">
- <span class="item item-icon-left ink"
- ng-if="!isCompany"
- copy-on-click>
- <i class="icon ion-key"></i>
- <p class="gray">{{formData.issuer}}</p>
- </span>
+ <span class="item item-icon-left ink"
+ ng-if="!isCompany"
+ copy-on-click>
+ <i class="icon ion-key"></i>
+ <p class="gray">{{formData.issuer}}</p>
+ </span>
- <div class="item">
- <p ng-bind-html="formData.description"></p>
- </div>
+ <div class="item">
+ <p ng-bind-html="formData.description"></p>
+ </div>
- <div ng-if="isCompany">
- <div class="item-divider"></div>
+ <div ng-if="isCompany">
+ <div class="item-divider"></div>
- <div class="item">
- <span translate>REGISTRY.COMMON.CATEGORY</span>
- <span class="badge badge-positive">{{category.name || formatCategory}}</span>
- </div>
+ <div class="item">
+ <span translate>REGISTRY.COMMON.CATEGORY</span>
+ <span class="badge badge-positive">{{category.name || formatCategory}}</span>
+ </div>
- <span class="item item-icon-left" >
- <i class="icon ion-person"></i>
- <h3><span translate>REGISTRY.COMMON.ISSUER</span></h3>
- <span class="badge" ng-class="{'badge-positive': isMember, 'badge-assertive': !isMember}">{{formData.issuer | formatPubkey}}</span>
- </span>
+ <span class="item item-icon-left" >
+ <i class="icon ion-person"></i>
+ <h3><span translate>REGISTRY.COMMON.ISSUER</span></h3>
+ <span class="badge" ng-class="{'badge-positive': isMember, 'badge-assertive': !isMember}">{{formData.issuer | formatPubkey}}</span>
+ </span>
- </div>
+ </div>
- </div>
- <div class="scroll-bar scroll-bar-v"></div>
</div>
- </ion-content>
+ <div class="scroll-bar scroll-bar-v"></div>
+ </div>
+ </ion-content>
<button class="button button-fab button-fab-bottom-right button-assertive icon ion-android-send visible-xs visible-sm"
ng-click="transfer(formData.issuer, formData.title)">
diff --git a/www/templates/settings/settings.html b/www/templates/settings/settings.html
index 442751fc..aae507b5 100644
--- a/www/templates/settings/settings.html
+++ b/www/templates/settings/settings.html
@@ -1,85 +1,88 @@
<ion-view left-buttons="leftButtons"
- view-title="{{'SETTINGS.TITLE' | translate}}"
+ cache-view="false"
id="settings">
+ <ion-nav-title>
+ <span translate>SETTINGS.TITLE</span>
+ </ion-nav-title>
- <ion-content >
- <div class="item item-toggle dark">
- <div class="input-label">
- {{'COMMON.BTN_RELATIVE_UNIT' | translate}}
- </div>
- <label class="toggle toggle-royal">
- <input type="checkbox" ng-model="formData.useRelative">
- <div class="track">
- <div class="handle"></div>
- </div>
- </label>
+ <ion-content >
+ <div class="item item-toggle dark">
+ <div class="input-label">
+ {{'COMMON.BTN_RELATIVE_UNIT' | translate}}
</div>
-
- <label class="item item-input item-select">
- <div class="input-label">
- {{'COMMON.LANGUAGE' | translate}}
- </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">
- {{'SETTINGS.USE_LOCAL_STORAGE' | translate}}
- </div>
- <label class="toggle toggle-royal">
- <input type="checkbox" ng-model="formData.useLocalStorage" >
+ <label class="toggle toggle-royal">
+ <input type="checkbox" ng-model="formData.useRelative">
<div class="track">
- <div class="handle"></div>
+ <div class="handle"></div>
</div>
- </label>
- </div>
+ </label>
+ </div>
- <span class="item item-divider">
- {{'SETTINGS.AUTHENTICATION_SETTINGS' | translate}}
- </span>
+ <label class="item item-input item-select">
+ <div class="input-label">
+ {{'COMMON.LANGUAGE' | translate}}
+ </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" >
- <div class="input-label" ng-class="{'gray': !formData.useLocalStorage}">
- {{'SETTINGS.REMEMBER_ME' | translate}}
- </div>
- <label class="toggle" ng-class="{'toggle-stable': !formData.useLocalStorage, 'toggle-royal': formData.useLocalStorage}">
- <input type="checkbox" ng-model="formData.rememberMe" ng-disabled="!formData.useLocalStorage"
- >
- <div class="track">
- <div class="handle"></div>
- </div>
- </label>
+ <div class="item item-toggle dark">
+ <div class="input-label">
+ {{'SETTINGS.USE_LOCAL_STORAGE' | translate}}
</div>
+ <label class="toggle toggle-royal">
+ <input type="checkbox" ng-model="formData.useLocalStorage" >
+ <div class="track">
+ <div class="handle"></div>
+ </div>
+ </label>
+ </div>
- <span class="item item-divider">
- {{'SETTINGS.HISTORY_SETTINGS' | translate}}
- </span>
+ <span class="item item-divider">
+ {{'SETTINGS.AUTHENTICATION_SETTINGS' | translate}}
+ </span>
- <div class="item item-toggle dark">
- <div class="input-label">
- {{'SETTINGS.DISPLAY_UD_HISTORY' | translate}}
- </div>
- <label class="toggle toggle-royal">
- <input type="checkbox" ng-model="formData.showUDHistory" >
- <div class="track">
- <div class="handle"></div>
- </div>
- </label>
+ <div class="item item-toggle" >
+ <div class="input-label" ng-class="{'gray': !formData.useLocalStorage}">
+ {{'SETTINGS.REMEMBER_ME' | translate}}
</div>
+ <label class="toggle" ng-class="{'toggle-stable': !formData.useLocalStorage, 'toggle-royal': formData.useLocalStorage}">
+ <input type="checkbox" ng-model="formData.rememberMe" ng-disabled="!formData.useLocalStorage"
+ >
+ <div class="track">
+ <div class="handle"></div>
+ </div>
+ </label>
+ </div>
- <span class="item item-divider">
- {{'SETTINGS.NETWORK_SETTINGS' | translate}}
- </span>
+ <span class="item item-divider">
+ {{'SETTINGS.HISTORY_SETTINGS' | translate}}
+ </span>
- <div class="item ink" ng-click="changeNode()">
- <div class="input-label">
- {{'SETTINGS.NODE' | translate}}
+ <div class="item item-toggle dark">
+ <div class="input-label">
+ {{'SETTINGS.DISPLAY_UD_HISTORY' | translate}}
+ </div>
+ <label class="toggle toggle-royal">
+ <input type="checkbox" ng-model="formData.showUDHistory" >
+ <div class="track">
+ <div class="handle"></div>
</div>
- <span class="item-note">{{formData.node}}</span>
+ </label>
+ </div>
+
+ <span class="item item-divider">
+ {{'SETTINGS.NETWORK_SETTINGS' | translate}}
+ </span>
+
+ <div class="item ink" ng-click="changeNode()">
+ <div class="input-label">
+ {{'SETTINGS.NODE' | translate}}
</div>
+ <span class="item-note">{{formData.node}}</span>
+ </div>
- </ion-content>
+ </ion-content>
</ion-view>
diff --git a/www/templates/wallet/new_transfer.html b/www/templates/wallet/new_transfer.html
index ae031d45..a2a3decd 100644
--- a/www/templates/wallet/new_transfer.html
+++ b/www/templates/wallet/new_transfer.html
@@ -1,6 +1,9 @@
-<ion-view view-title="{{'TRANSFER.TITLE' | translate}}"
- left-buttons="leftButtons"
- id="transfer">
+<ion-view left-buttons="leftButtons"
+ id="transfer">
+ <ion-nav-title>
+ <span translate>TRANSFER.TITLE</span>
+ </ion-nav-title>
+
<ion-nav-buttons side="secondary">
<button class="button button-icon button-clear icon ion-android-send visible-xs" ng-click="doTransfer()">
</button>
diff --git a/www/templates/wallet/view_wallet.html b/www/templates/wallet/view_wallet.html
index ecb0992c..6ee9425b 100644
--- a/www/templates/wallet/view_wallet.html
+++ b/www/templates/wallet/view_wallet.html
@@ -1,6 +1,8 @@
<ion-view left-buttons="leftButtons"
- view-title=" "
id="wallet">
+ <ion-nav-title>
+ <!-- no title-->
+ </ion-nav-title>
<ion-nav-buttons side="secondary">
diff --git a/www/templates/wot/lookup.html b/www/templates/wot/lookup.html
index 80910a03..2829689c 100644
--- a/www/templates/wot/lookup.html
+++ b/www/templates/wot/lookup.html
@@ -1,4 +1,8 @@
-<ion-view view-title="{{'WOT.LOOKUP.TITLE' | translate}}">
+<ion-view>
+ <ion-nav-title>
+ {{'WOT.LOOKUP.TITLE' | translate}}
+ </ion-nav-title>
+
<ion-nav-buttons side="secondary">
<button class="button button-icon button-clear icon ion-qr-scanner hidden-no-device"
ng-click="scanQrCode()">
--
GitLab