Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix proposal for #1135 #1136

Merged
merged 5 commits into from
Jul 26, 2023
Merged

Fix proposal for #1135 #1136

merged 5 commits into from
Jul 26, 2023

Conversation

fpotier
Copy link
Member

@fpotier fpotier commented Jul 21, 2023

See #1135

@fpotier
Copy link
Member Author

fpotier commented Jul 21, 2023

Note that this patch requires to update the deployment's config

@nitrosx
Copy link
Member

nitrosx commented Jul 21, 2023

@fpotier would you be able to expand the functionality in the following way:

  • If no configuration value is provided under the key "logo-icon", you use the assets/images/site-logo.png, otherwise you inject the value provide in configuration
  • Update/Create documentation so we explain the configuration variable and value, and also we provide example on how to mount the logo image into the docker container.

Please let me know if it makes sense, or I should elaborate on it.

@nitrosx nitrosx self-requested a review July 21, 2023 14:38
@fpotier
Copy link
Member Author

fpotier commented Jul 21, 2023

@nitrosx Should this new configuration key logo-icon contain the absolute path of the asset or we just assume it's a file in assets/images?

Where should I write the associated documentation?

@nitrosx
Copy link
Member

nitrosx commented Jul 24, 2023

@fpotier let's assume that it leaves in assets/images.

You can find the documentation in repo https://github.com/SciCatProject/documentation.
Most likely goes under the Operator section.

@nitrosx
Copy link
Member

nitrosx commented Jul 25, 2023

@fpotier please let me know if my comment makes sense

@fpotier
Copy link
Member Author

fpotier commented Jul 25, 2023

@nitrosx Yes it does, now it should work as you asked

<ng-template #otherFacility>
<img class="logo" src="../../../assets/images/site-logo.png" />
</ng-template>
<img class="logo" src="../../../assets/images/header-logo.png" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking something as the following:

<ng-template [ngIf]="logoIcon === '' or logoIcon ==='default'" [ngIfElse="customLogo">
 <img class="logo" src="../../../asstes/images/header-logo.png" />
</ng-template>
<ng-template #customLogo>
 <img class="logo" src="../../../asstes/images/{{ logoIcon }}" />
</ng_template>

@nitrosx nitrosx merged commit 480e671 into SciCatProject:master Jul 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants