From 5b88e7c55bf12c823f763d52cb0523ad705a0f1e Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Mon, 26 Feb 2018 10:25:46 +0100
Subject: [PATCH] [fix] Change link to user forum, to forum.monnaie-libre.fr -
fix #678 [fix] Fix some old URL, in the about popup
---
doc/configuration.md | 20 +++++++++++---------
package.json | 2 +-
www/js/services/settings-services.js | 3 +++
www/templates/modal_about.html | 6 +++---
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/doc/configuration.md b/doc/configuration.md
index 5dac7e81..472d8c81 100644
--- a/doc/configuration.md
+++ b/doc/configuration.md
@@ -46,7 +46,8 @@ angular.module("cesium.config", [])
},
"version": "...",
"build": "...",
- "newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug"
+ "newIssueUrl": "https://git.duniter.org/clients/cesium/cesium/issues/new",
+ "userForumUrl": "https://forum.duniter.org"
});
```
@@ -59,11 +60,11 @@ Because of default options values (see details below), the minimal configuration
angular.module("cesium.config", [])
.constant("csConfig", {
"node": {
- "host": "gtest.duniter.fr",
+ "host": "g1-test.duniter.org",
"port": "10900"
},
- "version": "0.9.18",
- "build": "2017-01-31T14:19:31.296Z"
+ "version": "...",
+ "build": "..."
});
```
@@ -72,7 +73,7 @@ Because of default options values (see details below), the minimal configuration
angular.module("cesium.config", [])
.constant("csConfig", {
"node": {
- "host": "g1-test.duniter.fr",
+ "host": "g1-test.duniter.org",
"port": 10900
},
"plugins": {
@@ -81,8 +82,8 @@ Because of default options values (see details below), the minimal configuration
"port": 443
}
},
- "version": "0.9.18",
- "build": "2017-01-31T14:19:31.296Z"
+ "version": "...",
+ "build": "..."
});
```
@@ -110,8 +111,9 @@ fallbackLanguage | Default locale, if browser default language not ex
defaultLanguage | Used to force the default language (ignore browser's language), on user first connection. | =`fallbackLanguage`
decimalCount | Number of decimal to display, on float value (when using relative unit) | `4`
shareBaseUrl | Used in share buttons, to reference another web site. | not defined (will use navigator's window location)
-helptip.installDocUrl | Used in features tour, for the link 'How-to install my own node'. | URL of [Duniter installation node](https://github.com/duniter/duniter/blob/master/doc/install-a-node.md)
-newIssueUrl | Used for link in the About screen, to submit new issue | URL of [Cesium issues on GitHub](https://github.com/duniter/cesium/issues/new?labels=bug)
+helptip.installDocUrl | Used in features tour, for the link 'How-to install my own node'. | URL of [Duniter installation node](https://duniter.org/en/wiki/duniter/install/)
+newIssueUrl | Used for link in the About screen, to submit new issue | URL of [Cesium issues](https://git.duniter.org/clients/cesium/cesium/issues/new)
+userForumUrl | Link to the user forum, show in the About screen | URL of [forum.monnaie-libre.fr](forum.monnaie-libre.fr)
timeout | Default network request timeout, in millisecond. | `4000`
timeWarningExpire | Delay (in second) before expiration of certifications, use to warn the user that there will soon be a lack of certifications | `5184000` (2 mois)
timeWarningExpireMembership | Delay (in second) before membership expiration, use to warns user that he should renew his membership. | `7776000` (3 mois)
diff --git a/package.json b/package.json
index 9f20c41c..377323bb 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"description": "Unhosted webapp client for Duniter network",
"repository": {
"type": "git",
- "url": "git@github.com:duniter/cesium.git"
+ "url": "git@git.duniter.org:clients/cesium/cesium.git"
},
"scripts": {
"postinstall": "bower install",
diff --git a/www/js/services/settings-services.js b/www/js/services/settings-services.js
index 9c667cd4..fa0c3541 100644
--- a/www/js/services/settings-services.js
+++ b/www/js/services/settings-services.js
@@ -68,6 +68,7 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config'])
uiEffects: true,
minVersion: '1.1.0',
newIssueUrl: "https://git.duniter.org/clients/cesium/cesium/issues/new",
+ userForumUrl: "https://forum.monnaie-libre.fr",
latestReleaseUrl: "https://api.github.com/repos/duniter/cesium/releases/latest",
duniterLatestReleaseUrl: "https://api.github.com/repos/duniter/duniter/releases/latest",
helptip: {
@@ -196,6 +197,8 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config'])
data.minVersion = defaultSettings.minVersion;
data.latestReleaseUrl = defaultSettings.latestReleaseUrl;
data.duniterLatestReleaseUrl = defaultSettings.duniterLatestReleaseUrl;
+ data.newIssueUrl = defaultSettings.newIssueUrl;
+ data.userForumUrl = defaultSettings.userForumUrl;
// Apply the new locale (only if need)
if (localeChanged) {
diff --git a/www/templates/modal_about.html b/www/templates/modal_about.html
index 9955c7a9..a912f699 100644
--- a/www/templates/modal_about.html
+++ b/www/templates/modal_about.html
@@ -24,7 +24,7 @@
<!-- link to release page -->
<h3 ng-if="!$root.device.enable">
- <a ng-click="openLink($event, $root.newRelease.url)" translate>{{$root.newRelease.url}}</a>
+ <a ng-click="openLink($event, $root.newRelease.url)" translate>{{::$root.newRelease.url}}</a>
</h3>
</ion-item>
@@ -33,7 +33,7 @@
<i class="item-image icon ion-bug"></i>
<span translate>ABOUT.PLEASE_REPORT_ISSUE</span>
<h3>
- <a ng-click="openLink($event, $root.config.newIssueUrl)" translate>ABOUT.REPORT_ISSUE</a>
+ <a ng-click="openLink($event, $root.settings.newIssueUrl)" translate>ABOUT.REPORT_ISSUE</a>
</h3>
</ion-item>
@@ -49,7 +49,7 @@
<ion-item class="item-icon-left">
<i class="item-image icon ion-chatbubbles"></i>
{{'ABOUT.FORUM' | translate}}
- <h3><a ng-click="openLink($event, 'https://forum.duniter.org')">https://forum.duniter.org</a></h3>
+ <h3><a ng-click="openLink($event, $root.settings.userForumUrl)">{{::$root.settings.userForumUrl}}</a></h3>
</ion-item>
<!-- team -->
--
GitLab