Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-24 03:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Remove unneccary and dead code to handle case where custom logo is not set

Browse source
This commit is contained in:
Johannes Zellner 2023-07-31 18:06:00 +02:00
parent 8dc7aa490a
commit a5f918c670
3 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -559,9 +559,6 @@ a:not(.disabled).is-active i.fa {
top: 45px; top: 45px;
left: 10px; left: 10px;
} }
#isSettingDatabaseCallDone {
display: none;
}
.at-link { .at-link {
color: #17683a; color: #17683a;
text-decoration: underline; text-decoration: underline;

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

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

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

@ -20,8 +20,6 @@ const validator = {
}, },
}; };
// let isSettingDatabaseFctCallDone = false;
Template.userFormsLayout.onCreated(function () { Template.userFormsLayout.onCreated(function () {
const templateInstance = this; const templateInstance = this;
templateInstance.currentSetting = new ReactiveVar(); templateInstance.currentSetting = new ReactiveVar();
@ -37,11 +35,6 @@ Template.userFormsLayout.onCreated(function () {
oidcBtnElt.html(htmlvalue); oidcBtnElt.html(htmlvalue);
} }
// 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(); return this.stop();
}, },
}); });
@ -86,10 +79,6 @@ Template.userFormsLayout.onRendered(() => {
}); });
Template.userFormsLayout.helpers({ Template.userFormsLayout.helpers({
// isSettingDatabaseCallDone(){
// return isSettingDatabaseFctCallDone;
// },
isLegalNoticeLinkExist() { isLegalNoticeLinkExist() {
const currSet = Template.instance().currentSetting.get(); const currSet = Template.instance().currentSetting.get();
if (currSet && currSet !== undefined && currSet != null) { if (currSet && currSet !== undefined && currSet != null) {