Merge 75de114858 into 03dac9ed6d

If the rss feed is empty or missing, the news button will simply not appear for those who don't want to use this feature

app/assets/js/scripts/landing.js

@@ -961,6 +961,10 @@ async function loadNews(){
     const distroData = await DistroAPI.getDistribution()
     if(!distroData.rawDistribution.rss) {
         loggerLanding.debug('No RSS feed provided.')
+
+        // remove the news button
+        await $('#newsButton').fadeOut(250).promise()
+
         return null
     }
 

app/assets/lang/_custom.toml

@@ -5,9 +5,9 @@ title = "Helios Launcher"
 
 [ejs.landing]
 mediaGitHubURL = "https://github.com/dscalzi/HeliosLauncher"
-mediaTwitterURL = "#"
+mediaTwitterURL = ""
-mediaInstagramURL = "#"
+mediaInstagramURL = ""
-mediaYouTubeURL = "#"
+mediaYouTubeURL = ""
 mediaDiscordURL = "https://discord.gg/zNWUXdt"
 
 [ejs.settings]

app/landing.ejs

@@ -27,8 +27,10 @@
                             </button>
                         </div>
                     </div>
+                    <% if (lang('landing.mediaGitHubURL') + lang('landing.mediaTwitterURL') + lang('landing.mediaInstagramURL') + lang('landing.mediaYouTubeURL') + lang('landing.mediaDiscordURL') != "") { %>
                         <div class="mediaDivider"></div>
                         <div id="externalMedia">
+                            <% if (lang('landing.mediaGitHubURL') != "") { %>
                                 <div class="mediaContainer">
                                     <a href="<%- lang('landing.mediaGitHubURL') %>" class="mediaURL" id="linkURL">
                                         <svg id="linkSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500">
@@ -39,6 +41,8 @@
                                         </svg>
                                     </a>
                                 </div>
+                            <% } %>
+                            <% if (lang('landing.mediaTwitterURL') != "") { %>
                                 <div class="mediaContainer">
                                     <a href="<%- lang('landing.mediaTwitterURL') %>" class="mediaURL" id="twitterURL">
                                         <svg id="twitterSVG" class="mediaSVG" viewBox="0 0 5000 4060" preserveAspectRatio="xMidYMid meet">	
@@ -48,6 +52,8 @@
                                         </svg>
                                     </a>
                                 </div>
+                            <% } %>
+                            <% if (lang('landing.mediaInstagramURL') != "") { %>
                                 <div class="mediaContainer">
                                     <a href="<%- lang('landing.mediaInstagramURL') %>" class="mediaURL" id="instagramURL">
                                         <svg id="instagramSVG" class="mediaSVG" viewBox="0 0 5040 5040">
@@ -68,6 +74,8 @@
                                         </svg>
                                     </a>
                                 </div>
+                            <% } %>
+                            <% if (lang('landing.mediaYouTubeURL') != "") { %>
                                 <div class="mediaContainer">
                                     <a href="<%- lang('landing.mediaYouTubeURL') %>" class="mediaURL" id="youtubeURL">
                                         <svg id="youtubeSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500">
@@ -77,6 +85,9 @@
                                         </svg>
                                     </a>
                                 </div>
+                            <% } %>
+
+                            <% if (lang('landing.mediaDiscordURL') != "") { %>
                                 <div class="mediaContainer">
                                     <a href="<%- lang('landing.mediaDiscordURL') %>" class="mediaURL" id="discordURL">
                                         <svg id="discordSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500">
@@ -86,7 +97,9 @@
                                         </svg>
                                     </a>
                                 </div>
+                            <% } %>
                         </div>
+                    <% } %>
                 </div>
             </div>
         </div>