From 4c842dd8ca8d0aeea12854eacde483f999d40542 Mon Sep 17 00:00:00 2001
From: LiWinDom <wadim.gorbachev@mail.ru>
Date: Mon, 8 Jun 2020 16:46:18 +0300
Subject: [PATCH 1/2] Added "download" menu to dashboard

Please translate to other languages
*from localeEN (
$string["download"] = "Download";
$string["forWindows"] = "For Windows";
$string["forAndroid"] = "For Android";
$string["forMacos"] = "For MacOS";
)
---
 dashboard/config.php             |  9 +++++++++
 dashboard/incl/dashboardLib.php  | 27 +++++++++++++++++++++++++++
 dashboard/incl/lang/localeEN.php |  5 +++++
 3 files changed, 41 insertions(+)
 create mode 100644 dashboard/config.php

diff --git a/dashboard/config.php b/dashboard/config.php
new file mode 100644
index 000000000..7feeaabd7
--- /dev/null
+++ b/dashboard/config.php
@@ -0,0 +1,9 @@
+<?php
+	//Download links settings
+	$isWinLink = 0;
+	$winDownloadLink = ""; //For Windows
+	$isAndrLink = 0;
+	$andrDownloadLink = ""; //For Android
+	$isMacosLink = 0;
+	$macosDownloadLink = ""; //For MacOS
+?>
\ No newline at end of file
diff --git a/dashboard/incl/dashboardLib.php b/dashboard/incl/dashboardLib.php
index 8fa2f16dd..dbb87547c 100644
--- a/dashboard/incl/dashboardLib.php
+++ b/dashboard/incl/dashboardLib.php
@@ -58,6 +58,7 @@ public function printNavbar($active){
 		$modActive = "";
 		$reuploadActive = "";
 		$statsActive = "";
+		$downloadActive = "";
 		switch($active){
 			case "home":
 				$homeActive = "active";
@@ -74,6 +75,9 @@ public function printNavbar($active){
 			case "stats":
 				$statsActive = "active";
 				break;
+			case "download":
+				$downloadActive = "active";
+				break;
 		}
 		echo '<nav class="navbar navbar-expand-lg navbar-dark menubar">
 			<a class="navbar-brand" href="index.php">CvoltonGDPS</a>
@@ -165,6 +169,29 @@ public function printNavbar($active){
 							<a class="dropdown-item" href="lang/switchLang.php?lang=TR">Türkçe</a>
 							<a class="dropdown-item" href="lang/switchLang.php?lang=test">translTest</a>
 						</div>';
+		require_once __DIR__."/../config.php";
+		$localizedDownloadSelection = $this->getLocalizedString("download");
+		$localizedForWindows = $this->getLocalizedString("forWindows");
+		$localizedForAndroid = $this->getLocalizedString("forAndroid");
+		$localizedForMacos = $this->getLocalizedString("forMacos");
+		$downloadCode = "<li class=\"nav-item dropdown $downloadActive\">
+					<a class=\"nav-link dropdown-toggle\" href=\"#\" id=\"navbarDropdownMenuLink\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">
+						<i class=\"fa fa-download\" aria-hidden=\"true\"></i> $localizedDownloadSelection
+					</a>
+					<div class=\"dropdown-menu\" aria-labelledby=\"navbarDropdownMenuLink\">";
+		if($isWinLink){
+			$downloadCode .= "<a class=\"dropdown-item\" href=$winDownloadLink> $localizedForWindows</a>";
+		}
+		if($isAndrLink){
+			$downloadCode .= "<a class=\"dropdown-item\" href=$andrDownloadLink> $localizedForAndroid</a>";
+		}
+		if($isMacosLink){
+			$downloadCode .= "<a class=\"dropdown-item\" href=$macosDownloadLink> $localizedForMacos</a>";
+		}
+		$downloadCode .= "</div></li>";
+		if($isWinLink || $isAndrLink || $isMacosLink){
+			echo $downloadCode;
+		}
 		if(isset($_SESSION["accountID"]) AND $_SESSION["accountID"] != 0){
 			$userName = $gs->getAccountName($_SESSION["accountID"]);
 			echo'<li class="nav-item dropdown">
diff --git a/dashboard/incl/lang/localeEN.php b/dashboard/incl/lang/localeEN.php
index 66b5d5704..370312920 100644
--- a/dashboard/incl/lang/localeEN.php
+++ b/dashboard/incl/lang/localeEN.php
@@ -27,6 +27,11 @@
 
 $string["language"] = "Language";
 
+$string["download"] = "Download";
+$string["forWindows"] = "For Windows";
+$string["forAndroid"] = "For Android";
+$string["forMacos"] = "For MacOS";
+
 $string["loginHeader"] = "Welcome, %s";
 $string["logout"] = "Log Out";
 $string["login"] = "Log In";

From b2834c95b3a78de3185d4bcb20f50f0cf83d25d1 Mon Sep 17 00:00:00 2001
From: LiWinDom <wadim.gorbachev@mail.ru>
Date: Mon, 8 Jun 2020 20:31:27 +0300
Subject: [PATCH 2/2] "download" menu optimisation

---
 dashboard/config.php            | 3 ---
 dashboard/incl/dashboardLib.php | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dashboard/config.php b/dashboard/config.php
index 7feeaabd7..07ee6550e 100644
--- a/dashboard/config.php
+++ b/dashboard/config.php
@@ -1,9 +1,6 @@
 <?php
 	//Download links settings
-	$isWinLink = 0;
 	$winDownloadLink = ""; //For Windows
-	$isAndrLink = 0;
 	$andrDownloadLink = ""; //For Android
-	$isMacosLink = 0;
 	$macosDownloadLink = ""; //For MacOS
 ?>
\ No newline at end of file
diff --git a/dashboard/incl/dashboardLib.php b/dashboard/incl/dashboardLib.php
index dbb87547c..68c2742f5 100644
--- a/dashboard/incl/dashboardLib.php
+++ b/dashboard/incl/dashboardLib.php
@@ -179,17 +179,17 @@ public function printNavbar($active){
 						<i class=\"fa fa-download\" aria-hidden=\"true\"></i> $localizedDownloadSelection
 					</a>
 					<div class=\"dropdown-menu\" aria-labelledby=\"navbarDropdownMenuLink\">";
-		if($isWinLink){
+		if($winDownloadLink){
 			$downloadCode .= "<a class=\"dropdown-item\" href=$winDownloadLink> $localizedForWindows</a>";
 		}
-		if($isAndrLink){
+		if($andrDownloadLink){
 			$downloadCode .= "<a class=\"dropdown-item\" href=$andrDownloadLink> $localizedForAndroid</a>";
 		}
-		if($isMacosLink){
+		if($macosDownloadLink){
 			$downloadCode .= "<a class=\"dropdown-item\" href=$macosDownloadLink> $localizedForMacos</a>";
 		}
 		$downloadCode .= "</div></li>";
-		if($isWinLink || $isAndrLink || $isMacosLink){
+		if($winDownloadLink || $andrDownloadLink || $macosDownloadLink){
 			echo $downloadCode;
 		}
 		if(isset($_SESSION["accountID"]) AND $_SESSION["accountID"] != 0){