cosmetic changes

sitn · Apr 1, 2021 · 4caf10d · 4caf10d
1 parent a36a352
commit 4caf10d
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 26 deletions.
diff --git a/back/api/templates/email_admin_fr-ch.html b/back/api/templates/email_admin_fr-ch.html
@@ -16,7 +16,7 @@
   {% endif %}
   {% if admin_url %}
   <p>
-    <a href="https://sitn.ne.ch/geoshop2_api{% url admin_url admin_url_params %}">
+    <a href="https://sitn.ne.ch{% url admin_url admin_url_params %}">
       {% url admin_url admin_url_params %}
     </a>
   </p>

diff --git a/back/api/templates/email_password_reset.html b/back/api/templates/email_password_reset.html
@@ -1,11 +1,11 @@
 {% extends "email_base_template.html" %}
 {% load i18n %}
 {% block content %}
-{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
+{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}<br><br>
 
-{% trans "Please go to the following page and choose a new password:" %}
+{% trans "Please go to the following page and choose a new password:" %}<br>
 {% block reset_link %}
 {{ protocol }}://{{ domain }}/auth/reset/{{ uid }}/{{ token }}
-{% endblock %}
-{% trans 'Your username, in case you’ve forgotten:' %} {{ user.get_username }}
+{% endblock %}<br><br>
+{% trans 'Your username, in case you’ve forgotten:' %}<strong> {{ user.get_username }}</strong>
 {% endblock %}
diff --git a/back/api/templates/registration/password_reset_email.html b/back/api/templates/registration/password_reset_email.html
diff --git a/front/angular.json b/front/angular.json
@@ -24,7 +24,7 @@
             "tsConfig": "tsconfig.app.json",
             "aot": true,
             "assets": [
-              "src/favicon.png",
+              "src/favicon.ico",
               "src/assets"
             ],
             "styles": [
@@ -92,7 +92,7 @@
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
             "assets": [
-              "src/favicon.png",
+              "src/favicon.ico",
               "src/assets"
             ],
             "styles": [

diff --git a/front/src/app/_components/help-overlay/help-overlay.component.html b/front/src/app/_components/help-overlay/help-overlay.component.html
@@ -4,7 +4,10 @@
     <span>Voir l'aide</span>
   </div>
 </button>
-
+<a color="primary" mat-button href="https://rsn.ne.ch/DATA/program/books/rsne/htm/2154211.htm" target="_blank">
+  Informations sur la tarification
+</a>
+<hr>
 <span class="padding-horizontal-15 questions">Avez-vous des questions ?</span>
 
 <a mat-button color="primary" [href]="'tel:' + phoneNumber">

diff --git a/front/src/app/app.component.html b/front/src/app/app.component.html
@@ -1,7 +1,7 @@
 <mat-toolbar color="primary">
 
   <div class="flex-row">
-    <a mat-button class="header-title" [routerLink]="['welcome']">GeoShop</a>
+    <a mat-button class="header-title" [routerLink]="['welcome']">GeoShop du système d'information du territoire neuchâtelois</a>
     <mat-divider *ngIf="subTitle" vertical="true" color="accent"></mat-divider>
     <span class="header-subtitle">{{subTitle}}</span>
   </div>
@@ -10,7 +10,7 @@
   <div class="right-container">
 
     <button mat-icon-button [matMenuTriggerFor]="helpOverlay">
-      <mat-icon>help</mat-icon>
+      <mat-icon>contact_support</mat-icon>
     </button>
     <mat-menu #helpOverlay="matMenu" class="overlay-menu-container">
       <gs2-help-overlay></gs2-help-overlay>

diff --git a/front/src/app/welcome/catalog/catalog.component.html b/front/src/app/welcome/catalog/catalog.component.html
@@ -22,14 +22,15 @@
            src="{{mediaUrl}}/{{product.thumbnail_link}}">
       <div class="item-label text-ellipsis-2" [matTooltip]="product.label">{{product.label}}</div>
 
+      <!--
       <ng-container *ngIf="product.pricing === 'Gratuit'; then gratuit; else payant">
       </ng-container>
       <ng-template #gratuit>
         <span class="item-price text-secondary">Gratuit</span>
       </ng-template>
       <ng-template #payant>
         <span class="item-price text-secondary">Tarification selon le type de mandat</span>
-      </ng-template>
+      </ng-template>-->
 
       <button class="item-help" matTooltip="Voir les meta données" aria-label="Voir les meta données"
               [disabled]="!product.metadata"

diff --git a/front/src/assets/configs/config.json.tmpl b/front/src/assets/configs/config.json.tmpl
@@ -9,10 +9,10 @@
   ],
   "contact": {
     "phone": {
-      "label": "+41 (0) 32 889 57 63",
+      "label": "+41 32 889 57 63",
       "number": "+41328895763"
     },
-    "email": "chantal.monnier@ne.ch"
+    "email": "sitn@ne.ch"
   },
   "initialCenter": [
     2551473.73, 1211195.03

diff --git a/front/src/assets/favicon.ico b/front/src/assets/favicon.ico
diff --git a/front/src/assets/favicon.png b/front/src/assets/favicon.png
diff --git a/front/src/index.html b/front/src/index.html
@@ -6,7 +6,7 @@
   <title>GeoShop</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="assets/favicon.png">
+  <link rel="icon" type="image/x-icon" href="assets/favicon.ico">
   <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500&display=swap" rel="stylesheet">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 </head>