diff --git a/client/src/app/core/containers/app.component.html b/client/src/app/core/containers/app.component.html index 50bf7c4d2a8737dbae1e9a568c4e701b33752542..f2a02fb4e0ba8d88fbcec86d5ffbb05878082b7a 100644 --- a/client/src/app/core/containers/app.component.html +++ b/client/src/app/core/containers/app.component.html @@ -12,7 +12,7 @@ <small>Currently based on anis-client v{{ anisClientVersion }}. Code licensed CeCILL.</small> </div> <div class="row justify-content-around"> - <div class="col text-center"> + <div class="col mb-3 text-center"> <a href="http://cesam.lam.fr" title="Centre de données Astrophysique de Marseille"> <img class="img-fluid" src="assets/logo_cesam_s.png" alt="CeSAM" /> </a> diff --git a/client/src/app/instance/home/components/welcome.component.scss b/client/src/app/instance/home/components/welcome.component.scss index 0a76fe2eca34d1a78330bf489fa2c6547fb46071..0c0f1a8992260f501b2473c9270dcaa856ca8654 100644 --- a/client/src/app/instance/home/components/welcome.component.scss +++ b/client/src/app/instance/home/components/welcome.component.scss @@ -10,3 +10,8 @@ div.jumbotron p { line-height: 35px; } + +.img-fluid { + height: auto; + max-width: 100%; +} \ No newline at end of file diff --git a/client/src/app/instance/shared-search/components/datatable/datatable.component.html b/client/src/app/instance/shared-search/components/datatable/datatable.component.html index ecb7f5726a7055b7592d8fc099ca53845d04bb19..00807214a9995614eced5be9a2abea117eebb72f 100644 --- a/client/src/app/instance/shared-search/components/datatable/datatable.component.html +++ b/client/src/app/instance/shared-search/components/datatable/datatable.component.html @@ -90,14 +90,14 @@ </div> <div class="row mt-3"> <div class="col"> - Showing + Show <select class="custom-select" (change)="changeNbItems($event.target.value)"> <option value="10" selected="true">10</option> <option value="20">20</option> <option value="50">50</option> <option value="100">100</option> </select> - of {{ dataLength }} items + entries </div> <div class="col-auto"> <pagination @@ -109,6 +109,6 @@ [itemsPerPage]="nbItems" previousText="‹" nextText="›" firstText="«" lastText="»" (pageChanged)="changePage($event.page)"> - </pagination> + </pagination> </div> </div> diff --git a/client/src/app/instance/store/models/criterion.model.ts b/client/src/app/instance/store/models/criterion.model.ts index 95f9d974ce488501c9af3e0b868c91b3be1f2ac8..f91cd67b956daea79846c5dd025583345bd942da 100644 --- a/client/src/app/instance/store/models/criterion.model.ts +++ b/client/src/app/instance/store/models/criterion.model.ts @@ -37,6 +37,7 @@ export interface Criterion { * criterionToString(criterion) */ export const criterionToString = (criterion: Criterion): string => { + console.log(criterion); let str: string = criterion.id.toString(); if (criterion.type === 'between') { const bw = criterion as BetweenCriterion; @@ -124,6 +125,7 @@ export const stringToCriterion = (attribute: Attribute, params: string[] = null) return { id: attribute.id, type: 'multiple', options } as SelectMultipleCriterion; } case 'json': + case 'svom_json_kw': if (params) { const [path, operator, value] = params[2].split('|'); return { id: attribute.id, type: 'json', path, operator, value } as JsonCriterion;