diff --git a/client/src/app/admin/instance/components/instance-form.component.html b/client/src/app/admin/instance/components/instance-form.component.html
index c43d1b5faecf70246112dfe6358d4c91e9380a3e..dc675e05b44b68f1c8b1311a41fd76554aa77f3b 100644
--- a/client/src/app/admin/instance/components/instance-form.component.html
+++ b/client/src/app/admin/instance/components/instance-form.component.html
@@ -346,12 +346,12 @@
</div>
<div class="form-row">
<div class="form-group col-md-6">
- <label for="search_next_btn_text_color_picker">Search next btn text color (picker)</label>
- <input class="form-control" type="color" id="search_next_btn_text_color_picker" [value]="form.value.search_next_btn_text_color" formControlName="search_next_btn_text_color">
+ <label for="search_next_btn_hover_text_color_picker">Search next btn hover text color (picker)</label>
+ <input class="form-control" type="color" id="search_next_btn_hover_text_color_picker" [value]="form.value.search_next_btn_hover_text_color" formControlName="search_next_btn_hover_text_color">
</div>
<div class="form-group col-md-6">
- <label for="search_next_btn_text_color_input">Search next btn text color (value)</label>
- <input type="text" class="form-control" id="search_next_btn_text_color_input" [value]="form.value.search_next_btn_text_color" formControlName="search_next_btn_text_color">
+ <label for="search_next_btn_hover_text_color_input">Search next btn hover text color (value)</label>
+ <input type="text" class="form-control" id="search_next_btn_hover_text_color_input" [value]="form.value.search_next_btn_hover_text_color" formControlName="search_next_btn_hover_text_color">
</div>
</div>
<div class="form-row">
@@ -376,12 +376,12 @@
</div>
<div class="form-row">
<div class="form-group col-md-6">
- <label for="search_back_btn_text_color_picker">Search back btn text color (picker)</label>
- <input class="form-control" type="color" id="search_back_btn_text_color_picker" [value]="form.value.search_back_btn_text_color" formControlName="search_back_btn_text_color">
+ <label for="search_back_btn_hover_text_color_picker">Search back btn hover text color (picker)</label>
+ <input class="form-control" type="color" id="search_back_btn_hover_text_color_picker" [value]="form.value.search_back_btn_hover_text_color" formControlName="search_back_btn_hover_text_color">
</div>
<div class="form-group col-md-6">
- <label for="search_back_btn_text_color_input">Search back btn text color (value)</label>
- <input type="text" class="form-control" id="search_back_btn_text_color_input" [value]="form.value.search_back_btn_text_color" formControlName="search_back_btn_text_color">
+ <label for="search_back_btn_hover_text_color_input">Search back btn text color (value)</label>
+ <input type="text" class="form-control" id="search_back_btn_hover_text_color_input" [value]="form.value.search_back_btn_hover_text_color" formControlName="search_back_btn_hover_text_color">
</div>
</div>
</accordion-group>
@@ -432,96 +432,106 @@
</div>
<div class="form-row">
<div class="form-group col-md-6">
- <label for="family_color_picker">Family color (picker)</label>
- <input class="form-control" type="color" id="family_color_picker" [value]="form.value.family_color" formControlName="family_color">
+ <label for="family_text_color_picker">Family text color (picker)</label>
+ <input class="form-control" type="color" id="family_text_color_picker" [value]="form.value.family_text_color" formControlName="family_text_color">
</div>
<div class="form-group col-md-6">
- <label for="family_color_input">Family color (value)</label>
- <input type="text" class="form-control" id="family_color_input" [value]="form.value.family_color" formControlName="family_color">
+ <label for="family_text_color_input">Family text color (value)</label>
+ <input type="text" class="form-control" id="family_text_color_input" [value]="form.value.family_text_color" formControlName="family_text_color">
</div>
</div>
</accordion-group>
- <accordion-group heading="[Search] Design dataset selection" [isOpen]="false">
+ <accordion-group heading="[Search] Design search info" [isOpen]="false">
<div class="form-row">
<div class="form-group col-md-6">
- <label for="dataset_select_btn_color_picker">Dataset select btn color (picker)</label>
- <input class="form-control" type="color" id="dataset_select_btn_color_picker" [value]="form.value.dataset_select_btn_color" formControlName="dataset_select_btn_color">
+ <label for="search_info_background_color_picker">Search info background color (picker)</label>
+ <input class="form-control" type="color" id="search_info_background_color_picker" [value]="form.value.search_info_background_color" formControlName="search_info_background_color">
</div>
<div class="form-group col-md-6">
- <label for="dataset_select_btn_color_input">Dataset select btn color (value)</label>
- <input type="text" class="form-control" id="dataset_select_btn_color_input" [value]="form.value.dataset_select_btn_color" formControlName="dataset_select_btn_color">
+ <label for="search_info_background_color_input">Search info background color (value)</label>
+ <input type="text" class="form-control" id="search_info_background_color_input" [value]="form.value.search_info_background_color" formControlName="search_info_background_color">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
- <label for="dataset_select_btn_hover_color_picker">Dataset select btn hover color (picker)</label>
- <input class="form-control" type="color" id="dataset_select_btn_hover_color_picker" [value]="form.value.dataset_select_btn_hover_color" formControlName="dataset_select_btn_hover_color">
+ <label for="search_info_text_color_picker">Search info text color (picker)</label>
+ <input class="form-control" type="color" id="search_info_text_color_picker" [value]="form.value.search_info_text_color" formControlName="search_info_text_color">
</div>
<div class="form-group col-md-6">
- <label for="dataset_select_btn_hover_color_input">Dataset select btn hover color (value)</label>
- <input type="text" class="form-control" id="dataset_select_btn_hover_color_input" [value]="form.value.dataset_select_btn_hover_color" formControlName="dataset_select_btn_hover_color">
+ <label for="search_info_text_color_input">Search info text color (value)</label>
+ <input type="text" class="form-control" id="search_info_text_color_input" [value]="form.value.search_info_text_color" formControlName="search_info_text_color">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
- <label for="dataset_select_btn_text_color_picker">Dataset select btn text color (picker)</label>
- <input class="form-control" type="color" id="dataset_select_btn_text_color_picker" [value]="form.value.dataset_select_btn_text_color" formControlName="dataset_select_btn_text_color">
+ <label for="search_info_btn_color_picker">Search info btn color (picker)</label>
+ <input class="form-control" type="color" id="search_info_btn_color_picker" [value]="form.value.search_info_btn_color" formControlName="search_info_btn_color">
</div>
<div class="form-group col-md-6">
- <label for="dataset_select_btn_text_color_input">Dataset select btn text color (value)</label>
- <input type="text" class="form-control" id="dataset_select_btn_text_color_input" [value]="form.value.dataset_select_btn_text_color" formControlName="dataset_select_btn_text_color">
+ <label for="search_info_btn_color_input">Search info btn color (value)</label>
+ <input type="text" class="form-control" id="search_info_btn_color_input" [value]="form.value.search_info_btn_color" formControlName="search_info_btn_color">
+ </div>
+ </div>
+ <div class="form-row">
+ <div class="form-group col-md-6">
+ <label for="search_info_btn_hover_color_picker">Search info btn hover color (picker)</label>
+ <input class="form-control" type="color" id="search_info_btn_hover_color_picker" [value]="form.value.search_info_btn_hover_color" formControlName="search_info_btn_hover_color">
+ </div>
+ <div class="form-group col-md-6">
+ <label for="search_info_btn_hover_color_input">Search info btn hover color (value)</label>
+ <input type="text" class="form-control" id="search_info_btn_hover_color_input" [value]="form.value.search_info_btn_hover_color" formControlName="search_info_btn_hover_color">
</div>
</div>
- </accordion-group>
- <accordion-group heading="[Search] Design result header" [isOpen]="false">
<div class="form-row">
<div class="form-group col-md-6">
- <label for="result_header_background_color_picker">Result header background color (picker)</label>
- <input class="form-control" type="color" id="result_header_background_color_picker" [value]="form.value.result_header_background_color" formControlName="result_header_background_color">
+ <label for="search_info_btn_text_color_picker">Search info btn text color (picker)</label>
+ <input class="form-control" type="color" id="search_info_btn_text_color_picker" [value]="form.value.search_info_btn_text_color" formControlName="search_info_btn_text_color">
</div>
<div class="form-group col-md-6">
- <label for="result_header_background_color_input">Result header background color (value)</label>
- <input type="text" class="form-control" id="result_header_background_color_input" [value]="form.value.result_header_background_color" formControlName="result_header_background_color">
+ <label for="search_info_btn_text_color_input">Search info btn text color (value)</label>
+ <input type="text" class="form-control" id="search_info_btn_text_color_input" [value]="form.value.search_info_btn_text_color" formControlName="search_info_btn_text_color">
</div>
</div>
+ </accordion-group>
+ <accordion-group heading="[Search] Design dataset selection" [isOpen]="false">
<div class="form-row">
<div class="form-group col-md-6">
- <label for="result_header_text_color_picker">Result header text color (picker)</label>
- <input class="form-control" type="color" id="result_header_text_color_picker" [value]="form.value.result_header_text_color" formControlName="result_header_text_color">
+ <label for="dataset_select_btn_color_picker">Dataset select btn color (picker)</label>
+ <input class="form-control" type="color" id="dataset_select_btn_color_picker" [value]="form.value.dataset_select_btn_color" formControlName="dataset_select_btn_color">
</div>
<div class="form-group col-md-6">
- <label for="result_header_text_color_input">Result header text color (value)</label>
- <input type="text" class="form-control" id="result_header_text_color_input" [value]="form.value.result_header_text_color" formControlName="result_header_text_color">
+ <label for="dataset_select_btn_color_input">Dataset select btn color (value)</label>
+ <input type="text" class="form-control" id="dataset_select_btn_color_input" [value]="form.value.dataset_select_btn_color" formControlName="dataset_select_btn_color">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
- <label for="result_header_btn_color_picker">Result header btn color (picker)</label>
- <input class="form-control" type="color" id="result_header_btn_color_picker" [value]="form.value.result_header_btn_color" formControlName="result_header_btn_color">
+ <label for="dataset_select_btn_hover_color_picker">Dataset select btn hover color (picker)</label>
+ <input class="form-control" type="color" id="dataset_select_btn_hover_color_picker" [value]="form.value.dataset_select_btn_hover_color" formControlName="dataset_select_btn_hover_color">
</div>
<div class="form-group col-md-6">
- <label for="result_header_btn_color_input">Result header btn color (value)</label>
- <input type="text" class="form-control" id="result_header_btn_color_input" [value]="form.value.result_header_btn_color" formControlName="result_header_btn_color">
+ <label for="dataset_select_btn_hover_color_input">Dataset select btn hover color (value)</label>
+ <input type="text" class="form-control" id="dataset_select_btn_hover_color_input" [value]="form.value.dataset_select_btn_hover_color" formControlName="dataset_select_btn_hover_color">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
- <label for="result_header_btn_hover_color_picker">Result header btn hover color (picker)</label>
- <input class="form-control" type="color" id="result_header_btn_hover_color_picker" [value]="form.value.result_header_btn_hover_color" formControlName="result_header_btn_hover_color">
+ <label for="dataset_select_btn_hover_text_color_picker">Dataset select btn hover text color (picker)</label>
+ <input class="form-control" type="color" id="dataset_select_btn_hover_text_color_picker" [value]="form.value.dataset_select_btn_hover_text_color" formControlName="dataset_select_btn_hover_text_color">
</div>
<div class="form-group col-md-6">
- <label for="result_header_btn_hover_color_input">Result header btn hover color (value)</label>
- <input type="text" class="form-control" id="result_header_btn_hover_color_input" [value]="form.value.result_header_btn_hover_color" formControlName="result_header_btn_hover_color">
+ <label for="dataset_select_btn_hover_text_color_input">Dataset select btn hover text color (value)</label>
+ <input type="text" class="form-control" id="dataset_select_btn_hover_text_color_input" [value]="form.value.dataset_select_btn_hover_text_color" formControlName="dataset_select_btn_hover_text_color">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
- <label for="result_header_btn_text_color_picker">Result header btn text color (picker)</label>
- <input class="form-control" type="color" id="result_header_btn_text_color_picker" [value]="form.value.result_header_btn_text_color" formControlName="result_header_btn_text_color">
+ <label for="dataset_selected_icon_color_picker">Dataset selected icon color (picker)</label>
+ <input class="form-control" type="color" id="dataset_selected_icon_color_picker" [value]="form.value.dataset_selected_icon_color" formControlName="dataset_selected_icon_color">
</div>
<div class="form-group col-md-6">
- <label for="result_header_btn_text_color_input">Result header btn text color (value)</label>
- <input type="text" class="form-control" id="result_header_btn_text_color_input" [value]="form.value.result_header_btn_text_color" formControlName="result_header_btn_text_color">
+ <label for="dataset_selected_icon_color_input">Dataset selected icon color (value)</label>
+ <input type="text" class="form-control" id="dataset_selected_icon_color_input" [value]="form.value.dataset_selected_icon_color" formControlName="dataset_selected_icon_color">
</div>
</div>
</accordion-group>
diff --git a/client/src/app/admin/instance/components/instance-form.component.ts b/client/src/app/admin/instance/components/instance-form.component.ts
index f2ed5a16eb91fc78eb202523c8c478eef7d9ecb4..a03470e1b6923a07410adf6582e57064b7a8763a 100644
--- a/client/src/app/admin/instance/components/instance-form.component.ts
+++ b/client/src/app/admin/instance/components/instance-form.component.ts
@@ -58,7 +58,7 @@ export class InstanceFormComponent implements OnInit {
family_title_color: new UntypedFormControl('#007BFF'),
family_title_bold: new UntypedFormControl(false),
family_background_color: new UntypedFormControl('#FFFFFF'),
- family_color: new UntypedFormControl('#212529'),
+ family_text_color: new UntypedFormControl('#212529'),
progress_bar_title: new UntypedFormControl('Dataset search'),
progress_bar_title_color: new UntypedFormControl('#000000'),
progress_bar_subtitle: new UntypedFormControl('Select a dataset, add criteria, select output columns and display the result.'),
@@ -75,18 +75,19 @@ export class InstanceFormComponent implements OnInit {
progress_bar_text_color: new UntypedFormControl('#91B2BF'),
search_next_btn_color: new UntypedFormControl('#007BFF'),
search_next_btn_hover_color: new UntypedFormControl('#007BFF'),
- search_next_btn_text_color: new UntypedFormControl('#FFFFFF'),
+ search_next_btn_hover_text_color: new UntypedFormControl('#FFFFFF'),
search_back_btn_color: new UntypedFormControl('#6C757D'),
search_back_btn_hover_color: new UntypedFormControl('#6C757D'),
- search_back_btn_text_color: new UntypedFormControl('#FFFFFF'),
+ search_back_btn_hover_text_color: new UntypedFormControl('#FFFFFF'),
dataset_select_btn_color: new UntypedFormControl('#6C757D'),
dataset_select_btn_hover_color: new UntypedFormControl('#6C757D'),
- dataset_select_btn_text_color: new UntypedFormControl('#FFFFFF'),
- result_header_background_color: new UntypedFormControl('#E9ECEF'),
- result_header_text_color: new UntypedFormControl('#000000'),
- result_header_btn_color: new UntypedFormControl('#007BFF'),
- result_header_btn_hover_color: new UntypedFormControl('#0069D9'),
- result_header_btn_text_color: new UntypedFormControl('#FFFFFF'),
+ dataset_select_btn_hover_text_color: new UntypedFormControl('#FFFFFF'),
+ dataset_selected_icon_color: new UntypedFormControl('#28A745'),
+ search_info_background_color: new UntypedFormControl('#E9ECEF'),
+ search_info_text_color: new UntypedFormControl('#000000'),
+ search_info_btn_color: new UntypedFormControl('#007BFF'),
+ search_info_btn_hover_color: new UntypedFormControl('#0069D9'),
+ search_info_btn_text_color: new UntypedFormControl('#FFFFFF'),
result_datatable_bordered: new UntypedFormControl(true),
result_datatable_border_color: new UntypedFormControl('#DEE2E6'),
result_datatable_header_background_color: new UntypedFormControl('#FFFFFF'),
diff --git a/client/src/app/instance/instance.component.spec.ts b/client/src/app/instance/instance.component.spec.ts
index 2b3dea50e3df7a85ac888e4dcb3afc08e711a372..74df9c43625eaddb8814c7447e640c83a7bdd3c1 100644
--- a/client/src/app/instance/instance.component.spec.ts
+++ b/client/src/app/instance/instance.component.spec.ts
@@ -105,7 +105,7 @@ describe('[Instance] InstanceComponent', () => {
family_title_color: '#007BFF',
family_title_bold: false,
family_background_color: '#FFFFFF',
- family_color: '#212529',
+ family_text_color: '#212529',
progress_bar_title: 'Dataset search',
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
@@ -122,18 +122,19 @@ describe('[Instance] InstanceComponent', () => {
progress_bar_text_color: '#91B2BF',
search_next_btn_color: '#007BFF',
search_next_btn_hover_color: '#007BFF',
- search_next_btn_text_color: '#FFFFFF',
+ search_next_btn_hover_text_color: '#FFFFFF',
search_back_btn_color: '#6C757D',
search_back_btn_hover_color: '#6C757D',
- search_back_btn_text_color: '#FFFFFF',
+ search_back_btn_hover_text_color: '#FFFFFF',
dataset_select_btn_color: '#6C757D',
dataset_select_btn_hover_color: '#6C757D',
- dataset_select_btn_text_color: '#FFFFFF',
- result_header_background_color: '#E9ECEF',
- result_header_text_color: '#000000',
- result_header_btn_color: '#007BFF',
- result_header_btn_hover_color: '#0069D9',
- result_header_btn_text_color: '#FFFFFF',
+ dataset_select_btn_hover_text_color: '#FFFFFF',
+ dataset_selected_icon_color: '#28A745',
+ search_info_background_color: '#E9ECEF',
+ search_info_text_color: '#000000',
+ search_info_btn_color: '#007BFF',
+ search_info_btn_hover_color: '#0069D9',
+ search_info_btn_text_color: '#FFFFFF',
result_datatable_bordered: true,
result_datatable_border_color: '#DEE2E6',
result_datatable_header_background_color: '#FFFFFF',
diff --git a/client/src/app/instance/instance.component.ts b/client/src/app/instance/instance.component.ts
index 0b0defe063d08dcf4f26895e3da192d103928933..1c06bda5acc201e41a53fafcb70a392cabe68cda 100644
--- a/client/src/app/instance/instance.component.ts
+++ b/client/src/app/instance/instance.component.ts
@@ -93,6 +93,7 @@ export class InstanceComponent implements OnInit, OnDestroy {
}
this.body.style.backgroundColor = instance.design_background_color;
if(document.styleSheets.length > 0) {
+ //Navbar style
this.style.setStyles('.navbar-instance', {
'background-color': instance.navbar_background_color,
'border-bottom': `1px solid ${instance.navbar_border_bottom_color}`,
@@ -114,6 +115,7 @@ export class InstanceComponent implements OnInit, OnDestroy {
});
this.style.setStyle('.navbar-instance #button-user', 'color', instance.navbar_user_btn_color);
+ // Footer style
this.style.setStyles('.footer', {
'background-color': instance.footer_background_color,
'border-top': `1px solid ${instance.footer_border_top_color}`,
@@ -126,7 +128,7 @@ export class InstanceComponent implements OnInit, OnDestroy {
'border-color': instance.search_next_btn_color
});
this.style.setStyles('.search-next:hover.btn.btn-outline-primary', {
- 'color': instance.search_next_btn_text_color,
+ 'color': instance.search_next_btn_hover_text_color,
'background-color': instance.search_next_btn_hover_color,
'border-color': instance.search_next_btn_hover_color
});
@@ -137,45 +139,49 @@ export class InstanceComponent implements OnInit, OnDestroy {
'border-color': instance.search_back_btn_color
});
this.style.setStyles('.search-back:hover.btn.btn-outline-secondary', {
- 'color': instance.search_back_btn_text_color,
+ 'color': instance.search_back_btn_hover_text_color,
'background-color': instance.search_back_btn_hover_color,
'border-color': instance.search_back_btn_hover_color
});
+ // Family
this.style.setStyle('.panel.card.custom-accordion', 'border-color', instance.family_border_color);
this.style.setStyle('.custom-accordion .panel-heading', 'background-color', instance.family_header_background_color);
this.style.setStyle('.custom-accordion .panel-heading .btn-link', 'color', instance.family_title_color);
const familyTitleBold = (instance.family_title_bold) ? 'bold' : 'normal';
this.style.setStyle('.custom-accordion .panel-heading .btn-link', 'font-weight', familyTitleBold);
this.style.setStyles('.custom-accordion .panel-body', {
- 'color': instance.family_color,
+ 'color': instance.family_text_color,
'background-color': `${instance.family_background_color}`
});
this.style.setStyle('.custom-accordion .panel-body .card', 'background-color', instance.family_background_color);
+ // Dataset selection
this.style.setStyles('.dataset-select-btn.btn.btn-outline-secondary', {
'color': instance.dataset_select_btn_color,
'border-color': instance.dataset_select_btn_color
});
this.style.setStyles('.dataset-select-btn:hover.btn.btn-outline-secondary', {
- 'color': instance.dataset_select_btn_text_color,
+ 'color': instance.dataset_select_btn_hover_text_color,
'background-color': instance.dataset_select_btn_hover_color,
'border-color': instance.dataset_select_btn_hover_color
});
+ this.style.setStyle('.search-dataset-selected', 'color', instance.dataset_selected_icon_color);
+ // Search info
this.style.setStyles('.anis-result-header.jumbotron', {
- 'background-color': instance.result_header_background_color,
- 'color': instance.result_header_text_color
+ 'background-color': instance.search_info_background_color,
+ 'color': instance.search_info_text_color
});
this.style.setStyles('.anis-result-header .btn-primary', {
- 'background-color': instance.result_header_btn_color,
- 'border-color': instance.result_header_btn_color,
- 'color': instance.result_header_btn_text_color
+ 'background-color': instance.search_info_btn_color,
+ 'border-color': instance.search_info_btn_color,
+ 'color': instance.search_info_btn_text_color
});
this.style.setStyles('.anis-result-header .btn-primary:hover', {
- 'background-color': instance.result_header_btn_hover_color,
- 'border-color': instance.result_header_btn_hover_color,
- 'color': instance.result_header_btn_text_color
+ 'background-color': instance.search_info_btn_hover_color,
+ 'border-color': instance.search_info_btn_hover_color,
+ 'color': instance.search_info_btn_text_color
});
if (instance.result_datatable_bordered) {
diff --git a/client/src/app/instance/search/components/criteria/search-criteria-list.component.html b/client/src/app/instance/search/components/criteria/search-criteria-list.component.html
index 3aa953cda6e7f878cdf97ae5a14b2e432bae14db..1e0c2e546104ba8019df926f62d44d938ca3edf1 100644
--- a/client/src/app/instance/search/components/criteria/search-criteria-list.component.html
+++ b/client/src/app/instance/search/components/criteria/search-criteria-list.component.html
@@ -32,9 +32,9 @@
</div>
</div>
<div class="row">
- <p>Once you have added your search criteria, if any, you can
- <a routerLink="/instance/{{ instance.name }}/search/output/{{ datasetSelected }}" [queryParams]="queryParams">
- select the columns to display</a>.
+ <p>Once you have added your search criteria, if any, you can select the
+ <a class="btn btn-outline-primary" routerLink="/instance/{{ instance.name }}/search/output/{{ datasetSelected }}" [queryParams]="queryParams">
+ output columns <span class="fas fa-arrow-right"></span></a>
</p>
</div>
</div>
diff --git a/client/src/app/instance/search/components/dataset/dataset-card.component.html b/client/src/app/instance/search/components/dataset/dataset-card.component.html
index 9e1086cd70d5aa4189a13294db6b7acba21a922c..f1882c3f0490134f8fce7af6e0532c1784d011b3 100644
--- a/client/src/app/instance/search/components/dataset/dataset-card.component.html
+++ b/client/src/app/instance/search/components/dataset/dataset-card.component.html
@@ -22,8 +22,8 @@
<button *ngIf="!isDatasetAccessible()" class="btn btn-outline-danger disabled" title="You are not authorized to access this dataset">
<span class="fa-solid fa-lock"></span> Private
</button>
- <span *ngIf="dataset.name === datasetSelected">
- <span class="far fa-check-circle fa-2x text-success"></span>
+ <span *ngIf="dataset.name === datasetSelected" class="search-dataset-selected">
+ <span class="far fa-check-circle fa-2x"></span>
</span>
</div>
</div>
diff --git a/client/src/app/instance/search/components/output/output-info.component.html b/client/src/app/instance/search/components/output/output-info.component.html
index 5a755ff873f0b9d09b5b07d4bdd70151a61cec74..54f7a862c97166f9c6f9788fcefa34342642b5a7 100644
--- a/client/src/app/instance/search/components/output/output-info.component.html
+++ b/client/src/app/instance/search/components/output/output-info.component.html
@@ -8,10 +8,10 @@
<div class="row">
<p>
Here you can customise the list of the table columns you want to display in the result
- table. You can then
- <a routerLink="/instance/{{ instanceSelected }}/search/result/{{ datasetSelected }}" [queryParams]="queryParams">
- display the results
- </a>.
+ table. You can then display the
+ <a class="btn btn-outline-primary" routerLink="/instance/{{ instanceSelected }}/search/result/{{ datasetSelected }}" [queryParams]="queryParams">
+ result table <span class="fas fa-arrow-right"></span>
+ </a>
</p>
</div>
</div>
diff --git a/client/src/app/instance/search/components/progress-bar.component.spec.ts b/client/src/app/instance/search/components/progress-bar.component.spec.ts
index 862258f4abb6a804b0edbb97f47e650c8dcdc652..b15b0de51b84b99713f24c4ca7baefc15e6f82d2 100644
--- a/client/src/app/instance/search/components/progress-bar.component.spec.ts
+++ b/client/src/app/instance/search/components/progress-bar.component.spec.ts
@@ -78,7 +78,7 @@ describe('[Instance][Search][Component] ProgressBarComponent', () => {
family_title_color: '#007BFF',
family_title_bold: false,
family_background_color: '#FFFFFF',
- family_color: '#212529',
+ family_text_color: '#212529',
progress_bar_title: 'Dataset search',
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
@@ -95,18 +95,19 @@ describe('[Instance][Search][Component] ProgressBarComponent', () => {
progress_bar_text_color: '#91B2BF',
search_next_btn_color: '#007BFF',
search_next_btn_hover_color: '#007BFF',
- search_next_btn_text_color: '#FFFFFF',
+ search_next_btn_hover_text_color: '#FFFFFF',
search_back_btn_color: '#6C757D',
search_back_btn_hover_color: '#6C757D',
- search_back_btn_text_color: '#FFFFFF',
+ search_back_btn_hover_text_color: '#FFFFFF',
dataset_select_btn_color: '#6C757D',
dataset_select_btn_hover_color: '#6C757D',
- dataset_select_btn_text_color: '#FFFFFF',
- result_header_background_color: '#E9ECEF',
- result_header_text_color: '#000000',
- result_header_btn_color: '#007BFF',
- result_header_btn_hover_color: '#0069D9',
- result_header_btn_text_color: '#FFFFFF',
+ dataset_select_btn_hover_text_color: '#FFFFFF',
+ dataset_selected_icon_color: '#28A745',
+ search_info_background_color: '#E9ECEF',
+ search_info_text_color: '#000000',
+ search_info_btn_color: '#007BFF',
+ search_info_btn_hover_color: '#0069D9',
+ search_info_btn_text_color: '#FFFFFF',
result_datatable_bordered: true,
result_datatable_border_color: '#DEE2E6',
result_datatable_header_background_color: '#FFFFFF',
@@ -168,7 +169,7 @@ describe('[Instance][Search][Component] ProgressBarComponent', () => {
family_title_color: '#007BFF',
family_title_bold: false,
family_background_color: '#FFFFFF',
- family_color: '#212529',
+ family_text_color: '#212529',
progress_bar_title: 'Dataset search',
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
@@ -185,18 +186,19 @@ describe('[Instance][Search][Component] ProgressBarComponent', () => {
progress_bar_text_color: '#91B2BF',
search_next_btn_color: '#007BFF',
search_next_btn_hover_color: '#007BFF',
- search_next_btn_text_color: '#FFFFFF',
+ search_next_btn_hover_text_color: '#FFFFFF',
search_back_btn_color: '#6C757D',
search_back_btn_hover_color: '#6C757D',
- search_back_btn_text_color: '#FFFFFF',
+ search_back_btn_hover_text_color: '#FFFFFF',
dataset_select_btn_color: '#6C757D',
dataset_select_btn_hover_color: '#6C757D',
- dataset_select_btn_text_color: '#FFFFFF',
- result_header_background_color: '#E9ECEF',
- result_header_text_color: '#000000',
- result_header_btn_color: '#007BFF',
- result_header_btn_hover_color: '#0069D9',
- result_header_btn_text_color: '#FFFFFF',
+ dataset_select_btn_hover_text_color: '#FFFFFF',
+ dataset_selected_icon_color: '#28A745',
+ search_info_background_color: '#E9ECEF',
+ search_info_text_color: '#000000',
+ search_info_btn_color: '#007BFF',
+ search_info_btn_hover_color: '#0069D9',
+ search_info_btn_text_color: '#FFFFFF',
result_datatable_bordered: true,
result_datatable_border_color: '#DEE2E6',
result_datatable_header_background_color: '#FFFFFF',
diff --git a/client/src/app/instance/search/containers/abstract-search.component.ts b/client/src/app/instance/search/containers/abstract-search.component.ts
index 21a02c66138481a4f3460e3ae19407ddce2a6d40..685141f2ee5311182dfb660bd1aa98f8ce83cd10 100644
--- a/client/src/app/instance/search/containers/abstract-search.component.ts
+++ b/client/src/app/instance/search/containers/abstract-search.component.ts
@@ -13,7 +13,7 @@ import { Store } from '@ngrx/store';
import { Observable } from 'rxjs';
import { ConeSearch, Criterion, SearchQueryParams } from '../../store/models';
-import { Dataset, Attribute, CriteriaFamily, OutputFamily, OutputCategory } from 'src/app/metamodel/models';
+import { Instance, Dataset, Attribute, CriteriaFamily, OutputFamily, OutputCategory } from 'src/app/metamodel/models';
import * as instanceSelector from 'src/app/metamodel/selectors/instance.selector';
import * as datasetSelector from 'src/app/metamodel/selectors/dataset.selector';
@@ -37,6 +37,7 @@ import * as coneSearchSelector from '../../store/selectors/cone-search.selector'
export abstract class AbstractSearchComponent implements OnInit {
public datasetSelected: Observable<string>;
public instanceSelected: Observable<string>;
+ public instance: Observable<Instance>;
public datasetListIsLoading: Observable<boolean>;
public datasetListIsLoaded: Observable<boolean>;
public datasetList: Observable<Dataset[]>;
@@ -62,6 +63,7 @@ export abstract class AbstractSearchComponent implements OnInit {
constructor(protected store: Store<{ }>) {
this.datasetSelected = store.select(datasetSelector.selectDatasetNameByRoute);
this.instanceSelected = store.select(instanceSelector.selectInstanceNameByRoute);
+ this.instance = store.select(instanceSelector.selectInstanceByRouteName);
this.datasetListIsLoading = store.select(datasetSelector.selectDatasetListIsLoading);
this.datasetListIsLoaded = store.select(datasetSelector.selectDatasetListIsLoaded);
this.datasetList = store.select(datasetSelector.selectAllDatasets);
diff --git a/client/src/app/instance/search/containers/criteria.component.html b/client/src/app/instance/search/containers/criteria.component.html
index 438f30601c73bf3a7a3c4a634ae815aa9fdc3d43..73ce251929f86be36df218a7da3115767ca85017 100644
--- a/client/src/app/instance/search/containers/criteria.component.html
+++ b/client/src/app/instance/search/containers/criteria.component.html
@@ -45,13 +45,13 @@
<a routerLink="/instance/{{ instanceSelected | async }}/search/dataset/{{ datasetSelected | async }}"
[queryParams]="queryParams | async"
class="search-back btn btn-outline-secondary">
- <span class="fas fa-arrow-left"></span> Dataset selection
+ <span class="fas fa-arrow-left"></span> {{ (instance | async).progress_bar_step_dataset_title }}
</a>
</div>
<div class="col col-auto">
<a routerLink="/instance/{{ instanceSelected | async }}/search/output/{{ datasetSelected | async }}" [queryParams]="queryParams | async"
class="search-next btn btn-outline-primary">
- Output columns <span class="fas fa-arrow-right"></span>
+ {{ (instance | async).progress_bar_step_output_title }} <span class="fas fa-arrow-right"></span>
</a>
</div>
</div>
diff --git a/client/src/app/instance/search/containers/criteria.component.ts b/client/src/app/instance/search/containers/criteria.component.ts
index 83117cf8d64f64d586c8da1e5986054a510f90fd..cb78817b14fc9b92861d1e10a7a99f1a789e9fb8 100644
--- a/client/src/app/instance/search/containers/criteria.component.ts
+++ b/client/src/app/instance/search/containers/criteria.component.ts
@@ -31,7 +31,6 @@ import * as coneSearchSelector from '../../store/selectors/cone-search.selector'
templateUrl: 'criteria.component.html'
})
export class CriteriaComponent extends AbstractSearchComponent {
- public instance: Observable<Instance>;
public dataset: Observable<Dataset>;
public resolverIsLoading: Observable<boolean>;
public resolverIsLoaded: Observable<boolean>;
@@ -41,7 +40,6 @@ export class CriteriaComponent extends AbstractSearchComponent {
constructor(protected store: Store<{ }>) {
super(store);
- this.instance = store.select(instanceSelector.selectInstanceByRouteName);
this.dataset = store.select(datasetSelector.selectDatasetByRouteName);
this.resolverIsLoading = this.store.select(coneSearchSelector.selectResolverIsLoading);
this.resolverIsLoaded = this.store.select(coneSearchSelector.selectResolverIsLoaded);
diff --git a/client/src/app/instance/search/containers/dataset.component.html b/client/src/app/instance/search/containers/dataset.component.html
index 4430411af0560ac51d13b651d3eeb756af6db09e..c5b44cc162e190045193c30d4cfa4cde55622e9c 100644
--- a/client/src/app/instance/search/containers/dataset.component.html
+++ b/client/src/app/instance/search/containers/dataset.component.html
@@ -35,7 +35,7 @@
<div *ngIf="datasetSelected | async" class="row mt-5 justify-content-end">
<div class="col col-auto">
<a routerLink="/instance/{{ instanceSelected | async}}/search/criteria/{{ datasetSelected | async }}" [queryParams]="queryParams | async"
- class="search-next btn btn-outline-primary">Search criteria <span class="fas fa-arrow-right"></span>
+ class="search-next btn btn-outline-primary">{{ (instance | async).progress_bar_step_criteria_title }} <span class="fas fa-arrow-right"></span>
</a>
</div>
</div>
diff --git a/client/src/app/instance/search/containers/output.component.html b/client/src/app/instance/search/containers/output.component.html
index eb8a3b84174c276d1fe577ebfacf033080cc8032..bf62d14fe2205301deed27a930bf4de958ba3248 100644
--- a/client/src/app/instance/search/containers/output.component.html
+++ b/client/src/app/instance/search/containers/output.component.html
@@ -28,18 +28,18 @@
<div class="col">
<a routerLink="/instance/{{ instanceSelected | async }}/search/criteria/{{ datasetSelected | async }}" [queryParams]="queryParams | async"
class="search-back btn btn-outline-secondary">
- <span class="fas fa-arrow-left"></span> Search criteria
+ <span class="fas fa-arrow-left"></span> {{ (instance | async).progress_bar_step_criteria_title }}
</a>
</div>
<!-- Simplifier ? -->
<div class="col col-auto">
<button *ngIf="(outputList | async).length < 1; else notEmpty" class="search-next btn btn-outline-primary disabled not-allowed" title="At least 1 output required!">
- Result table <span class="fas fa-arrow-right"></span>
+ {{ (instance | async).progress_bar_step_result_title }} <span class="fas fa-arrow-right"></span>
</button>
<ng-template #notEmpty>
<a routerLink="/instance/{{ instanceSelected | async }}/search/result/{{ datasetSelected | async }}" [queryParams]="queryParams | async"
class="search-next btn btn-outline-primary">
- Result table <span class="fas fa-arrow-right"></span>
+ {{ (instance | async).progress_bar_step_result_title }} <span class="fas fa-arrow-right"></span>
</a>
</ng-template>
</div>
diff --git a/client/src/app/instance/search/containers/output.component.ts b/client/src/app/instance/search/containers/output.component.ts
index e3a20028ca7248d3c3f5198b9ef8244dc2f98b1c..726c6bfe2af3f299226dc993e9f83d3f17e75aee 100644
--- a/client/src/app/instance/search/containers/output.component.ts
+++ b/client/src/app/instance/search/containers/output.component.ts
@@ -27,12 +27,10 @@ import * as searchActions from '../../store/actions/search.actions';
templateUrl: 'output.component.html'
})
export class OutputComponent extends AbstractSearchComponent {
- public instance: Observable<Instance>;
public dataset: Observable<Dataset>;
constructor(protected store: Store<{ }>) {
super(store);
- this.instance = store.select(instanceSelector.selectInstanceByRouteName);
this.dataset = store.select(datasetSelector.selectDatasetByRouteName);
}
diff --git a/client/src/app/instance/search/containers/result.component.html b/client/src/app/instance/search/containers/result.component.html
index a88984f2b02be948042c52d818c32465114ff9e6..133d33add81161ccce61efba30881ddb20f153db 100644
--- a/client/src/app/instance/search/containers/result.component.html
+++ b/client/src/app/instance/search/containers/result.component.html
@@ -133,7 +133,7 @@
<div class="row mt-5 justify-content-between">
<div class="col">
<a routerLink="/instance/{{ instanceSelected | async }}/search/output/{{ datasetSelected | async }}" [queryParams]="queryParams | async" class="search-back btn btn-outline-secondary">
- <span class="fas fa-arrow-left"></span> Output columns
+ <span class="fas fa-arrow-left"></span> {{ (instance | async).progress_bar_step_output_title }}
</a>
</div>
</div>
diff --git a/client/src/app/instance/search/containers/result.component.ts b/client/src/app/instance/search/containers/result.component.ts
index a6195fd3bf285ec050e0091fdcbf331d9d8bac47..1f0d7dbbdf625bde1c0105de200ade814c564049 100644
--- a/client/src/app/instance/search/containers/result.component.ts
+++ b/client/src/app/instance/search/containers/result.component.ts
@@ -39,7 +39,6 @@ import * as coneSearchConfigSelector from 'src/app/metamodel/selectors/cone-sear
templateUrl: 'result.component.html'
})
export class ResultComponent extends AbstractSearchComponent implements OnInit, OnDestroy {
- public instance: Observable<Instance>;
public dataset: Observable<Dataset>;
public dataLength: Observable<number>;
public dataLengthIsLoading: Observable<boolean>;
@@ -65,7 +64,6 @@ export class ResultComponent extends AbstractSearchComponent implements OnInit,
constructor(protected store: Store<{}>) {
super(store);
this.dataset = store.select(datasetSelector.selectDatasetByRouteName);
- this.instance = store.select(instanceSelector.selectInstanceByRouteName);
this.dataLength = this.store.select(searchSelector.selectDataLength);
this.dataLengthIsLoading = this.store.select(searchSelector.selectDataLengthIsLoading);
this.dataLengthIsLoaded = this.store.select(searchSelector.selectDataLengthIsLoaded);
diff --git a/client/src/app/instance/store/effects/search-multiple.effects.spec.ts b/client/src/app/instance/store/effects/search-multiple.effects.spec.ts
index fbfd1647050fd51e1c7d1330bb72b96a92c51f38..1ee5ef94950381d9d92ba0910654c4c5b2dfeeff 100644
--- a/client/src/app/instance/store/effects/search-multiple.effects.spec.ts
+++ b/client/src/app/instance/store/effects/search-multiple.effects.spec.ts
@@ -159,7 +159,7 @@ describe('[Instance][Store] SearchMultipleEffects', () => {
family_title_color: '#007BFF',
family_title_bold: false,
family_background_color: '#FFFFFF',
- family_color: '#212529',
+ family_text_color: '#212529',
footer_logos: null,
progress_bar_title: 'Dataset search',
progress_bar_title_color: '#000000',
@@ -177,18 +177,19 @@ describe('[Instance][Store] SearchMultipleEffects', () => {
progress_bar_text_color: '#91B2BF',
search_next_btn_color: '#007BFF',
search_next_btn_hover_color: '#007BFF',
- search_next_btn_text_color: '#FFFFFF',
+ search_next_btn_hover_text_color: '#FFFFFF',
search_back_btn_color: '#6C757D',
search_back_btn_hover_color: '#6C757D',
- search_back_btn_text_color: '#FFFFFF',
+ search_back_btn_hover_text_color: '#FFFFFF',
dataset_select_btn_color: '#6C757D',
dataset_select_btn_hover_color: '#6C757D',
- dataset_select_btn_text_color: '#FFFFFF',
- result_header_background_color: '#E9ECEF',
- result_header_text_color: '#000000',
- result_header_btn_color: '#007BFF',
- result_header_btn_hover_color: '#0069D9',
- result_header_btn_text_color: '#FFFFFF',
+ dataset_select_btn_hover_text_color: '#FFFFFF',
+ dataset_selected_icon_color: '#28A745',
+ search_info_background_color: '#E9ECEF',
+ search_info_text_color: '#000000',
+ search_info_btn_color: '#007BFF',
+ search_info_btn_hover_color: '#0069D9',
+ search_info_btn_text_color: '#FFFFFF',
result_datatable_bordered: true,
result_datatable_border_color: '#DEE2E6',
result_datatable_header_background_color: '#FFFFFF',
@@ -293,7 +294,7 @@ describe('[Instance][Store] SearchMultipleEffects', () => {
family_title_color: '#007BFF',
family_title_bold: false,
family_background_color: '#FFFFFF',
- family_color: '#212529',
+ family_text_color: '#212529',
progress_bar_title: 'Dataset search',
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
@@ -310,18 +311,19 @@ describe('[Instance][Store] SearchMultipleEffects', () => {
progress_bar_text_color: '#91B2BF',
search_next_btn_color: '#007BFF',
search_next_btn_hover_color: '#007BFF',
- search_next_btn_text_color: '#FFFFFF',
+ search_next_btn_hover_text_color: '#FFFFFF',
search_back_btn_color: '#6C757D',
search_back_btn_hover_color: '#6C757D',
- search_back_btn_text_color: '#FFFFFF',
+ search_back_btn_hover_text_color: '#FFFFFF',
dataset_select_btn_color: '#6C757D',
dataset_select_btn_hover_color: '#6C757D',
- dataset_select_btn_text_color: '#FFFFFF',
- result_header_background_color: '#E9ECEF',
- result_header_text_color: '#000000',
- result_header_btn_color: '#007BFF',
- result_header_btn_hover_color: '#0069D9',
- result_header_btn_text_color: '#FFFFFF',
+ dataset_select_btn_hover_text_color: '#FFFFFF',
+ dataset_selected_icon_color: '#28A745',
+ search_info_background_color: '#E9ECEF',
+ search_info_text_color: '#000000',
+ search_info_btn_color: '#007BFF',
+ search_info_btn_hover_color: '#0069D9',
+ search_info_btn_text_color: '#FFFFFF',
result_datatable_bordered: true,
result_datatable_border_color: '#DEE2E6',
result_datatable_header_background_color: '#FFFFFF',
diff --git a/client/src/app/metamodel/models/instance.model.ts b/client/src/app/metamodel/models/instance.model.ts
index 2442754f9edce26c57ed8966bf13683ae319550f..f7d2252541e0766313e1d4555a8fbf0908da3706 100644
--- a/client/src/app/metamodel/models/instance.model.ts
+++ b/client/src/app/metamodel/models/instance.model.ts
@@ -45,7 +45,7 @@ export interface Instance {
family_title_color: string;
family_title_bold: boolean;
family_background_color: string;
- family_color: string;
+ family_text_color: string;
progress_bar_title: string;
progress_bar_title_color: string;
progress_bar_subtitle: string;
@@ -62,18 +62,19 @@ export interface Instance {
progress_bar_text_color: string;
search_next_btn_color: string;
search_next_btn_hover_color: string;
- search_next_btn_text_color: string;
+ search_next_btn_hover_text_color: string;
search_back_btn_color: string;
search_back_btn_hover_color: string;
- search_back_btn_text_color: string;
+ search_back_btn_hover_text_color: string;
dataset_select_btn_color: string;
dataset_select_btn_hover_color: string;
- dataset_select_btn_text_color: string;
- result_header_background_color: string;
- result_header_text_color: string;
- result_header_btn_color: string;
- result_header_btn_hover_color: string;
- result_header_btn_text_color: string;
+ dataset_select_btn_hover_text_color: string;
+ dataset_selected_icon_color: string;
+ search_info_background_color: string;
+ search_info_text_color: string;
+ search_info_btn_color: string;
+ search_info_btn_hover_color: string;
+ search_info_btn_text_color: string;
result_datatable_bordered: boolean;
result_datatable_border_color: string;
result_datatable_header_background_color: string;
diff --git a/client/src/test-data.ts b/client/src/test-data.ts
index e62ad75d77704842eabdcb1e8d4e482bc6f3559b..b8d271d35dcb9d2fade87d17545fa5116e43a21f 100644
--- a/client/src/test-data.ts
+++ b/client/src/test-data.ts
@@ -75,7 +75,7 @@ export const INSTANCE_LIST: Instance[] = [
family_title_color: '#007BFF',
family_title_bold: false,
family_background_color: '#FFFFFF',
- family_color: '#212529',
+ family_text_color: '#212529',
progress_bar_title: 'Dataset search',
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
@@ -92,18 +92,19 @@ export const INSTANCE_LIST: Instance[] = [
progress_bar_text_color: '#91B2BF',
search_next_btn_color: '#007BFF',
search_next_btn_hover_color: '#007BFF',
- search_next_btn_text_color: '#FFFFFF',
+ search_next_btn_hover_text_color: '#FFFFFF',
search_back_btn_color: '#6C757D',
search_back_btn_hover_color: '#6C757D',
- search_back_btn_text_color: '#FFFFFF',
+ search_back_btn_hover_text_color: '#FFFFFF',
dataset_select_btn_color: '#6C757D',
dataset_select_btn_hover_color: '#6C757D',
- dataset_select_btn_text_color: '#FFFFFF',
- result_header_background_color: '#E9ECEF',
- result_header_text_color: '#000000',
- result_header_btn_color: '#007BFF',
- result_header_btn_hover_color: '#0069D9',
- result_header_btn_text_color: '#FFFFFF',
+ dataset_select_btn_hover_text_color: '#FFFFFF',
+ dataset_selected_icon_color: '#28A745',
+ search_info_background_color: '#E9ECEF',
+ search_info_text_color: '#000000',
+ search_info_btn_color: '#007BFF',
+ search_info_btn_hover_color: '#0069D9',
+ search_info_btn_text_color: '#FFFFFF',
result_datatable_bordered: true,
result_datatable_border_color: '#DEE2E6',
result_datatable_header_background_color: '#FFFFFF',
@@ -159,7 +160,7 @@ export const INSTANCE_LIST: Instance[] = [
family_title_color: '#007BFF',
family_title_bold: false,
family_background_color: '#FFFFFF',
- family_color: '#212529',
+ family_text_color: '#212529',
progress_bar_title: 'Dataset search',
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
@@ -176,18 +177,19 @@ export const INSTANCE_LIST: Instance[] = [
progress_bar_text_color: '#91B2BF',
search_next_btn_color: '#007BFF',
search_next_btn_hover_color: '#007BFF',
- search_next_btn_text_color: '#FFFFFF',
+ search_next_btn_hover_text_color: '#FFFFFF',
search_back_btn_color: '#6C757D',
search_back_btn_hover_color: '#6C757D',
- search_back_btn_text_color: '#FFFFFF',
+ search_back_btn_hover_text_color: '#FFFFFF',
dataset_select_btn_color: '#6C757D',
dataset_select_btn_hover_color: '#6C757D',
- dataset_select_btn_text_color: '#FFFFFF',
- result_header_background_color: '#E9ECEF',
- result_header_text_color: '#000000',
- result_header_btn_color: '#007BFF',
- result_header_btn_hover_color: '#0069D9',
- result_header_btn_text_color: '#FFFFFF',
+ dataset_select_btn_hover_text_color: '#FFFFFF',
+ dataset_selected_icon_color: '#28A745',
+ search_info_background_color: '#E9ECEF',
+ search_info_text_color: '#000000',
+ search_info_btn_color: '#007BFF',
+ search_info_btn_hover_color: '#0069D9',
+ search_info_btn_text_color: '#FFFFFF',
result_datatable_bordered: true,
result_datatable_border_color: '#DEE2E6',
result_datatable_header_background_color: '#FFFFFF',
@@ -245,7 +247,7 @@ export const INSTANCE: Instance = {
family_title_color: '#007BFF',
family_title_bold: false,
family_background_color: '#FFFFFF',
- family_color: '#212529',
+ family_text_color: '#212529',
progress_bar_title: 'Dataset search',
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
@@ -262,18 +264,19 @@ export const INSTANCE: Instance = {
progress_bar_text_color: '#91B2BF',
search_next_btn_color: '#007BFF',
search_next_btn_hover_color: '#007BFF',
- search_next_btn_text_color: '#FFFFFF',
+ search_next_btn_hover_text_color: '#FFFFFF',
search_back_btn_color: '#6C757D',
search_back_btn_hover_color: '#6C757D',
- search_back_btn_text_color: '#FFFFFF',
+ search_back_btn_hover_text_color: '#FFFFFF',
dataset_select_btn_color: '#6C757D',
dataset_select_btn_hover_color: '#6C757D',
- dataset_select_btn_text_color: '#FFFFFF',
- result_header_background_color: '#E9ECEF',
- result_header_text_color: '#000000',
- result_header_btn_color: '#007BFF',
- result_header_btn_hover_color: '#0069D9',
- result_header_btn_text_color: '#FFFFFF',
+ dataset_select_btn_hover_text_color: '#FFFFFF',
+ dataset_selected_icon_color: '#28A745',
+ search_info_background_color: '#E9ECEF',
+ search_info_text_color: '#000000',
+ search_info_btn_color: '#007BFF',
+ search_info_btn_hover_color: '#0069D9',
+ search_info_btn_text_color: '#FFFFFF',
result_datatable_bordered: true,
result_datatable_border_color: '#DEE2E6',
result_datatable_header_background_color: '#FFFFFF',
diff --git a/conf-dev/create-db.sh b/conf-dev/create-db.sh
index c41f01e62e901197a7ef515dd181512cfb1ea724..92e15bbd464471a39404fed8ae8c33b61d496a1c 100644
--- a/conf-dev/create-db.sh
+++ b/conf-dev/create-db.sh
@@ -8,7 +8,7 @@ set -e
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
-curl -d '{"name":"default","label":"Default instance","description":"Instance for the test","scientific_manager":"M. Durand","instrument":"Multiple","wavelength_domain":"Visible imaging / Spectroscopy","display":10,"data_path":"\/DEFAULT","files_path":"\/INSTANCE_FILES","public":true,"portal_logo":"","design_color":"#7AC29A","design_background_color":"#ffffff","design_logo":"/logo.png","design_favicon":"/favicon.ico","navbar_background_color":"#F8F9FA","navbar_border_bottom_color":"#DEE2E6","navbar_color_href":"#000000","navbar_font_family":"Roboto, sans-serif","navbar_sign_in_btn_color":"#28A745","navbar_user_btn_color":"#7AC29A","footer_background_color":"#F8F9FA","footer_border_top_color":"#DEE2E6","footer_text_color":"#000000","footer_logos":[{"href":"http:\/\/lam.fr","title":"Laboratoire d'\''Astrophysique de Marseille","file":"\/logo_lam_s.png","display":20},{"href":"http:\/\/www.univ-amu.fr","title":"Aix*Marseille Universit\u00e9","file":"\/logo_amu_s.png","display":30},{"href":"http:\/\/anis.lam.fr","title":"AstroNomical Information System","file":"\/cesam_anis40.png","display":50},{"href":"http:\/\/cesam.lam.fr","title":"Centre de donn\u00e9es Astrophysique de Marseille","file":"\/logo_cesam_s.png","display":10},{"href":"http:\/\/www.insu.cnrs.fr","title":"Institut National des Sciences de l'\''Univers","file":"\/logo_insu_s.png","display":40}],"family_border_color":"#DFDFDF","family_header_background_color":"#F7F7F7","family_title_color":"#007BFF","family_title_bold":false,"family_background_color":"#FFFFFF","family_color":"#212529","progress_bar_title":"Dataset search","progress_bar_title_color":"#000000","progress_bar_subtitle":"Select a dataset, add criteria, select output columns and display the result.","progress_bar_subtitle_color":"#6C757D","progress_bar_step_dataset_title":"Dataset selection","progress_bar_step_criteria_title":"Search criteria","progress_bar_step_output_title":"Output columns","progress_bar_step_result_title":"Result table","progress_bar_color":"#E9ECEF","progress_bar_active_color":"#7AC29A","progress_bar_circle_color":"#FFFFFF","progress_bar_circle_icon_color":"#CCCCCC","progress_bar_circle_icon_active_color":"#FFFFFF","progress_bar_text_color":"#91B2BF","search_next_btn_color":"#007BFF","search_next_btn_hover_color":"#007BFF","search_next_btn_text_color":"#FFFFFF","search_back_btn_color":"#6C757D","search_back_btn_hover_color":"#6C757D","search_back_btn_text_color":"#FFFFFF","dataset_select_btn_color":"#6C757D","dataset_select_btn_hover_color":"#6C757D","dataset_select_btn_text_color":"#FFFFFF","result_header_background_color":"#E9ECEF","result_header_text_color":"#000000","result_header_btn_color":"#007BFF","result_header_btn_hover_color":"#0069D9","result_header_btn_text_color":"#FFFFFF","result_datatable_bordered":true,"result_datatable_border_color":"#DEE2E6","result_datatable_header_background_color":"#FFFFFF","result_datatable_header_text_color":"#000000","result_datatable_rows_background_color":"#FFFFFF","result_datatable_rows_text_color":"#000000","result_datatable_sorted_color":"#C5C5C5","result_datatable_sorted_active_color":"#000000","result_datatable_link_color":"#007BFF","result_datatable_link_hover_color":"#0056B3","result_datatable_rows_selected_color":"#7AC29A","samp_enabled":true,"back_to_portal":true,"user_menu_enabled":true,"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_allowed":false,"documentation_label":"Documentation"}' --header 'Content-Type: application/json' -X POST http://localhost/instance
+curl -d '{"name":"default","label":"Default instance","description":"Instance for the test","scientific_manager":"M. Durand","instrument":"Multiple","wavelength_domain":"Visible imaging / Spectroscopy","display":10,"data_path":"\/DEFAULT","files_path":"\/INSTANCE_FILES","public":true,"portal_logo":"","design_color":"#7AC29A","design_background_color":"#ffffff","design_logo":"/logo.png","design_favicon":"/favicon.ico","navbar_background_color":"#F8F9FA","navbar_border_bottom_color":"#DEE2E6","navbar_color_href":"#000000","navbar_font_family":"Roboto, sans-serif","navbar_sign_in_btn_color":"#28A745","navbar_user_btn_color":"#7AC29A","footer_background_color":"#F8F9FA","footer_border_top_color":"#DEE2E6","footer_text_color":"#000000","footer_logos":[{"href":"http:\/\/lam.fr","title":"Laboratoire d'\''Astrophysique de Marseille","file":"\/logo_lam_s.png","display":20},{"href":"http:\/\/www.univ-amu.fr","title":"Aix*Marseille Universit\u00e9","file":"\/logo_amu_s.png","display":30},{"href":"http:\/\/anis.lam.fr","title":"AstroNomical Information System","file":"\/cesam_anis40.png","display":50},{"href":"http:\/\/cesam.lam.fr","title":"Centre de donn\u00e9es Astrophysique de Marseille","file":"\/logo_cesam_s.png","display":10},{"href":"http:\/\/www.insu.cnrs.fr","title":"Institut National des Sciences de l'\''Univers","file":"\/logo_insu_s.png","display":40}],"family_border_color":"#DFDFDF","family_header_background_color":"#F7F7F7","family_title_color":"#007BFF","family_title_bold":false,"family_background_color":"#FFFFFF","family_text_color":"#212529","progress_bar_title":"Dataset search","progress_bar_title_color":"#000000","progress_bar_subtitle":"Select a dataset, add criteria, select output columns and display the result.","progress_bar_subtitle_color":"#6C757D","progress_bar_step_dataset_title":"Dataset selection","progress_bar_step_criteria_title":"Search criteria","progress_bar_step_output_title":"Output columns","progress_bar_step_result_title":"Result table","progress_bar_color":"#E9ECEF","progress_bar_active_color":"#7AC29A","progress_bar_circle_color":"#FFFFFF","progress_bar_circle_icon_color":"#CCCCCC","progress_bar_circle_icon_active_color":"#FFFFFF","progress_bar_text_color":"#91B2BF","search_next_btn_color":"#007BFF","search_next_btn_hover_color":"#007BFF","search_next_btn_hover_text_color":"#FFFFFF","search_back_btn_color":"#6C757D","search_back_btn_hover_color":"#6C757D","search_back_btn_hover_text_color":"#FFFFFF","dataset_select_btn_color":"#6C757D","dataset_select_btn_hover_color":"#6C757D","dataset_select_btn_hover_text_color":"#FFFFFF","dataset_selected_icon_color":"#28A745","search_info_background_color":"#E9ECEF","search_info_text_color":"#000000","search_info_btn_color":"#007BFF","search_info_btn_hover_color":"#0069D9","search_info_btn_text_color":"#FFFFFF","result_datatable_bordered":true,"result_datatable_border_color":"#DEE2E6","result_datatable_header_background_color":"#FFFFFF","result_datatable_header_text_color":"#000000","result_datatable_rows_background_color":"#FFFFFF","result_datatable_rows_text_color":"#000000","result_datatable_sorted_color":"#C5C5C5","result_datatable_sorted_active_color":"#000000","result_datatable_link_color":"#007BFF","result_datatable_link_hover_color":"#0056B3","result_datatable_rows_selected_color":"#7AC29A","samp_enabled":true,"back_to_portal":true,"user_menu_enabled":true,"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_allowed":false,"documentation_label":"Documentation"}' --header 'Content-Type: application/json' -X POST http://localhost/instance
# Add dataset families
curl -d '{"label":"Default dataset family","display":10,"opened":true}' --header 'Content-Type: application/json' -X POST http://localhost/instance/default/dataset-family
diff --git a/server/doctrine-proxy/__CG__AppEntityInstance.php b/server/doctrine-proxy/__CG__AppEntityInstance.php
index 9dabfedbd313e9fdac3afbaace455b69f4213a10..18b784254a05d8026bce9b97dcf3918aa6e642f5 100644
--- a/server/doctrine-proxy/__CG__AppEntityInstance.php
+++ b/server/doctrine-proxy/__CG__AppEntityInstance.php
@@ -67,10 +67,10 @@ class Instance extends \App\Entity\Instance implements \Doctrine\ORM\Proxy\Proxy
public function __sleep()
{
if ($this->__isInitialized__) {
- return ['__isInitialized__', 'name', 'label', 'description', 'scientificManager', 'instrument', 'wavelengthDomain', 'display', 'dataPath', 'filesPath', 'public', 'portalLogo', 'designColor', 'designBackgroundColor', 'designLogo', 'designFavicon', 'navbarBackgroundColor', 'navbarBorderBottomColor', 'navbarColorHref', 'navbarFontFamily', 'navbarSignInBtnColor', 'navbarUserBtnColor', 'footerBackgroundColor', 'footerBorderTopColor', 'footerTextColor', 'footerLogos', 'familyBorderColor', 'familyHeaderBackgroundColor', 'familyTitleColor', 'familyTitleBold', 'familyBackgroundColor', 'familyColor', 'progressBarTitle', 'progressBarTitleColor', 'progressBarSubtitle', 'progressBarSubtitleColor', 'progressBarStepDatasetTitle', 'progressBarStepCriteriaTitle', 'progressBarStepOutputTitle', 'progressBarStepResultTitle', 'progressBarColor', 'progressBarActiveColor', 'progressBarCircleColor', 'progressBarCircleIconColor', 'progressBarCircleIconActiveColor', 'progressBarTextColor', 'searchNextBtnColor', 'searchNextBtnHoverColor', 'searchNextBtnTextColor', 'searchBackBtnColor', 'searchBackBtnHoverColor', 'searchBackBtnTextColor', 'datasetSelectBtnColor', 'datasetSelectBtnHoverColor', 'datasetSelectBtnTextColor', 'resultHeaderBackgroundColor', 'resultHeaderTextColor', 'resultHeaderBtnColor', 'resultHeaderBtnHoverColor', 'resultHeaderBtnTextColor', 'resultDatatableBordered', 'resultDatatableBorderColor', 'resultDatatableHeaderBackgroundColor', 'resultDatatableHeaderTextColor', 'resultDatatableRowsBackgroundColor', 'resultDatatableRowsTextColor', 'resultDatatableSortedColor', 'resultDatatableSortedActiveColor', 'resultDatatableLinkColor', 'resultDatatableLinkHoverColor', 'resultDatatableRowsSelectedColor', 'sampEnabled', 'backToPortal', 'userMenuEnabled', 'searchByCriteriaAllowed', 'searchByCriteriaLabel', 'searchMultipleAllowed', 'searchMultipleLabel', 'searchMultipleAllDatasetsSelected', 'documentationAllowed', 'documentationLabel', 'datasetFamilies'];
+ return ['__isInitialized__', 'name', 'label', 'description', 'scientificManager', 'instrument', 'wavelengthDomain', 'display', 'dataPath', 'filesPath', 'public', 'portalLogo', 'designColor', 'designBackgroundColor', 'designLogo', 'designFavicon', 'navbarBackgroundColor', 'navbarBorderBottomColor', 'navbarColorHref', 'navbarFontFamily', 'navbarSignInBtnColor', 'navbarUserBtnColor', 'footerBackgroundColor', 'footerBorderTopColor', 'footerTextColor', 'footerLogos', 'familyBorderColor', 'familyHeaderBackgroundColor', 'familyTitleColor', 'familyTitleBold', 'familyBackgroundColor', 'familyTextColor', 'progressBarTitle', 'progressBarTitleColor', 'progressBarSubtitle', 'progressBarSubtitleColor', 'progressBarStepDatasetTitle', 'progressBarStepCriteriaTitle', 'progressBarStepOutputTitle', 'progressBarStepResultTitle', 'progressBarColor', 'progressBarActiveColor', 'progressBarCircleColor', 'progressBarCircleIconColor', 'progressBarCircleIconActiveColor', 'progressBarTextColor', 'searchNextBtnColor', 'searchNextBtnHoverColor', 'searchNextBtnHoverTextColor', 'searchBackBtnColor', 'searchBackBtnHoverColor', 'searchBackBtnHoverTextColor', 'datasetSelectBtnColor', 'datasetSelectBtnHoverColor', 'datasetSelectBtnHoverTextColor', 'datasetSelectedIconColor', 'searchInfoBackgroundColor', 'searchInfoTextColor', 'searchInfoBtnColor', 'searchInfoBtnHoverColor', 'searchInfoBtnTextColor', 'resultDatatableBordered', 'resultDatatableBorderColor', 'resultDatatableHeaderBackgroundColor', 'resultDatatableHeaderTextColor', 'resultDatatableRowsBackgroundColor', 'resultDatatableRowsTextColor', 'resultDatatableSortedColor', 'resultDatatableSortedActiveColor', 'resultDatatableLinkColor', 'resultDatatableLinkHoverColor', 'resultDatatableRowsSelectedColor', 'sampEnabled', 'backToPortal', 'userMenuEnabled', 'searchByCriteriaAllowed', 'searchByCriteriaLabel', 'searchMultipleAllowed', 'searchMultipleLabel', 'searchMultipleAllDatasetsSelected', 'documentationAllowed', 'documentationLabel', 'datasetFamilies'];
}
- return ['__isInitialized__', 'name', 'label', 'description', 'scientificManager', 'instrument', 'wavelengthDomain', 'display', 'dataPath', 'filesPath', 'public', 'portalLogo', 'designColor', 'designBackgroundColor', 'designLogo', 'designFavicon', 'navbarBackgroundColor', 'navbarBorderBottomColor', 'navbarColorHref', 'navbarFontFamily', 'navbarSignInBtnColor', 'navbarUserBtnColor', 'footerBackgroundColor', 'footerBorderTopColor', 'footerTextColor', 'footerLogos', 'familyBorderColor', 'familyHeaderBackgroundColor', 'familyTitleColor', 'familyTitleBold', 'familyBackgroundColor', 'familyColor', 'progressBarTitle', 'progressBarTitleColor', 'progressBarSubtitle', 'progressBarSubtitleColor', 'progressBarStepDatasetTitle', 'progressBarStepCriteriaTitle', 'progressBarStepOutputTitle', 'progressBarStepResultTitle', 'progressBarColor', 'progressBarActiveColor', 'progressBarCircleColor', 'progressBarCircleIconColor', 'progressBarCircleIconActiveColor', 'progressBarTextColor', 'searchNextBtnColor', 'searchNextBtnHoverColor', 'searchNextBtnTextColor', 'searchBackBtnColor', 'searchBackBtnHoverColor', 'searchBackBtnTextColor', 'datasetSelectBtnColor', 'datasetSelectBtnHoverColor', 'datasetSelectBtnTextColor', 'resultHeaderBackgroundColor', 'resultHeaderTextColor', 'resultHeaderBtnColor', 'resultHeaderBtnHoverColor', 'resultHeaderBtnTextColor', 'resultDatatableBordered', 'resultDatatableBorderColor', 'resultDatatableHeaderBackgroundColor', 'resultDatatableHeaderTextColor', 'resultDatatableRowsBackgroundColor', 'resultDatatableRowsTextColor', 'resultDatatableSortedColor', 'resultDatatableSortedActiveColor', 'resultDatatableLinkColor', 'resultDatatableLinkHoverColor', 'resultDatatableRowsSelectedColor', 'sampEnabled', 'backToPortal', 'userMenuEnabled', 'searchByCriteriaAllowed', 'searchByCriteriaLabel', 'searchMultipleAllowed', 'searchMultipleLabel', 'searchMultipleAllDatasetsSelected', 'documentationAllowed', 'documentationLabel', 'datasetFamilies'];
+ return ['__isInitialized__', 'name', 'label', 'description', 'scientificManager', 'instrument', 'wavelengthDomain', 'display', 'dataPath', 'filesPath', 'public', 'portalLogo', 'designColor', 'designBackgroundColor', 'designLogo', 'designFavicon', 'navbarBackgroundColor', 'navbarBorderBottomColor', 'navbarColorHref', 'navbarFontFamily', 'navbarSignInBtnColor', 'navbarUserBtnColor', 'footerBackgroundColor', 'footerBorderTopColor', 'footerTextColor', 'footerLogos', 'familyBorderColor', 'familyHeaderBackgroundColor', 'familyTitleColor', 'familyTitleBold', 'familyBackgroundColor', 'familyTextColor', 'progressBarTitle', 'progressBarTitleColor', 'progressBarSubtitle', 'progressBarSubtitleColor', 'progressBarStepDatasetTitle', 'progressBarStepCriteriaTitle', 'progressBarStepOutputTitle', 'progressBarStepResultTitle', 'progressBarColor', 'progressBarActiveColor', 'progressBarCircleColor', 'progressBarCircleIconColor', 'progressBarCircleIconActiveColor', 'progressBarTextColor', 'searchNextBtnColor', 'searchNextBtnHoverColor', 'searchNextBtnHoverTextColor', 'searchBackBtnColor', 'searchBackBtnHoverColor', 'searchBackBtnHoverTextColor', 'datasetSelectBtnColor', 'datasetSelectBtnHoverColor', 'datasetSelectBtnHoverTextColor', 'datasetSelectedIconColor', 'searchInfoBackgroundColor', 'searchInfoTextColor', 'searchInfoBtnColor', 'searchInfoBtnHoverColor', 'searchInfoBtnTextColor', 'resultDatatableBordered', 'resultDatatableBorderColor', 'resultDatatableHeaderBackgroundColor', 'resultDatatableHeaderTextColor', 'resultDatatableRowsBackgroundColor', 'resultDatatableRowsTextColor', 'resultDatatableSortedColor', 'resultDatatableSortedActiveColor', 'resultDatatableLinkColor', 'resultDatatableLinkHoverColor', 'resultDatatableRowsSelectedColor', 'sampEnabled', 'backToPortal', 'userMenuEnabled', 'searchByCriteriaAllowed', 'searchByCriteriaLabel', 'searchMultipleAllowed', 'searchMultipleLabel', 'searchMultipleAllDatasetsSelected', 'documentationAllowed', 'documentationLabel', 'datasetFamilies'];
}
/**
@@ -833,23 +833,23 @@ class Instance extends \App\Entity\Instance implements \Doctrine\ORM\Proxy\Proxy
/**
* {@inheritDoc}
*/
- public function getFamilyColor()
+ public function getFamilyTextColor()
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFamilyColor', []);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'getFamilyTextColor', []);
- return parent::getFamilyColor();
+ return parent::getFamilyTextColor();
}
/**
* {@inheritDoc}
*/
- public function setFamilyColor($familyColor)
+ public function setFamilyTextColor($familyTextColor)
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFamilyColor', [$familyColor]);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'setFamilyTextColor', [$familyTextColor]);
- return parent::setFamilyColor($familyColor);
+ return parent::setFamilyTextColor($familyTextColor);
}
/**
@@ -1207,23 +1207,23 @@ class Instance extends \App\Entity\Instance implements \Doctrine\ORM\Proxy\Proxy
/**
* {@inheritDoc}
*/
- public function getSearchNextBtnTextColor()
+ public function getSearchNextBtnHoverTextColor()
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSearchNextBtnTextColor', []);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSearchNextBtnHoverTextColor', []);
- return parent::getSearchNextBtnTextColor();
+ return parent::getSearchNextBtnHoverTextColor();
}
/**
* {@inheritDoc}
*/
- public function setSearchNextBtnTextColor($searchNextBtnTextColor)
+ public function setSearchNextBtnHoverTextColor($searchNextBtnHoverTextColor)
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSearchNextBtnTextColor', [$searchNextBtnTextColor]);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSearchNextBtnHoverTextColor', [$searchNextBtnHoverTextColor]);
- return parent::setSearchNextBtnTextColor($searchNextBtnTextColor);
+ return parent::setSearchNextBtnHoverTextColor($searchNextBtnHoverTextColor);
}
/**
@@ -1273,23 +1273,23 @@ class Instance extends \App\Entity\Instance implements \Doctrine\ORM\Proxy\Proxy
/**
* {@inheritDoc}
*/
- public function getSearchBackBtnTextColor()
+ public function getSearchBackBtnHoverTextColor()
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSearchBackBtnTextColor', []);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSearchBackBtnHoverTextColor', []);
- return parent::getSearchBackBtnTextColor();
+ return parent::getSearchBackBtnHoverTextColor();
}
/**
* {@inheritDoc}
*/
- public function setSearchBackBtnTextColor($searchBackBtnTextColor)
+ public function setSearchBackBtnHoverTextColor($searchBackBtnHoverTextColor)
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSearchBackBtnTextColor', [$searchBackBtnTextColor]);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSearchBackBtnHoverTextColor', [$searchBackBtnHoverTextColor]);
- return parent::setSearchBackBtnTextColor($searchBackBtnTextColor);
+ return parent::setSearchBackBtnHoverTextColor($searchBackBtnHoverTextColor);
}
/**
@@ -1339,133 +1339,155 @@ class Instance extends \App\Entity\Instance implements \Doctrine\ORM\Proxy\Proxy
/**
* {@inheritDoc}
*/
- public function getDatasetSelectBtnTextColor()
+ public function getDatasetSelectBtnHoverTextColor()
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDatasetSelectBtnTextColor', []);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDatasetSelectBtnHoverTextColor', []);
- return parent::getDatasetSelectBtnTextColor();
+ return parent::getDatasetSelectBtnHoverTextColor();
}
/**
* {@inheritDoc}
*/
- public function setDatasetSelectBtnTextColor($datasetSelectBtnTextColor)
+ public function setDatasetSelectBtnHoverTextColor($datasetSelectBtnHoverTextColor)
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDatasetSelectBtnTextColor', [$datasetSelectBtnTextColor]);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDatasetSelectBtnHoverTextColor', [$datasetSelectBtnHoverTextColor]);
- return parent::setDatasetSelectBtnTextColor($datasetSelectBtnTextColor);
+ return parent::setDatasetSelectBtnHoverTextColor($datasetSelectBtnHoverTextColor);
}
/**
* {@inheritDoc}
*/
- public function getResultHeaderBackgroundColor()
+ public function getDatasetSelectedIconColor()
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'getResultHeaderBackgroundColor', []);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'getDatasetSelectedIconColor', []);
- return parent::getResultHeaderBackgroundColor();
+ return parent::getDatasetSelectedIconColor();
}
/**
* {@inheritDoc}
*/
- public function setResultHeaderBackgroundColor($resultHeaderBackgroundColor)
+ public function setDatasetSelectedIconColor($datasetSelectedIconColor)
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'setResultHeaderBackgroundColor', [$resultHeaderBackgroundColor]);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'setDatasetSelectedIconColor', [$datasetSelectedIconColor]);
- return parent::setResultHeaderBackgroundColor($resultHeaderBackgroundColor);
+ return parent::setDatasetSelectedIconColor($datasetSelectedIconColor);
}
/**
* {@inheritDoc}
*/
- public function getResultHeaderTextColor()
+ public function getSearchInfoBackgroundColor()
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'getResultHeaderTextColor', []);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSearchInfoBackgroundColor', []);
- return parent::getResultHeaderTextColor();
+ return parent::getSearchInfoBackgroundColor();
}
/**
* {@inheritDoc}
*/
- public function setResultHeaderTextColor($resultHeaderTextColor)
+ public function setSearchInfoBackgroundColor($searchInfoBackgroundColor)
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'setResultHeaderTextColor', [$resultHeaderTextColor]);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSearchInfoBackgroundColor', [$searchInfoBackgroundColor]);
- return parent::setResultHeaderTextColor($resultHeaderTextColor);
+ return parent::setSearchInfoBackgroundColor($searchInfoBackgroundColor);
}
/**
* {@inheritDoc}
*/
- public function getResultHeaderBtnColor()
+ public function getSearchInfoTextColor()
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'getResultHeaderBtnColor', []);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSearchInfoTextColor', []);
- return parent::getResultHeaderBtnColor();
+ return parent::getSearchInfoTextColor();
}
/**
* {@inheritDoc}
*/
- public function setResultHeaderBtnColor($resultHeaderBtnColor)
+ public function setSearchInfoTextColor($searchInfoTextColor)
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'setResultHeaderBtnColor', [$resultHeaderBtnColor]);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSearchInfoTextColor', [$searchInfoTextColor]);
- return parent::setResultHeaderBtnColor($resultHeaderBtnColor);
+ return parent::setSearchInfoTextColor($searchInfoTextColor);
}
/**
* {@inheritDoc}
*/
- public function getResultHeaderBtnHoverColor()
+ public function getSearchInfoBtnColor()
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'getResultHeaderBtnHoverColor', []);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSearchInfoBtnColor', []);
- return parent::getResultHeaderBtnHoverColor();
+ return parent::getSearchInfoBtnColor();
}
/**
* {@inheritDoc}
*/
- public function setResultHeaderBtnHoverColor($resultHeaderBtnHoverColor)
+ public function setSearchInfoBtnColor($searchInfoBtnColor)
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'setResultHeaderBtnHoverColor', [$resultHeaderBtnHoverColor]);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSearchInfoBtnColor', [$searchInfoBtnColor]);
- return parent::setResultHeaderBtnHoverColor($resultHeaderBtnHoverColor);
+ return parent::setSearchInfoBtnColor($searchInfoBtnColor);
}
/**
* {@inheritDoc}
*/
- public function getResultHeaderBtnTextColor()
+ public function getSearchInfoBtnHoverColor()
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'getResultHeaderBtnTextColor', []);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSearchInfoBtnHoverColor', []);
- return parent::getResultHeaderBtnTextColor();
+ return parent::getSearchInfoBtnHoverColor();
}
/**
* {@inheritDoc}
*/
- public function setResultHeaderBtnTextColor($resultHeaderBtnTextColor)
+ public function setSearchInfoBtnHoverColor($searchInfoBtnHoverColor)
{
- $this->__initializer__ && $this->__initializer__->__invoke($this, 'setResultHeaderBtnTextColor', [$resultHeaderBtnTextColor]);
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSearchInfoBtnHoverColor', [$searchInfoBtnHoverColor]);
- return parent::setResultHeaderBtnTextColor($resultHeaderBtnTextColor);
+ return parent::setSearchInfoBtnHoverColor($searchInfoBtnHoverColor);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getSearchInfoBtnTextColor()
+ {
+
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'getSearchInfoBtnTextColor', []);
+
+ return parent::getSearchInfoBtnTextColor();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function setSearchInfoBtnTextColor($searchInfoBtnTextColor)
+ {
+
+ $this->__initializer__ && $this->__initializer__->__invoke($this, 'setSearchInfoBtnTextColor', [$searchInfoBtnTextColor]);
+
+ return parent::setSearchInfoBtnTextColor($searchInfoBtnTextColor);
}
/**
diff --git a/server/src/Action/InstanceAction.php b/server/src/Action/InstanceAction.php
index 5a39b6f03043abfb0fd0b8f2745356ed704cd7e9..212035c01b38b51fa7b8ceb0c6ff4590c8c775aa 100644
--- a/server/src/Action/InstanceAction.php
+++ b/server/src/Action/InstanceAction.php
@@ -93,7 +93,7 @@ final class InstanceAction extends AbstractAction
'family_title_color',
'family_title_bold',
'family_background_color',
- 'family_color',
+ 'family_text_color',
'progress_bar_title',
'progress_bar_title_color',
'progress_bar_subtitle',
@@ -110,18 +110,19 @@ final class InstanceAction extends AbstractAction
'progress_bar_text_color',
'search_next_btn_color',
'search_next_btn_hover_color',
- 'search_next_btn_text_color',
+ 'search_next_btn_hover_text_color',
'search_back_btn_color',
'search_back_btn_hover_color',
- 'search_back_btn_text_color',
+ 'search_back_btn_hover_text_color',
'dataset_select_btn_color',
'dataset_select_btn_hover_color',
- 'dataset_select_btn_text_color',
- 'result_header_background_color',
- 'result_header_text_color',
- 'result_header_btn_color',
- 'result_header_btn_hover_color',
- 'result_header_btn_text_color',
+ 'dataset_select_btn_hover_text_color',
+ 'dataset_selected_icon_color',
+ 'search_info_background_color',
+ 'search_info_text_color',
+ 'search_info_btn_color',
+ 'search_info_btn_hover_color',
+ 'search_info_btn_text_color',
'result_datatable_bordered',
'result_datatable_border_color',
'result_datatable_header_background_color',
@@ -207,7 +208,7 @@ final class InstanceAction extends AbstractAction
$instance->setFamilyTitleColor($parsedBody['family_title_color']);
$instance->setFamilyTitleBold($parsedBody['family_title_bold']);
$instance->setFamilyBackgroundColor($parsedBody['family_background_color']);
- $instance->setFamilyColor($parsedBody['family_color']);
+ $instance->setFamilyTextColor($parsedBody['family_text_color']);
$instance->setProgressBarTitle($parsedBody['progress_bar_title']);
$instance->setProgressBarTitleColor($parsedBody['progress_bar_title_color']);
$instance->setProgressBarSubtitle($parsedBody['progress_bar_subtitle']);
@@ -224,18 +225,19 @@ final class InstanceAction extends AbstractAction
$instance->setProgressBarTextColor($parsedBody['progress_bar_text_color']);
$instance->setSearchNextBtnColor($parsedBody['search_next_btn_color']);
$instance->setSearchNextBtnHoverColor($parsedBody['search_next_btn_hover_color']);
- $instance->setSearchNextBtnTextColor($parsedBody['search_next_btn_text_color']);
+ $instance->setSearchNextBtnHoverTextColor($parsedBody['search_next_btn_hover_text_color']);
$instance->setSearchBackBtnColor($parsedBody['search_back_btn_color']);
$instance->setSearchBackBtnHoverColor($parsedBody['search_back_btn_hover_color']);
- $instance->setSearchBackBtnTextColor($parsedBody['search_back_btn_text_color']);
+ $instance->setSearchBackBtnHoverTextColor($parsedBody['search_back_btn_hover_text_color']);
$instance->setDatasetSelectBtnColor($parsedBody['dataset_select_btn_color']);
$instance->setDatasetSelectBtnHoverColor($parsedBody['dataset_select_btn_hover_color']);
- $instance->setDatasetSelectBtnTextColor($parsedBody['dataset_select_btn_text_color']);
- $instance->setResultHeaderBackgroundColor($parsedBody['result_header_background_color']);
- $instance->setResultHeaderTextColor($parsedBody['result_header_text_color']);
- $instance->setResultHeaderBtnColor($parsedBody['result_header_btn_color']);
- $instance->setResultHeaderBtnHoverColor($parsedBody['result_header_btn_hover_color']);
- $instance->setResultHeaderBtnTextColor($parsedBody['result_header_btn_text_color']);
+ $instance->setDatasetSelectBtnHoverTextColor($parsedBody['dataset_select_btn_hover_text_color']);
+ $instance->setDatasetSelectedIconColor($parsedBody['dataset_selected_icon_color']);
+ $instance->setSearchInfoBackgroundColor($parsedBody['search_info_background_color']);
+ $instance->setSearchInfoTextColor($parsedBody['search_info_text_color']);
+ $instance->setSearchInfoBtnColor($parsedBody['search_info_btn_color']);
+ $instance->setSearchInfoBtnHoverColor($parsedBody['search_info_btn_hover_color']);
+ $instance->setSearchInfoBtnTextColor($parsedBody['search_info_btn_text_color']);
$instance->setResultDatatableBordered($parsedBody['result_datatable_bordered']);
$instance->setResultDatatableBorderColor($parsedBody['result_datatable_border_color']);
$instance->setResultDatatableHeaderBackgroundColor($parsedBody['result_datatable_header_background_color']);
diff --git a/server/src/Action/InstanceListAction.php b/server/src/Action/InstanceListAction.php
index 686190245db4d227eaa617e04d08a4a06346ec58..54e27394ef251a705086b30ea33490e760962998 100644
--- a/server/src/Action/InstanceListAction.php
+++ b/server/src/Action/InstanceListAction.php
@@ -93,7 +93,7 @@ final class InstanceListAction extends AbstractAction
'family_title_color',
'family_title_bold',
'family_background_color',
- 'family_color',
+ 'family_text_color',
'progress_bar_title',
'progress_bar_title_color',
'progress_bar_subtitle',
@@ -110,18 +110,19 @@ final class InstanceListAction extends AbstractAction
'progress_bar_text_color',
'search_next_btn_color',
'search_next_btn_hover_color',
- 'search_next_btn_text_color',
+ 'search_next_btn_hover_text_color',
'search_back_btn_color',
'search_back_btn_hover_color',
- 'search_back_btn_text_color',
+ 'search_back_btn_hover_text_color',
'dataset_select_btn_color',
'dataset_select_btn_hover_color',
- 'dataset_select_btn_text_color',
- 'result_header_background_color',
- 'result_header_text_color',
- 'result_header_btn_color',
- 'result_header_btn_hover_color',
- 'result_header_btn_text_color',
+ 'dataset_select_btn_hover_text_color',
+ 'dataset_selected_icon_color',
+ 'search_info_background_color',
+ 'search_info_text_color',
+ 'search_info_btn_color',
+ 'search_info_btn_hover_color',
+ 'search_info_btn_text_color',
'result_datatable_bordered',
'result_datatable_border_color',
'result_datatable_header_background_color',
@@ -201,7 +202,7 @@ final class InstanceListAction extends AbstractAction
$instance->setFamilyTitleColor($parsedBody['family_title_color']);
$instance->setFamilyTitleBold($parsedBody['family_title_bold']);
$instance->setFamilyBackgroundColor($parsedBody['family_background_color']);
- $instance->setFamilyColor($parsedBody['family_color']);
+ $instance->setFamilyTextColor($parsedBody['family_text_color']);
$instance->setProgressBarTitle($parsedBody['progress_bar_title']);
$instance->setProgressBarTitleColor($parsedBody['progress_bar_title_color']);
$instance->setProgressBarSubtitle($parsedBody['progress_bar_subtitle']);
@@ -218,18 +219,19 @@ final class InstanceListAction extends AbstractAction
$instance->setProgressBarTextColor($parsedBody['progress_bar_text_color']);
$instance->setSearchNextBtnColor($parsedBody['search_next_btn_color']);
$instance->setSearchNextBtnHoverColor($parsedBody['search_next_btn_hover_color']);
- $instance->setSearchNextBtnTextColor($parsedBody['search_next_btn_text_color']);
+ $instance->setSearchNextBtnHoverTextColor($parsedBody['search_next_btn_hover_text_color']);
$instance->setSearchBackBtnColor($parsedBody['search_back_btn_color']);
$instance->setSearchBackBtnHoverColor($parsedBody['search_back_btn_hover_color']);
- $instance->setSearchBackBtnTextColor($parsedBody['search_back_btn_text_color']);
+ $instance->setSearchBackBtnHoverTextColor($parsedBody['search_back_btn_hover_text_color']);
$instance->setDatasetSelectBtnColor($parsedBody['dataset_select_btn_color']);
$instance->setDatasetSelectBtnHoverColor($parsedBody['dataset_select_btn_hover_color']);
- $instance->setDatasetSelectBtnTextColor($parsedBody['dataset_select_btn_text_color']);
- $instance->setResultHeaderBackgroundColor($parsedBody['result_header_background_color']);
- $instance->setResultHeaderTextColor($parsedBody['result_header_text_color']);
- $instance->setResultHeaderBtnColor($parsedBody['result_header_btn_color']);
- $instance->setResultHeaderBtnHoverColor($parsedBody['result_header_btn_hover_color']);
- $instance->setResultHeaderBtnTextColor($parsedBody['result_header_btn_text_color']);
+ $instance->setDatasetSelectBtnHoverTextColor($parsedBody['dataset_select_btn_hover_text_color']);
+ $instance->setDatasetSelectedIconColor($parsedBody['dataset_selected_icon_color']);
+ $instance->setSearchInfoBackgroundColor($parsedBody['search_info_background_color']);
+ $instance->setSearchInfoTextColor($parsedBody['search_info_text_color']);
+ $instance->setSearchInfoBtnColor($parsedBody['search_info_btn_color']);
+ $instance->setSearchInfoBtnHoverColor($parsedBody['search_info_btn_hover_color']);
+ $instance->setSearchInfoBtnTextColor($parsedBody['search_info_btn_text_color']);
$instance->setResultDatatableBordered($parsedBody['result_datatable_bordered']);
$instance->setResultDatatableBorderColor($parsedBody['result_datatable_border_color']);
$instance->setResultDatatableHeaderBackgroundColor($parsedBody['result_datatable_header_background_color']);
diff --git a/server/src/Entity/Instance.php b/server/src/Entity/Instance.php
index 5235eaf240a610d620ea9a74f272360da1ea3531..ff77123b1b09fb7e5dd1fc07208f5f0d65ca36ea 100644
--- a/server/src/Entity/Instance.php
+++ b/server/src/Entity/Instance.php
@@ -237,9 +237,9 @@ class Instance implements \JsonSerializable
/**
* @var string
*
- * @Column(type="string", name="family_color", nullable=false, options={"default" : "#212529"})
+ * @Column(type="string", name="family_text_color", nullable=false, options={"default" : "#212529"})
*/
- protected $familyColor;
+ protected $familyTextColor;
/**
* @var string
@@ -368,9 +368,9 @@ class Instance implements \JsonSerializable
/**
* @var string
*
- * @Column(type="string", name="search_next_btn_text_color", nullable=false, options={"default" : "#FFFFFF"})
+ * @Column(type="string", name="search_next_btn_hover_text_color", nullable=false, options={"default" : "#FFFFFF"})
*/
- protected $searchNextBtnTextColor;
+ protected $searchNextBtnHoverTextColor;
/**
* @var string
@@ -389,9 +389,9 @@ class Instance implements \JsonSerializable
/**
* @var string
*
- * @Column(type="string", name="search_back_btn_text_color", nullable=false, options={"default" : "#FFFFFF"})
+ * @Column(type="string", name="search_back_btn_hover_text_color", nullable=false, options={"default" : "#FFFFFF"})
*/
- protected $searchBackBtnTextColor;
+ protected $searchBackBtnHoverTextColor;
/**
* @var string
@@ -410,44 +410,53 @@ class Instance implements \JsonSerializable
/**
* @var string
*
- * @Column(type="string", name="dataset_select_btn_text_color", nullable=false, options={"default" : "#FFFFFF"})
+ * @Column(type="string", name="dataset_select_btn_hover_text_color", nullable=false, options={
+ * "default" : "#FFFFFF"
+ * })
+ */
+ protected $datasetSelectBtnHoverTextColor;
+
+ /**
+ * @var string
+ *
+ * @Column(type="string", name="dataset_selected_icon_color", nullable=false, options={"default" : "#28A745"})
*/
- protected $datasetSelectBtnTextColor;
+ protected $datasetSelectedIconColor;
/**
* @var string
*
- * @Column(type="string", name="result_header_background_color", nullable=false, options={"default" : "#E9ECEF"})
+ * @Column(type="string", name="search_info_background_color", nullable=false, options={"default" : "#E9ECEF"})
*/
- protected $resultHeaderBackgroundColor;
+ protected $searchInfoBackgroundColor;
/**
* @var string
*
- * @Column(type="string", name="result_header_text_color", nullable=false, options={"default" : "#000000"})
+ * @Column(type="string", name="search_info_text_color", nullable=false, options={"default" : "#000000"})
*/
- protected $resultHeaderTextColor;
+ protected $searchInfoTextColor;
/**
* @var string
*
- * @Column(type="string", name="result_header_btn_color", nullable=false, options={"default" : "#007BFF"})
+ * @Column(type="string", name="search_info_btn_color", nullable=false, options={"default" : "#007BFF"})
*/
- protected $resultHeaderBtnColor;
+ protected $searchInfoBtnColor;
/**
* @var string
*
- * @Column(type="string", name="result_header_btn_hover_color", nullable=false, options={"default" : "#0069D9"})
+ * @Column(type="string", name="search_info_btn_hover_color", nullable=false, options={"default" : "#0069D9"})
*/
- protected $resultHeaderBtnHoverColor;
+ protected $searchInfoBtnHoverColor;
/**
* @var string
*
- * @Column(type="string", name="result_header_btn_text_color", nullable=false, options={"default" : "#FFFFFF"})
+ * @Column(type="string", name="search_info_btn_text_color", nullable=false, options={"default" : "#FFFFFF"})
*/
- protected $resultHeaderBtnTextColor;
+ protected $searchInfoBtnTextColor;
/**
* @var bool
@@ -919,14 +928,14 @@ class Instance implements \JsonSerializable
$this->familyBackgroundColor = $familyBackgroundColor;
}
- public function getFamilyColor()
+ public function getFamilyTextColor()
{
- return $this->familyColor;
+ return $this->familyTextColor;
}
- public function setFamilyColor($familyColor)
+ public function setFamilyTextColor($familyTextColor)
{
- $this->familyColor = $familyColor;
+ $this->familyTextColor = $familyTextColor;
}
public function getProgressBarTitle()
@@ -1089,14 +1098,14 @@ class Instance implements \JsonSerializable
$this->searchNextBtnHoverColor = $searchNextBtnHoverColor;
}
- public function getSearchNextBtnTextColor()
+ public function getSearchNextBtnHoverTextColor()
{
- return $this->searchNextBtnTextColor;
+ return $this->searchNextBtnHoverTextColor;
}
- public function setSearchNextBtnTextColor($searchNextBtnTextColor)
+ public function setSearchNextBtnHoverTextColor($searchNextBtnHoverTextColor)
{
- $this->searchNextBtnTextColor = $searchNextBtnTextColor;
+ $this->searchNextBtnHoverTextColor = $searchNextBtnHoverTextColor;
}
public function getSearchBackBtnColor()
@@ -1119,14 +1128,14 @@ class Instance implements \JsonSerializable
$this->searchBackBtnHoverColor = $searchBackBtnHoverColor;
}
- public function getSearchBackBtnTextColor()
+ public function getSearchBackBtnHoverTextColor()
{
- return $this->searchBackBtnTextColor;
+ return $this->searchBackBtnHoverTextColor;
}
- public function setSearchBackBtnTextColor($searchBackBtnTextColor)
+ public function setSearchBackBtnHoverTextColor($searchBackBtnHoverTextColor)
{
- $this->searchBackBtnTextColor = $searchBackBtnTextColor;
+ $this->searchBackBtnHoverTextColor = $searchBackBtnHoverTextColor;
}
public function getDatasetSelectBtnColor()
@@ -1149,64 +1158,74 @@ class Instance implements \JsonSerializable
$this->datasetSelectBtnHoverColor = $datasetSelectBtnHoverColor;
}
- public function getDatasetSelectBtnTextColor()
+ public function getDatasetSelectBtnHoverTextColor()
+ {
+ return $this->datasetSelectBtnHoverTextColor;
+ }
+
+ public function setDatasetSelectBtnHoverTextColor($datasetSelectBtnHoverTextColor)
+ {
+ $this->datasetSelectBtnHoverTextColor = $datasetSelectBtnHoverTextColor;
+ }
+
+ public function getDatasetSelectedIconColor()
{
- return $this->datasetSelectBtnTextColor;
+ return $this->datasetSelectedIconColor;
}
- public function setDatasetSelectBtnTextColor($datasetSelectBtnTextColor)
+ public function setDatasetSelectedIconColor($datasetSelectedIconColor)
{
- $this->datasetSelectBtnTextColor = $datasetSelectBtnTextColor;
+ $this->datasetSelectedIconColor = $datasetSelectedIconColor;
}
- public function getResultHeaderBackgroundColor()
+ public function getSearchInfoBackgroundColor()
{
- return $this->resultHeaderBackgroundColor;
+ return $this->searchInfoBackgroundColor;
}
- public function setResultHeaderBackgroundColor($resultHeaderBackgroundColor)
+ public function setSearchInfoBackgroundColor($searchInfoBackgroundColor)
{
- $this->resultHeaderBackgroundColor = $resultHeaderBackgroundColor;
+ $this->searchInfoBackgroundColor = $searchInfoBackgroundColor;
}
- public function getResultHeaderTextColor()
+ public function getSearchInfoTextColor()
{
- return $this->resultHeaderTextColor;
+ return $this->searchInfoTextColor;
}
- public function setResultHeaderTextColor($resultHeaderTextColor)
+ public function setSearchInfoTextColor($searchInfoTextColor)
{
- $this->resultHeaderTextColor = $resultHeaderTextColor;
+ $this->searchInfoTextColor = $searchInfoTextColor;
}
- public function getResultHeaderBtnColor()
+ public function getSearchInfoBtnColor()
{
- return $this->resultHeaderBtnColor;
+ return $this->searchInfoBtnColor;
}
- public function setResultHeaderBtnColor($resultHeaderBtnColor)
+ public function setSearchInfoBtnColor($searchInfoBtnColor)
{
- $this->resultHeaderBtnColor = $resultHeaderBtnColor;
+ $this->searchInfoBtnColor = $searchInfoBtnColor;
}
- public function getResultHeaderBtnHoverColor()
+ public function getSearchInfoBtnHoverColor()
{
- return $this->resultHeaderBtnHoverColor;
+ return $this->searchInfoBtnHoverColor;
}
- public function setResultHeaderBtnHoverColor($resultHeaderBtnHoverColor)
+ public function setSearchInfoBtnHoverColor($searchInfoBtnHoverColor)
{
- $this->resultHeaderBtnHoverColor = $resultHeaderBtnHoverColor;
+ $this->searchInfoBtnHoverColor = $searchInfoBtnHoverColor;
}
- public function getResultHeaderBtnTextColor()
+ public function getSearchInfoBtnTextColor()
{
- return $this->resultHeaderBtnTextColor;
+ return $this->searchInfoBtnTextColor;
}
- public function setResultHeaderBtnTextColor($resultHeaderBtnTextColor)
+ public function setSearchInfoBtnTextColor($searchInfoBtnTextColor)
{
- $this->resultHeaderBtnTextColor = $resultHeaderBtnTextColor;
+ $this->searchInfoBtnTextColor = $searchInfoBtnTextColor;
}
public function getResultDatatableBordered()
@@ -1466,7 +1485,7 @@ class Instance implements \JsonSerializable
'family_title_color' => $this->getFamilyTitleColor(),
'family_title_bold' => $this->getFamilyTitleBold(),
'family_background_color' => $this->getFamilyBackgroundColor(),
- 'family_color' => $this->getFamilyColor(),
+ 'family_text_color' => $this->getFamilyTextColor(),
'progress_bar_title' => $this->getProgressBarTitle(),
'progress_bar_title_color' => $this->getProgressBarTitleColor(),
'progress_bar_subtitle' => $this->getProgressBarSubtitle(),
@@ -1483,18 +1502,19 @@ class Instance implements \JsonSerializable
'progress_bar_text_color' => $this->getProgressBarTextColor(),
'search_next_btn_color' => $this->getSearchNextBtnColor(),
'search_next_btn_hover_color' => $this->getSearchNextBtnHoverColor(),
- 'search_next_btn_text_color' => $this->getSearchNextBtnTextColor(),
+ 'search_next_btn_hover_text_color' => $this->getSearchNextBtnHoverTextColor(),
'search_back_btn_color' => $this->getSearchBackBtnColor(),
'search_back_btn_hover_color' => $this->getSearchBackBtnHoverColor(),
- 'search_back_btn_text_color' => $this->getSearchBackBtnTextColor(),
+ 'search_back_btn_hover_text_color' => $this->getSearchBackBtnHoverTextColor(),
'dataset_select_btn_color' => $this->getDatasetSelectBtnColor(),
'dataset_select_btn_hover_color' => $this->getDatasetSelectBtnHoverColor(),
- 'dataset_select_btn_text_color' => $this->getDatasetSelectBtnTextColor(),
- 'result_header_background_color' => $this->getResultHeaderBackgroundColor(),
- 'result_header_text_color' => $this->getResultHeaderTextColor(),
- 'result_header_btn_color' => $this->getResultHeaderBtnColor(),
- 'result_header_btn_hover_color' => $this->getResultHeaderBtnHoverColor(),
- 'result_header_btn_text_color' => $this->getResultHeaderBtnTextColor(),
+ 'dataset_select_btn_hover_text_color' => $this->getDatasetSelectBtnHoverTextColor(),
+ 'dataset_selected_icon_color' => $this->getDatasetSelectedIconColor(),
+ 'search_info_background_color' => $this->getSearchInfoBackgroundColor(),
+ 'search_info_text_color' => $this->getSearchInfoTextColor(),
+ 'search_info_btn_color' => $this->getSearchInfoBtnColor(),
+ 'search_info_btn_hover_color' => $this->getSearchInfoBtnHoverColor(),
+ 'search_info_btn_text_color' => $this->getSearchInfoBtnTextColor(),
'result_datatable_bordered' => $this->getResultDatatableBordered(),
'result_datatable_border_color' => $this->getResultDatatableBorderColor(),
'result_datatable_header_background_color' => $this->getResultDatatableHeaderBackgroundColor(),
diff --git a/server/tests/Action/InstanceActionTest.php b/server/tests/Action/InstanceActionTest.php
index 71ef9183e9abbb9727c0977d18a0055c7438797b..006a43ea8d91e45bb0ac0bdba218988d397572c0 100644
--- a/server/tests/Action/InstanceActionTest.php
+++ b/server/tests/Action/InstanceActionTest.php
@@ -107,7 +107,7 @@ final class InstanceActionTest extends TestCase
'family_title_color' => '#007BFF',
'family_title_bold' => false,
'family_background_color' => '#FFFFFF',
- 'family_color' => '#212529',
+ 'family_text_color' => '#212529',
'progress_bar_title' => 'Dataset search',
'progress_bar_title_color' => '#000000',
'progress_bar_subtitle' => 'Select a dataset, add criteria, select output columns and display the result.',
@@ -124,18 +124,19 @@ final class InstanceActionTest extends TestCase
'progress_bar_text_color' => '#91B2BF',
'search_next_btn_color' => '#007BFF',
'search_next_btn_hover_color' => '#007BFF',
- 'search_next_btn_text_color' => '#FFFFFF',
+ 'search_next_btn_hover_text_color' => '#FFFFFF',
'search_back_btn_color' => '#6C757D',
'search_back_btn_hover_color' => '#6C757D',
- 'search_back_btn_text_color' => '#FFFFFF',
+ 'search_back_btn_hover_text_color' => '#FFFFFF',
'dataset_select_btn_color' => '#6C757D',
'dataset_select_btn_hover_color' => '#6C757D',
- 'dataset_select_btn_text_color' => '#FFFFFF',
- 'result_header_background_color' => '#E9ECEF',
- 'result_header_text_color' => '#000000',
- 'result_header_btn_color' => '#007BFF',
- 'result_header_btn_hover_color' => '#0069D9',
- 'result_header_btn_text_color' => '#FFFFFF',
+ 'dataset_select_btn_hover_text_color' => '#FFFFFF',
+ 'dataset_selected_icon_color' => '#28A745',
+ 'search_info_background_color' => '#E9ECEF',
+ 'search_info_text_color' => '#000000',
+ 'search_info_btn_color' => '#007BFF',
+ 'search_info_btn_hover_color' => '#0069D9',
+ 'search_info_btn_text_color' => '#FFFFFF',
'result_datatable_bordered' => true,
'result_datatable_border_color' => '#DEE2E6',
'result_datatable_header_background_color' => '#FFFFFF',
diff --git a/server/tests/Action/InstanceListActionTest.php b/server/tests/Action/InstanceListActionTest.php
index de1eed639b70d397194851406921a5c392238a88..9e42b7c5208191b274d83ed279dffbf96e038a90 100644
--- a/server/tests/Action/InstanceListActionTest.php
+++ b/server/tests/Action/InstanceListActionTest.php
@@ -91,7 +91,7 @@ final class InstanceListActionTest extends TestCase
'family_title_color' => '#007BFF',
'family_title_bold' => false,
'family_background_color' => '#FFFFFF',
- 'family_color' => '#212529',
+ 'family_text_color' => '#212529',
'progress_bar_title' => 'Dataset search',
'progress_bar_title_color' => '#000000',
'progress_bar_subtitle' => 'Select a dataset, add criteria, select output columns and display the result.',
@@ -108,18 +108,19 @@ final class InstanceListActionTest extends TestCase
'progress_bar_text_color' => '#91B2BF',
'search_next_btn_color' => '#007BFF',
'search_next_btn_hover_color' => '#007BFF',
- 'search_next_btn_text_color' => '#FFFFFF',
+ 'search_next_btn_hover_text_color' => '#FFFFFF',
'search_back_btn_color' => '#6C757D',
'search_back_btn_hover_color' => '#6C757D',
- 'search_back_btn_text_color' => '#FFFFFF',
+ 'search_back_btn_hover_text_color' => '#FFFFFF',
'dataset_select_btn_color' => '#6C757D',
'dataset_select_btn_hover_color' => '#6C757D',
- 'dataset_select_btn_text_color' => '#FFFFFF',
- 'result_header_background_color' => '#E9ECEF',
- 'result_header_text_color' => '#000000',
- 'result_header_btn_color' => '#007BFF',
- 'result_header_btn_hover_color' => '#0069D9',
- 'result_header_btn_text_color' => '#FFFFFF',
+ 'dataset_select_btn_hover_text_color' => '#FFFFFF',
+ 'dataset_selected_icon_color' => '#28A745',
+ 'search_info_background_color' => '#E9ECEF',
+ 'search_info_text_color' => '#000000',
+ 'search_info_btn_color' => '#007BFF',
+ 'search_info_btn_hover_color' => '#0069D9',
+ 'search_info_btn_text_color' => '#FFFFFF',
'result_datatable_bordered' => true,
'result_datatable_border_color' => '#DEE2E6',
'result_datatable_header_background_color' => '#FFFFFF',