github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 04:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

[point #3830] Display default weekan logo if there isn't a custom one

Browse source
This commit is contained in:
Emile NDAGIJIMANA 2021-10-18 16:58:54 +02:00
parent d9329a9e15
commit 5a5a01cf17
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/main/layouts.jade
View file

@ -34,7 +34,7 @@ template(name="userFormsLayout")
img(src="{{currentSetting.customLoginLogoImageUrl}}" width="300" height="auto")
br
unless currentSetting.customLoginLogoImageUrl
if isSettingDatabaseFctCallDone
div#isSettingDatabaseCallDone
img(src="{{pathFor '/wekan-logo.svg'}}" alt="" width="300" height="auto")
br
if currentSetting.textBelowCustomLoginLogo

14
client/components/main/layouts.js
View file

@ -23,7 +23,7 @@ const validator = {
},
};
let isSettingDatabaseFctCallDone = false;
// let isSettingDatabaseFctCallDone = false;
Template.userFormsLayout.onCreated(function() {
const templateInstance = this;
@ -40,7 +40,11 @@ Template.userFormsLayout.onCreated(function() {
oidcBtnElt.html(htmlvalue);
}
isSettingDatabaseFctCallDone = true;
// isSettingDatabaseFctCallDone = true;
if(currSetting && currSetting !== undefined && currSetting.customLoginLogoImageUrl !== undefined)
document.getElementById("isSettingDatabaseCallDone").style.display = 'none';
else
document.getElementById("isSettingDatabaseCallDone").style.display = 'block';
return this.stop();
},
});
@ -69,9 +73,9 @@ Template.userFormsLayout.helpers({
return Template.instance().currentSetting.get();
},
isSettingDatabaseCallDone(){
return isSettingDatabaseFctCallDone;
},
// isSettingDatabaseCallDone(){
// return isSettingDatabaseFctCallDone;
// },
isLoading() {
return Template.instance().isLoading.get();

3
client/components/main/layouts.styl
View file

@ -542,3 +542,6 @@ a
100%
transform: rotate(360deg)
#isSettingDatabaseCallDone
display: none;