Skip to content
Snippets Groups Projects
Commit 917a6a10 authored by François Agneray's avatar François Agneray
Browse files

Instance title => instance label

parent f911a8b0
No related branches found
No related tags found
1 merge request!29Develop
Pipeline #6308 passed
Stage: trigger-child-pipelines
Pipeline: anis-next

#6309

    Hide whitespace changes
    Inline Side-by-side
    client/src/app/instance/instance.component.ts
    + 2
    − 0
    View file @ 917a6a10
    ...@@ -31,6 +31,7 @@ import { AppConfigService } from 'src/app/app-config.service'; ...@@ -31,6 +31,7 @@ import { AppConfigService } from 'src/app/app-config.service';
    */ */
    export class InstanceComponent implements OnInit, OnDestroy { export class InstanceComponent implements OnInit, OnDestroy {
    public favIcon: HTMLLinkElement = document.querySelector('#favicon'); public favIcon: HTMLLinkElement = document.querySelector('#favicon');
    public title: HTMLLinkElement = document.querySelector('#title');
    public links = [ public links = [
    { label: 'Home', icon: 'fas fa-home', routerLink: 'home' } { label: 'Home', icon: 'fas fa-home', routerLink: 'home' }
    ]; ];
    ...@@ -65,6 +66,7 @@ export class InstanceComponent implements OnInit, OnDestroy { ...@@ -65,6 +66,7 @@ export class InstanceComponent implements OnInit, OnDestroy {
    if (instance.config.design.design_favicon !== '') { if (instance.config.design.design_favicon !== '') {
    this.favIcon.href = `${this.config.apiUrl}/download-instance-file/${instance.name}/${instance.config.design.design_favicon}`; this.favIcon.href = `${this.config.apiUrl}/download-instance-file/${instance.name}/${instance.config.design.design_favicon}`;
    } }
    this.title.innerHTML = instance.label;
    }) })
    } }
    ......
    client/src/index.html
    + 1
    − 1
    View file @ 917a6a10
    ...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
    <html lang="en" class="h-100"> <html lang="en" class="h-100">
    <head> <head>
    <meta charset="utf-8"> <meta charset="utf-8">
    <title>Anis - Client</title> <title id="title">Anis - Client</title>
    <base href="/"> <base href="/">
    <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
    <link rel="icon" id="favicon" type="image/x-icon" href="favicon.ico"> <link rel="icon" id="favicon" type="image/x-icon" href="favicon.ico">
    ......
    conf-dev/create-db.sh
    + 1
    − 1
    View file @ 917a6a10
    ...@@ -59,7 +59,7 @@ curl -d '{"label":"Spectra graph","value":"spectra_graph","display":20,"select_n ...@@ -59,7 +59,7 @@ curl -d '{"label":"Spectra graph","value":"spectra_graph","display":20,"select_n
    curl -d '{"label":"Test","dbname":"anis_test","dbtype":"pdo_pgsql","dbhost":"db","dbport":5432,"dblogin":"anis","dbpassword":"anis"}' --header 'Content-Type: application/json' -X POST http://localhost/database curl -d '{"label":"Test","dbname":"anis_test","dbtype":"pdo_pgsql","dbhost":"db","dbport":5432,"dblogin":"anis","dbpassword":"anis"}' --header 'Content-Type: application/json' -X POST http://localhost/database
    # Add default instance # Add default instance
    curl -d '{"name":"default","label":"Default instance","data_path":"\/DEFAULT","config":{"design":{"design_color":"#7AC29A","design_logo":"","design_favicon":""},"home":{"home_component":"WelcomeComponent","home_config":{"home_component_text":"AstroNomical Information System","home_component_logo":"home_component_logo.png"}},"search":{"search_by_criteria_allowed":true,"search_by_criteria_label":"Search","search_multiple_allowed":false,"search_multiple_label":"Search multiple","search_multiple_all_datasets_selected":false},"documentation":{"documentation_allowed":false,"documentation_label":"Documentation"}}}' --header 'Content-Type: application/json' -X POST http://localhost/instance curl -d '{"name":"default","label":"Default instance","data_path":"\/DEFAULT","config":{"design":{"design_color":"#7AC29A","design_logo":"logo.png","design_favicon":"favicon.ico"},"home":{"home_component":"WelcomeComponent","home_config":{"home_component_text":"AstroNomical Information System","home_component_logo":"home_component_logo.png"}},"search":{"search_by_criteria_allowed":true,"search_by_criteria_label":"Search","search_multiple_allowed":false,"search_multiple_label":"Search multiple","search_multiple_all_datasets_selected":false},"documentation":{"documentation_allowed":false,"documentation_label":"Documentation"}}}' --header 'Content-Type: application/json' -X POST http://localhost/instance
    # Add ANIS, SVOM and IRIS surveys # Add ANIS, SVOM and IRIS surveys
    curl -d '{"name":"anis_survey","label":"ANIS survey","description":"Survey used for testing","link":"https://anis.lam.fr","manager":"F. Agneray","id_database":1}' --header 'Content-Type: application/json' -X POST http://localhost/survey curl -d '{"name":"anis_survey","label":"ANIS survey","description":"Survey used for testing","link":"https://anis.lam.fr","manager":"F. Agneray","id_database":1}' --header 'Content-Type: application/json' -X POST http://localhost/survey
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment